diff --git a/.gitignore b/.gitignore index 10e8c6ee..d9f529d5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ _notes/Maps/plot.log *.mod /_content/_output *.mod +*.mod diff --git a/_content/_tlk/ra_tdog.tlk.xml b/_content/_tlk/ra_tdog.tlk.xml index f4b7e42d..1c80db54 100644 --- a/_content/_tlk/ra_tdog.tlk.xml +++ b/_content/_tlk/ra_tdog.tlk.xml @@ -5938,9 +5938,151 @@ Its muscles grow and become more defined, it starts to move with greater alacrit The subject improves in all ways. It gains a +4 enhancement bonus to each of its ability scores. -Material Component: A statuette of a celestial or fiend worth 50 gp. +Material Component: A statuette of a celestial or fiend worth 50 gp. Chasing Perfection (12) Chasing Perfection (16) + Regenerate Light Wounds + Conjuration (Healing) +Level: Cleric 1, Druid 1, +Components: V, S, +Casting Time: 1 action +Range: Touch +Target: Living creature touched +Duration: 10 rounds + 1 round/level +Saving Throw: Will negates (harmless) +Spell Resistance: Yes (harmless) + +With a touch of your hand, you boost the subject's life energy, granting him or her the fast healing ability for the duration of the spell. This healing applies only to damage sustained during the spell's duration, not to that from previous injuries. The subject heals 1 hit point per round of such damage until the spell ends and is automatically stabilized if he or she begins dying from hit point loss during that time. + +Regenerate light wounds does not restore hit points lost from starvation, thirst, or suffocation, nor does it allow a creature to regrow or attach lost body parts. The effects of multiple regenerate spells do not stack, only the highest-level effect applies. Applying a second regenerate spell of equal level extends the +first spell's duration by the full duration of the second spell. + Regenerate Light Wounds (3) + Regenerate Light Wounds (6) + Regenerate Light Wounds (9) + Regenerate Moderate Wounds + Conjuration (Healing) +Level: Cleric 2, Druid 2, +Components: V, S, +Casting Time: 1 action +Range: Touch +Target: Living creature touched +Duration: 10 rounds + 1 round/level +Saving Throw: Will negates (harmless) +Spell Resistance: Yes (harmless) + +With a touch of your hand, you boost the subject's life energy, granting him or her the fast healing ability for the duration of the spell. This healing applies only to damage sustained during the spell's duration, not to that from previous injuries. The subject heals 2 hit points per round of such damage until the spell ends and is automatically stabilized if he or she begins dying from hit point loss during that time. + +Regenerate moderate wounds does not restore hit points lost from starvation, thirst, or suffocation, nor does it allow a creature to regrow or attach lost body parts. The effects of multiple regenerate spells do not stack, only the highest-level effect applies. Applying a second regenerate spell of equal level extends the +first spell's duration by the full duration of the second spell. + Regenerate Moderate Wounds (3) + Regenerate Moderate Wounds (6) + Regenerate Moderate Wounds (9) + Regenerate Serious Wounds + Conjuration (Healing) +Level: Cleric 3, Druid 3, +Components: V, S, +Casting Time: 1 action +Range: Touch +Target: Living creature touched +Duration: 10 rounds + 1 round/level +Saving Throw: Will negates (harmless) +Spell Resistance: Yes (harmless) + +With a touch of your hand, you boost the subject's life energy, granting him or her the fast healing ability for the duration of the spell. This healing applies only to damage sustained during the spell's duration, not to that from previous injuries. The subject heals 3 hit points per round of such damage until the spell ends and is automatically stabilized if he or she begins dying from hit point loss during that time. + +Regenerate serious wounds does not restore hit points lost from starvation, thirst, or suffocation, nor does it allow a creature to regrow or attach lost body parts. The effects of multiple regenerate spells do not stack, only the highest-level effect applies. Applying a second regenerate spell of equal level extends the +first spell's duration by the full duration of the second spell. + Regenerate Serious Wounds (5) + Regenerate Serious Wounds (10) + Regenerate Serious Wounds (15) + Regenerate Critical Wounds + Conjuration (Healing) +Level: Cleric 4, Druid 4, +Components: V, S, +Casting Time: 1 action +Range: Touch +Target: Living creature touched +Duration: 10 rounds + 1 round/level +Saving Throw: Will negates (harmless) +Spell Resistance: Yes (harmless) + +With a touch of your hand, you boost the subject's life energy, granting him or her the fast healing ability for the duration of the spell. This healing applies only to damage sustained during the spell's duration, not to that from previous injuries. The subject heals 4 hit point per round of such damage until the spell ends and is automatically stabilized if he or she begins dying from hit point loss during that time. + +Regenerate critical wounds does not restore hit points lost from starvation, thirst, or suffocation, nor does it allow a creature to regrow or attach lost body parts. The effects of multiple regenerate spells do not stack, only the highest-level effect applies. Applying a second regenerate spell of equal level extends the +first spell's duration by the full duration of the second spell. + Regenerate Critical Wounds (7) + Regenerate Critical Wounds (12) + Regenerate Critical Wounds (15) + Speed of the Wind + Transmutation +Level: Druid 2, +Components: V, S, +Casting Time: 1 action +Range: Touch +Target: Living creature touched +Duration: 10 minutes/level +Saving Throw: Will negates +Spell Resistance: Yes + +With this spell, you can grant the ephemeral quickness of a sudden breeze. The subject gains a +4 enhancement bonus to Dexterity and a -2 enhancement penalty to Constitution. + Speed of the Wind (7) + Speed of the Wind (12) + Speed of the Wind (15) + Spirit Worm + Necromancy +Level: Sorcerer 1, Wizard 1, +Components: V, S, M, +Casting Time: 1 standard action +Range: Touch +Target: Living creature touched +Duration: 1 round/level, up to 5 rounds; see text +Saving Throw: Fortitude negates; see text +Spell Resistance: Yes + +You press the bit of blackened bone against your foe and intone the spell. The bone vanishes, leaving a mottled bruise where it touched. You create a lingering decay in the spirit and body of the target. If the target fails its saving throw, it takes 1 point of Constitution damage each round while the spell lasts (maximum 5 points). The victim can attempt a Fortitude saving throw each round, and success negates the Constitution damage for that round and ends the spell. + +Material Component: A piece of fire-blackened ivory or bone carved in the shape of a segmented worm. + Spirit Worm (5) + Spiritual Weapon + Evocation [Force] +Level: Cleric 2, Knight of the Chalice 2, War 2 +Components: V, S, DF, +Casting Time: 1 standard action +Range: Medium (100 ft. + 10 ft./level) +Effect: Magic weapon of force +Duration: 1 round/level (D) +Saving Throw: None +Spell Resistance: Yes + +A weapon made of pure force springs into existence and attacks opponents at a distance, as you direct it, dealing 1d8 force damage per hit, +1 point per three caster levels (maximum +5 at 15th level). The weapon takes the shape of a weapon favored by your deity or a weapon with some spiritual significance or symbolism to you (see below) and has the same threat range and critical multipliers as a real weapon of its form. It strikes the opponent you designate, starting with one attack in the round the spell is cast and continuing each round thereafter on your turn. It uses your base attack bonus (possibly allowing it multiple attacks per round in subsequent rounds) plus your Wisdom modifier as its attack bonus. It strikes as a spell, not as a weapon, so, for example, it can damage creatures that have damage reduction. As a force effect, it can strike incorporeal creatures without the normal miss chance associated with incorporeality. The weapon always strikes from your direction. It does not get a flanking bonus or help a combatant get one. Your feats (such as Weapon Focus) or combat actions (such as charge) do not affect the weapon. If the weapon goes beyond the spell range, if it goes out of your sight, or if you are not directing it, the weapon returns to you and hovers. + +Each round after the first, you can use a move action to redirect the weapon to a new target. If you do not, the weapon continues to attack the previous round's target. On any round that the weapon switches targets, it gets one attack. Subsequent rounds of attacking that target allow the weapon to make multiple attacks if your base attack bonus would allow it to. Even if the spiritual weapon is a ranged weapon, use the spell's range, not the weapon's normal range increment, and switching targets still is a move action. + +A spiritual weapon cannot be attacked or harmed by physical attacks, but dispel magic, disintegrate, a sphere of annihilation, or a rod of cancellation affects it. A spiritual weapon's AC against touch attacks is 12 (10 + size bonus for Tiny object). + +If an attacked creature has spell resistance, you make a caster level check (1d20 + caster level) against that spell resistance the first time the spiritual weapon strikes it. If the weapon is successfully resisted, the spell is dispelled. If not, the weapon has its normal full effect on that creature for the duration of the spell. + Spiritual Weapon (5) + Spiritual Weapon (10) + Spiritual Weapon (15) + Tortoise Shell + Transmutation +Level: Druid 6, +Components: V, S, DF, +Casting Time: 1 standard action +Range: Touch +Target: Living creature touched +Duration: 10 minutes/level +Saving Throw: None +Spell Resistance: Yes (harmless) + +In the blink of an eye, the creature you touched grows the armor plating of a tortoise across its torso and a tough, leathery skin elsewhere. Tortoise shell grants a +6 enhancement bonus to the subject's existing natural armor bonus. This enhancement bonus increases by 1 for every three caster levels beyond 11th, to a maximum of +9 at 20th level. + +The enhancement bonus provided by tortoise shell stacks with the target's natural armor bonus, but not with other enhancement bonuses to natural armor. A creature without natural armor has an effective natural armor of +0, much as a character wearing only normal clothing has an armor bonus of +0. + +Tortoise shell slows a creature's movement as if it were wearing heavy armor. An elf subject to tortoise shell, for example, would have a speed of 20 feet and could run only 60 feet per round. The spell affects only a creature's speed; tortoise shell doesn't carry an armor check penalty or an arcane spell failure chance. + Tortoise Shell (12) + Tortoise Shell (15) + Tortoise Shell (18) 62 63 64 @@ -77029,13 +77171,10 @@ Temples to evil deities sell cursed water at cost (making no profit). Warmage Flame Weapon Warmage Gedlee's Electric Loop Warmage Ice Knife - Warmage Melf's Acid Arrow - Warmage Pyrotechnics - - Warmage Pyrotechnics: Fireworks - - Warmage Pyrotechnics: Smoke - + Warmage Acid Arrow + Warmage Pyrotechnics + Warmage Pyrotechnics: Fireworks + Warmage Pyrotechnics: Smoke Warmage Scorching Ray Warmage Seeking Ray Warmage Snilloc's Snowball Swarm diff --git a/_module/are/adventurers_inn.are.json b/_module/are/adventurers_inn.are.json index dee7291c..9c38f7c0 100644 --- a/_module/are/adventurers_inn.are.json +++ b/_module/are/adventurers_inn.are.json @@ -677,7 +677,7 @@ }, "Version": { "type": "dword", - "value": 113 + "value": 114 }, "Width": { "type": "int", diff --git a/_module/are/area500sparky.are.json b/_module/are/area500sparky.are.json index b6655eb3..9a202977 100644 --- a/_module/are/area500sparky.are.json +++ b/_module/are/area500sparky.are.json @@ -11169,7 +11169,7 @@ }, "Version": { "type": "dword", - "value": 27 + "value": 28 }, "Width": { "type": "int", diff --git a/_module/are/innoftheflyingmo.are.json b/_module/are/innoftheflyingmo.are.json index 1b92aa1d..0d4daf1c 100644 --- a/_module/are/innoftheflyingmo.are.json +++ b/_module/are/innoftheflyingmo.are.json @@ -2907,13 +2907,17 @@ } ] }, + "TileBrdrDisabled": { + "type": "byte", + "value": 0 + }, "Tileset": { "type": "resref", "value": "tin01" }, "Version": { "type": "dword", - "value": 17 + "value": 18 }, "Width": { "type": "int", diff --git a/_module/are/lvl01_north.are.json b/_module/are/lvl01_north.are.json index 68f3a3df..88344196 100644 --- a/_module/are/lvl01_north.are.json +++ b/_module/are/lvl01_north.are.json @@ -2907,13 +2907,17 @@ } ] }, + "TileBrdrDisabled": { + "type": "byte", + "value": 0 + }, "Tileset": { "type": "resref", "value": "tdm01" }, "Version": { "type": "dword", - "value": 28 + "value": 29 }, "Width": { "type": "int", diff --git a/_module/are/old_hf_swamp.are.json b/_module/are/old_hf_swamp.are.json index 844bde6c..3c97fe29 100644 --- a/_module/are/old_hf_swamp.are.json +++ b/_module/are/old_hf_swamp.are.json @@ -11163,13 +11163,17 @@ } ] }, + "TileBrdrDisabled": { + "type": "byte", + "value": 0 + }, "Tileset": { "type": "resref", "value": "ttr01" }, "Version": { "type": "dword", - "value": 24 + "value": 25 }, "Width": { "type": "int", diff --git a/_module/are/starting_area.are.json b/_module/are/starting_area.are.json index 163656e4..2fa2f23a 100644 --- a/_module/are/starting_area.are.json +++ b/_module/are/starting_area.are.json @@ -1703,13 +1703,17 @@ } ] }, + "TileBrdrDisabled": { + "type": "byte", + "value": 0 + }, "Tileset": { "type": "resref", "value": "tic01" }, "Version": { "type": "dword", - "value": 86 + "value": 88 }, "Width": { "type": "int", diff --git a/_module/git/innoftheflyingmo.git.json b/_module/git/innoftheflyingmo.git.json index b53d4d25..f222a6be 100644 --- a/_module/git/innoftheflyingmo.git.json +++ b/_module/git/innoftheflyingmo.git.json @@ -970,6 +970,82 @@ "type": "resref", "value": "zep_commonw" }, + "xArmorPart_Belt": { + "type": "word", + "value": 0 + }, + "xArmorPart_LBice": { + "type": "word", + "value": 8 + }, + "xArmorPart_LFArm": { + "type": "word", + "value": 150 + }, + "xArmorPart_LFoot": { + "type": "word", + "value": 152 + }, + "xArmorPart_LHand": { + "type": "word", + "value": 1 + }, + "xArmorPart_LShin": { + "type": "word", + "value": 152 + }, + "xArmorPart_LShou": { + "type": "word", + "value": 0 + }, + "xArmorPart_LThig": { + "type": "word", + "value": 80 + }, + "xArmorPart_Neck": { + "type": "word", + "value": 1 + }, + "xArmorPart_Pelvi": { + "type": "word", + "value": 25 + }, + "xArmorPart_RBice": { + "type": "word", + "value": 8 + }, + "xArmorPart_RFArm": { + "type": "word", + "value": 150 + }, + "xArmorPart_RFoot": { + "type": "word", + "value": 152 + }, + "xArmorPart_RHand": { + "type": "word", + "value": 1 + }, + "xArmorPart_Robe": { + "type": "word", + "value": 154 + }, + "xArmorPart_RShin": { + "type": "word", + "value": 152 + }, + "xArmorPart_RShou": { + "type": "word", + "value": 0 + }, + "xArmorPart_RThig": { + "type": "word", + "value": 80 + }, + "xArmorPart_Torso": { + "type": "word", + "value": 153 + }, "XOrientation": { "type": "float", "value": 3.012791698298357e-043 @@ -1479,6 +1555,82 @@ "type": "byte", "value": 10 }, + "xAppearance_Head": { + "type": "word", + "value": 23 + }, + "xArmorPart_RFoot": { + "type": "word", + "value": 1 + }, + "xBodyPart_Belt": { + "type": "word", + "value": 0 + }, + "xBodyPart_LBicep": { + "type": "word", + "value": 1 + }, + "xBodyPart_LFArm": { + "type": "word", + "value": 1 + }, + "xBodyPart_LFoot": { + "type": "word", + "value": 1 + }, + "xBodyPart_LHand": { + "type": "word", + "value": 1 + }, + "xBodyPart_LShin": { + "type": "word", + "value": 1 + }, + "xBodyPart_LShoul": { + "type": "word", + "value": 0 + }, + "xBodyPart_LThigh": { + "type": "word", + "value": 1 + }, + "xBodyPart_Neck": { + "type": "word", + "value": 1 + }, + "xBodyPart_Pelvis": { + "type": "word", + "value": 1 + }, + "xBodyPart_RBicep": { + "type": "word", + "value": 1 + }, + "xBodyPart_RFArm": { + "type": "word", + "value": 1 + }, + "xBodyPart_RHand": { + "type": "word", + "value": 1 + }, + "xBodyPart_RShin": { + "type": "word", + "value": 1 + }, + "xBodyPart_RShoul": { + "type": "word", + "value": 0 + }, + "xBodyPart_RThigh": { + "type": "word", + "value": 1 + }, + "xBodyPart_Torso": { + "type": "word", + "value": 1 + }, "XOrientation": { "type": "float", "value": 1.500313440925744e-019 @@ -1902,7 +2054,7 @@ }, "TemplateResRef": { "type": "resref", - "value": "x3_door_wood002" + "value": "inn2pcrooms" }, "TrapDetectable": { "type": "byte", @@ -3736,6 +3888,18 @@ "type": "resref", "value": "nw_it_mpotion021" }, + "xModelPart1": { + "type": "word", + "value": 56 + }, + "xModelPart2": { + "type": "word", + "value": 21 + }, + "xModelPart3": { + "type": "word", + "value": 21 + }, "XOrientation": { "type": "float", "value": 0.0 @@ -3879,6 +4043,18 @@ "type": "resref", "value": "nw_it_mpotion023" }, + "xModelPart1": { + "type": "word", + "value": 74 + }, + "xModelPart2": { + "type": "word", + "value": 31 + }, + "xModelPart3": { + "type": "word", + "value": 61 + }, "XOrientation": { "type": "float", "value": 0.0 @@ -4022,6 +4198,18 @@ "type": "resref", "value": "nw_it_mpotion022" }, + "xModelPart1": { + "type": "word", + "value": 45 + }, + "xModelPart2": { + "type": "word", + "value": 41 + }, + "xModelPart3": { + "type": "word", + "value": 11 + }, "XOrientation": { "type": "float", "value": 0.0 diff --git a/_module/ifo/module.ifo.json b/_module/ifo/module.ifo.json index 41c3a01f..1529528e 100644 --- a/_module/ifo/module.ifo.json +++ b/_module/ifo/module.ifo.json @@ -2193,7 +2193,7 @@ }, "Mod_MinGameVer": { "type": "cexostring", - "value": "1.87" + "value": "1.88" }, "Mod_MinPerHour": { "type": "byte", @@ -2321,6 +2321,10 @@ "type": "cexostring", "value": "MODULE" }, + "Mod_UUID": { + "type": "cexostring", + "value": "" + }, "Mod_Version": { "type": "dword", "value": 3 @@ -2659,7 +2663,7 @@ }, "Value": { "type": "int", - "value": 0 + "value": 1 } }, { diff --git a/_module/itp/creaturepalcus.itp.json b/_module/itp/creaturepalcus.itp.json index 9d8233ec..6a467d7e 100644 --- a/_module/itp/creaturepalcus.itp.json +++ b/_module/itp/creaturepalcus.itp.json @@ -11996,6 +11996,25 @@ "LIST": { "type": "list", "value": [ + { + "__struct_id": 0, + "CR": { + "type": "float", + "value": 7.0 + }, + "FACTION": { + "type": "cexostring", + "value": "Hostile" + }, + "NAME": { + "type": "cexostring", + "value": "Algoid" + }, + "RESREF": { + "type": "resref", + "value": "prc_algoid" + } + }, { "__struct_id": 0, "CR": { @@ -12015,6 +12034,44 @@ "value": "inv_earthenhand" } }, + { + "__struct_id": 0, + "CR": { + "type": "float", + "value": 1.0 + }, + "FACTION": { + "type": "cexostring", + "value": "Commoner" + }, + "NAME": { + "type": "cexostring", + "value": "Myconid" + }, + "RESREF": { + "type": "resref", + "value": "prc_myconid" + } + }, + { + "__struct_id": 0, + "CR": { + "type": "float", + "value": 6.0 + }, + "FACTION": { + "type": "cexostring", + "value": "Hostile" + }, + "NAME": { + "type": "cexostring", + "value": "Shambling Mound" + }, + "RESREF": { + "type": "resref", + "value": "prc_shambmound" + } + }, { "__struct_id": 0, "CR": { @@ -16163,6 +16220,25 @@ "value": "ghast001" } }, + { + "__struct_id": 0, + "CR": { + "type": "float", + "value": 5.0 + }, + "FACTION": { + "type": "cexostring", + "value": "Hostile" + }, + "NAME": { + "type": "cexostring", + "value": "Ghast: 04 HD" + }, + "RESREF": { + "type": "resref", + "value": "nw_ghast" + } + }, { "__struct_id": 0, "CR": { @@ -16182,6 +16258,25 @@ "value": "ghoul001" } }, + { + "__struct_id": 0, + "CR": { + "type": "float", + "value": 3.0 + }, + "FACTION": { + "type": "cexostring", + "value": "bandit1" + }, + "NAME": { + "type": "cexostring", + "value": "Ghoul: 02 HD" + }, + "RESREF": { + "type": "resref", + "value": "nw_ghoul" + } + }, { "__struct_id": 0, "CR": { @@ -17031,6 +17126,25 @@ "value": "prc_to_mohrg" } }, + { + "__struct_id": 0, + "CR": { + "type": "float", + "value": 14.0 + }, + "FACTION": { + "type": "cexostring", + "value": "Hostile" + }, + "NAME": { + "type": "cexostring", + "value": "Mohrg: 14 HD" + }, + "RESREF": { + "type": "resref", + "value": "nw_mohrg" + } + }, { "__struct_id": 0, "CR": { @@ -17392,6 +17506,25 @@ "value": "ra_wight001" } }, + { + "__struct_id": 0, + "CR": { + "type": "float", + "value": 4.0 + }, + "FACTION": { + "type": "cexostring", + "value": "Hostile" + }, + "NAME": { + "type": "cexostring", + "value": "Wight: 04 HD" + }, + "RESREF": { + "type": "resref", + "value": "nw_wight" + } + }, { "__struct_id": 0, "CR": { @@ -17560,6 +17693,25 @@ "value": "shadow002" } }, + { + "__struct_id": 0, + "CR": { + "type": "float", + "value": 4.0 + }, + "FACTION": { + "type": "cexostring", + "value": "Hostile" + }, + "NAME": { + "type": "cexostring", + "value": "Shadow: 03 HD" + }, + "RESREF": { + "type": "resref", + "value": "nw_shadow" + } + }, { "__struct_id": 0, "CR": { @@ -18238,6 +18390,25 @@ "value": "nadroj" } }, + { + "__struct_id": 0, + "CR": { + "type": "float", + "value": 8.0 + }, + "FACTION": { + "type": "cexostring", + "value": "Hostile" + }, + "NAME": { + "type": "cexostring", + "value": "Spectre: 07 HD" + }, + "RESREF": { + "type": "resref", + "value": "nw_spectre" + } + }, { "__struct_id": 0, "CR": { @@ -18428,6 +18599,25 @@ "value": "ra_wraith01" } }, + { + "__struct_id": 0, + "CR": { + "type": "float", + "value": 7.0 + }, + "FACTION": { + "type": "cexostring", + "value": "Hostile" + }, + "NAME": { + "type": "cexostring", + "value": "Wraith: 05 HD" + }, + "RESREF": { + "type": "resref", + "value": "nw_wraith" + } + }, { "__struct_id": 0, "CR": { @@ -24717,6 +24907,25 @@ "value": "hamatula" } }, + { + "__struct_id": 0, + "CR": { + "type": "float", + "value": 8.0 + }, + "FACTION": { + "type": "cexostring", + "value": "Commoner" + }, + "NAME": { + "type": "cexostring", + "value": "Hamatula" + }, + "RESREF": { + "type": "resref", + "value": "hamatula001" + } + }, { "__struct_id": 0, "CR": { @@ -25576,7 +25785,7 @@ "__struct_id": 0, "CR": { "type": "float", - "value": 0.3333333432674408 + "value": 0.5 }, "FACTION": { "type": "cexostring", diff --git a/_module/itp/doorpalcus.itp.json b/_module/itp/doorpalcus.itp.json index 4a4802aa..18a7dbcc 100644 --- a/_module/itp/doorpalcus.itp.json +++ b/_module/itp/doorpalcus.itp.json @@ -17,6 +17,17 @@ "LIST": { "type": "list", "value": [ + { + "__struct_id": 0, + "NAME": { + "type": "cexostring", + "value": "\"Create Area\" Door" + }, + "RESREF": { + "type": "resref", + "value": "inn2pcrooms" + } + }, { "__struct_id": 0, "NAME": { diff --git a/_module/itp/itempalcus.itp.json b/_module/itp/itempalcus.itp.json index ee8dfbcb..7cf37d1e 100644 --- a/_module/itp/itempalcus.itp.json +++ b/_module/itp/itempalcus.itp.json @@ -8763,6 +8763,17 @@ "value": "cr_hide_aldeth" } }, + { + "__struct_id": 0, + "NAME": { + "type": "cexostring", + "value": "Algoid Hide" + }, + "RESREF": { + "type": "resref", + "value": "prc_hide_algoid" + } + }, { "__struct_id": 0, "NAME": { @@ -10270,6 +10281,17 @@ "value": 12938 } }, + { + "__struct_id": 0, + "NAME": { + "type": "cexostring", + "value": "Myconid Hide" + }, + "RESREF": { + "type": "resref", + "value": "prc_hide_myconid" + } + }, { "__struct_id": 0, "RESREF": { @@ -10930,6 +10952,17 @@ "value": "cr_hide_shamb001" } }, + { + "__struct_id": 0, + "NAME": { + "type": "cexostring", + "value": "Shambling Mound Hide" + }, + "RESREF": { + "type": "resref", + "value": "prc_hide_shambmd" + } + }, { "__struct_id": 0, "NAME": { @@ -11639,6 +11672,17 @@ "LIST": { "type": "list", "value": [ + { + "__struct_id": 0, + "NAME": { + "type": "cexostring", + "value": "Algoid Slam" + }, + "RESREF": { + "type": "resref", + "value": "prc_slam_algoid" + } + }, { "__struct_id": 0, "NAME": { @@ -15058,50 +15102,6 @@ "value": 16807438 } }, - { - "__struct_id": 0, - "NAME": { - "type": "cexostring", - "value": "Mug of Ale" - }, - "RESREF": { - "type": "resref", - "value": "zep_mug_01" - } - }, - { - "__struct_id": 0, - "NAME": { - "type": "cexostring", - "value": "Mug of Ale" - }, - "RESREF": { - "type": "resref", - "value": "zep_mug_02" - } - }, - { - "__struct_id": 0, - "NAME": { - "type": "cexostring", - "value": "Mug of Ale" - }, - "RESREF": { - "type": "resref", - "value": "zep_mug_03" - } - }, - { - "__struct_id": 0, - "NAME": { - "type": "cexostring", - "value": "Mug of Ale" - }, - "RESREF": { - "type": "resref", - "value": "zep_mug_04" - } - }, { "__struct_id": 0, "RESREF": { @@ -38885,17 +38885,6 @@ "value": "prc_wol_calad" } }, - { - "__struct_id": 0, - "NAME": { - "type": "cexostring", - "value": "Eagle Claw" - }, - "RESREF": { - "type": "resref", - "value": "eagleclaw" - } - }, { "__struct_id": 0, "NAME": { @@ -39133,17 +39122,6 @@ "value": "wblmcl003" } }, - { - "__struct_id": 0, - "NAME": { - "type": "cexostring", - "value": "Femur Club" - }, - "RESREF": { - "type": "resref", - "value": "zep_clfemur_001" - } - }, { "__struct_id": 0, "RESREF": { @@ -39467,17 +39445,6 @@ "value": "prc_eldrtch_glv" } }, - { - "__struct_id": 0, - "NAME": { - "type": "cexostring", - "value": "Heavy Mace" - }, - "RESREF": { - "type": "resref", - "value": "heavy_mace" - } - }, { "__struct_id": 0, "NAME": { diff --git a/_module/itp/placeablepalcus.itp.json b/_module/itp/placeablepalcus.itp.json index 5ec9f0a5..0b4f63ee 100644 --- a/_module/itp/placeablepalcus.itp.json +++ b/_module/itp/placeablepalcus.itp.json @@ -15392,6 +15392,17 @@ "value": 16811614 } }, + { + "__struct_id": 0, + "NAME": { + "type": "cexostring", + "value": "Tree, Fallen 1" + }, + "RESREF": { + "type": "resref", + "value": "blueprint008" + } + }, { "__struct_id": 0, "RESREF": { @@ -19366,6 +19377,17 @@ "value": 16811648 } }, + { + "__struct_id": 0, + "NAME": { + "type": "cexostring", + "value": "Ore" + }, + "RESREF": { + "type": "resref", + "value": "ore" + } + }, { "__struct_id": 0, "RESREF": { diff --git a/_module/ncs/10abeholderp1.ncs b/_module/ncs/10abeholderp1.ncs index 9e455287..fe15e750 100644 Binary files a/_module/ncs/10abeholderp1.ncs and b/_module/ncs/10abeholderp1.ncs differ diff --git a/_module/ncs/10abeholderp2.ncs b/_module/ncs/10abeholderp2.ncs index f854351b..65dcb85e 100644 Binary files a/_module/ncs/10abeholderp2.ncs and b/_module/ncs/10abeholderp2.ncs differ diff --git a/_module/ncs/10aboat.ncs b/_module/ncs/10aboat.ncs index 69fcbf61..725f1b51 100644 Binary files a/_module/ncs/10aboat.ncs and b/_module/ncs/10aboat.ncs differ diff --git a/_module/ncs/10aboat1.ncs b/_module/ncs/10aboat1.ncs index aa35e60e..79de2e34 100644 Binary files a/_module/ncs/10aboat1.ncs and b/_module/ncs/10aboat1.ncs differ diff --git a/_module/ncs/10ariver1.ncs b/_module/ncs/10ariver1.ncs index c8be58a3..78e8c78b 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 840106aa..53f8da2c 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 76242cdc..b7721f59 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 b3ff4701..5113f06b 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 a5237855..216fa3a8 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 393cfb84..d34d152c 100644 Binary files a/_module/ncs/10ariver6.ncs and b/_module/ncs/10ariver6.ncs differ diff --git a/_module/ncs/10asmlaked1.ncs b/_module/ncs/10asmlaked1.ncs index d66c1773..7cff340d 100644 Binary files a/_module/ncs/10asmlaked1.ncs and b/_module/ncs/10asmlaked1.ncs differ diff --git a/_module/ncs/10asmlaked2.ncs b/_module/ncs/10asmlaked2.ncs index 1fb21133..9d046900 100644 Binary files a/_module/ncs/10asmlaked2.ncs and b/_module/ncs/10asmlaked2.ncs differ diff --git a/_module/ncs/10ato11.ncs b/_module/ncs/10ato11.ncs index 9eb342e8..44f5acb4 100644 Binary files a/_module/ncs/10ato11.ncs and b/_module/ncs/10ato11.ncs differ diff --git a/_module/ncs/10ato9a.ncs b/_module/ncs/10ato9a.ncs index 2aaf32ec..09c68844 100644 Binary files a/_module/ncs/10ato9a.ncs and b/_module/ncs/10ato9a.ncs differ diff --git a/_module/ncs/10to13a.ncs b/_module/ncs/10to13a.ncs index c65d4f2d..ea8d9eb4 100644 Binary files a/_module/ncs/10to13a.ncs and b/_module/ncs/10to13a.ncs differ diff --git a/_module/ncs/11dive1.ncs b/_module/ncs/11dive1.ncs index e3a01f54..a44f97d2 100644 Binary files a/_module/ncs/11dive1.ncs and b/_module/ncs/11dive1.ncs differ diff --git a/_module/ncs/11dive2.ncs b/_module/ncs/11dive2.ncs index bf15e73d..d8fcd253 100644 Binary files a/_module/ncs/11dive2.ncs and b/_module/ncs/11dive2.ncs differ diff --git a/_module/ncs/11diving.ncs b/_module/ncs/11diving.ncs index 9327d25a..ecab1310 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 74eaee71..1feab3ef 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 d2ecf949..19a30f46 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 e751fae9..ef81c871 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 555c14e1..2831aac3 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 3df36a1e..efb82e8e 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 5a12c92e..4b667b58 100644 Binary files a/_module/ncs/11river4.ncs and b/_module/ncs/11river4.ncs differ diff --git a/_module/ncs/11to10a.ncs b/_module/ncs/11to10a.ncs index 95c8c16e..bd96ed3f 100644 Binary files a/_module/ncs/11to10a.ncs and b/_module/ncs/11to10a.ncs differ diff --git a/_module/ncs/12aboat2.ncs b/_module/ncs/12aboat2.ncs index 64cf844c..3f0d7cd6 100644 Binary files a/_module/ncs/12aboat2.ncs and b/_module/ncs/12aboat2.ncs differ diff --git a/_module/ncs/12acyc2.ncs b/_module/ncs/12acyc2.ncs index 33db83e1..1f235a71 100644 Binary files a/_module/ncs/12acyc2.ncs and b/_module/ncs/12acyc2.ncs differ diff --git a/_module/ncs/12ahermit1.ncs b/_module/ncs/12ahermit1.ncs index d4cee795..2ba4d89a 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 3fd9cd6d..e4b26f4f 100644 Binary files a/_module/ncs/12ahermit2.ncs and b/_module/ncs/12ahermit2.ncs differ diff --git a/_module/ncs/12dive1.ncs b/_module/ncs/12dive1.ncs index d591fc3f..d4370e47 100644 Binary files a/_module/ncs/12dive1.ncs and b/_module/ncs/12dive1.ncs differ diff --git a/_module/ncs/12dive2.ncs b/_module/ncs/12dive2.ncs index 9f245c80..d7546464 100644 Binary files a/_module/ncs/12dive2.ncs and b/_module/ncs/12dive2.ncs differ diff --git a/_module/ncs/12totarpit.ncs b/_module/ncs/12totarpit.ncs index f334afcd..02a24533 100644 Binary files a/_module/ncs/12totarpit.ncs and b/_module/ncs/12totarpit.ncs differ diff --git a/_module/ncs/14to5.ncs b/_module/ncs/14to5.ncs index 8ac552c8..8f23898d 100644 Binary files a/_module/ncs/14to5.ncs and b/_module/ncs/14to5.ncs differ diff --git a/_module/ncs/15to13.ncs b/_module/ncs/15to13.ncs index 3cf89501..c32886b2 100644 Binary files a/_module/ncs/15to13.ncs and b/_module/ncs/15to13.ncs differ diff --git a/_module/ncs/1riverto9.ncs b/_module/ncs/1riverto9.ncs index 9b6b6c23..072485aa 100644 Binary files a/_module/ncs/1riverto9.ncs and b/_module/ncs/1riverto9.ncs differ diff --git a/_module/ncs/3aholedoor.ncs b/_module/ncs/3aholedoor.ncs index fc89e467..d7aeb7b5 100644 Binary files a/_module/ncs/3aholedoor.ncs and b/_module/ncs/3aholedoor.ncs differ diff --git a/_module/ncs/3ato6a.ncs b/_module/ncs/3ato6a.ncs index 073cd88d..2c70d7f9 100644 Binary files a/_module/ncs/3ato6a.ncs and b/_module/ncs/3ato6a.ncs differ diff --git a/_module/ncs/3fireperround.ncs b/_module/ncs/3fireperround.ncs index 2ad62885..3e0d827f 100644 Binary files a/_module/ncs/3fireperround.ncs and b/_module/ncs/3fireperround.ncs differ diff --git a/_module/ncs/3holesdoor.ncs b/_module/ncs/3holesdoor.ncs index e5b3dc57..23dc00fd 100644 Binary files a/_module/ncs/3holesdoor.ncs and b/_module/ncs/3holesdoor.ncs differ diff --git a/_module/ncs/3holesdoor2.ncs b/_module/ncs/3holesdoor2.ncs index 922bc8a9..039bca69 100644 Binary files a/_module/ncs/3holesdoor2.ncs and b/_module/ncs/3holesdoor2.ncs differ diff --git a/_module/ncs/3statsspawndoor.ncs b/_module/ncs/3statsspawndoor.ncs index 848330f1..37083db1 100644 Binary files a/_module/ncs/3statsspawndoor.ncs and b/_module/ncs/3statsspawndoor.ncs differ diff --git a/_module/ncs/3statued.ncs b/_module/ncs/3statued.ncs index a8587c77..e87187b4 100644 Binary files a/_module/ncs/3statued.ncs and b/_module/ncs/3statued.ncs differ diff --git a/_module/ncs/3statuesid1.ncs b/_module/ncs/3statuesid1.ncs index c39d9b09..7da7814a 100644 Binary files a/_module/ncs/3statuesid1.ncs and b/_module/ncs/3statuesid1.ncs differ diff --git a/_module/ncs/3statuesid2.ncs b/_module/ncs/3statuesid2.ncs index aa18d976..d400bbac 100644 Binary files a/_module/ncs/3statuesid2.ncs and b/_module/ncs/3statuesid2.ncs differ diff --git a/_module/ncs/3statuesid3.ncs b/_module/ncs/3statuesid3.ncs index ab816019..8c5a68c2 100644 Binary files a/_module/ncs/3statuesid3.ncs and b/_module/ncs/3statuesid3.ncs differ diff --git a/_module/ncs/3statuesidx.ncs b/_module/ncs/3statuesidx.ncs index 16cdbc0c..af5c16ee 100644 Binary files a/_module/ncs/3statuesidx.ncs and b/_module/ncs/3statuesidx.ncs differ diff --git a/_module/ncs/4ae.ncs b/_module/ncs/4ae.ncs index c84e4a2d..1f57abc4 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 1f6cb532..9afe05c7 100644 Binary files a/_module/ncs/4ariver1.ncs and b/_module/ncs/4ariver1.ncs differ diff --git a/_module/ncs/4ato7a.ncs b/_module/ncs/4ato7a.ncs index 652d4edd..11052900 100644 Binary files a/_module/ncs/4ato7a.ncs and b/_module/ncs/4ato7a.ncs differ diff --git a/_module/ncs/4aw.ncs b/_module/ncs/4aw.ncs index 7cafdb8c..078ba3f4 100644 Binary files a/_module/ncs/4aw.ncs and b/_module/ncs/4aw.ncs differ diff --git a/_module/ncs/5to14.ncs b/_module/ncs/5to14.ncs index 636d2c3c..d6f16c7e 100644 Binary files a/_module/ncs/5to14.ncs and b/_module/ncs/5to14.ncs differ diff --git a/_module/ncs/5to14jump.ncs b/_module/ncs/5to14jump.ncs index 636d2c3c..d6f16c7e 100644 Binary files a/_module/ncs/5to14jump.ncs and b/_module/ncs/5to14jump.ncs differ diff --git a/_module/ncs/69_client_enter.ncs b/_module/ncs/69_client_enter.ncs index 237c867c..a3ba116d 100644 Binary files a/_module/ncs/69_client_enter.ncs and b/_module/ncs/69_client_enter.ncs differ diff --git a/_module/ncs/69_client_exit.ncs b/_module/ncs/69_client_exit.ncs index 29d4b2c5..28e69858 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 ab9b5f77..f7b40749 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 c25706dc..b40c6ae0 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 bb23168b..1f82bc60 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 58d08801..8587449c 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_hen_spawnin.ncs b/_module/ncs/69_hen_spawnin.ncs index b454ebf9..f781b263 100644 Binary files a/_module/ncs/69_hen_spawnin.ncs and b/_module/ncs/69_hen_spawnin.ncs differ diff --git a/_module/ncs/69_hench_canlvl.ncs b/_module/ncs/69_hench_canlvl.ncs index 5e5593ea..d1e1aab5 100644 Binary files a/_module/ncs/69_hench_canlvl.ncs and b/_module/ncs/69_hench_canlvl.ncs differ diff --git a/_module/ncs/69_hench_crtrno1.ncs b/_module/ncs/69_hench_crtrno1.ncs index f349f49f..56f6bcec 100644 Binary files a/_module/ncs/69_hench_crtrno1.ncs and b/_module/ncs/69_hench_crtrno1.ncs differ diff --git a/_module/ncs/69_hench_crtrno2.ncs b/_module/ncs/69_hench_crtrno2.ncs index f49aba8f..4d48b469 100644 Binary files a/_module/ncs/69_hench_crtrno2.ncs and b/_module/ncs/69_hench_crtrno2.ncs differ diff --git a/_module/ncs/69_hench_crtrye1.ncs b/_module/ncs/69_hench_crtrye1.ncs index f17cb1d4..b8f5c493 100644 Binary files a/_module/ncs/69_hench_crtrye1.ncs and b/_module/ncs/69_hench_crtrye1.ncs differ diff --git a/_module/ncs/69_hench_crtrye2.ncs b/_module/ncs/69_hench_crtrye2.ncs index dcecffc3..23960992 100644 Binary files a/_module/ncs/69_hench_crtrye2.ncs and b/_module/ncs/69_hench_crtrye2.ncs differ diff --git a/_module/ncs/69_hench_destobj.ncs b/_module/ncs/69_hench_destobj.ncs index 9ee294cc..b57fd4f5 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_didie.ncs b/_module/ncs/69_hench_didie.ncs index dddac67a..3a1ef5e7 100644 Binary files a/_module/ncs/69_hench_didie.ncs and b/_module/ncs/69_hench_didie.ncs differ diff --git a/_module/ncs/69_hench_eqmelee.ncs b/_module/ncs/69_hench_eqmelee.ncs index 2f88224a..19de2583 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_eqrange.ncs b/_module/ncs/69_hench_eqrange.ncs index e7b5fd8f..8dd69f3f 100644 Binary files a/_module/ncs/69_hench_eqrange.ncs and b/_module/ncs/69_hench_eqrange.ncs differ diff --git a/_module/ncs/69_hench_eqswap.ncs b/_module/ncs/69_hench_eqswap.ncs index e45fb155..0a8d2013 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 69ac20b6..41c39faf 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_fired.ncs b/_module/ncs/69_hench_fired.ncs index 1ed997dc..0c843a5a 100644 Binary files a/_module/ncs/69_hench_fired.ncs and b/_module/ncs/69_hench_fired.ncs differ diff --git a/_module/ncs/69_hench_gomelee.ncs b/_module/ncs/69_hench_gomelee.ncs index cd20e419..de53e93f 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_gorange.ncs b/_module/ncs/69_hench_gorange.ncs index 93fb7531..a7ebb2e2 100644 Binary files a/_module/ncs/69_hench_gorange.ncs and b/_module/ncs/69_hench_gorange.ncs differ diff --git a/_module/ncs/69_hench_heall.ncs b/_module/ncs/69_hench_heall.ncs index cb3e2357..759d716a 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 085c42a1..9650e91e 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_identfy.ncs b/_module/ncs/69_hench_identfy.ncs index bcd3e24d..576f9869 100644 Binary files a/_module/ncs/69_hench_identfy.ncs and b/_module/ncs/69_hench_identfy.ncs differ diff --git a/_module/ncs/69_hench_pickup.ncs b/_module/ncs/69_hench_pickup.ncs index c3a79cef..a57a271c 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 ca518b02..87ba8392 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_rangeno.ncs b/_module/ncs/69_hench_rangeno.ncs index 1418dab5..abade2d1 100644 Binary files a/_module/ncs/69_hench_rangeno.ncs and b/_module/ncs/69_hench_rangeno.ncs differ diff --git a/_module/ncs/69_hench_rangeye.ncs b/_module/ncs/69_hench_rangeye.ncs index 9939650b..e6a1f6f7 100644 Binary files a/_module/ncs/69_hench_rangeye.ncs and b/_module/ncs/69_hench_rangeye.ncs differ diff --git a/_module/ncs/69_hench_scout1.ncs b/_module/ncs/69_hench_scout1.ncs index 9ebcf906..ae39c9dd 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 d5ef50bb..f45b2cf6 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 e63bb31d..16aaacbb 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_hench_switchn.ncs b/_module/ncs/69_hench_switchn.ncs index 6ad5c38a..c7a5c8cf 100644 Binary files a/_module/ncs/69_hench_switchn.ncs and b/_module/ncs/69_hench_switchn.ncs differ diff --git a/_module/ncs/69_hench_whatxp.ncs b/_module/ncs/69_hench_whatxp.ncs index d45d4cf1..ecf8b796 100644 Binary files a/_module/ncs/69_hench_whatxp.ncs and b/_module/ncs/69_hench_whatxp.ncs differ diff --git a/_module/ncs/69_henchrt_enter.ncs b/_module/ncs/69_henchrt_enter.ncs index 6d915970..bd251035 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 6a56ca64..4df0b27d 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 02ae46d1..6457d19a 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 2d9d436f..7df1e15c 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 0d5574bc..f2fa8934 100644 Binary files a/_module/ncs/69_o0_dying.ncs and b/_module/ncs/69_o0_dying.ncs differ diff --git a/_module/ncs/69_o0_levelup.ncs b/_module/ncs/69_o0_levelup.ncs index 4a29017f..6196a822 100644 Binary files a/_module/ncs/69_o0_levelup.ncs and b/_module/ncs/69_o0_levelup.ncs differ diff --git a/_module/ncs/69_oe_attckmastr.ncs b/_module/ncs/69_oe_attckmastr.ncs index 25cfe05b..4bbf0ddb 100644 Binary files a/_module/ncs/69_oe_attckmastr.ncs and b/_module/ncs/69_oe_attckmastr.ncs differ diff --git a/_module/ncs/69_onactivate.ncs b/_module/ncs/69_onactivate.ncs index 7c94b1a5..27fe42e5 100644 Binary files a/_module/ncs/69_onactivate.ncs and b/_module/ncs/69_onactivate.ncs differ diff --git a/_module/ncs/6ato10a.ncs b/_module/ncs/6ato10a.ncs index f1b2cbc5..810fb92d 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 89c03d5d..2cd79ed8 100644 Binary files a/_module/ncs/6ato3a.ncs and b/_module/ncs/6ato3a.ncs differ diff --git a/_module/ncs/6ato8.ncs b/_module/ncs/6ato8.ncs index 0bd084cc..64b6b6ab 100644 Binary files a/_module/ncs/6ato8.ncs and b/_module/ncs/6ato8.ncs differ diff --git a/_module/ncs/6to10a.ncs b/_module/ncs/6to10a.ncs index 60f1d474..a958b1ad 100644 Binary files a/_module/ncs/6to10a.ncs and b/_module/ncs/6to10a.ncs differ diff --git a/_module/ncs/6towaterroute.ncs b/_module/ncs/6towaterroute.ncs index a4af82f7..d7027b31 100644 Binary files a/_module/ncs/6towaterroute.ncs and b/_module/ncs/6towaterroute.ncs differ diff --git a/_module/ncs/6towaterroute2.ncs b/_module/ncs/6towaterroute2.ncs index bed473c2..ca10adec 100644 Binary files a/_module/ncs/6towaterroute2.ncs and b/_module/ncs/6towaterroute2.ncs differ diff --git a/_module/ncs/7asect1.ncs b/_module/ncs/7asect1.ncs index fff15882..8ce572cc 100644 Binary files a/_module/ncs/7asect1.ncs and b/_module/ncs/7asect1.ncs differ diff --git a/_module/ncs/7asect2.ncs b/_module/ncs/7asect2.ncs index 78d04023..fbc8d0cd 100644 Binary files a/_module/ncs/7asect2.ncs and b/_module/ncs/7asect2.ncs differ diff --git a/_module/ncs/7cryptport.ncs b/_module/ncs/7cryptport.ncs index 1e563d7c..b4215d66 100644 Binary files a/_module/ncs/7cryptport.ncs and b/_module/ncs/7cryptport.ncs differ diff --git a/_module/ncs/7doortodes.ncs b/_module/ncs/7doortodes.ncs index 4eb926c6..f882eab9 100644 Binary files a/_module/ncs/7doortodes.ncs and b/_module/ncs/7doortodes.ncs differ diff --git a/_module/ncs/7portbard.ncs b/_module/ncs/7portbard.ncs index faa11053..84bc5861 100644 Binary files a/_module/ncs/7portbard.ncs and b/_module/ncs/7portbard.ncs differ diff --git a/_module/ncs/7to11a.ncs b/_module/ncs/7to11a.ncs index be3fa1e1..b82c074d 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 f7f206f1..d6e74013 100644 Binary files a/_module/ncs/7to12.ncs and b/_module/ncs/7to12.ncs differ diff --git a/_module/ncs/8lakeuprope.ncs b/_module/ncs/8lakeuprope.ncs index c8446bc1..1559ba33 100644 Binary files a/_module/ncs/8lakeuprope.ncs and b/_module/ncs/8lakeuprope.ncs differ diff --git a/_module/ncs/8port6a.ncs b/_module/ncs/8port6a.ncs index e79cf2a8..2b91376b 100644 Binary files a/_module/ncs/8port6a.ncs and b/_module/ncs/8port6a.ncs differ diff --git a/_module/ncs/8river1.ncs b/_module/ncs/8river1.ncs index 8410af24..6715acce 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 4c47c1c5..201fda3a 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 07da4af0..db69b3bf 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 37f2dd67..2af7390d 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 ad97fc1e..6d678af9 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 5047138d..0117f2c4 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 22e73902..9ee8853a 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 be3391d9..342911de 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 f2004376..2b37d33d 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 e18b5e8a..c199052d 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 b935c21f..35566d7d 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 a6046632..f96a4c04 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 7d927e6f..15628ef1 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 12c85479..54c87056 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 c339e888..1843037e 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 79d9370a..fbf91ce7 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 12748e4b..6ee6a74b 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 24ecec97..053000b1 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 416be22e..ab641a00 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 0d15148d..1ef3eeb7 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 1bb8bd5d..15203b73 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 cf487d74..1660d426 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 0e5eeb62..371634d2 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 e67961d7..24c658e8 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 25099d41..ca849bce 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 ad5b0d07..551648df 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 a1342cd6..f14186ef 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 52c6e802..2dfb4520 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 e26e389b..08e700ef 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 c1af25c8..598851e6 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 4a94a0bb..b127aaa2 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 c093e162..b178d3fe 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 729ab5c8..cdcce63c 100644 Binary files a/_module/ncs/9bdive3.ncs and b/_module/ncs/9bdive3.ncs differ diff --git a/_module/ncs/9bdive4.ncs b/_module/ncs/9bdive4.ncs index 502adcec..57f0f0af 100644 Binary files a/_module/ncs/9bdive4.ncs and b/_module/ncs/9bdive4.ncs differ diff --git a/_module/ncs/9bdive5.ncs b/_module/ncs/9bdive5.ncs index 70dea95a..2d98d2d4 100644 Binary files a/_module/ncs/9bdive5.ncs and b/_module/ncs/9bdive5.ncs differ diff --git a/_module/ncs/9bdive6.ncs b/_module/ncs/9bdive6.ncs index fc6fd3e2..085969fe 100644 Binary files a/_module/ncs/9bdive6.ncs and b/_module/ncs/9bdive6.ncs differ diff --git a/_module/ncs/9bportntos.ncs b/_module/ncs/9bportntos.ncs index dae08107..8eb7b3cc 100644 Binary files a/_module/ncs/9bportntos.ncs and b/_module/ncs/9bportntos.ncs differ diff --git a/_module/ncs/9bportston.ncs b/_module/ncs/9bportston.ncs index b714a66f..1ca7dd76 100644 Binary files a/_module/ncs/9bportston.ncs and b/_module/ncs/9bportston.ncs differ diff --git a/_module/ncs/9briver1.ncs b/_module/ncs/9briver1.ncs index 6ca48cbc..3c361890 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 7affdb42..3a8208c6 100644 Binary files a/_module/ncs/9briver2.ncs and b/_module/ncs/9briver2.ncs differ diff --git a/_module/ncs/9btowp.ncs b/_module/ncs/9btowp.ncs index a45530c0..5245556c 100644 Binary files a/_module/ncs/9btowp.ncs and b/_module/ncs/9btowp.ncs differ diff --git a/_module/ncs/9bvrock.ncs b/_module/ncs/9bvrock.ncs index e704851c..62658574 100644 Binary files a/_module/ncs/9bvrock.ncs and b/_module/ncs/9bvrock.ncs differ diff --git a/_module/ncs/9bvrokdive.ncs b/_module/ncs/9bvrokdive.ncs index b976204f..23e47fbd 100644 Binary files a/_module/ncs/9bvrokdive.ncs and b/_module/ncs/9bvrokdive.ncs differ diff --git a/_module/ncs/SetAppearancecon.ncs b/_module/ncs/SetAppearancecon.ncs index efa6930b..d05b9557 100644 Binary files a/_module/ncs/SetAppearancecon.ncs and b/_module/ncs/SetAppearancecon.ncs differ diff --git a/_module/ncs/ab_desctrig_fnf.ncs b/_module/ncs/ab_desctrig_fnf.ncs index 72cb889b..a26f00ca 100644 Binary files a/_module/ncs/ab_desctrig_fnf.ncs and b/_module/ncs/ab_desctrig_fnf.ncs differ diff --git a/_module/ncs/ab_desctrig_mult.ncs b/_module/ncs/ab_desctrig_mult.ncs index a85b0647..c5d1e73a 100644 Binary files a/_module/ncs/ab_desctrig_mult.ncs and b/_module/ncs/ab_desctrig_mult.ncs differ diff --git a/_module/ncs/acid_cloud1.ncs b/_module/ncs/acid_cloud1.ncs index 38ab5f5f..b3876bab 100644 Binary files a/_module/ncs/acid_cloud1.ncs and b/_module/ncs/acid_cloud1.ncs differ diff --git a/_module/ncs/acid_cloud2.ncs b/_module/ncs/acid_cloud2.ncs index 3c8e3fba..f4cb2180 100644 Binary files a/_module/ncs/acid_cloud2.ncs and b/_module/ncs/acid_cloud2.ncs differ diff --git a/_module/ncs/acid_cloud_aura.ncs b/_module/ncs/acid_cloud_aura.ncs index f31eb7b3..16449d22 100644 Binary files a/_module/ncs/acid_cloud_aura.ncs and b/_module/ncs/acid_cloud_aura.ncs differ diff --git a/_module/ncs/advanced_ai.ncs b/_module/ncs/advanced_ai.ncs index 5a13b8da..6463ed66 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 28d0459f..82c5e604 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 a341bca6..a6f96630 100644 Binary files a/_module/ncs/agypyramid.ncs and b/_module/ncs/agypyramid.ncs differ diff --git a/_module/ncs/airlessaura.ncs b/_module/ncs/airlessaura.ncs index 5ce8c6d4..78fff536 100644 Binary files a/_module/ncs/airlessaura.ncs and b/_module/ncs/airlessaura.ncs differ diff --git a/_module/ncs/airlessaura2.ncs b/_module/ncs/airlessaura2.ncs index b2cf9062..c6cd2997 100644 Binary files a/_module/ncs/airlessaura2.ncs and b/_module/ncs/airlessaura2.ncs differ diff --git a/_module/ncs/anaxim_ai.ncs b/_module/ncs/anaxim_ai.ncs index 9e38868e..0cd1a9e9 100644 Binary files a/_module/ncs/anaxim_ai.ncs and b/_module/ncs/anaxim_ai.ncs differ diff --git a/_module/ncs/angelofdecay_ai.ncs b/_module/ncs/angelofdecay_ai.ncs index 59deb97d..3a6928d6 100644 Binary files a/_module/ncs/angelofdecay_ai.ncs and b/_module/ncs/angelofdecay_ai.ncs differ diff --git a/_module/ncs/aod_hb.ncs b/_module/ncs/aod_hb.ncs index f49e1eb7..af568d59 100644 Binary files a/_module/ncs/aod_hb.ncs and b/_module/ncs/aod_hb.ncs differ diff --git a/_module/ncs/aodrottingtouch.ncs b/_module/ncs/aodrottingtouch.ncs index 83e7408e..153419a5 100644 Binary files a/_module/ncs/aodrottingtouch.ncs and b/_module/ncs/aodrottingtouch.ncs differ diff --git a/_module/ncs/ar_barredoor_f2o.ncs b/_module/ncs/ar_barredoor_f2o.ncs index f55c0fec..4eaa0bf4 100644 Binary files a/_module/ncs/ar_barredoor_f2o.ncs and b/_module/ncs/ar_barredoor_f2o.ncs differ diff --git a/_module/ncs/array_example.ncs b/_module/ncs/array_example.ncs new file mode 100644 index 00000000..4515ec5d Binary files /dev/null and b/_module/ncs/array_example.ncs differ diff --git a/_module/ncs/at_001.ncs b/_module/ncs/at_001.ncs index 41fed16c..b3d755d5 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 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_002.ncs and b/_module/ncs/at_002.ncs differ diff --git a/_module/ncs/at_003.ncs b/_module/ncs/at_003.ncs index 91c01315..96373e6e 100644 Binary files a/_module/ncs/at_003.ncs and b/_module/ncs/at_003.ncs differ diff --git a/_module/ncs/at_004.ncs b/_module/ncs/at_004.ncs index 5b28f5a3..72491cf3 100644 Binary files a/_module/ncs/at_004.ncs and b/_module/ncs/at_004.ncs differ diff --git a/_module/ncs/at_005.ncs b/_module/ncs/at_005.ncs index 946f6d54..cad684c5 100644 Binary files a/_module/ncs/at_005.ncs and b/_module/ncs/at_005.ncs differ diff --git a/_module/ncs/at_006.ncs b/_module/ncs/at_006.ncs index bd2bd6b6..a3d6d7a4 100644 Binary files a/_module/ncs/at_006.ncs and b/_module/ncs/at_006.ncs differ diff --git a/_module/ncs/at_007.ncs b/_module/ncs/at_007.ncs index 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_010.ncs and b/_module/ncs/at_010.ncs differ diff --git a/_module/ncs/at_018.ncs b/_module/ncs/at_018.ncs index 5b28f5a3..72491cf3 100644 Binary files a/_module/ncs/at_018.ncs and b/_module/ncs/at_018.ncs differ diff --git a/_module/ncs/at_019.ncs b/_module/ncs/at_019.ncs index 41fed16c..b3d755d5 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 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_020.ncs and b/_module/ncs/at_020.ncs differ diff --git a/_module/ncs/at_023.ncs b/_module/ncs/at_023.ncs index d3bff2eb..d9994bf6 100644 Binary files a/_module/ncs/at_023.ncs and b/_module/ncs/at_023.ncs differ diff --git a/_module/ncs/at_024.ncs b/_module/ncs/at_024.ncs index 41fed16c..b3d755d5 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 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_025.ncs and b/_module/ncs/at_025.ncs differ diff --git a/_module/ncs/at_029.ncs b/_module/ncs/at_029.ncs index 5b715727..20259ab8 100644 Binary files a/_module/ncs/at_029.ncs and b/_module/ncs/at_029.ncs differ diff --git a/_module/ncs/at_032.ncs b/_module/ncs/at_032.ncs index 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_037.ncs and b/_module/ncs/at_037.ncs differ diff --git a/_module/ncs/at_038.ncs b/_module/ncs/at_038.ncs index 0a444afe..eae58508 100644 Binary files a/_module/ncs/at_038.ncs and b/_module/ncs/at_038.ncs differ diff --git a/_module/ncs/at_040.ncs b/_module/ncs/at_040.ncs index 5b715727..20259ab8 100644 Binary files a/_module/ncs/at_040.ncs and b/_module/ncs/at_040.ncs differ diff --git a/_module/ncs/at_043.ncs b/_module/ncs/at_043.ncs index 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_049.ncs and b/_module/ncs/at_049.ncs differ diff --git a/_module/ncs/at_051.ncs b/_module/ncs/at_051.ncs index 192b5fba..80662115 100644 Binary files a/_module/ncs/at_051.ncs and b/_module/ncs/at_051.ncs differ diff --git a/_module/ncs/at_052.ncs b/_module/ncs/at_052.ncs index 35f4b759..2a3c4a39 100644 Binary files a/_module/ncs/at_052.ncs and b/_module/ncs/at_052.ncs differ diff --git a/_module/ncs/at_053.ncs b/_module/ncs/at_053.ncs index d1d771f9..5d14edf6 100644 Binary files a/_module/ncs/at_053.ncs and b/_module/ncs/at_053.ncs differ diff --git a/_module/ncs/at_054.ncs b/_module/ncs/at_054.ncs index 082b1168..480e2a13 100644 Binary files a/_module/ncs/at_054.ncs and b/_module/ncs/at_054.ncs differ diff --git a/_module/ncs/at_055.ncs b/_module/ncs/at_055.ncs index b3f7dbe2..5199f65a 100644 Binary files a/_module/ncs/at_055.ncs and b/_module/ncs/at_055.ncs differ diff --git a/_module/ncs/at_056.ncs b/_module/ncs/at_056.ncs index 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_064.ncs and b/_module/ncs/at_064.ncs differ diff --git a/_module/ncs/at_066.ncs b/_module/ncs/at_066.ncs index 355e3e76..5bf21749 100644 Binary files a/_module/ncs/at_066.ncs and b/_module/ncs/at_066.ncs differ diff --git a/_module/ncs/at_069.ncs b/_module/ncs/at_069.ncs index 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_082.ncs and b/_module/ncs/at_082.ncs differ diff --git a/_module/ncs/at_083.ncs b/_module/ncs/at_083.ncs index bd2bd6b6..a3d6d7a4 100644 Binary files a/_module/ncs/at_083.ncs and b/_module/ncs/at_083.ncs differ diff --git a/_module/ncs/at_085.ncs b/_module/ncs/at_085.ncs index c8d1ef30..72e37f95 100644 Binary files a/_module/ncs/at_085.ncs and b/_module/ncs/at_085.ncs differ diff --git a/_module/ncs/at_086.ncs b/_module/ncs/at_086.ncs index 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_089.ncs and b/_module/ncs/at_089.ncs differ diff --git a/_module/ncs/at_091.ncs b/_module/ncs/at_091.ncs index 530ea97a..5ca1792d 100644 Binary files a/_module/ncs/at_091.ncs and b/_module/ncs/at_091.ncs differ diff --git a/_module/ncs/at_093.ncs b/_module/ncs/at_093.ncs index 69099533..8144bfef 100644 Binary files a/_module/ncs/at_093.ncs and b/_module/ncs/at_093.ncs differ diff --git a/_module/ncs/at_094.ncs b/_module/ncs/at_094.ncs index 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_113.ncs and b/_module/ncs/at_113.ncs differ diff --git a/_module/ncs/at_115.ncs b/_module/ncs/at_115.ncs index 09fbfadf..59c364f4 100644 Binary files a/_module/ncs/at_115.ncs and b/_module/ncs/at_115.ncs differ diff --git a/_module/ncs/at_120.ncs b/_module/ncs/at_120.ncs index 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_127.ncs and b/_module/ncs/at_127.ncs differ diff --git a/_module/ncs/at_129.ncs b/_module/ncs/at_129.ncs index a0d46f21..da6ee3c1 100644 Binary files a/_module/ncs/at_129.ncs and b/_module/ncs/at_129.ncs differ diff --git a/_module/ncs/at_130.ncs b/_module/ncs/at_130.ncs index 5f5d214e..cc1ac3a7 100644 Binary files a/_module/ncs/at_130.ncs and b/_module/ncs/at_130.ncs differ diff --git a/_module/ncs/at_131.ncs b/_module/ncs/at_131.ncs index 342559cf..8488b3f0 100644 Binary files a/_module/ncs/at_131.ncs and b/_module/ncs/at_131.ncs differ diff --git a/_module/ncs/at_132.ncs b/_module/ncs/at_132.ncs index bf87a3f4..8ff66ed5 100644 Binary files a/_module/ncs/at_132.ncs and b/_module/ncs/at_132.ncs differ diff --git a/_module/ncs/at_133.ncs b/_module/ncs/at_133.ncs index 2b6ef7b5..0c7bd21b 100644 Binary files a/_module/ncs/at_133.ncs and b/_module/ncs/at_133.ncs differ diff --git a/_module/ncs/at_134.ncs b/_module/ncs/at_134.ncs index 56057495..ad96c830 100644 Binary files a/_module/ncs/at_134.ncs and b/_module/ncs/at_134.ncs differ diff --git a/_module/ncs/at_136.ncs b/_module/ncs/at_136.ncs index f4c4b68e..59a40d17 100644 Binary files a/_module/ncs/at_136.ncs and b/_module/ncs/at_136.ncs differ diff --git a/_module/ncs/at_137.ncs b/_module/ncs/at_137.ncs index 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_137.ncs and b/_module/ncs/at_137.ncs differ diff --git a/_module/ncs/at_138.ncs b/_module/ncs/at_138.ncs index ae24306a..7181ace5 100644 Binary files a/_module/ncs/at_138.ncs and b/_module/ncs/at_138.ncs differ diff --git a/_module/ncs/at_139.ncs b/_module/ncs/at_139.ncs index 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_155.ncs and b/_module/ncs/at_155.ncs differ diff --git a/_module/ncs/at_156.ncs b/_module/ncs/at_156.ncs index 72583c24..f1e1c5a5 100644 Binary files a/_module/ncs/at_156.ncs and b/_module/ncs/at_156.ncs differ diff --git a/_module/ncs/at_157.ncs b/_module/ncs/at_157.ncs index 0908b00a..6a0890a0 100644 Binary files a/_module/ncs/at_157.ncs and b/_module/ncs/at_157.ncs differ diff --git a/_module/ncs/at_164.ncs b/_module/ncs/at_164.ncs index cfff4f27..9c06053c 100644 Binary files a/_module/ncs/at_164.ncs and b/_module/ncs/at_164.ncs differ diff --git a/_module/ncs/at_166.ncs b/_module/ncs/at_166.ncs index d3bff2eb..d9994bf6 100644 Binary files a/_module/ncs/at_166.ncs and b/_module/ncs/at_166.ncs differ diff --git a/_module/ncs/at_170.ncs b/_module/ncs/at_170.ncs index c6585dfb..0b213c39 100644 Binary files a/_module/ncs/at_170.ncs and b/_module/ncs/at_170.ncs differ diff --git a/_module/ncs/at_171.ncs b/_module/ncs/at_171.ncs index c6585dfb..0b213c39 100644 Binary files a/_module/ncs/at_171.ncs and b/_module/ncs/at_171.ncs differ diff --git a/_module/ncs/at_173.ncs b/_module/ncs/at_173.ncs index 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_173.ncs and b/_module/ncs/at_173.ncs differ diff --git a/_module/ncs/at_174.ncs b/_module/ncs/at_174.ncs index 1d8b23ca..24a20717 100644 Binary files a/_module/ncs/at_174.ncs and b/_module/ncs/at_174.ncs differ diff --git a/_module/ncs/at_176.ncs b/_module/ncs/at_176.ncs index 1a0fe39e..7682bedc 100644 Binary files a/_module/ncs/at_176.ncs and b/_module/ncs/at_176.ncs differ diff --git a/_module/ncs/at_178.ncs b/_module/ncs/at_178.ncs index 8f58b681..98a89aa7 100644 Binary files a/_module/ncs/at_178.ncs and b/_module/ncs/at_178.ncs differ diff --git a/_module/ncs/at_180.ncs b/_module/ncs/at_180.ncs index 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_180.ncs and b/_module/ncs/at_180.ncs differ diff --git a/_module/ncs/at_184.ncs b/_module/ncs/at_184.ncs index bd2bd6b6..a3d6d7a4 100644 Binary files a/_module/ncs/at_184.ncs and b/_module/ncs/at_184.ncs differ diff --git a/_module/ncs/at_185.ncs b/_module/ncs/at_185.ncs index 8f17edbd..7e76091c 100644 Binary files a/_module/ncs/at_185.ncs and b/_module/ncs/at_185.ncs differ diff --git a/_module/ncs/at_186.ncs b/_module/ncs/at_186.ncs index 9a1d84c8..b6dc32ad 100644 Binary files a/_module/ncs/at_186.ncs and b/_module/ncs/at_186.ncs differ diff --git a/_module/ncs/at_187.ncs b/_module/ncs/at_187.ncs index b3e8e442..d4be75fb 100644 Binary files a/_module/ncs/at_187.ncs and b/_module/ncs/at_187.ncs differ diff --git a/_module/ncs/at_189.ncs b/_module/ncs/at_189.ncs index d3bff2eb..d9994bf6 100644 Binary files a/_module/ncs/at_189.ncs and b/_module/ncs/at_189.ncs differ diff --git a/_module/ncs/at_191.ncs b/_module/ncs/at_191.ncs index 3d7931d3..1d98c302 100644 Binary files a/_module/ncs/at_191.ncs and b/_module/ncs/at_191.ncs differ diff --git a/_module/ncs/at_193.ncs b/_module/ncs/at_193.ncs index a3aa5ca9..f199d7da 100644 Binary files a/_module/ncs/at_193.ncs and b/_module/ncs/at_193.ncs differ diff --git a/_module/ncs/at_196.ncs b/_module/ncs/at_196.ncs index 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_196.ncs and b/_module/ncs/at_196.ncs differ diff --git a/_module/ncs/at_199.ncs b/_module/ncs/at_199.ncs index 04573bb4..3a7d5f82 100644 Binary files a/_module/ncs/at_199.ncs and b/_module/ncs/at_199.ncs differ diff --git a/_module/ncs/at_202.ncs b/_module/ncs/at_202.ncs index 16165a5d..0b9c311c 100644 Binary files a/_module/ncs/at_202.ncs and b/_module/ncs/at_202.ncs differ diff --git a/_module/ncs/at_204.ncs b/_module/ncs/at_204.ncs index 72583c24..f1e1c5a5 100644 Binary files a/_module/ncs/at_204.ncs and b/_module/ncs/at_204.ncs differ diff --git a/_module/ncs/at_205.ncs b/_module/ncs/at_205.ncs index 4f2a6977..8f579f35 100644 Binary files a/_module/ncs/at_205.ncs and b/_module/ncs/at_205.ncs differ diff --git a/_module/ncs/at_206.ncs b/_module/ncs/at_206.ncs index 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_206.ncs and b/_module/ncs/at_206.ncs differ diff --git a/_module/ncs/at_232.ncs b/_module/ncs/at_232.ncs index a540f23c..8514c502 100644 Binary files a/_module/ncs/at_232.ncs and b/_module/ncs/at_232.ncs differ diff --git a/_module/ncs/at_233.ncs b/_module/ncs/at_233.ncs index 07a97682..66bf0e8c 100644 Binary files a/_module/ncs/at_233.ncs and b/_module/ncs/at_233.ncs differ diff --git a/_module/ncs/at_234.ncs b/_module/ncs/at_234.ncs index 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_234.ncs and b/_module/ncs/at_234.ncs differ diff --git a/_module/ncs/at_235.ncs b/_module/ncs/at_235.ncs index 7e9e621d..b2e5a349 100644 Binary files a/_module/ncs/at_235.ncs and b/_module/ncs/at_235.ncs differ diff --git a/_module/ncs/at_236.ncs b/_module/ncs/at_236.ncs index 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 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 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_243.ncs and b/_module/ncs/at_243.ncs differ diff --git a/_module/ncs/at_244.ncs b/_module/ncs/at_244.ncs index 77a641bb..17ccddab 100644 Binary files a/_module/ncs/at_244.ncs and b/_module/ncs/at_244.ncs differ diff --git a/_module/ncs/at_245.ncs b/_module/ncs/at_245.ncs index e184f5b2..4e1a60b3 100644 Binary files a/_module/ncs/at_245.ncs and b/_module/ncs/at_245.ncs differ diff --git a/_module/ncs/at_246.ncs b/_module/ncs/at_246.ncs index 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_246.ncs and b/_module/ncs/at_246.ncs differ diff --git a/_module/ncs/at_248.ncs b/_module/ncs/at_248.ncs index 6bd67562..e95d5c3d 100644 Binary files a/_module/ncs/at_248.ncs and b/_module/ncs/at_248.ncs differ diff --git a/_module/ncs/at_249.ncs b/_module/ncs/at_249.ncs index b19c1fba..631960d6 100644 Binary files a/_module/ncs/at_249.ncs and b/_module/ncs/at_249.ncs differ diff --git a/_module/ncs/at_250.ncs b/_module/ncs/at_250.ncs index b19c1fba..631960d6 100644 Binary files a/_module/ncs/at_250.ncs and b/_module/ncs/at_250.ncs differ diff --git a/_module/ncs/at_259.ncs b/_module/ncs/at_259.ncs index 41fed16c..b3d755d5 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 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_260.ncs and b/_module/ncs/at_260.ncs differ diff --git a/_module/ncs/at_264.ncs b/_module/ncs/at_264.ncs index 1a0fe39e..7682bedc 100644 Binary files a/_module/ncs/at_264.ncs and b/_module/ncs/at_264.ncs differ diff --git a/_module/ncs/at_266.ncs b/_module/ncs/at_266.ncs index c11db4d4..22118e88 100644 Binary files a/_module/ncs/at_266.ncs and b/_module/ncs/at_266.ncs differ diff --git a/_module/ncs/at_268.ncs b/_module/ncs/at_268.ncs index 41fed16c..b3d755d5 100644 Binary files a/_module/ncs/at_268.ncs and b/_module/ncs/at_268.ncs differ diff --git a/_module/ncs/at_271.ncs b/_module/ncs/at_271.ncs index a3007427..8e9c3e70 100644 Binary files a/_module/ncs/at_271.ncs and b/_module/ncs/at_271.ncs differ diff --git a/_module/ncs/at_272.ncs b/_module/ncs/at_272.ncs index d73e1e31..84242ba7 100644 Binary files a/_module/ncs/at_272.ncs and b/_module/ncs/at_272.ncs differ diff --git a/_module/ncs/at_caplvlup.ncs b/_module/ncs/at_caplvlup.ncs index 4684c165..9b6ef389 100644 Binary files a/_module/ncs/at_caplvlup.ncs and b/_module/ncs/at_caplvlup.ncs differ diff --git a/_module/ncs/at_dm_attack1.ncs b/_module/ncs/at_dm_attack1.ncs index 226b0737..5968e2d4 100644 Binary files a/_module/ncs/at_dm_attack1.ncs and b/_module/ncs/at_dm_attack1.ncs differ diff --git a/_module/ncs/at_enter_pc_room.ncs b/_module/ncs/at_enter_pc_room.ncs index 1f644c0b..9c8ac9bf 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_ghoulchest1.ncs b/_module/ncs/at_ghoulchest1.ncs index 0bf5aeb2..42fa66d1 100644 Binary files a/_module/ncs/at_ghoulchest1.ncs and b/_module/ncs/at_ghoulchest1.ncs differ diff --git a/_module/ncs/at_ghoulchest2.ncs b/_module/ncs/at_ghoulchest2.ncs index 92c494fd..17968170 100644 Binary files a/_module/ncs/at_ghoulchest2.ncs and b/_module/ncs/at_ghoulchest2.ncs differ diff --git a/_module/ncs/at_give_coins.ncs b/_module/ncs/at_give_coins.ncs index 52a2a309..dc927cf5 100644 Binary files a/_module/ncs/at_give_coins.ncs and b/_module/ncs/at_give_coins.ncs differ diff --git a/_module/ncs/at_gotplaycards.ncs b/_module/ncs/at_gotplaycards.ncs index 1216078e..b8b3ed8a 100644 Binary files a/_module/ncs/at_gotplaycards.ncs and b/_module/ncs/at_gotplaycards.ncs differ diff --git a/_module/ncs/at_grabcards.ncs b/_module/ncs/at_grabcards.ncs index eda358d2..cecb4e52 100644 Binary files a/_module/ncs/at_grabcards.ncs and b/_module/ncs/at_grabcards.ncs differ diff --git a/_module/ncs/at_move2latrene3.ncs b/_module/ncs/at_move2latrene3.ncs index bd9f81f7..e26896f3 100644 Binary files a/_module/ncs/at_move2latrene3.ncs and b/_module/ncs/at_move2latrene3.ncs differ diff --git a/_module/ncs/at_spawn_fiilaar.ncs b/_module/ncs/at_spawn_fiilaar.ncs index b7972def..a168eb4c 100644 Binary files a/_module/ncs/at_spawn_fiilaar.ncs and b/_module/ncs/at_spawn_fiilaar.ncs differ diff --git a/_module/ncs/at_spiders_lie.ncs b/_module/ncs/at_spiders_lie.ncs index e37444df..1a7653d6 100644 Binary files a/_module/ncs/at_spiders_lie.ncs and b/_module/ncs/at_spiders_lie.ncs differ diff --git a/_module/ncs/at_spn_grn_slime.ncs b/_module/ncs/at_spn_grn_slime.ncs index 4b9a14c5..dcbfd988 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 4cc33400..5b7967b6 100644 Binary files a/_module/ncs/atropal_ai.ncs and b/_module/ncs/atropal_ai.ncs differ diff --git a/_module/ncs/atropal_aura.ncs b/_module/ncs/atropal_aura.ncs index 1e31b5ad..fe681e17 100644 Binary files a/_module/ncs/atropal_aura.ncs and b/_module/ncs/atropal_aura.ncs differ diff --git a/_module/ncs/atropal_aura1.ncs b/_module/ncs/atropal_aura1.ncs index ec64dfd0..433fd4e7 100644 Binary files a/_module/ncs/atropal_aura1.ncs and b/_module/ncs/atropal_aura1.ncs differ diff --git a/_module/ncs/atropal_aura2.ncs b/_module/ncs/atropal_aura2.ncs index a43fa5c7..9f0a11ce 100644 Binary files a/_module/ncs/atropal_aura2.ncs and b/_module/ncs/atropal_aura2.ncs differ diff --git a/_module/ncs/atropal_aura3.ncs b/_module/ncs/atropal_aura3.ncs index de00e5b0..f8566c72 100644 Binary files a/_module/ncs/atropal_aura3.ncs and b/_module/ncs/atropal_aura3.ncs differ diff --git a/_module/ncs/atropaltouch.ncs b/_module/ncs/atropaltouch.ncs index 483385b3..7ad75066 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 41fed16c..b3d755d5 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 4dd1c9ea..445609dd 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 34daa4c9..fe24db65 100644 Binary files a/_module/ncs/aura_ai.ncs and b/_module/ncs/aura_ai.ncs differ diff --git a/_module/ncs/baneenter.ncs b/_module/ncs/baneenter.ncs index e9da924e..5ddcf0a2 100644 Binary files a/_module/ncs/baneenter.ncs and b/_module/ncs/baneenter.ncs differ diff --git a/_module/ncs/belgos.ncs b/_module/ncs/belgos.ncs index 0dffdd96..ab085c3d 100644 Binary files a/_module/ncs/belgos.ncs and b/_module/ncs/belgos.ncs differ diff --git a/_module/ncs/blaspheme_bite.ncs b/_module/ncs/blaspheme_bite.ncs index afb67f43..a29fb925 100644 Binary files a/_module/ncs/blaspheme_bite.ncs and b/_module/ncs/blaspheme_bite.ncs differ diff --git a/_module/ncs/bld_drain_onhit.ncs b/_module/ncs/bld_drain_onhit.ncs index 873e0227..c0214126 100644 Binary files a/_module/ncs/bld_drain_onhit.ncs and b/_module/ncs/bld_drain_onhit.ncs differ diff --git a/_module/ncs/bleakaura.ncs b/_module/ncs/bleakaura.ncs index 3c51c888..bf87c92f 100644 Binary files a/_module/ncs/bleakaura.ncs and b/_module/ncs/bleakaura.ncs differ diff --git a/_module/ncs/bleakaura1.ncs b/_module/ncs/bleakaura1.ncs index 17b71901..47f128dc 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 7203793f..32c2e944 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 31cfd5a4..27195ad2 100644 Binary files a/_module/ncs/blindonopen.ncs and b/_module/ncs/blindonopen.ncs differ diff --git a/_module/ncs/bloodcall.ncs b/_module/ncs/bloodcall.ncs index 4be2d1a0..43838d45 100644 Binary files a/_module/ncs/bloodcall.ncs and b/_module/ncs/bloodcall.ncs differ diff --git a/_module/ncs/bloodspawn.ncs b/_module/ncs/bloodspawn.ncs index cbdfe55d..6b90c2ab 100644 Binary files a/_module/ncs/bloodspawn.ncs and b/_module/ncs/bloodspawn.ncs differ diff --git a/_module/ncs/boatcheck1.ncs b/_module/ncs/boatcheck1.ncs index c12551cb..0cb9c6d0 100644 Binary files a/_module/ncs/boatcheck1.ncs and b/_module/ncs/boatcheck1.ncs differ diff --git a/_module/ncs/bonesubsumption.ncs b/_module/ncs/bonesubsumption.ncs index 14e7b0ac..60d09dcd 100644 Binary files a/_module/ncs/bonesubsumption.ncs and b/_module/ncs/bonesubsumption.ncs differ diff --git a/_module/ncs/boneyard_ai.ncs b/_module/ncs/boneyard_ai.ncs index a3a094bf..e6746b03 100644 Binary files a/_module/ncs/boneyard_ai.ncs and b/_module/ncs/boneyard_ai.ncs differ diff --git a/_module/ncs/boneyard_ud.ncs b/_module/ncs/boneyard_ud.ncs index 7e43cad2..336cb5ac 100644 Binary files a/_module/ncs/boneyard_ud.ncs and b/_module/ncs/boneyard_ud.ncs differ diff --git a/_module/ncs/book_levelup.ncs b/_module/ncs/book_levelup.ncs index f2352c45..14bfaaef 100644 Binary files a/_module/ncs/book_levelup.ncs and b/_module/ncs/book_levelup.ncs differ diff --git a/_module/ncs/boosonenter.ncs b/_module/ncs/boosonenter.ncs index 491f5384..ab27ee4e 100644 Binary files a/_module/ncs/boosonenter.ncs and b/_module/ncs/boosonenter.ncs differ diff --git a/_module/ncs/boriscomes.ncs b/_module/ncs/boriscomes.ncs index f458e33d..d3d71953 100644 Binary files a/_module/ncs/boriscomes.ncs and b/_module/ncs/boriscomes.ncs differ diff --git a/_module/ncs/burrow_onuserdef.ncs b/_module/ncs/burrow_onuserdef.ncs index b4a4027a..d023571d 100644 Binary files a/_module/ncs/burrow_onuserdef.ncs and b/_module/ncs/burrow_onuserdef.ncs differ diff --git a/_module/ncs/buy_ess_puller.ncs b/_module/ncs/buy_ess_puller.ncs index 24b1cc8e..d530abc8 100644 Binary files a/_module/ncs/buy_ess_puller.ncs and b/_module/ncs/buy_ess_puller.ncs differ diff --git a/_module/ncs/cavein_retex.ncs b/_module/ncs/cavein_retex.ncs index aadf85b7..3e85f17a 100644 Binary files a/_module/ncs/cavein_retex.ncs and b/_module/ncs/cavein_retex.ncs differ diff --git a/_module/ncs/ceonopen.ncs b/_module/ncs/ceonopen.ncs index e27116f2..e5e4e4f1 100644 Binary files a/_module/ncs/ceonopen.ncs and b/_module/ncs/ceonopen.ncs differ diff --git a/_module/ncs/cha_drain.ncs b/_module/ncs/cha_drain.ncs index bdbc3a94..d40dd07c 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 ca3d17f2..133af44f 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 b36113a8..86ff8c93 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 d129a45a..c716fdd9 100644 Binary files a/_module/ncs/chic_ai.ncs and b/_module/ncs/chic_ai.ncs differ diff --git a/_module/ncs/clickforxp.ncs b/_module/ncs/clickforxp.ncs index 46f96227..1930c225 100644 Binary files a/_module/ncs/clickforxp.ncs and b/_module/ncs/clickforxp.ncs differ diff --git a/_module/ncs/codi_attacked.ncs b/_module/ncs/codi_attacked.ncs new file mode 100644 index 00000000..118d3f3d Binary files /dev/null and b/_module/ncs/codi_attacked.ncs differ diff --git a/_module/ncs/codi_endcombat.ncs b/_module/ncs/codi_endcombat.ncs new file mode 100644 index 00000000..359c3774 Binary files /dev/null and b/_module/ncs/codi_endcombat.ncs differ diff --git a/_module/ncs/codi_heartbeat.ncs b/_module/ncs/codi_heartbeat.ncs new file mode 100644 index 00000000..23cb027c Binary files /dev/null and b/_module/ncs/codi_heartbeat.ncs differ diff --git a/_module/ncs/codi_onblocked.ncs b/_module/ncs/codi_onblocked.ncs new file mode 100644 index 00000000..8501ab33 Binary files /dev/null and b/_module/ncs/codi_onblocked.ncs differ diff --git a/_module/ncs/codi_onconv.ncs b/_module/ncs/codi_onconv.ncs new file mode 100644 index 00000000..197c230a Binary files /dev/null and b/_module/ncs/codi_onconv.ncs differ diff --git a/_module/ncs/codi_ondamage.ncs b/_module/ncs/codi_ondamage.ncs new file mode 100644 index 00000000..31a70cf6 Binary files /dev/null and b/_module/ncs/codi_ondamage.ncs differ diff --git a/_module/ncs/codi_ondeath.ncs b/_module/ncs/codi_ondeath.ncs new file mode 100644 index 00000000..d3325435 Binary files /dev/null and b/_module/ncs/codi_ondeath.ncs differ diff --git a/_module/ncs/codi_ondisturb.ncs b/_module/ncs/codi_ondisturb.ncs new file mode 100644 index 00000000..20087378 Binary files /dev/null and b/_module/ncs/codi_ondisturb.ncs differ diff --git a/_module/ncs/codi_percept.ncs b/_module/ncs/codi_percept.ncs new file mode 100644 index 00000000..551ca600 Binary files /dev/null and b/_module/ncs/codi_percept.ncs differ diff --git a/_module/ncs/codi_rested.ncs b/_module/ncs/codi_rested.ncs new file mode 100644 index 00000000..8335dd5f Binary files /dev/null and b/_module/ncs/codi_rested.ncs differ diff --git a/_module/ncs/codi_spawn.ncs b/_module/ncs/codi_spawn.ncs new file mode 100644 index 00000000..4775a8a7 Binary files /dev/null and b/_module/ncs/codi_spawn.ncs differ diff --git a/_module/ncs/codi_spellcast.ncs b/_module/ncs/codi_spellcast.ncs new file mode 100644 index 00000000..66a4807e Binary files /dev/null and b/_module/ncs/codi_spellcast.ncs differ diff --git a/_module/ncs/codi_userdef.ncs b/_module/ncs/codi_userdef.ncs new file mode 100644 index 00000000..4d231518 Binary files /dev/null and b/_module/ncs/codi_userdef.ncs differ diff --git a/_module/ncs/cold_aura1.ncs b/_module/ncs/cold_aura1.ncs index 5184e5c8..e709f97b 100644 Binary files a/_module/ncs/cold_aura1.ncs and b/_module/ncs/cold_aura1.ncs differ diff --git a/_module/ncs/cold_aura2.ncs b/_module/ncs/cold_aura2.ncs index 2478216b..366900a1 100644 Binary files a/_module/ncs/cold_aura2.ncs and b/_module/ncs/cold_aura2.ncs differ diff --git a/_module/ncs/commoner_creator.ncs b/_module/ncs/commoner_creator.ncs index 619d410c..9798142a 100644 Binary files a/_module/ncs/commoner_creator.ncs and b/_module/ncs/commoner_creator.ncs differ diff --git a/_module/ncs/commoner_main.ncs b/_module/ncs/commoner_main.ncs index 4036f424..0b9134ea 100644 Binary files a/_module/ncs/commoner_main.ncs and b/_module/ncs/commoner_main.ncs differ diff --git a/_module/ncs/commoner_main_cb.ncs b/_module/ncs/commoner_main_cb.ncs index ebce14d4..59f0f131 100644 Binary files a/_module/ncs/commoner_main_cb.ncs and b/_module/ncs/commoner_main_cb.ncs differ diff --git a/_module/ncs/commoner_resume.ncs b/_module/ncs/commoner_resume.ncs index 086628d5..40759fe5 100644 Binary files a/_module/ncs/commoner_resume.ncs and b/_module/ncs/commoner_resume.ncs differ diff --git a/_module/ncs/commoner_spawn.ncs b/_module/ncs/commoner_spawn.ncs index b0387eb2..59e311c4 100644 Binary files a/_module/ncs/commoner_spawn.ncs and b/_module/ncs/commoner_spawn.ncs differ diff --git a/_module/ncs/conlossconv.ncs b/_module/ncs/conlossconv.ncs index 3c48ff1a..189189bf 100644 Binary files a/_module/ncs/conlossconv.ncs and b/_module/ncs/conlossconv.ncs differ diff --git a/_module/ncs/constrict.ncs b/_module/ncs/constrict.ncs index 52cb98ec..08f73bdc 100644 Binary files a/_module/ncs/constrict.ncs and b/_module/ncs/constrict.ncs differ diff --git a/_module/ncs/convevil10.ncs b/_module/ncs/convevil10.ncs index b4d3e247..4f428f04 100644 Binary files a/_module/ncs/convevil10.ncs and b/_module/ncs/convevil10.ncs differ diff --git a/_module/ncs/convgood1.ncs b/_module/ncs/convgood1.ncs index 7d6c3f8e..33886d46 100644 Binary files a/_module/ncs/convgood1.ncs and b/_module/ncs/convgood1.ncs differ diff --git a/_module/ncs/convgood10.ncs b/_module/ncs/convgood10.ncs index c2d8fc6b..c9acda09 100644 Binary files a/_module/ncs/convgood10.ncs and b/_module/ncs/convgood10.ncs differ diff --git a/_module/ncs/convgood100.ncs b/_module/ncs/convgood100.ncs index 2e3dcd6a..1ea6ec9c 100644 Binary files a/_module/ncs/convgood100.ncs and b/_module/ncs/convgood100.ncs differ diff --git a/_module/ncs/convpbutcher.ncs b/_module/ncs/convpbutcher.ncs index ad03ad8f..5a226ea4 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 8a6783d2..202b2c4d 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 336f691c..0ea58814 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 fd2d837f..0d6ac426 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 6fc9f3ab..93096781 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 b41b177e..ac449280 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 aee5e903..d3dc1c95 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 db40447e..48336d0c 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 d3fd0060..064af25a 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 c80fb26f..806f906f 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 c6d7c4a6..6e0f2842 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 25a9c52f..09036b0a 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 7ead9779..8e0af5d2 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 e5b1ec18..db4caf6e 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 90d9b457..33c44c6b 100644 Binary files a/_module/ncs/convportorcus.ncs and b/_module/ncs/convportorcus.ncs differ diff --git a/_module/ncs/corrak_onpercep.ncs b/_module/ncs/corrak_onpercep.ncs index 6f1d24db..73d121d8 100644 Binary files a/_module/ncs/corrak_onpercep.ncs and b/_module/ncs/corrak_onpercep.ncs differ diff --git a/_module/ncs/cpcraterlake1.ncs b/_module/ncs/cpcraterlake1.ncs index 4349d50b..936963b0 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 739b4321..e5f0982a 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 c664ba5b..e647a35d 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 070ac02d..5e328823 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 7ba3d6d0..f214c4e3 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 6be4db3b..7ec371e7 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_bloodfly_hb.ncs b/_module/ncs/cr_bloodfly_hb.ncs index 90e73444..b695cbda 100644 Binary files a/_module/ncs/cr_bloodfly_hb.ncs and b/_module/ncs/cr_bloodfly_hb.ncs differ diff --git a/_module/ncs/cr_claw_ggg_l.ncs b/_module/ncs/cr_claw_ggg_l.ncs index dd216433..d25c0be0 100644 Binary files a/_module/ncs/cr_claw_ggg_l.ncs and b/_module/ncs/cr_claw_ggg_l.ncs differ diff --git a/_module/ncs/cr_claw_ggg_r.ncs b/_module/ncs/cr_claw_ggg_r.ncs index 631c3d01..afef01a6 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 20f70a09..3873583f 100644 Binary files a/_module/ncs/cr_dung_slam.ncs and b/_module/ncs/cr_dung_slam.ncs differ diff --git a/_module/ncs/craterdive.ncs b/_module/ncs/craterdive.ncs index 4fe48a0f..53bf19e0 100644 Binary files a/_module/ncs/craterdive.ncs and b/_module/ncs/craterdive.ncs differ diff --git a/_module/ncs/craterport.ncs b/_module/ncs/craterport.ncs index 5564703d..a34f91a9 100644 Binary files a/_module/ncs/craterport.ncs and b/_module/ncs/craterport.ncs differ diff --git a/_module/ncs/cryptchaos.ncs b/_module/ncs/cryptchaos.ncs index 44d6159d..46816e0a 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 1d8bfe99..f808cce5 100644 Binary files a/_module/ncs/cryptevil.ncs and b/_module/ncs/cryptevil.ncs differ diff --git a/_module/ncs/cs_oe_trapcep.ncs b/_module/ncs/cs_oe_trapcep.ncs index 703db97a..b4fea61e 100644 Binary files a/_module/ncs/cs_oe_trapcep.ncs and b/_module/ncs/cs_oe_trapcep.ncs differ diff --git a/_module/ncs/cs_ox_trapcep.ncs b/_module/ncs/cs_ox_trapcep.ncs index 3ed56678..c67316f0 100644 Binary files a/_module/ncs/cs_ox_trapcep.ncs and b/_module/ncs/cs_ox_trapcep.ncs differ diff --git a/_module/ncs/curesonenter.ncs b/_module/ncs/curesonenter.ncs index cf0a4fb3..df3c1862 100644 Binary files a/_module/ncs/curesonenter.ncs and b/_module/ncs/curesonenter.ncs differ diff --git a/_module/ncs/curseonopen.ncs b/_module/ncs/curseonopen.ncs index 0f296678..d88dfd9b 100644 Binary files a/_module/ncs/curseonopen.ncs and b/_module/ncs/curseonopen.ncs differ diff --git a/_module/ncs/cutarm.ncs b/_module/ncs/cutarm.ncs index 94c274c9..d657f5de 100644 Binary files a/_module/ncs/cutarm.ncs and b/_module/ncs/cutarm.ncs differ diff --git a/_module/ncs/cv_10a_tar_fight.ncs b/_module/ncs/cv_10a_tar_fight.ncs index f7b5217c..472c498f 100644 Binary files a/_module/ncs/cv_10a_tar_fight.ncs and b/_module/ncs/cv_10a_tar_fight.ncs differ diff --git a/_module/ncs/cv_50cp_100xp.ncs b/_module/ncs/cv_50cp_100xp.ncs index e812f8d7..d2918511 100644 Binary files a/_module/ncs/cv_50cp_100xp.ncs and b/_module/ncs/cv_50cp_100xp.ncs differ diff --git a/_module/ncs/cv_chk_1000gp.ncs b/_module/ncs/cv_chk_1000gp.ncs index e0724473..55ec5609 100644 Binary files a/_module/ncs/cv_chk_1000gp.ncs and b/_module/ncs/cv_chk_1000gp.ncs differ diff --git a/_module/ncs/cv_chk_150gp.ncs b/_module/ncs/cv_chk_150gp.ncs index e2de9e8b..e86b15e8 100644 Binary files a/_module/ncs/cv_chk_150gp.ncs and b/_module/ncs/cv_chk_150gp.ncs differ diff --git a/_module/ncs/cv_chk_lvl10plus.ncs b/_module/ncs/cv_chk_lvl10plus.ncs index 89c51f00..887e976c 100644 Binary files a/_module/ncs/cv_chk_lvl10plus.ncs and b/_module/ncs/cv_chk_lvl10plus.ncs differ diff --git a/_module/ncs/cv_chk_lvl15plus.ncs b/_module/ncs/cv_chk_lvl15plus.ncs index a84d3aca..ba8a332f 100644 Binary files a/_module/ncs/cv_chk_lvl15plus.ncs and b/_module/ncs/cv_chk_lvl15plus.ncs differ diff --git a/_module/ncs/cv_destselfnofx.ncs b/_module/ncs/cv_destselfnofx.ncs index 2c7b93ae..384fa205 100644 Binary files a/_module/ncs/cv_destselfnofx.ncs and b/_module/ncs/cv_destselfnofx.ncs differ diff --git a/_module/ncs/cv_doppleshift.ncs b/_module/ncs/cv_doppleshift.ncs index 8c5e72cc..5ac19a88 100644 Binary files a/_module/ncs/cv_doppleshift.ncs and b/_module/ncs/cv_doppleshift.ncs differ diff --git a/_module/ncs/cv_evil_plus10.ncs b/_module/ncs/cv_evil_plus10.ncs index b4d3e247..4f428f04 100644 Binary files a/_module/ncs/cv_evil_plus10.ncs and b/_module/ncs/cv_evil_plus10.ncs differ diff --git a/_module/ncs/cv_evil_plus4.ncs b/_module/ncs/cv_evil_plus4.ncs index e3bb4b3a..7ffa3d0c 100644 Binary files a/_module/ncs/cv_evil_plus4.ncs and b/_module/ncs/cv_evil_plus4.ncs differ diff --git a/_module/ncs/cv_gobsgone.ncs b/_module/ncs/cv_gobsgone.ncs index d6f0d45c..4e213b14 100644 Binary files a/_module/ncs/cv_gobsgone.ncs and b/_module/ncs/cv_gobsgone.ncs differ diff --git a/_module/ncs/cv_good_plus2.ncs b/_module/ncs/cv_good_plus2.ncs index 24b0aeef..73730c4c 100644 Binary files a/_module/ncs/cv_good_plus2.ncs and b/_module/ncs/cv_good_plus2.ncs differ diff --git a/_module/ncs/cv_good_plus4.ncs b/_module/ncs/cv_good_plus4.ncs index bf41bff5..17aef802 100644 Binary files a/_module/ncs/cv_good_plus4.ncs and b/_module/ncs/cv_good_plus4.ncs differ diff --git a/_module/ncs/cv_is_charmed.ncs b/_module/ncs/cv_is_charmed.ncs index f0408bce..0de574a5 100644 Binary files a/_module/ncs/cv_is_charmed.ncs and b/_module/ncs/cv_is_charmed.ncs differ diff --git a/_module/ncs/cv_party_5k_xp.ncs b/_module/ncs/cv_party_5k_xp.ncs index 9dc5657f..9cc85503 100644 Binary files a/_module/ncs/cv_party_5k_xp.ncs and b/_module/ncs/cv_party_5k_xp.ncs differ diff --git a/_module/ncs/cv_pc_death.ncs b/_module/ncs/cv_pc_death.ncs index 27d95cd1..525f0757 100644 Binary files a/_module/ncs/cv_pc_death.ncs and b/_module/ncs/cv_pc_death.ncs differ diff --git a/_module/ncs/cv_port_graveyrd.ncs b/_module/ncs/cv_port_graveyrd.ncs index 1aea1ddb..e5fdb489 100644 Binary files a/_module/ncs/cv_port_graveyrd.ncs and b/_module/ncs/cv_port_graveyrd.ncs differ diff --git a/_module/ncs/cv_pwstore_01.ncs b/_module/ncs/cv_pwstore_01.ncs index 466e0bae..ec8aad09 100644 Binary files a/_module/ncs/cv_pwstore_01.ncs and b/_module/ncs/cv_pwstore_01.ncs differ diff --git a/_module/ncs/cv_scramge_shift.ncs b/_module/ncs/cv_scramge_shift.ncs index 2daf5fa2..d05b9557 100644 Binary files a/_module/ncs/cv_scramge_shift.ncs and b/_module/ncs/cv_scramge_shift.ncs differ diff --git a/_module/ncs/cv_take_1000gp.ncs b/_module/ncs/cv_take_1000gp.ncs index 5ead8d9e..121add57 100644 Binary files a/_module/ncs/cv_take_1000gp.ncs and b/_module/ncs/cv_take_1000gp.ncs differ diff --git a/_module/ncs/cv_take_10k_gp.ncs b/_module/ncs/cv_take_10k_gp.ncs index 51ba62ff..e2fe01c5 100644 Binary files a/_module/ncs/cv_take_10k_gp.ncs and b/_module/ncs/cv_take_10k_gp.ncs differ diff --git a/_module/ncs/cv_take_150gp.ncs b/_module/ncs/cv_take_150gp.ncs index 2c0e785f..3bd2fab8 100644 Binary files a/_module/ncs/cv_take_150gp.ncs and b/_module/ncs/cv_take_150gp.ncs differ diff --git a/_module/ncs/cv_ubar_reward.ncs b/_module/ncs/cv_ubar_reward.ncs index 5b28f5a3..72491cf3 100644 Binary files a/_module/ncs/cv_ubar_reward.ncs and b/_module/ncs/cv_ubar_reward.ncs differ diff --git a/_module/ncs/daernstored.ncs b/_module/ncs/daernstored.ncs index caa94c31..da9e194d 100644 Binary files a/_module/ncs/daernstored.ncs and b/_module/ncs/daernstored.ncs differ diff --git a/_module/ncs/dante_letodel_at.ncs b/_module/ncs/dante_letodel_at.ncs index 69c2eca6..70344263 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 32b8b6c0..c68cb956 100644 Binary files a/_module/ncs/death_aura1.ncs and b/_module/ncs/death_aura1.ncs differ diff --git a/_module/ncs/deathconv.ncs b/_module/ncs/deathconv.ncs index ec97c13c..cfc7f915 100644 Binary files a/_module/ncs/deathconv.ncs and b/_module/ncs/deathconv.ncs differ diff --git a/_module/ncs/deathenter.ncs b/_module/ncs/deathenter.ncs index 5a1e05fe..2a754f2d 100644 Binary files a/_module/ncs/deathenter.ncs and b/_module/ncs/deathenter.ncs differ diff --git a/_module/ncs/deathonopen.ncs b/_module/ncs/deathonopen.ncs index 6d0a72ef..4407cfc9 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 3286e949..2211f9b9 100644 Binary files a/_module/ncs/deathopen.ncs and b/_module/ncs/deathopen.ncs differ diff --git a/_module/ncs/default7_1min.ncs b/_module/ncs/default7_1min.ncs index 8d0a8a7a..1a35c561 100644 Binary files a/_module/ncs/default7_1min.ncs and b/_module/ncs/default7_1min.ncs differ diff --git a/_module/ncs/default9_pw_glnd.ncs b/_module/ncs/default9_pw_glnd.ncs index ed48c88c..61ef412c 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 859747b7..6a5d07e3 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 2bf164e8..76887a3c 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 c2c09112..baf70bd0 100644 Binary files a/_module/ncs/desecrating_aur1.ncs and b/_module/ncs/desecrating_aur1.ncs differ diff --git a/_module/ncs/desecrating_aur2.ncs b/_module/ncs/desecrating_aur2.ncs index 279738a9..97967369 100644 Binary files a/_module/ncs/desecrating_aur2.ncs and b/_module/ncs/desecrating_aur2.ncs differ diff --git a/_module/ncs/desecrating_aur3.ncs b/_module/ncs/desecrating_aur3.ncs index 04e466a2..92e2186b 100644 Binary files a/_module/ncs/desecrating_aur3.ncs and b/_module/ncs/desecrating_aur3.ncs differ diff --git a/_module/ncs/desecrating_aura.ncs b/_module/ncs/desecrating_aura.ncs index 209990f0..cef378c4 100644 Binary files a/_module/ncs/desecrating_aura.ncs and b/_module/ncs/desecrating_aura.ncs differ diff --git a/_module/ncs/destobjroguedoor.ncs b/_module/ncs/destobjroguedoor.ncs index 3d4e3596..be2d9314 100644 Binary files a/_module/ncs/destobjroguedoor.ncs and b/_module/ncs/destobjroguedoor.ncs differ diff --git a/_module/ncs/diseaseenter.ncs b/_module/ncs/diseaseenter.ncs index aebe6b9e..3e8342b3 100644 Binary files a/_module/ncs/diseaseenter.ncs and b/_module/ncs/diseaseenter.ncs differ diff --git a/_module/ncs/dive10ato11.ncs b/_module/ncs/dive10ato11.ncs index 0bb4891d..647bead6 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 5a6f2bc5..cb8007e7 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 a7929621..5d12118d 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 4f85e182..ab58a724 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 73726cd3..77193d4e 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 8ae9749e..a4c92d47 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 ef0e5293..22e0e08a 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 79db4009..cef61813 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 7e472211..26aabf6c 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 26deae6a..c6ba0969 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 3ab3baa3..ce4df6c9 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 ffffea76..c27bd0f6 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 6fc94433..e22c88b1 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 e71ddcf5..405bb58b 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 c74d0d44..5fedb542 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 d0a2ee47..633b1573 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 f14894a6..735cb9fb 100644 Binary files a/_module/ncs/dmfi_activate.ncs and b/_module/ncs/dmfi_activate.ncs differ diff --git a/_module/ncs/dmfi_cond_dmw.ncs b/_module/ncs/dmfi_cond_dmw.ncs index 42bd7e1d..9f480d77 100644 Binary files a/_module/ncs/dmfi_cond_dmw.ncs and b/_module/ncs/dmfi_cond_dmw.ncs differ diff --git a/_module/ncs/dmfi_execute.ncs b/_module/ncs/dmfi_execute.ncs index f9dcfe9e..63c5d634 100644 Binary files a/_module/ncs/dmfi_execute.ncs and b/_module/ncs/dmfi_execute.ncs differ diff --git a/_module/ncs/dmfi_getln_cbtpl.ncs b/_module/ncs/dmfi_getln_cbtpl.ncs index 758f1fc4..e5ebc3d9 100644 Binary files a/_module/ncs/dmfi_getln_cbtpl.ncs and b/_module/ncs/dmfi_getln_cbtpl.ncs differ diff --git a/_module/ncs/dmfi_onclienter.ncs b/_module/ncs/dmfi_onclienter.ncs index 1b9df640..af71bd3b 100644 Binary files a/_module/ncs/dmfi_onclienter.ncs and b/_module/ncs/dmfi_onclienter.ncs differ diff --git a/_module/ncs/dmfi_onmodhb.ncs b/_module/ncs/dmfi_onmodhb.ncs index f36cedd5..c3cf9364 100644 Binary files a/_module/ncs/dmfi_onmodhb.ncs and b/_module/ncs/dmfi_onmodhb.ncs differ diff --git a/_module/ncs/dmfi_onplychat.ncs b/_module/ncs/dmfi_onplychat.ncs index da2c4c69..a4f03c9f 100644 Binary files a/_module/ncs/dmfi_onplychat.ncs and b/_module/ncs/dmfi_onplychat.ncs differ diff --git a/_module/ncs/dmfi_onrest.ncs b/_module/ncs/dmfi_onrest.ncs index a8a86254..b3759611 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 1ca142bc..c0850bab 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_unact_nam02.ncs b/_module/ncs/dmfi_unact_nam02.ncs index 76a917a2..c21e4928 100644 Binary files a/_module/ncs/dmfi_unact_nam02.ncs and b/_module/ncs/dmfi_unact_nam02.ncs differ diff --git a/_module/ncs/dmfi_unact_nam06.ncs b/_module/ncs/dmfi_unact_nam06.ncs index 7753ab88..351eb8b2 100644 Binary files a/_module/ncs/dmfi_unact_nam06.ncs and b/_module/ncs/dmfi_unact_nam06.ncs differ diff --git a/_module/ncs/dmfi_uncnd_nam01.ncs b/_module/ncs/dmfi_uncnd_nam01.ncs index d55a63cd..e059b2f0 100644 Binary files a/_module/ncs/dmfi_uncnd_nam01.ncs and b/_module/ncs/dmfi_uncnd_nam01.ncs differ diff --git a/_module/ncs/dmfi_uncnd_nam05.ncs b/_module/ncs/dmfi_uncnd_nam05.ncs index 0f8ab6d9..5756b546 100644 Binary files a/_module/ncs/dmfi_uncnd_nam05.ncs and b/_module/ncs/dmfi_uncnd_nam05.ncs differ diff --git a/_module/ncs/dmfi_univ_1.ncs b/_module/ncs/dmfi_univ_1.ncs index 56f47a01..82ad3c22 100644 Binary files a/_module/ncs/dmfi_univ_1.ncs and b/_module/ncs/dmfi_univ_1.ncs differ diff --git a/_module/ncs/dmfi_univ_10.ncs b/_module/ncs/dmfi_univ_10.ncs index 6241d358..3c5ba9fc 100644 Binary files a/_module/ncs/dmfi_univ_10.ncs and b/_module/ncs/dmfi_univ_10.ncs differ diff --git a/_module/ncs/dmfi_univ_2.ncs b/_module/ncs/dmfi_univ_2.ncs index 3c21f9b3..4fa68008 100644 Binary files a/_module/ncs/dmfi_univ_2.ncs and b/_module/ncs/dmfi_univ_2.ncs differ diff --git a/_module/ncs/dmfi_univ_3.ncs b/_module/ncs/dmfi_univ_3.ncs index 4e23bd86..edd0e2a7 100644 Binary files a/_module/ncs/dmfi_univ_3.ncs and b/_module/ncs/dmfi_univ_3.ncs differ diff --git a/_module/ncs/dmfi_univ_4.ncs b/_module/ncs/dmfi_univ_4.ncs index 66fd8cd7..a81f2e2b 100644 Binary files a/_module/ncs/dmfi_univ_4.ncs and b/_module/ncs/dmfi_univ_4.ncs differ diff --git a/_module/ncs/dmfi_univ_5.ncs b/_module/ncs/dmfi_univ_5.ncs index 8efb3201..e061d53d 100644 Binary files a/_module/ncs/dmfi_univ_5.ncs and b/_module/ncs/dmfi_univ_5.ncs differ diff --git a/_module/ncs/dmfi_univ_6.ncs b/_module/ncs/dmfi_univ_6.ncs index afec9c41..5d762bd9 100644 Binary files a/_module/ncs/dmfi_univ_6.ncs and b/_module/ncs/dmfi_univ_6.ncs differ diff --git a/_module/ncs/dmfi_univ_7.ncs b/_module/ncs/dmfi_univ_7.ncs index 677d5741..6522e681 100644 Binary files a/_module/ncs/dmfi_univ_7.ncs and b/_module/ncs/dmfi_univ_7.ncs differ diff --git a/_module/ncs/dmfi_univ_8.ncs b/_module/ncs/dmfi_univ_8.ncs index 511808ca..edfb3540 100644 Binary files a/_module/ncs/dmfi_univ_8.ncs and b/_module/ncs/dmfi_univ_8.ncs differ diff --git a/_module/ncs/dmfi_univ_9.ncs b/_module/ncs/dmfi_univ_9.ncs index 20b16925..71041f8e 100644 Binary files a/_module/ncs/dmfi_univ_9.ncs and b/_module/ncs/dmfi_univ_9.ncs differ diff --git a/_module/ncs/dmfi_univ_listen.ncs b/_module/ncs/dmfi_univ_listen.ncs index 597be450..24a52c86 100644 Binary files a/_module/ncs/dmfi_univ_listen.ncs and b/_module/ncs/dmfi_univ_listen.ncs differ diff --git a/_module/ncs/dmfi_voice1.ncs b/_module/ncs/dmfi_voice1.ncs index 94381661..c63d715a 100644 Binary files a/_module/ncs/dmfi_voice1.ncs and b/_module/ncs/dmfi_voice1.ncs differ diff --git a/_module/ncs/dmfi_voice_exe.ncs b/_module/ncs/dmfi_voice_exe.ncs index d26a2066..7dfd7f0d 100644 Binary files a/_module/ncs/dmfi_voice_exe.ncs and b/_module/ncs/dmfi_voice_exe.ncs differ diff --git a/_module/ncs/dmfi_x_afflict.ncs b/_module/ncs/dmfi_x_afflict.ncs index c15e92d7..4169a23c 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 2f56d84c..e2b13f8d 100644 Binary files a/_module/ncs/dmfi_x_emote.ncs and b/_module/ncs/dmfi_x_emote.ncs differ diff --git a/_module/ncs/dmfi_x_fx.ncs b/_module/ncs/dmfi_x_fx.ncs index a0ad6cbc..c3465214 100644 Binary files a/_module/ncs/dmfi_x_fx.ncs and b/_module/ncs/dmfi_x_fx.ncs differ diff --git a/_module/ncs/dofencebarb.ncs b/_module/ncs/dofencebarb.ncs index 339166c0..b8653e1d 100644 Binary files a/_module/ncs/dofencebarb.ncs and b/_module/ncs/dofencebarb.ncs differ diff --git a/_module/ncs/dogongbard.ncs b/_module/ncs/dogongbard.ncs index 9d8223d0..043ea290 100644 Binary files a/_module/ncs/dogongbard.ncs and b/_module/ncs/dogongbard.ncs differ diff --git a/_module/ncs/door_area_trans.ncs b/_module/ncs/door_area_trans.ncs index e391b0b9..5dc59149 100644 Binary files a/_module/ncs/door_area_trans.ncs and b/_module/ncs/door_area_trans.ncs differ diff --git a/_module/ncs/door_fail2open.ncs b/_module/ncs/door_fail2open.ncs index 823ae484..21650b5c 100644 Binary files a/_module/ncs/door_fail2open.ncs and b/_module/ncs/door_fail2open.ncs differ diff --git a/_module/ncs/doplchange.ncs b/_module/ncs/doplchange.ncs index 8e4e19c5..52c26a10 100644 Binary files a/_module/ncs/doplchange.ncs and b/_module/ncs/doplchange.ncs differ diff --git a/_module/ncs/doscreenev.ncs b/_module/ncs/doscreenev.ncs index 4e50ba38..abe1ca35 100644 Binary files a/_module/ncs/doscreenev.ncs and b/_module/ncs/doscreenev.ncs differ diff --git a/_module/ncs/dowallfire.ncs b/_module/ncs/dowallfire.ncs index f39ab1b8..b33af85d 100644 Binary files a/_module/ncs/dowallfire.ncs and b/_module/ncs/dowallfire.ncs differ diff --git a/_module/ncs/dowallpriest.ncs b/_module/ncs/dowallpriest.ncs index f18fc68b..4fe4f379 100644 Binary files a/_module/ncs/dowallpriest.ncs and b/_module/ncs/dowallpriest.ncs differ diff --git a/_module/ncs/drainingmelody.ncs b/_module/ncs/drainingmelody.ncs index a8edd3b5..87f763b2 100644 Binary files a/_module/ncs/drainingmelody.ncs and b/_module/ncs/drainingmelody.ncs differ diff --git a/_module/ncs/dream_ai.ncs b/_module/ncs/dream_ai.ncs index 29a084c4..8980d5c9 100644 Binary files a/_module/ncs/dream_ai.ncs and b/_module/ncs/dream_ai.ncs differ diff --git a/_module/ncs/dream_tendril.ncs b/_module/ncs/dream_tendril.ncs index 5aabb1d9..049477ff 100644 Binary files a/_module/ncs/dream_tendril.ncs and b/_module/ncs/dream_tendril.ncs differ diff --git a/_module/ncs/drooggong.ncs b/_module/ncs/drooggong.ncs index 7234c1c8..881719f7 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 157b60f8..9b5fc27a 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 3d436ce1..848779b6 100644 Binary files a/_module/ncs/drowndoor.ncs and b/_module/ncs/drowndoor.ncs differ diff --git a/_module/ncs/drownitem.ncs b/_module/ncs/drownitem.ncs index b1ebc195..cde91442 100644 Binary files a/_module/ncs/drownitem.ncs and b/_module/ncs/drownitem.ncs differ diff --git a/_module/ncs/drusilla_onperce.ncs b/_module/ncs/drusilla_onperce.ncs index 6f1d24db..73d121d8 100644 Binary files a/_module/ncs/drusilla_onperce.ncs and b/_module/ncs/drusilla_onperce.ncs differ diff --git a/_module/ncs/dspiderbite.ncs b/_module/ncs/dspiderbite.ncs index 402f7461..82d2070a 100644 Binary files a/_module/ncs/dspiderbite.ncs and b/_module/ncs/dspiderbite.ncs differ diff --git a/_module/ncs/dst2objgreen.ncs b/_module/ncs/dst2objgreen.ncs index cfffcdf1..5dbd75e8 100644 Binary files a/_module/ncs/dst2objgreen.ncs and b/_module/ncs/dst2objgreen.ncs differ diff --git a/_module/ncs/dumbcurseenter.ncs b/_module/ncs/dumbcurseenter.ncs index 6373ff4e..416530ee 100644 Binary files a/_module/ncs/dumbcurseenter.ncs and b/_module/ncs/dumbcurseenter.ncs differ diff --git a/_module/ncs/dungeon_enter.ncs b/_module/ncs/dungeon_enter.ncs index f1847ee3..b2b8ae40 100644 Binary files a/_module/ncs/dungeon_enter.ncs and b/_module/ncs/dungeon_enter.ncs differ diff --git a/_module/ncs/dungmon_onhb.ncs b/_module/ncs/dungmon_onhb.ncs index 69175fd9..8ad18441 100644 Binary files a/_module/ncs/dungmon_onhb.ncs and b/_module/ncs/dungmon_onhb.ncs differ diff --git a/_module/ncs/dwarfstatue.ncs b/_module/ncs/dwarfstatue.ncs index faf62ba7..6e631f5c 100644 Binary files a/_module/ncs/dwarfstatue.ncs and b/_module/ncs/dwarfstatue.ncs differ diff --git a/_module/ncs/dwarfstatuelead.ncs b/_module/ncs/dwarfstatuelead.ncs index 6cac1d26..dfa498e2 100644 Binary files a/_module/ncs/dwarfstatuelead.ncs and b/_module/ncs/dwarfstatuelead.ncs differ diff --git a/_module/ncs/ed3_troll_custom.ncs b/_module/ncs/ed3_troll_custom.ncs index 909eec73..29e243bd 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 5d002e0b..8c2a0f85 100644 Binary files a/_module/ncs/ed3_troll_spawn.ncs and b/_module/ncs/ed3_troll_spawn.ncs differ diff --git a/_module/ncs/elfstatue.ncs b/_module/ncs/elfstatue.ncs index 01e75b43..75a057bf 100644 Binary files a/_module/ncs/elfstatue.ncs and b/_module/ncs/elfstatue.ncs differ diff --git a/_module/ncs/ema_xp4trap_dis.ncs b/_module/ncs/ema_xp4trap_dis.ncs index 358a2bc9..541f22ce 100644 Binary files a/_module/ncs/ema_xp4trap_dis.ncs and b/_module/ncs/ema_xp4trap_dis.ncs differ diff --git a/_module/ncs/endleah.ncs b/_module/ncs/endleah.ncs index 3cccbb3d..660cd537 100644 Binary files a/_module/ncs/endleah.ncs and b/_module/ncs/endleah.ncs differ diff --git a/_module/ncs/entranhumani.ncs b/_module/ncs/entranhumani.ncs index 8518a9e6..d362a828 100644 Binary files a/_module/ncs/entranhumani.ncs and b/_module/ncs/entranhumani.ncs differ diff --git a/_module/ncs/entropic_blade.ncs b/_module/ncs/entropic_blade.ncs index a62edb74..02750e5a 100644 Binary files a/_module/ncs/entropic_blade.ncs and b/_module/ncs/entropic_blade.ncs differ diff --git a/_module/ncs/eviscerator.ncs b/_module/ncs/eviscerator.ncs index b61c198f..40f7f140 100644 Binary files a/_module/ncs/eviscerator.ncs and b/_module/ncs/eviscerator.ncs differ diff --git a/_module/ncs/fbondeath.ncs b/_module/ncs/fbondeath.ncs index e479820f..9f9a1aa1 100644 Binary files a/_module/ncs/fbondeath.ncs and b/_module/ncs/fbondeath.ncs differ diff --git a/_module/ncs/fear2_aura1.ncs b/_module/ncs/fear2_aura1.ncs index c68840a0..9ef215ab 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 32a0d31a..b37581de 100644 Binary files a/_module/ncs/fear_aura1.ncs and b/_module/ncs/fear_aura1.ncs differ diff --git a/_module/ncs/feararea.ncs b/_module/ncs/feararea.ncs index 66650718..6d9452e4 100644 Binary files a/_module/ncs/feararea.ncs and b/_module/ncs/feararea.ncs differ diff --git a/_module/ncs/fearattack.ncs b/_module/ncs/fearattack.ncs index 5f679bba..f023d8b5 100644 Binary files a/_module/ncs/fearattack.ncs and b/_module/ncs/fearattack.ncs differ diff --git a/_module/ncs/fighterstatue.ncs b/_module/ncs/fighterstatue.ncs index b13b2cc2..8ae88c99 100644 Binary files a/_module/ncs/fighterstatue.ncs and b/_module/ncs/fighterstatue.ncs differ diff --git a/_module/ncs/fireballonattack.ncs b/_module/ncs/fireballonattack.ncs index 8224a8be..c5636a1b 100644 Binary files a/_module/ncs/fireballonattack.ncs and b/_module/ncs/fireballonattack.ncs differ diff --git a/_module/ncs/fireonheartbeat.ncs b/_module/ncs/fireonheartbeat.ncs index 2ad62885..3e0d827f 100644 Binary files a/_module/ncs/fireonheartbeat.ncs and b/_module/ncs/fireonheartbeat.ncs differ diff --git a/_module/ncs/flightfireisle.ncs b/_module/ncs/flightfireisle.ncs index 73edd32f..0dbafbe4 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 8b397424..4e6ce93e 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 a924c436..87ffb56b 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 1b4e7cc5..8791dacb 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 31cdf27a..a5326fc2 100644 Binary files a/_module/ncs/flymummy2.ncs and b/_module/ncs/flymummy2.ncs differ diff --git a/_module/ncs/g_firework_wand.ncs b/_module/ncs/g_firework_wand.ncs index 726d3aac..3fbbf3d6 100644 Binary files a/_module/ncs/g_firework_wand.ncs and b/_module/ncs/g_firework_wand.ncs differ diff --git a/_module/ncs/g_fireworks.ncs b/_module/ncs/g_fireworks.ncs index 34cada39..835a514a 100644 Binary files a/_module/ncs/g_fireworks.ncs and b/_module/ncs/g_fireworks.ncs differ diff --git a/_module/ncs/g_larfireworks.ncs b/_module/ncs/g_larfireworks.ncs index b6a20031..7a5baebe 100644 Binary files a/_module/ncs/g_larfireworks.ncs and b/_module/ncs/g_larfireworks.ncs differ diff --git a/_module/ncs/g_lightson.ncs b/_module/ncs/g_lightson.ncs index 556664ed..31227061 100644 Binary files a/_module/ncs/g_lightson.ncs and b/_module/ncs/g_lightson.ncs differ diff --git a/_module/ncs/g_lightsout.ncs b/_module/ncs/g_lightsout.ncs index e5fe5683..2d7a1d4e 100644 Binary files a/_module/ncs/g_lightsout.ncs and b/_module/ncs/g_lightsout.ncs differ diff --git a/_module/ncs/g_medfireworks.ncs b/_module/ncs/g_medfireworks.ncs index e33c1d0a..8e52d670 100644 Binary files a/_module/ncs/g_medfireworks.ncs and b/_module/ncs/g_medfireworks.ncs differ diff --git a/_module/ncs/g_missile.ncs b/_module/ncs/g_missile.ncs index dd5a8eb3..06b00114 100644 Binary files a/_module/ncs/g_missile.ncs and b/_module/ncs/g_missile.ncs differ diff --git a/_module/ncs/g_smallfirework2.ncs b/_module/ncs/g_smallfirework2.ncs index 7cd22e46..c66adf12 100644 Binary files a/_module/ncs/g_smallfirework2.ncs and b/_module/ncs/g_smallfirework2.ncs differ diff --git a/_module/ncs/g_smallfireworks.ncs b/_module/ncs/g_smallfireworks.ncs index 1d8b6581..e23713d2 100644 Binary files a/_module/ncs/g_smallfireworks.ncs and b/_module/ncs/g_smallfireworks.ncs differ diff --git a/_module/ncs/g_startfireworks.ncs b/_module/ncs/g_startfireworks.ncs index e1737a40..abbb2246 100644 Binary files a/_module/ncs/g_startfireworks.ncs and b/_module/ncs/g_startfireworks.ncs differ diff --git a/_module/ncs/gatetodesstas.ncs b/_module/ncs/gatetodesstas.ncs index 3f7e4fd9..985d9149 100644 Binary files a/_module/ncs/gatetodesstas.ncs and b/_module/ncs/gatetodesstas.ncs differ diff --git a/_module/ncs/ghast_stench.ncs b/_module/ncs/ghast_stench.ncs index ebb879a1..33a4f72b 100644 Binary files a/_module/ncs/ghast_stench.ncs and b/_module/ncs/ghast_stench.ncs differ diff --git a/_module/ncs/ghast_stench1.ncs b/_module/ncs/ghast_stench1.ncs index 489901fb..2f3605cf 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 78abb09f..11a22c4b 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 e4b896b5..8f82015f 100644 Binary files a/_module/ncs/ghoul_claw.ncs and b/_module/ncs/ghoul_claw.ncs differ diff --git a/_module/ncs/gibletstatue.ncs b/_module/ncs/gibletstatue.ncs index b6804924..e1294026 100644 Binary files a/_module/ncs/gibletstatue.ncs and b/_module/ncs/gibletstatue.ncs differ diff --git a/_module/ncs/gloplakedive.ncs b/_module/ncs/gloplakedive.ncs index 9036e790..fbfd928a 100644 Binary files a/_module/ncs/gloplakedive.ncs and b/_module/ncs/gloplakedive.ncs differ diff --git a/_module/ncs/gloplakerise.ncs b/_module/ncs/gloplakerise.ncs index c05c4bcb..475cc834 100644 Binary files a/_module/ncs/gloplakerise.ncs and b/_module/ncs/gloplakerise.ncs differ diff --git a/_module/ncs/gobsgone.ncs b/_module/ncs/gobsgone.ncs index 4347d0ea..e3f9f2e5 100644 Binary files a/_module/ncs/gobsgone.ncs and b/_module/ncs/gobsgone.ncs differ diff --git a/_module/ncs/goldcheck.ncs b/_module/ncs/goldcheck.ncs index ce276334..bd023f36 100644 Binary files a/_module/ncs/goldcheck.ncs and b/_module/ncs/goldcheck.ncs differ diff --git a/_module/ncs/goldcheck100.ncs b/_module/ncs/goldcheck100.ncs index 6b2cd432..3db01f29 100644 Binary files a/_module/ncs/goldcheck100.ncs and b/_module/ncs/goldcheck100.ncs differ diff --git a/_module/ncs/goldcheck1000.ncs b/_module/ncs/goldcheck1000.ncs index 324668dc..5d27124d 100644 Binary files a/_module/ncs/goldcheck1000.ncs and b/_module/ncs/goldcheck1000.ncs differ diff --git a/_module/ncs/goldcheck10000.ncs b/_module/ncs/goldcheck10000.ncs index db4ad34a..940423f4 100644 Binary files a/_module/ncs/goldcheck10000.ncs and b/_module/ncs/goldcheck10000.ncs differ diff --git a/_module/ncs/goldcheck200.ncs b/_module/ncs/goldcheck200.ncs index dca36fe3..50214ebd 100644 Binary files a/_module/ncs/goldcheck200.ncs and b/_module/ncs/goldcheck200.ncs differ diff --git a/_module/ncs/goovport.ncs b/_module/ncs/goovport.ncs index a43885af..1752c99c 100644 Binary files a/_module/ncs/goovport.ncs and b/_module/ncs/goovport.ncs differ diff --git a/_module/ncs/gz_chair_use.ncs b/_module/ncs/gz_chair_use.ncs index a904cdbe..23eaed39 100644 Binary files a/_module/ncs/gz_chair_use.ncs and b/_module/ncs/gz_chair_use.ncs differ diff --git a/_module/ncs/habd_onpcdeath.ncs b/_module/ncs/habd_onpcdeath.ncs index 414c837b..320fde99 100644 Binary files a/_module/ncs/habd_onpcdeath.ncs and b/_module/ncs/habd_onpcdeath.ncs differ diff --git a/_module/ncs/habd_onpcdying.ncs b/_module/ncs/habd_onpcdying.ncs index baa44305..c0dcf6b4 100644 Binary files a/_module/ncs/habd_onpcdying.ncs and b/_module/ncs/habd_onpcdying.ncs differ diff --git a/_module/ncs/habd_onpcrespawn.ncs b/_module/ncs/habd_onpcrespawn.ncs index 27b456d2..89cb8a21 100644 Binary files a/_module/ncs/habd_onpcrespawn.ncs and b/_module/ncs/habd_onpcrespawn.ncs differ diff --git a/_module/ncs/harpytree_climb.ncs b/_module/ncs/harpytree_climb.ncs index 50525f92..ba03147d 100644 Binary files a/_module/ncs/harpytree_climb.ncs and b/_module/ncs/harpytree_climb.ncs differ diff --git a/_module/ncs/hb_cold.ncs b/_module/ncs/hb_cold.ncs index e870ccd3..e5aeaf3b 100644 Binary files a/_module/ncs/hb_cold.ncs and b/_module/ncs/hb_cold.ncs differ diff --git a/_module/ncs/hb_fire.ncs b/_module/ncs/hb_fire.ncs index 59ab4e14..a877d398 100644 Binary files a/_module/ncs/hb_fire.ncs and b/_module/ncs/hb_fire.ncs differ diff --git a/_module/ncs/hb_prism.ncs b/_module/ncs/hb_prism.ncs index 05de8729..07961aaa 100644 Binary files a/_module/ncs/hb_prism.ncs and b/_module/ncs/hb_prism.ncs differ diff --git a/_module/ncs/hcoffiner.ncs b/_module/ncs/hcoffiner.ncs index 056f4b8f..54315de1 100644 Binary files a/_module/ncs/hcoffiner.ncs and b/_module/ncs/hcoffiner.ncs differ diff --git a/_module/ncs/henchlvl_arcanta.ncs b/_module/ncs/henchlvl_arcanta.ncs index 719b8f5d..8ab4117d 100644 Binary files a/_module/ncs/henchlvl_arcanta.ncs and b/_module/ncs/henchlvl_arcanta.ncs differ diff --git a/_module/ncs/henchlvl_blackta.ncs b/_module/ncs/henchlvl_blackta.ncs index 2ab187ad..0eaecb57 100644 Binary files a/_module/ncs/henchlvl_blackta.ncs and b/_module/ncs/henchlvl_blackta.ncs differ diff --git a/_module/ncs/henchlvl_dvnchta.ncs b/_module/ncs/henchlvl_dvnchta.ncs index c1d491ab..d93041eb 100644 Binary files a/_module/ncs/henchlvl_dvnchta.ncs and b/_module/ncs/henchlvl_dvnchta.ncs differ diff --git a/_module/ncs/henchlvl_dwrfdta.ncs b/_module/ncs/henchlvl_dwrfdta.ncs index 9c0ba961..a62dc578 100644 Binary files a/_module/ncs/henchlvl_dwrfdta.ncs and b/_module/ncs/henchlvl_dwrfdta.ncs differ diff --git a/_module/ncs/henchlvl_harpeta.ncs b/_module/ncs/henchlvl_harpeta.ncs index 2860c098..c50625f8 100644 Binary files a/_module/ncs/henchlvl_harpeta.ncs and b/_module/ncs/henchlvl_harpeta.ncs differ diff --git a/_module/ncs/henchlvl_reapta.ncs b/_module/ncs/henchlvl_reapta.ncs index 0412f9dd..01436656 100644 Binary files a/_module/ncs/henchlvl_reapta.ncs and b/_module/ncs/henchlvl_reapta.ncs differ diff --git a/_module/ncs/henchlvl_shadota.ncs b/_module/ncs/henchlvl_shadota.ncs index c5cb565b..de921ec0 100644 Binary files a/_module/ncs/henchlvl_shadota.ncs and b/_module/ncs/henchlvl_shadota.ncs differ diff --git a/_module/ncs/henchlvl_shiftta.ncs b/_module/ncs/henchlvl_shiftta.ncs index 535bd106..d0c5ee35 100644 Binary files a/_module/ncs/henchlvl_shiftta.ncs and b/_module/ncs/henchlvl_shiftta.ncs differ diff --git a/_module/ncs/henchlvl_wpnmsta.ncs b/_module/ncs/henchlvl_wpnmsta.ncs index ce87c35d..8bbef085 100644 Binary files a/_module/ncs/henchlvl_wpnmsta.ncs and b/_module/ncs/henchlvl_wpnmsta.ncs differ diff --git a/_module/ncs/hermitquest1.ncs b/_module/ncs/hermitquest1.ncs index b44139e2..7b47a026 100644 Binary files a/_module/ncs/hermitquest1.ncs and b/_module/ncs/hermitquest1.ncs differ diff --git a/_module/ncs/hidden_comp001.ncs b/_module/ncs/hidden_comp001.ncs index 0ba3abe1..43c346dc 100644 Binary files a/_module/ncs/hidden_comp001.ncs and b/_module/ncs/hidden_comp001.ncs differ diff --git a/_module/ncs/hif_onplayerrest.ncs b/_module/ncs/hif_onplayerrest.ncs index 283761ab..b3ceef23 100644 Binary files a/_module/ncs/hif_onplayerrest.ncs and b/_module/ncs/hif_onplayerrest.ncs differ diff --git a/_module/ncs/highdamageent.ncs b/_module/ncs/highdamageent.ncs index 8b688992..c27c6367 100644 Binary files a/_module/ncs/highdamageent.ncs and b/_module/ncs/highdamageent.ncs differ diff --git a/_module/ncs/howl_ai.ncs b/_module/ncs/howl_ai.ncs index 38d4806e..a55404ff 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 ea93423b..fc88000a 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 22396a9a..e1fc308b 100644 Binary files a/_module/ncs/hunefer_rot.ncs and b/_module/ncs/hunefer_rot.ncs differ diff --git a/_module/ncs/iceorb.ncs b/_module/ncs/iceorb.ncs index 03e76303..f8bc73a5 100644 Binary files a/_module/ncs/iceorb.ncs and b/_module/ncs/iceorb.ncs differ diff --git a/_module/ncs/imp_grab.ncs b/_module/ncs/imp_grab.ncs index 6be4db3b..7ec371e7 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 5b0aea09..3a3e3b54 100644 Binary files a/_module/ncs/infernal_ai.ncs and b/_module/ncs/infernal_ai.ncs differ diff --git a/_module/ncs/intgone1.ncs b/_module/ncs/intgone1.ncs index 02bdf32c..b023a0aa 100644 Binary files a/_module/ncs/intgone1.ncs and b/_module/ncs/intgone1.ncs differ diff --git a/_module/ncs/invis_onspawn.ncs b/_module/ncs/invis_onspawn.ncs index e9aa3cd0..9884d160 100644 Binary files a/_module/ncs/invis_onspawn.ncs and b/_module/ncs/invis_onspawn.ncs differ diff --git a/_module/ncs/invisscriptonhb.ncs b/_module/ncs/invisscriptonhb.ncs index 41f1fac0..ed34c145 100644 Binary files a/_module/ncs/invisscriptonhb.ncs and b/_module/ncs/invisscriptonhb.ncs differ diff --git a/_module/ncs/invtaggedhb.ncs b/_module/ncs/invtaggedhb.ncs index 5ad19bf5..da659a62 100644 Binary files a/_module/ncs/invtaggedhb.ncs and b/_module/ncs/invtaggedhb.ncs differ diff --git a/_module/ncs/ironflask.ncs b/_module/ncs/ironflask.ncs index 8523d8e0..495f44ff 100644 Binary files a/_module/ncs/ironflask.ncs and b/_module/ncs/ironflask.ncs differ diff --git a/_module/ncs/is_big_no_rope.ncs b/_module/ncs/is_big_no_rope.ncs index 9d67dc6f..1b0eebd6 100644 Binary files a/_module/ncs/is_big_no_rope.ncs and b/_module/ncs/is_big_no_rope.ncs differ diff --git a/_module/ncs/itm_efreetibot01.ncs b/_module/ncs/itm_efreetibot01.ncs index 3e009a6d..71830ccd 100644 Binary files a/_module/ncs/itm_efreetibot01.ncs and b/_module/ncs/itm_efreetibot01.ncs differ diff --git a/_module/ncs/jcarag.ncs b/_module/ncs/jcarag.ncs index aeaf0eac..b0729cfb 100644 Binary files a/_module/ncs/jcarag.ncs and b/_module/ncs/jcarag.ncs differ diff --git a/_module/ncs/jcbeast.ncs b/_module/ncs/jcbeast.ncs index 931905f2..858b265d 100644 Binary files a/_module/ncs/jcbeast.ncs and b/_module/ncs/jcbeast.ncs differ diff --git a/_module/ncs/jcbeast1.ncs b/_module/ncs/jcbeast1.ncs index ed1b7a18..3297799f 100644 Binary files a/_module/ncs/jcbeast1.ncs and b/_module/ncs/jcbeast1.ncs differ diff --git a/_module/ncs/jcdoor1.ncs b/_module/ncs/jcdoor1.ncs index b0705732..d32e6bb1 100644 Binary files a/_module/ncs/jcdoor1.ncs and b/_module/ncs/jcdoor1.ncs differ diff --git a/_module/ncs/jcdoor2.ncs b/_module/ncs/jcdoor2.ncs index ab5fa03b..2a22bf33 100644 Binary files a/_module/ncs/jcdoor2.ncs and b/_module/ncs/jcdoor2.ncs differ diff --git a/_module/ncs/jchusb1.ncs b/_module/ncs/jchusb1.ncs index 3111615a..bcd817df 100644 Binary files a/_module/ncs/jchusb1.ncs and b/_module/ncs/jchusb1.ncs differ diff --git a/_module/ncs/jchusb2.ncs b/_module/ncs/jchusb2.ncs index 7b9af60c..d3a36f11 100644 Binary files a/_module/ncs/jchusb2.ncs and b/_module/ncs/jchusb2.ncs differ diff --git a/_module/ncs/jchusband.ncs b/_module/ncs/jchusband.ncs index f5da261a..4c250ccb 100644 Binary files a/_module/ncs/jchusband.ncs and b/_module/ncs/jchusband.ncs differ diff --git a/_module/ncs/jchusband2.ncs b/_module/ncs/jchusband2.ncs index a78cba78..be06a011 100644 Binary files a/_module/ncs/jchusband2.ncs and b/_module/ncs/jchusband2.ncs differ diff --git a/_module/ncs/jchusband3.ncs b/_module/ncs/jchusband3.ncs index 5c85d70e..33b27264 100644 Binary files a/_module/ncs/jchusband3.ncs and b/_module/ncs/jchusband3.ncs differ diff --git a/_module/ncs/jcjust0.ncs b/_module/ncs/jcjust0.ncs index 2d2640d5..16223294 100644 Binary files a/_module/ncs/jcjust0.ncs and b/_module/ncs/jcjust0.ncs differ diff --git a/_module/ncs/jcjust1.ncs b/_module/ncs/jcjust1.ncs index 4c74a753..8cd3246e 100644 Binary files a/_module/ncs/jcjust1.ncs and b/_module/ncs/jcjust1.ncs differ diff --git a/_module/ncs/jcjust2.ncs b/_module/ncs/jcjust2.ncs index c261c63b..caf64994 100644 Binary files a/_module/ncs/jcjust2.ncs and b/_module/ncs/jcjust2.ncs differ diff --git a/_module/ncs/jcjust4.ncs b/_module/ncs/jcjust4.ncs index 023a004a..f8f48436 100644 Binary files a/_module/ncs/jcjust4.ncs and b/_module/ncs/jcjust4.ncs differ diff --git a/_module/ncs/jckupra1.ncs b/_module/ncs/jckupra1.ncs index c0534dbb..aec1e4cd 100644 Binary files a/_module/ncs/jckupra1.ncs and b/_module/ncs/jckupra1.ncs differ diff --git a/_module/ncs/jckupra1x.ncs b/_module/ncs/jckupra1x.ncs index c2feb1e8..0fe147f7 100644 Binary files a/_module/ncs/jckupra1x.ncs and b/_module/ncs/jckupra1x.ncs differ diff --git a/_module/ncs/jclostaltar4.ncs b/_module/ncs/jclostaltar4.ncs index 001f87e4..79db3360 100644 Binary files a/_module/ncs/jclostaltar4.ncs and b/_module/ncs/jclostaltar4.ncs differ diff --git a/_module/ncs/jcmarth0.ncs b/_module/ncs/jcmarth0.ncs index 5e1d6a21..acb4a246 100644 Binary files a/_module/ncs/jcmarth0.ncs and b/_module/ncs/jcmarth0.ncs differ diff --git a/_module/ncs/jcmarthek1.ncs b/_module/ncs/jcmarthek1.ncs index 5e1d6a21..acb4a246 100644 Binary files a/_module/ncs/jcmarthek1.ncs and b/_module/ncs/jcmarthek1.ncs differ diff --git a/_module/ncs/jcmarthekk.ncs b/_module/ncs/jcmarthekk.ncs index e944954b..c7a43e33 100644 Binary files a/_module/ncs/jcmarthekk.ncs and b/_module/ncs/jcmarthekk.ncs differ diff --git a/_module/ncs/jcoutcasts1.ncs b/_module/ncs/jcoutcasts1.ncs index cd0754c3..97ab3e1f 100644 Binary files a/_module/ncs/jcoutcasts1.ncs and b/_module/ncs/jcoutcasts1.ncs differ diff --git a/_module/ncs/jcseals.ncs b/_module/ncs/jcseals.ncs index 35f20cfb..b96073c7 100644 Binary files a/_module/ncs/jcseals.ncs and b/_module/ncs/jcseals.ncs differ diff --git a/_module/ncs/jcspid0.ncs b/_module/ncs/jcspid0.ncs index f4b17be9..1c15e8d8 100644 Binary files a/_module/ncs/jcspid0.ncs and b/_module/ncs/jcspid0.ncs differ diff --git a/_module/ncs/jcspid1.ncs b/_module/ncs/jcspid1.ncs index c99a9ceb..70e069e9 100644 Binary files a/_module/ncs/jcspid1.ncs and b/_module/ncs/jcspid1.ncs differ diff --git a/_module/ncs/jcspid2.ncs b/_module/ncs/jcspid2.ncs index a06dee49..f3591a85 100644 Binary files a/_module/ncs/jcspid2.ncs and b/_module/ncs/jcspid2.ncs differ diff --git a/_module/ncs/jcyuanti.ncs b/_module/ncs/jcyuanti.ncs index 02ac089d..6f09472b 100644 Binary files a/_module/ncs/jcyuanti.ncs and b/_module/ncs/jcyuanti.ncs differ diff --git a/_module/ncs/journal_gnrc_oce.ncs b/_module/ncs/journal_gnrc_oce.ncs index 0483ea7d..87ef55f7 100644 Binary files a/_module/ncs/journal_gnrc_oce.ncs and b/_module/ncs/journal_gnrc_oce.ncs differ diff --git a/_module/ncs/journalcheck.ncs b/_module/ncs/journalcheck.ncs index 9e371fae..7159a8c1 100644 Binary files a/_module/ncs/journalcheck.ncs and b/_module/ncs/journalcheck.ncs differ diff --git a/_module/ncs/journalcheckcha1.ncs b/_module/ncs/journalcheckcha1.ncs index 5360cd49..7985381e 100644 Binary files a/_module/ncs/journalcheckcha1.ncs and b/_module/ncs/journalcheckcha1.ncs differ diff --git a/_module/ncs/journalcheckcha2.ncs b/_module/ncs/journalcheckcha2.ncs index dab34f96..0be639c6 100644 Binary files a/_module/ncs/journalcheckcha2.ncs and b/_module/ncs/journalcheckcha2.ncs differ diff --git a/_module/ncs/journalcheckdd3.ncs b/_module/ncs/journalcheckdd3.ncs index e1f0f4df..1768f140 100644 Binary files a/_module/ncs/journalcheckdd3.ncs and b/_module/ncs/journalcheckdd3.ncs differ diff --git a/_module/ncs/journalcheckdd4.ncs b/_module/ncs/journalcheckdd4.ncs index 4f483152..90f0447d 100644 Binary files a/_module/ncs/journalcheckdd4.ncs and b/_module/ncs/journalcheckdd4.ncs differ diff --git a/_module/ncs/journalcheckgs2l.ncs b/_module/ncs/journalcheckgs2l.ncs index 4e4cb709..65e64950 100644 Binary files a/_module/ncs/journalcheckgs2l.ncs and b/_module/ncs/journalcheckgs2l.ncs differ diff --git a/_module/ncs/journalcheckgs3g.ncs b/_module/ncs/journalcheckgs3g.ncs index c9a27356..c76b1cae 100644 Binary files a/_module/ncs/journalcheckgs3g.ncs and b/_module/ncs/journalcheckgs3g.ncs differ diff --git a/_module/ncs/journalcheckpri1.ncs b/_module/ncs/journalcheckpri1.ncs index 418640c5..bb052df2 100644 Binary files a/_module/ncs/journalcheckpri1.ncs and b/_module/ncs/journalcheckpri1.ncs differ diff --git a/_module/ncs/journalcheckspi1.ncs b/_module/ncs/journalcheckspi1.ncs index 4e6e61e0..62c49904 100644 Binary files a/_module/ncs/journalcheckspi1.ncs and b/_module/ncs/journalcheckspi1.ncs differ diff --git a/_module/ncs/journalchecktri0.ncs b/_module/ncs/journalchecktri0.ncs index eff8dde6..4b9767b9 100644 Binary files a/_module/ncs/journalchecktri0.ncs and b/_module/ncs/journalchecktri0.ncs differ diff --git a/_module/ncs/journalchecktri1.ncs b/_module/ncs/journalchecktri1.ncs index 2ccb1dd6..3674b02e 100644 Binary files a/_module/ncs/journalchecktri1.ncs and b/_module/ncs/journalchecktri1.ncs differ diff --git a/_module/ncs/journalchecktri3.ncs b/_module/ncs/journalchecktri3.ncs index 58b12629..9efd90df 100644 Binary files a/_module/ncs/journalchecktri3.ncs and b/_module/ncs/journalchecktri3.ncs differ diff --git a/_module/ncs/journalchecktri4.ncs b/_module/ncs/journalchecktri4.ncs index 97f6f8ba..654b152f 100644 Binary files a/_module/ncs/journalchecktri4.ncs and b/_module/ncs/journalchecktri4.ncs differ diff --git a/_module/ncs/journalchecktri5.ncs b/_module/ncs/journalchecktri5.ncs index 98e9ac09..ba42f9fe 100644 Binary files a/_module/ncs/journalchecktri5.ncs and b/_module/ncs/journalchecktri5.ncs differ diff --git a/_module/ncs/journalchecktri7.ncs b/_module/ncs/journalchecktri7.ncs index 516b127f..8b8accff 100644 Binary files a/_module/ncs/journalchecktri7.ncs and b/_module/ncs/journalchecktri7.ncs differ diff --git a/_module/ncs/journalchecktri8.ncs b/_module/ncs/journalchecktri8.ncs index e7ad6336..7723458d 100644 Binary files a/_module/ncs/journalchecktri8.ncs and b/_module/ncs/journalchecktri8.ncs differ diff --git a/_module/ncs/justicar1.ncs b/_module/ncs/justicar1.ncs index 99232f0b..18dd2857 100644 Binary files a/_module/ncs/justicar1.ncs and b/_module/ncs/justicar1.ncs differ diff --git a/_module/ncs/justicar2.ncs b/_module/ncs/justicar2.ncs index 891a25c0..81dd2fb3 100644 Binary files a/_module/ncs/justicar2.ncs and b/_module/ncs/justicar2.ncs differ diff --git a/_module/ncs/justvaldoor.ncs b/_module/ncs/justvaldoor.ncs index c7ae544d..1196b537 100644 Binary files a/_module/ncs/justvaldoor.ncs and b/_module/ncs/justvaldoor.ncs differ diff --git a/_module/ncs/keepinchair.ncs b/_module/ncs/keepinchair.ncs index cb692d4a..56461c55 100644 Binary files a/_module/ncs/keepinchair.ncs and b/_module/ncs/keepinchair.ncs differ diff --git a/_module/ncs/keypillar1.ncs b/_module/ncs/keypillar1.ncs index 8289d44f..0f45ff05 100644 Binary files a/_module/ncs/keypillar1.ncs and b/_module/ncs/keypillar1.ncs differ diff --git a/_module/ncs/lakecryptport.ncs b/_module/ncs/lakecryptport.ncs index 1e1d7dff..8f0bed21 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 46c17179..e54788a5 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 5d89ee77..a41a7edd 100644 Binary files a/_module/ncs/latrene_rope.ncs and b/_module/ncs/latrene_rope.ncs differ diff --git a/_module/ncs/lcheck1.ncs b/_module/ncs/lcheck1.ncs index 23d78683..7891fc72 100644 Binary files a/_module/ncs/lcheck1.ncs and b/_module/ncs/lcheck1.ncs differ diff --git a/_module/ncs/lightrayconv1.ncs b/_module/ncs/lightrayconv1.ncs index 4db1253c..3fd07d92 100644 Binary files a/_module/ncs/lightrayconv1.ncs and b/_module/ncs/lightrayconv1.ncs differ diff --git a/_module/ncs/lockflooddoor.ncs b/_module/ncs/lockflooddoor.ncs index 736ff4fa..76470401 100644 Binary files a/_module/ncs/lockflooddoor.ncs and b/_module/ncs/lockflooddoor.ncs differ diff --git a/_module/ncs/losexponresp.ncs b/_module/ncs/losexponresp.ncs index d4edc57c..5262112a 100644 Binary files a/_module/ncs/losexponresp.ncs and b/_module/ncs/losexponresp.ncs differ diff --git a/_module/ncs/lostaltar4.ncs b/_module/ncs/lostaltar4.ncs index 401b93c3..b6a5cfd8 100644 Binary files a/_module/ncs/lostaltar4.ncs and b/_module/ncs/lostaltar4.ncs differ diff --git a/_module/ncs/lostaltarstart.ncs b/_module/ncs/lostaltarstart.ncs index 849266a9..3f7b8cda 100644 Binary files a/_module/ncs/lostaltarstart.ncs and b/_module/ncs/lostaltarstart.ncs differ diff --git a/_module/ncs/lowdamageent.ncs b/_module/ncs/lowdamageent.ncs index 18a3f920..8c965791 100644 Binary files a/_module/ncs/lowdamageent.ncs and b/_module/ncs/lowdamageent.ncs differ diff --git a/_module/ncs/lvl01_bone_src10.ncs b/_module/ncs/lvl01_bone_src10.ncs index 7dfd4ed9..5e27bd07 100644 Binary files a/_module/ncs/lvl01_bone_src10.ncs and b/_module/ncs/lvl01_bone_src10.ncs differ diff --git a/_module/ncs/lvl01_bone_srch5.ncs b/_module/ncs/lvl01_bone_srch5.ncs index f1d4dfcc..0e7d165c 100644 Binary files a/_module/ncs/lvl01_bone_srch5.ncs and b/_module/ncs/lvl01_bone_srch5.ncs differ diff --git a/_module/ncs/lvl_drain_onhit.ncs b/_module/ncs/lvl_drain_onhit.ncs index 7e3979ac..21d7d88f 100644 Binary files a/_module/ncs/lvl_drain_onhit.ncs and b/_module/ncs/lvl_drain_onhit.ncs differ diff --git a/_module/ncs/lw_trap_ondisarm.ncs b/_module/ncs/lw_trap_ondisarm.ncs index 031b2f4d..d528c835 100644 Binary files a/_module/ncs/lw_trap_ondisarm.ncs and b/_module/ncs/lw_trap_ondisarm.ncs differ diff --git a/_module/ncs/lycan_userdef.ncs b/_module/ncs/lycan_userdef.ncs index 50af9e4c..82d9c992 100644 Binary files a/_module/ncs/lycan_userdef.ncs and b/_module/ncs/lycan_userdef.ncs differ diff --git a/_module/ncs/medamageent.ncs b/_module/ncs/medamageent.ncs index 77c36162..ce1db9ee 100644 Binary files a/_module/ncs/medamageent.ncs and b/_module/ncs/medamageent.ncs differ diff --git a/_module/ncs/melody1.ncs b/_module/ncs/melody1.ncs index 194d3758..236aded6 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 21faa160..bce0b0d9 100644 Binary files a/_module/ncs/melody2.ncs and b/_module/ncs/melody2.ncs differ diff --git a/_module/ncs/melody3.ncs b/_module/ncs/melody3.ncs index e0ac4dd4..17d52e1d 100644 Binary files a/_module/ncs/melody3.ncs and b/_module/ncs/melody3.ncs differ diff --git a/_module/ncs/menaktomb1.ncs b/_module/ncs/menaktomb1.ncs index ab999e36..9bddb5a3 100644 Binary files a/_module/ncs/menaktomb1.ncs and b/_module/ncs/menaktomb1.ncs differ diff --git a/_module/ncs/menaktombtel.ncs b/_module/ncs/menaktombtel.ncs index 9cb400c7..482e1e7d 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 4e05d50a..247015c4 100644 Binary files a/_module/ncs/menaktombtel1.ncs and b/_module/ncs/menaktombtel1.ncs differ diff --git a/_module/ncs/merc_templestore.ncs b/_module/ncs/merc_templestore.ncs index 7106df26..dab93b56 100644 Binary files a/_module/ncs/merc_templestore.ncs and b/_module/ncs/merc_templestore.ncs differ diff --git a/_module/ncs/merc_tmpl_check.ncs b/_module/ncs/merc_tmpl_check.ncs index 7839abfe..c1185500 100644 Binary files a/_module/ncs/merc_tmpl_check.ncs and b/_module/ncs/merc_tmpl_check.ncs differ diff --git a/_module/ncs/meteordoor.ncs b/_module/ncs/meteordoor.ncs index 63dca593..a1fd00a5 100644 Binary files a/_module/ncs/meteordoor.ncs and b/_module/ncs/meteordoor.ncs differ diff --git a/_module/ncs/meteoronopen.ncs b/_module/ncs/meteoronopen.ncs index b46dd6d5..39d7fa71 100644 Binary files a/_module/ncs/meteoronopen.ncs and b/_module/ncs/meteoronopen.ncs differ diff --git a/_module/ncs/mindpoolbad.ncs b/_module/ncs/mindpoolbad.ncs index 84c1f905..c1529680 100644 Binary files a/_module/ncs/mindpoolbad.ncs and b/_module/ncs/mindpoolbad.ncs differ diff --git a/_module/ncs/mmheart.ncs b/_module/ncs/mmheart.ncs index b28da652..9c2757d9 100644 Binary files a/_module/ncs/mmheart.ncs and b/_module/ncs/mmheart.ncs differ diff --git a/_module/ncs/mmlife.ncs b/_module/ncs/mmlife.ncs index c0755ab3..ec35ee41 100644 Binary files a/_module/ncs/mmlife.ncs and b/_module/ncs/mmlife.ncs differ diff --git a/_module/ncs/mmlife1.ncs b/_module/ncs/mmlife1.ncs index 88566777..ffd2f657 100644 Binary files a/_module/ncs/mmlife1.ncs and b/_module/ncs/mmlife1.ncs differ diff --git a/_module/ncs/mmmind.ncs b/_module/ncs/mmmind.ncs index c1a2b99a..a35ca931 100644 Binary files a/_module/ncs/mmmind.ncs and b/_module/ncs/mmmind.ncs differ diff --git a/_module/ncs/mod_ctrl_bk_set.ncs b/_module/ncs/mod_ctrl_bk_set.ncs index 6e123e98..09359fa9 100644 Binary files a/_module/ncs/mod_ctrl_bk_set.ncs and b/_module/ncs/mod_ctrl_bk_set.ncs differ diff --git a/_module/ncs/mod_gui.ncs b/_module/ncs/mod_gui.ncs index 0c35cca1..f7952b53 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 cb9963ea..bad69785 100644 Binary files a/_module/ncs/mod_nui.ncs and b/_module/ncs/mod_nui.ncs differ diff --git a/_module/ncs/mod_target.ncs b/_module/ncs/mod_target.ncs index 5208522c..b635b0a8 100644 Binary files a/_module/ncs/mod_target.ncs and b/_module/ncs/mod_target.ncs differ diff --git a/_module/ncs/neaura.ncs b/_module/ncs/neaura.ncs index 5be7a8fe..8d0d800c 100644 Binary files a/_module/ncs/neaura.ncs and b/_module/ncs/neaura.ncs differ diff --git a/_module/ncs/neaura1.ncs b/_module/ncs/neaura1.ncs index 69d7f5bd..422f512b 100644 Binary files a/_module/ncs/neaura1.ncs and b/_module/ncs/neaura1.ncs differ diff --git a/_module/ncs/neaura2.ncs b/_module/ncs/neaura2.ncs index 8228ef68..80dc0c6f 100644 Binary files a/_module/ncs/neaura2.ncs and b/_module/ncs/neaura2.ncs differ diff --git a/_module/ncs/neaura3.ncs b/_module/ncs/neaura3.ncs index de00e5b0..f8566c72 100644 Binary files a/_module/ncs/neaura3.ncs and b/_module/ncs/neaura3.ncs differ diff --git a/_module/ncs/newmenak1.ncs b/_module/ncs/newmenak1.ncs index 26891830..060be928 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 a3e5f9b6..51d84088 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_blk.ncs b/_module/ncs/no_ai_blk.ncs index 4187cdae..b7806759 100644 Binary files a/_module/ncs/no_ai_blk.ncs and b/_module/ncs/no_ai_blk.ncs differ diff --git a/_module/ncs/no_ai_cmb.ncs b/_module/ncs/no_ai_cmb.ncs index 69595261..30e2649b 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 3c4bcf7a..62271e52 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 d603effa..16ac0ff5 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 4f934df9..7c4966b9 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 c9878374..9c1b7a5e 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 9b402c59..870f95ef 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 167d9076..fa3ef0e1 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 1038f9a4..74508775 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_logeq.ncs b/_module/ncs/no_scr_logeq.ncs index 46566fda..f0289591 100644 Binary files a/_module/ncs/no_scr_logeq.ncs and b/_module/ncs/no_scr_logeq.ncs differ diff --git a/_module/ncs/no_scr_shutdown.ncs b/_module/ncs/no_scr_shutdown.ncs index 734a8a14..84a29f3c 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 dd183d09..dfaf5150 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 472379ba..0258e7e8 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 4b4ee356..f27dcc93 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 6c5220b7..96073c18 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 19e19b89..7740d856 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 9d71ba21..a8ed3184 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 f3c91fbd..89699b80 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 ae6f1d9a..93d653be 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 6c5220b7..96073c18 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 ebd186da..76ce1245 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 afe6a166..43a32e41 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 85298cae..3a9b4177 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 c9d8fa22..8be94853 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 a164dd12..6ce45ae2 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 cef7ed81..efbe73eb 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 19594283..2cb69b8a 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 dc3d703e..3ee0fdb0 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 23096c4b..430a9f88 100644 Binary files a/_module/ncs/no_spn_wiz.ncs and b/_module/ncs/no_spn_wiz.ncs differ diff --git a/_module/ncs/npcrecognew.ncs b/_module/ncs/npcrecognew.ncs index 26ccca35..ab1e7e59 100644 Binary files a/_module/ncs/npcrecognew.ncs and b/_module/ncs/npcrecognew.ncs differ diff --git a/_module/ncs/npcrecognknows.ncs b/_module/ncs/npcrecognknows.ncs index 28006fd1..22e9d101 100644 Binary files a/_module/ncs/npcrecognknows.ncs and b/_module/ncs/npcrecognknows.ncs differ diff --git a/_module/ncs/nui_f_storage.ncs b/_module/ncs/nui_f_storage.ncs index ccc9fe69..9cdc8389 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 9b54557d..eeaf5bbf 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 ecd94260..06e88d73 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 5a71a562..720f759e 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_onblocked.ncs b/_module/ncs/nw_ai_onblocked.ncs index 7a141d10..1fa0c3e9 100644 Binary files a/_module/ncs/nw_ai_onblocked.ncs and b/_module/ncs/nw_ai_onblocked.ncs differ diff --git a/_module/ncs/nw_ai_onconvers.ncs b/_module/ncs/nw_ai_onconvers.ncs index 57523caa..20ecc349 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 91900703..ab36d431 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_ondeath.ncs b/_module/ncs/nw_ai_ondeath.ncs index fffc8942..58d4f2d3 100644 Binary files a/_module/ncs/nw_ai_ondeath.ncs and b/_module/ncs/nw_ai_ondeath.ncs differ diff --git a/_module/ncs/nw_ai_ondisturb.ncs b/_module/ncs/nw_ai_ondisturb.ncs index a270f6e5..dd6ddea4 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 3eae63ab..0b26d7a9 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 bedd63e2..d8a859d6 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 fbb8d2c0..28d45e77 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_bossdie.ncs b/_module/ncs/nw_c2_bossdie.ncs index 00c9424e..2e198a48 100644 Binary files a/_module/ncs/nw_c2_bossdie.ncs and b/_module/ncs/nw_c2_bossdie.ncs differ diff --git a/_module/ncs/nw_c2_bossspawn.ncs b/_module/ncs/nw_c2_bossspawn.ncs index a1b2b349..9ed5af09 100644 Binary files a/_module/ncs/nw_c2_bossspawn.ncs and b/_module/ncs/nw_c2_bossspawn.ncs differ diff --git a/_module/ncs/nw_c2_vampireg9.ncs b/_module/ncs/nw_c2_vampireg9.ncs new file mode 100644 index 00000000..c5136321 Binary files /dev/null and b/_module/ncs/nw_c2_vampireg9.ncs differ diff --git a/_module/ncs/nw_s0_remeffect.ncs b/_module/ncs/nw_s0_remeffect.ncs index fbb2832e..46ed39d0 100644 Binary files a/_module/ncs/nw_s0_remeffect.ncs and b/_module/ncs/nw_s0_remeffect.ncs differ diff --git a/_module/ncs/nw_s1_aurablnda.ncs b/_module/ncs/nw_s1_aurablnda.ncs index 376b84a9..69a359eb 100644 Binary files a/_module/ncs/nw_s1_aurablnda.ncs and b/_module/ncs/nw_s1_aurablnda.ncs differ diff --git a/_module/ncs/nw_s1_auracoldc.ncs b/_module/ncs/nw_s1_auracoldc.ncs index 841ab57b..25e81a48 100644 Binary files a/_module/ncs/nw_s1_auracoldc.ncs and b/_module/ncs/nw_s1_auracoldc.ncs differ diff --git a/_module/ncs/nw_s1_auraelecc.ncs b/_module/ncs/nw_s1_auraelecc.ncs index 6e622d99..7f66cf4b 100644 Binary files a/_module/ncs/nw_s1_auraelecc.ncs and b/_module/ncs/nw_s1_auraelecc.ncs differ diff --git a/_module/ncs/nw_s1_aurafirec.ncs b/_module/ncs/nw_s1_aurafirec.ncs index 50fe6329..7e37f9be 100644 Binary files a/_module/ncs/nw_s1_aurafirec.ncs and b/_module/ncs/nw_s1_aurafirec.ncs differ diff --git a/_module/ncs/nw_s1_auramenca.ncs b/_module/ncs/nw_s1_auramenca.ncs index ed889d3b..864f53e0 100644 Binary files a/_module/ncs/nw_s1_auramenca.ncs and b/_module/ncs/nw_s1_auramenca.ncs differ diff --git a/_module/ncs/nw_s1_auraprota.ncs b/_module/ncs/nw_s1_auraprota.ncs index 468539b7..cea1eeca 100644 Binary files a/_module/ncs/nw_s1_auraprota.ncs and b/_module/ncs/nw_s1_auraprota.ncs differ diff --git a/_module/ncs/nw_s1_aurastuna.ncs b/_module/ncs/nw_s1_aurastuna.ncs index 279ae960..93234a42 100644 Binary files a/_module/ncs/nw_s1_aurastuna.ncs and b/_module/ncs/nw_s1_aurastuna.ncs differ diff --git a/_module/ncs/nw_s1_auraunata.ncs b/_module/ncs/nw_s1_auraunata.ncs index adac269e..8ebd9473 100644 Binary files a/_module/ncs/nw_s1_auraunata.ncs and b/_module/ncs/nw_s1_auraunata.ncs differ diff --git a/_module/ncs/nw_s1_aurauneaa.ncs b/_module/ncs/nw_s1_aurauneaa.ncs index f2ae3376..fc49bf0b 100644 Binary files a/_module/ncs/nw_s1_aurauneaa.ncs and b/_module/ncs/nw_s1_aurauneaa.ncs differ diff --git a/_module/ncs/nw_s1_bltacid.ncs b/_module/ncs/nw_s1_bltacid.ncs index 9e9d57ba..fcf323ee 100644 Binary files a/_module/ncs/nw_s1_bltacid.ncs and b/_module/ncs/nw_s1_bltacid.ncs differ diff --git a/_module/ncs/nw_s1_bltcharm.ncs b/_module/ncs/nw_s1_bltcharm.ncs index 60db2a78..fa6e617e 100644 Binary files a/_module/ncs/nw_s1_bltcharm.ncs and b/_module/ncs/nw_s1_bltcharm.ncs differ diff --git a/_module/ncs/nw_s1_bltchrdr.ncs b/_module/ncs/nw_s1_bltchrdr.ncs index d86707e7..8f99f487 100644 Binary files a/_module/ncs/nw_s1_bltchrdr.ncs and b/_module/ncs/nw_s1_bltchrdr.ncs differ diff --git a/_module/ncs/nw_s1_bltcold.ncs b/_module/ncs/nw_s1_bltcold.ncs index 373a803b..09b19ff3 100644 Binary files a/_module/ncs/nw_s1_bltcold.ncs and b/_module/ncs/nw_s1_bltcold.ncs differ diff --git a/_module/ncs/nw_s1_bltcondr.ncs b/_module/ncs/nw_s1_bltcondr.ncs index e8c357f8..5320de0b 100644 Binary files a/_module/ncs/nw_s1_bltcondr.ncs and b/_module/ncs/nw_s1_bltcondr.ncs differ diff --git a/_module/ncs/nw_s1_bltconf.ncs b/_module/ncs/nw_s1_bltconf.ncs index 914f4a12..8b56a10f 100644 Binary files a/_module/ncs/nw_s1_bltconf.ncs and b/_module/ncs/nw_s1_bltconf.ncs differ diff --git a/_module/ncs/nw_s1_bltdaze.ncs b/_module/ncs/nw_s1_bltdaze.ncs index 708985f1..5ae5e301 100644 Binary files a/_module/ncs/nw_s1_bltdaze.ncs and b/_module/ncs/nw_s1_bltdaze.ncs differ diff --git a/_module/ncs/nw_s1_bltdeath.ncs b/_module/ncs/nw_s1_bltdeath.ncs index c1ecd7d8..b66c290a 100644 Binary files a/_module/ncs/nw_s1_bltdeath.ncs and b/_module/ncs/nw_s1_bltdeath.ncs differ diff --git a/_module/ncs/nw_s1_bltdexdr.ncs b/_module/ncs/nw_s1_bltdexdr.ncs index ecc29838..863e85b3 100644 Binary files a/_module/ncs/nw_s1_bltdexdr.ncs and b/_module/ncs/nw_s1_bltdexdr.ncs differ diff --git a/_module/ncs/nw_s1_bltdisese.ncs b/_module/ncs/nw_s1_bltdisese.ncs index 8580d056..d90e269e 100644 Binary files a/_module/ncs/nw_s1_bltdisese.ncs and b/_module/ncs/nw_s1_bltdisese.ncs differ diff --git a/_module/ncs/nw_s1_bltdomn.ncs b/_module/ncs/nw_s1_bltdomn.ncs index ab8a4bea..063a3899 100644 Binary files a/_module/ncs/nw_s1_bltdomn.ncs and b/_module/ncs/nw_s1_bltdomn.ncs differ diff --git a/_module/ncs/nw_s1_bltfire.ncs b/_module/ncs/nw_s1_bltfire.ncs index cf13feaf..dd3f0df3 100644 Binary files a/_module/ncs/nw_s1_bltfire.ncs and b/_module/ncs/nw_s1_bltfire.ncs differ diff --git a/_module/ncs/nw_s1_bltintdr.ncs b/_module/ncs/nw_s1_bltintdr.ncs index 33b3da46..732cb9d4 100644 Binary files a/_module/ncs/nw_s1_bltintdr.ncs and b/_module/ncs/nw_s1_bltintdr.ncs differ diff --git a/_module/ncs/nw_s1_bltknckd.ncs b/_module/ncs/nw_s1_bltknckd.ncs index 5c098196..398ff64c 100644 Binary files a/_module/ncs/nw_s1_bltknckd.ncs and b/_module/ncs/nw_s1_bltknckd.ncs differ diff --git a/_module/ncs/nw_s1_bltlightn.ncs b/_module/ncs/nw_s1_bltlightn.ncs index 93155270..7971f256 100644 Binary files a/_module/ncs/nw_s1_bltlightn.ncs and b/_module/ncs/nw_s1_bltlightn.ncs differ diff --git a/_module/ncs/nw_s1_bltlvldr.ncs b/_module/ncs/nw_s1_bltlvldr.ncs index c70c291b..ccc14520 100644 Binary files a/_module/ncs/nw_s1_bltlvldr.ncs and b/_module/ncs/nw_s1_bltlvldr.ncs differ diff --git a/_module/ncs/nw_s1_bltparal.ncs b/_module/ncs/nw_s1_bltparal.ncs index 352beb7c..315054f4 100644 Binary files a/_module/ncs/nw_s1_bltparal.ncs and b/_module/ncs/nw_s1_bltparal.ncs differ diff --git a/_module/ncs/nw_s1_bltpoison.ncs b/_module/ncs/nw_s1_bltpoison.ncs index d7368cb1..f4a5a40c 100644 Binary files a/_module/ncs/nw_s1_bltpoison.ncs and b/_module/ncs/nw_s1_bltpoison.ncs differ diff --git a/_module/ncs/nw_s1_bltshards.ncs b/_module/ncs/nw_s1_bltshards.ncs index b260bb75..f2b68769 100644 Binary files a/_module/ncs/nw_s1_bltshards.ncs and b/_module/ncs/nw_s1_bltshards.ncs differ diff --git a/_module/ncs/nw_s1_bltslow.ncs b/_module/ncs/nw_s1_bltslow.ncs index 779dedd9..ab2bf8f8 100644 Binary files a/_module/ncs/nw_s1_bltslow.ncs and b/_module/ncs/nw_s1_bltslow.ncs differ diff --git a/_module/ncs/nw_s1_bltstrdr.ncs b/_module/ncs/nw_s1_bltstrdr.ncs index 7ecf22e8..4406f768 100644 Binary files a/_module/ncs/nw_s1_bltstrdr.ncs and b/_module/ncs/nw_s1_bltstrdr.ncs differ diff --git a/_module/ncs/nw_s1_bltstun.ncs b/_module/ncs/nw_s1_bltstun.ncs index 0b8993e3..b37d887d 100644 Binary files a/_module/ncs/nw_s1_bltstun.ncs and b/_module/ncs/nw_s1_bltstun.ncs differ diff --git a/_module/ncs/nw_s1_bltweb.ncs b/_module/ncs/nw_s1_bltweb.ncs index 25d622a0..2905142f 100644 Binary files a/_module/ncs/nw_s1_bltweb.ncs and b/_module/ncs/nw_s1_bltweb.ncs differ diff --git a/_module/ncs/nw_s1_bltwisdr.ncs b/_module/ncs/nw_s1_bltwisdr.ncs index f357cf1b..cb603217 100644 Binary files a/_module/ncs/nw_s1_bltwisdr.ncs and b/_module/ncs/nw_s1_bltwisdr.ncs differ diff --git a/_module/ncs/nw_s1_coneacid.ncs b/_module/ncs/nw_s1_coneacid.ncs index bad07028..5207fc55 100644 Binary files a/_module/ncs/nw_s1_coneacid.ncs and b/_module/ncs/nw_s1_coneacid.ncs differ diff --git a/_module/ncs/nw_s1_conecold.ncs b/_module/ncs/nw_s1_conecold.ncs index 21c9e7e2..791c1169 100644 Binary files a/_module/ncs/nw_s1_conecold.ncs and b/_module/ncs/nw_s1_conecold.ncs differ diff --git a/_module/ncs/nw_s1_conedisea.ncs b/_module/ncs/nw_s1_conedisea.ncs index 3bac3ebd..7ddb012d 100644 Binary files a/_module/ncs/nw_s1_conedisea.ncs and b/_module/ncs/nw_s1_conedisea.ncs differ diff --git a/_module/ncs/nw_s1_coneelec.ncs b/_module/ncs/nw_s1_coneelec.ncs index f1cfdc77..0e501463 100644 Binary files a/_module/ncs/nw_s1_coneelec.ncs and b/_module/ncs/nw_s1_coneelec.ncs differ diff --git a/_module/ncs/nw_s1_conesonic.ncs b/_module/ncs/nw_s1_conesonic.ncs index f7b256b4..df174169 100644 Binary files a/_module/ncs/nw_s1_conesonic.ncs and b/_module/ncs/nw_s1_conesonic.ncs differ diff --git a/_module/ncs/nw_s1_dragcold.ncs b/_module/ncs/nw_s1_dragcold.ncs index fc176e2d..1386a562 100644 Binary files a/_module/ncs/nw_s1_dragcold.ncs and b/_module/ncs/nw_s1_dragcold.ncs differ diff --git a/_module/ncs/nw_s1_dragfear.ncs b/_module/ncs/nw_s1_dragfear.ncs index e0a66afa..56b6f976 100644 Binary files a/_module/ncs/nw_s1_dragfear.ncs and b/_module/ncs/nw_s1_dragfear.ncs differ diff --git a/_module/ncs/nw_s1_dragfeara.ncs b/_module/ncs/nw_s1_dragfeara.ncs index 717ef4f6..73206fbb 100644 Binary files a/_module/ncs/nw_s1_dragfeara.ncs and b/_module/ncs/nw_s1_dragfeara.ncs differ diff --git a/_module/ncs/nw_s1_feroc3.ncs b/_module/ncs/nw_s1_feroc3.ncs index 25681cda..dfb32e00 100644 Binary files a/_module/ncs/nw_s1_feroc3.ncs and b/_module/ncs/nw_s1_feroc3.ncs differ diff --git a/_module/ncs/nw_s1_gazechaos.ncs b/_module/ncs/nw_s1_gazechaos.ncs index 584a1fd8..c1fc41f3 100644 Binary files a/_module/ncs/nw_s1_gazechaos.ncs and b/_module/ncs/nw_s1_gazechaos.ncs differ diff --git a/_module/ncs/nw_s1_gazecharm.ncs b/_module/ncs/nw_s1_gazecharm.ncs index b27cd59f..dedb2e76 100644 Binary files a/_module/ncs/nw_s1_gazecharm.ncs and b/_module/ncs/nw_s1_gazecharm.ncs differ diff --git a/_module/ncs/nw_s1_gazeconfu.ncs b/_module/ncs/nw_s1_gazeconfu.ncs index f5a010fd..bbb37a13 100644 Binary files a/_module/ncs/nw_s1_gazeconfu.ncs and b/_module/ncs/nw_s1_gazeconfu.ncs differ diff --git a/_module/ncs/nw_s1_gazedaze.ncs b/_module/ncs/nw_s1_gazedaze.ncs index d63fc808..8b1cb514 100644 Binary files a/_module/ncs/nw_s1_gazedaze.ncs and b/_module/ncs/nw_s1_gazedaze.ncs differ diff --git a/_module/ncs/nw_s1_gazedeath.ncs b/_module/ncs/nw_s1_gazedeath.ncs index 149369ae..e1299381 100644 Binary files a/_module/ncs/nw_s1_gazedeath.ncs and b/_module/ncs/nw_s1_gazedeath.ncs differ diff --git a/_module/ncs/nw_s1_gazedomn.ncs b/_module/ncs/nw_s1_gazedomn.ncs index ec2f33fe..9faa11f3 100644 Binary files a/_module/ncs/nw_s1_gazedomn.ncs and b/_module/ncs/nw_s1_gazedomn.ncs differ diff --git a/_module/ncs/nw_s1_gazedoom.ncs b/_module/ncs/nw_s1_gazedoom.ncs index 9b0f39ad..64536771 100644 Binary files a/_module/ncs/nw_s1_gazedoom.ncs and b/_module/ncs/nw_s1_gazedoom.ncs differ diff --git a/_module/ncs/nw_s1_gazeevil.ncs b/_module/ncs/nw_s1_gazeevil.ncs index d5e209d4..b7872e4f 100644 Binary files a/_module/ncs/nw_s1_gazeevil.ncs and b/_module/ncs/nw_s1_gazeevil.ncs differ diff --git a/_module/ncs/nw_s1_gazefear.ncs b/_module/ncs/nw_s1_gazefear.ncs index bb9fe902..07fed1db 100644 Binary files a/_module/ncs/nw_s1_gazefear.ncs and b/_module/ncs/nw_s1_gazefear.ncs differ diff --git a/_module/ncs/nw_s1_gazegood.ncs b/_module/ncs/nw_s1_gazegood.ncs index 33deeef8..d7913d22 100644 Binary files a/_module/ncs/nw_s1_gazegood.ncs and b/_module/ncs/nw_s1_gazegood.ncs differ diff --git a/_module/ncs/nw_s1_gazelaw.ncs b/_module/ncs/nw_s1_gazelaw.ncs index c4d06dc9..7734b067 100644 Binary files a/_module/ncs/nw_s1_gazelaw.ncs and b/_module/ncs/nw_s1_gazelaw.ncs differ diff --git a/_module/ncs/nw_s1_gazestun.ncs b/_module/ncs/nw_s1_gazestun.ncs index 717ed05c..e07d7137 100644 Binary files a/_module/ncs/nw_s1_gazestun.ncs and b/_module/ncs/nw_s1_gazestun.ncs differ diff --git a/_module/ncs/nw_s1_golemgas.ncs b/_module/ncs/nw_s1_golemgas.ncs index 5d6dbb86..efb74eeb 100644 Binary files a/_module/ncs/nw_s1_golemgas.ncs and b/_module/ncs/nw_s1_golemgas.ncs differ diff --git a/_module/ncs/nw_s1_hndbreath.ncs b/_module/ncs/nw_s1_hndbreath.ncs index aa1ea7e9..17a00299 100644 Binary files a/_module/ncs/nw_s1_hndbreath.ncs and b/_module/ncs/nw_s1_hndbreath.ncs differ diff --git a/_module/ncs/nw_s1_howlconf.ncs b/_module/ncs/nw_s1_howlconf.ncs index 10cd0209..09a038a2 100644 Binary files a/_module/ncs/nw_s1_howlconf.ncs and b/_module/ncs/nw_s1_howlconf.ncs differ diff --git a/_module/ncs/nw_s1_howldaze.ncs b/_module/ncs/nw_s1_howldaze.ncs index 82237ef9..606f8bda 100644 Binary files a/_module/ncs/nw_s1_howldaze.ncs and b/_module/ncs/nw_s1_howldaze.ncs differ diff --git a/_module/ncs/nw_s1_howldeath.ncs b/_module/ncs/nw_s1_howldeath.ncs index 06fe047f..1e7e120e 100644 Binary files a/_module/ncs/nw_s1_howldeath.ncs and b/_module/ncs/nw_s1_howldeath.ncs differ diff --git a/_module/ncs/nw_s1_howlfear.ncs b/_module/ncs/nw_s1_howlfear.ncs index a2af6c1e..1878ff22 100644 Binary files a/_module/ncs/nw_s1_howlfear.ncs and b/_module/ncs/nw_s1_howlfear.ncs differ diff --git a/_module/ncs/nw_s1_howlparal.ncs b/_module/ncs/nw_s1_howlparal.ncs index aed44157..b3899ae6 100644 Binary files a/_module/ncs/nw_s1_howlparal.ncs and b/_module/ncs/nw_s1_howlparal.ncs differ diff --git a/_module/ncs/nw_s1_howlsonic.ncs b/_module/ncs/nw_s1_howlsonic.ncs index 62c88721..5ea39cc0 100644 Binary files a/_module/ncs/nw_s1_howlsonic.ncs and b/_module/ncs/nw_s1_howlsonic.ncs differ diff --git a/_module/ncs/nw_s1_howlstun.ncs b/_module/ncs/nw_s1_howlstun.ncs index b2d068a1..49a24c20 100644 Binary files a/_module/ncs/nw_s1_howlstun.ncs and b/_module/ncs/nw_s1_howlstun.ncs differ diff --git a/_module/ncs/nw_s1_krenscare.ncs b/_module/ncs/nw_s1_krenscare.ncs index 484b8073..430d2a37 100644 Binary files a/_module/ncs/nw_s1_krenscare.ncs and b/_module/ncs/nw_s1_krenscare.ncs differ diff --git a/_module/ncs/nw_s1_mephsalt.ncs b/_module/ncs/nw_s1_mephsalt.ncs index 0e92ae39..ab0b266e 100644 Binary files a/_module/ncs/nw_s1_mephsalt.ncs and b/_module/ncs/nw_s1_mephsalt.ncs differ diff --git a/_module/ncs/nw_s1_mephsteam.ncs b/_module/ncs/nw_s1_mephsteam.ncs index 91107e1c..ba8664b5 100644 Binary files a/_module/ncs/nw_s1_mephsteam.ncs and b/_module/ncs/nw_s1_mephsteam.ncs differ diff --git a/_module/ncs/nw_s1_mumundead.ncs b/_module/ncs/nw_s1_mumundead.ncs index 6897b909..2205868c 100644 Binary files a/_module/ncs/nw_s1_mumundead.ncs and b/_module/ncs/nw_s1_mumundead.ncs differ diff --git a/_module/ncs/nw_s1_pulschrdr.ncs b/_module/ncs/nw_s1_pulschrdr.ncs index e3f8c5ac..1f7a0d22 100644 Binary files a/_module/ncs/nw_s1_pulschrdr.ncs and b/_module/ncs/nw_s1_pulschrdr.ncs differ diff --git a/_module/ncs/nw_s1_pulscold.ncs b/_module/ncs/nw_s1_pulscold.ncs index b17e5afb..de7893ff 100644 Binary files a/_module/ncs/nw_s1_pulscold.ncs and b/_module/ncs/nw_s1_pulscold.ncs differ diff --git a/_module/ncs/nw_s1_pulscondr.ncs b/_module/ncs/nw_s1_pulscondr.ncs index a1301921..4f364f04 100644 Binary files a/_module/ncs/nw_s1_pulscondr.ncs and b/_module/ncs/nw_s1_pulscondr.ncs differ diff --git a/_module/ncs/nw_s1_pulsdeath.ncs b/_module/ncs/nw_s1_pulsdeath.ncs index 230f564b..5f8049a9 100644 Binary files a/_module/ncs/nw_s1_pulsdeath.ncs and b/_module/ncs/nw_s1_pulsdeath.ncs differ diff --git a/_module/ncs/nw_s1_pulsdexdr.ncs b/_module/ncs/nw_s1_pulsdexdr.ncs index a2fd8841..c042b113 100644 Binary files a/_module/ncs/nw_s1_pulsdexdr.ncs and b/_module/ncs/nw_s1_pulsdexdr.ncs differ diff --git a/_module/ncs/nw_s1_pulsdis.ncs b/_module/ncs/nw_s1_pulsdis.ncs index 80e023b5..39c19bac 100644 Binary files a/_module/ncs/nw_s1_pulsdis.ncs and b/_module/ncs/nw_s1_pulsdis.ncs differ diff --git a/_module/ncs/nw_s1_pulselec.ncs b/_module/ncs/nw_s1_pulselec.ncs index 40fc5cfe..e8c36f9e 100644 Binary files a/_module/ncs/nw_s1_pulselec.ncs and b/_module/ncs/nw_s1_pulselec.ncs differ diff --git a/_module/ncs/nw_s1_pulsfire.ncs b/_module/ncs/nw_s1_pulsfire.ncs index 20f097e2..dd6247cc 100644 Binary files a/_module/ncs/nw_s1_pulsfire.ncs and b/_module/ncs/nw_s1_pulsfire.ncs differ diff --git a/_module/ncs/nw_s1_pulsholy.ncs b/_module/ncs/nw_s1_pulsholy.ncs index c2302071..91f2d46e 100644 Binary files a/_module/ncs/nw_s1_pulsholy.ncs and b/_module/ncs/nw_s1_pulsholy.ncs differ diff --git a/_module/ncs/nw_s1_pulsintdr.ncs b/_module/ncs/nw_s1_pulsintdr.ncs index 6730fc8f..44f629c2 100644 Binary files a/_module/ncs/nw_s1_pulsintdr.ncs and b/_module/ncs/nw_s1_pulsintdr.ncs differ diff --git a/_module/ncs/nw_s1_pulslvldr.ncs b/_module/ncs/nw_s1_pulslvldr.ncs index de1184e1..ba715d4e 100644 Binary files a/_module/ncs/nw_s1_pulslvldr.ncs and b/_module/ncs/nw_s1_pulslvldr.ncs differ diff --git a/_module/ncs/nw_s1_pulsneg.ncs b/_module/ncs/nw_s1_pulsneg.ncs index 373c0523..34c6acd3 100644 Binary files a/_module/ncs/nw_s1_pulsneg.ncs and b/_module/ncs/nw_s1_pulsneg.ncs differ diff --git a/_module/ncs/nw_s1_pulspois.ncs b/_module/ncs/nw_s1_pulspois.ncs index cafb629b..a381a67c 100644 Binary files a/_module/ncs/nw_s1_pulspois.ncs and b/_module/ncs/nw_s1_pulspois.ncs differ diff --git a/_module/ncs/nw_s1_pulsspore.ncs b/_module/ncs/nw_s1_pulsspore.ncs index 723d8559..4f7e5904 100644 Binary files a/_module/ncs/nw_s1_pulsspore.ncs and b/_module/ncs/nw_s1_pulsspore.ncs differ diff --git a/_module/ncs/nw_s1_pulsstrdr.ncs b/_module/ncs/nw_s1_pulsstrdr.ncs index aa85653d..63024147 100644 Binary files a/_module/ncs/nw_s1_pulsstrdr.ncs and b/_module/ncs/nw_s1_pulsstrdr.ncs differ diff --git a/_module/ncs/nw_s1_pulswind.ncs b/_module/ncs/nw_s1_pulswind.ncs index 92fccc72..09e520af 100644 Binary files a/_module/ncs/nw_s1_pulswind.ncs and b/_module/ncs/nw_s1_pulswind.ncs differ diff --git a/_module/ncs/nw_s1_pulswisdr.ncs b/_module/ncs/nw_s1_pulswisdr.ncs index 19253dea..1b33c9ab 100644 Binary files a/_module/ncs/nw_s1_pulswisdr.ncs and b/_module/ncs/nw_s1_pulswisdr.ncs differ diff --git a/_module/ncs/nw_s1_smokeclaw.ncs b/_module/ncs/nw_s1_smokeclaw.ncs index ebed03b3..85ee73d0 100644 Binary files a/_module/ncs/nw_s1_smokeclaw.ncs and b/_module/ncs/nw_s1_smokeclaw.ncs differ diff --git a/_module/ncs/nw_s1_stink_a.ncs b/_module/ncs/nw_s1_stink_a.ncs index bb2bc5b1..30142be8 100644 Binary files a/_module/ncs/nw_s1_stink_a.ncs and b/_module/ncs/nw_s1_stink_a.ncs differ diff --git a/_module/ncs/nw_s1_tyrantfga.ncs b/_module/ncs/nw_s1_tyrantfga.ncs index a28a1dfe..5ac4b254 100644 Binary files a/_module/ncs/nw_s1_tyrantfga.ncs and b/_module/ncs/nw_s1_tyrantfga.ncs differ diff --git a/_module/ncs/nw_s1_tyrantfog.ncs b/_module/ncs/nw_s1_tyrantfog.ncs index 609cad3b..8ba90b5d 100644 Binary files a/_module/ncs/nw_s1_tyrantfog.ncs and b/_module/ncs/nw_s1_tyrantfog.ncs differ diff --git a/_module/ncs/nw_s2_divprot.ncs b/_module/ncs/nw_s2_divprot.ncs index f82e4473..b28c6e6e 100644 Binary files a/_module/ncs/nw_s2_divprot.ncs and b/_module/ncs/nw_s2_divprot.ncs differ diff --git a/_module/ncs/nw_s3_actitem01.ncs b/_module/ncs/nw_s3_actitem01.ncs index f6b6fd88..edb8f578 100644 Binary files a/_module/ncs/nw_s3_actitem01.ncs and b/_module/ncs/nw_s3_actitem01.ncs differ diff --git a/_module/ncs/nw_s3_balordeth.ncs b/_module/ncs/nw_s3_balordeth.ncs index 3ea0a567..65837869 100644 Binary files a/_module/ncs/nw_s3_balordeth.ncs and b/_module/ncs/nw_s3_balordeth.ncs differ diff --git a/_module/ncs/obj_us_chest.ncs b/_module/ncs/obj_us_chest.ncs index 98e89c6c..63244d57 100644 Binary files a/_module/ncs/obj_us_chest.ncs and b/_module/ncs/obj_us_chest.ncs differ diff --git a/_module/ncs/object_respawner.ncs b/_module/ncs/object_respawner.ncs index a4e7ac88..de8e2b21 100644 Binary files a/_module/ncs/object_respawner.ncs and b/_module/ncs/object_respawner.ncs differ diff --git a/_module/ncs/oldhermit_onhb.ncs b/_module/ncs/oldhermit_onhb.ncs index a0761b28..edfc32ab 100644 Binary files a/_module/ncs/oldhermit_onhb.ncs and b/_module/ncs/oldhermit_onhb.ncs differ diff --git a/_module/ncs/on_pubsub.ncs b/_module/ncs/on_pubsub.ncs index 96cfa959..68c830ea 100644 Binary files a/_module/ncs/on_pubsub.ncs and b/_module/ncs/on_pubsub.ncs differ diff --git a/_module/ncs/ondam_commode.ncs b/_module/ncs/ondam_commode.ncs index c368e5a7..e99ff58c 100644 Binary files a/_module/ncs/ondam_commode.ncs and b/_module/ncs/ondam_commode.ncs differ diff --git a/_module/ncs/onspawn_ab.ncs b/_module/ncs/onspawn_ab.ncs index 708f3af2..98fc6016 100644 Binary files a/_module/ncs/onspawn_ab.ncs and b/_module/ncs/onspawn_ab.ncs differ diff --git a/_module/ncs/onspawn_glowred.ncs b/_module/ncs/onspawn_glowred.ncs index 85dac38e..f81eb6c8 100644 Binary files a/_module/ncs/onspawn_glowred.ncs and b/_module/ncs/onspawn_glowred.ncs differ diff --git a/_module/ncs/onspawn_outcast.ncs b/_module/ncs/onspawn_outcast.ncs index db989b31..44992355 100644 Binary files a/_module/ncs/onspawn_outcast.ncs and b/_module/ncs/onspawn_outcast.ncs differ diff --git a/_module/ncs/onspawn_regen.ncs b/_module/ncs/onspawn_regen.ncs index ba0baec4..8bf001c7 100644 Binary files a/_module/ncs/onspawn_regen.ncs and b/_module/ncs/onspawn_regen.ncs differ diff --git a/_module/ncs/onspawn_shadow.ncs b/_module/ncs/onspawn_shadow.ncs index 1aa4ec61..dcefca95 100644 Binary files a/_module/ncs/onspawn_shadow.ncs and b/_module/ncs/onspawn_shadow.ncs differ diff --git a/_module/ncs/onspell_infernal.ncs b/_module/ncs/onspell_infernal.ncs index 67c7eddd..3665b841 100644 Binary files a/_module/ncs/onspell_infernal.ncs and b/_module/ncs/onspell_infernal.ncs differ diff --git a/_module/ncs/orctohecstat.ncs b/_module/ncs/orctohecstat.ncs index cfac05c4..d7147ddb 100644 Binary files a/_module/ncs/orctohecstat.ncs and b/_module/ncs/orctohecstat.ncs differ diff --git a/_module/ncs/orcusdoor.ncs b/_module/ncs/orcusdoor.ncs index 34d0578a..978caabf 100644 Binary files a/_module/ncs/orcusdoor.ncs and b/_module/ncs/orcusdoor.ncs differ diff --git a/_module/ncs/ostland_onpercep.ncs b/_module/ncs/ostland_onpercep.ncs index 6f1d24db..73d121d8 100644 Binary files a/_module/ncs/ostland_onpercep.ncs and b/_module/ncs/ostland_onpercep.ncs differ diff --git a/_module/ncs/otres_cleanup_oe.ncs b/_module/ncs/otres_cleanup_oe.ncs index ed106544..f887e19a 100644 Binary files a/_module/ncs/otres_cleanup_oe.ncs and b/_module/ncs/otres_cleanup_oe.ncs differ diff --git a/_module/ncs/otres_cond.ncs b/_module/ncs/otres_cond.ncs index c735320b..2ed8c71c 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 a3e2048b..880d4cf5 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 448c7878..1271fe56 100644 Binary files a/_module/ncs/otres_cond3.ncs and b/_module/ncs/otres_cond3.ncs differ diff --git a/_module/ncs/otres_forestrand.ncs b/_module/ncs/otres_forestrand.ncs index 5c1e6dd8..44f76a2e 100644 Binary files a/_module/ncs/otres_forestrand.ncs and b/_module/ncs/otres_forestrand.ncs differ diff --git a/_module/ncs/otres_plainsrand.ncs b/_module/ncs/otres_plainsrand.ncs index 4468a238..22504769 100644 Binary files a/_module/ncs/otres_plainsrand.ncs and b/_module/ncs/otres_plainsrand.ncs differ diff --git a/_module/ncs/otres_rand_sc.ncs b/_module/ncs/otres_rand_sc.ncs index fb7a7df3..261b4317 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_randleavd2.ncs b/_module/ncs/otres_randleavd2.ncs index 5ee70b01..8ea50c70 100644 Binary files a/_module/ncs/otres_randleavd2.ncs and b/_module/ncs/otres_randleavd2.ncs differ diff --git a/_module/ncs/otres_re_leave.ncs b/_module/ncs/otres_re_leave.ncs index c7cc2185..4795c361 100644 Binary files a/_module/ncs/otres_re_leave.ncs and b/_module/ncs/otres_re_leave.ncs differ diff --git a/_module/ncs/otres_travelcall.ncs b/_module/ncs/otres_travelcall.ncs index 65cbe939..664b24dd 100644 Binary files a/_module/ncs/otres_travelcall.ncs and b/_module/ncs/otres_travelcall.ncs differ diff --git a/_module/ncs/paralyze_onhit.ncs b/_module/ncs/paralyze_onhit.ncs index 3ddf43a5..bfe212a7 100644 Binary files a/_module/ncs/paralyze_onhit.ncs and b/_module/ncs/paralyze_onhit.ncs differ diff --git a/_module/ncs/paralyzeonopen.ncs b/_module/ncs/paralyzeonopen.ncs index 89d13ffd..876e5bc5 100644 Binary files a/_module/ncs/paralyzeonopen.ncs and b/_module/ncs/paralyzeonopen.ncs differ diff --git a/_module/ncs/pc_room_onexit.ncs b/_module/ncs/pc_room_onexit.ncs index 7c8c1f32..c567d0c2 100644 Binary files a/_module/ncs/pc_room_onexit.ncs and b/_module/ncs/pc_room_onexit.ncs differ diff --git a/_module/ncs/petrifyonseen.ncs b/_module/ncs/petrifyonseen.ncs index 7de687b6..b169e44f 100644 Binary files a/_module/ncs/petrifyonseen.ncs and b/_module/ncs/petrifyonseen.ncs differ diff --git a/_module/ncs/phaethon_ai.ncs b/_module/ncs/phaethon_ai.ncs index c5cc8092..358af00d 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 531359d4..aa94ef27 100644 Binary files a/_module/ncs/pillarscript.ncs and b/_module/ncs/pillarscript.ncs differ diff --git a/_module/ncs/pitdespdown.ncs b/_module/ncs/pitdespdown.ncs index 076feffb..150af600 100644 Binary files a/_module/ncs/pitdespdown.ncs and b/_module/ncs/pitdespdown.ncs differ diff --git a/_module/ncs/pitdespup.ncs b/_module/ncs/pitdespup.ncs index 87b53c5f..f74461b9 100644 Binary files a/_module/ncs/pitdespup.ncs and b/_module/ncs/pitdespup.ncs differ diff --git a/_module/ncs/plague_blight.ncs b/_module/ncs/plague_blight.ncs index c5f8cb3b..dfb3ff92 100644 Binary files a/_module/ncs/plague_blight.ncs and b/_module/ncs/plague_blight.ncs differ diff --git a/_module/ncs/plagueaura.ncs b/_module/ncs/plagueaura.ncs index 1f6b93ad..08b972df 100644 Binary files a/_module/ncs/plagueaura.ncs and b/_module/ncs/plagueaura.ncs differ diff --git a/_module/ncs/plagueaura1.ncs b/_module/ncs/plagueaura1.ncs index 4e55e664..a2f9ee66 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 bc6047c5..f869be8b 100644 Binary files a/_module/ncs/plagueaura2.ncs and b/_module/ncs/plagueaura2.ncs differ diff --git a/_module/ncs/poolofmind.ncs b/_module/ncs/poolofmind.ncs index 5c6f0bf8..3a7e648a 100644 Binary files a/_module/ncs/poolofmind.ncs and b/_module/ncs/poolofmind.ncs differ diff --git a/_module/ncs/port3a10.ncs b/_module/ncs/port3a10.ncs index bf41ea09..e6833699 100644 Binary files a/_module/ncs/port3a10.ncs and b/_module/ncs/port3a10.ncs differ diff --git a/_module/ncs/port6central.ncs b/_module/ncs/port6central.ncs index 533e96c0..5e1afdbc 100644 Binary files a/_module/ncs/port6central.ncs and b/_module/ncs/port6central.ncs differ diff --git a/_module/ncs/port8lake1.ncs b/_module/ncs/port8lake1.ncs index 2ddd2b43..f76e60de 100644 Binary files a/_module/ncs/port8lake1.ncs and b/_module/ncs/port8lake1.ncs differ diff --git a/_module/ncs/portal_start.ncs b/_module/ncs/portal_start.ncs index 29224a67..1b2494bf 100644 Binary files a/_module/ncs/portal_start.ncs and b/_module/ncs/portal_start.ncs differ diff --git a/_module/ncs/portarenatopil.ncs b/_module/ncs/portarenatopil.ncs index 0b82f05c..fe122035 100644 Binary files a/_module/ncs/portarenatopil.ncs and b/_module/ncs/portarenatopil.ncs differ diff --git a/_module/ncs/portdowncliff.ncs b/_module/ncs/portdowncliff.ncs index 28e5c790..7f3c7cc3 100644 Binary files a/_module/ncs/portdowncliff.ncs and b/_module/ncs/portdowncliff.ncs differ diff --git a/_module/ncs/porthole.ncs b/_module/ncs/porthole.ncs index 085936b3..ac2160c5 100644 Binary files a/_module/ncs/porthole.ncs and b/_module/ncs/porthole.ncs differ diff --git a/_module/ncs/portjestyn1.ncs b/_module/ncs/portjestyn1.ncs index 8477bd86..b3155cc6 100644 Binary files a/_module/ncs/portjestyn1.ncs and b/_module/ncs/portjestyn1.ncs differ diff --git a/_module/ncs/portjestyn2.ncs b/_module/ncs/portjestyn2.ncs index 11adad04..03002770 100644 Binary files a/_module/ncs/portjestyn2.ncs and b/_module/ncs/portjestyn2.ncs differ diff --git a/_module/ncs/porto6a.ncs b/_module/ncs/porto6a.ncs index 068e4de5..1e853284 100644 Binary files a/_module/ncs/porto6a.ncs and b/_module/ncs/porto6a.ncs differ diff --git a/_module/ncs/portolevel1s.ncs b/_module/ncs/portolevel1s.ncs index ea03fa11..4fe51dd0 100644 Binary files a/_module/ncs/portolevel1s.ncs and b/_module/ncs/portolevel1s.ncs differ diff --git a/_module/ncs/portpc.ncs b/_module/ncs/portpc.ncs index 703bb11d..79777a9d 100644 Binary files a/_module/ncs/portpc.ncs and b/_module/ncs/portpc.ncs differ diff --git a/_module/ncs/portrock.ncs b/_module/ncs/portrock.ncs index 2394ae0a..425e21cc 100644 Binary files a/_module/ncs/portrock.ncs and b/_module/ncs/portrock.ncs differ diff --git a/_module/ncs/portrope.ncs b/_module/ncs/portrope.ncs index 9b2b9dcd..99716f9c 100644 Binary files a/_module/ncs/portrope.ncs and b/_module/ncs/portrope.ncs differ diff --git a/_module/ncs/portto6pit.ncs b/_module/ncs/portto6pit.ncs index 470521a1..3403994d 100644 Binary files a/_module/ncs/portto6pit.ncs and b/_module/ncs/portto6pit.ncs differ diff --git a/_module/ncs/porttoaragnak.ncs b/_module/ncs/porttoaragnak.ncs index 7bb15ea6..70304583 100644 Binary files a/_module/ncs/porttoaragnak.ncs and b/_module/ncs/porttoaragnak.ncs differ diff --git a/_module/ncs/porttogrove.ncs b/_module/ncs/porttogrove.ncs index bc8b33f1..455c0689 100644 Binary files a/_module/ncs/porttogrove.ncs and b/_module/ncs/porttogrove.ncs differ diff --git a/_module/ncs/porttotemple.ncs b/_module/ncs/porttotemple.ncs index f3faed81..a0d603d3 100644 Binary files a/_module/ncs/porttotemple.ncs and b/_module/ncs/porttotemple.ncs differ diff --git a/_module/ncs/porttowell.ncs b/_module/ncs/porttowell.ncs index 7cfbb376..c7889127 100644 Binary files a/_module/ncs/porttowell.ncs and b/_module/ncs/porttowell.ncs differ diff --git a/_module/ncs/portupcliff.ncs b/_module/ncs/portupcliff.ncs index 81955a8c..6907e410 100644 Binary files a/_module/ncs/portupcliff.ncs and b/_module/ncs/portupcliff.ncs differ diff --git a/_module/ncs/portuprope4a.ncs b/_module/ncs/portuprope4a.ncs index bfe0ccbb..76d54eec 100644 Binary files a/_module/ncs/portuprope4a.ncs and b/_module/ncs/portuprope4a.ncs differ diff --git a/_module/ncs/prism_aura.ncs b/_module/ncs/prism_aura.ncs index 90d330a0..f3296124 100644 Binary files a/_module/ncs/prism_aura.ncs and b/_module/ncs/prism_aura.ncs differ diff --git a/_module/ncs/prism_aura1.ncs b/_module/ncs/prism_aura1.ncs index 7f94aa4d..db0929cb 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 ac3f4ed6..eff0de5a 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 97591f98..63367dcf 100644 Binary files a/_module/ncs/purplewormbite.ncs and b/_module/ncs/purplewormbite.ncs differ diff --git a/_module/ncs/pw_dgland_repop.ncs b/_module/ncs/pw_dgland_repop.ncs index 557b8b08..c6a24f1c 100644 Binary files a/_module/ncs/pw_dgland_repop.ncs and b/_module/ncs/pw_dgland_repop.ncs differ diff --git a/_module/ncs/pw_enc_spawnin.ncs b/_module/ncs/pw_enc_spawnin.ncs index 93acc2fc..c267ca2f 100644 Binary files a/_module/ncs/pw_enc_spawnin.ncs and b/_module/ncs/pw_enc_spawnin.ncs differ diff --git a/_module/ncs/pw_on_spawn.ncs b/_module/ncs/pw_on_spawn.ncs index 319f0978..3d0b2810 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 8766717a..ac330b01 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 f456ffb9..2127d574 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 16dd2491..bc7f8512 100644 Binary files a/_module/ncs/pw_stmlng_dth.ncs and b/_module/ncs/pw_stmlng_dth.ncs differ diff --git a/_module/ncs/qn_onhit.ncs b/_module/ncs/qn_onhit.ncs index 482a6c35..66e0c8c4 100644 Binary files a/_module/ncs/qn_onhit.ncs and b/_module/ncs/qn_onhit.ncs differ diff --git a/_module/ncs/qst_altar_2nd.ncs b/_module/ncs/qst_altar_2nd.ncs index 3307cc77..cdf2d7cc 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_altar_3rd.ncs b/_module/ncs/qst_altar_3rd.ncs index 8cc936df..04352e5b 100644 Binary files a/_module/ncs/qst_altar_3rd.ncs and b/_module/ncs/qst_altar_3rd.ncs differ diff --git a/_module/ncs/qst_altar_end.ncs b/_module/ncs/qst_altar_end.ncs index 0c19422a..63785584 100644 Binary files a/_module/ncs/qst_altar_end.ncs and b/_module/ncs/qst_altar_end.ncs differ diff --git a/_module/ncs/qst_altar_start.ncs b/_module/ncs/qst_altar_start.ncs index 0d57a609..af8c88be 100644 Binary files a/_module/ncs/qst_altar_start.ncs and b/_module/ncs/qst_altar_start.ncs differ diff --git a/_module/ncs/qst_aragnak_01.ncs b/_module/ncs/qst_aragnak_01.ncs index 7b002447..a54f1d99 100644 Binary files a/_module/ncs/qst_aragnak_01.ncs and b/_module/ncs/qst_aragnak_01.ncs differ diff --git a/_module/ncs/qst_aragnak_chk.ncs b/_module/ncs/qst_aragnak_chk.ncs index aeaf0eac..b0729cfb 100644 Binary files a/_module/ncs/qst_aragnak_chk.ncs and b/_module/ncs/qst_aragnak_chk.ncs differ diff --git a/_module/ncs/qst_aragnak_end.ncs b/_module/ncs/qst_aragnak_end.ncs index 0653d4f2..0e1c230b 100644 Binary files a/_module/ncs/qst_aragnak_end.ncs and b/_module/ncs/qst_aragnak_end.ncs differ diff --git a/_module/ncs/qst_aragnak_strt.ncs b/_module/ncs/qst_aragnak_strt.ncs index 6c8f4c35..b40761b4 100644 Binary files a/_module/ncs/qst_aragnak_strt.ncs and b/_module/ncs/qst_aragnak_strt.ncs differ diff --git a/_module/ncs/qst_blood_end.ncs b/_module/ncs/qst_blood_end.ncs index 1e699c54..10626c23 100644 Binary files a/_module/ncs/qst_blood_end.ncs and b/_module/ncs/qst_blood_end.ncs differ diff --git a/_module/ncs/qst_blood_start.ncs b/_module/ncs/qst_blood_start.ncs index 2f5326c3..4747ccc5 100644 Binary files a/_module/ncs/qst_blood_start.ncs and b/_module/ncs/qst_blood_start.ncs differ diff --git a/_module/ncs/qst_ch_altar04.ncs b/_module/ncs/qst_ch_altar04.ncs index ed93c949..489c78b7 100644 Binary files a/_module/ncs/qst_ch_altar04.ncs and b/_module/ncs/qst_ch_altar04.ncs differ diff --git a/_module/ncs/qst_ch_altar_nf.ncs b/_module/ncs/qst_ch_altar_nf.ncs index f8fa952a..f7a99d66 100644 Binary files a/_module/ncs/qst_ch_altar_nf.ncs and b/_module/ncs/qst_ch_altar_nf.ncs differ diff --git a/_module/ncs/qst_ch_dirty02.ncs b/_module/ncs/qst_ch_dirty02.ncs index 7226bd9a..59ee5417 100644 Binary files a/_module/ncs/qst_ch_dirty02.ncs and b/_module/ncs/qst_ch_dirty02.ncs differ diff --git a/_module/ncs/qst_ch_dirty03.ncs b/_module/ncs/qst_ch_dirty03.ncs index be655915..135d6840 100644 Binary files a/_module/ncs/qst_ch_dirty03.ncs and b/_module/ncs/qst_ch_dirty03.ncs differ diff --git a/_module/ncs/qst_ch_dirty05.ncs b/_module/ncs/qst_ch_dirty05.ncs index 197552f7..2ba772c6 100644 Binary files a/_module/ncs/qst_ch_dirty05.ncs and b/_module/ncs/qst_ch_dirty05.ncs differ diff --git a/_module/ncs/qst_ch_door01.ncs b/_module/ncs/qst_ch_door01.ncs index 7efd1082..9da0ca9d 100644 Binary files a/_module/ncs/qst_ch_door01.ncs and b/_module/ncs/qst_ch_door01.ncs differ diff --git a/_module/ncs/qst_ch_door01g.ncs b/_module/ncs/qst_ch_door01g.ncs index 7efd1082..9da0ca9d 100644 Binary files a/_module/ncs/qst_ch_door01g.ncs and b/_module/ncs/qst_ch_door01g.ncs differ diff --git a/_module/ncs/qst_ch_kngsly01.ncs b/_module/ncs/qst_ch_kngsly01.ncs index 4a596f41..f6a189bb 100644 Binary files a/_module/ncs/qst_ch_kngsly01.ncs and b/_module/ncs/qst_ch_kngsly01.ncs differ diff --git a/_module/ncs/qst_ch_kngsly01g.ncs b/_module/ncs/qst_ch_kngsly01g.ncs index 0e1a25a0..89f22a77 100644 Binary files a/_module/ncs/qst_ch_kngsly01g.ncs and b/_module/ncs/qst_ch_kngsly01g.ncs differ diff --git a/_module/ncs/qst_ch_kupra01.ncs b/_module/ncs/qst_ch_kupra01.ncs index a6fd4ac0..c7caf026 100644 Binary files a/_module/ncs/qst_ch_kupra01.ncs and b/_module/ncs/qst_ch_kupra01.ncs differ diff --git a/_module/ncs/qst_ch_spiders01.ncs b/_module/ncs/qst_ch_spiders01.ncs index 6fc487c6..9bcac108 100644 Binary files a/_module/ncs/qst_ch_spiders01.ncs and b/_module/ncs/qst_ch_spiders01.ncs differ diff --git a/_module/ncs/qst_ch_spiders02.ncs b/_module/ncs/qst_ch_spiders02.ncs index 3845ec35..f5cbdec7 100644 Binary files a/_module/ncs/qst_ch_spiders02.ncs and b/_module/ncs/qst_ch_spiders02.ncs differ diff --git a/_module/ncs/qst_ch_tribitz00.ncs b/_module/ncs/qst_ch_tribitz00.ncs index 66e68f79..ec8d9a84 100644 Binary files a/_module/ncs/qst_ch_tribitz00.ncs and b/_module/ncs/qst_ch_tribitz00.ncs differ diff --git a/_module/ncs/qst_ch_tribitz01.ncs b/_module/ncs/qst_ch_tribitz01.ncs index 2ccb1dd6..3674b02e 100644 Binary files a/_module/ncs/qst_ch_tribitz01.ncs and b/_module/ncs/qst_ch_tribitz01.ncs differ diff --git a/_module/ncs/qst_ch_tribitz03.ncs b/_module/ncs/qst_ch_tribitz03.ncs index 87637b8d..09cfcdfc 100644 Binary files a/_module/ncs/qst_ch_tribitz03.ncs and b/_module/ncs/qst_ch_tribitz03.ncs differ diff --git a/_module/ncs/qst_ch_tribitz05.ncs b/_module/ncs/qst_ch_tribitz05.ncs index 24fb8455..ae4bd4a5 100644 Binary files a/_module/ncs/qst_ch_tribitz05.ncs and b/_module/ncs/qst_ch_tribitz05.ncs differ diff --git a/_module/ncs/qst_ch_yuanti02.ncs b/_module/ncs/qst_ch_yuanti02.ncs index 0366fae3..20bfff0f 100644 Binary files a/_module/ncs/qst_ch_yuanti02.ncs and b/_module/ncs/qst_ch_yuanti02.ncs differ diff --git a/_module/ncs/qst_chk_outcasts.ncs b/_module/ncs/qst_chk_outcasts.ncs index bfc21564..2861a6fc 100644 Binary files a/_module/ncs/qst_chk_outcasts.ncs and b/_module/ncs/qst_chk_outcasts.ncs differ diff --git a/_module/ncs/qst_chk_outcst01.ncs b/_module/ncs/qst_chk_outcst01.ncs index b91adb0a..66ac7dc7 100644 Binary files a/_module/ncs/qst_chk_outcst01.ncs and b/_module/ncs/qst_chk_outcst01.ncs differ diff --git a/_module/ncs/qst_chk_outcst02.ncs b/_module/ncs/qst_chk_outcst02.ncs index f7842bf1..f643563b 100644 Binary files a/_module/ncs/qst_chk_outcst02.ncs and b/_module/ncs/qst_chk_outcst02.ncs differ diff --git a/_module/ncs/qst_chk_outcst03.ncs b/_module/ncs/qst_chk_outcst03.ncs index 3087d1bb..dcd010d7 100644 Binary files a/_module/ncs/qst_chk_outcst03.ncs and b/_module/ncs/qst_chk_outcst03.ncs differ diff --git a/_module/ncs/qst_dirty_2nd.ncs b/_module/ncs/qst_dirty_2nd.ncs index 0c333b9c..2234199e 100644 Binary files a/_module/ncs/qst_dirty_2nd.ncs and b/_module/ncs/qst_dirty_2nd.ncs differ diff --git a/_module/ncs/qst_dirty_3rd.ncs b/_module/ncs/qst_dirty_3rd.ncs index 0df54f98..6f600e90 100644 Binary files a/_module/ncs/qst_dirty_3rd.ncs and b/_module/ncs/qst_dirty_3rd.ncs differ diff --git a/_module/ncs/qst_dirty_5th.ncs b/_module/ncs/qst_dirty_5th.ncs index 02a4f61b..ce53e4a0 100644 Binary files a/_module/ncs/qst_dirty_5th.ncs and b/_module/ncs/qst_dirty_5th.ncs differ diff --git a/_module/ncs/qst_dirty_end1.ncs b/_module/ncs/qst_dirty_end1.ncs index 010e2c12..6fbbf7a2 100644 Binary files a/_module/ncs/qst_dirty_end1.ncs and b/_module/ncs/qst_dirty_end1.ncs differ diff --git a/_module/ncs/qst_dirty_end2.ncs b/_module/ncs/qst_dirty_end2.ncs index 980ddc69..c87b010b 100644 Binary files a/_module/ncs/qst_dirty_end2.ncs and b/_module/ncs/qst_dirty_end2.ncs differ diff --git a/_module/ncs/qst_dirty_st.ncs b/_module/ncs/qst_dirty_st.ncs index b1542e95..2ed4f1fd 100644 Binary files a/_module/ncs/qst_dirty_st.ncs and b/_module/ncs/qst_dirty_st.ncs differ diff --git a/_module/ncs/qst_door_end.ncs b/_module/ncs/qst_door_end.ncs index 178b8995..45584c23 100644 Binary files a/_module/ncs/qst_door_end.ncs and b/_module/ncs/qst_door_end.ncs differ diff --git a/_module/ncs/qst_ghost_end.ncs b/_module/ncs/qst_ghost_end.ncs index aeb92828..16da2deb 100644 Binary files a/_module/ncs/qst_ghost_end.ncs and b/_module/ncs/qst_ghost_end.ncs differ diff --git a/_module/ncs/qst_ghost_start.ncs b/_module/ncs/qst_ghost_start.ncs index b19d43b6..6a9713b6 100644 Binary files a/_module/ncs/qst_ghost_start.ncs and b/_module/ncs/qst_ghost_start.ncs differ diff --git a/_module/ncs/qst_gntslave_01.ncs b/_module/ncs/qst_gntslave_01.ncs index 36ac86da..62945f20 100644 Binary files a/_module/ncs/qst_gntslave_01.ncs and b/_module/ncs/qst_gntslave_01.ncs differ diff --git a/_module/ncs/qst_gntslave_03.ncs b/_module/ncs/qst_gntslave_03.ncs index c45e3e68..d7d542d3 100644 Binary files a/_module/ncs/qst_gntslave_03.ncs and b/_module/ncs/qst_gntslave_03.ncs differ diff --git a/_module/ncs/qst_husband_01.ncs b/_module/ncs/qst_husband_01.ncs index 37b84873..59a3d624 100644 Binary files a/_module/ncs/qst_husband_01.ncs and b/_module/ncs/qst_husband_01.ncs differ diff --git a/_module/ncs/qst_husband_02.ncs b/_module/ncs/qst_husband_02.ncs index 7b9af60c..d3a36f11 100644 Binary files a/_module/ncs/qst_husband_02.ncs and b/_module/ncs/qst_husband_02.ncs differ diff --git a/_module/ncs/qst_husband_bad.ncs b/_module/ncs/qst_husband_bad.ncs index d6d7acbf..3c54ec66 100644 Binary files a/_module/ncs/qst_husband_bad.ncs and b/_module/ncs/qst_husband_bad.ncs differ diff --git a/_module/ncs/qst_husband_end.ncs b/_module/ncs/qst_husband_end.ncs index fc8e2410..069895ed 100644 Binary files a/_module/ncs/qst_husband_end.ncs and b/_module/ncs/qst_husband_end.ncs differ diff --git a/_module/ncs/qst_justicar_4th.ncs b/_module/ncs/qst_justicar_4th.ncs index 2c8096e6..ad83d963 100644 Binary files a/_module/ncs/qst_justicar_4th.ncs and b/_module/ncs/qst_justicar_4th.ncs differ diff --git a/_module/ncs/qst_justicar_chk.ncs b/_module/ncs/qst_justicar_chk.ncs index a326baa7..64e4d8bc 100644 Binary files a/_module/ncs/qst_justicar_chk.ncs and b/_module/ncs/qst_justicar_chk.ncs differ diff --git a/_module/ncs/qst_justicar_off.ncs b/_module/ncs/qst_justicar_off.ncs index 7935bfe3..3ebb4ca6 100644 Binary files a/_module/ncs/qst_justicar_off.ncs and b/_module/ncs/qst_justicar_off.ncs differ diff --git a/_module/ncs/qst_justicar_st.ncs b/_module/ncs/qst_justicar_st.ncs index cbfca74e..705ae8f6 100644 Binary files a/_module/ncs/qst_justicar_st.ncs and b/_module/ncs/qst_justicar_st.ncs differ diff --git a/_module/ncs/qst_kngsly_2nd.ncs b/_module/ncs/qst_kngsly_2nd.ncs index e85ba920..a4b48d8c 100644 Binary files a/_module/ncs/qst_kngsly_2nd.ncs and b/_module/ncs/qst_kngsly_2nd.ncs differ diff --git a/_module/ncs/qst_kngsly_3rd.ncs b/_module/ncs/qst_kngsly_3rd.ncs index 8dfeedac..443413f3 100644 Binary files a/_module/ncs/qst_kngsly_3rd.ncs and b/_module/ncs/qst_kngsly_3rd.ncs differ diff --git a/_module/ncs/qst_kngsly_start.ncs b/_module/ncs/qst_kngsly_start.ncs index 15387292..865b93c6 100644 Binary files a/_module/ncs/qst_kngsly_start.ncs and b/_module/ncs/qst_kngsly_start.ncs differ diff --git a/_module/ncs/qst_lostgob_2nd.ncs b/_module/ncs/qst_lostgob_2nd.ncs index a29956c6..20b01ca1 100644 Binary files a/_module/ncs/qst_lostgob_2nd.ncs and b/_module/ncs/qst_lostgob_2nd.ncs differ diff --git a/_module/ncs/qst_lostgob_end.ncs b/_module/ncs/qst_lostgob_end.ncs index d2e09bca..40969555 100644 Binary files a/_module/ncs/qst_lostgob_end.ncs and b/_module/ncs/qst_lostgob_end.ncs differ diff --git a/_module/ncs/qst_lostgob_st.ncs b/_module/ncs/qst_lostgob_st.ncs index c36f8a3e..3c3b5a76 100644 Binary files a/_module/ncs/qst_lostgob_st.ncs and b/_module/ncs/qst_lostgob_st.ncs differ diff --git a/_module/ncs/qst_losthubby01.ncs b/_module/ncs/qst_losthubby01.ncs index d1e338b4..5fbd9675 100644 Binary files a/_module/ncs/qst_losthubby01.ncs and b/_module/ncs/qst_losthubby01.ncs differ diff --git a/_module/ncs/qst_losthubby02.ncs b/_module/ncs/qst_losthubby02.ncs index 9fb22564..07919a68 100644 Binary files a/_module/ncs/qst_losthubby02.ncs and b/_module/ncs/qst_losthubby02.ncs differ diff --git a/_module/ncs/qst_marthek_3rd.ncs b/_module/ncs/qst_marthek_3rd.ncs index 9eaf4065..3fc232aa 100644 Binary files a/_module/ncs/qst_marthek_3rd.ncs and b/_module/ncs/qst_marthek_3rd.ncs differ diff --git a/_module/ncs/qst_marthek_4th.ncs b/_module/ncs/qst_marthek_4th.ncs index ba1238d5..c865e60d 100644 Binary files a/_module/ncs/qst_marthek_4th.ncs and b/_module/ncs/qst_marthek_4th.ncs differ diff --git a/_module/ncs/qst_marthek_bad.ncs b/_module/ncs/qst_marthek_bad.ncs index b36f2f70..ac6ad8cd 100644 Binary files a/_module/ncs/qst_marthek_bad.ncs and b/_module/ncs/qst_marthek_bad.ncs differ diff --git a/_module/ncs/qst_marthek_chk.ncs b/_module/ncs/qst_marthek_chk.ncs index bd78f0e4..ad158602 100644 Binary files a/_module/ncs/qst_marthek_chk.ncs and b/_module/ncs/qst_marthek_chk.ncs differ diff --git a/_module/ncs/qst_marthek_end.ncs b/_module/ncs/qst_marthek_end.ncs index 7feeea85..7deccde3 100644 Binary files a/_module/ncs/qst_marthek_end.ncs and b/_module/ncs/qst_marthek_end.ncs differ diff --git a/_module/ncs/qst_marthek_off.ncs b/_module/ncs/qst_marthek_off.ncs index 8b11db24..82a9b64f 100644 Binary files a/_module/ncs/qst_marthek_off.ncs and b/_module/ncs/qst_marthek_off.ncs differ diff --git a/_module/ncs/qst_marthek_strt.ncs b/_module/ncs/qst_marthek_strt.ncs index 2700a2c5..c2dee5ee 100644 Binary files a/_module/ncs/qst_marthek_strt.ncs and b/_module/ncs/qst_marthek_strt.ncs differ diff --git a/_module/ncs/qst_mushroom_end.ncs b/_module/ncs/qst_mushroom_end.ncs index d0c16c08..becf59ec 100644 Binary files a/_module/ncs/qst_mushroom_end.ncs and b/_module/ncs/qst_mushroom_end.ncs differ diff --git a/_module/ncs/qst_mushroom_st.ncs b/_module/ncs/qst_mushroom_st.ncs index 847c36b8..4e971bfc 100644 Binary files a/_module/ncs/qst_mushroom_st.ncs and b/_module/ncs/qst_mushroom_st.ncs differ diff --git a/_module/ncs/qst_orcus_end.ncs b/_module/ncs/qst_orcus_end.ncs index 5c26210d..45cd948c 100644 Binary files a/_module/ncs/qst_orcus_end.ncs and b/_module/ncs/qst_orcus_end.ncs differ diff --git a/_module/ncs/qst_orcus_start.ncs b/_module/ncs/qst_orcus_start.ncs index 5ee3f736..a77e1d3a 100644 Binary files a/_module/ncs/qst_orcus_start.ncs and b/_module/ncs/qst_orcus_start.ncs differ diff --git a/_module/ncs/qst_outcst_end.ncs b/_module/ncs/qst_outcst_end.ncs index cc290b56..e127aa59 100644 Binary files a/_module/ncs/qst_outcst_end.ncs and b/_module/ncs/qst_outcst_end.ncs differ diff --git a/_module/ncs/qst_outcst_nope.ncs b/_module/ncs/qst_outcst_nope.ncs index ac74b356..2d29fd7c 100644 Binary files a/_module/ncs/qst_outcst_nope.ncs and b/_module/ncs/qst_outcst_nope.ncs differ diff --git a/_module/ncs/qst_outcst_start.ncs b/_module/ncs/qst_outcst_start.ncs index 85769e8e..0b5c1545 100644 Binary files a/_module/ncs/qst_outcst_start.ncs and b/_module/ncs/qst_outcst_start.ncs differ diff --git a/_module/ncs/qst_papers_end.ncs b/_module/ncs/qst_papers_end.ncs index d69c439a..b6922b5d 100644 Binary files a/_module/ncs/qst_papers_end.ncs and b/_module/ncs/qst_papers_end.ncs differ diff --git a/_module/ncs/qst_papers_nope.ncs b/_module/ncs/qst_papers_nope.ncs index 523d17cb..105afae4 100644 Binary files a/_module/ncs/qst_papers_nope.ncs and b/_module/ncs/qst_papers_nope.ncs differ diff --git a/_module/ncs/qst_papers_start.ncs b/_module/ncs/qst_papers_start.ncs index 3c03a1ba..bf794298 100644 Binary files a/_module/ncs/qst_papers_start.ncs and b/_module/ncs/qst_papers_start.ncs differ diff --git a/_module/ncs/qst_priests_01.ncs b/_module/ncs/qst_priests_01.ncs index 82955200..8b3c292e 100644 Binary files a/_module/ncs/qst_priests_01.ncs and b/_module/ncs/qst_priests_01.ncs differ diff --git a/_module/ncs/qst_priests_2nd.ncs b/_module/ncs/qst_priests_2nd.ncs index af83430e..c9e95340 100644 Binary files a/_module/ncs/qst_priests_2nd.ncs and b/_module/ncs/qst_priests_2nd.ncs differ diff --git a/_module/ncs/qst_priests_end.ncs b/_module/ncs/qst_priests_end.ncs index 0ba2003b..6f07ec38 100644 Binary files a/_module/ncs/qst_priests_end.ncs and b/_module/ncs/qst_priests_end.ncs differ diff --git a/_module/ncs/qst_priests_strt.ncs b/_module/ncs/qst_priests_strt.ncs index 01123fc2..d368e150 100644 Binary files a/_module/ncs/qst_priests_strt.ncs and b/_module/ncs/qst_priests_strt.ncs differ diff --git a/_module/ncs/qst_scramge_end.ncs b/_module/ncs/qst_scramge_end.ncs index 2daf5fa2..d05b9557 100644 Binary files a/_module/ncs/qst_scramge_end.ncs and b/_module/ncs/qst_scramge_end.ncs differ diff --git a/_module/ncs/qst_scramge_end2.ncs b/_module/ncs/qst_scramge_end2.ncs index 53e603f5..7ae4132d 100644 Binary files a/_module/ncs/qst_scramge_end2.ncs and b/_module/ncs/qst_scramge_end2.ncs differ diff --git a/_module/ncs/qst_scramge_end3.ncs b/_module/ncs/qst_scramge_end3.ncs index 8839a537..f62446bf 100644 Binary files a/_module/ncs/qst_scramge_end3.ncs and b/_module/ncs/qst_scramge_end3.ncs differ diff --git a/_module/ncs/qst_scramge_strt.ncs b/_module/ncs/qst_scramge_strt.ncs index 5bc39db2..7ffdc7b2 100644 Binary files a/_module/ncs/qst_scramge_strt.ncs and b/_module/ncs/qst_scramge_strt.ncs differ diff --git a/_module/ncs/qst_seals_chk.ncs b/_module/ncs/qst_seals_chk.ncs index ac8ae8b3..5bdaa7ac 100644 Binary files a/_module/ncs/qst_seals_chk.ncs and b/_module/ncs/qst_seals_chk.ncs differ diff --git a/_module/ncs/qst_seals_start.ncs b/_module/ncs/qst_seals_start.ncs index c1453e12..a232b6e8 100644 Binary files a/_module/ncs/qst_seals_start.ncs and b/_module/ncs/qst_seals_start.ncs differ diff --git a/_module/ncs/qst_slayer_end.ncs b/_module/ncs/qst_slayer_end.ncs index ac95ce14..fd464422 100644 Binary files a/_module/ncs/qst_slayer_end.ncs and b/_module/ncs/qst_slayer_end.ncs differ diff --git a/_module/ncs/qst_slayer_start.ncs b/_module/ncs/qst_slayer_start.ncs index 3ce3ee23..5289c5fa 100644 Binary files a/_module/ncs/qst_slayer_start.ncs and b/_module/ncs/qst_slayer_start.ncs differ diff --git a/_module/ncs/qst_spiders_01.ncs b/_module/ncs/qst_spiders_01.ncs index 9fc8a981..93b188f6 100644 Binary files a/_module/ncs/qst_spiders_01.ncs and b/_module/ncs/qst_spiders_01.ncs differ diff --git a/_module/ncs/qst_spiders_03.ncs b/_module/ncs/qst_spiders_03.ncs index 05267fab..c003721d 100644 Binary files a/_module/ncs/qst_spiders_03.ncs and b/_module/ncs/qst_spiders_03.ncs differ diff --git a/_module/ncs/qst_spiders_chk.ncs b/_module/ncs/qst_spiders_chk.ncs index 9cfcfcf9..e85dbc00 100644 Binary files a/_module/ncs/qst_spiders_chk.ncs and b/_module/ncs/qst_spiders_chk.ncs differ diff --git a/_module/ncs/qst_spiders_end.ncs b/_module/ncs/qst_spiders_end.ncs index 37da2841..4f793442 100644 Binary files a/_module/ncs/qst_spiders_end.ncs and b/_module/ncs/qst_spiders_end.ncs differ diff --git a/_module/ncs/qst_spiders_fail.ncs b/_module/ncs/qst_spiders_fail.ncs index 89fc45ef..184bd6f5 100644 Binary files a/_module/ncs/qst_spiders_fail.ncs and b/_module/ncs/qst_spiders_fail.ncs differ diff --git a/_module/ncs/qst_spiders_strt.ncs b/_module/ncs/qst_spiders_strt.ncs index ed7b56ff..8b64d711 100644 Binary files a/_module/ncs/qst_spiders_strt.ncs and b/_module/ncs/qst_spiders_strt.ncs differ diff --git a/_module/ncs/qst_tribitz_2nd.ncs b/_module/ncs/qst_tribitz_2nd.ncs index f47b3ea2..37c60e4f 100644 Binary files a/_module/ncs/qst_tribitz_2nd.ncs and b/_module/ncs/qst_tribitz_2nd.ncs differ diff --git a/_module/ncs/qst_tribitz_3rd.ncs b/_module/ncs/qst_tribitz_3rd.ncs index d6897617..c6c549c4 100644 Binary files a/_module/ncs/qst_tribitz_3rd.ncs and b/_module/ncs/qst_tribitz_3rd.ncs differ diff --git a/_module/ncs/qst_tribitz_4th.ncs b/_module/ncs/qst_tribitz_4th.ncs index 9a15bffc..a81f090b 100644 Binary files a/_module/ncs/qst_tribitz_4th.ncs and b/_module/ncs/qst_tribitz_4th.ncs differ diff --git a/_module/ncs/qst_tribitz_7th.ncs b/_module/ncs/qst_tribitz_7th.ncs index 9a303a21..7c5433fe 100644 Binary files a/_module/ncs/qst_tribitz_7th.ncs and b/_module/ncs/qst_tribitz_7th.ncs differ diff --git a/_module/ncs/qst_tribitz_end.ncs b/_module/ncs/qst_tribitz_end.ncs index de1b996f..911032a2 100644 Binary files a/_module/ncs/qst_tribitz_end.ncs and b/_module/ncs/qst_tribitz_end.ncs differ diff --git a/_module/ncs/qst_tribitz_end1.ncs b/_module/ncs/qst_tribitz_end1.ncs index 88144197..db8623cc 100644 Binary files a/_module/ncs/qst_tribitz_end1.ncs and b/_module/ncs/qst_tribitz_end1.ncs differ diff --git a/_module/ncs/qst_tribitz_end2.ncs b/_module/ncs/qst_tribitz_end2.ncs index 15f15027..696ff93c 100644 Binary files a/_module/ncs/qst_tribitz_end2.ncs and b/_module/ncs/qst_tribitz_end2.ncs differ diff --git a/_module/ncs/qst_tribitz_st.ncs b/_module/ncs/qst_tribitz_st.ncs index a5e1fb00..68abce0a 100644 Binary files a/_module/ncs/qst_tribitz_st.ncs and b/_module/ncs/qst_tribitz_st.ncs differ diff --git a/_module/ncs/qst_yuanti_end.ncs b/_module/ncs/qst_yuanti_end.ncs index 507167d0..173dbcd3 100644 Binary files a/_module/ncs/qst_yuanti_end.ncs and b/_module/ncs/qst_yuanti_end.ncs differ diff --git a/_module/ncs/qst_yuanti_start.ncs b/_module/ncs/qst_yuanti_start.ncs index 15537967..6a2f4e36 100644 Binary files a/_module/ncs/qst_yuanti_start.ncs and b/_module/ncs/qst_yuanti_start.ncs differ diff --git a/_module/ncs/ra_ai_heartbeat.ncs b/_module/ncs/ra_ai_heartbeat.ncs index d6087694..cb30e17b 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 0af7d512..68df56e6 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_ai_userdef.ncs b/_module/ncs/ra_ai_userdef.ncs index 117e27d5..b34b6a8b 100644 Binary files a/_module/ncs/ra_ai_userdef.ncs and b/_module/ncs/ra_ai_userdef.ncs differ diff --git a/_module/ncs/ra_antinude.ncs b/_module/ncs/ra_antinude.ncs index 16cd495b..c5032733 100644 Binary files a/_module/ncs/ra_antinude.ncs and b/_module/ncs/ra_antinude.ncs differ diff --git a/_module/ncs/ra_areaonenter.ncs b/_module/ncs/ra_areaonenter.ncs index 6133d463..70861b57 100644 Binary files a/_module/ncs/ra_areaonenter.ncs and b/_module/ncs/ra_areaonenter.ncs differ diff --git a/_module/ncs/ra_beggar_hb.ncs b/_module/ncs/ra_beggar_hb.ncs index 6ca47505..df8fdb95 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_cocktrc_bite.ncs b/_module/ncs/ra_cocktrc_bite.ncs index f85237b2..8bcab5a5 100644 Binary files a/_module/ncs/ra_cocktrc_bite.ncs and b/_module/ncs/ra_cocktrc_bite.ncs differ diff --git a/_module/ncs/ra_disarmtrap01.ncs b/_module/ncs/ra_disarmtrap01.ncs index 26cb61f9..eab3205b 100644 Binary files a/_module/ncs/ra_disarmtrap01.ncs and b/_module/ncs/ra_disarmtrap01.ncs differ diff --git a/_module/ncs/ra_fac_attack_pc.ncs b/_module/ncs/ra_fac_attack_pc.ncs index 70a39e82..e15f47a7 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_greet_new_pc.ncs b/_module/ncs/ra_greet_new_pc.ncs index d3e5cf64..0844b7bd 100644 Binary files a/_module/ncs/ra_greet_new_pc.ncs and b/_module/ncs/ra_greet_new_pc.ncs differ diff --git a/_module/ncs/ra_gv_harpy_gems.ncs b/_module/ncs/ra_gv_harpy_gems.ncs index 00210c15..498be2a7 100644 Binary files a/_module/ncs/ra_gv_harpy_gems.ncs and b/_module/ncs/ra_gv_harpy_gems.ncs differ diff --git a/_module/ncs/ra_harpytreefall.ncs b/_module/ncs/ra_harpytreefall.ncs index 66ece663..e700c41d 100644 Binary files a/_module/ncs/ra_harpytreefall.ncs and b/_module/ncs/ra_harpytreefall.ncs differ diff --git a/_module/ncs/ra_has50kgp.ncs b/_module/ncs/ra_has50kgp.ncs index ce276334..bd023f36 100644 Binary files a/_module/ncs/ra_has50kgp.ncs and b/_module/ncs/ra_has50kgp.ncs differ diff --git a/_module/ncs/ra_hen_spw_fight.ncs b/_module/ncs/ra_hen_spw_fight.ncs index 04d74f95..a58c3e56 100644 Binary files a/_module/ncs/ra_hen_spw_fight.ncs and b/_module/ncs/ra_hen_spw_fight.ncs differ diff --git a/_module/ncs/ra_hen_spw_rogue.ncs b/_module/ncs/ra_hen_spw_rogue.ncs index 456882c0..ba046fdb 100644 Binary files a/_module/ncs/ra_hen_spw_rogue.ncs and b/_module/ncs/ra_hen_spw_rogue.ncs differ diff --git a/_module/ncs/ra_hidden_loot.ncs b/_module/ncs/ra_hidden_loot.ncs index 2c75efda..165b1a74 100644 Binary files a/_module/ncs/ra_hidden_loot.ncs and b/_module/ncs/ra_hidden_loot.ncs differ diff --git a/_module/ncs/ra_ill_door001.ncs b/_module/ncs/ra_ill_door001.ncs index 804d6704..4e92db59 100644 Binary files a/_module/ncs/ra_ill_door001.ncs and b/_module/ncs/ra_ill_door001.ncs differ diff --git a/_module/ncs/ra_lvl01_onenter.ncs b/_module/ncs/ra_lvl01_onenter.ncs index 9026716f..15f2e86f 100644 Binary files a/_module/ncs/ra_lvl01_onenter.ncs and b/_module/ncs/ra_lvl01_onenter.ncs differ diff --git a/_module/ncs/ra_lvl01_onexit.ncs b/_module/ncs/ra_lvl01_onexit.ncs index 0457cdd6..f02e108a 100644 Binary files a/_module/ncs/ra_lvl01_onexit.ncs and b/_module/ncs/ra_lvl01_onexit.ncs differ diff --git a/_module/ncs/ra_lvl01_onhb.ncs b/_module/ncs/ra_lvl01_onhb.ncs index fd7dc2e5..003bbc39 100644 Binary files a/_module/ncs/ra_lvl01_onhb.ncs and b/_module/ncs/ra_lvl01_onhb.ncs differ diff --git a/_module/ncs/ra_lvl01a_onentr.ncs b/_module/ncs/ra_lvl01a_onentr.ncs index d54cef10..7368d8e2 100644 Binary files a/_module/ncs/ra_lvl01a_onentr.ncs and b/_module/ncs/ra_lvl01a_onentr.ncs differ diff --git a/_module/ncs/ra_lvl01a_onexit.ncs b/_module/ncs/ra_lvl01a_onexit.ncs index 0457cdd6..f02e108a 100644 Binary files a/_module/ncs/ra_lvl01a_onexit.ncs and b/_module/ncs/ra_lvl01a_onexit.ncs differ diff --git a/_module/ncs/ra_lvl01a_onhb.ncs b/_module/ncs/ra_lvl01a_onhb.ncs index a33914f4..1c4298b0 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 50af9e4c..82d9c992 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 f3a4c68c..98d974e2 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 0b508bbd..445609dd 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_npc_knowspc.ncs b/_module/ncs/ra_npc_knowspc.ncs index 5bfd3b84..5c1616b0 100644 Binary files a/_module/ncs/ra_npc_knowspc.ncs and b/_module/ncs/ra_npc_knowspc.ncs differ diff --git a/_module/ncs/ra_npc_talkcheck.ncs b/_module/ncs/ra_npc_talkcheck.ncs index ce90cb0a..0636a9ab 100644 Binary files a/_module/ncs/ra_npc_talkcheck.ncs and b/_module/ncs/ra_npc_talkcheck.ncs differ diff --git a/_module/ncs/ra_npc_talktimes.ncs b/_module/ncs/ra_npc_talktimes.ncs index bbf63224..2bf74462 100644 Binary files a/_module/ncs/ra_npc_talktimes.ncs and b/_module/ncs/ra_npc_talktimes.ncs differ diff --git a/_module/ncs/ra_onareaenter.ncs b/_module/ncs/ra_onareaenter.ncs index 6133d463..70861b57 100644 Binary files a/_module/ncs/ra_onareaenter.ncs and b/_module/ncs/ra_onareaenter.ncs differ diff --git a/_module/ncs/ra_rnd_drill_hb.ncs b/_module/ncs/ra_rnd_drill_hb.ncs index c6c933a6..1870fdf9 100644 Binary files a/_module/ncs/ra_rnd_drill_hb.ncs and b/_module/ncs/ra_rnd_drill_hb.ncs differ diff --git a/_module/ncs/ra_slp_2d4_min.ncs b/_module/ncs/ra_slp_2d4_min.ncs index 728d6542..b5ef2e1d 100644 Binary files a/_module/ncs/ra_slp_2d4_min.ncs and b/_module/ncs/ra_slp_2d4_min.ncs differ diff --git a/_module/ncs/ra_spbook_zana.ncs b/_module/ncs/ra_spbook_zana.ncs index 823d0a00..d25e4a3f 100644 Binary files a/_module/ncs/ra_spbook_zana.ncs and b/_module/ncs/ra_spbook_zana.ncs differ diff --git a/_module/ncs/ra_stuck2web.ncs b/_module/ncs/ra_stuck2web.ncs index 9012f266..fd02deee 100644 Binary files a/_module/ncs/ra_stuck2web.ncs and b/_module/ncs/ra_stuck2web.ncs differ diff --git a/_module/ncs/ra_t1_yelmold.ncs b/_module/ncs/ra_t1_yelmold.ncs index 483ae5e9..eff7022e 100644 Binary files a/_module/ncs/ra_t1_yelmold.ncs and b/_module/ncs/ra_t1_yelmold.ncs differ diff --git a/_module/ncs/ra_t1_yelmold1.ncs b/_module/ncs/ra_t1_yelmold1.ncs index 4c99b9c0..1c5480d2 100644 Binary files a/_module/ncs/ra_t1_yelmold1.ncs and b/_module/ncs/ra_t1_yelmold1.ncs differ diff --git a/_module/ncs/ra_traplth_sod.ncs b/_module/ncs/ra_traplth_sod.ncs index 3b7756f8..efe5ee04 100644 Binary files a/_module/ncs/ra_traplth_sod.ncs and b/_module/ncs/ra_traplth_sod.ncs differ diff --git a/_module/ncs/ra_trp_sec_door1.ncs b/_module/ncs/ra_trp_sec_door1.ncs index 52e81edf..d7f6a90b 100644 Binary files a/_module/ncs/ra_trp_sec_door1.ncs and b/_module/ncs/ra_trp_sec_door1.ncs differ diff --git a/_module/ncs/ra_wake_aragnak.ncs b/_module/ncs/ra_wake_aragnak.ncs index 5fcac65f..e2b13d2a 100644 Binary files a/_module/ncs/ra_wake_aragnak.ncs and b/_module/ncs/ra_wake_aragnak.ncs differ diff --git a/_module/ncs/ra_wererat_att1.ncs b/_module/ncs/ra_wererat_att1.ncs index 73b6daf2..cba2ba8e 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 82b571fe..b51340c9 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 c03e1b23..fa5f9a1c 100644 Binary files a/_module/ncs/rakshasachange.ncs and b/_module/ncs/rakshasachange.ncs differ diff --git a/_module/ncs/ratstatue.ncs b/_module/ncs/ratstatue.ncs index d6826ae7..a31c5883 100644 Binary files a/_module/ncs/ratstatue.ncs and b/_module/ncs/ratstatue.ncs differ diff --git a/_module/ncs/ratstatue2.ncs b/_module/ncs/ratstatue2.ncs index 6866e7dc..88d9329e 100644 Binary files a/_module/ncs/ratstatue2.ncs and b/_module/ncs/ratstatue2.ncs differ diff --git a/_module/ncs/re_beggar_spawn.ncs b/_module/ncs/re_beggar_spawn.ncs index a54731fd..445e9ee1 100644 Binary files a/_module/ncs/re_beggar_spawn.ncs and b/_module/ncs/re_beggar_spawn.ncs differ diff --git a/_module/ncs/re_common_blkd.ncs b/_module/ncs/re_common_blkd.ncs index 3d4f8512..b09179b0 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_common_spawn.ncs b/_module/ncs/re_common_spawn.ncs index d824a4c6..202ce8ff 100644 Binary files a/_module/ncs/re_common_spawn.ncs and b/_module/ncs/re_common_spawn.ncs differ diff --git a/_module/ncs/re_commoner0.ncs b/_module/ncs/re_commoner0.ncs index 99f3592e..f5d3ab8b 100644 Binary files a/_module/ncs/re_commoner0.ncs and b/_module/ncs/re_commoner0.ncs differ diff --git a/_module/ncs/re_commoner1.ncs b/_module/ncs/re_commoner1.ncs index 1c518dd8..8a91c15a 100644 Binary files a/_module/ncs/re_commoner1.ncs and b/_module/ncs/re_commoner1.ncs differ diff --git a/_module/ncs/re_commonspwnrhb.ncs b/_module/ncs/re_commonspwnrhb.ncs index 62b7f246..3c30e263 100644 Binary files a/_module/ncs/re_commonspwnrhb.ncs and b/_module/ncs/re_commonspwnrhb.ncs differ diff --git a/_module/ncs/re_custom.ncs b/_module/ncs/re_custom.ncs index f02a8296..120b2859 100644 Binary files a/_module/ncs/re_custom.ncs and b/_module/ncs/re_custom.ncs differ diff --git a/_module/ncs/re_custom1.ncs b/_module/ncs/re_custom1.ncs index 770303f6..8f9e8d6f 100644 Binary files a/_module/ncs/re_custom1.ncs and b/_module/ncs/re_custom1.ncs differ diff --git a/_module/ncs/re_levspawnerhb.ncs b/_module/ncs/re_levspawnerhb.ncs index 06fe9a93..2be39799 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 e5b29b31..072f0a65 100644 Binary files a/_module/ncs/re_mmorpghb.ncs and b/_module/ncs/re_mmorpghb.ncs differ diff --git a/_module/ncs/re_moditemdrop.ncs b/_module/ncs/re_moditemdrop.ncs index 157fdf47..4fc32200 100644 Binary files a/_module/ncs/re_moditemdrop.ncs and b/_module/ncs/re_moditemdrop.ncs differ diff --git a/_module/ncs/re_modulehb.ncs b/_module/ncs/re_modulehb.ncs index 5945c243..63c2c253 100644 Binary files a/_module/ncs/re_modulehb.ncs and b/_module/ncs/re_modulehb.ncs differ diff --git a/_module/ncs/re_noble_spawn.ncs b/_module/ncs/re_noble_spawn.ncs index c860e9f1..81942a75 100644 Binary files a/_module/ncs/re_noble_spawn.ncs and b/_module/ncs/re_noble_spawn.ncs differ diff --git a/_module/ncs/re_oncliententer.ncs b/_module/ncs/re_oncliententer.ncs index 5e36ce5a..294cf87c 100644 Binary files a/_module/ncs/re_oncliententer.ncs and b/_module/ncs/re_oncliententer.ncs differ diff --git a/_module/ncs/re_onrest.ncs b/_module/ncs/re_onrest.ncs index 8530d151..8512f3be 100644 Binary files a/_module/ncs/re_onrest.ncs and b/_module/ncs/re_onrest.ncs differ diff --git a/_module/ncs/re_onunacquire.ncs b/_module/ncs/re_onunacquire.ncs index b57def89..3abe0f97 100644 Binary files a/_module/ncs/re_onunacquire.ncs and b/_module/ncs/re_onunacquire.ncs differ diff --git a/_module/ncs/re_or.ncs b/_module/ncs/re_or.ncs index d7ec7867..4072f43c 100644 Binary files a/_module/ncs/re_or.ncs and b/_module/ncs/re_or.ncs differ diff --git a/_module/ncs/re_placespawnhb.ncs b/_module/ncs/re_placespawnhb.ncs index 8080194c..10750b40 100644 Binary files a/_module/ncs/re_placespawnhb.ncs and b/_module/ncs/re_placespawnhb.ncs differ diff --git a/_module/ncs/re_pwrespawnerhb.ncs b/_module/ncs/re_pwrespawnerhb.ncs index ac05e50e..5739d974 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 4438d59a..4d1263e5 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 d1d32a8f..f61fcc64 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_treasure.ncs b/_module/ncs/re_treasure.ncs index 51a300c4..006f7a4e 100644 Binary files a/_module/ncs/re_treasure.ncs and b/_module/ncs/re_treasure.ncs differ diff --git a/_module/ncs/re_treasure0.ncs b/_module/ncs/re_treasure0.ncs index f0261afc..a81ffa4b 100644 Binary files a/_module/ncs/re_treasure0.ncs and b/_module/ncs/re_treasure0.ncs differ diff --git a/_module/ncs/re_treasure1.ncs b/_module/ncs/re_treasure1.ncs index f044e9a9..6e82c96c 100644 Binary files a/_module/ncs/re_treasure1.ncs and b/_module/ncs/re_treasure1.ncs differ diff --git a/_module/ncs/re_widget1.ncs b/_module/ncs/re_widget1.ncs index 7335e2fa..9222b7e8 100644 Binary files a/_module/ncs/re_widget1.ncs and b/_module/ncs/re_widget1.ncs differ diff --git a/_module/ncs/re_widget12.ncs b/_module/ncs/re_widget12.ncs index 42771317..2e8ac69f 100644 Binary files a/_module/ncs/re_widget12.ncs and b/_module/ncs/re_widget12.ncs differ diff --git a/_module/ncs/re_widget13.ncs b/_module/ncs/re_widget13.ncs index 1b90d38a..8b8eadaa 100644 Binary files a/_module/ncs/re_widget13.ncs and b/_module/ncs/re_widget13.ncs differ diff --git a/_module/ncs/re_widget18.ncs b/_module/ncs/re_widget18.ncs index 35f184ec..ac612c90 100644 Binary files a/_module/ncs/re_widget18.ncs and b/_module/ncs/re_widget18.ncs differ diff --git a/_module/ncs/re_widget2.ncs b/_module/ncs/re_widget2.ncs index 347a4887..f89d83a7 100644 Binary files a/_module/ncs/re_widget2.ncs and b/_module/ncs/re_widget2.ncs differ diff --git a/_module/ncs/re_widget20.ncs b/_module/ncs/re_widget20.ncs index 4826dc2c..166d7317 100644 Binary files a/_module/ncs/re_widget20.ncs and b/_module/ncs/re_widget20.ncs differ diff --git a/_module/ncs/re_widget3.ncs b/_module/ncs/re_widget3.ncs index 2c3aba01..06ec3e1f 100644 Binary files a/_module/ncs/re_widget3.ncs and b/_module/ncs/re_widget3.ncs differ diff --git a/_module/ncs/re_widget8.ncs b/_module/ncs/re_widget8.ncs index ebeea52e..30eb278b 100644 Binary files a/_module/ncs/re_widget8.ncs and b/_module/ncs/re_widget8.ncs differ diff --git a/_module/ncs/resptownport.ncs b/_module/ncs/resptownport.ncs index b7ce9868..3a0fab2a 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 c414e429..17cab86b 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 a8954479..635bb6ea 100644 Binary files a/_module/ncs/river3a1.ncs and b/_module/ncs/river3a1.ncs differ diff --git a/_module/ncs/rotaura.ncs b/_module/ncs/rotaura.ncs index e2f20c80..4699d131 100644 Binary files a/_module/ncs/rotaura.ncs and b/_module/ncs/rotaura.ncs differ diff --git a/_module/ncs/rotaura1.ncs b/_module/ncs/rotaura1.ncs index f6886431..a3ac3913 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 3a1f8085..5eae1288 100644 Binary files a/_module/ncs/rotaura3.ncs and b/_module/ncs/rotaura3.ncs differ diff --git a/_module/ncs/sc_007.ncs b/_module/ncs/sc_007.ncs index acf003a8..5c3b6dc9 100644 Binary files a/_module/ncs/sc_007.ncs and b/_module/ncs/sc_007.ncs differ diff --git a/_module/ncs/sc_008.ncs b/_module/ncs/sc_008.ncs index acf003a8..5c3b6dc9 100644 Binary files a/_module/ncs/sc_008.ncs and b/_module/ncs/sc_008.ncs differ diff --git a/_module/ncs/sc_009.ncs b/_module/ncs/sc_009.ncs index 6a71df84..1632e281 100644 Binary files a/_module/ncs/sc_009.ncs and b/_module/ncs/sc_009.ncs differ diff --git a/_module/ncs/sc_010.ncs b/_module/ncs/sc_010.ncs index e5ca0b7b..c8e04c15 100644 Binary files a/_module/ncs/sc_010.ncs and b/_module/ncs/sc_010.ncs differ diff --git a/_module/ncs/sc_013.ncs b/_module/ncs/sc_013.ncs index 281051c9..6f815438 100644 Binary files a/_module/ncs/sc_013.ncs and b/_module/ncs/sc_013.ncs differ diff --git a/_module/ncs/sc_017.ncs b/_module/ncs/sc_017.ncs index acf003a8..5c3b6dc9 100644 Binary files a/_module/ncs/sc_017.ncs and b/_module/ncs/sc_017.ncs differ diff --git a/_module/ncs/sc_018.ncs b/_module/ncs/sc_018.ncs index acf003a8..5c3b6dc9 100644 Binary files a/_module/ncs/sc_018.ncs and b/_module/ncs/sc_018.ncs differ diff --git a/_module/ncs/sc_019.ncs b/_module/ncs/sc_019.ncs index acf003a8..5c3b6dc9 100644 Binary files a/_module/ncs/sc_019.ncs and b/_module/ncs/sc_019.ncs differ diff --git a/_module/ncs/sc_020.ncs b/_module/ncs/sc_020.ncs index acf003a8..5c3b6dc9 100644 Binary files a/_module/ncs/sc_020.ncs and b/_module/ncs/sc_020.ncs differ diff --git a/_module/ncs/sc_021.ncs b/_module/ncs/sc_021.ncs index acf003a8..5c3b6dc9 100644 Binary files a/_module/ncs/sc_021.ncs and b/_module/ncs/sc_021.ncs differ diff --git a/_module/ncs/sc_022.ncs b/_module/ncs/sc_022.ncs index acf003a8..5c3b6dc9 100644 Binary files a/_module/ncs/sc_022.ncs and b/_module/ncs/sc_022.ncs differ diff --git a/_module/ncs/sc_025.ncs b/_module/ncs/sc_025.ncs index dd965c2b..f0dbaf7e 100644 Binary files a/_module/ncs/sc_025.ncs and b/_module/ncs/sc_025.ncs differ diff --git a/_module/ncs/sc_031.ncs b/_module/ncs/sc_031.ncs index a4c5e1f9..383a254f 100644 Binary files a/_module/ncs/sc_031.ncs and b/_module/ncs/sc_031.ncs differ diff --git a/_module/ncs/sc_038.ncs b/_module/ncs/sc_038.ncs index c9d5a214..8d22df9e 100644 Binary files a/_module/ncs/sc_038.ncs and b/_module/ncs/sc_038.ncs differ diff --git a/_module/ncs/sc_054.ncs b/_module/ncs/sc_054.ncs index 7b9333f6..507f0739 100644 Binary files a/_module/ncs/sc_054.ncs and b/_module/ncs/sc_054.ncs differ diff --git a/_module/ncs/sc_060.ncs b/_module/ncs/sc_060.ncs index b054e5cb..58599a6d 100644 Binary files a/_module/ncs/sc_060.ncs and b/_module/ncs/sc_060.ncs differ diff --git a/_module/ncs/sc_068.ncs b/_module/ncs/sc_068.ncs index 3d90528c..81fbb309 100644 Binary files a/_module/ncs/sc_068.ncs and b/_module/ncs/sc_068.ncs differ diff --git a/_module/ncs/sc_073.ncs b/_module/ncs/sc_073.ncs index 362465fb..e80dd594 100644 Binary files a/_module/ncs/sc_073.ncs and b/_module/ncs/sc_073.ncs differ diff --git a/_module/ncs/sc_087.ncs b/_module/ncs/sc_087.ncs index 8ec7f2a2..d1c6c7e6 100644 Binary files a/_module/ncs/sc_087.ncs and b/_module/ncs/sc_087.ncs differ diff --git a/_module/ncs/sc_089.ncs b/_module/ncs/sc_089.ncs index 90367ea0..4b94b2ca 100644 Binary files a/_module/ncs/sc_089.ncs and b/_module/ncs/sc_089.ncs differ diff --git a/_module/ncs/sc_092.ncs b/_module/ncs/sc_092.ncs index c45df7c5..077f8737 100644 Binary files a/_module/ncs/sc_092.ncs and b/_module/ncs/sc_092.ncs differ diff --git a/_module/ncs/sc_093.ncs b/_module/ncs/sc_093.ncs index 9dd0c5d5..e1cadd84 100644 Binary files a/_module/ncs/sc_093.ncs and b/_module/ncs/sc_093.ncs differ diff --git a/_module/ncs/sc_095.ncs b/_module/ncs/sc_095.ncs index c9d5a214..8d22df9e 100644 Binary files a/_module/ncs/sc_095.ncs and b/_module/ncs/sc_095.ncs differ diff --git a/_module/ncs/sc_100.ncs b/_module/ncs/sc_100.ncs index d8baa3e5..3a98b87a 100644 Binary files a/_module/ncs/sc_100.ncs and b/_module/ncs/sc_100.ncs differ diff --git a/_module/ncs/sc_109.ncs b/_module/ncs/sc_109.ncs index a284a0f3..75851d01 100644 Binary files a/_module/ncs/sc_109.ncs and b/_module/ncs/sc_109.ncs differ diff --git a/_module/ncs/sc_30dc_distrap.ncs b/_module/ncs/sc_30dc_distrap.ncs index 71279267..c832d844 100644 Binary files a/_module/ncs/sc_30dc_distrap.ncs and b/_module/ncs/sc_30dc_distrap.ncs differ diff --git a/_module/ncs/sc_appraise_dc10.ncs b/_module/ncs/sc_appraise_dc10.ncs index 29c1842d..e4c6059a 100644 Binary files a/_module/ncs/sc_appraise_dc10.ncs and b/_module/ncs/sc_appraise_dc10.ncs differ diff --git a/_module/ncs/sc_chk_looted.ncs b/_module/ncs/sc_chk_looted.ncs index db925893..4943c32e 100644 Binary files a/_module/ncs/sc_chk_looted.ncs and b/_module/ncs/sc_chk_looted.ncs differ diff --git a/_module/ncs/sc_ck_ghoulchst.ncs b/_module/ncs/sc_ck_ghoulchst.ncs index 56ab5281..0e954b7d 100644 Binary files a/_module/ncs/sc_ck_ghoulchst.ncs and b/_module/ncs/sc_ck_ghoulchst.ncs differ diff --git a/_module/ncs/sc_dc30_dex_chk.ncs b/_module/ncs/sc_dc30_dex_chk.ncs index aa5a0d53..b2a05833 100644 Binary files a/_module/ncs/sc_dc30_dex_chk.ncs and b/_module/ncs/sc_dc30_dex_chk.ncs differ diff --git a/_module/ncs/sc_ds_charm_cnv.ncs b/_module/ncs/sc_ds_charm_cnv.ncs index f18549a6..242e2988 100644 Binary files a/_module/ncs/sc_ds_charm_cnv.ncs and b/_module/ncs/sc_ds_charm_cnv.ncs differ diff --git a/_module/ncs/sc_is_small.ncs b/_module/ncs/sc_is_small.ncs index 1e62edc1..ebc5cd7d 100644 Binary files a/_module/ncs/sc_is_small.ncs and b/_module/ncs/sc_is_small.ncs differ diff --git a/_module/ncs/sc_isbig_hasrope.ncs b/_module/ncs/sc_isbig_hasrope.ncs index f15d5c7f..1a0a9c5c 100644 Binary files a/_module/ncs/sc_isbig_hasrope.ncs and b/_module/ncs/sc_isbig_hasrope.ncs differ diff --git a/_module/ncs/sc_isnotsmall.ncs b/_module/ncs/sc_isnotsmall.ncs index 4e688a9a..f678bc7c 100644 Binary files a/_module/ncs/sc_isnotsmall.ncs and b/_module/ncs/sc_isnotsmall.ncs differ diff --git a/_module/ncs/sc_ra_rnd_dialog.ncs b/_module/ncs/sc_ra_rnd_dialog.ncs index 43ecf274..898eb9d0 100644 Binary files a/_module/ncs/sc_ra_rnd_dialog.ncs and b/_module/ncs/sc_ra_rnd_dialog.ncs differ diff --git a/_module/ncs/sc_ra_rnd_rumors.ncs b/_module/ncs/sc_ra_rnd_rumors.ncs index f1aea7aa..e3136523 100644 Binary files a/_module/ncs/sc_ra_rnd_rumors.ncs and b/_module/ncs/sc_ra_rnd_rumors.ncs differ diff --git a/_module/ncs/sc_remtoxcards.ncs b/_module/ncs/sc_remtoxcards.ncs index 77d2aefc..9e4e2224 100644 Binary files a/_module/ncs/sc_remtoxcards.ncs and b/_module/ncs/sc_remtoxcards.ncs differ diff --git a/_module/ncs/sc_search_dc10.ncs b/_module/ncs/sc_search_dc10.ncs index 7aa4fea5..be15cef7 100644 Binary files a/_module/ncs/sc_search_dc10.ncs and b/_module/ncs/sc_search_dc10.ncs differ diff --git a/_module/ncs/sc_search_dc20.ncs b/_module/ncs/sc_search_dc20.ncs index 648a743e..c94f1467 100644 Binary files a/_module/ncs/sc_search_dc20.ncs and b/_module/ncs/sc_search_dc20.ncs differ diff --git a/_module/ncs/sc_search_dc5.ncs b/_module/ncs/sc_search_dc5.ncs index d5919d03..fa973dbe 100644 Binary files a/_module/ncs/sc_search_dc5.ncs and b/_module/ncs/sc_search_dc5.ncs differ diff --git a/_module/ncs/sc_seetoxcards.ncs b/_module/ncs/sc_seetoxcards.ncs index a0918e8f..20ffb574 100644 Binary files a/_module/ncs/sc_seetoxcards.ncs and b/_module/ncs/sc_seetoxcards.ncs differ diff --git a/_module/ncs/sc_small_hasrope.ncs b/_module/ncs/sc_small_hasrope.ncs index a7caeee7..45ad806a 100644 Binary files a/_module/ncs/sc_small_hasrope.ncs and b/_module/ncs/sc_small_hasrope.ncs differ diff --git a/_module/ncs/sc_small_no_rope.ncs b/_module/ncs/sc_small_no_rope.ncs index a67ebff0..b0379494 100644 Binary files a/_module/ncs/sc_small_no_rope.ncs and b/_module/ncs/sc_small_no_rope.ncs differ diff --git a/_module/ncs/sc_spot_dc10.ncs b/_module/ncs/sc_spot_dc10.ncs index cfa2930e..df44061f 100644 Binary files a/_module/ncs/sc_spot_dc10.ncs and b/_module/ncs/sc_spot_dc10.ncs differ diff --git a/_module/ncs/sc_spot_dc5.ncs b/_module/ncs/sc_spot_dc5.ncs index 8a4baef1..e3c2c003 100644 Binary files a/_module/ncs/sc_spot_dc5.ncs and b/_module/ncs/sc_spot_dc5.ncs differ diff --git a/_module/ncs/scorpeggs1.ncs b/_module/ncs/scorpeggs1.ncs index 0c67826f..073205f7 100644 Binary files a/_module/ncs/scorpeggs1.ncs and b/_module/ncs/scorpeggs1.ncs differ diff --git a/_module/ncs/se_door_death.ncs b/_module/ncs/se_door_death.ncs index 8c3e510b..5f80da18 100644 Binary files a/_module/ncs/se_door_death.ncs and b/_module/ncs/se_door_death.ncs differ diff --git a/_module/ncs/searchstatue.ncs b/_module/ncs/searchstatue.ncs index b4721940..e6ae8f6c 100644 Binary files a/_module/ncs/searchstatue.ncs and b/_module/ncs/searchstatue.ncs differ diff --git a/_module/ncs/secretcoffin.ncs b/_module/ncs/secretcoffin.ncs index 773e9ee9..17bf0976 100644 Binary files a/_module/ncs/secretcoffin.ncs and b/_module/ncs/secretcoffin.ncs differ diff --git a/_module/ncs/sei_drop.ncs b/_module/ncs/sei_drop.ncs index bb4daa4c..fbc55851 100644 Binary files a/_module/ncs/sei_drop.ncs and b/_module/ncs/sei_drop.ncs differ diff --git a/_module/ncs/sei_sit.ncs b/_module/ncs/sei_sit.ncs index e3a1bcb3..de30a5f7 100644 Binary files a/_module/ncs/sei_sit.ncs and b/_module/ncs/sei_sit.ncs differ diff --git a/_module/ncs/setappearancedop.ncs b/_module/ncs/setappearancedop.ncs index de430af3..864a64a5 100644 Binary files a/_module/ncs/setappearancedop.ncs and b/_module/ncs/setappearancedop.ncs differ diff --git a/_module/ncs/shadow_touch.ncs b/_module/ncs/shadow_touch.ncs index 9cf8cc0a..e57be217 100644 Binary files a/_module/ncs/shadow_touch.ncs and b/_module/ncs/shadow_touch.ncs differ diff --git a/_module/ncs/sitscript_x.ncs b/_module/ncs/sitscript_x.ncs index 56e7aca1..022be3ee 100644 Binary files a/_module/ncs/sitscript_x.ncs and b/_module/ncs/sitscript_x.ncs differ diff --git a/_module/ncs/sklchk_search20.ncs b/_module/ncs/sklchk_search20.ncs index d5d4e0a2..b8ea1eed 100644 Binary files a/_module/ncs/sklchk_search20.ncs and b/_module/ncs/sklchk_search20.ncs differ diff --git a/_module/ncs/slavishdoorback.ncs b/_module/ncs/slavishdoorback.ncs index 08efc0f7..ed0b4d8b 100644 Binary files a/_module/ncs/slavishdoorback.ncs and b/_module/ncs/slavishdoorback.ncs differ diff --git a/_module/ncs/slavishfly1.ncs b/_module/ncs/slavishfly1.ncs index eef61d43..152189be 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 a456fe85..8d73ee0d 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 93d091e6..ec4102c1 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 e5d3f122..3c65576a 100644 Binary files a/_module/ncs/sleeponopen.ncs and b/_module/ncs/sleeponopen.ncs differ diff --git a/_module/ncs/slp_drg_onpercp.ncs b/_module/ncs/slp_drg_onpercp.ncs index 7d084198..371cdb62 100644 Binary files a/_module/ncs/slp_drg_onpercp.ncs and b/_module/ncs/slp_drg_onpercp.ncs differ diff --git a/_module/ncs/sm_on_act.ncs b/_module/ncs/sm_on_act.ncs index 5165a910..cd43afc1 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 5aa6c34e..c83a497a 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 110d8d86..30d59527 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 979087ee..1e7ec786 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 28174117..d772e198 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 5afa7d27..fdf08bbb 100644 Binary files a/_module/ncs/sm_on_rest.ncs and b/_module/ncs/sm_on_rest.ncs differ diff --git a/_module/ncs/sm_on_unacquire.ncs b/_module/ncs/sm_on_unacquire.ncs index cb3bc8aa..ffe4e774 100644 Binary files a/_module/ncs/sm_on_unacquire.ncs and b/_module/ncs/sm_on_unacquire.ncs differ diff --git a/_module/ncs/solar_ai.ncs b/_module/ncs/solar_ai.ncs index 1a569e44..eaa1da2f 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 a81bba77..9126680a 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 21fe1370..c76be1d8 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 f61a3e87..a33e2b22 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 9d2dfe3a..84a156ef 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 9144a2d3..9cd04616 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 e2a1affc..0b6f461e 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 f2fbe4c9..67eda7ce 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 9cb705a0..61885442 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_pseudohb.ncs b/_module/ncs/spawn_pseudohb.ncs index d9cc81e9..e1ea7bb3 100644 Binary files a/_module/ncs/spawn_pseudohb.ncs and b/_module/ncs/spawn_pseudohb.ncs differ diff --git a/_module/ncs/spawn_sample_hb.ncs b/_module/ncs/spawn_sample_hb.ncs index 9cb705a0..61885442 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 33002c89..488916f6 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_deactiv.ncs b/_module/ncs/spawn_sc_deactiv.ncs index 0aaa8b45..78ed4149 100644 Binary files a/_module/ncs/spawn_sc_deactiv.ncs and b/_module/ncs/spawn_sc_deactiv.ncs differ diff --git a/_module/ncs/spawn_sc_death.ncs b/_module/ncs/spawn_sc_death.ncs index 88bc0ae3..e7977121 100644 Binary files a/_module/ncs/spawn_sc_death.ncs and b/_module/ncs/spawn_sc_death.ncs differ diff --git a/_module/ncs/spawn_sc_hbeat.ncs b/_module/ncs/spawn_sc_hbeat.ncs index 525fb8d7..9da1da9b 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_patrol.ncs b/_module/ncs/spawn_sc_patrol.ncs index 61bbfd64..28490c7f 100644 Binary files a/_module/ncs/spawn_sc_patrol.ncs and b/_module/ncs/spawn_sc_patrol.ncs differ diff --git a/_module/ncs/spawn_sit.ncs b/_module/ncs/spawn_sit.ncs index b643a65b..3545d516 100644 Binary files a/_module/ncs/spawn_sit.ncs and b/_module/ncs/spawn_sit.ncs differ diff --git a/_module/ncs/spawn_smpl_onen2.ncs b/_module/ncs/spawn_smpl_onen2.ncs index 6133d463..70861b57 100644 Binary files a/_module/ncs/spawn_smpl_onen2.ncs and b/_module/ncs/spawn_smpl_onen2.ncs differ diff --git a/_module/ncs/spawn_smpl_onent.ncs b/_module/ncs/spawn_smpl_onent.ncs index eb0926cc..2bafc7b1 100644 Binary files a/_module/ncs/spawn_smpl_onent.ncs and b/_module/ncs/spawn_smpl_onent.ncs differ diff --git a/_module/ncs/spawn_smpl_onext.ncs b/_module/ncs/spawn_smpl_onext.ncs index d8b60179..97ea11d0 100644 Binary files a/_module/ncs/spawn_smpl_onext.ncs and b/_module/ncs/spawn_smpl_onext.ncs differ diff --git a/_module/ncs/spawn_used_corps.ncs b/_module/ncs/spawn_used_corps.ncs index ddb4fa02..7b93683c 100644 Binary files a/_module/ncs/spawn_used_corps.ncs and b/_module/ncs/spawn_used_corps.ncs differ diff --git a/_module/ncs/spawnakbeth1.ncs b/_module/ncs/spawnakbeth1.ncs index 2517d9b3..0fb5770e 100644 Binary files a/_module/ncs/spawnakbeth1.ncs and b/_module/ncs/spawnakbeth1.ncs differ diff --git a/_module/ncs/spawnakbeth2.ncs b/_module/ncs/spawnakbeth2.ncs index ab0b70f8..4fa5244d 100644 Binary files a/_module/ncs/spawnakbeth2.ncs and b/_module/ncs/spawnakbeth2.ncs differ diff --git a/_module/ncs/spawnb_cc_nsclog.ncs b/_module/ncs/spawnb_cc_nsclog.ncs index 8953047c..1da7b912 100644 Binary files a/_module/ncs/spawnb_cc_nsclog.ncs and b/_module/ncs/spawnb_cc_nsclog.ncs differ diff --git a/_module/ncs/spawnb_cc_nsdlog.ncs b/_module/ncs/spawnb_cc_nsdlog.ncs index 113610e9..f5d87036 100644 Binary files a/_module/ncs/spawnb_cc_nsdlog.ncs and b/_module/ncs/spawnb_cc_nsdlog.ncs differ diff --git a/_module/ncs/spawnb_cc_sclog.ncs b/_module/ncs/spawnb_cc_sclog.ncs index b40562d3..08533e59 100644 Binary files a/_module/ncs/spawnb_cc_sclog.ncs and b/_module/ncs/spawnb_cc_sclog.ncs differ diff --git a/_module/ncs/spawnb_cc_sdlog.ncs b/_module/ncs/spawnb_cc_sdlog.ncs index ab26152c..718c9dca 100644 Binary files a/_module/ncs/spawnb_cc_sdlog.ncs and b/_module/ncs/spawnb_cc_sdlog.ncs differ diff --git a/_module/ncs/spawnb_sample_ai.ncs b/_module/ncs/spawnb_sample_ai.ncs index 6782f012..9823929e 100644 Binary files a/_module/ncs/spawnb_sample_ai.ncs and b/_module/ncs/spawnb_sample_ai.ncs differ diff --git a/_module/ncs/spawnb_sc_activ.ncs b/_module/ncs/spawnb_sc_activ.ncs index 8f25997e..d932f403 100644 Binary files a/_module/ncs/spawnb_sc_activ.ncs and b/_module/ncs/spawnb_sc_activ.ncs differ diff --git a/_module/ncs/spawnb_sc_dactiv.ncs b/_module/ncs/spawnb_sc_dactiv.ncs index 1f19955c..9859011f 100644 Binary files a/_module/ncs/spawnb_sc_dactiv.ncs and b/_module/ncs/spawnb_sc_dactiv.ncs differ diff --git a/_module/ncs/spawnb_sc_disp.ncs b/_module/ncs/spawnb_sc_disp.ncs index 180951b2..7dc5ec1f 100644 Binary files a/_module/ncs/spawnb_sc_disp.ncs and b/_module/ncs/spawnb_sc_disp.ncs differ diff --git a/_module/ncs/spawnfiilaar.ncs b/_module/ncs/spawnfiilaar.ncs index b7972def..a168eb4c 100644 Binary files a/_module/ncs/spawnfiilaar.ncs and b/_module/ncs/spawnfiilaar.ncs differ diff --git a/_module/ncs/spawnkingsley.ncs b/_module/ncs/spawnkingsley.ncs index 48ea6286..b643a04d 100644 Binary files a/_module/ncs/spawnkingsley.ncs and b/_module/ncs/spawnkingsley.ncs differ diff --git a/_module/ncs/spawnkingsleyhen.ncs b/_module/ncs/spawnkingsleyhen.ncs index 7091ff93..8857a4a5 100644 Binary files a/_module/ncs/spawnkingsleyhen.ncs and b/_module/ncs/spawnkingsleyhen.ncs differ diff --git a/_module/ncs/spawnorcus1.ncs b/_module/ncs/spawnorcus1.ncs index fea4e515..a75fad98 100644 Binary files a/_module/ncs/spawnorcus1.ncs and b/_module/ncs/spawnorcus1.ncs differ diff --git a/_module/ncs/spawnorcus2.ncs b/_module/ncs/spawnorcus2.ncs index ae6c7837..c08ff086 100644 Binary files a/_module/ncs/spawnorcus2.ncs and b/_module/ncs/spawnorcus2.ncs differ diff --git a/_module/ncs/spawnorcus3.ncs b/_module/ncs/spawnorcus3.ncs index 5dbf0157..5b72d8ee 100644 Binary files a/_module/ncs/spawnorcus3.ncs and b/_module/ncs/spawnorcus3.ncs differ diff --git a/_module/ncs/spawnorcusx.ncs b/_module/ncs/spawnorcusx.ncs index a7df906c..8f9b4e69 100644 Binary files a/_module/ncs/spawnorcusx.ncs and b/_module/ncs/spawnorcusx.ncs differ diff --git a/_module/ncs/spawnscramge.ncs b/_module/ncs/spawnscramge.ncs index 432f1e16..13603c29 100644 Binary files a/_module/ncs/spawnscramge.ncs and b/_module/ncs/spawnscramge.ncs differ diff --git a/_module/ncs/spawnsorates.ncs b/_module/ncs/spawnsorates.ncs index 35069dde..e238d239 100644 Binary files a/_module/ncs/spawnsorates.ncs and b/_module/ncs/spawnsorates.ncs differ diff --git a/_module/ncs/spawnsoratesh.ncs b/_module/ncs/spawnsoratesh.ncs index 19749854..6e00cb27 100644 Binary files a/_module/ncs/spawnsoratesh.ncs and b/_module/ncs/spawnsoratesh.ncs differ diff --git a/_module/ncs/spawnst.ncs b/_module/ncs/spawnst.ncs index de9ca427..6f424157 100644 Binary files a/_module/ncs/spawnst.ncs and b/_module/ncs/spawnst.ncs differ diff --git a/_module/ncs/spawnsthench.ncs b/_module/ncs/spawnsthench.ncs index 5688816a..542b2359 100644 Binary files a/_module/ncs/spawnsthench.ncs and b/_module/ncs/spawnsthench.ncs differ diff --git a/_module/ncs/spell_suck.ncs b/_module/ncs/spell_suck.ncs index f6a2b188..eb99537b 100644 Binary files a/_module/ncs/spell_suck.ncs and b/_module/ncs/spell_suck.ncs differ diff --git a/_module/ncs/spmarthekhench.ncs b/_module/ncs/spmarthekhench.ncs index 5bd71a7a..5f3ca45f 100644 Binary files a/_module/ncs/spmarthekhench.ncs and b/_module/ncs/spmarthekhench.ncs differ diff --git a/_module/ncs/start_merchant.ncs b/_module/ncs/start_merchant.ncs index b20bcc68..b10ad25f 100644 Binary files a/_module/ncs/start_merchant.ncs and b/_module/ncs/start_merchant.ncs differ diff --git a/_module/ncs/statue.ncs b/_module/ncs/statue.ncs index 625339b1..7e235d81 100644 Binary files a/_module/ncs/statue.ncs and b/_module/ncs/statue.ncs differ diff --git a/_module/ncs/statuedwarfscrip.ncs b/_module/ncs/statuedwarfscrip.ncs index 54aa02ae..f286f792 100644 Binary files a/_module/ncs/statuedwarfscrip.ncs and b/_module/ncs/statuedwarfscrip.ncs differ diff --git a/_module/ncs/stealbreath.ncs b/_module/ncs/stealbreath.ncs index a4de314e..374739ad 100644 Binary files a/_module/ncs/stealbreath.ncs and b/_module/ncs/stealbreath.ncs differ diff --git a/_module/ncs/stench_onenter.ncs b/_module/ncs/stench_onenter.ncs index d8509512..4cdd5a30 100644 Binary files a/_module/ncs/stench_onenter.ncs and b/_module/ncs/stench_onenter.ncs differ diff --git a/_module/ncs/stombcraterp.ncs b/_module/ncs/stombcraterp.ncs index 84282b76..9b5665a6 100644 Binary files a/_module/ncs/stombcraterp.ncs and b/_module/ncs/stombcraterp.ncs differ diff --git a/_module/ncs/stonebat.ncs b/_module/ncs/stonebat.ncs index 8aef0de7..615e7f2e 100644 Binary files a/_module/ncs/stonebat.ncs and b/_module/ncs/stonebat.ncs differ diff --git a/_module/ncs/stonehb.ncs b/_module/ncs/stonehb.ncs index 7bd40ac6..490d2b6e 100644 Binary files a/_module/ncs/stonehb.ncs and b/_module/ncs/stonehb.ncs differ diff --git a/_module/ncs/stonepriest.ncs b/_module/ncs/stonepriest.ncs index 8d6653a6..32bfc40f 100644 Binary files a/_module/ncs/stonepriest.ncs and b/_module/ncs/stonepriest.ncs differ diff --git a/_module/ncs/store_gen_start.ncs b/_module/ncs/store_gen_start.ncs index 27d07d5c..f3e89857 100644 Binary files a/_module/ncs/store_gen_start.ncs and b/_module/ncs/store_gen_start.ncs differ diff --git a/_module/ncs/store_shadydick.ncs b/_module/ncs/store_shadydick.ncs index 92e1bc20..e641c927 100644 Binary files a/_module/ncs/store_shadydick.ncs and b/_module/ncs/store_shadydick.ncs differ diff --git a/_module/ncs/strdraintrig.ncs b/_module/ncs/strdraintrig.ncs index 390a6c20..f18eac59 100644 Binary files a/_module/ncs/strdraintrig.ncs and b/_module/ncs/strdraintrig.ncs differ diff --git a/_module/ncs/stripstuff.ncs b/_module/ncs/stripstuff.ncs index 0f2b80ff..ec564811 100644 Binary files a/_module/ncs/stripstuff.ncs and b/_module/ncs/stripstuff.ncs differ diff --git a/_module/ncs/stripstuff1.ncs b/_module/ncs/stripstuff1.ncs index 50906b6a..99f436dd 100644 Binary files a/_module/ncs/stripstuff1.ncs and b/_module/ncs/stripstuff1.ncs differ diff --git a/_module/ncs/sumcorrak.ncs b/_module/ncs/sumcorrak.ncs index 17bb8fc0..320ab103 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 0d774c22..887f8309 100644 Binary files a/_module/ncs/summon4glabs.ncs and b/_module/ncs/summon4glabs.ncs differ diff --git a/_module/ncs/summon_skelies.ncs b/_module/ncs/summon_skelies.ncs index dc2d1ca2..a1458b50 100644 Binary files a/_module/ncs/summon_skelies.ncs and b/_module/ncs/summon_skelies.ncs differ diff --git a/_module/ncs/summonantony.ncs b/_module/ncs/summonantony.ncs index ac3550f3..0cf051b0 100644 Binary files a/_module/ncs/summonantony.ncs and b/_module/ncs/summonantony.ncs differ diff --git a/_module/ncs/summondemi.ncs b/_module/ncs/summondemi.ncs index c175753a..c9e4a9b8 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 22b32b9c..053fee53 100644 Binary files a/_module/ncs/summonrtroll.ncs and b/_module/ncs/summonrtroll.ncs differ diff --git a/_module/ncs/surfto11.ncs b/_module/ncs/surfto11.ncs index 0b3cccfa..3a392058 100644 Binary files a/_module/ncs/surfto11.ncs and b/_module/ncs/surfto11.ncs differ diff --git a/_module/ncs/surfto2.ncs b/_module/ncs/surfto2.ncs index c49f7f64..cc2a823f 100644 Binary files a/_module/ncs/surfto2.ncs and b/_module/ncs/surfto2.ncs differ diff --git a/_module/ncs/swarm_bloodfly.ncs b/_module/ncs/swarm_bloodfly.ncs index e026d8ba..f9ec68a0 100644 Binary files a/_module/ncs/swarm_bloodfly.ncs and b/_module/ncs/swarm_bloodfly.ncs differ diff --git a/_module/ncs/swm_bloodfly_ent.ncs b/_module/ncs/swm_bloodfly_ent.ncs index a456ff2e..713fa9f5 100644 Binary files a/_module/ncs/swm_bloodfly_ent.ncs and b/_module/ncs/swm_bloodfly_ent.ncs differ diff --git a/_module/ncs/swm_bloodfly_ext.ncs b/_module/ncs/swm_bloodfly_ext.ncs index 47e69394..928d0402 100644 Binary files a/_module/ncs/swm_bloodfly_ext.ncs and b/_module/ncs/swm_bloodfly_ext.ncs differ diff --git a/_module/ncs/swm_bloodfly_hb.ncs b/_module/ncs/swm_bloodfly_hb.ncs index 79c4ab9e..1f3da9d0 100644 Binary files a/_module/ncs/swm_bloodfly_hb.ncs and b/_module/ncs/swm_bloodfly_hb.ncs differ diff --git a/_module/ncs/talk2pc_onpercp.ncs b/_module/ncs/talk2pc_onpercp.ncs index 03e3b7f5..cc04e06c 100644 Binary files a/_module/ncs/talk2pc_onpercp.ncs and b/_module/ncs/talk2pc_onpercp.ncs differ diff --git a/_module/ncs/talktopc.ncs b/_module/ncs/talktopc.ncs index 0b35acf3..c2dc8634 100644 Binary files a/_module/ncs/talktopc.ncs and b/_module/ncs/talktopc.ncs differ diff --git a/_module/ncs/tar_lake_hb.ncs b/_module/ncs/tar_lake_hb.ncs index 8df95365..10bc700b 100644 Binary files a/_module/ncs/tar_lake_hb.ncs and b/_module/ncs/tar_lake_hb.ncs differ diff --git a/_module/ncs/tarlaketo12.ncs b/_module/ncs/tarlaketo12.ncs index 4a869840..be7db14f 100644 Binary files a/_module/ncs/tarlaketo12.ncs and b/_module/ncs/tarlaketo12.ncs differ diff --git a/_module/ncs/tarpitconvport.ncs b/_module/ncs/tarpitconvport.ncs index d87cb3a1..5e53261d 100644 Binary files a/_module/ncs/tarpitconvport.ncs and b/_module/ncs/tarpitconvport.ncs differ diff --git a/_module/ncs/teleport_auto.ncs b/_module/ncs/teleport_auto.ncs index 3ad1ae81..c7d42116 100644 Binary files a/_module/ncs/teleport_auto.ncs and b/_module/ncs/teleport_auto.ncs differ diff --git a/_module/ncs/teleport_party.ncs b/_module/ncs/teleport_party.ncs index e48da7a8..c4f0dd97 100644 Binary files a/_module/ncs/teleport_party.ncs and b/_module/ncs/teleport_party.ncs differ diff --git a/_module/ncs/teleport_start.ncs b/_module/ncs/teleport_start.ncs index 29224a67..1b2494bf 100644 Binary files a/_module/ncs/teleport_start.ncs and b/_module/ncs/teleport_start.ncs differ diff --git a/_module/ncs/temple_curecrit.ncs b/_module/ncs/temple_curecrit.ncs index 4c8f2b48..a61261c2 100644 Binary files a/_module/ncs/temple_curecrit.ncs and b/_module/ncs/temple_curecrit.ncs differ diff --git a/_module/ncs/temple_curelight.ncs b/_module/ncs/temple_curelight.ncs index 8f5470cd..b1a167be 100644 Binary files a/_module/ncs/temple_curelight.ncs and b/_module/ncs/temple_curelight.ncs differ diff --git a/_module/ncs/temple_fcurecrit.ncs b/_module/ncs/temple_fcurecrit.ncs index 20e8738b..dbfaa244 100644 Binary files a/_module/ncs/temple_fcurecrit.ncs and b/_module/ncs/temple_fcurecrit.ncs differ diff --git a/_module/ncs/temple_fcurelig.ncs b/_module/ncs/temple_fcurelig.ncs index 03fdb344..fb53d1a4 100644 Binary files a/_module/ncs/temple_fcurelig.ncs and b/_module/ncs/temple_fcurelig.ncs differ diff --git a/_module/ncs/temple_flessres.ncs b/_module/ncs/temple_flessres.ncs index 74275c44..ff971365 100644 Binary files a/_module/ncs/temple_flessres.ncs and b/_module/ncs/temple_flessres.ncs differ diff --git a/_module/ncs/temple_fneutpoi.ncs b/_module/ncs/temple_fneutpoi.ncs index db925217..7f095038 100644 Binary files a/_module/ncs/temple_fneutpoi.ncs and b/_module/ncs/temple_fneutpoi.ncs differ diff --git a/_module/ncs/temple_lessresto.ncs b/_module/ncs/temple_lessresto.ncs index 3a12ac94..e5fed020 100644 Binary files a/_module/ncs/temple_lessresto.ncs and b/_module/ncs/temple_lessresto.ncs differ diff --git a/_module/ncs/temple_moaning.ncs b/_module/ncs/temple_moaning.ncs index 1ec5b17a..2a4a235a 100644 Binary files a/_module/ncs/temple_moaning.ncs and b/_module/ncs/temple_moaning.ncs differ diff --git a/_module/ncs/temple_monkhb.ncs b/_module/ncs/temple_monkhb.ncs index f8777599..eef7beca 100644 Binary files a/_module/ncs/temple_monkhb.ncs and b/_module/ncs/temple_monkhb.ncs differ diff --git a/_module/ncs/temple_neutrapoi.ncs b/_module/ncs/temple_neutrapoi.ncs index 0c0d5dad..4c4e00b5 100644 Binary files a/_module/ncs/temple_neutrapoi.ncs and b/_module/ncs/temple_neutrapoi.ncs differ diff --git a/_module/ncs/temple_patien2sp.ncs b/_module/ncs/temple_patien2sp.ncs index 771edd98..852eba0b 100644 Binary files a/_module/ncs/temple_patien2sp.ncs and b/_module/ncs/temple_patien2sp.ncs differ diff --git a/_module/ncs/temple_patientsp.ncs b/_module/ncs/temple_patientsp.ncs index 771edd98..852eba0b 100644 Binary files a/_module/ncs/temple_patientsp.ncs and b/_module/ncs/temple_patientsp.ncs differ diff --git a/_module/ncs/temple_sbrechb.ncs b/_module/ncs/temple_sbrechb.ncs index 6e61c942..fa6320f4 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 69a8391c..015abc71 100644 Binary files a/_module/ncs/temple_surghb.ncs and b/_module/ncs/temple_surghb.ncs differ diff --git a/_module/ncs/tempstasistrigge.ncs b/_module/ncs/tempstasistrigge.ncs index 30c28459..0acc92c9 100644 Binary files a/_module/ncs/tempstasistrigge.ncs and b/_module/ncs/tempstasistrigge.ncs differ diff --git a/_module/ncs/test_ondying.ncs b/_module/ncs/test_ondying.ncs index 60f8904b..800481a7 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 d3fd0060..064af25a 100644 Binary files a/_module/ncs/testofstrconvp.ncs and b/_module/ncs/testofstrconvp.ncs differ diff --git a/_module/ncs/to_mt_sea_cave.ncs b/_module/ncs/to_mt_sea_cave.ncs index a90884b0..08ca6a02 100644 Binary files a/_module/ncs/to_mt_sea_cave.ncs and b/_module/ncs/to_mt_sea_cave.ncs differ diff --git a/_module/ncs/toanthole29.ncs b/_module/ncs/toanthole29.ncs index e0cd8265..e4dec9bc 100644 Binary files a/_module/ncs/toanthole29.ncs and b/_module/ncs/toanthole29.ncs differ diff --git a/_module/ncs/toanthole30.ncs b/_module/ncs/toanthole30.ncs index 1e635ffb..3db2010a 100644 Binary files a/_module/ncs/toanthole30.ncs and b/_module/ncs/toanthole30.ncs differ diff --git a/_module/ncs/toanthole33.ncs b/_module/ncs/toanthole33.ncs index 3716a530..dfd78b90 100644 Binary files a/_module/ncs/toanthole33.ncs and b/_module/ncs/toanthole33.ncs differ diff --git a/_module/ncs/tombofektolake.ncs b/_module/ncs/tombofektolake.ncs index c97791b4..bee49053 100644 Binary files a/_module/ncs/tombofektolake.ncs and b/_module/ncs/tombofektolake.ncs differ diff --git a/_module/ncs/tomemotespawn.ncs b/_module/ncs/tomemotespawn.ncs index 93ed0046..054fd436 100644 Binary files a/_module/ncs/tomemotespawn.ncs and b/_module/ncs/tomemotespawn.ncs differ diff --git a/_module/ncs/toship1.ncs b/_module/ncs/toship1.ncs index f13af5de..19da4507 100644 Binary files a/_module/ncs/toship1.ncs and b/_module/ncs/toship1.ncs differ diff --git a/_module/ncs/towntosg.ncs b/_module/ncs/towntosg.ncs index 703bb11d..79777a9d 100644 Binary files a/_module/ncs/towntosg.ncs and b/_module/ncs/towntosg.ncs differ diff --git a/_module/ncs/trap_footcatch.ncs b/_module/ncs/trap_footcatch.ncs index a93a8165..4a0395c6 100644 Binary files a/_module/ncs/trap_footcatch.ncs and b/_module/ncs/trap_footcatch.ncs differ diff --git a/_module/ncs/tribitzend.ncs b/_module/ncs/tribitzend.ncs index 82413fcf..074e6e67 100644 Binary files a/_module/ncs/tribitzend.ncs and b/_module/ncs/tribitzend.ncs differ diff --git a/_module/ncs/tribitzfinalch.ncs b/_module/ncs/tribitzfinalch.ncs index ef474fe9..6bf1ba7b 100644 Binary files a/_module/ncs/tribitzfinalch.ncs and b/_module/ncs/tribitzfinalch.ncs differ diff --git a/_module/ncs/trigger_warn_dms.ncs b/_module/ncs/trigger_warn_dms.ncs index 155092c3..037e92c5 100644 Binary files a/_module/ncs/trigger_warn_dms.ncs and b/_module/ncs/trigger_warn_dms.ncs differ diff --git a/_module/ncs/tz_ed_ondeath.ncs b/_module/ncs/tz_ed_ondeath.ncs index c8546735..73453a4a 100644 Binary files a/_module/ncs/tz_ed_ondeath.ncs and b/_module/ncs/tz_ed_ondeath.ncs differ diff --git a/_module/ncs/tz_ed_ondying.ncs b/_module/ncs/tz_ed_ondying.ncs index 0e56d625..bce78fde 100644 Binary files a/_module/ncs/tz_ed_ondying.ncs and b/_module/ncs/tz_ed_ondying.ncs differ diff --git a/_module/ncs/ubersecport.ncs b/_module/ncs/ubersecport.ncs index c472bfd0..e768891c 100644 Binary files a/_module/ncs/ubersecport.ncs and b/_module/ncs/ubersecport.ncs differ diff --git a/_module/ncs/underwater_hb.ncs b/_module/ncs/underwater_hb.ncs index da07eb7e..c28079ec 100644 Binary files a/_module/ncs/underwater_hb.ncs and b/_module/ncs/underwater_hb.ncs differ diff --git a/_module/ncs/uptarpit.ncs b/_module/ncs/uptarpit.ncs index 071a1204..19ebcf8e 100644 Binary files a/_module/ncs/uptarpit.ncs and b/_module/ncs/uptarpit.ncs differ diff --git a/_module/ncs/userdef_troll.ncs b/_module/ncs/userdef_troll.ncs index 88ea91f7..149ca85b 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 9c7a1062..d4b21d34 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 4c3e3d18..d97fa44a 100644 Binary files a/_module/ncs/vampscome.ncs and b/_module/ncs/vampscome.ncs differ diff --git a/_module/ncs/wallclose.ncs b/_module/ncs/wallclose.ncs index e77006f1..ee7fa104 100644 Binary files a/_module/ncs/wallclose.ncs and b/_module/ncs/wallclose.ncs differ diff --git a/_module/ncs/warpparty.ncs b/_module/ncs/warpparty.ncs index 9159b99c..8ba54ff0 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 24e68467..257714ac 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 133114a1..024d0641 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 b929310c..299e5fae 100644 Binary files a/_module/ncs/wierdopen.ncs and b/_module/ncs/wierdopen.ncs differ diff --git a/_module/ncs/wierdtrig.ncs b/_module/ncs/wierdtrig.ncs index 5654904e..06c661fb 100644 Binary files a/_module/ncs/wierdtrig.ncs and b/_module/ncs/wierdtrig.ncs differ diff --git a/_module/ncs/wisdraintrigger.ncs b/_module/ncs/wisdraintrigger.ncs index 461682b4..62544a2c 100644 Binary files a/_module/ncs/wisdraintrigger.ncs and b/_module/ncs/wisdraintrigger.ncs differ diff --git a/_module/ncs/wisgone2.ncs b/_module/ncs/wisgone2.ncs index 3cecc11a..9d8f6510 100644 Binary files a/_module/ncs/wisgone2.ncs and b/_module/ncs/wisgone2.ncs differ diff --git a/_module/ncs/wisright1.ncs b/_module/ncs/wisright1.ncs index 5ca6b98f..c7504cef 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 3a6d6337..2e576196 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 0c7bd07f..2bd8b8f7 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 bcf439fb..392191af 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 a515c1cf..2b7a810a 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 8fe5d3d6..3ba2e1e8 100644 Binary files a/_module/ncs/wiswrong3.ncs and b/_module/ncs/wiswrong3.ncs differ diff --git a/_module/ncs/wpto9b.ncs b/_module/ncs/wpto9b.ncs index 32812f81..862845d6 100644 Binary files a/_module/ncs/wpto9b.ncs and b/_module/ncs/wpto9b.ncs differ diff --git a/_module/ncs/ww_aura1.ncs b/_module/ncs/ww_aura1.ncs index cbef6176..ca7639fb 100644 Binary files a/_module/ncs/ww_aura1.ncs and b/_module/ncs/ww_aura1.ncs differ diff --git a/_module/ncs/ww_aura2.ncs b/_module/ncs/ww_aura2.ncs index 55c4c208..ea45b5c9 100644 Binary files a/_module/ncs/ww_aura2.ncs and b/_module/ncs/ww_aura2.ncs differ diff --git a/_module/ncs/wwclaw.ncs b/_module/ncs/wwclaw.ncs index 5668eefe..1d908866 100644 Binary files a/_module/ncs/wwclaw.ncs and b/_module/ncs/wwclaw.ncs differ diff --git a/_module/ncs/x2_act_ws_makeme.ncs b/_module/ncs/x2_act_ws_makeme.ncs index f7ff1ec8..162e23f3 100644 Binary files a/_module/ncs/x2_act_ws_makeme.ncs and b/_module/ncs/x2_act_ws_makeme.ncs differ diff --git a/_module/ncs/x2_def_heartbeat.ncs b/_module/ncs/x2_def_heartbeat.ncs index 043d02d2..672b9a39 100644 Binary files a/_module/ncs/x2_def_heartbeat.ncs and b/_module/ncs/x2_def_heartbeat.ncs differ diff --git a/_module/ncs/x2_def_userdef.ncs b/_module/ncs/x2_def_userdef.ncs index ebc539cb..edd56f76 100644 Binary files a/_module/ncs/x2_def_userdef.ncs and b/_module/ncs/x2_def_userdef.ncs differ diff --git a/_module/ncs/x2_mod_def_load.ncs b/_module/ncs/x2_mod_def_load.ncs index 89c3641c..8a5e592f 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 e2f4a124..0b9e55bf 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 ef3a6046..adafa99d 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 e79f8e99..0b980078 100644 Binary files a/_module/ncs/x2_s1_beholdray.ncs and b/_module/ncs/x2_s1_beholdray.ncs differ diff --git a/_module/ncs/x2_sig_state.ncs b/_module/ncs/x2_sig_state.ncs index 6ef01265..122c5967 100644 Binary files a/_module/ncs/x2_sig_state.ncs and b/_module/ncs/x2_sig_state.ncs differ diff --git a/_module/ncs/xix_ai.ncs b/_module/ncs/xix_ai.ncs index ca076d09..a27eb1b6 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 16e64ac4..2b998d36 100644 Binary files a/_module/ncs/xix_hit.ncs and b/_module/ncs/xix_hit.ncs differ diff --git a/_module/ncs/yuantigone.ncs b/_module/ncs/yuantigone.ncs index 7098c684..a8462c8c 100644 Binary files a/_module/ncs/yuantigone.ncs and b/_module/ncs/yuantigone.ncs differ diff --git a/_module/ncs/zep_shrieker_spw.ncs b/_module/ncs/zep_shrieker_spw.ncs index 8904f056..8d759ccb 100644 Binary files a/_module/ncs/zep_shrieker_spw.ncs and b/_module/ncs/zep_shrieker_spw.ncs differ diff --git a/_module/nss/array_example.nss b/_module/nss/array_example.nss new file mode 100644 index 00000000..53f13f8f --- /dev/null +++ b/_module/nss/array_example.nss @@ -0,0 +1,143 @@ +//#include "inc_array" +#include "nwnx_time" + +// nwnx_data also includes inc_array, so don't double dip. +#include "nwnx_data" + +void Log(string msg) +{ + WriteTimestampedLogEntry(msg); +} + +void TestArrayOnModule() +{ + + string array = "test"; + + // By default, temporary arrays are created on the module. + Array_PushBack_Str(array, "BItem1"); + Array_PushBack_Str(array, "AItem2"); + Array_PushBack_Str(array, "AItem3"); + Array_PushBack_Str(array, "BItem2"); + Array_Debug_Dump(array, "After first load"); + + int foo = Array_Find_Str(array, "AItem3"); + Log("Found element AItem3 at index = " + IntToString(foo)); + + Array_Set_Str(array, 2, "Suck it up..."); + Array_Debug_Dump(array, "After set 2 = 'Suck it up...'"); + + Array_Erase(array, 1); + Array_Debug_Dump(array, "After delete 1"); + + Array_PushBack_Str(array, "MItem1"); + Array_PushBack_Str(array, "QItem2"); + Array_PushBack_Str(array, "NItem3"); + Array_PushBack_Str(array, "KItem2"); + + Array_Debug_Dump(array, "After add more"); + Array_SortAscending(array); + + Array_Debug_Dump(array, "After sort"); + + Array_Shuffle(array); + Array_Debug_Dump(array, "After shuffle"); + + Log( (Array_Contains_Str(array, "NItem3")) ? "Passed.. found it" : "Failed.. should have found it" ); + Log( (Array_Contains_Str(array, "KItem2")) ? "Passed.. found it" : "Failed.. should have found it" ); + Log( (Array_Contains_Str(array, "xxxxxx")) ? "Failed.. not found" : "Passed.. should not exist" ); + + Array_Clear(array); + // Load up the array with 100 entries + int i; + + struct NWNX_Time_HighResTimestamp b; + b = NWNX_Time_GetHighResTimeStamp(); + Log("Start Time: " + IntToString(b.seconds) + "." + IntToString(b.microseconds)); + for (i=0; i<1000; i++) + { + Array_PushBack_Str(array, IntToString(d100()) + " xxx " + IntToString(i)); + } + b = NWNX_Time_GetHighResTimeStamp(); + Log("Loaded 1000: " + IntToString(b.seconds) + "." + IntToString(b.microseconds)); + Array_Shuffle(array); + b = NWNX_Time_GetHighResTimeStamp(); + Log("Shuffled 1000: " + IntToString(b.seconds) + "." + IntToString(b.microseconds)); + for (i=5; i<995; i++) + { + // Delete the third entry a bunch of times + Array_Erase(array, 3); + } + b = NWNX_Time_GetHighResTimeStamp(); + Log("Delete ~990: " + IntToString(b.seconds) + "." + IntToString(b.microseconds)); + Array_Debug_Dump(array, "After mass insert/delete"); + +} + +void TestArrayOnChicken() +{ + string array="chicken"; + // Let's create an array "on" our favorite creature: the deadly nw_chicken + // Note - arrays aren't really attached to the item, but the module, and they + // are tagged with the objects string representation. + object oCreature = CreateObject(OBJECT_TYPE_CREATURE, "nw_chicken", GetStartingLocation()); + if (!GetIsObjectValid(oCreature)) + { + Log("NWNX_Creature test: Failed to create creature"); + return; + } + + Array_PushBack_Str(array, "BItem1", oCreature); + Array_PushBack_Str(array, "AItem2", oCreature); + Array_PushBack_Str(array, "AItem3", oCreature); + Array_PushBack_Str(array, "BItem2", oCreature); + Array_Debug_Dump(array, "After Chicken array load", oCreature); + +} + +void TestNWNXArray() +{ + Log(""); + Log("Start NWNX_Data test."); + string array = "test2"; + + NWNX_Data_Array_PushBack_Str(GetModule(), array, "XItem1"); + NWNX_Data_Array_PushBack_Str(GetModule(), array, "ZItem2"); + NWNX_Data_Array_PushBack_Str(GetModule(), array, "ZItem3"); + NWNX_Data_Array_PushBack_Str(GetModule(), array, "XItem2"); + Array_Debug_Dump(array, "After first load"); + + int foo = NWNX_Data_Array_Find_Str(GetModule(), array, "ZItem3"); + Log("Found element AItem3 at index = " + IntToString(foo)); + + NWNX_Data_Array_Set_Str(GetModule(), array, 2, "Suck it up..."); + Array_Debug_Dump(array, "After set 2 = 'Suck it up...'"); + + NWNX_Data_Array_Erase(NWNX_DATA_TYPE_STRING, GetModule(), array, 1); + Array_Debug_Dump(array, "After delete 1"); + + NWNX_Data_Array_PushBack_Str(GetModule(), array, "MItem1"); + NWNX_Data_Array_PushBack_Str(GetModule(), array, "QItem2"); + NWNX_Data_Array_PushBack_Str(GetModule(), array, "NItem3"); + NWNX_Data_Array_PushBack_Str(GetModule(), array, "KItem2"); + + Array_Debug_Dump(array, "After add more"); + NWNX_Data_Array_SortAscending(NWNX_DATA_TYPE_STRING, GetModule(), array); + + Array_Debug_Dump(array, "After sort"); + +} + +// Uncomment and assign to some event click. +/* */ +void main() +{ + Log("Start"); + + TestArrayOnModule(); + + TestArrayOnChicken(); + + TestNWNXArray(); +} +/* */ diff --git a/_module/nss/codi_attacked.nss b/_module/nss/codi_attacked.nss new file mode 100644 index 00000000..71a81dec --- /dev/null +++ b/_module/nss/codi_attacked.nss @@ -0,0 +1,33 @@ +//:://///////////////////////////////////////////// +//:: Name codi_attacked +//:: +//::////////////////////////////////////////////// +/* + NPC OnAttacked event script caller to run CODI + AI & PRC events. +*/ +//::////////////////////////////////////////////// +//:: Created By: Jaysyn +//:: Created On: 20240331 +//::////////////////////////////////////////////// + +void main() +{ + //-------------------------------------------------------------------------- + // GZ: 2003-10-16 + // Make Plot Creatures Ignore Attacks + //-------------------------------------------------------------------------- + if (GetPlotFlag(OBJECT_SELF)) + { + return; + } + +//:: Execute the CODI AI NPC OnAttacked script + ExecuteScript("no_ai_atk", OBJECT_SELF); + +//:: Execute the Default NPC OnAttacked script + //ExecuteScript("nw_c2_default5", OBJECT_SELF); + +//:: Execute the PRC NPC OnAttacked script + ExecuteScript("prc_npc_physatt", OBJECT_SELF); +} diff --git a/_module/nss/codi_endcombat.nss b/_module/nss/codi_endcombat.nss new file mode 100644 index 00000000..318c7493 --- /dev/null +++ b/_module/nss/codi_endcombat.nss @@ -0,0 +1,24 @@ +//:://///////////////////////////////////////////// +//:: Name codi_endcombat +//:: +//::////////////////////////////////////////////// +/* + NPC EndCombatRound event script caller to run + CODI AI & PRC events. +*/ +//::////////////////////////////////////////////// +//:: Created By: Jaysyn +//:: Created On: 20240331 +//::////////////////////////////////////////////// + +void main() +{ +//:: Execute the CODI AI NPC OnCombatRoundEnd script + ExecuteScript("no_ai_cmb", OBJECT_SELF); + +//:: Execute the default NPC OnCombatRoundEnd script + //ExecuteScript("nw_c2_default3", OBJECT_SELF); + +//:: Execute the PRC NPC OnCombatRoundEnd script + ExecuteScript("prc_npc_combat", OBJECT_SELF); +} diff --git a/_module/nss/codi_heartbeat.nss b/_module/nss/codi_heartbeat.nss new file mode 100644 index 00000000..4e73560e --- /dev/null +++ b/_module/nss/codi_heartbeat.nss @@ -0,0 +1,65 @@ +//:://///////////////////////////////////////////// +//:: Name codi_heartbeat +//:: +//::////////////////////////////////////////////// +/* + NPC Heartbeat event script caller to run CODI + AI & PRC events. +*/ +//::////////////////////////////////////////////// +//:: Created By: Jaysyn +//:: Created On: 20240331 +//::////////////////////////////////////////////// + +void main() +{ +//:: Declare major variables + object oNPC = OBJECT_SELF; + object oAttacker; + string sResRef = GetResRef(oNPC); + +//:: Runs special swarm HB + // if (sResRef == "ds_repbatswrm001" || + // sResRef == "ds_minkankswrm01" || + // sResRef == "ds_locustswarm01" || + // sResRef == "ar_berzwasp001" || + // sResRef == "ar_berzwasp002" ) + // { + // ExecuteScript("cr_locust_hb", oNPC); + // } + +//:: Equips best armor + if ((!GetIsInCombat(oNPC) && (GetItemInSlot(INVENTORY_SLOT_CHEST) == OBJECT_INVALID))) + DelayCommand(0.5f, ActionEquipMostEffectiveArmor()); + +//:: Handles Vampire's Gaseous form death. + if(sResRef == "ra_vamp_gas_form") + { + //:: Get nearest alive PC. + oAttacker = GetNearestCreature(CREATURE_TYPE_PLAYER_CHAR, PLAYER_CHAR_IS_PC, oNPC, 1, CREATURE_TYPE_IS_ALIVE, TRUE); + + //:: Set destroyable. + SetIsDestroyable(TRUE, FALSE, FALSE); + + //:: Remove plot/immoral/lootable flags JUST in case. + SetPlotFlag(oNPC, FALSE); + SetImmortal(oNPC, FALSE); + SetLootable(oNPC, FALSE); + + //:: Clear Actions & run away + ClearAllActions(); + ActionMoveAwayFromObject(oAttacker, TRUE, 300.0f); + + //:: Destroy ourselves after fleeing the scene + DelayCommand(10.0f, DestroyObject(oNPC)); + } + +//:: Execute the CODI NPC OnHeartbeat script + ExecuteScript("no_ai_hrt", oNPC); + +//:: Execute the default NPC OnHeartbeat script + //ExecuteScript("nw_c2_default1", oNPC); + +//:: Execute the PRC NPC OnHeartbeat script + ExecuteScript("prc_npc_hb", oNPC); +} diff --git a/_module/nss/codi_onblocked.nss b/_module/nss/codi_onblocked.nss new file mode 100644 index 00000000..a767125f --- /dev/null +++ b/_module/nss/codi_onblocked.nss @@ -0,0 +1,21 @@ +//:://///////////////////////////////////////////// +//:: Name codi_onblocked +//:: +//::////////////////////////////////////////////// +/* + NPC OnBlocked event script caller to run CODI + AI & PRC events. +*/ +//::////////////////////////////////////////////// +//:: Created By: Jaysyn +//:: Created On: 20240331 +//::////////////////////////////////////////////// + +void main() +{ +//:: Execute the CODI AI NPC OnBlocked script + ExecuteScript("no_ai_blk", OBJECT_SELF); + +//:: Execute the PRC NPC OnBlocked script + ExecuteScript("prc_npc_blocked", OBJECT_SELF); +} diff --git a/_module/nss/codi_onconv.nss b/_module/nss/codi_onconv.nss new file mode 100644 index 00000000..c4d6d730 --- /dev/null +++ b/_module/nss/codi_onconv.nss @@ -0,0 +1,25 @@ +//:://///////////////////////////////////////////// +//:: Name codi_onconv +//:: +//::////////////////////////////////////////////// +/* + NPC OnConversation event script caller to run + CODI AI & PRC events. +*/ +//::////////////////////////////////////////////// +//:: Created By: Jaysyn +//:: Created On: 20240331 +//::////////////////////////////////////////////// + + +void main() +{ +//:: Execute the CODI AI NPC OnConversation script + ExecuteScript("no_ai_cnv", OBJECT_SELF); + +//:: Execute the default NPC OnConversation script + //ExecuteScript("nw_c2_default4", OBJECT_SELF); + +//:: Execute the PRC NPC OnConversation script + ExecuteScript("prc_npc_conv", OBJECT_SELF); +} diff --git a/_module/nss/codi_ondamage.nss b/_module/nss/codi_ondamage.nss new file mode 100644 index 00000000..e41e5844 --- /dev/null +++ b/_module/nss/codi_ondamage.nss @@ -0,0 +1,54 @@ +//:://///////////////////////////////////////////// +//:: Name codi_ondamage +//:: +//::////////////////////////////////////////////// +/* + NPC OnDamaged event script caller to run + CODI AI & PRC events. +*/ +//::////////////////////////////////////////////// +//:: Created By: Jaysyn +//:: Created On: 20240331 +//::////////////////////////////////////////////// + + +void main() +{ + int nTotalDamage = GetTotalDamageDealt(); + int nFireDamage = 0; + + string sResRef = GetResRef(OBJECT_SELF); + + //-------------------------------------------------------------------------- + // GZ: 2003-10-16 + // Make Plot Creatures Ignore Attacks + //-------------------------------------------------------------------------- + if (GetPlotFlag(OBJECT_SELF)) + { + return; + } + +//:: Handles healing from fire damage + if(sResRef == "BLEAKBORN001" || sResRef == "BLEAKBORN002") + { + if(GetDamageDealtByType(DAMAGE_TYPE_FIRE) != -1) + { + nFireDamage = GetDamageDealtByType(DAMAGE_TYPE_FIRE); + //DelayCommand(0.0f, SpeakString("Fire Damage: " + IntToString(nFireDamage))); + } + + effect eHeal = EffectTemporaryHitpoints(nFireDamage/3); + //DelayCommand(0.0f, SpeakString("Subdual damage healed: " + IntToString(nSubDmg))); + ApplyEffectToObject(DURATION_TYPE_INSTANT, eHeal, OBJECT_SELF, 0.0f); + +} + +//:: Execute the CODI AI NPC OnDamaged script + ExecuteScript("no_ai_dam", OBJECT_SELF); + +//:: Execute the Default NPC OnDamaged script + //ExecuteScript("nw_c2_default6", OBJECT_SELF); + +//:: Execute the PRC NPC OnDamaged script + ExecuteScript("prc_npc_damaged", OBJECT_SELF); +} diff --git a/_module/nss/codi_ondeath.nss b/_module/nss/codi_ondeath.nss new file mode 100644 index 00000000..31cb9bcd --- /dev/null +++ b/_module/nss/codi_ondeath.nss @@ -0,0 +1,111 @@ +//:://///////////////////////////////////////////// +//:: Name codi_ondeath +//:: +//::////////////////////////////////////////////// +/* + NPC OnDeath event script caller to run + CODI AI & PRC events. +*/ +//::////////////////////////////////////////////// +//:: Created By: Jaysyn +//:: Created On: 20240331 +//::////////////////////////////////////////////// +#include "prc_inc_spells" +#include "prc_inc_combmove" + +void main() +{ +//:: Declare major variables + object oNPC = OBJECT_SELF; + object oPC = GetLastKiller(); + + //int nKillFlag = GetLocalInt(GetLastKiller(), "KILL_TASK_FLAG"); + + string sTagSelf = GetTag(oNPC); + //string sTagTarget = GetLocalString(oPC, "KILL_TASK_TARGET"); + + string sResRef = GetResRef(oNPC); + + if (GetLocalInt(GetModule(),"X3_ENABLE_MOUNT_DB")&&GetIsObjectValid(GetMaster(OBJECT_SELF))) SetLocalInt(GetMaster(OBJECT_SELF),"bX3_STORE_MOUNT_INFO",TRUE); + +//:: End any active grapple from Improved Grab + EndGrapple(oNPC, GetGrappleTarget(oNPC)); + + int nBalor = GetStringLeft(GetTag(OBJECT_SELF), 9) == "POA_BALOR" ? TRUE : FALSE; + if(nBalor) + { + DelayCommand(0.0f, ExecuteScript("nw_s3_balordeth",OBJECT_SELF)); + } + + + int nInsanity = GetLocalInt(OBJECT_SELF,"INSANITY"); + if(nInsanity) + { + object oCaster = OBJECT_SELF; + object oTarget = GetLastKiller(); + effect eConfuse = EffectConfused(); + effect eImpact = EffectVisualEffect(VFX_FNF_LOS_NORMAL_20); + effect eVis = EffectVisualEffect(VFX_IMP_CONFUSION_S); + effect eMind = EffectVisualEffect(VFX_DUR_MIND_AFFECTING_DISABLED); + effect eDur = EffectVisualEffect(VFX_DUR_CESSATE_NEGATIVE); + effect eLink = EffectLinkEffects(eMind, eConfuse); + eLink = EffectLinkEffects(eLink, eDur); + eLink = SupernaturalEffect(eLink); + + // Get oCaster's DC + int nCreCHAMod = GetAbilityModifier(ABILITY_CHARISMA, oCaster); + int nCreHD = GetHitDice (oCaster); + int nDC = (10 + (nCreHD/2) + nCreCHAMod); + + ApplyEffectAtLocation(DURATION_TYPE_INSTANT, eImpact, GetSpellTargetLocation()); + + if ( !PRCMySavingThrow(SAVING_THROW_WILL, oTarget, nDC, SAVING_THROW_TYPE_MIND_SPELLS, oCaster)) + { + ApplyEffectToObject(DURATION_TYPE_INSTANT, eVis, oTarget); // Apply Viz + ApplyEffectToObject(DURATION_TYPE_PERMANENT, eLink, oTarget); + AssignCommand(oTarget,SpeakString("*The "+GetName(oCaster)+" has driven you insane!*")); + } + } + + +//:: Vampire's Gaseous Form onDeath + if(sResRef == "ra_vampspawn01" || sResRef == "ra_vampspawn02") + { + effect eVFX; + object oSpawn; + location lSelf = GetLocation(OBJECT_SELF); + +//:: Apply some visual effects & unload the model. + eVFX = EffectVisualEffect(VFX_COM_UNLOAD_MODEL); + ApplyEffectToObject(DURATION_TYPE_INSTANT, eVFX, oNPC); + eVFX = EffectVisualEffect(VFX_COM_BLOOD_CRT_RED); + ApplyEffectToObject(DURATION_TYPE_INSTANT, eVFX, oNPC); + eVFX = EffectVisualEffect(491); + ApplyEffectToObject(DURATION_TYPE_INSTANT, eVFX, oNPC); + eVFX = EffectVisualEffect(VFX_COM_CHUNK_RED_SMALL); + ApplyEffectToObject(DURATION_TYPE_INSTANT, eVFX, oNPC); + eVFX = EffectVisualEffect(VFX_FNF_SMOKE_PUFF); + ApplyEffectToObject(DURATION_TYPE_INSTANT, eVFX, oNPC); + +//:: Spawn Gaseous Form. + eVFX = EffectVisualEffect(133); + oSpawn = CreateObject(OBJECT_TYPE_CREATURE, "ra_vamp_gas_form", GetLocation(oNPC)); + DelayCommand(0.5, ApplyEffectToObject(DURATION_TYPE_INSTANT, eVFX, oSpawn));; + + } + +//:: Execute CODI AI NPC OnDeath script + DelayCommand(0.0f, ExecuteScript("no_ai_dth", OBJECT_SELF)); + +//:: Execute NWN NPC OnDeath script + //ExecuteScript("nw_c2_default7", OBJECT_SELF); + +//:: Execute PWFXP XP script + //DelayCommand(0.0f, ExecuteScript("pwfxp", OBJECT_SELF)); + +//:: Execute PRC NPC OnDeath script + DelayCommand(0.0f, ExecuteScript("prc_npc_death", OBJECT_SELF)); + +//:: Execute PRC PW OnDeath scripts + DelayCommand(0.0f, ExecuteScript("prc_pwondeath", OBJECT_SELF)); +} diff --git a/_module/nss/codi_ondisturb.nss b/_module/nss/codi_ondisturb.nss new file mode 100644 index 00000000..1e7d55ed --- /dev/null +++ b/_module/nss/codi_ondisturb.nss @@ -0,0 +1,24 @@ +//:://///////////////////////////////////////////// +//:: Name codi_ondisturb +//:: +//::////////////////////////////////////////////// +/* + NPC OnDisturbed event script caller to run + CODI AI & PRC events. +*/ +//::////////////////////////////////////////////// +//:: Created By: Jaysyn +//:: Created On: 20240331 +//::////////////////////////////////////////////// + +void main() +{ +//:: Execute the CODI AI NPC OnDisturbed script + ExecuteScript("no_ai_dis", OBJECT_SELF); + +//:: Execute the default NPC OnDisturbed script + //ExecuteScript("nw_c2_default8", OBJECT_SELF); + +//:: Execute the PRC NPC OnDisturbed script + ExecuteScript("prc_npc_blocked", OBJECT_SELF); +} diff --git a/_module/nss/codi_percept.nss b/_module/nss/codi_percept.nss new file mode 100644 index 00000000..9887c09a --- /dev/null +++ b/_module/nss/codi_percept.nss @@ -0,0 +1,27 @@ +//:://///////////////////////////////////////////// +//:: Name codi_percept +//:: +//::////////////////////////////////////////////// +/* + NPC OnPerception event script caller to run + CODI AI & PRC events. +*/ +//::////////////////////////////////////////////// +//:: Created By: Jaysyn +//:: Created On: 202400331 +//::////////////////////////////////////////////// + +void main() +{ +//:: Declare major variables + object oPC = GetLastPerceived(); + +//:: Execute the CODI AI NPC OnPerception script + ExecuteScript("no_ai_per", OBJECT_SELF); + +//:: Execute the default NPC OnPerception script + //ExecuteScript("nw_c2_default2", OBJECT_SELF); + +//:: Execute the PRC NPC OnPerception script + ExecuteScript("prc_npc_percep", OBJECT_SELF); +} diff --git a/_module/nss/codi_rested.nss b/_module/nss/codi_rested.nss new file mode 100644 index 00000000..08d67971 --- /dev/null +++ b/_module/nss/codi_rested.nss @@ -0,0 +1,25 @@ +//:://///////////////////////////////////////////// +//:: Name codi_rested +//:: +//::////////////////////////////////////////////// +/* + NPC OnRested event script caller to run + CODI AI & PRC events. +*/ +//::////////////////////////////////////////////// +//:: Created By: Jaysyn +//:: Created On: 20240331 +//::////////////////////////////////////////////// + + +void main() +{ +//:: Execute the CODI AI NPC OnRested script + ExecuteScript("no_ai_rst", OBJECT_SELF); + +//:: Execute the default NPC OnRested script + //ExecuteScript("nw_c2_defaulta", OBJECT_SELF); + +//:: Execute the PRC NPC OnRested script + ExecuteScript("prc_npc_rested", OBJECT_SELF); +} diff --git a/_module/nss/codi_spawn.nss b/_module/nss/codi_spawn.nss new file mode 100644 index 00000000..56f83b13 --- /dev/null +++ b/_module/nss/codi_spawn.nss @@ -0,0 +1,608 @@ +//:://///////////////////////////////////////////// +//:: Name codi_spawn +//:: +//::////////////////////////////////////////////// +/* + NPC OnSpawn event script caller to run + CODI AI & PRC events. +*/ +//::////////////////////////////////////////////// +/* + 2003-07-28: Georg Zoeller: + + If you set a ninteger on the creature named + "X2_USERDEFINED_ONSPAWN_EVENTS" + The creature will fire a pre and a post-spawn + event on itself, depending on the value of that + variable + 1 - Fire Userdefined Event 1510 (pre spawn) + 2 - Fire Userdefined Event 1511 (post spawn) + 3 - Fire both events + + 2007-12-31: Deva Winblood + Modified to look for X3_HORSE_OWNER_TAG and if + it is defined look for an NPC with that tag + nearby or in the module (checks near first). + It will make that NPC this horse's master. + + 20221201: Jaysyn + Modified to read desired CODI AI spawner + from string var "SPAWN_TYPE" set on the NPC, + defaults to fighter. + +*/ +//::////////////////////////////////////////////// +//:: Created By: Keith Warner, Georg Zoeller +//:: Created On: June 11/03 +//:: Modified By: Jaysyn +//:: Modified On: 20240331 +//::////////////////////////////////////////////// + +const int EVENT_USER_DEFINED_PRESPAWN = 1510; +const int EVENT_USER_DEFINED_POSTSPAWN = 1511; + +#include "ms_name_inc" +#include "x2_inc_switches" + +void Embiggen(object oNPC, float fIncrease); + +void Embiggen(object oNPC, float fIncrease) +{ + SetObjectVisualTransform(OBJECT_SELF, OBJECT_VISUAL_TRANSFORM_SCALE, fIncrease); +} + + +void main() +{ +//:: User defined OnSpawn event requested? + int nSpecEvent = GetLocalInt(OBJECT_SELF,"X2_USERDEFINED_ONSPAWN_EVENTS"); + +//:: Pre Spawn Event requested + if (nSpecEvent == 1 || nSpecEvent == 3 ) + { + SignalEvent(OBJECT_SELF,EventUserDefined(EVENT_USER_DEFINED_PRESPAWN )); + } + +//:: Declare major variables + object oNPC; + + string sTag; + string sResRef = GetResRef(OBJECT_SELF); + string sSpawnType = "no_spn_ftr"; + + sSpawnType = GetLocalString(OBJECT_SELF,"SPAWN_TYPE"); + + if (sSpawnType == "") + { + sSpawnType = "no_spn_ftr"; + } + + sTag=GetLocalString(OBJECT_SELF,"X3_HORSE_OWNER_TAG"); + if (GetStringLength(sTag)>0) + { // look for master + oNPC=GetNearestObjectByTag(sTag); + if (GetIsObjectValid(oNPC)&&GetObjectType(oNPC)==OBJECT_TYPE_CREATURE) + { // master found + AddHenchman(oNPC); + } // master found + else + { // look in module + oNPC=GetObjectByTag(sTag); + if (GetIsObjectValid(oNPC)&&GetObjectType(oNPC)==OBJECT_TYPE_CREATURE) + { // master found + AddHenchman(oNPC); + } // master found + else + { // master does not exist - remove X3_HORSE_OWNER_TAG + DeleteLocalString(OBJECT_SELF,"X3_HORSE_OWNER_TAG"); + } // master does not exist - remove X3_HORSE_OWNER_TAG + } // look in module + } // look for master + + +//:: Handles various Aura effects + int nAtropal = GetTag(OBJECT_SELF) == "ATROPAL001" ? TRUE : FALSE; + if(nAtropal)ExecuteScript("atropal_aura",OBJECT_SELF); + + int AtropalScion = GetTag(OBJECT_SELF) == "ATROPALSCION001" ? TRUE : FALSE; + if(AtropalScion)ExecuteScript("neaura",OBJECT_SELF); + + int nBleakborn = GetStringLeft(GetTag(OBJECT_SELF), 9) == "BLEAKBORN" ? TRUE : FALSE; + if(nBleakborn)ExecuteScript("bleakaura",OBJECT_SELF); + + int nCryptChanter = GetStringLeft(GetTag(OBJECT_SELF), 12) == "CRYPTCHANTER" ? TRUE : FALSE; + if(nCryptChanter)ExecuteScript("drainingmelody",OBJECT_SELF); + + int nNWalker = GetStringLeft(GetTag(OBJECT_SELF), 11) == "NIGHTWALKER" ? TRUE : FALSE; + if(nNWalker)ExecuteScript("desecrating_aura",OBJECT_SELF); + + int nNCrawler = GetStringLeft(GetTag(OBJECT_SELF), 12) == "NIGHTCRAWLER" ? TRUE : FALSE; + if(nNCrawler)ExecuteScript("desecrating_aura",OBJECT_SELF); + + int nVoidWraith = GetStringLeft(GetTag(OBJECT_SELF), 10) == "VOIDWRAITH" ? TRUE : FALSE; + if(nVoidWraith)ExecuteScript("airlessaura",OBJECT_SELF); + + int nGhast1 = GetStringLeft(GetTag(OBJECT_SELF), 5) == "GHAST" ? TRUE : FALSE; + if(nGhast1)ExecuteScript("ghast_stench",OBJECT_SELF); + if(nGhast1)ExecuteScript("zombie_feed",OBJECT_SELF); + + int nGhast2 = GetStringLeft(GetTag(OBJECT_SELF), 8) == "NW_GHAST" ? TRUE : FALSE; + if(nGhast2)ExecuteScript("ghast_stench",OBJECT_SELF); + if(nGhast2)ExecuteScript("zombie_feed",OBJECT_SELF); + + int nGhoul = GetStringLeft(GetTag(OBJECT_SELF), 5) == "GHOUL" ? TRUE : FALSE; + if(nGhoul)ExecuteScript("zombie_feed",OBJECT_SELF); + + int nGhoul2 = GetStringLeft(GetTag(OBJECT_SELF), 8) == "NW_GHOUL" ? TRUE : FALSE; + if(nGhoul2)ExecuteScript("zombie_feed",OBJECT_SELF); + + int nZombie = GetStringLeft(GetTag(OBJECT_SELF), 7) == "NW_ZOMB" ? TRUE : FALSE; + if(nZombie)ExecuteScript("zombie_feed",OBJECT_SELF); + + int nDecay = GetStringLeft(GetTag(OBJECT_SELF), 12) == "ANGELOFDECAY" ? TRUE : FALSE; + if(nDecay)ExecuteScript("rotura",OBJECT_SELF); + + int nDecay1 = GetStringLeft(GetTag(OBJECT_SELF), 13) == "DS_YELMUSKCRP" ? TRUE : FALSE; + if(nDecay1)ExecuteScript("consume_int",OBJECT_SELF); + + int nPrisma = GetStringLeft(GetTag(OBJECT_SELF), 12) == "PRISMASAURUS" ? TRUE : FALSE; + if(nPrisma)ExecuteScript("prism_aura",OBJECT_SELF); + + int nDream = GetStringLeft(GetTag(OBJECT_SELF), 12) == "DREAMVESTIGE" ? TRUE : FALSE; + if(nDream)ExecuteScript("desecrating_aura",OBJECT_SELF); + + int nWinter = GetStringLeft(GetTag(OBJECT_SELF), 11) == "WINTERWIGHT" ? TRUE : FALSE; + if(nWinter)ExecuteScript("ww_aura",OBJECT_SELF); + + int nPlague = GetStringLeft(GetTag(OBJECT_SELF), 12) == "PLAGUEBLIGHT" ? TRUE : FALSE; + if(nPlague)ExecuteScript("plagueaura",OBJECT_SELF); + + int nHunefer = GetStringLeft(GetTag(OBJECT_SELF), 7) == "HUNEFER" ? TRUE : FALSE; + if(nHunefer)ExecuteScript("fear2_aura",OBJECT_SELF); + + +//:: Make a creature a little bigger. + int nEmbiggen = GetLocalInt(OBJECT_SELF,"EMBIGGEN"); + if (nEmbiggen > 0) + { + float fIncrease = (IntToFloat(nEmbiggen)+100.0) / 100.0; + DelayCommand(0.0f, Embiggen(OBJECT_SELF, fIncrease)); + } + +//:: Handle various onspawn immunities & buffs + +//:: Shadows should be unaffected by darkness + int nShadow1 = GetStringLeft(GetTag(OBJECT_SELF), 9) == "NW_SHADOW" ? TRUE : FALSE; + if(nShadow1) + { + effect eUltraVis = EffectUltravision(); + eUltraVis = SupernaturalEffect(eUltraVis); + eUltraVis = ExtraordinaryEffect(eUltraVis); + eUltraVis = UnyieldingEffect(eUltraVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eUltraVis,OBJECT_SELF)); + } + + int nShadow2 = GetStringLeft(GetTag(OBJECT_SELF), 6) == "SHADOW" ? TRUE : FALSE; + if(nShadow2) + { + effect eUltraVis = EffectUltravision(); + eUltraVis = SupernaturalEffect(eUltraVis); + eUltraVis = ExtraordinaryEffect(eUltraVis); + eUltraVis = UnyieldingEffect(eUltraVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eUltraVis,OBJECT_SELF)); + } + + int nNoStun = GetLocalInt(OBJECT_SELF,"NOSTUN"); + if (nNoStun > 0) + { + effect eNoStun = EffectImmunity(IMMUNITY_TYPE_STUN); + eNoStun = SupernaturalEffect(eNoStun); + eNoStun = ExtraordinaryEffect(eNoStun); + eNoStun = UnyieldingEffect(eNoStun); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eNoStun,OBJECT_SELF)); + } + + int nNatInvis1 = GetLocalInt(OBJECT_SELF,"NATURAL_INVIS"); + if (nNatInvis1 == 1) + { + effect eNatInvis = EffectInvisibility(4); + eNatInvis = SupernaturalEffect(eNatInvis); + //eNatInvis = ExtraordinaryEffect(eNatInvis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eNatInvis,OBJECT_SELF)); + } + + int nNatInvis2 = GetLocalInt(OBJECT_SELF,"NATURAL_INVIS"); + if (nNatInvis2 == 2) + { + effect eNatInvis = EffectInvisibility(4); + eNatInvis = SupernaturalEffect(eNatInvis); + eNatInvis = ExtraordinaryEffect(eNatInvis); + eNatInvis = UnyieldingEffect(eNatInvis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eNatInvis,OBJECT_SELF)); + } + + int nSeeInvis = GetLocalInt(OBJECT_SELF,"SEE_INVIS"); + if (nSeeInvis > 0) + { + effect eSeeInvis = EffectSeeInvisible(); + eSeeInvis = SupernaturalEffect(eSeeInvis); + eSeeInvis = ExtraordinaryEffect(eSeeInvis); + eSeeInvis = UnyieldingEffect(eSeeInvis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eSeeInvis,OBJECT_SELF)); + } + + int nNoSleep = GetLocalInt(OBJECT_SELF,"NOSLEEP"); + if (nNoSleep > 0) + { + effect eNoSleep = EffectImmunity(IMMUNITY_TYPE_SLEEP); + eNoSleep = SupernaturalEffect(eNoSleep); + eNoSleep = ExtraordinaryEffect(eNoSleep); + eNoSleep = UnyieldingEffect(eNoSleep); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eNoSleep,OBJECT_SELF)); + } + + int nNoDaze = GetLocalInt(OBJECT_SELF,"NODAZE"); + if (nNoDaze > 0) + { + effect eNoDaze = EffectImmunity(IMMUNITY_TYPE_DAZED); + eNoDaze = SupernaturalEffect(eNoDaze); + eNoDaze = ExtraordinaryEffect(eNoDaze); + eNoDaze = UnyieldingEffect(eNoDaze); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eNoDaze,OBJECT_SELF)); + } + + int nNoBlind = GetLocalInt(OBJECT_SELF,"NOBLIND"); + if (nNoBlind > 0) + { + effect eNoBlind = EffectImmunity(IMMUNITY_TYPE_BLINDNESS); + eNoBlind = SupernaturalEffect(eNoBlind); + eNoBlind = ExtraordinaryEffect(eNoBlind); + eNoBlind = UnyieldingEffect(eNoBlind); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eNoBlind,OBJECT_SELF)); + } + + int nNoDeaf = GetLocalInt(OBJECT_SELF,"NODEAF"); + if (nNoDeaf > 0) + { + effect eNoDeaf = EffectImmunity(IMMUNITY_TYPE_DEAFNESS); + eNoDeaf = SupernaturalEffect(eNoDeaf); + eNoDeaf = ExtraordinaryEffect(eNoDeaf); + eNoDeaf = UnyieldingEffect(eNoDeaf); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eNoDeaf,OBJECT_SELF)); + } + + int nDeaf = GetLocalInt(OBJECT_SELF,"IS_DEAF"); + if (nDeaf > 0) + { + effect eDeaf = EffectDeaf(); + eDeaf = SupernaturalEffect(eDeaf); + eDeaf = ExtraordinaryEffect(eDeaf); + eDeaf = UnyieldingEffect(eDeaf); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eDeaf,OBJECT_SELF)); + } + + /* Fix for the new golems to reduce their number of attacks */ + + int nNumber = GetLocalInt(OBJECT_SELF,CREATURE_VAR_NUMBER_OF_ATTACKS); + if (nNumber >0 ) + { + SetBaseAttackBonus(nNumber); + } + + int nVFX = GetLocalInt(OBJECT_SELF,"SpawnVFX"); + if(nVFX) + { + ApplyEffectToObject(DURATION_TYPE_PERMANENT,SupernaturalEffect(EffectVisualEffect(nVFX)),OBJECT_SELF); + } + + int nRegen = GetLocalInt(OBJECT_SELF,"FAST_HEALING"); + if(nRegen) + { + effect eRegen = EffectRegenerate(nRegen, 6.0f); + eRegen = SupernaturalEffect(eRegen); + eRegen = ExtraordinaryEffect(eRegen); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT, eRegen, OBJECT_SELF)); + } + + int nShadowy = GetLocalInt(OBJECT_SELF,"SHADOWY"); + if (nShadowy) + { + effect eVis = EffectVisualEffect(VFX_DUR_PROT_SHADOW_ARMOR); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + + int nStony = GetLocalInt(OBJECT_SELF,"STONY"); + if (nStony) + { + effect eVis = EffectVisualEffect(VFX_DUR_PROT_STONESKIN); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + int nFirey = GetLocalInt(OBJECT_SELF,"FIREY"); + if (nFirey) + { + effect eVis = EffectVisualEffect(VFX_DUR_INFERNO_NO_SOUND); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + int nWoody = GetLocalInt(OBJECT_SELF,"WOODY"); + if (nWoody) + { + effect eVis = EffectVisualEffect(VFX_DUR_PROT_BARKSKIN); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + + int nConcealed20 = GetLocalInt(OBJECT_SELF,"CONCEALED20"); + if (nConcealed20) + { + effect eVis = EffectVisualEffect(VFX_DUR_BLUR ); + effect eConceal = EffectConcealment(20, 0); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + + int nConcealed50 = GetLocalInt(OBJECT_SELF,"CONCEALED50"); + if (nConcealed50) + { + effect eVis = EffectVisualEffect(VFX_DUR_BLUR ); + effect eConceal = EffectConcealment(50, 0); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + + int nIcy = GetLocalInt(OBJECT_SELF,"ICY"); + if (nIcy) + { + effect eVis = EffectVisualEffect(VFX_DUR_ICESKIN); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + + int nSR = GetLocalInt(OBJECT_SELF,"SPELL_RESISTANCE"); + if ( nSR ) + { + effect eSR = EffectSpellResistanceIncrease(nSR); + eSR = SupernaturalEffect(eSR); + eSR = ExtraordinaryEffect(eSR); + eSR = UnyieldingEffect(eSR); + ApplyEffectToObject(DURATION_TYPE_PERMANENT,eSR,OBJECT_SELF); + } + + int nAttackBonus = GetLocalInt(OBJECT_SELF,"ATTACK_BONUS"); + if ( nAttackBonus ) + { + effect eAttack = EffectAttackIncrease(nAttackBonus); + eAttack = SupernaturalEffect(eAttack); + eAttack = ExtraordinaryEffect(eAttack); + eAttack = UnyieldingEffect(eAttack); + ApplyEffectToObject(DURATION_TYPE_PERMANENT,eAttack,OBJECT_SELF); + } + + int nIceShield = GetLocalInt(OBJECT_SELF,"FROST_SHIELD"); + if ( nIceShield ) + { + effect eShield = EffectDamageShield(0,DAMAGE_BONUS_1d6,DAMAGE_TYPE_COLD); + eShield = SupernaturalEffect(eShield); + eShield = ExtraordinaryEffect(eShield); + eShield = UnyieldingEffect(eShield); + ApplyEffectToObject(DURATION_TYPE_PERMANENT,eShield,OBJECT_SELF); + } + + int nAcidShield = GetLocalInt(OBJECT_SELF,"ACID_SHIELD"); + if ( nAcidShield ) + { + effect eShield = EffectDamageShield(0,DAMAGE_BONUS_1d8,DAMAGE_TYPE_ACID); + eShield = SupernaturalEffect(eShield); + eShield = ExtraordinaryEffect(eShield); + eShield = UnyieldingEffect(eShield); + ApplyEffectToObject(DURATION_TYPE_PERMANENT,eShield,OBJECT_SELF); + } + + int nSerratedEdge = GetLocalInt(OBJECT_SELF,"SERRATED_EDGE"); + if ( nSerratedEdge ) + { + effect eShield = EffectDamageShield(0,DAMAGE_BONUS_1d6,DAMAGE_TYPE_SLASHING); + eShield = SupernaturalEffect(eShield); + eShield = ExtraordinaryEffect(eShield); + eShield = UnyieldingEffect(eShield); + ApplyEffectToObject(DURATION_TYPE_PERMANENT,eShield,OBJECT_SELF); + } + + int nSpikedArmor = GetLocalInt(OBJECT_SELF,"SPIKED_ARMOR"); + if ( nSpikedArmor ) + { + effect eShield = EffectDamageShield(0,DAMAGE_BONUS_1d4,DAMAGE_TYPE_PIERCING); + eShield = SupernaturalEffect(eShield); + eShield = ExtraordinaryEffect(eShield); + eShield = UnyieldingEffect(eShield); + ApplyEffectToObject(DURATION_TYPE_PERMANENT,eShield,OBJECT_SELF); + } + +//:: OnSpawn Glow effects + int nGlow = GetLocalInt (OBJECT_SELF,"GLOW_COLOR"); + if (nGlow == 1) + { + effect eVis = EffectVisualEffect(VFX_DUR_GLOW_BLUE); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + else if (nGlow == 2) + { + effect eVis = EffectVisualEffect(VFX_DUR_GLOW_BROWN); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + else if (nGlow == 3) + { + effect eVis = EffectVisualEffect(VFX_DUR_GLOW_GREEN); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + else if (nGlow == 4) + { + effect eVis = EffectVisualEffect(VFX_DUR_GLOW_GREY); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + else if (nGlow == 5) + { + effect eVis = EffectVisualEffect(VFX_DUR_GLOW_LIGHT_BLUE); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + else if (nGlow == 6) + { + effect eVis = EffectVisualEffect(VFX_DUR_GLOW_LIGHT_BROWN); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + else if (nGlow == 7) + { + effect eVis = EffectVisualEffect(VFX_DUR_GLOW_LIGHT_GREEN); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + else if (nGlow == 8) + { + effect eVis = EffectVisualEffect(VFX_DUR_GLOW_LIGHT_ORANGE); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + else if (nGlow == 9) + { + effect eVis = EffectVisualEffect(VFX_DUR_GLOW_LIGHT_PURPLE); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + else if (nGlow == 10) + { + effect eVis = EffectVisualEffect(VFX_DUR_GLOW_LIGHT_RED); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + else if (nGlow == 11) + { + effect eVis = EffectVisualEffect(VFX_DUR_GLOW_LIGHT_YELLOW); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + else if (nGlow == 12) + { + effect eVis = EffectVisualEffect(VFX_DUR_GLOW_ORANGE); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + else if (nGlow == 13) + { + effect eVis = EffectVisualEffect(VFX_DUR_GLOW_PURPLE); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + else if (nGlow == 14) + { + effect eVis = EffectVisualEffect(VFX_DUR_GLOW_RED); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + else if (nGlow == 15) + { + effect eVis = EffectVisualEffect(VFX_DUR_GLOW_WHITE); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + else if (nGlow == 16) + { + effect eVis = EffectVisualEffect(VFX_DUR_GLOW_YELLOW); + eVis = SupernaturalEffect(eVis); + eVis = ExtraordinaryEffect(eVis); + eVis = UnyieldingEffect(eVis); + DelayCommand(0.0f, ApplyEffectToObject(DURATION_TYPE_PERMANENT,eVis,OBJECT_SELF)); + } + +//:: If Incorporeal, apply changes + if (GetCreatureFlag(OBJECT_SELF, CREATURE_VAR_IS_INCORPOREAL) == TRUE) + { + effect eConceal = EffectConcealment(50, MISS_CHANCE_TYPE_NORMAL); + eConceal = ExtraordinaryEffect(eConceal); + effect eGhost = EffectCutsceneGhost(); + eGhost = ExtraordinaryEffect(eGhost); + ApplyEffectToObject(DURATION_TYPE_PERMANENT, eConceal, OBJECT_SELF); + ApplyEffectToObject(DURATION_TYPE_PERMANENT, eGhost, OBJECT_SELF); + } + +//:: Execute OnSpawn script. + int nSpider = GetStringLeft(GetTag(OBJECT_SELF), 12) == "MONST_SPIDER" ? TRUE : FALSE; + if(nSpider) + { + //:: Execute drop in from above spawn. + ExecuteScript("nw_c2_dropin9", OBJECT_SELF); + } + else + { + //:: Execute CODI AI OnSpawn script. + ExecuteScript(sSpawnType, OBJECT_SELF); + + //:: Execute default OnSpawn script. + //ExecuteScript("nw_c2_default9", OBJECT_SELF); + } + +//:: Set or Randomize name + ms_Nomenclature(OBJECT_SELF); + +//:: Execute PRC OnSpawn script. + ExecuteScript("prc_npc_spawn", OBJECT_SELF); + + +//:: Post Spawn event requested + if (nSpecEvent == 2 || nSpecEvent == 3) + { + SignalEvent(OBJECT_SELF,EventUserDefined(EVENT_USER_DEFINED_POSTSPAWN)); + } + +} \ No newline at end of file diff --git a/_module/nss/codi_spellcast.nss b/_module/nss/codi_spellcast.nss new file mode 100644 index 00000000..8a8fdba3 --- /dev/null +++ b/_module/nss/codi_spellcast.nss @@ -0,0 +1,33 @@ +//:://///////////////////////////////////////////// +//:: Name codi_spellcast +//:: +//::////////////////////////////////////////////// +/* + NPC OnSpellCastAt event script caller to run + CODI AI & PRC events. +*/ +//::////////////////////////////////////////////// +//:: Created By: Jaysyn +//:: Created On: 20240331 +//::////////////////////////////////////////////// + +void main() +{ + //-------------------------------------------------------------------------- + // GZ: 2003-10-16 + // Make Plot Creatures Ignore Attacks + //-------------------------------------------------------------------------- + if (GetPlotFlag(OBJECT_SELF)) + { + return; + } + +//:: Execute the CODI AI NPC OnSpellCastAt script + ExecuteScript("no_ai_spt", OBJECT_SELF); + +//:: Execute the Default NPC OnSpellCastAt script + //ExecuteScript("nw_c2_defaultb", OBJECT_SELF); + +//:: Execute the PRC NPC OnSpellCastAt script + ExecuteScript("prc_npc_spellat", OBJECT_SELF); +} diff --git a/_module/nss/codi_userdef.nss b/_module/nss/codi_userdef.nss new file mode 100644 index 00000000..a0c55540 --- /dev/null +++ b/_module/nss/codi_userdef.nss @@ -0,0 +1,170 @@ +//:://///////////////////////////////////////////// +//:: Name codi_userdef +//:: +//::////////////////////////////////////////////// +/* + NPC OnUserDefined event script caller to run + CODI AI & PRC events. + + May need to actually disable most of this for + the CODI AI. +*/ +//::////////////////////////////////////////////// +//:: Created By: Jaysyn +//:: Created On: 20240331 +//::////////////////////////////////////////////// + +const int EVENT_USER_DEFINED_PRESPAWN = 1510; +const int EVENT_USER_DEFINED_POSTSPAWN = 1511; +void main() +{ +//:: Declare major variables + int nUser = GetUserDefinedEventNumber(); + int nFireDamage = 0; + int nAcidDamage = 0; + int nColdDamage = 0; + int nDivineDamage = 0; + int nElectricalDamage = 0; + int nPositiveDamage = 0; + int nNegativeDamage = 0; + int nMagicalDamage = 0; + int nSonicDamage = 0; + + string sResRef = GetResRef(OBJECT_SELF); + + effect eSleep = EffectSleep(); + effect eSlow = EffectSlow(); + + if(nUser == EVENT_HEARTBEAT ) //HEARTBEAT + { + if(sResRef == "ra_troll001" || sResRef == "TROLL_FEDORLA") + { + if(GetLocalInt(OBJECT_SELF, "nSubDual") > 0) + { + SetLocalInt(OBJECT_SELF, "nSubDual", GetLocalInt(OBJECT_SELF, "nSubDual") - 5); + + if(GetLocalInt(OBJECT_SELF, "nSubDual") < GetCurrentHitPoints(OBJECT_SELF)) + { + RemoveEffect(OBJECT_SELF, eSleep); + } + //SpeakString("My Subdual is now " + IntToString(GetLocalInt(OBJECT_SELF, "nSubDual"))); + } + } + } + else if(nUser == EVENT_PERCEIVE) // PERCEIVE + { + + } + else if(nUser == EVENT_END_COMBAT_ROUND) // END OF COMBAT + { + + } + else if(nUser == EVENT_DIALOGUE) // ON DIALOGUE + { + + } + else if(nUser == EVENT_ATTACKED) // ATTACKED + { + + } + else if(nUser == EVENT_DAMAGED) // DAMAGED + { + //:: Handles swarm immunity to physical weapons + if(sResRef == "ds_minkankswrm01" || sResRef == "ds_locustswarm01") + { + int nTotalDamage = GetTotalDamageDealt(); + + if(GetDamageDealtByType(DAMAGE_TYPE_FIRE) > 0) + { + nFireDamage = GetDamageDealtByType(DAMAGE_TYPE_FIRE); + } + + if(GetDamageDealtByType(DAMAGE_TYPE_ACID) > 0) + { + nAcidDamage = GetDamageDealtByType(DAMAGE_TYPE_ACID); + } + + if(GetDamageDealtByType(DAMAGE_TYPE_COLD) > 0) + { + nColdDamage = GetDamageDealtByType(DAMAGE_TYPE_COLD); + } + + if(GetDamageDealtByType(DAMAGE_TYPE_DIVINE) > 0) + { + nDivineDamage = GetDamageDealtByType(DAMAGE_TYPE_DIVINE); + } + + if(GetDamageDealtByType(DAMAGE_TYPE_ELECTRICAL) > 0) + { + nElectricalDamage = GetDamageDealtByType(DAMAGE_TYPE_ELECTRICAL); + } + + if(GetDamageDealtByType(DAMAGE_TYPE_MAGICAL) > 0) + { + nMagicalDamage = GetDamageDealtByType(DAMAGE_TYPE_MAGICAL); + } + + if(GetDamageDealtByType(DAMAGE_TYPE_NEGATIVE) > 0) + { + nNegativeDamage = GetDamageDealtByType(DAMAGE_TYPE_NEGATIVE); + } + + if(GetDamageDealtByType(DAMAGE_TYPE_POSITIVE) > 0) + { + nPositiveDamage = GetDamageDealtByType(DAMAGE_TYPE_POSITIVE); + } + + if(GetDamageDealtByType(DAMAGE_TYPE_SONIC) > 0) + { + nSonicDamage = GetDamageDealtByType(DAMAGE_TYPE_SONIC); + } + + + int nSubDmg = nTotalDamage - (nFireDamage + + nAcidDamage + + nColdDamage + + nDivineDamage + + nElectricalDamage + + nMagicalDamage + + nNegativeDamage + + nPositiveDamage + + nSonicDamage); + + int nActDmg = (nFireDamage + nAcidDamage + + nColdDamage + + nDivineDamage + + nElectricalDamage + + nMagicalDamage + + nNegativeDamage + + nPositiveDamage + + nSonicDamage); + + effect eHeal = EffectHeal(nSubDmg); + + ApplyEffectToObject(DURATION_TYPE_INSTANT, eHeal, OBJECT_SELF, 0.0f); + + } + } + else if(nUser == 1007) // DEATH - do not use for critical code, does not fire reliably all the time + { + + } + else if(nUser == EVENT_DISTURBED) // DISTURBED + { + + } + else if (nUser == EVENT_USER_DEFINED_PRESPAWN) + { + + } + else if (nUser == EVENT_USER_DEFINED_POSTSPAWN) + { + + } + +//:: Execute the PRC NPC OnUserDef script + ExecuteScript("prc_npc_userdef", OBJECT_SELF); + +} + + diff --git a/_module/nss/inc_array.nss b/_module/nss/inc_array.nss new file mode 100644 index 00000000..7671723d --- /dev/null +++ b/_module/nss/inc_array.nss @@ -0,0 +1,512 @@ +/// @addtogroup data Data +/// @brief Provides a number of data structures for NWN code to use (simulated arrays) +/// @{ +/// @file nwnx_data.nss + +const int INVALID_INDEX = -1; +const int TYPE_FLOAT = 0; +const int TYPE_INTEGER = 1; +const int TYPE_OBJECT = 2; +const int TYPE_STRING = 3; + +/// @defgroup data_array_at Array At +/// @brief Returns the element at the index. +/// @ingroup data +/// @param obj The object. +/// @param tag The tag. +/// @param index The index. +/// @return The element of associated type. +/// @{ +string Array_At_Str(string tag, int index, object obj=OBJECT_INVALID); +float Array_At_Flt(string tag, int index, object obj=OBJECT_INVALID); +int Array_At_Int(string tag, int index, object obj=OBJECT_INVALID); +object Array_At_Obj(string tag, int index, object obj=OBJECT_INVALID); +/// @} + + +/// Clears the entire array, such that size==0. +void Array_Clear(string tag, object obj=OBJECT_INVALID); + +/// @defgroup data_array_contains Array Contains +/// @brief Checks if array contains the element. +/// @ingroup data +/// @param obj The object. +/// @param tag The tag. +/// @param element The element. +/// @return TRUE if the collection contains the element. +/// @{ +int Array_Contains_Flt(string tag, float element, object obj=OBJECT_INVALID); +int Array_Contains_Int(string tag, int element, object obj=OBJECT_INVALID); +int Array_Contains_Obj(string tag, object element, object obj=OBJECT_INVALID); +int Array_Contains_Str(string tag, string element, object obj=OBJECT_INVALID); +/// @} + +/// Copies the array of name otherTag over the array of name tag. +void Array_Copy(string tag, string otherTag, object obj=OBJECT_INVALID); + +/// Erases the element at index, and shuffles any elements from index size-1 to index + 1 left. +void Array_Erase(string tag, int index, object obj=OBJECT_INVALID); + +/// @defgroup data_array_find Array Find +/// @brief Get the index at which the element is located. +/// @ingroup data +/// @param obj The object. +/// @param tag The tag. +/// @param element The element. +/// @return Returns the index at which the element is located, or ARRAY_INVALID_INDEX. +/// @{ +int Array_Find_Flt(string tag, float element, object obj=OBJECT_INVALID); +int Array_Find_Int(string tag, int element, object obj=OBJECT_INVALID); +int Array_Find_Obj(string tag, object element, object obj=OBJECT_INVALID); +int Array_Find_Str(string tag, string element, object obj=OBJECT_INVALID); +/// @} + +/// @defgroup data_array_insert Array Insert +/// @brief Inserts the element at the index, where size > index >= 0. +/// @ingroup data +/// @param obj The object. +/// @param tag The tag. +/// @param index The index. +/// @param element The element. +/// @{ +void Array_Insert_Flt(string tag, int index, float element, object obj=OBJECT_INVALID); +void Array_Insert_Int(string tag, int index, int element, object obj=OBJECT_INVALID); +void Array_Insert_Obj(string tag, int index, object element, object obj=OBJECT_INVALID); +void Array_Insert_Str(string tag, int index, string element, object obj=OBJECT_INVALID); +/// @} + +/// @defgroup data_array_pushback Array Pushback +/// @brief Pushes an element to the back of the collection. +/// @remark Functionally identical to an insert at index size-1. +/// @ingroup data +/// @param obj The object. +/// @param tag The tag. +/// @param element The element. +/// @{ +void Array_PushBack_Flt(string tag, float element, object obj=OBJECT_INVALID); +void Array_PushBack_Int(string tag, int element, object obj=OBJECT_INVALID); +void Array_PushBack_Obj(string tag, object element, object obj=OBJECT_INVALID); +void Array_PushBack_Str(string tag, string element, object obj=OBJECT_INVALID); +/// @} + +/// Resizes the array. If the array is shrinking, it chops off elements at the ned. +void Array_Resize(string tag, int size, object obj=OBJECT_INVALID); + +/// Reorders the array such each possible permutation of elements has equal probability of appearance. +void Array_Shuffle(string tag, object obj=OBJECT_INVALID); + +/// Returns the size of the array. +int Array_Size(string tag, object obj=OBJECT_INVALID); + +/// Sorts the collection based on descending order. +void Array_SortAscending(string tag, int type=TYPE_STRING, object obj=OBJECT_INVALID); + +/// Sorts the collection based on descending order. +void Array_SortDescending(string tag, int type=TYPE_STRING, object obj=OBJECT_INVALID); + +/// @defgroup data_array_set Array Set +/// @brief Sets the element at the index, where size > index >= 0. +/// @ingroup data +/// @param obj The object. +/// @param tag The tag. +/// @param index The index. +/// @param element The element. +/// @{ +void Array_Set_Flt(string tag, int index, float element, object obj=OBJECT_INVALID); +void Array_Set_Int(string tag, int index, int element, object obj=OBJECT_INVALID); +void Array_Set_Obj(string tag, int index, object element, object obj=OBJECT_INVALID); +void Array_Set_Str(string tag, int index, string element, object obj=OBJECT_INVALID); +/// @} + +/// @} + +// +// Local Utility Functions. +// +string GetTableName(string tag, object obj=OBJECT_INVALID, int bare=FALSE) { + if (obj == OBJECT_INVALID) + obj = GetModule(); + + string sName = "array_" + ObjectToString(obj) + "_" + tag; + // Remove invalid characters from the tag rather than failing. + string sCleansed = RegExpReplace("[^A-Za-z0-9_\$@#]", sName, ""); + // But provide some feedback. + if (GetStringLength(sName) != GetStringLength(sCleansed) || GetStringLength(sCleansed) == 0) { + WriteTimestampedLogEntry("WARNING: Invalid table name detected for array with tag <" + tag + ">. Only characters (a-zA-Z0-9), _, @, $ and # are allowed. Using <"+sCleansed+"> instead."); + + } + + // BARE returns just the table name with no wrapping. + if (bare == TRUE) { + return sCleansed; + } + + // Table name wraped in quotes to avoid token expansion. + return "\""+sCleansed+"\""; +} + +string GetTableCreateString(string tag, object obj=OBJECT_INVALID) { + // for simplicity sake, everything is turned into a string. Possible enhancement + // to create specific tables for int/float/whatever. + return "CREATE TABLE IF NOT EXISTS " + GetTableName(tag, obj) + " ( ind INTEGER, value TEXT )"; +} + +int TableExists(string tag, object obj=OBJECT_INVALID) { + string stmt = "SELECT name FROM sqlite_master WHERE type = 'table' AND name = @tablename;"; + sqlquery sqlQuery = SqlPrepareQueryObject(GetModule(), stmt); + SqlBindString(sqlQuery, "@tablename", GetTableName(tag, obj, TRUE)); + return SqlStep(sqlQuery); +} + +void ExecuteStatement(string statement, object obj=OBJECT_INVALID) { + if (obj == OBJECT_INVALID) + obj = GetModule(); + // There's no direct "execute this.." everything has to be prepared then executed. + //WriteTimestampedLogEntry("SQL: " + statement); + sqlquery sqlQuery = SqlPrepareQueryObject(GetModule(), statement); + SqlStep(sqlQuery); +} + +void CreateArrayTable(string tag, object obj=OBJECT_INVALID) { + string createStatement = GetTableCreateString(tag, obj); + ExecuteStatement(createStatement, obj); +} + +// Get the table row count. Returns -1 on error (0 is a valid number of rows in a table) +int GetRowCount(string tag, object obj=OBJECT_INVALID) { + if (obj == OBJECT_INVALID) + obj = GetModule(); + CreateArrayTable(tag, obj); + string stmt = "SELECT COUNT(1) FROM " + GetTableName(tag, obj); + sqlquery sqlQuery = SqlPrepareQueryObject(GetModule(), stmt); + if ( SqlStep(sqlQuery) ) { + return SqlGetInt(sqlQuery, 0); + } + return -1; +} + + +//////////////////////////////////////////////////////////////////////////////// +// return the value contained in location "index" +string Array_At_Str(string tag, int index, object obj=OBJECT_INVALID) +{ + // Just "create if not exists" to ensure it exists for the insert. + CreateArrayTable(tag, obj); + + string stmt = "SELECT value FROM " + GetTableName(tag, obj) + " WHERE ind = @ind"; + sqlquery sqlQuery = SqlPrepareQueryObject(GetModule(), stmt); + SqlBindInt(sqlQuery, "@ind", index); + if ( SqlStep(sqlQuery) ) { + return SqlGetString(sqlQuery, 0); + } + return ""; +} + +float Array_At_Flt(string tag, int index, object obj=OBJECT_INVALID) +{ + string st = Array_At_Str(tag, index, obj); + if (st == "") { + return 0.0; + } + return StringToFloat(st); +} + +int Array_At_Int(string tag, int index, object obj=OBJECT_INVALID) +{ + string st = Array_At_Str(tag, index, obj); + if (st == "") { + return 0; + } + return StringToInt(st); +} + +object Array_At_Obj(string tag, int index, object obj=OBJECT_INVALID) +{ + string st = Array_At_Str(tag, index, obj); + if (st == "") { + return OBJECT_INVALID; + } + return StringToObject(st); +} + +void Array_Clear(string tag, object obj=OBJECT_INVALID) +{ + ExecuteStatement("delete from "+GetTableName(tag, obj), obj); +} + +//////////////////////////////////////////////////////////////////////////////// +// Return true/value (1/0) if the array contains the value "element" +int Array_Contains_Str(string tag, string element, object obj=OBJECT_INVALID) +{ + CreateArrayTable(tag, obj); + string stmt = "SELECT COUNT(1) FROM "+GetTableName(tag, obj)+" WHERE value = @element"; + + sqlquery sqlQuery = SqlPrepareQueryObject(GetModule(), stmt); + SqlBindString(sqlQuery, "@element", element); + + int pos = -1; + if ( SqlStep(sqlQuery) ) { + pos = SqlGetInt(sqlQuery, 0); + if (pos > 0) { + return TRUE; + } + } + return FALSE; +} + +int Array_Contains_Flt(string tag, float element, object obj=OBJECT_INVALID) +{ + return Array_Contains_Str(tag, FloatToString(element), obj); +} + +int Array_Contains_Int(string tag, int element, object obj=OBJECT_INVALID) +{ + return Array_Contains_Str(tag, IntToString(element), obj); +} + +int Array_Contains_Obj(string tag, object element, object obj=OBJECT_INVALID) +{ + return Array_Contains_Str(tag, ObjectToString(element), obj); +} + + +//////////////////////////////////////////////////////////////////////////////// +void Array_Copy(string tag, string otherTag, object obj=OBJECT_INVALID) +{ + CreateArrayTable(otherTag, obj); + ExecuteStatement("INSERT INTO "+GetTableName(otherTag, obj)+" SELECT * FROM "+GetTableName(tag, obj), obj); +} + +//////////////////////////////////////////////////////////////////////////////// +void Array_Erase(string tag, int index, object obj=OBJECT_INVALID) +{ + int rows = GetRowCount(tag, obj); + // Silently fail if "index" is outside the range of valid indicies. + if (index >= 0 && index < rows) { + string stmt = "DELETE FROM "+GetTableName(tag, obj)+" WHERE ind = @ind"; + sqlquery sqlQuery = SqlPrepareQueryObject(GetModule(), stmt); + SqlBindInt(sqlQuery, "@ind", index); + SqlStep(sqlQuery); + + stmt = "UPDATE "+GetTableName(tag, obj)+" SET ind = ind - 1 WHERE ind > @ind"; + sqlQuery = SqlPrepareQueryObject(GetModule(), stmt); + SqlBindInt(sqlQuery, "@ind", index); + SqlStep(sqlQuery); + } +} + +//////////////////////////////////////////////////////////////////////////////// +// return the index in the array containing "element" +// if not found, return INVALID_INDEX +int Array_Find_Str(string tag, string element, object obj=OBJECT_INVALID) +{ + string stmt; + sqlquery sqlQuery; + + // Just create it before trying to select in case it doesn't exist yet. + CreateArrayTable(tag, obj); + + stmt = "SELECT IFNULL(MIN(ind),@invalid_index) FROM "+GetTableName(tag, obj)+" WHERE value = @element"; + sqlQuery = SqlPrepareQueryObject(GetModule(), stmt); + + SqlBindInt(sqlQuery, "@invalid_index", INVALID_INDEX); + SqlBindString(sqlQuery, "@element", element); + if ( SqlStep(sqlQuery) ) { + return SqlGetInt(sqlQuery, 0); + } + return INVALID_INDEX; +} + +int Array_Find_Flt(string tag, float element, object obj=OBJECT_INVALID) +{ + return Array_Find_Str(tag, FloatToString(element), obj); +} + +int Array_Find_Int(string tag, int element, object obj=OBJECT_INVALID) +{ + return Array_Find_Str(tag, IntToString(element), obj); +} + +int Array_Find_Obj(string tag, object element, object obj=OBJECT_INVALID) +{ + return Array_Find_Str(tag, ObjectToString(element), obj); +} + +//////////////////////////////////////////////////////////////////////////////// +// Insert a new element into position 'index'. If index is beyond the number of rows in the array, +// this will quietly fail. This could be changed if you wanted to support sparse +// arrays. +void Array_Insert_Str(string tag, int index, string element, object obj=OBJECT_INVALID) +{ + int rows = GetRowCount(tag, obj); + // Index numbers are off by one, much like C arrays, so for "rows=10" - values are 0-9. + // It's not unreasonable to fail if you try to insert ind=10 into an array who's indexes + // only go to 9, but I guess it doesn't hurt as long as we're not allowing gaps in + // index numbers. + if (index >= 0 && index <= rows) { + // index is passed as an integer, so immune (as far as I know) to SQL injection for a one shot query. + ExecuteStatement("UPDATE "+GetTableName(tag, obj)+" SET ind = ind + 1 WHERE ind >= "+IntToString(index), obj); + // Element, however, is not. + string stmt = "INSERT INTO "+GetTableName(tag, obj)+" VALUES ( @ind, @element )"; + sqlquery sqlQuery = SqlPrepareQueryObject(GetModule(), stmt); + SqlBindInt(sqlQuery, "@ind", index); + SqlBindString(sqlQuery, "@element", element); + SqlStep(sqlQuery); + } +} + +void Array_Insert_Flt(string tag, int index, float element, object obj=OBJECT_INVALID) +{ + Array_Insert_Str(tag, index, FloatToString(element), obj); +} + +void Array_Insert_Int(string tag, int index, int element, object obj=OBJECT_INVALID) +{ + Array_Insert_Str(tag, index, IntToString(element), obj); +} + +void Array_Insert_Obj(string tag, int index, object element, object obj=OBJECT_INVALID) +{ + Array_Insert_Str(tag, index, ObjectToString(element), obj); +} + +//////////////////////////////////////////////////////////////////////////////// +// Insert a new element at the end of the array. +void Array_PushBack_Str(string tag, string element, object obj=OBJECT_INVALID) +{ + // Create it before trhing to INSERT into it. If it already exists, this is a no-op. + CreateArrayTable(tag, obj); + + // If rowCount = 10, indexes are from 0 to 9, so this becomes the 11th entry at index 10. + int rowCount = GetRowCount(tag, obj); + + string stmt = "INSERT INTO "+GetTableName(tag, obj)+" VALUES ( @ind, @element )"; + sqlquery sqlQuery = SqlPrepareQueryObject(GetModule(), stmt); + SqlBindInt(sqlQuery, "@ind", rowCount); + SqlBindString(sqlQuery, "@element", element); + SqlStep(sqlQuery); +} + +void Array_PushBack_Flt(string tag, float element, object obj=OBJECT_INVALID) +{ + Array_PushBack_Str(tag, FloatToString(element), obj); +} + +void Array_PushBack_Int(string tag, int element, object obj=OBJECT_INVALID) +{ + Array_PushBack_Str(tag, IntToString(element), obj); +} + +void Array_PushBack_Obj(string tag, object element, object obj=OBJECT_INVALID) +{ + Array_PushBack_Str(tag, ObjectToString(element), obj); +} + +//////////////////////////////////////////////////////////////////////////////// +// Cuts the array off at size 'size'. Elements beyond size are removed. +void Array_Resize(string tag, int size, object obj=OBJECT_INVALID) +{ + // Int immune to sql injection so easier to one-shot it. + ExecuteStatement("DELETE FROM "+GetTableName(tag, obj)+" WHERE ind >= " + IntToString(size), obj); +} + +//////////////////////////////////////////////////////////////////////////////// +void Array_Shuffle(string tag, object obj=OBJECT_INVALID) +{ + string table = GetTableName(tag, obj, TRUE); + ExecuteStatement("CREATE TABLE " +table+ "_temp AS SELECT ROW_NUMBER() OVER(ORDER BY RANDOM())-1, value FROM " +table, obj); + ExecuteStatement("DELETE FROM " +table , obj); + ExecuteStatement("INSERT INTO " +table+ " SELECT * FROM " +table+ "_temp", obj); + ExecuteStatement("DROP TABLE " +table+ "_TEMP", obj); +} + +//////////////////////////////////////////////////////////////////////////////// +int Array_Size(string tag, object obj=OBJECT_INVALID) +{ + return GetRowCount(tag, obj); +} + +//////////////////////////////////////////////////////////////////////////////// +// Sort the array by value according to 'direction' (ASC or DESC). +// Supplying a type allows for correct numerical sorting of integers or floats. +void Array_Sort(string tag, string dir="ASC", int type=TYPE_STRING, object obj=OBJECT_INVALID) +{ + string table = GetTableName(tag, obj, TRUE); + string direction = GetStringUpperCase(dir); + + if ( ! (direction == "ASC" || direction == "DESC") ) { + WriteTimestampedLogEntry("WARNING: Invalid sort direction <" + direction + "> supplied. Defaulting to ASC."); + direction = "ASC"; + } + + // default orderBy for strings. + string orderBy = "ORDER BY value " + direction; + switch(type) { + case TYPE_INTEGER: + orderBy = "ORDER BY CAST(value AS INTEGER)" + direction; + break; + case TYPE_FLOAT: + orderBy = "ORDER BY CAST(value AS DECIMAL)" + direction; + break; + } + ExecuteStatement("CREATE TABLE " +table+ "_temp AS SELECT ROW_NUMBER() OVER(" + orderBy + ")-1, value FROM " +table, obj); + ExecuteStatement("DELETE FROM " +table, obj); + ExecuteStatement("INSERT INTO " +table+ " SELECT * FROM " +table+ "_temp", obj); + ExecuteStatement("DROP TABLE " +table+ "_temp", obj); +} + +void Array_SortAscending(string tag, int type=TYPE_STRING, object obj=OBJECT_INVALID) +{ + Array_Sort(tag, "ASC", type, obj); +} + +void Array_SortDescending(string tag, int type=TYPE_STRING, object obj=OBJECT_INVALID) +{ + Array_Sort(tag, "DESC", type, obj); +} + +//////////////////////////////////////////////////////////////////////////////// +// Set the value of array index 'index' to a 'element' +// This will quietly eat values if index > array size +void Array_Set_Str(string tag, int index, string element, object obj=OBJECT_INVALID) +{ + int rows = GetRowCount(tag, obj); + if (index >= 0 && index <= rows) { + string stmt = "UPDATE "+GetTableName(tag, obj)+" SET value = @element WHERE ind = @ind"; + sqlquery sqlQuery = SqlPrepareQueryObject(GetModule(), stmt); + SqlBindInt(sqlQuery, "@ind", index); + SqlBindString(sqlQuery, "@element", element); + SqlStep(sqlQuery); + } +} + +void Array_Set_Flt(string tag, int index, float element, object obj=OBJECT_INVALID) +{ + Array_Set_Str(tag, index, FloatToString(element), obj); +} + +void Array_Set_Int(string tag, int index, int element, object obj=OBJECT_INVALID) +{ + Array_Set_Str(tag, index, IntToString(element), obj); +} + +void Array_Set_Obj(string tag, int index, object element, object obj=OBJECT_INVALID) +{ + Array_Set_Str(tag, index, ObjectToString(element), obj); +} + +void Array_Debug_Dump(string tag, string title = "xxx", object obj=OBJECT_INVALID) { + if (title != "xxx") { + WriteTimestampedLogEntry("== " + title + " ======================================"); + } + WriteTimestampedLogEntry("Table name = " + GetTableName(tag, obj)); + string stmt = "SELECT ind, value FROM " + GetTableName(tag, obj); + sqlquery sqlQuery = SqlPrepareQueryObject(GetModule(), stmt); + int ind = -1; + string value = ""; + while ( SqlStep(sqlQuery) ) { + ind = SqlGetInt(sqlQuery, 0); + value = SqlGetString(sqlQuery, 1); + WriteTimestampedLogEntry(tag + "[" + IntToString(ind) + "] = " + value); + } +} diff --git a/_module/nss/inc_sqlite_time.nss b/_module/nss/inc_sqlite_time.nss new file mode 100644 index 00000000..f8dddeb4 --- /dev/null +++ b/_module/nss/inc_sqlite_time.nss @@ -0,0 +1,68 @@ +/// @addtogroup time Time +/// @brief Provides various time related functions. +/// @{ +/// @file inc_sqlite_time.nss + +/// @brief Returns the current time formatted according to the provided sqlite date time format string. +/// @param format Format string as used by sqlites STRFTIME(). +/// @return The current time in the requested format. Empty string on error. +string SQLite_GetFormattedSystemTime(string format); + +/// @return Returns the number of seconds since midnight on January 1, 1970. +int SQLite_GetTimeStamp(); + +/// @brief A millisecond timestamp +struct SQLite_MillisecondTimeStamp +{ + int seconds; ///< Seconds since epoch + int milliseconds; ///< Milliseconds +}; + +/// @remark For mircosecond timestamps use NWNX_Utility_GetHighResTimeStamp(). +/// @return Returns the number of milliseconds since midnight on January 1, 1970. +struct SQLite_MillisecondTimeStamp SQLite_GetMillisecondTimeStamp(); + +/// @brief Returns the current date. +/// @return The date in the format (mm/dd/yyyy). +string SQLite_GetSystemDate(); + +/// @brief Returns current time. +/// @return The current time in the format (24:mm:ss). +string SQLite_GetSystemTime(); + +/// @} + +string SQLite_GetFormattedSystemTime(string format) +{ + sqlquery query = SqlPrepareQueryObject(GetModule(), "SELECT STRFTIME(@format, 'now', 'localtime')"); + SqlBindString(query, "@format", format); + SqlStep(query); // sqlite returns NULL for invalid format in STRFTIME() + return SqlGetString(query, 0); +} + +int SQLite_GetTimeStamp() +{ + sqlquery query = SqlPrepareQueryObject(GetModule(), "SELECT STRFTIME('%s', 'now')"); + SqlStep(query); + return SqlGetInt(query, 0); +} + +struct SQLite_MillisecondTimeStamp SQLite_GetMillisecondTimeStamp() +{ + sqlquery query = SqlPrepareQueryObject(GetModule(), "SELECT STRFTIME('%s', 'now'), SUBSTR(STRFTIME('%f', 'now'), 4)"); + SqlStep(query); + struct SQLite_MillisecondTimeStamp t; + t.seconds = SqlGetInt(query, 0); + t.milliseconds = SqlGetInt(query, 1); + return t; +} + +string SQLite_GetSystemDate() +{ + return SQLite_GetFormattedSystemTime("%m/%d/%Y"); +} + +string SQLite_GetSystemTime() +{ + return SQLite_GetFormattedSystemTime("%H:%M:%S"); +} diff --git a/_module/nss/nw_c2_vampireg9.nss b/_module/nss/nw_c2_vampireg9.nss new file mode 100644 index 00000000..36d31cc8 --- /dev/null +++ b/_module/nss/nw_c2_vampireg9.nss @@ -0,0 +1,37 @@ +//:://///////////////////////////////////////////// +//:: NW_C2_VAMPIREG9.nss +//:: Copyright (c) 2001 Bioware Corp. +//::////////////////////////////////////////////// +/* + Vampire gas, when spawned in tries to + move coffin with same name as self +*/ +//::////////////////////////////////////////////// +//:: Created By: Brent +//:: Created On: January 2002 +//::////////////////////////////////////////////// +void main() +{ + // * search for nearest coffin + int bFound = FALSE; + int nCount = 0; + while (bFound == FALSE) + { + object oCoffin = GetObjectByTag(GetTag(OBJECT_SELF),nCount); + nCount++; + if (GetIsObjectValid(oCoffin) && (GetObjectType(oCoffin) == OBJECT_TYPE_PLACEABLE)) + { + bFound = TRUE; + ActionMoveToObject(oCoffin, FALSE, 3.0); //* moving this number too close will make this break + ActionDoCommand(SignalEvent(OBJECT_SELF, EventUserDefined(7777))); + SetCommandable(FALSE); + } + else + // * if no coffin then destroy self + if (GetIsObjectValid(oCoffin) == FALSE) + { + bFound = TRUE; + DestroyObject(OBJECT_SELF, 0.1); + } + } +} diff --git a/_module/nss/nwnx.nss b/_module/nss/nwnx.nss index fe8942cf..f7648213 100644 --- a/_module/nss/nwnx.nss +++ b/_module/nss/nwnx.nss @@ -3,111 +3,135 @@ /// @{ /// @file nwnx.nss +const string NWNX_Core = "NWNX_Core"; ///< @private + /// @brief Scripting interface to NWNX. /// @param pluginName The plugin name. /// @param functionName The function name (do not include NWNX_Plugin_). void NWNX_CallFunction(string pluginName, string functionName); /// @brief Pushes the specified type to the c++ side -/// @param pluginName The plugin name. -/// @param functionName The function name (do not include NWNX_Plugin_). /// @param value The value of specified type to push. -void NWNX_PushArgumentInt(string pluginName, string functionName, int value); +void NWNX_PushArgumentInt(int value); /// @copydoc NWNX_PushArgumentInt() -void NWNX_PushArgumentFloat(string pluginName, string functionName, float value); +void NWNX_PushArgumentFloat(float value); /// @copydoc NWNX_PushArgumentInt() -void NWNX_PushArgumentObject(string pluginName, string functionName, object value); +void NWNX_PushArgumentObject(object value); /// @copydoc NWNX_PushArgumentInt() -void NWNX_PushArgumentString(string pluginName, string functionName, string value); +void NWNX_PushArgumentString(string value); /// @copydoc NWNX_PushArgumentInt() -void NWNX_PushArgumentEffect(string pluginName, string functionName, effect value); +void NWNX_PushArgumentEffect(effect value); /// @copydoc NWNX_PushArgumentInt() -void NWNX_PushArgumentItemProperty(string pluginName, string functionName, itemproperty value); +void NWNX_PushArgumentItemProperty(itemproperty value); +/// @copydoc NWNX_PushArgumentInt() +void NWNX_PushArgumentJson(json value); /// @brief Returns the specified type from the c++ side -/// @param pluginName The plugin name. -/// @param functionName The function name (do not include NWNX_Plugin_). /// @return The value of specified type. -int NWNX_GetReturnValueInt(string pluginName, string functionName); +int NWNX_GetReturnValueInt(); /// @copydoc NWNX_GetReturnValueInt() -float NWNX_GetReturnValueFloat(string pluginName, string functionName); +float NWNX_GetReturnValueFloat(); /// @copydoc NWNX_GetReturnValueInt() -object NWNX_GetReturnValueObject(string pluginName, string functionName); +object NWNX_GetReturnValueObject(); /// @copydoc NWNX_GetReturnValueInt() -string NWNX_GetReturnValueString(string pluginName, string functionName); +string NWNX_GetReturnValueString(); /// @copydoc NWNX_GetReturnValueInt() -effect NWNX_GetReturnValueEffect(string pluginName, string functionName); +effect NWNX_GetReturnValueEffect(); /// @copydoc NWNX_GetReturnValueInt() -itemproperty NWNX_GetReturnValueItemProperty(string pluginName, string functionName); +itemproperty NWNX_GetReturnValueItemProperty(); +/// @copydoc NWNX_GetReturnValueInt() +json NWNX_GetReturnValueJson(); + +/// @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_PluginExists("NWNX_Creature"); +/// @return TRUE if the plugin exists and is enabled, otherwise FALSE. +int NWNX_PluginExists(string sPlugin); /// @private -string NWNX_INTERNAL_BuildString(string pluginName, string functionName, string operation) -{ - return "NWNXEE!ABIv2!" + pluginName + "!" + functionName + "!" + operation; -} +const string NWNX_PUSH = "NWNXEE!ABIv2!X!Y!PUSH"; +const string NWNX_POP = "NWNXEE!ABIv2!X!Y!POP"; /// @} void NWNX_CallFunction(string pluginName, string functionName) { - PlaySound(NWNX_INTERNAL_BuildString(pluginName, functionName, "CALL")); + PlaySound("NWNXEE!ABIv2!" + pluginName + "!" + functionName + "!CALL"); } -void NWNX_PushArgumentInt(string pluginName, string functionName, int value) +void NWNX_PushArgumentInt(int value) { - SetLocalInt(OBJECT_INVALID, NWNX_INTERNAL_BuildString(pluginName, functionName, "PUSH"), value); + SetLocalInt(OBJECT_INVALID, NWNX_PUSH, value); } -void NWNX_PushArgumentFloat(string pluginName, string functionName, float value) +void NWNX_PushArgumentFloat(float value) { - SetLocalFloat(OBJECT_INVALID, NWNX_INTERNAL_BuildString(pluginName, functionName, "PUSH"), value); + SetLocalFloat(OBJECT_INVALID, NWNX_PUSH, value); } -void NWNX_PushArgumentObject(string pluginName, string functionName, object value) +void NWNX_PushArgumentObject(object value) { - SetLocalObject(OBJECT_INVALID, NWNX_INTERNAL_BuildString(pluginName, functionName, "PUSH"), value); + SetLocalObject(OBJECT_INVALID, NWNX_PUSH, value); } -void NWNX_PushArgumentString(string pluginName, string functionName, string value) +void NWNX_PushArgumentString(string value) { - SetLocalString(OBJECT_INVALID, NWNX_INTERNAL_BuildString(pluginName, functionName, "PUSH"), value); + SetLocalString(OBJECT_INVALID, NWNX_PUSH, value); } -void NWNX_PushArgumentEffect(string pluginName, string functionName, effect value) +void NWNX_PushArgumentEffect(effect value) { - TagEffect(value, NWNX_INTERNAL_BuildString(pluginName, functionName, "PUSH")); + TagEffect(value, NWNX_PUSH); } -void NWNX_PushArgumentItemProperty(string pluginName, string functionName, itemproperty value) +void NWNX_PushArgumentItemProperty(itemproperty value) { - TagItemProperty(value, NWNX_INTERNAL_BuildString(pluginName, functionName, "PUSH")); + TagItemProperty(value, NWNX_PUSH); } -int NWNX_GetReturnValueInt(string pluginName, string functionName) +void NWNX_PushArgumentJson(json value) { - return GetLocalInt(OBJECT_INVALID, NWNX_INTERNAL_BuildString(pluginName, functionName, "POP")); + SetLocalJson(OBJECT_INVALID, NWNX_PUSH, value); } -float NWNX_GetReturnValueFloat(string pluginName, string functionName) +int NWNX_GetReturnValueInt() { - return GetLocalFloat(OBJECT_INVALID, NWNX_INTERNAL_BuildString(pluginName, functionName, "POP")); + return GetLocalInt(OBJECT_INVALID, NWNX_POP); } -object NWNX_GetReturnValueObject(string pluginName, string functionName) +float NWNX_GetReturnValueFloat() { - return GetLocalObject(OBJECT_INVALID, NWNX_INTERNAL_BuildString(pluginName, functionName, "POP")); + return GetLocalFloat(OBJECT_INVALID, NWNX_POP); } -string NWNX_GetReturnValueString(string pluginName, string functionName) +object NWNX_GetReturnValueObject() { - return GetLocalString(OBJECT_INVALID, NWNX_INTERNAL_BuildString(pluginName, functionName, "POP")); + return GetLocalObject(OBJECT_INVALID, NWNX_POP); } -effect NWNX_GetReturnValueEffect(string pluginName, string functionName) +string NWNX_GetReturnValueString() +{ + return GetLocalString(OBJECT_INVALID, NWNX_POP); +} + +effect NWNX_GetReturnValueEffect() { effect e; - return TagEffect(e, NWNX_INTERNAL_BuildString(pluginName, functionName, "POP")); + return TagEffect(e, NWNX_POP); } -itemproperty NWNX_GetReturnValueItemProperty(string pluginName, string functionName) +itemproperty NWNX_GetReturnValueItemProperty() { itemproperty ip; - return TagItemProperty(ip, NWNX_INTERNAL_BuildString(pluginName, functionName, "POP")); + return TagItemProperty(ip, NWNX_POP); +} + +json NWNX_GetReturnValueJson() +{ + return GetLocalJson(OBJECT_INVALID, NWNX_POP); +} + +int NWNX_PluginExists(string sPlugin) +{ + string sFunc = "PluginExists"; + NWNX_PushArgumentString(sPlugin); + NWNX_CallFunction(NWNX_Core, sFunc); + return NWNX_GetReturnValueInt(); } diff --git a/_module/nss/nwnx_admin.nss b/_module/nss/nwnx_admin.nss index bbb43df9..7cd016e5 100644 --- a/_module/nss/nwnx_admin.nss +++ b/_module/nss/nwnx_admin.nss @@ -10,16 +10,16 @@ const string NWNX_Administration = "NWNX_Administration"; ///< @private /// @anchor admin_opts /// /// @{ -const int NWNX_ADMINISTRATION_OPTION_ALL_KILLABLE = 0; // TRUE/FALSE -const int NWNX_ADMINISTRATION_OPTION_NON_PARTY_KILLABLE = 1; // TRUE/FALSE -const int NWNX_ADMINISTRATION_OPTION_REQUIRE_RESURRECTION = 2; // TRUE/FALSE -const int NWNX_ADMINISTRATION_OPTION_LOSE_STOLEN_ITEMS = 3; // TRUE/FALSE -const int NWNX_ADMINISTRATION_OPTION_LOSE_ITEMS = 4; // TRUE/FALSE -const int NWNX_ADMINISTRATION_OPTION_LOSE_EXP = 5; // TRUE/FALSE -const int NWNX_ADMINISTRATION_OPTION_LOSE_GOLD = 6; // TRUE/FALSE -const int NWNX_ADMINISTRATION_OPTION_LOSE_GOLD_NUM = 7; -const int NWNX_ADMINISTRATION_OPTION_LOSE_EXP_NUM = 8; -const int NWNX_ADMINISTRATION_OPTION_LOSE_ITEMS_NUM = 9; +const int NWNX_ADMINISTRATION_OPTION_ALL_KILLABLE = 0; // DOES NOT DO ANYTHING +const int NWNX_ADMINISTRATION_OPTION_NON_PARTY_KILLABLE = 1; // DOES NOT DO ANYTHING +const int NWNX_ADMINISTRATION_OPTION_REQUIRE_RESURRECTION = 2; // DOES NOT DO ANYTHING +const int NWNX_ADMINISTRATION_OPTION_LOSE_STOLEN_ITEMS = 3; // DOES NOT DO ANYTHING +const int NWNX_ADMINISTRATION_OPTION_LOSE_ITEMS = 4; // DOES NOT DO ANYTHING +const int NWNX_ADMINISTRATION_OPTION_LOSE_EXP = 5; // DOES NOT DO ANYTHING +const int NWNX_ADMINISTRATION_OPTION_LOSE_GOLD = 6; // DOES NOT DO ANYTHING +const int NWNX_ADMINISTRATION_OPTION_LOSE_GOLD_NUM = 7; // DOES NOT DO ANYTHING +const int NWNX_ADMINISTRATION_OPTION_LOSE_EXP_NUM = 8; // DOES NOT DO ANYTHING +const int NWNX_ADMINISTRATION_OPTION_LOSE_ITEMS_NUM = 9; // DOES NOT DO ANYTHING const int NWNX_ADMINISTRATION_OPTION_PVP_SETTING = 10; // 0 = No PVP, 1 = Party PVP, 2 = Full PVP const int NWNX_ADMINISTRATION_OPTION_PAUSE_AND_PLAY = 11; // TRUE/FALSE const int NWNX_ADMINISTRATION_OPTION_ONE_PARTY_ONLY = 12; // TRUE/FALSE @@ -37,6 +37,8 @@ const int NWNX_ADMINISTRATION_OPTION_USE_MAX_HITPOINTS = 23; // TRUE/FA const int NWNX_ADMINISTRATION_OPTION_RESTORE_SPELLS_USES = 24; // TRUE/FALSE const int NWNX_ADMINISTRATION_OPTION_RESET_ENCOUNTER_SPAWN_POOL = 25; // TRUE/FALSE const int NWNX_ADMINISTRATION_OPTION_HIDE_HITPOINTS_GAINED = 26; // TRUE/FALSE +const int NWNX_ADMINISTRATION_OPTION_PLAYER_PARTY_CONTROL = 27; // TRUE/FALSE +const int NWNX_ADMINISTRATION_OPTION_SHOW_PLAYER_JOIN_MESSAGES = 28; // TRUE/FALSE /// @} /// @name Administration Debug Types @@ -156,6 +158,23 @@ void NWNX_Administration_SetDebugValue(int type, int state); /// @warning DANGER, DRAGONS. Bad things may or may not happen. void NWNX_Administration_ReloadRules(); +/// @brief Get the servers minimum level. +/// @return The minimum level for the server. +int NWNX_Administration_GetMinLevel(); + +/// @brief Set the servers minimum level. +/// @param nLevel The minimum level for the server. +void NWNX_Administration_SetMinLevel(int nLevel); + +/// @brief Get the servers maximum level. +/// @return The maximum level for the server. +int NWNX_Administration_GetMaxLevel(); + +/// @brief Set the servers maximum level. +/// @note Attention when using this and the MaxLevel plugin. They both change the same value. +/// @param nLevel The maximum level for the server. +void NWNX_Administration_SetMaxLevel(int nLevel); + /// @} string NWNX_Administration_GetPlayerPassword() @@ -163,14 +182,14 @@ string NWNX_Administration_GetPlayerPassword() string sFunc = "GetPlayerPassword"; NWNX_CallFunction(NWNX_Administration, sFunc); - return NWNX_GetReturnValueString(NWNX_Administration, sFunc); + return NWNX_GetReturnValueString(); } void NWNX_Administration_SetPlayerPassword(string password) { string sFunc = "SetPlayerPassword"; - NWNX_PushArgumentString(NWNX_Administration, sFunc, password); + NWNX_PushArgumentString(password); NWNX_CallFunction(NWNX_Administration, sFunc); } @@ -186,14 +205,14 @@ string NWNX_Administration_GetDMPassword() string sFunc = "GetDMPassword"; NWNX_CallFunction(NWNX_Administration, sFunc); - return NWNX_GetReturnValueString(NWNX_Administration, sFunc); + return NWNX_GetReturnValueString(); } void NWNX_Administration_SetDMPassword(string password) { string sFunc = "SetDMPassword"; - NWNX_PushArgumentString(NWNX_Administration, sFunc, password); + NWNX_PushArgumentString(password); NWNX_CallFunction(NWNX_Administration, sFunc); } @@ -208,9 +227,9 @@ void NWNX_Administration_DeletePlayerCharacter(object oPC, int bPreserveBackup = { string sFunc = "DeletePlayerCharacter"; - NWNX_PushArgumentString(NWNX_Administration, sFunc, sKickMessage); - NWNX_PushArgumentInt(NWNX_Administration, sFunc, bPreserveBackup); - NWNX_PushArgumentObject(NWNX_Administration, sFunc, oPC); + NWNX_PushArgumentString(sKickMessage); + NWNX_PushArgumentInt(bPreserveBackup); + NWNX_PushArgumentObject(oPC); NWNX_CallFunction(NWNX_Administration, sFunc); } @@ -218,42 +237,42 @@ void NWNX_Administration_AddBannedIP(string ip) { string sFunc = "AddBannedIP"; - NWNX_PushArgumentString(NWNX_Administration, sFunc, ip); + NWNX_PushArgumentString(ip); NWNX_CallFunction(NWNX_Administration, sFunc); } void NWNX_Administration_RemoveBannedIP(string ip) { string sFunc = "RemoveBannedIP"; - NWNX_PushArgumentString(NWNX_Administration, sFunc, ip); + NWNX_PushArgumentString(ip); NWNX_CallFunction(NWNX_Administration, sFunc); } void NWNX_Administration_AddBannedCDKey(string key) { string sFunc = "AddBannedCDKey"; - NWNX_PushArgumentString(NWNX_Administration, sFunc, key); + NWNX_PushArgumentString(key); NWNX_CallFunction(NWNX_Administration, sFunc); } void NWNX_Administration_RemoveBannedCDKey(string key) { string sFunc = "RemoveBannedCDKey"; - NWNX_PushArgumentString(NWNX_Administration, sFunc, key); + NWNX_PushArgumentString(key); NWNX_CallFunction(NWNX_Administration, sFunc); } void NWNX_Administration_AddBannedPlayerName(string playerName) { string sFunc = "AddBannedPlayerName"; - NWNX_PushArgumentString(NWNX_Administration, sFunc, playerName); + NWNX_PushArgumentString(playerName); NWNX_CallFunction(NWNX_Administration, sFunc); } void NWNX_Administration_RemoveBannedPlayerName(string playerName) { string sFunc = "RemoveBannedPlayerName"; - NWNX_PushArgumentString(NWNX_Administration, sFunc, playerName); + NWNX_PushArgumentString(playerName); NWNX_CallFunction(NWNX_Administration, sFunc); } string NWNX_Administration_GetBannedList() @@ -261,14 +280,14 @@ string NWNX_Administration_GetBannedList() string sFunc = "GetBannedList"; NWNX_CallFunction(NWNX_Administration, sFunc); - return NWNX_GetReturnValueString(NWNX_Administration, sFunc); + return NWNX_GetReturnValueString(); } void NWNX_Administration_SetModuleName(string name) { string sFunc = "SetModuleName"; - NWNX_PushArgumentString(NWNX_Administration, sFunc, name); + NWNX_PushArgumentString(name); NWNX_CallFunction(NWNX_Administration, sFunc); } @@ -276,7 +295,7 @@ void NWNX_Administration_SetServerName(string name) { string sFunc = "SetServerName"; - NWNX_PushArgumentString(NWNX_Administration, sFunc, name); + NWNX_PushArgumentString(name); NWNX_CallFunction(NWNX_Administration, sFunc); } @@ -284,25 +303,25 @@ string NWNX_Administration_GetServerName() { string sFunc = "GetServerName"; NWNX_CallFunction(NWNX_Administration, sFunc); - return NWNX_GetReturnValueString(NWNX_Administration, sFunc); + return NWNX_GetReturnValueString(); } int NWNX_Administration_GetPlayOption(int option) { string sFunc = "GetPlayOption"; - NWNX_PushArgumentInt(NWNX_Administration, sFunc, option); + NWNX_PushArgumentInt(option); NWNX_CallFunction(NWNX_Administration, sFunc); - return NWNX_GetReturnValueInt(NWNX_Administration, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Administration_SetPlayOption(int option, int value) { string sFunc = "SetPlayOption"; - NWNX_PushArgumentInt(NWNX_Administration, sFunc, value); - NWNX_PushArgumentInt(NWNX_Administration, sFunc, option); + NWNX_PushArgumentInt(value); + NWNX_PushArgumentInt(option); NWNX_CallFunction(NWNX_Administration, sFunc); } @@ -310,29 +329,29 @@ int NWNX_Administration_DeleteTURD(string playerName, string characterName) { string sFunc = "DeleteTURD"; - NWNX_PushArgumentString(NWNX_Administration, sFunc, characterName); - NWNX_PushArgumentString(NWNX_Administration, sFunc, playerName); + NWNX_PushArgumentString(characterName); + NWNX_PushArgumentString(playerName); NWNX_CallFunction(NWNX_Administration, sFunc); - return NWNX_GetReturnValueInt(NWNX_Administration, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Administration_GetDebugValue(int type) { string sFunc = "GetDebugValue"; - NWNX_PushArgumentInt(NWNX_Administration, sFunc, type); + NWNX_PushArgumentInt(type); NWNX_CallFunction(NWNX_Administration, sFunc); - return NWNX_GetReturnValueInt(NWNX_Administration, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Administration_SetDebugValue(int type, int state) { string sFunc = "SetDebugValue"; - NWNX_PushArgumentInt(NWNX_Administration, sFunc, state); - NWNX_PushArgumentInt(NWNX_Administration, sFunc, type); + NWNX_PushArgumentInt(state); + NWNX_PushArgumentInt(type); NWNX_CallFunction(NWNX_Administration, sFunc); } @@ -342,3 +361,31 @@ void NWNX_Administration_ReloadRules() NWNX_CallFunction(NWNX_Administration, sFunc); } + +int NWNX_Administration_GetMinLevel() +{ + string sFunc = "GetMinLevel"; + NWNX_CallFunction(NWNX_Administration, sFunc); + return NWNX_GetReturnValueInt(); +} + +void NWNX_Administration_SetMinLevel(int nLevel) +{ + string sFunc = "SetMinLevel"; + NWNX_PushArgumentInt(nLevel); + NWNX_CallFunction(NWNX_Administration, sFunc); +} + +int NWNX_Administration_GetMaxLevel() +{ + string sFunc = "GetMaxLevel"; + NWNX_CallFunction(NWNX_Administration, sFunc); + return NWNX_GetReturnValueInt(); +} + +void NWNX_Administration_SetMaxLevel(int nLevel) +{ + string sFunc = "SetMaxLevel"; + NWNX_PushArgumentInt(nLevel); + NWNX_CallFunction(NWNX_Administration, sFunc); +} diff --git a/_module/nss/nwnx_appearance.nss b/_module/nss/nwnx_appearance.nss index 6f31140a..9e8ed1fd 100644 --- a/_module/nss/nwnx_appearance.nss +++ b/_module/nss/nwnx_appearance.nss @@ -51,10 +51,10 @@ void NWNX_Appearance_SetOverride(object oPlayer, object oCreature, int nType, in { string sFunc = "SetOverride"; - NWNX_PushArgumentInt(NWNX_Appearance, sFunc, nValue); - NWNX_PushArgumentInt(NWNX_Appearance, sFunc, nType); - NWNX_PushArgumentObject(NWNX_Appearance, sFunc, oCreature); - NWNX_PushArgumentObject(NWNX_Appearance, sFunc, oPlayer); + NWNX_PushArgumentInt(nValue); + NWNX_PushArgumentInt(nType); + NWNX_PushArgumentObject(oCreature); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Appearance, sFunc); } @@ -63,11 +63,11 @@ int NWNX_Appearance_GetOverride(object oPlayer, object oCreature, int nType) { string sFunc = "GetOverride"; - NWNX_PushArgumentInt(NWNX_Appearance, sFunc, nType); - NWNX_PushArgumentObject(NWNX_Appearance, sFunc, oCreature); - NWNX_PushArgumentObject(NWNX_Appearance, sFunc, oPlayer); + NWNX_PushArgumentInt(nType); + NWNX_PushArgumentObject(oCreature); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Appearance, sFunc); - return NWNX_GetReturnValueInt(NWNX_Appearance, sFunc); + return NWNX_GetReturnValueInt(); } diff --git a/_module/nss/nwnx_area.nss b/_module/nss/nwnx_area.nss index f1a9134f..cfb90add 100644 --- a/_module/nss/nwnx_area.nss +++ b/_module/nss/nwnx_area.nss @@ -50,6 +50,15 @@ struct NWNX_Area_TileInfo int nGridY; ///< The tile's grid y position }; +/// @brief Area wind info struct +struct NWNX_Area_AreaWind +{ + vector vDirection; ///< Wind's direction + float fMagnitude; ///< Wind's magnitude + float fYaw; ///< Wind's yaw + float fPitch; ///< Wind's pitch +}; + /// @brief Gets the number of players in area. /// @param area The area object. /// @return The player count for the area. @@ -268,54 +277,126 @@ struct NWNX_Area_TileInfo NWNX_Area_GetTileInfo(object oArea, float fTileX, floa /// @return TRUE if exported successfully, FALSE if not. int NWNX_Area_ExportARE(object oArea, string sFileName, string sNewName = "", string sNewTag = "", string sAlias = "NWNX"); +/// @brief Get the ambient sound playing in an area during the day. +/// @param oArea The area to get the sound of. +/// @return The ambient soundtrack. See ambientsound.2da. +int NWNX_Area_GetAmbientSoundDay(object oArea); + +/// @brief Get the ambient sound playing in an area during the night. +/// @param oArea The area to get the sound of. +/// @return The ambient soundtrack. See ambientsound.2da. +int NWNX_Area_GetAmbientSoundNight(object oArea); + +/// @brief Get the volume of the ambient sound playing in an area during the day. +/// @param oArea The area to get the sound volume of. +/// @return The volume. +int NWNX_Area_GetAmbientSoundDayVolume(object oArea); + +/// @brief Get the volume of the ambient sound playing in an area during the night. +/// @param oArea The area to get the sound volume of. +/// @return The volume. +int NWNX_Area_GetAmbientSoundNightVolume(object oArea); + +/// @brief Create a sound object. +/// @param oArea The area where to create the sound object. +/// @param vPosition The area position where to create the sound object. +/// @param sResRef The ResRef of the sound object. +/// @return The sound object. +object NWNX_Area_CreateSoundObject(object oArea, vector vPosition, string sResRef); + +/// @brief Rotates an existing area, including all objects within (excluding PCs). +/// @note Functions while clients are in the area, but not recommended as tiles/walkmesh only updates on area load, and this may result in unexpected clientside results. +/// @param oArea The area to be rotated +/// @param nRotation How many 90 degrees clockwise to rotate (1-3). +void NWNX_Area_RotateArea(object oArea, int nRotation); + +/// @brief Get the tile info of the tile at nIndex in the tile array. +/// @param oArea The area. +/// @param nIndex The index of the tile. +/// @return A NWNX_Area_TileInfo struct with tile info. +struct NWNX_Area_TileInfo NWNX_Area_GetTileInfoByTileIndex(object oArea, int nIndex); + +/// @brief Check if there is a path between two positions in an area. +/// @note Does not care about doors or placeables, only checks tile path nodes. +/// @param oArea The area. +/// @param vStartPosition The start position. +/// @param vEndPosition The end position. +/// @param nMaxDepth The max depth of the DFS tree. A good value is AreaWidth * AreaHeight. +/// @return TRUE if there is a path between vStartPosition and vEndPosition, FALSE if not or on error. +int NWNX_Area_GetPathExists(object oArea, vector vStartPosition, vector vEndPosition, int nMaxDepth); + +/// @brief Get oArea's flags, interior/underground etc. +/// @param oArea The area. +/// @return The raw flags bitmask or -1 on error. +int NWNX_Area_GetAreaFlags(object oArea); + +/// @brief Set oArea's raw flags bitmask. +/// @note You'll have to do any bitwise operations yourself. +/// @note Requires clients to reload the area to get any updated flags. +/// @param oArea The area. +/// @param nFlags The flags. +void NWNX_Area_SetAreaFlags(object oArea, int nFlags); + +/// @brief Get oArea's detailed win data. +/// @note vDirection returns [0.0, 0.0, 0.0] if not set previously with SetAreaWind nwscript function. +/// @param oArea The area. +struct NWNX_Area_AreaWind NWNX_Area_GetAreaWind(object oArea); + +/// @brief Set the default discoverability mask for objects in an area. +/// @param oArea The area or OBJECT_INVALID to set a global mask for all areas. Per area masks will override the global mask. +/// @param nObjectTypes A mask of OBJECT_TYPE_* constants or OBJECT_TYPE_ALL for all suitable object types. Currently only works on Creatures, Doors (Hilite only), Items and Useable Placeables. +/// @param nMask A mask of OBJECT_UI_DISCOVERY_* +/// @param bForceUpdate If TRUE, will update the discovery mask of ALL objects in the area or module(if oArea == OBJECT_INVALID), according to the current mask. Use with care. +void NWNX_Area_SetDefaultObjectUiDiscoveryMask(object oArea, int nObjectTypes, int nMask, int bForceUpdate = FALSE); + /// @} int NWNX_Area_GetNumberOfPlayersInArea(object area) { string sFunc = "GetNumberOfPlayersInArea"; - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueInt(NWNX_Area, sFunc); + return NWNX_GetReturnValueInt(); } object NWNX_Area_GetLastEntered(object area) { string sFunc = "GetLastEntered"; - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueObject(NWNX_Area, sFunc); + return NWNX_GetReturnValueObject(); } object NWNX_Area_GetLastLeft(object area) { string sFunc = "GetLastLeft"; - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueObject(NWNX_Area, sFunc); + return NWNX_GetReturnValueObject(); } int NWNX_Area_GetPVPSetting(object area) { string sFunc = "GetPVPSetting"; - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueInt(NWNX_Area, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Area_SetPVPSetting(object area, int pvpSetting) { string sFunc = "SetPVPSetting"; - NWNX_PushArgumentInt(NWNX_Area, sFunc, pvpSetting); - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentInt(pvpSetting); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); } @@ -323,18 +404,18 @@ int NWNX_Area_GetAreaSpotModifier(object area) { string sFunc = "GetAreaSpotModifier"; - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueInt(NWNX_Area, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Area_SetAreaSpotModifier(object area, int spotModifier) { string sFunc = "SetAreaSpotModifier"; - NWNX_PushArgumentInt(NWNX_Area, sFunc, spotModifier); - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentInt(spotModifier); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); } @@ -342,18 +423,18 @@ int NWNX_Area_GetAreaListenModifier(object area) { string sFunc = "GetAreaListenModifier"; - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueInt(NWNX_Area, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Area_SetAreaListenModifier(object area, int listenModifier) { string sFunc = "SetAreaListenModifier"; - NWNX_PushArgumentInt(NWNX_Area, sFunc, listenModifier); - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentInt(listenModifier); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); } @@ -361,18 +442,18 @@ int NWNX_Area_GetNoRestingAllowed(object area) { string sFunc = "GetNoRestingAllowed"; - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueInt(NWNX_Area, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Area_SetNoRestingAllowed(object area, int bNoRestingAllowed) { string sFunc = "SetNoRestingAllowed"; - NWNX_PushArgumentInt(NWNX_Area, sFunc, bNoRestingAllowed); - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentInt(bNoRestingAllowed); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); } @@ -380,18 +461,18 @@ int NWNX_Area_GetWindPower(object area) { string sFunc = "GetWindPower"; - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueInt(NWNX_Area, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Area_SetWindPower(object area, int windPower) { string sFunc = "SetWindPower"; - NWNX_PushArgumentInt(NWNX_Area, sFunc, windPower); - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentInt(windPower); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); } @@ -399,20 +480,20 @@ int NWNX_Area_GetWeatherChance(object area, int type) { string sFunc = "GetWeatherChance"; - NWNX_PushArgumentInt(NWNX_Area, sFunc, type); - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentInt(type); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueInt(NWNX_Area, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Area_SetWeatherChance(object area, int type, int chance) { string sFunc = "SetWeatherChance"; - NWNX_PushArgumentInt(NWNX_Area, sFunc, chance); - NWNX_PushArgumentInt(NWNX_Area, sFunc, type); - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentInt(chance); + NWNX_PushArgumentInt(type); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); } @@ -420,18 +501,18 @@ float NWNX_Area_GetFogClipDistance(object area) { string sFunc = "GetFogClipDistance"; - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueFloat(NWNX_Area, sFunc); + return NWNX_GetReturnValueFloat(); } void NWNX_Area_SetFogClipDistance(object area, float distance) { string sFunc = "SetFogClipDistance"; - NWNX_PushArgumentFloat(NWNX_Area, sFunc, distance); - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentFloat(distance); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); } @@ -439,18 +520,18 @@ int NWNX_Area_GetShadowOpacity(object area) { string sFunc = "GetShadowOpacity"; - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueInt(NWNX_Area, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Area_SetShadowOpacity(object area, int shadowOpacity) { string sFunc = "SetShadowOpacity"; - NWNX_PushArgumentInt(NWNX_Area, sFunc, shadowOpacity); - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentInt(shadowOpacity); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); } @@ -459,18 +540,18 @@ int NWNX_Area_GetDayNightCycle(object area) { string sFunc = "GetDayNightCycle"; - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueInt(NWNX_Area, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Area_SetDayNightCycle(object area, int type) { string sFunc = "SetDayNightCycle"; - NWNX_PushArgumentInt(NWNX_Area, sFunc, type); - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentInt(type); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); } @@ -478,20 +559,20 @@ int NWNX_Area_GetSunMoonColors(object area, int type) { string sFunc = "GetSunMoonColors"; - NWNX_PushArgumentInt(NWNX_Area, sFunc, type); - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentInt(type); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueInt(NWNX_Area, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Area_SetSunMoonColors(object area, int type, int color) { string sFunc = "SetSunMoonColors"; - NWNX_PushArgumentInt(NWNX_Area, sFunc, color); - NWNX_PushArgumentInt(NWNX_Area, sFunc, type); - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + NWNX_PushArgumentInt(color); + NWNX_PushArgumentInt(type); + NWNX_PushArgumentObject(area); NWNX_CallFunction(NWNX_Area, sFunc); } @@ -499,41 +580,41 @@ object NWNX_Area_CreateTransition(object area, object target, float x, float y, { string sFunc = "CreateTransition"; - NWNX_PushArgumentString(NWNX_Area, sFunc, tag); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, size); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, z); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, y); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, x); - NWNX_PushArgumentObject(NWNX_Area, sFunc, target); - NWNX_PushArgumentObject(NWNX_Area, sFunc, area); + 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(NWNX_Area, sFunc); + return NWNX_GetReturnValueObject(); } int NWNX_Area_GetTileAnimationLoop(object oArea, float fTileX, float fTileY, int nAnimLoop) { string sFunc = "GetTileAnimationLoop"; - NWNX_PushArgumentInt(NWNX_Area, sFunc, nAnimLoop); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fTileY); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fTileX); - NWNX_PushArgumentObject(NWNX_Area, sFunc, oArea); + NWNX_PushArgumentInt(nAnimLoop); + NWNX_PushArgumentFloat(fTileY); + NWNX_PushArgumentFloat(fTileX); + NWNX_PushArgumentObject(oArea); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueInt(NWNX_Area, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Area_SetTileAnimationLoop(object oArea, float fTileX, float fTileY, int nAnimLoop, int bEnabled) { string sFunc = "SetTileAnimationLoop"; - NWNX_PushArgumentInt(NWNX_Area, sFunc, bEnabled); - NWNX_PushArgumentInt(NWNX_Area, sFunc, nAnimLoop); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fTileY); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fTileX); - NWNX_PushArgumentObject(NWNX_Area, sFunc, oArea); + NWNX_PushArgumentInt(bEnabled); + NWNX_PushArgumentInt(nAnimLoop); + NWNX_PushArgumentFloat(fTileY); + NWNX_PushArgumentFloat(fTileX); + NWNX_PushArgumentObject(oArea); NWNX_CallFunction(NWNX_Area, sFunc); } @@ -541,64 +622,64 @@ void NWNX_Area_SetTileAnimationLoop(object oArea, float fTileX, float fTileY, in string NWNX_Area_GetTileModelResRef(object oArea, float fTileX, float fTileY) { string sFunc = "GetTileModelResRef"; - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fTileY); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fTileX); - NWNX_PushArgumentObject(NWNX_Area, sFunc, oArea); + NWNX_PushArgumentFloat(fTileY); + NWNX_PushArgumentFloat(fTileX); + NWNX_PushArgumentObject(oArea); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueString(NWNX_Area, sFunc); + return NWNX_GetReturnValueString(); } 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(NWNX_Area, sFunc, bIgnoreDoors); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fHeight); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fPerSpace); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fEndY); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fEndX); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fStartY); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fStartX); - NWNX_PushArgumentObject(NWNX_Area, sFunc, oArea); + 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(NWNX_Area, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Area_GetMusicIsPlaying(object oArea, int bBattleMusic = FALSE) { string sFunc = "GetMusicIsPlaying"; - NWNX_PushArgumentInt(NWNX_Area, sFunc, bBattleMusic); - NWNX_PushArgumentObject(NWNX_Area, sFunc, oArea); + NWNX_PushArgumentInt(bBattleMusic); + NWNX_PushArgumentObject(oArea); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueInt(NWNX_Area, sFunc); + return NWNX_GetReturnValueInt(); } object NWNX_Area_CreateGenericTrigger(object oArea, float fX, float fY, float fZ, string sTag = "", float fSize = 1.0f) { string sFunc = "CreateGenericTrigger"; - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fSize); - NWNX_PushArgumentString(NWNX_Area, sFunc, sTag); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fZ); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fY); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fX); - NWNX_PushArgumentObject(NWNX_Area, sFunc, oArea); + 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(NWNX_Area, sFunc); + return NWNX_GetReturnValueObject(); } void NWNX_Area_AddObjectToExclusionList(object oObject) { string sFunc = "AddObjectToExclusionList"; - NWNX_PushArgumentObject(NWNX_Area, sFunc, oObject); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Area, sFunc); } @@ -606,7 +687,7 @@ void NWNX_Area_RemoveObjectFromExclusionList(object oObject) { string sFunc = "RemoveObjectFromExclusionList"; - NWNX_PushArgumentObject(NWNX_Area, sFunc, oObject); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Area, sFunc); } @@ -614,33 +695,33 @@ int NWNX_Area_ExportGIT(object oArea, string sFileName = "", int bExportVarTable { string sFunc = "ExportGIT"; - NWNX_PushArgumentString(NWNX_Area, sFunc, sAlias); - NWNX_PushArgumentInt(NWNX_Area, sFunc, nObjectFilter); - NWNX_PushArgumentInt(NWNX_Area, sFunc, bExportUUID); - NWNX_PushArgumentInt(NWNX_Area, sFunc, bExportVarTable); - NWNX_PushArgumentString(NWNX_Area, sFunc, sFileName); - NWNX_PushArgumentObject(NWNX_Area, sFunc, oArea); + 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(NWNX_Area, sFunc); + return NWNX_GetReturnValueInt(); } struct NWNX_Area_TileInfo NWNX_Area_GetTileInfo(object oArea, float fTileX, float fTileY) { string sFunc = "GetTileInfo"; - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fTileY); - NWNX_PushArgumentFloat(NWNX_Area, sFunc, fTileX); - NWNX_PushArgumentObject(NWNX_Area, sFunc, oArea); + NWNX_PushArgumentFloat(fTileY); + NWNX_PushArgumentFloat(fTileX); + NWNX_PushArgumentObject(oArea); NWNX_CallFunction(NWNX_Area, sFunc); struct NWNX_Area_TileInfo str; - str.nGridY = NWNX_GetReturnValueInt(NWNX_Area, sFunc); - str.nGridX = NWNX_GetReturnValueInt(NWNX_Area, sFunc); - str.nOrientation = NWNX_GetReturnValueInt(NWNX_Area, sFunc); - str.nHeight = NWNX_GetReturnValueInt(NWNX_Area, sFunc); - str.nID = NWNX_GetReturnValueInt(NWNX_Area, sFunc); + str.nGridY = NWNX_GetReturnValueInt(); + str.nGridX = NWNX_GetReturnValueInt(); + str.nOrientation = NWNX_GetReturnValueInt(); + str.nHeight = NWNX_GetReturnValueInt(); + str.nID = NWNX_GetReturnValueInt(); return str; } @@ -649,12 +730,159 @@ int NWNX_Area_ExportARE(object oArea, string sFileName, string sNewName = "", st { string sFunc = "ExportARE"; - NWNX_PushArgumentString(NWNX_Area, sFunc, sAlias); - NWNX_PushArgumentString(NWNX_Area, sFunc, sNewTag); - NWNX_PushArgumentString(NWNX_Area, sFunc, sNewName); - NWNX_PushArgumentString(NWNX_Area, sFunc, sFileName); - NWNX_PushArgumentObject(NWNX_Area, sFunc, oArea); + NWNX_PushArgumentString(sAlias); + NWNX_PushArgumentString(sNewTag); + NWNX_PushArgumentString(sNewName); + NWNX_PushArgumentString(sFileName); + NWNX_PushArgumentObject(oArea); NWNX_CallFunction(NWNX_Area, sFunc); - return NWNX_GetReturnValueInt(NWNX_Area, sFunc); + return NWNX_GetReturnValueInt(); +} + +int NWNX_Area_GetAmbientSoundDay(object oArea) +{ + string sFunc = "GetAmbientSoundDay"; + + NWNX_PushArgumentObject(oArea); + NWNX_CallFunction(NWNX_Area, sFunc); + + return NWNX_GetReturnValueInt(); +} + +int NWNX_Area_GetAmbientSoundNight(object oArea) +{ + string sFunc = "GetAmbientSoundNight"; + + NWNX_PushArgumentObject(oArea); + NWNX_CallFunction(NWNX_Area, sFunc); + + return NWNX_GetReturnValueInt(); +} + +int NWNX_Area_GetAmbientSoundDayVolume(object oArea) +{ + string sFunc = "GetAmbientSoundDayVolume"; + + NWNX_PushArgumentObject(oArea); + NWNX_CallFunction(NWNX_Area, sFunc); + + return NWNX_GetReturnValueInt(); +} + +int NWNX_Area_GetAmbientSoundNightVolume(object oArea) +{ + string sFunc = "GetAmbientSoundNightVolume"; + + NWNX_PushArgumentObject(oArea); + NWNX_CallFunction(NWNX_Area, sFunc); + + return NWNX_GetReturnValueInt(); +} + +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(); +} + +void NWNX_Area_RotateArea(object oArea, int nRotation) +{ + string sFunc = "RotateArea"; + + NWNX_PushArgumentInt(nRotation); + NWNX_PushArgumentObject(oArea); + + NWNX_CallFunction(NWNX_Area, sFunc); +} + +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); + + 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(); + + 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(); +} + +int NWNX_Area_GetAreaFlags(object oArea) +{ + string sFunc = "GetAreaFlags"; + + NWNX_PushArgumentObject(oArea); + NWNX_CallFunction(NWNX_Area, sFunc); + + return NWNX_GetReturnValueInt(); +} + +void NWNX_Area_SetAreaFlags(object oArea, int nFlags) +{ + string sFunc = "SetAreaFlags"; + + NWNX_PushArgumentInt(nFlags); + NWNX_PushArgumentObject(oArea); + NWNX_CallFunction(NWNX_Area, sFunc); +} + +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(); + + 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); } diff --git a/_module/nss/nwnx_chat.nss b/_module/nss/nwnx_chat.nss index 90ca95e4..ffa12df1 100644 --- a/_module/nss/nwnx_chat.nss +++ b/_module/nss/nwnx_chat.nss @@ -82,19 +82,19 @@ int NWNX_Chat_SendMessage(int channel, string message, object sender = OBJECT_SE { string sFunc = "SendMessage"; - NWNX_PushArgumentObject(NWNX_Chat, sFunc, target); - NWNX_PushArgumentObject(NWNX_Chat, sFunc, sender); - NWNX_PushArgumentString(NWNX_Chat, sFunc, message); - NWNX_PushArgumentInt(NWNX_Chat, sFunc, channel); + NWNX_PushArgumentObject(target); + NWNX_PushArgumentObject(sender); + NWNX_PushArgumentString(message); + NWNX_PushArgumentInt(channel); NWNX_CallFunction(NWNX_Chat, sFunc); - return NWNX_GetReturnValueInt(NWNX_Chat, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Chat_RegisterChatScript(string script) { string sFunc = "RegisterChatScript"; - NWNX_PushArgumentString(NWNX_Chat, sFunc, script); + NWNX_PushArgumentString(script); NWNX_CallFunction(NWNX_Chat, sFunc); } @@ -110,7 +110,7 @@ int NWNX_Chat_GetChannel() string sFunc = "GetChannel"; NWNX_CallFunction(NWNX_Chat, sFunc); - return NWNX_GetReturnValueInt(NWNX_Chat, sFunc); + return NWNX_GetReturnValueInt(); } string NWNX_Chat_GetMessage() @@ -118,7 +118,7 @@ string NWNX_Chat_GetMessage() string sFunc = "GetMessage"; NWNX_CallFunction(NWNX_Chat, sFunc); - return NWNX_GetReturnValueString(NWNX_Chat, sFunc); + return NWNX_GetReturnValueString(); } object NWNX_Chat_GetSender() @@ -126,7 +126,7 @@ object NWNX_Chat_GetSender() string sFunc = "GetSender"; NWNX_CallFunction(NWNX_Chat, sFunc); - return NWNX_GetReturnValueObject(NWNX_Chat, sFunc); + return NWNX_GetReturnValueObject(); } object NWNX_Chat_GetTarget() @@ -134,16 +134,16 @@ object NWNX_Chat_GetTarget() string sFunc = "GetTarget"; NWNX_CallFunction(NWNX_Chat, sFunc); - return NWNX_GetReturnValueObject(NWNX_Chat, sFunc); + return NWNX_GetReturnValueObject(); } void NWNX_Chat_SetChatHearingDistance(float distance, object listener = OBJECT_INVALID, int channel = NWNX_CHAT_CHANNEL_PLAYER_TALK) { string sFunc = "SetChatHearingDistance"; - NWNX_PushArgumentInt(NWNX_Chat, sFunc, channel); - NWNX_PushArgumentObject(NWNX_Chat, sFunc, listener); - NWNX_PushArgumentFloat(NWNX_Chat, sFunc, distance); + NWNX_PushArgumentInt(channel); + NWNX_PushArgumentObject(listener); + NWNX_PushArgumentFloat(distance); NWNX_CallFunction(NWNX_Chat, sFunc); } @@ -151,8 +151,8 @@ float NWNX_Chat_GetChatHearingDistance(object listener = OBJECT_INVALID, int cha { string sFunc = "GetChatHearingDistance"; - NWNX_PushArgumentInt(NWNX_Chat, sFunc, channel); - NWNX_PushArgumentObject(NWNX_Chat, sFunc, listener); + NWNX_PushArgumentInt(channel); + NWNX_PushArgumentObject(listener); NWNX_CallFunction(NWNX_Chat, sFunc); - return NWNX_GetReturnValueFloat(NWNX_Chat, sFunc); + return NWNX_GetReturnValueFloat(); } diff --git a/_module/nss/nwnx_creature.nss b/_module/nss/nwnx_creature.nss index 0e3486a1..275638f4 100644 --- a/_module/nss/nwnx_creature.nss +++ b/_module/nss/nwnx_creature.nss @@ -34,32 +34,6 @@ const int NWNX_CREATURE_MOVEMENT_TYPE_SIDESTEP = 3; const int NWNX_CREATURE_MOVEMENT_TYPE_WALK_BACKWARDS = 4; /// @} -/// @name Cleric Domains -/// @anchor cleric_domains -/// -/// The clerical domains. -/// @{ -const int NWNX_CREATURE_CLERIC_DOMAIN_AIR = 0; -const int NWNX_CREATURE_CLERIC_DOMAIN_ANIMAL = 1; -const int NWNX_CREATURE_CLERIC_DOMAIN_DEATH = 3; -const int NWNX_CREATURE_CLERIC_DOMAIN_DESTRUCTION = 4; -const int NWNX_CREATURE_CLERIC_DOMAIN_EARTH = 5; -const int NWNX_CREATURE_CLERIC_DOMAIN_EVIL = 6; -const int NWNX_CREATURE_CLERIC_DOMAIN_FIRE = 7; -const int NWNX_CREATURE_CLERIC_DOMAIN_GOOD = 8; -const int NWNX_CREATURE_CLERIC_DOMAIN_HEALING = 9; -const int NWNX_CREATURE_CLERIC_DOMAIN_KNOWLEDGE = 10; -const int NWNX_CREATURE_CLERIC_DOMAIN_MAGIC = 13; -const int NWNX_CREATURE_CLERIC_DOMAIN_PLANT = 14; -const int NWNX_CREATURE_CLERIC_DOMAIN_PROTECTION = 15; -const int NWNX_CREATURE_CLERIC_DOMAIN_STRENGTH = 16; -const int NWNX_CREATURE_CLERIC_DOMAIN_SUN = 17; -const int NWNX_CREATURE_CLERIC_DOMAIN_TRAVEL = 18; -const int NWNX_CREATURE_CLERIC_DOMAIN_TRICKERY = 19; -const int NWNX_CREATURE_CLERIC_DOMAIN_WAR = 20; -const int NWNX_CREATURE_CLERIC_DOMAIN_WATER = 21; -/// @} - /// @name Bonus Types /// @anchor bonus_types /// @@ -73,6 +47,22 @@ const int NWNX_CREATURE_BONUS_TYPE_SKILL = 5; const int NWNX_CREATURE_BONUS_TYPE_TOUCH_ATTACK = 6; /// @} +/// @name Ranged Projectile VFX +/// @anchor ranged_projectile_vfx +/// +/// Used with NWNX_Creature_OverrideRangedProjectileVFX() these are the projectile vfx types. +/// @{ +const int NWNX_CREATURE_PROJECTILE_VFX_NONE = 0; ///< No VFX +const int NWNX_CREATURE_PROJECTILE_VFX_ACID = 1; +const int NWNX_CREATURE_PROJECTILE_VFX_COLD = 2; +const int NWNX_CREATURE_PROJECTILE_VFX_ELECTRICAL = 3; +const int NWNX_CREATURE_PROJECTILE_VFX_FIRE = 4; +const int NWNX_CREATURE_PROJECTILE_VFX_SONIC = 5; +const int NWNX_CREATURE_PROJECTILE_VFX_RANDOM = 6; ///< Random Elemental VFX +/// @} + +const int NWNX_CREATURE_ABILITY_NONE = 6; + /// @struct NWNX_Creature_SpecialAbility /// @brief A creature special ability. struct NWNX_Creature_SpecialAbility @@ -82,16 +72,6 @@ struct NWNX_Creature_SpecialAbility int level; ///< The level of the ability }; -/// @struct NWNX_Creature_MemorisedSpell -/// @brief A memorised spell structure. -struct NWNX_Creature_MemorisedSpell -{ - int id; ///< Spell ID - int ready; ///< Whether the spell can be cast - int meta; ///< Metamagic type, if any - int domain; ///< Clerical domain, if any -}; - /// @brief Gives the creature a feat. /// @param creature The creature object. /// @param feat The feat id. @@ -110,6 +90,14 @@ void NWNX_Creature_AddFeatByLevel(object creature, int feat, int level); /// @param feat The feat id. void NWNX_Creature_RemoveFeat(object creature, int feat); +/// @brief Removes the creature a feat assigned at a level +/// @param creature The creature object. +/// @param feat The feat id. +/// @param level The level they gained the feat. +/// @remark Removes the feat from the stat list at the provided level. Does not remove the feat from the creature, use +/// NWNX_Creature_RemoveFeat for this. +void NWNX_Creature_RemoveFeatByLevel(object creature, int feat, int level); + /// @brief Determines if the creature knows a feat. /// @note This differs from native @nwn{GetHasFeat} which returns FALSE if the feat has no more uses per day. /// @param creature The creature object. @@ -224,29 +212,6 @@ void NWNX_Creature_ModifyRawAbilityScore(object creature, int ability, int modif /// @return The raw ability score. int NWNX_Creature_GetPrePolymorphAbilityScore(object creature, int ability); -/// @brief Gets the count of memorised spells for a creature's class at a level. -/// @param creature The creature object. -/// @param class The class id from classes.2da. (Not class index 0-2) -/// @param level The spell level. -/// @return The memorised spell count. -int NWNX_Creature_GetMemorisedSpellCountByLevel(object creature, int class, int level); - -/// @brief Gets the memorised spell at a class level's index. -/// @param creature The creature object. -/// @param class The class id from classes.2da. (Not class index 0-2) -/// @param level The spell level. -/// @param index The index. Index bounds: 0 <= index < NWNX_Creature_GetMemorisedSpellCountByLevel(). -/// @return An NWNX_Creature_MemorisedSpell() struct. -struct NWNX_Creature_MemorisedSpell NWNX_Creature_GetMemorisedSpell(object creature, int class, int level, int index); - -/// @brief Sets the memorised spell at a class level's index. -/// @param creature The creature object. -/// @param class The class id from classes.2da. (Not class index 0-2) -/// @param level The spell level. -/// @param index The index. Index bounds: 0 <= index < NWNX_Creature_GetMemorisedSpellCountByLevel(). -/// @param spell An NWNX_Creature_MemorisedSpell() struct. -void NWNX_Creature_SetMemorisedSpell(object creature, int class, int level, int index, struct NWNX_Creature_MemorisedSpell spell); - /// @brief Gets the remaining spell slots (innate casting) at a class level's index. /// @param creature The creature object. /// @param class The class id from classes.2da. (Not class index 0-2) @@ -268,21 +233,6 @@ void NWNX_Creature_SetRemainingSpellSlots(object creature, int class, int level, /// @return The maximum spell slot count. int NWNX_Creature_GetMaxSpellSlots(object creature, int class, int level); -/// @brief Gets the known spell count (innate casting) at a class level. -/// @param creature The creature object. -/// @param class The class id from classes.2da. (Not class index 0-2) -/// @param level The spell level. -/// @return The known spell count. -int NWNX_Creature_GetKnownSpellCount(object creature, int class, int level); - -/// @brief Gets the known spell at a class level's index. -/// @param creature The creature object. -/// @param class The class id from classes.2da. (Not class index 0-2) -/// @param level The spell level. -/// @param index The index. Index bounds: 0 <= index < NWNX_Creature_GetKnownSpellCount(). -/// @return The spell id. -int NWNX_Creature_GetKnownSpell(object creature, int class, int level, int index); - /// @brief Add a spell to a creature's spellbook for class. /// @param creature The creature object. /// @param class The class id from classes.2da. (Not class index 0-2) @@ -297,19 +247,6 @@ void NWNX_Creature_AddKnownSpell(object creature, int class, int level, int spel /// @param spellId The spell to remove. void NWNX_Creature_RemoveKnownSpell(object creature, int class, int level, int spellId); -/// @brief Clear a specific spell from the creature's spellbook for class -/// @param creature The creature object. -/// @param class The class id from classes.2da. (Not class index 0-2) -/// @param spellId The spell to clear. -void NWNX_Creature_ClearMemorisedKnownSpells(object creature, int class, int spellId); - -/// @brief Clear the memorised spell of the creature for the class, level and index. -/// @param creature The creature object. -/// @param class The class id from classes.2da. (Not class index 0-2) -/// @param level The spell level. -/// @param index The index. Index bounds: 0 <= index < NWNX_Creature_GetMemorisedSpellCountByLevel(). -void NWNX_Creature_ClearMemorisedSpell(object creature, int class, int level, int index); - /// @brief Gets the maximum hit points for creature for level. /// @param creature The creature object. /// @param level The level. @@ -339,6 +276,12 @@ float NWNX_Creature_GetMovementRateFactor(object creature); /// @param rate The rate to set. void NWNX_Creature_SetMovementRateFactor(object creature, float rate); +/// @brief Returns the creature's maximum movement rate cap. +/// @remark Default movement rate cap is 1.5. +/// @param creature The creature object. +/// @return The maximum movement rate cap. +float NWNX_Creature_GetMovementRateFactorCap(object creature); + /// @brief Sets the creature's maximum movement rate cap. /// @note Default movement rate cap is 1.5. /// @param creature The creature object. @@ -367,28 +310,35 @@ void NWNX_Creature_SetAlignmentGoodEvil(object creature, int value); /// @param value The value to set. void NWNX_Creature_SetAlignmentLawChaos(object creature, int value); -/// @brief Get the soundset index for creature. -/// @param creature The creature object. -/// @return The soundset used by the creature. -int NWNX_Creature_GetSoundset(object creature); - -/// @brief Set the soundset index for creature. -/// @param creature The creature object. -/// @param soundset The soundset index. -void NWNX_Creature_SetSoundset(object creature, int soundset); - /// @brief Set the base ranks in a skill for creature /// @param creature The creature object. /// @param skill The skill id. /// @param rank The value to set as the skill rank. void NWNX_Creature_SetSkillRank(object creature, int skill, int rank); +/// @brief Get the ranks in a skill for creature assigned at a level. +/// @param creature The creature object. +/// @param skill The skill id. +/// @param level The level they gained skill ranks. +/// @return The rank in a skill assigned at a level (-1 on error). +int NWNX_Creature_GetSkillRankByLevel(object creature, int skill, int level); + +/// @brief Set the ranks in a skill for creature assigned at a level. +/// @note It only affect the leveling array, to know what to do on level-down. To effectivly change the skill rank on the current level, NWNX_Creature_SetSkillRank is also needed. +/// @param creature The creature object. +/// @param skill The skill id. +/// @param level The level they gained skill ranks. +/// @param rank The value to set as the skill rank. +void NWNX_Creature_SetSkillRankByLevel(object creature, int skill, int rank, int level); + /// @brief Set the class ID in a particular position for a creature. /// @param creature The creature object. /// @param position Should be 0, 1, or 2 depending on how many classes the creature /// has and which is to be modified. /// @param classID A valid ID number in classes.2da and between 0 and 255. -void NWNX_Creature_SetClassByPosition(object creature, int position, int classID); +/// @param bUpdateLevels determines whether the method will replace all occurrences +/// of the old class in CNWLevelStats with the new classID. +void NWNX_Creature_SetClassByPosition(object creature, int position, int classID, int bUpdateLevels = TRUE); /// @brief Set the level at the given position for a creature. /// @note A creature should already have a class in that position. @@ -416,11 +366,6 @@ void NWNX_Creature_SetBaseAttackBonus(object creature, int bab); /// @return The attacks per round. int NWNX_Creature_GetAttacksPerRound(object creature, int bBaseAPR = FALSE); -/// @brief Sets the creature gender. -/// @param creature The creature object. -/// @param gender The GENDER_ constant. -void NWNX_Creature_SetGender(object creature, int gender); - /// @brief Restore all creature feat uses. /// @param creature The creature object. void NWNX_Creature_RestoreFeats(object creature); @@ -429,11 +374,6 @@ void NWNX_Creature_RestoreFeats(object creature); /// @param creature The creature object. void NWNX_Creature_RestoreSpecialAbilities(object creature); -/// @brief Restore all creature spells per day for given level. -/// @param creature The creature object. -/// @param level The level to restore. If -1, all spells are restored. -void NWNX_Creature_RestoreSpells(object creature, int level = -1); - /// @brief Restore uses for all items carried by the creature. /// @param creature The creature object. void NWNX_Creature_RestoreItems(object creature); @@ -453,6 +393,18 @@ int NWNX_Creature_GetSkillPointsRemaining(object creature); /// @param skillpoints The value to set. void NWNX_Creature_SetSkillPointsRemaining(object creature, int skillpoints); +/// @brief Gets the creature's remaining unspent skill points for level. +/// @param creature The creature object. +/// @param level The level. +/// @return The remaining unspent skill points for level. +int NWNX_Creature_GetSkillPointsRemainingByLevel(object creature, int level); + +/// @brief Sets the creature's remaining unspent skill points for level. +/// @param creature The creature object. +/// @param level The level. +/// @param value The value to set for level. +void NWNX_Creature_SetSkillPointsRemainingByLevel(object creature, int level, int value); + /// @brief Sets the creature's racial type /// @param creature The creature object. /// @param racialtype The racial type to set. @@ -485,8 +437,9 @@ void NWNX_Creature_SetBaseSavingThrow(object creature, int which, int value); /// @param creature The creature object. /// @param class The class id. /// @param count The amount of levels of class to add. +/// @param package The class package to use for leveling up (PACKAGE_INVALID = starting package) /// @note This will not work on player characters. -void NWNX_Creature_LevelUp(object creature, int class, int count=1); +void NWNX_Creature_LevelUp(object creature, int class, int count = 1, int package = PACKAGE_INVALID); /// @brief Remove last levels from a creature. /// @param creature The creature object. @@ -603,13 +556,6 @@ int NWNX_Creature_GetDisarmable(object creature); /// @param disarmable Set to TRUE if the creature can be disarmed. void NWNX_Creature_SetDisarmable(object creature, int disarmable); -/// @brief Gets one of creature's domains. -/// @param creature The creature object. -/// @param class The class id from classes.2da. (Not class index 0-2) -/// @param index The first or second domain. -/// @deprecated Use GetDomain(). This will be removed in future NWNX releases. -int NWNX_Creature_GetDomain(object creature, int class, int index); - /// @brief Sets one of creature's domains. /// @param creature The creature object. /// @param class The class id from classes.2da. (Not class index 0-2) @@ -617,12 +563,6 @@ int NWNX_Creature_GetDomain(object creature, int class, int index); /// @param domain The domain constant to set. void NWNX_Creature_SetDomain(object creature, int class, int index, int domain); -/// @brief Gets the creature's specialist school. -/// @param creature The creature object. -/// @param class The class id from classes.2da. (Not class index 0-2) -/// @deprecated Use GetSpecialization(). This will be removed in future NWNX releases. -int NWNX_Creature_GetSpecialization(object creature, int class); - /// @brief Sets creature's specialist school. /// @param creature The creature object. /// @param class The class id from classes.2da. (Not class index 0-2) @@ -756,12 +696,6 @@ int NWNX_Creature_GetCriticalRangeOverride(object oCreature, int nHand = 0, int /// @param nAssociateType The associate type, one of ASSOCIATE_TYPE_*, except _NONE void NWNX_Creature_AddAssociate(object oCreature, object oAssociate, int nAssociateType); -/// @brief Set whether an effect icon is flashing or not. -/// @param oCreature The target creature. -/// @param nIconId The icon id, see effecticons.2da. -/// @param bFlashing TRUE for flashing, FALSE for not flashing. -void NWNX_Creature_SetEffectIconFlashing(object oCreature, int nIconId, int bFlashing); - /// @brief Override the damage level of oCreature. /// @note Damage levels are the damage state under a creature's name, for example: 'Near Death' /// @param oCreature The target creature. @@ -845,13 +779,241 @@ vector NWNX_Creature_ComputeSafeLocation(object oCreature, vector vPosition, flo /// @param oTargetCreature The target creature. void NWNX_Creature_DoPerceptionUpdateOnCreature(object oCreature, object oTargetCreature); +/// @brief Get a creatures personal space (meters from center to non-creature objects). +/// @param oCreature The creature. +/// @return The creatures personal space. +float NWNX_Creature_GetPersonalSpace(object oCreature); + +/// @brief Set a creatures personal space (meters from center to non-creature objects). +/// @param oCreature The creature. +/// @param fPerspace The creatures personal space. +void NWNX_Creature_SetPersonalSpace(object oCreature, float fPerspace); + +/// @brief Get a creatures creature personal space (meters from center to other creatures). +/// @param oCreature The creature. +/// @return The creatures creature personal space. +float NWNX_Creature_GetCreaturePersonalSpace(object oCreature); + +/// @brief Set a creatures creature personal space (meters from center to other creatures). +/// @param oCreature The creature. +/// @param fCrePerspace The creatures creature personal space. +void NWNX_Creature_SetCreaturePersonalSpace(object oCreature, float fCrePerspace); + +/// @brief Get a creatures height. +/// @param oCreature The creature. +/// @return The creatures height. +float NWNX_Creature_GetHeight(object oCreature); + +/// @brief Set a creatures height. +/// @param oCreature The creature. +/// @param fHeight The creatures height. +void NWNX_Creature_SetHeight(object oCreature, float fHeight); + +/// @brief Get a creatures hit distance. +/// @param oCreature The creature. +/// @return The creatures hit distance. +float NWNX_Creature_GetHitDistance(object oCreature); + +/// @brief Set a creatures hit distance. +/// @param oCreature The creature. +/// @param fHitDist The creatures hit distance. +void NWNX_Creature_SetHitDistance(object oCreature, float fHitDist); + +/// @brief Get a creatures preferred attack distance. +/// @param oCreature The creature. +/// @return The creatures preferred attack distance. +float NWNX_Creature_GetPreferredAttackDistance(object oCreature); + +/// @brief Set a creatures preferred attack distance. +/// @param oCreature The creature. +/// @param fPrefAtckDist The creatures preferred attack distance. +void NWNX_Creature_SetPreferredAttackDistance(object oCreature, float fPrefAtckDist); + +/// @brief Get the skill penalty from wearing armor. +/// @param oCreature The creature. +int NWNX_Creature_GetArmorCheckPenalty(object oCreature); + +/// @brief Get the skill penalty from wearing a shield. +/// @param oCreature The creature. +int NWNX_Creature_GetShieldCheckPenalty(object oCreature); + +/// @brief Sets a chance for normal Effect Immunities to be bypassed +/// @param oCreature The affected creature +/// @param nImmunityType 'IMMUNITY_TYPE_*' to bypass. By default affects outgoing effects (oCreature -> another creature). Use a negative (-IMMUNITY_TYPE_*) to affect incoming effects instead (another creature -> oCreature) use 255/-255 to bypass ALL Immunities. +/// @param nChance The chance (of 100%) to bypass the immunity check. A Positive chance results in NOT IMMUNE. A Negative chance results in IMMUNE. +/// @param bPersist Whether the modifier should persist to .bic file (for PCs) +/// @note Persistence is enabled after a server reset by the first use of this function. Recommended to trigger on a dummy target OnModuleLoad to enable persistence. +/// @note Where an Outgoing and Incoming bypass both attempt opposing outcomes, both are ignored and the immunity status without bypass will apply. +void NWNX_Creature_SetBypassEffectImmunity(object oCreature, int nImmunityType, int nChance = 100, int bPersist = FALSE); + +/// @brief Gets a chance for normal Effect Immunities to be bypassed +/// @param oCreature The target creature +/// @param nImmunityType 'IMMUNITY_TYPE_*' to retrieve the current chance for bypass: Positive gets outgoing effects (oCreature -> another creature). Negative (-IMMUNITY_TYPE_*) gets incoming effects (another creature -> oCreature). +/// @return the current critical hit multiplier modifier for the creature +int NWNX_Creature_GetBypassEffectImmunity(object oCreature, int nImmunityType); + +/// @brief Sets the killer of oCreature to oKiller. +/// @param oCreature The target creature. +/// @param oKiller The killer. +void NWNX_Creature_SetLastKiller(object oCreature, object oKiller); + +/// @brief Instantly cast a spell at a target or location. +/// @note oCreature must be in the same area as oTarget or locTarget. +/// @note Does not care if oCreature can't cast spells or doesn't know the spell. Does not consume spell slots. +/// @param oCreature The caster. +/// @param oTarget The target, use OBJECT_INVALID to cast at a location. +/// @param locTarget The location, only used when oTarget is OBJECT_INVALID. +/// @param nSpellID The spell ID. +/// @param nCasterLevel The caster level of the spell. +/// @param fProjectileTime The time in seconds for the projectile to reach the target. 0.0f for no projectile. +/// @param nProjectilePathType A PROJECTILE_PATH_TYPE_* constant. +/// @param nProjectileSpellID An optional spell ID which to use the projectile vfx of. -1 to use nSpellID's projectile vfx. +/// @param oItem The spell cast item retrieved by GetSpellCastItem(). +/// @param sImpactScript The spell impact script. Set to "****"" to not run any impact script. If left blank, will execute nSpellID's impact script. +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 = ""); + +/// @brief Have oCreature instantly equip oItem to nInventorySlot. +/// @param oCreature The creature. +/// @param oItem The item, must be possessed by oCreature. +/// @param nInventorySlot An INVENTORY_SLOT_* constant. +/// @return TRUE on success, FALSE on failure. +int NWNX_Creature_RunEquip(object oCreature, object oItem, int nInventorySlot); + +/// @brief Have oCreature instantly unequip oItem. +/// @param oCreature The creature. +/// @param oItem The item, must be possessed by oCreature. +/// @return TRUE on success, FALSE on failure. +int NWNX_Creature_RunUnequip(object oCreature, object oItem); + +/// @brief Override the elemental projectile visual effect of ranged/throwing weapons. +/// @param oCreature The creature. +/// @param nProjectileVFX A @ref ranged_projectile_vfx "NWNX_CREATURE_PROJECTILE_VFX_*" constant or -1 to remove the override. +/// @param bPersist Whether the vfx should persist to the .bic file (for PCs). +/// @note Persistence is enabled after a server reset by the first use of this function. Recommended to trigger on a dummy target OnModuleLoad to enable persistence. +void NWNX_Creature_OverrideRangedProjectileVFX(object oCreature, int nProjectileVFX, int bPersist = FALSE); + +/// @brief Sets a custom Initiative modifier +/// @param oCreature The affected creature +/// @param nMod The amount to adjust their initiative (+/-). +/// @param bPersist Whether the modifier should persist to .bic file (for PCs) +/// @note Persistence is enabled after a server reset by the first use of this function. Recommended to trigger on a dummy target OnModuleLoad to enable persistence. +/// @warning This modifier takes precedence over an NWNX_Race Initiative modifier; they're not additive +void NWNX_Creature_SetInitiativeModifier(object oCreature, int nMod, int bPersist = FALSE); + +/// @brief Gets the custom Initiative modifier. +/// @param oCreature The target creature +/// @return the current custom initiative modifier for the creature +int NWNX_Creature_GetInitiativeModifier(object oCreature); + +/// @brief Gets the Body Bag of a creature +/// @param oCreature The target creature +/// @return The creatures assigned Body Bag +object NWNX_Creature_GetBodyBag(object oCreature); + +/// @brief Add a cast spell action to oCreature's action queue. +/// @param oCreature The creature casting the spell. +/// @param oTarget The target, to cast at a location use the area as target. +/// @param vTargetLocation The target location. +/// @param nSpellID The spell ID. +/// @param nMultiClass The character class position to cast the spell as. 0 = First Class, 1 = Second Class, 3 = Third Class. To cast a cheat spell use 255 and to cast a special ability use 254. +/// @param nMetaMagic A METAMAGIC_* constant, except METAMAGIC_ANY. +/// @param nDomainLevel The domain level if casting a domain spell. +/// @param nProjectilePathType A PROJECTILE_PATH_TYPE_* constant. +/// @param bInstant TRUE to instantly cast the spell. +/// @param bClearActions TRUE to clear all actions. +/// @param bAddToFront TRUE to add the cast spell action to the front of the action queue. +/// @return TRUE if the action was successfully added to oCreature's action queue. +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); + +/// @brief Get whether oCreature is flanking oTargetCreature. +/// @param oCreature The creature object. +/// @param oTargetCreature The target creature object. +/// @return TRUE if oCreature is flanking oTargetCreature. +int NWNX_Creature_GetIsFlanking(object oCreature, object oTargetCreature); + +/// @brief Decrements the remaining spell slots (innate casting) at a class level. +/// @param oCreature The creature object. +/// @param nClass The class id from classes.2da. (Not class index 0-2) +/// @param nSpellLevel The spell level. +void NWNX_Creature_DecrementRemainingSpellSlots(object oCreature, int nClass, int nSpellLevel); + +/// @brief Increments the remaining spell slots (innate casting) at a class level. +/// @param oCreature The creature object. +/// @param nClass The class id from classes.2da. (Not class index 0-2) +/// @param nSpellLevel The spell level. +void NWNX_Creature_IncrementRemainingSpellSlots(object oCreature, int nClass, int nSpellLevel); + +/// @brief Gets the maximum number of bonus attacks a creature can have from EffectModifyAttacks(). +/// @param oCreature The creature. +/// @return The maximum number of bonus attacks or 0 on error. +int NWNX_Creature_GetMaximumBonusAttacks(object oCreature); + +/// @brief Sets the maximum number of bonus attacks a creature can have from EffectModifyAttacks(). +/// @note This function also removes the limit of 5 bonus attacks from EffectModifyAttacks(). +/// @param oCreature The creature. +/// @param nMaxBonusAttacks The maximum number of bonus attacks. Values < 0 will set the limit back to the default of 5. +/// @param bPersist Whether the modifier should persist to .bic file (for PCs). +/// @note Persistence is enabled after a server reset by the first use of this function. Recommended to trigger on a dummy target OnModuleLoad to enable persistence. +void NWNX_Creature_SetMaximumBonusAttacks(object oCreature, int nMaxBonusAttacks, int bPersist = FALSE); + +/// @brief Inserts a cleave or great cleave attack into oCreature's current attack round against the nearest enemy within melee reach. +/// @param oCreature The creature object. +/// @note oCreature must have the cleave or great cleave feats, must be in combat, and must have available attacks remaining in their combat round to use for cleave attack. +void NWNX_Creature_DoCleaveAttack(object oCreature); + +/// @brief Gets the current object oCreature's orientation is locked to. +/// @param oCreature The creature object. +/// @return The object oCreature's orientation is locked to, or OBJECT_INVALID if oCreature's orientation is not locked. +object NWNX_Creature_GetLockOrientationToObject(object oCreature); + +/// @brief Locks oCreature's orientation to always face oTarget. +/// @param oCreature The creature object. +/// @param oTarget The target to lock oCreature's orientation to. Use OBJECT_INVALID to remove the orientation lock. +void NWNX_Creature_SetLockOrientationToObject(object oCreature, object oTarget); + +/// @brief Causes oCreature to broadcast an Attack of Opportunity against themself. +/// @param oCreature The creature object. +/// @param oSingleCreature A single creature to broadcast the Attack of Opporunity to. Use OBJECT_INVALID to broadcast to all nearby enemies. +/// @param bMovement Whether the Attack of Opportunity was caused by movement. +void NWNX_Creature_BroadcastAttackOfOpportunity(object oCreature, object oSingleCreature = OBJECT_INVALID, int bMovement = FALSE); + +/// @brief Returns the maximum price oStore will buy items from oCreature for. +/// @param oCreature The creature object. +/// @param oStore The store object. +/// @return The max buy price override. -1 = No maximum buy price, -2 = No override set. +int NWNX_Creature_GetMaxSellToStorePriceOverride(object oCreature, object oStore); + +/// @brief Overrides the maximum price oStore will buy items from oCreature for. +/// @param oCreature The creature object. +/// @param oStore The store object. +/// @param nMaxSellToPrice The maximum buy price override. -1 = No maximum buy price, -2 = Remove the override. +void NWNX_Creature_SetMaxSellToStorePriceOverride(object oCreature, object oStore, int nMaxSellToPrice); + +/// @brief Returns the creature's ability increase for nLevel. +/// @param oCreature The creature object. +/// @param nLevel The level. +/// @return An ABILITY_* constant, NWNX_CREATURE_ABILITY_NONE or -1 on error +int NWNX_Creature_GetAbilityIncreaseByLevel(object oCreature, int nLevel); + +/// @brief Sets the creature's ability increase for nLevel. +/// @param oCreature The creature object. +/// @param nLevel The level. +/// @param nAbility ABILITY_* constant or NWNX_CREATURE_ABILITY_NONE +void NWNX_Creature_SetAbilityIncreaseByLevel(object oCreature, int nLevel, int nAbility); + +/// @brief Returns the creature's maximum attack range to a target +/// @param oCreature The creature object. +/// @param oTarget The target to get the maximum attack range to +/// @return The maximum attack range for oCreature to oTarget +float NWNX_Creature_GetMaxAttackRange(object oCreature, object oTarget); + /// @} void NWNX_Creature_AddFeat(object creature, int feat) { string sFunc = "AddFeat"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, feat); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(feat); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -860,9 +1022,9 @@ void NWNX_Creature_AddFeatByLevel(object creature, int feat, int level) { string sFunc = "AddFeatByLevel"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, feat); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(level); + NWNX_PushArgumentInt(feat); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -870,8 +1032,19 @@ void NWNX_Creature_AddFeatByLevel(object creature, int feat, int level) void NWNX_Creature_RemoveFeat(object creature, int feat) { string sFunc = "RemoveFeat"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, feat); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(feat); + NWNX_PushArgumentObject(creature); + + NWNX_CallFunction(NWNX_Creature, sFunc); +} + +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); } @@ -880,76 +1053,76 @@ int NWNX_Creature_GetKnowsFeat(object creature, int feat) { string sFunc = "GetKnowsFeat"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, feat); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(feat); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Creature_GetFeatCountByLevel(object creature, int level) { string sFunc = "GetFeatCountByLevel"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(level); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Creature_GetFeatByLevel(object creature, int level, int index) { string sFunc = "GetFeatByLevel"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, index); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(index); + NWNX_PushArgumentInt(level); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Creature_GetFeatCount(object creature) { string sFunc = "GetFeatCount"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Creature_GetFeatGrantLevel(object creature, int feat) { string sFunc = "GetFeatGrantLevel"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, feat); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(feat); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Creature_GetFeatByIndex(object creature, int index) { string sFunc = "GetFeatByIndex"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, index); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(index); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Creature_GetMeetsFeatRequirements(object creature, int feat) { string sFunc = "GetMeetsFeatRequirements"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, feat); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(feat); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } struct NWNX_Creature_SpecialAbility NWNX_Creature_GetSpecialAbility(object creature, int index) @@ -958,14 +1131,14 @@ struct NWNX_Creature_SpecialAbility NWNX_Creature_GetSpecialAbility(object creat struct NWNX_Creature_SpecialAbility ability; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, index); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(index); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - ability.level = NWNX_GetReturnValueInt(NWNX_Creature, sFunc); - ability.ready = NWNX_GetReturnValueInt(NWNX_Creature, sFunc); - ability.id = NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + ability.level = NWNX_GetReturnValueInt(); + ability.ready = NWNX_GetReturnValueInt(); + ability.id = NWNX_GetReturnValueInt(); return ability; } @@ -974,20 +1147,20 @@ int NWNX_Creature_GetSpecialAbilityCount(object creature) { string sFunc = "GetSpecialAbilityCount"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_AddSpecialAbility(object creature, struct NWNX_Creature_SpecialAbility ability) { string sFunc = "AddSpecialAbility"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, ability.id); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, ability.ready); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, ability.level); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(ability.id); + NWNX_PushArgumentInt(ability.ready); + NWNX_PushArgumentInt(ability.level); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -996,8 +1169,8 @@ void NWNX_Creature_RemoveSpecialAbility(object creature, int index) { string sFunc = "RemoveSpecialAbility"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, index); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(index); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1006,11 +1179,11 @@ void NWNX_Creature_SetSpecialAbility(object creature, int index, struct NWNX_Cre { string sFunc = "SetSpecialAbility"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, ability.id); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, ability.ready); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, ability.level); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, index); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(ability.id); + NWNX_PushArgumentInt(ability.ready); + NWNX_PushArgumentInt(ability.level); + NWNX_PushArgumentInt(index); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1019,19 +1192,19 @@ int NWNX_Creature_GetClassByLevel(object creature, int level) { string sFunc = "GetClassByLevel"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(level); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetBaseAC(object creature, int ac) { string sFunc = "SetBaseAC"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, ac); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(ac); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1040,19 +1213,19 @@ int NWNX_Creature_GetBaseAC(object creature) { string sFunc = "GetBaseAC"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetRawAbilityScore(object creature, int ability, int value) { string sFunc = "SetRawAbilityScore"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, value); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, ability); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(value); + NWNX_PushArgumentInt(ability); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1061,20 +1234,20 @@ int NWNX_Creature_GetRawAbilityScore(object creature, int ability) { string sFunc = "GetRawAbilityScore"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, ability); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(ability); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_ModifyRawAbilityScore(object creature, int ability, int modifier) { string sFunc = "ModifyRawAbilityScore"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, modifier); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, ability); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(modifier); + NWNX_PushArgumentInt(ability); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1083,118 +1256,45 @@ int NWNX_Creature_GetPrePolymorphAbilityScore(object creature, int ability) { string sFunc = "GetPrePolymorphAbilityScore"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, ability); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); -} - -struct NWNX_Creature_MemorisedSpell NWNX_Creature_GetMemorisedSpell(object creature, int class, int level, int index) -{ - string sFunc = "GetMemorisedSpell"; - struct NWNX_Creature_MemorisedSpell spell; - - NWNX_PushArgumentInt(NWNX_Creature, sFunc, index); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, class); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - - spell.domain = NWNX_GetReturnValueInt(NWNX_Creature, sFunc); - spell.meta = NWNX_GetReturnValueInt(NWNX_Creature, sFunc); - spell.ready = NWNX_GetReturnValueInt(NWNX_Creature, sFunc); - spell.id = NWNX_GetReturnValueInt(NWNX_Creature, sFunc); - return spell; -} - -int NWNX_Creature_GetMemorisedSpellCountByLevel(object creature, int class, int level) -{ - string sFunc = "GetMemorisedSpellCountByLevel"; - - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, class); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); -} - -void NWNX_Creature_SetMemorisedSpell(object creature, int class, int level, int index, struct NWNX_Creature_MemorisedSpell spell) -{ - string sFunc = "SetMemorisedSpell"; - - NWNX_PushArgumentInt(NWNX_Creature, sFunc, spell.id); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, spell.ready); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, spell.meta); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, spell.domain); - - NWNX_PushArgumentInt(NWNX_Creature, sFunc, index); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, class); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(ability); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Creature_GetRemainingSpellSlots(object creature, int class, int level) { string sFunc = "GetRemainingSpellSlots"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, class); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(level); + NWNX_PushArgumentInt(class); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetRemainingSpellSlots(object creature, int class, int level, int slots) { string sFunc = "SetRemainingSpellSlots"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, slots); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, class); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(slots); + NWNX_PushArgumentInt(level); + NWNX_PushArgumentInt(class); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } -int NWNX_Creature_GetKnownSpell(object creature, int class, int level, int index) -{ - string sFunc = "GetKnownSpell"; - - NWNX_PushArgumentInt(NWNX_Creature, sFunc, index); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, class); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); -} - -int NWNX_Creature_GetKnownSpellCount(object creature, int class, int level) -{ - string sFunc = "GetKnownSpellCount"; - - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, class); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); -} - void NWNX_Creature_RemoveKnownSpell(object creature, int class, int level, int spellId) { string sFunc = "RemoveKnownSpell"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, spellId); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, class); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(spellId); + NWNX_PushArgumentInt(level); + NWNX_PushArgumentInt(class); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1203,33 +1303,10 @@ void NWNX_Creature_AddKnownSpell(object creature, int class, int level, int spel { string sFunc = "AddKnownSpell"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, spellId); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, class); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); -} - -void NWNX_Creature_ClearMemorisedKnownSpells(object creature, int class, int spellId) -{ - string sFunc = "ClearMemorisedKnownSpells"; - - NWNX_PushArgumentInt(NWNX_Creature, sFunc, spellId); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, class); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); -} - -void NWNX_Creature_ClearMemorisedSpell(object creature, int class, int level, int index) -{ - string sFunc = "ClearMemorisedSpell"; - - NWNX_PushArgumentInt(NWNX_Creature, sFunc, index); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, class); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(spellId); + NWNX_PushArgumentInt(level); + NWNX_PushArgumentInt(class); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1238,12 +1315,12 @@ int NWNX_Creature_GetMaxSpellSlots(object creature, int class, int level) { string sFunc = "GetMaxSpellSlots"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, class); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(level); + NWNX_PushArgumentInt(class); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } @@ -1251,20 +1328,20 @@ int NWNX_Creature_GetMaxHitPointsByLevel(object creature, int level) { string sFunc = "GetMaxHitPointsByLevel"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(level); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetMaxHitPointsByLevel(object creature, int level, int value) { string sFunc = "SetMaxHitPointsByLevel"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, value); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(value); + NWNX_PushArgumentInt(level); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1273,8 +1350,8 @@ void NWNX_Creature_SetMovementRate(object creature, int rate) { string sFunc = "SetMovementRate"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, rate); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(rate); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1282,28 +1359,37 @@ void NWNX_Creature_SetMovementRate(object creature, int rate) float NWNX_Creature_GetMovementRateFactor(object creature) { string sFunc = "GetMovementRateFactor"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueFloat(NWNX_Creature, sFunc); + return NWNX_GetReturnValueFloat(); } void NWNX_Creature_SetMovementRateFactor(object creature, float factor) { string sFunc = "SetMovementRateFactor"; - NWNX_PushArgumentFloat(NWNX_Creature, sFunc, factor); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentFloat(factor); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } +float NWNX_Creature_GetMovementRateFactorCap(object creature) +{ + string sFunc = "GetMovementRateFactorCap"; + NWNX_PushArgumentObject(creature); + + NWNX_CallFunction(NWNX_Creature, sFunc); + return NWNX_GetReturnValueFloat(); +} + void NWNX_Creature_SetMovementRateFactorCap(object creature, float cap) { string sFunc = "SetMovementRateFactorCap"; - NWNX_PushArgumentFloat(NWNX_Creature, sFunc, cap); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentFloat(cap); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1312,8 +1398,8 @@ void NWNX_Creature_SetAlignmentGoodEvil(object creature, int value) { string sFunc = "SetAlignmentGoodEvil"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, value); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(value); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1322,28 +1408,8 @@ void NWNX_Creature_SetAlignmentLawChaos(object creature, int value) { string sFunc = "SetAlignmentLawChaos"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, value); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); -} - -int NWNX_Creature_GetSoundset(object creature) -{ - string sFunc = "GetSoundset"; - - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); -} - -void NWNX_Creature_SetSoundset(object creature, int soundset) -{ - string sFunc = "SetSoundset"; - - NWNX_PushArgumentInt(NWNX_Creature, sFunc, soundset); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(value); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1351,19 +1417,44 @@ void NWNX_Creature_SetSoundset(object creature, int soundset) void NWNX_Creature_SetSkillRank(object creature, int skill, int rank) { string sFunc = "SetSkillRank"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, rank); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, skill); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(rank); + NWNX_PushArgumentInt(skill); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } -void NWNX_Creature_SetClassByPosition(object creature, int position, int classID) +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(); +} + +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); +} + +void NWNX_Creature_SetClassByPosition(object creature, int position, int classID, int bUpdateLevels = TRUE) { string sFunc = "SetClassByPosition"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, classID); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, position); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(bUpdateLevels); + NWNX_PushArgumentInt(classID); + NWNX_PushArgumentInt(position); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1371,9 +1462,9 @@ void NWNX_Creature_SetClassByPosition(object creature, int position, int classID void NWNX_Creature_SetLevelByPosition(object creature, int position, int level) { string sFunc = "SetLevelByPosition"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, position); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(level); + NWNX_PushArgumentInt(position); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1381,8 +1472,8 @@ void NWNX_Creature_SetLevelByPosition(object creature, int position, int level) void NWNX_Creature_SetBaseAttackBonus(object creature, int bab) { string sFunc = "SetBaseAttackBonus"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, bab); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(bab); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1390,26 +1481,17 @@ void NWNX_Creature_SetBaseAttackBonus(object creature, int bab) int NWNX_Creature_GetAttacksPerRound(object creature, int bBaseAPR = FALSE) { string sFunc = "GetAttacksPerRound"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, bBaseAPR); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); -} - -void NWNX_Creature_SetGender(object creature, int gender) -{ - string sFunc = "SetGender"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, gender); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(bBaseAPR); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_RestoreFeats(object creature) { string sFunc = "RestoreFeats"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1417,16 +1499,7 @@ void NWNX_Creature_RestoreFeats(object creature) void NWNX_Creature_RestoreSpecialAbilities(object creature) { string sFunc = "RestoreSpecialAbilities"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); - - NWNX_CallFunction(NWNX_Creature, sFunc); -} - -void NWNX_Creature_RestoreSpells(object creature, int level = -1) -{ - string sFunc = "RestoreSpells"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, level); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1434,7 +1507,7 @@ void NWNX_Creature_RestoreSpells(object creature, int level = -1) void NWNX_Creature_RestoreItems(object creature) { string sFunc = "RestoreItems"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1442,8 +1515,8 @@ void NWNX_Creature_RestoreItems(object creature) void NWNX_Creature_SetSize(object creature, int size) { string sFunc = "SetSize"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, size); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(size); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1451,18 +1524,40 @@ void NWNX_Creature_SetSize(object creature, int size) int NWNX_Creature_GetSkillPointsRemaining(object creature) { string sFunc = "GetSkillPointsRemaining"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetSkillPointsRemaining(object creature, int skillpoints) { string sFunc = "SetSkillPointsRemaining"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, skillpoints); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(skillpoints); + NWNX_PushArgumentObject(creature); + + NWNX_CallFunction(NWNX_Creature, sFunc); +} + +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(); +} + +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); } @@ -1470,8 +1565,8 @@ void NWNX_Creature_SetSkillPointsRemaining(object creature, int skillpoints) void NWNX_Creature_SetRacialType(object creature, int racialtype) { string sFunc = "SetRacialType"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, racialtype); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(racialtype); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1479,17 +1574,17 @@ void NWNX_Creature_SetRacialType(object creature, int racialtype) int NWNX_Creature_GetMovementType(object creature) { string sFunc = "GetMovementType"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetWalkRateCap(object creature, float fWalkRate = 2000.0f) { string sFunc = "SetWalkRateCap"; - NWNX_PushArgumentFloat(NWNX_Creature, sFunc, fWalkRate); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentFloat(fWalkRate); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1497,8 +1592,8 @@ void NWNX_Creature_SetWalkRateCap(object creature, float fWalkRate = 2000.0f) void NWNX_Creature_SetGold(object creature, int gold) { string sFunc = "SetGold"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, gold); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(gold); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1506,8 +1601,8 @@ void NWNX_Creature_SetGold(object creature, int gold) void NWNX_Creature_SetCorpseDecayTime(object creature, int nDecayTime) { string sFunc = "SetCorpseDecayTime"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nDecayTime); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(nDecayTime); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1516,29 +1611,30 @@ void NWNX_Creature_SetCorpseDecayTime(object creature, int nDecayTime) int NWNX_Creature_GetBaseSavingThrow(object creature, int which) { string sFunc = "GetBaseSavingThrow"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, which); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(which); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetBaseSavingThrow(object creature, int which, int value) { string sFunc = "SetBaseSavingThrow"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, value); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, which); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(value); + NWNX_PushArgumentInt(which); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } -void NWNX_Creature_LevelUp(object creature, int class, int count=1) +void NWNX_Creature_LevelUp(object creature, int class, int count = 1, int package = PACKAGE_INVALID) { string sFunc = "LevelUp"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, count); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, class); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(package); + NWNX_PushArgumentInt(count); + NWNX_PushArgumentInt(class); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1546,8 +1642,8 @@ void NWNX_Creature_LevelUp(object creature, int class, int count=1) void NWNX_Creature_LevelDown(object creature, int count=1) { string sFunc = "LevelDown"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, count); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(count); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1555,8 +1651,8 @@ void NWNX_Creature_LevelDown(object creature, int count=1) void NWNX_Creature_SetChallengeRating(object creature, float fCR) { string sFunc = "SetChallengeRating"; - NWNX_PushArgumentFloat(NWNX_Creature, sFunc, fCR); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentFloat(fCR); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1579,56 +1675,56 @@ int NWNX_Creature_GetAttackBonus(object creature, int isMelee = -1, int isTouchA } } - NWNX_PushArgumentInt(NWNX_Creature, sFunc, includeBaseAttackBonus); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, isOffhand); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, isTouchAttack); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, isMelee); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(includeBaseAttackBonus); + NWNX_PushArgumentInt(isOffhand); + NWNX_PushArgumentInt(isTouchAttack); + NWNX_PushArgumentInt(isMelee); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Creature_GetHighestLevelOfFeat(object creature, int feat) { string sFunc = "GetHighestLevelOfFeat"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, feat); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(feat); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Creature_GetFeatRemainingUses(object creature, int feat) { string sFunc = "GetFeatRemainingUses"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, feat); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(feat); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Creature_GetFeatTotalUses(object creature, int feat) { string sFunc = "GetFeatTotalUses"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, feat); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(feat); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetFeatRemainingUses(object creature, int feat, int uses) { string sFunc = "SetFeatRemainingUses"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, uses); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, feat); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(uses); + NWNX_PushArgumentInt(feat); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1637,28 +1733,28 @@ int NWNX_Creature_GetTotalEffectBonus(object creature, int bonusType=NWNX_CREATU { string sFunc = "GetTotalEffectBonus"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, isOffhand); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, abilityScore); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, skill); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, saveSpecificType); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, savetype); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, isForceMax); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, isElemental); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, target); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, bonusType); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + 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(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetOriginalName(object creature, string name, int isLastName) { string sFunc = "SetOriginalName"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, isLastName); - NWNX_PushArgumentString(NWNX_Creature, sFunc, name); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(isLastName); + NWNX_PushArgumentString(name); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1667,19 +1763,19 @@ string NWNX_Creature_GetOriginalName(object creature, int isLastName) { string sFunc = "GetOriginalName"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, isLastName); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(isLastName); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueString(NWNX_Creature, sFunc); + return NWNX_GetReturnValueString(); } void NWNX_Creature_SetSpellResistance(object creature, int sr) { string sFunc = "SetSpellResistance"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, sr); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(sr); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1688,8 +1784,8 @@ void NWNX_Creature_SetAnimalCompanionCreatureType(object creature, int type) { string sFunc = "SetAnimalCompanionCreatureType"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, type); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(type); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1698,8 +1794,8 @@ void NWNX_Creature_SetFamiliarCreatureType(object creature, int type) { string sFunc = "SetFamiliarCreatureType"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, type); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(type); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1708,8 +1804,8 @@ void NWNX_Creature_SetAnimalCompanionName(object creature, string name) { string sFunc = "SetAnimalCompanionName"; - NWNX_PushArgumentString(NWNX_Creature, sFunc, name); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentString(name); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1718,8 +1814,8 @@ void NWNX_Creature_SetFamiliarName(object creature, string name) { string sFunc = "SetFamiliarName"; - NWNX_PushArgumentString(NWNX_Creature, sFunc, name); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentString(name); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1728,55 +1824,41 @@ int NWNX_Creature_GetDisarmable(object creature) { string sFunc = "GetDisarmable"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetDisarmable(object creature, int disarmable) { string sFunc = "SetDisarmable"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, disarmable); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(disarmable); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } -int NWNX_Creature_GetDomain(object creature, int class, int index) -{ - WriteTimestampedLogEntry("NWNX_Creature: GetDomain() is deprecated. Please use the basegame's GetDomain() instead"); - - return GetDomain(creature, index, class); -} - void NWNX_Creature_SetDomain(object creature, int class, int index, int domain) { string sFunc = "SetDomain"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, domain); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, index); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, class); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(domain); + NWNX_PushArgumentInt(index); + NWNX_PushArgumentInt(class); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } -int NWNX_Creature_GetSpecialization(object creature, int class) -{ - WriteTimestampedLogEntry("NWNX_Creature: GetSpecialization() is deprecated. Please use the basegame's GetSpecialization() instead"); - - return GetSpecialization(creature, class); -} - void NWNX_Creature_SetSpecialization(object creature, int class, int school) { string sFunc = "SetSpecialization"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, school); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, class); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, creature); + NWNX_PushArgumentInt(school); + NWNX_PushArgumentInt(class); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1784,56 +1866,56 @@ void NWNX_Creature_SetSpecialization(object creature, int class, int school) void NWNX_Creature_SetFaction(object oCreature, int nFactionId) { string sFunc = "SetFaction"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nFactionId); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(nFactionId); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } int NWNX_Creature_GetFaction(object oCreature) { string sFunc = "GetFaction"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Creature_GetFlatFooted(object oCreature) { string sFunc = "GetFlatFooted"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } string NWNX_Creature_SerializeQuickbar(object oCreature) { string sFunc = "SerializeQuickbar"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueString(NWNX_Creature, sFunc); + return NWNX_GetReturnValueString(); } int NWNX_Creature_DeserializeQuickbar(object oCreature, string sSerializedQuickbar) { string sFunc = "DeserializeQuickbar"; - NWNX_PushArgumentString(NWNX_Creature, sFunc, sSerializedQuickbar); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentString(sSerializedQuickbar); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetCasterLevelModifier(object oCreature, int nClass, int nModifier, int bPersist = FALSE) { string sFunc = "SetCasterLevelModifier"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, bPersist); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nModifier); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nClass); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(bPersist); + NWNX_PushArgumentInt(nModifier); + NWNX_PushArgumentInt(nClass); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1842,21 +1924,21 @@ int NWNX_Creature_GetCasterLevelModifier(object oCreature, int nClass) { string sFunc = "GetCasterLevelModifier"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nClass); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(nClass); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetCasterLevelOverride(object oCreature, int nClass, int nCasterLevel, int bPersist = FALSE) { string sFunc = "SetCasterLevelOverride"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, bPersist); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nCasterLevel); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nClass); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(bPersist); + NWNX_PushArgumentInt(nCasterLevel); + NWNX_PushArgumentInt(nClass); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1865,17 +1947,17 @@ int NWNX_Creature_GetCasterLevelOverride(object oCreature, int nClass) { string sFunc = "GetCasterLevelOverride"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nClass); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(nClass); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_JumpToLimbo(object oCreature) { string sFunc = "JumpToLimbo"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1883,11 +1965,11 @@ void NWNX_Creature_SetCriticalMultiplierModifier(object oCreature, int nModifier { string sFunc = "SetCriticalMultiplierModifier"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nBaseItem); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, bPersist); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nHand); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nModifier); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(nBaseItem); + NWNX_PushArgumentInt(bPersist); + NWNX_PushArgumentInt(nHand); + NWNX_PushArgumentInt(nModifier); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1896,23 +1978,23 @@ int NWNX_Creature_GetCriticalMultiplierModifier(object oCreature, int nHand = 0, { string sFunc = "GetCriticalMultiplierModifier"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nBaseItem); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nHand); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(nBaseItem); + NWNX_PushArgumentInt(nHand); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetCriticalMultiplierOverride(object oCreature, int nOverride, int nHand = 0, int bPersist = FALSE, int nBaseItem = -1) { string sFunc = "SetCriticalMultiplierOverride"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nBaseItem); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, bPersist); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nHand); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nOverride); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(nBaseItem); + NWNX_PushArgumentInt(bPersist); + NWNX_PushArgumentInt(nHand); + NWNX_PushArgumentInt(nOverride); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1921,23 +2003,23 @@ int NWNX_Creature_GetCriticalMultiplierOverride(object oCreature, int nHand = 0, { string sFunc = "GetCriticalMultiplierOverride"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nBaseItem); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nHand); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(nBaseItem); + NWNX_PushArgumentInt(nHand); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetCriticalRangeModifier(object oCreature, int nModifier, int nHand = 0, int bPersist = FALSE, int nBaseItem = -1) { string sFunc = "SetCriticalRangeModifier"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nBaseItem); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, bPersist); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nHand); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nModifier); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(nBaseItem); + NWNX_PushArgumentInt(bPersist); + NWNX_PushArgumentInt(nHand); + NWNX_PushArgumentInt(nModifier); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1946,23 +2028,23 @@ int NWNX_Creature_GetCriticalRangeModifier(object oCreature, int nHand = 0, int { string sFunc = "GetCriticalRangeModifier"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nBaseItem); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nHand); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(nBaseItem); + NWNX_PushArgumentInt(nHand); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetCriticalRangeOverride(object oCreature, int nOverride, int nHand = 0, int bPersist = FALSE, int nBaseItem = -1) { string sFunc = "SetCriticalRangeOverride"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nBaseItem); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, bPersist); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nHand); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nOverride); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(nBaseItem); + NWNX_PushArgumentInt(bPersist); + NWNX_PushArgumentInt(nHand); + NWNX_PushArgumentInt(nOverride); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -1971,41 +2053,31 @@ int NWNX_Creature_GetCriticalRangeOverride(object oCreature, int nHand = 0, int { string sFunc = "GetCriticalRangeOverride"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nBaseItem); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nHand); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(nBaseItem); + NWNX_PushArgumentInt(nHand); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_AddAssociate(object oCreature, object oAssociate, int nAssociateType) { string sFunc = "AddAssociate"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nAssociateType); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oAssociate); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(nAssociateType); + NWNX_PushArgumentObject(oAssociate); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } -void NWNX_Creature_SetEffectIconFlashing(object oCreature, int nIconId, int bFlashing) -{ - string sFunc = "SetEffectIconFlashing"; - - NWNX_PushArgumentInt(NWNX_Creature, sFunc, bFlashing); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nIconId); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); - NWNX_CallFunction(NWNX_Creature, sFunc); -} - void NWNX_Creature_OverrideDamageLevel(object oCreature, int nDamageLevel) { string sFunc = "OverrideDamageLevel"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nDamageLevel); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(nDamageLevel); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -2013,8 +2085,8 @@ void NWNX_Creature_SetEncounter(object oCreature, object oEncounter) { string sFunc = "SetEncounter"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oEncounter); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentObject(oEncounter); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -2022,27 +2094,27 @@ object NWNX_Creature_GetEncounter(object oCreature) { string sFunc = "GetEncounter"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueObject(NWNX_Creature, sFunc); + return NWNX_GetReturnValueObject(); } int NWNX_Creature_GetIsBartering(object oCreature) { string sFunc = "GetIsBartering"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetLastItemCasterLevel(object oCreature, int nCasterLvl) { string sFunc = "SetLastItemCasterLevel"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nCasterLvl); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(nCasterLvl); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -2050,54 +2122,54 @@ void NWNX_Creature_SetLastItemCasterLevel(object oCreature, int nCasterLvl) int NWNX_Creature_GetLastItemCasterLevel(object oCreature) { string sFunc = "GetLastItemCasterLevel"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Creature_GetArmorClassVersus(object oAttacked, object oVersus, int nTouch=FALSE) { string sFunc = "GetArmorClassVersus"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nTouch); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oVersus); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oAttacked); + NWNX_PushArgumentInt(nTouch); + NWNX_PushArgumentObject(oVersus); + NWNX_PushArgumentObject(oAttacked); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Creature_GetWalkAnimation(object oCreature) { string sFunc = "GetWalkAnimation"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetWalkAnimation(object oCreature, int nAnimation) { string sFunc = "SetWalkAnimation"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nAnimation); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(nAnimation); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } void NWNX_Creature_SetAttackRollOverride(object oCreature, int nRoll, int nModifier) { string sFunc = "SetAttackRollOverride"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nModifier); - NWNX_PushArgumentInt(NWNX_Creature, sFunc, nRoll); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(nModifier); + NWNX_PushArgumentInt(nRoll); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } void NWNX_Creature_SetParryAllAttacks(object oCreature, int bParry) { string sFunc = "SetParryAllAttacks"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, bParry); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(bParry); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -2105,18 +2177,18 @@ int NWNX_Creature_GetNoPermanentDeath(object oCreature) { string sFunc = "GetNoPermanentDeath"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); - return NWNX_GetReturnValueInt(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Creature_SetNoPermanentDeath(object oCreature, int bNoPermanentDeath) { string sFunc = "SetNoPermanentDeath"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, bNoPermanentDeath); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentInt(bNoPermanentDeath); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } @@ -2124,18 +2196,18 @@ vector NWNX_Creature_ComputeSafeLocation(object oCreature, vector vPosition, flo { string sFunc = "ComputeSafeLocation"; - NWNX_PushArgumentInt(NWNX_Creature, sFunc, bWalkStraightLineRequired); - NWNX_PushArgumentFloat(NWNX_Creature, sFunc, fRadius); - NWNX_PushArgumentFloat(NWNX_Creature, sFunc, vPosition.x); - NWNX_PushArgumentFloat(NWNX_Creature, sFunc, vPosition.y); - NWNX_PushArgumentFloat(NWNX_Creature, sFunc, vPosition.z); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + 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(NWNX_Creature, sFunc); - v.y = NWNX_GetReturnValueFloat(NWNX_Creature, sFunc); - v.x = NWNX_GetReturnValueFloat(NWNX_Creature, sFunc); + v.z = NWNX_GetReturnValueFloat(); + v.y = NWNX_GetReturnValueFloat(); + v.x = NWNX_GetReturnValueFloat(); return v; } @@ -2144,7 +2216,398 @@ void NWNX_Creature_DoPerceptionUpdateOnCreature(object oCreature, object oTarget { string sFunc = "DoPerceptionUpdateOnCreature"; - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oTargetCreature); - NWNX_PushArgumentObject(NWNX_Creature, sFunc, oCreature); + NWNX_PushArgumentObject(oTargetCreature); + NWNX_PushArgumentObject(oCreature); NWNX_CallFunction(NWNX_Creature, sFunc); } + +float NWNX_Creature_GetPersonalSpace(object oCreature) +{ + string sFunc = "GetPersonalSpace"; + + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); + + return NWNX_GetReturnValueFloat(); +} + +void NWNX_Creature_SetPersonalSpace(object oCreature, float fPerspace) +{ + string sFunc = "SetPersonalSpace"; + + NWNX_PushArgumentFloat(fPerspace); + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); +} + +float NWNX_Creature_GetCreaturePersonalSpace(object oCreature) +{ + string sFunc = "GetCreaturePersonalSpace"; + + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); + + return NWNX_GetReturnValueFloat(); +} + +void NWNX_Creature_SetCreaturePersonalSpace(object oCreature, float fCrePerspace) +{ + string sFunc = "SetCreaturePersonalSpace"; + + NWNX_PushArgumentFloat(fCrePerspace); + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); +} + +float NWNX_Creature_GetHeight(object oCreature) +{ + string sFunc = "GetHeight"; + + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); + + return NWNX_GetReturnValueFloat(); +} + +void NWNX_Creature_SetHeight(object oCreature, float fHeight) +{ + string sFunc = "SetHeight"; + + NWNX_PushArgumentFloat(fHeight); + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); +} + +float NWNX_Creature_GetHitDistance(object oCreature) +{ + string sFunc = "GetHitDistance"; + + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); + + return NWNX_GetReturnValueFloat(); +} + +void NWNX_Creature_SetHitDistance(object oCreature, float fHitDist) +{ + string sFunc = "SetHitDistance"; + + NWNX_PushArgumentFloat(fHitDist); + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); +} + +float NWNX_Creature_GetPreferredAttackDistance(object oCreature) +{ + string sFunc = "GetPreferredAttackDistance"; + + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); + + return NWNX_GetReturnValueFloat(); +} + +void NWNX_Creature_SetPreferredAttackDistance(object oCreature, float fPrefAtckDist) +{ + string sFunc = "SetPreferredAttackDistance"; + + NWNX_PushArgumentFloat(fPrefAtckDist); + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); +} + +int NWNX_Creature_GetArmorCheckPenalty(object oCreature) +{ + string sFunc = "GetArmorCheckPenalty"; + + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); +} + +int NWNX_Creature_GetShieldCheckPenalty(object oCreature) +{ + string sFunc = "GetShieldCheckPenalty"; + + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); +} + +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); +} + +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(); +} + +void NWNX_Creature_SetLastKiller(object oCreature, object oKiller) +{ + string sFunc = "SetLastKiller"; + + NWNX_PushArgumentObject(oKiller); + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); +} + +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); +} + +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(); +} + +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(); +} + +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); +} + +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); +} + +int NWNX_Creature_GetInitiativeModifier(object oCreature) +{ + string sFunc = "GetInitiativeModifier"; + + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); +} + +object NWNX_Creature_GetBodyBag(object oCreature) +{ + string sFunc = "GetBodyBag"; + + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); + return NWNX_GetReturnValueObject(); +} + +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(); +} + +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(); +} + +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); +} + +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); +} + +int NWNX_Creature_GetMaximumBonusAttacks(object oCreature) +{ + string sFunc = "GetMaximumBonusAttacks"; + + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); + return NWNX_GetReturnValueInt(); +} + +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); +} + +void NWNX_Creature_DoCleaveAttack(object oCreature) +{ + string sFunc = "DoCleaveAttack"; + + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); +} + +object NWNX_Creature_GetLockOrientationToObject(object oCreature) +{ + string sFunc = "GetLockOrientationToObject"; + + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); + + return NWNX_GetReturnValueObject(); +} + +void NWNX_Creature_SetLockOrientationToObject(object oCreature, object oTarget) +{ + string sFunc = "SetLockOrientationToObject"; + + NWNX_PushArgumentObject(oTarget); + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); +} + +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); +} + +int NWNX_Creature_GetMaxSellToStorePriceOverride(object oCreature, object oStore) +{ + string sFunc = "GetMaxSellToStorePriceOverride"; + + NWNX_PushArgumentObject(oStore); + NWNX_PushArgumentObject(oCreature); + NWNX_CallFunction(NWNX_Creature, sFunc); + + return NWNX_GetReturnValueInt(); +} + +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); +} + +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(); +} + +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); +} + +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(); +} diff --git a/_module/nss/nwnx_damage.nss b/_module/nss/nwnx_damage.nss index 3e206ea2..352d810c 100644 --- a/_module/nss/nwnx_damage.nss +++ b/_module/nss/nwnx_damage.nss @@ -24,6 +24,26 @@ struct NWNX_Damage_DamageEventData int iPositive; ///< Positive damage int iSonic; ///< Sonic damage int iBase; ///< Base damage + int iCustom1; ///< Custom1 damage + int iCustom2; ///< Custom2 damage + int iCustom3; ///< Custom3 damage + int iCustom4; ///< Custom4 damage + int iCustom5; ///< Custom5 damage + int iCustom6; ///< Custom6 damage + int iCustom7; ///< Custom7 damage + int iCustom8; ///< Custom8 damage + int iCustom9; ///< Custom9 damage + int iCustom10; ///< Custom10 damage + int iCustom11; ///< Custom11 damage + int iCustom12; ///< Custom12 damage + int iCustom13; ///< Custom13 damage + int iCustom14; ///< Custom14 damage + int iCustom15; ///< Custom15 damage + int iCustom16; ///< Custom16 damage + int iCustom17; ///< Custom17 damage + int iCustom18; ///< Custom18 damage + int iCustom19; ///< Custom19 damage + int iSpellId; ///< The spell id associated with the damage or -1 if not known. }; /// @struct NWNX_Damage_AttackEventData @@ -44,10 +64,33 @@ struct NWNX_Damage_AttackEventData int iPositive; ///< Positive damage int iSonic; ///< Sonic damage int iBase; ///< Base damage + int iCustom1; ///< Custom1 damage + int iCustom2; ///< Custom2 damage + int iCustom3; ///< Custom3 damage + int iCustom4; ///< Custom4 damage + int iCustom5; ///< Custom5 damage + int iCustom6; ///< Custom6 damage + int iCustom7; ///< Custom7 damage + int iCustom8; ///< Custom8 damage + int iCustom9; ///< Custom9 damage + int iCustom10; ///< Custom10 damage + int iCustom11; ///< Custom11 damage + int iCustom12; ///< Custom12 damage + int iCustom13; ///< Custom13 damage + int iCustom14; ///< Custom14 damage + int iCustom15; ///< Custom15 damage + int iCustom16; ///< Custom16 damage + int iCustom17; ///< Custom17 damage + int iCustom18; ///< Custom18 damage + int iCustom19; ///< Custom19 damage int iAttackNumber; ///< 1-based index of the attack in current combat round - int iAttackResult; ///< 1=hit, 3=critical hit, 4=miss, 8=concealed - int iAttackType; ///< 1=main hand, 2=offhand, 3-5=creature, 6=haste - int iSneakAttack; ///< 0=neither, 1=sneak attack, 2=death attack, 3=both + int iAttackResult; ///< 1=hit, 2=parried, 3=critical hit, 4=miss, 5=resisted, 7=automatic hit, 8=concealed, 9=miss chance, 10=devastating crit + int iWeaponAttackType; ///< 1=main hand, 2=offhand, 3-5=creature, 6=extra(haste), 7=unarmed, 8=unarmed extra + int iSneakAttack; ///< 0=neither, 1=sneak attack, 2=death attack, 3=both + int iAttackType; ///< 65002=Attack of Opportunity, 65003=Riposte or a FeatID like KnockDown or some other special attack. + int bKillingBlow; ///< TRUE if the hit is a killing blow + int iToHitRoll; ///< The to hit roll of the attack + int iToHitModifier; ///< The to hit modifier of the attack }; /// @struct NWNX_Damage_DamageData @@ -66,13 +109,32 @@ struct NWNX_Damage_DamageData int iNegative; ///< Negative damage int iPositive; ///< Positive damage int iSonic; ///< Sonic damage + int iCustom1; ///< Custom1 damage + int iCustom2; ///< Custom2 damage + int iCustom3; ///< Custom3 damage + int iCustom4; ///< Custom4 damage + int iCustom5; ///< Custom5 damage + int iCustom6; ///< Custom6 damage + int iCustom7; ///< Custom7 damage + int iCustom8; ///< Custom8 damage + int iCustom9; ///< Custom9 damage + int iCustom10; ///< Custom10 damage + int iCustom11; ///< Custom11 damage + int iCustom12; ///< Custom12 damage + int iCustom13; ///< Custom13 damage + int iCustom14; ///< Custom14 damage + int iCustom15; ///< Custom15 damage + int iCustom16; ///< Custom16 damage + int iCustom17; ///< Custom17 damage + int iCustom18; ///< Custom18 damage + int iCustom19; ///< Custom19 damage int iPower; ///< For overcoming DR }; /// @brief Sets the script to run with a damage event. /// @param sScript The script that will handle the damage event. /// @param oOwner An object if only executing for a specific object or OBJECT_INVALID for global. -void NWNX_Damage_SetDamageEventScript(string sScript, object oOwner=OBJECT_INVALID); +void NWNX_Damage_SetDamageEventScript(string sScript, object oOwner = OBJECT_INVALID); /// @brief Get Damage Event Data /// @return A NWNX_Damage_DamageEventData struct. @@ -87,7 +149,7 @@ void NWNX_Damage_SetDamageEventData(struct NWNX_Damage_DamageEventData data); /// @brief Sets the script to run with an attack event. /// @param sScript The script that will handle the attack event. /// @param oOwner An object if only executing for a specific object or OBJECT_INVALID for global. -void NWNX_Damage_SetAttackEventScript(string sScript, object oOwner=OBJECT_INVALID); +void NWNX_Damage_SetAttackEventScript(string sScript, object oOwner = OBJECT_INVALID); /// @brief Get Attack Event Data /// @return A NWNX_Damage_AttackEventData struct. @@ -97,6 +159,7 @@ struct NWNX_Damage_AttackEventData NWNX_Damage_GetAttackEventData(); /// @brief Set Attack Event Data /// @param data A NWNX_Damage_AttackEventData struct. /// @note To use only in the Attack Event Script. +/// @note Setting iSneakAttack will only change the attack roll message and floating text feedback. Immunities and damage will have already been resolved by the time the attack event script is ran. void NWNX_Damage_SetAttackEventData(struct NWNX_Damage_AttackEventData data); /// @brief Deal damage to a target. @@ -105,7 +168,7 @@ void NWNX_Damage_SetAttackEventData(struct NWNX_Damage_AttackEventData data); /// @param oTarget The target object on whom the damage is dealt. /// @param oSource The source of the damage. /// @param iRanged Whether the attack should be treated as ranged by the engine (for example when considering damage inflicted by Acid Sheath and other such effects) -void NWNX_Damage_DealDamage(struct NWNX_Damage_DamageData data, object oTarget, object oSource=OBJECT_SELF, int iRanged = FALSE); +void NWNX_Damage_DealDamage(struct NWNX_Damage_DamageData data, object oTarget, object oSource = OBJECT_SELF, int iRanged = FALSE); /// @} @@ -113,9 +176,9 @@ void NWNX_Damage_SetDamageEventScript(string sScript, object oOwner=OBJECT_INVAL { string sFunc = "SetEventScript"; - NWNX_PushArgumentObject(NWNX_Damage, sFunc, oOwner); - NWNX_PushArgumentString(NWNX_Damage, sFunc, sScript); - NWNX_PushArgumentString(NWNX_Damage, sFunc, "DAMAGE"); + NWNX_PushArgumentObject(oOwner); + NWNX_PushArgumentString(sScript); + NWNX_PushArgumentString("DAMAGE"); NWNX_CallFunction(NWNX_Damage, sFunc); } @@ -127,20 +190,40 @@ struct NWNX_Damage_DamageEventData NWNX_Damage_GetDamageEventData() NWNX_CallFunction(NWNX_Damage, sFunc); - data.oDamager = NWNX_GetReturnValueObject(NWNX_Damage, sFunc); - data.iBludgeoning = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iPierce = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iSlash = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iMagical = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iAcid = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iCold = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iDivine = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iElectrical = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iFire = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iNegative = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iPositive = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iSonic = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iBase = NWNX_GetReturnValueInt(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(); return data; } @@ -149,19 +232,38 @@ void NWNX_Damage_SetDamageEventData(struct NWNX_Damage_DamageEventData data) { string sFunc = "SetDamageEventData"; - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iBase); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iSonic); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iPositive); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iNegative); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iFire); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iElectrical); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iDivine); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iCold); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iAcid); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iMagical); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iSlash); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iPierce); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, 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); } @@ -170,9 +272,9 @@ void NWNX_Damage_SetAttackEventScript(string sScript, object oOwner=OBJECT_INVAL { string sFunc = "SetEventScript"; - NWNX_PushArgumentObject(NWNX_Damage, sFunc, oOwner); - NWNX_PushArgumentString(NWNX_Damage, sFunc, sScript); - NWNX_PushArgumentString(NWNX_Damage, sFunc, "ATTACK"); + NWNX_PushArgumentObject(oOwner); + NWNX_PushArgumentString(sScript); + NWNX_PushArgumentString("ATTACK"); NWNX_CallFunction(NWNX_Damage, sFunc); } @@ -184,24 +286,47 @@ struct NWNX_Damage_AttackEventData NWNX_Damage_GetAttackEventData() NWNX_CallFunction(NWNX_Damage, sFunc); - data.oTarget = NWNX_GetReturnValueObject(NWNX_Damage, sFunc); - data.iBludgeoning = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iPierce = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iSlash = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iMagical = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iAcid = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iCold = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iDivine = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iElectrical = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iFire = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iNegative = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iPositive = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iSonic = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iBase = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iAttackNumber = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iAttackResult = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iAttackType = NWNX_GetReturnValueInt(NWNX_Damage, sFunc); - data.iSneakAttack = NWNX_GetReturnValueInt(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(); return data; } @@ -210,20 +335,40 @@ void NWNX_Damage_SetAttackEventData(struct NWNX_Damage_AttackEventData data) { string sFunc = "SetAttackEventData"; - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iAttackResult); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iBase); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iSonic); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iPositive); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iNegative); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iFire); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iElectrical); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iDivine); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iCold); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iAcid); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iMagical); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iSlash); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iPierce); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iBludgeoning); + 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); } @@ -232,22 +377,42 @@ void NWNX_Damage_DealDamage(struct NWNX_Damage_DamageData data, object oTarget, { string sFunc = "DealDamage"; - NWNX_PushArgumentInt(NWNX_Damage, sFunc, iRanged); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iPower); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iSonic); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iPositive); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iNegative); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iFire); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iElectrical); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iDivine); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iCold); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iAcid); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iMagical); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iSlash); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iPierce); - NWNX_PushArgumentInt(NWNX_Damage, sFunc, data.iBludgeoning); - NWNX_PushArgumentObject(NWNX_Damage, sFunc, oTarget); - NWNX_PushArgumentObject(NWNX_Damage, sFunc, oSource); + 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); } diff --git a/_module/nss/nwnx_data.nss b/_module/nss/nwnx_data.nss new file mode 100644 index 00000000..b900de5b --- /dev/null +++ b/_module/nss/nwnx_data.nss @@ -0,0 +1,351 @@ +/// @addtogroup data Data +/// @brief Provides a number of data structures for NWN code to use (simulated arrays) +/// @{ +/// @file nwnx_data.nss + +#include "inc_array" + +// All these calls just pass through to the Array code in inc_array to provide +// an NWNX_Data compatible API for ease of transition. + +const int NWNX_DATA_INVALID_INDEX = INVALID_INDEX; +const int NWNX_DATA_TYPE_FLOAT = TYPE_FLOAT; +const int NWNX_DATA_TYPE_INTEGER = TYPE_INTEGER; +const int NWNX_DATA_TYPE_OBJECT = TYPE_OBJECT; +const int NWNX_DATA_TYPE_STRING = TYPE_STRING; + +/// @defgroup data_array_at Array At +/// @brief Returns the element at the index. +/// @ingroup data +/// @param obj The object. +/// @param tag The tag. +/// @param index The index. +/// @return The element of associated type. +/// @{ +string NWNX_Data_Array_At_Str(object obj, string tag, int index); +float NWNX_Data_Array_At_Flt(object obj, string tag, int index); +int NWNX_Data_Array_At_Int(object obj, string tag, int index); +object NWNX_Data_Array_At_Obj(object obj, string tag, int index); +/// @} + + +/// Clears the entire array, such that size==0. +void NWNX_Data_Array_Clear(int type, object obj, string tag); + +/// @defgroup data_array_contains Array Contains +/// @brief Checks if array contains the element. +/// @ingroup data +/// @param obj The object. +/// @param tag The tag. +/// @param element The element. +/// @return TRUE if the collection contains the element. +/// @{ +int NWNX_Data_Array_Contains_Flt(object obj, string tag, float element); +int NWNX_Data_Array_Contains_Int(object obj, string tag, int element); +int NWNX_Data_Array_Contains_Obj(object obj, string tag, object element); +int NWNX_Data_Array_Contains_Str(object obj, string tag, string element); +/// @} + +/// Copies the array of name otherTag over the array of name tag. +void NWNX_Data_Array_Copy(int type, object obj, string tag, string otherTag); + +/// Erases the element at index, and shuffles any elements from index size-1 to index + 1 left. +void NWNX_Data_Array_Erase(int type, object obj, string tag, int index); + +/// @defgroup data_array_find Array Find +/// @brief Get the index at which the element is located. +/// @ingroup data +/// @param obj The object. +/// @param tag The tag. +/// @param element The element. +/// @return Returns the index at which the element is located, or ARRAY_INVALID_INDEX. +/// @{ +int NWNX_Data_Array_Find_Flt(object obj, string tag, float element); +int NWNX_Data_Array_Find_Int(object obj, string tag, int element); +int NWNX_Data_Array_Find_Obj(object obj, string tag, object element); +int NWNX_Data_Array_Find_Str(object obj, string tag, string element); +/// @} + +/// @defgroup data_array_insert Array Insert +/// @brief Inserts the element at the index, where size > index >= 0. +/// @ingroup data +/// @param obj The object. +/// @param tag The tag. +/// @param index The index. +/// @param element The element. +/// @{ +void NWNX_Data_Array_Insert_Flt(object obj, string tag, int index, float element); +void NWNX_Data_Array_Insert_Int(object obj, string tag, int index, int element); +void NWNX_Data_Array_Insert_Obj(object obj, string tag, int index, object element); +void NWNX_Data_Array_Insert_Str(object obj, string tag, int index, string element); +/// @} + +/// @defgroup data_array_pushback Array Pushback +/// @brief Pushes an element to the back of the collection. +/// @remark Functionally identical to an insert at index size-1. +/// @ingroup data +/// @param obj The object. +/// @param tag The tag. +/// @param element The element. +/// @{ +void NWNX_Data_Array_PushBack_Flt(object obj, string tag, float element); +void NWNX_Data_Array_PushBack_Int(object obj, string tag, int element); +void NWNX_Data_Array_PushBack_Obj(object obj, string tag, object element); +void NWNX_Data_Array_PushBack_Str(object obj, string tag, string element); +/// @} + +/// Resizes the array. If the array is shrinking, it chops off elements at the ned. +void NWNX_Data_Array_Resize(int type, object obj, string tag, int size); + +/// Reorders the array such each possible permutation of elements has equal probability of appearance. +void NWNX_Data_Array_Shuffle(int type, object obj, string tag); + +/// Returns the size of the array. +int NWNX_Data_Array_Size(int type, object obj, string tag); + +/// Sorts the collection based on descending order. +void NWNX_Data_Array_SortAscending(int type, object obj, string tag); + +/// Sorts the collection based on descending order. +void NWNX_Data_Array_SortDescending(int type, object obj, string tag); + +/// @defgroup data_array_set Array Set +/// @brief Sets the element at the index, where size > index >= 0. +/// @ingroup data +/// @param obj The object. +/// @param tag The tag. +/// @param index The index. +/// @param element The element. +/// @{ +void NWNX_Data_Array_Set_Flt(object obj, string tag, int index, float element); +void NWNX_Data_Array_Set_Int(object obj, string tag, int index, int element); +void NWNX_Data_Array_Set_Obj(object obj, string tag, int index, object element); +void NWNX_Data_Array_Set_Str(object obj, string tag, int index, string element); +/// @} + +/// @} + +//////////////////////////////////////////////////////////////////////////////// +// return the value contained in location "index" +string NWNX_Data_Array_At_Str(object obj, string tag, int index) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + return Array_At_Str(tag, index, obj); +} + +float NWNX_Data_Array_At_Flt(object obj, string tag, int index) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + return Array_At_Flt(tag, index, obj); +} + +int NWNX_Data_Array_At_Int(object obj, string tag, int index) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + return Array_At_Int(tag, index, obj); +} + +object NWNX_Data_Array_At_Obj(object obj, string tag, int index) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + return Array_At_Obj(tag, index, obj); +} + +void NWNX_Data_Array_Clear(int type, object obj, string tag) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_Clear(tag, obj); +} + +//////////////////////////////////////////////////////////////////////////////// +// Return true/value (1/0) if the array contains the value "element" +int NWNX_Data_Array_Contains_Str(object obj, string tag, string element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + return Array_Contains_Str(tag, element, obj); +} + +int NWNX_Data_Array_Contains_Flt(object obj, string tag, float element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + return Array_Contains_Flt(tag, element, obj); +} + +int NWNX_Data_Array_Contains_Int(object obj, string tag, int element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + return Array_Contains_Int(tag, element, obj); +} + +int NWNX_Data_Array_Contains_Obj(object obj, string tag, object element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + return Array_Contains_Obj(tag, element, obj); +} + + +//////////////////////////////////////////////////////////////////////////////// +void NWNX_Data_Array_Copy(int type, object obj, string tag, string otherTag) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_Copy(tag, otherTag, obj); +} + +//////////////////////////////////////////////////////////////////////////////// +void NWNX_Data_Array_Erase(int type, object obj, string tag, int index) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_Erase(tag, index, obj); +} + +//////////////////////////////////////////////////////////////////////////////// +// return the index in the array containing "element" +// if not found, return NWNX_DATA_INVALID_INDEX +int NWNX_Data_Array_Find_Str(object obj, string tag, string element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + return Array_Find_Str(tag, element, obj); +} + +int NWNX_Data_Array_Find_Flt(object obj, string tag, float element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + return Array_Find_Flt(tag, element, obj); +} + +int NWNX_Data_Array_Find_Int(object obj, string tag, int element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + return Array_Find_Int(tag, element, obj); +} + +int NWNX_Data_Array_Find_Obj(object obj, string tag, object element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + return Array_Find_Obj(tag, element, obj); +} + +//////////////////////////////////////////////////////////////////////////////// +// Insert a new element into position 'index'. If index is beyond the number of rows in the array, +// this will quietly fail. This could be changed if you wanted to support sparse +// arrays. +void NWNX_Data_Array_Insert_Str(object obj, string tag, int index, string element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_Insert_Str(tag, index, element, obj); +} + +void NWNX_Data_Array_Insert_Flt(object obj, string tag, int index, float element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_Insert_Flt(tag, index, element, obj); +} + +void NWNX_Data_Array_Insert_Int(object obj, string tag, int index, int element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_Insert_Int(tag, index, element, obj); +} + +void NWNX_Data_Array_Insert_Obj(object obj, string tag, int index, object element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_Insert_Obj(tag, index, element, obj); +} + +//////////////////////////////////////////////////////////////////////////////// +// Insert a new element at the end of the array. +void NWNX_Data_Array_PushBack_Str(object obj, string tag, string element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_PushBack_Str(tag, element, obj); +} + +void NWNX_Data_Array_PushBack_Flt(object obj, string tag, float element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_PushBack_Flt(tag, element, obj); +} + +void NWNX_Data_Array_PushBack_Int(object obj, string tag, int element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_PushBack_Int(tag, element, obj); +} + +void NWNX_Data_Array_PushBack_Obj(object obj, string tag, object element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_PushBack_Obj(tag, element, obj); +} + +//////////////////////////////////////////////////////////////////////////////// +// Cuts the array off at size 'size'. Elements beyond size are removed. +void NWNX_Data_Array_Resize(int type, object obj, string tag, int size) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_Resize(tag, size, obj); +} + +//////////////////////////////////////////////////////////////////////////////// +void NWNX_Data_Array_Shuffle(int type, object obj, string tag) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_Shuffle(tag, obj); +} + +//////////////////////////////////////////////////////////////////////////////// +int NWNX_Data_Array_Size(int type, object obj, string tag) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + return Array_Size(tag, obj); +} + +//////////////////////////////////////////////////////////////////////////////// +// Sort the array by value according to 'direciton' (ASC or DESC) +// Note that this is a lexical sort, so sorting an array of ints or floats will have +// odd results +void NWNX_Data_Array_Sort(object obj, string tag, string direction) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_Sort(tag, direction, TYPE_STRING, obj); +} + +void NWNX_Data_Array_SortAscending(int type, object obj, string tag) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_SortAscending(tag, TYPE_STRING, obj); +} + +void NWNX_Data_Array_SortDescending(int type, object obj, string tag) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_SortDescending(tag, TYPE_STRING, obj); +} + +//////////////////////////////////////////////////////////////////////////////// +// Set the value of array index 'index' to a 'element' +// This will quietly eat values if index > array size +void NWNX_Data_Array_Set_Str(object obj, string tag, int index, string element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_Set_Str(tag, index, element, obj); +} + +void NWNX_Data_Array_Set_Flt(object obj, string tag, int index, float element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_Set_Flt(tag, index, element, obj); +} + +void NWNX_Data_Array_Set_Int(object obj, string tag, int index, int element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_Set_Int(tag, index, element, obj); +} + +void NWNX_Data_Array_Set_Obj(object obj, string tag, int index, object element) +{ + WriteTimestampedLogEntry("WARNING: NWNX_Data is deprecated. You should migrate to Array (see inc_array)"); + Array_Set_Obj(tag, index, element, obj); +} diff --git a/_module/nss/nwnx_deprecated.nss b/_module/nss/nwnx_deprecated.nss new file mode 100644 index 00000000..f3be16cf --- /dev/null +++ b/_module/nss/nwnx_deprecated.nss @@ -0,0 +1,483 @@ +// The following functions have been removed from NWNX, please replace them with their basegame implementation! +// To use this file, include it to nwnx.nss and recompile all your scripts. + +// *** NWNX_Creature + +/// @name Cleric Domains +/// @anchor cleric_domains +/// +/// The clerical domains. +/// @{ +const int NWNX_CREATURE_CLERIC_DOMAIN_AIR = 0; +const int NWNX_CREATURE_CLERIC_DOMAIN_ANIMAL = 1; +const int NWNX_CREATURE_CLERIC_DOMAIN_DEATH = 3; +const int NWNX_CREATURE_CLERIC_DOMAIN_DESTRUCTION = 4; +const int NWNX_CREATURE_CLERIC_DOMAIN_EARTH = 5; +const int NWNX_CREATURE_CLERIC_DOMAIN_EVIL = 6; +const int NWNX_CREATURE_CLERIC_DOMAIN_FIRE = 7; +const int NWNX_CREATURE_CLERIC_DOMAIN_GOOD = 8; +const int NWNX_CREATURE_CLERIC_DOMAIN_HEALING = 9; +const int NWNX_CREATURE_CLERIC_DOMAIN_KNOWLEDGE = 10; +const int NWNX_CREATURE_CLERIC_DOMAIN_MAGIC = 13; +const int NWNX_CREATURE_CLERIC_DOMAIN_PLANT = 14; +const int NWNX_CREATURE_CLERIC_DOMAIN_PROTECTION = 15; +const int NWNX_CREATURE_CLERIC_DOMAIN_STRENGTH = 16; +const int NWNX_CREATURE_CLERIC_DOMAIN_SUN = 17; +const int NWNX_CREATURE_CLERIC_DOMAIN_TRAVEL = 18; +const int NWNX_CREATURE_CLERIC_DOMAIN_TRICKERY = 19; +const int NWNX_CREATURE_CLERIC_DOMAIN_WAR = 20; +const int NWNX_CREATURE_CLERIC_DOMAIN_WATER = 21; +/// @} + +/// @struct NWNX_Creature_MemorisedSpell +/// @brief A memorised spell structure. +struct NWNX_Creature_MemorisedSpell +{ + int id; ///< Spell ID + int ready; ///< Whether the spell can be cast + int meta; ///< Metamagic type, if any + int domain; ///< Clerical domain, if any +}; + +/// @brief Gets the count of memorised spells for a creature's class at a level. +/// @param creature The creature object. +/// @param class The class id from classes.2da. (Not class index 0-2) +/// @param level The spell level. +/// @return The memorised spell count. +int NWNX_Creature_GetMemorisedSpellCountByLevel(object creature, int class, int level); + +/// @brief Gets the memorised spell at a class level's index. +/// @param creature The creature object. +/// @param class The class id from classes.2da. (Not class index 0-2) +/// @param level The spell level. +/// @param index The index. Index bounds: 0 <= index < NWNX_Creature_GetMemorisedSpellCountByLevel(). +/// @return An NWNX_Creature_MemorisedSpell() struct. +struct NWNX_Creature_MemorisedSpell NWNX_Creature_GetMemorisedSpell(object creature, int class, int level, int index); + +/// @brief Sets the memorised spell at a class level's index. +/// @param creature The creature object. +/// @param class The class id from classes.2da. (Not class index 0-2) +/// @param level The spell level. +/// @param index The index. Index bounds: 0 <= index < NWNX_Creature_GetMemorisedSpellCountByLevel(). +/// @param spell An NWNX_Creature_MemorisedSpell() struct. +void NWNX_Creature_SetMemorisedSpell(object creature, int class, int level, int index, struct NWNX_Creature_MemorisedSpell spell); + +/// @brief Gets the known spell count (innate casting) at a class level. +/// @param creature The creature object. +/// @param class The class id from classes.2da. (Not class index 0-2) +/// @param level The spell level. +/// @return The known spell count. +int NWNX_Creature_GetKnownSpellCount(object creature, int class, int level); + +/// @brief Gets the known spell at a class level's index. +/// @param creature The creature object. +/// @param class The class id from classes.2da. (Not class index 0-2) +/// @param level The spell level. +/// @param index The index. Index bounds: 0 <= index < NWNX_Creature_GetKnownSpellCount(). +/// @return The spell id. +int NWNX_Creature_GetKnownSpell(object creature, int class, int level, int index); + +/// @brief Clear a specific spell from the creature's spellbook for class +/// @param creature The creature object. +/// @param class The class id from classes.2da. (Not class index 0-2) +/// @param spellId The spell to clear. +void NWNX_Creature_ClearMemorisedKnownSpells(object creature, int class, int spellId); + +/// @brief Clear the memorised spell of the creature for the class, level and index. +/// @param creature The creature object. +/// @param class The class id from classes.2da. (Not class index 0-2) +/// @param level The spell level. +/// @param index The index. Index bounds: 0 <= index < NWNX_Creature_GetMemorisedSpellCountByLevel(). +void NWNX_Creature_ClearMemorisedSpell(object creature, int class, int level, int index); + +/// @brief Get the soundset index for creature. +/// @param creature The creature object. +/// @return The soundset used by the creature. +int NWNX_Creature_GetSoundset(object creature); + +/// @brief Set the soundset index for creature. +/// @param creature The creature object. +/// @param soundset The soundset index. +void NWNX_Creature_SetSoundset(object creature, int soundset); + +/// @brief Sets the creature gender. +/// @param creature The creature object. +/// @param gender The GENDER_ constant. +void NWNX_Creature_SetGender(object creature, int gender); + +/// @brief Restore all creature spells per day for given level. +/// @param creature The creature object. +/// @param level The level to restore. If -1, all spells are restored. +void NWNX_Creature_RestoreSpells(object creature, int level = -1); + +/// @brief Gets one of creature's domains. +/// @param creature The creature object. +/// @param class The class id from classes.2da. (Not class index 0-2) +/// @param index The first or second domain. +/// @deprecated Use GetDomain(). This will be removed in future NWNX releases. +int NWNX_Creature_GetDomain(object creature, int class, int index); + +/// @brief Gets the creature's specialist school. +/// @param creature The creature object. +/// @param class The class id from classes.2da. (Not class index 0-2) +/// @deprecated Use GetSpecialization(). This will be removed in future NWNX releases. +int NWNX_Creature_GetSpecialization(object creature, int class); + +/// @brief Get the number of uses left of a spell. +/// @note This function is for caster classes that don't need to memorize spells. +/// @param oCreature The creature. +/// @param nSpellID The spell ID. +/// @param nMultiClass The position of the class to check, 0-2 +/// @param nDomainLevel The domain level if checking a domain spell. +/// @param nMetaMagic A METAMAGIC_* constant. +/// @return The number of spell uses left or 0 on error. +int NWNX_Creature_GetSpellUsesLeft(object oCreature, int nSpellID, int nMultiClass, int nDomainLevel = 0, int nMetaMagic = METAMAGIC_NONE); + +/// @brief Get the number of memorized ready spells by spellid. +/// @note This function is for caster classes that need to memorize spells. +/// @param oCreature The creature. +/// @param nSpellID The spell ID. +/// @param nMultiClass The position of the class to check, 0-2 +/// @param nMetaMagic A METAMAGIC_* constant. +/// @return The number of spell uses left or 0 on error. +int NWNX_Creature_GetMemorizedSpellReadyCount(object oCreature, int nSpellID, int nMultiClass, int nMetaMagic = METAMAGIC_NONE); + +/// @brief Set whether an effect icon is flashing or not. +/// @param oCreature The target creature. +/// @param nIconId The icon id, see effecticons.2da. +/// @param bFlashing TRUE for flashing, FALSE for not flashing. +void NWNX_Creature_SetEffectIconFlashing(object oCreature, int nIconId, int bFlashing); + +int NWNX_Creature_GetMemorisedSpellCountByLevel(object creature, int class, int level) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Creature_GetMemorisedSpellCountByLevel"); + return GetMemorizedSpellCountByLevel(creature, class, level); +} + +struct NWNX_Creature_MemorisedSpell NWNX_Creature_GetMemorisedSpell(object creature, int class, int level, int index) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Creature_GetMemorisedSpell"); + struct NWNX_Creature_MemorisedSpell spell; + spell.domain = GetMemorizedSpellIsDomainSpell(creature, class, level, index); + spell.meta = GetMemorizedSpellMetaMagic(creature, class, level, index); + spell.ready = GetMemorizedSpellReady(creature, class, level, index); + spell.id = GetMemorizedSpellId(creature, class, level, index); + return spell; +} + +void NWNX_Creature_SetMemorisedSpell(object creature, int class, int level, int index, struct NWNX_Creature_MemorisedSpell spell) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Creature_SetMemorisedSpell"); + SetMemorizedSpell(creature, class, level, index, spell.id, spell.ready, spell.meta, spell.domain); +} + +int NWNX_Creature_GetKnownSpellCount(object creature, int class, int level) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Creature_GetKnownSpellCount"); + return GetKnownSpellCount(creature, class, level); +} + +int NWNX_Creature_GetKnownSpell(object creature, int class, int level, int index) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Creature_GetKnownSpell"); + return GetKnownSpellId(creature, class, level, index); +} + +void NWNX_Creature_ClearMemorisedKnownSpells(object creature, int class, int spellId) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Creature_ClearMemorisedKnownSpells"); + ClearMemorizedSpellBySpellId(creature, class, spellId); +} + +void NWNX_Creature_ClearMemorisedSpell(object creature, int class, int level, int index) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Creature_ClearMemorisedSpell"); + ClearMemorizedSpell(creature, class, level, index); +} + +int NWNX_Creature_GetSoundset(object creature) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Creature_GetSoundset"); + return GetSoundset(creature); +} + +void NWNX_Creature_SetSoundset(object creature, int soundset) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Creature_SetSoundset"); + SetSoundset(creature, soundset); +} + +void NWNX_Creature_SetGender(object creature, int gender) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Creature_SetGender"); + SetGender(creature, gender); +} + +void NWNX_Creature_RestoreSpells(object creature, int level = -1) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Creature_RestoreSpells"); + if (level == -1) + { + int i; + for (i = 0; i < 10; i++) + { + ReadySpellLevel(creature, i); + } + } + else + ReadySpellLevel(creature, level); + +} + +int NWNX_Creature_GetDomain(object creature, int class, int index) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Creature_GetDomain"); + return GetDomain(creature, index, class); +} + +int NWNX_Creature_GetSpecialization(object creature, int class) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Creature_GetSpecialization"); + return GetSpecialization(creature, class); +} + +int NWNX_Creature_GetSpellUsesLeft(object oCreature, int nSpellID, int nMultiClass, int nDomainLevel = 0, int nMetaMagic = METAMAGIC_NONE) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Creature_GetSpellUsesLeft"); + return GetSpellUsesLeft(oCreature, GetClassByPosition(nMultiClass + 1), nSpellID, nMetaMagic, nDomainLevel); +} + +int NWNX_Creature_GetMemorizedSpellReadyCount(object oCreature, int nSpellID, int nMultiClass, int nMetaMagic = METAMAGIC_NONE) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Creature_GetMemorizedSpellReadyCount"); + return GetSpellUsesLeft(oCreature, GetClassByPosition(nMultiClass + 1), nSpellID, nMetaMagic); +} + +void NWNX_Creature_SetEffectIconFlashing(object oCreature, int nIconId, int bFlashing) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Creature_SetEffectIconFlashing"); + SetEffectIconFlashing(oCreature, nIconId, bFlashing); +} + +// *** NWNX_Effect + +/// @brief Set a script with optional data that runs when an effect expires +/// @param e The effect. +/// @param script The script to run when the effect expires. +/// @param data Any other data you wish to send back to the script. +/// @remark OBJECT_SELF in the script is the object the effect is applied to. +/// @note Only works for TEMPORARY and PERMANENT effects applied to an object. +effect NWNX_Effect_SetEffectExpiredScript(effect e, string script, string data = ""); + +/// @brief Get the data set with NWNX_Effect_SetEffectExpiredScript() +/// @note Should only be called from a script set with NWNX_Effect_SetEffectExpiredScript(). +/// @return The data attached to the effect. +string NWNX_Effect_GetEffectExpiredData(); + +/// @brief Get the effect creator. +/// @note Should only be called from a script set with NWNX_Effect_SetEffectExpiredScript(). +/// @return The object from which the effect originated. +object NWNX_Effect_GetEffectExpiredCreator(); + +/// @brief Accessorize an EffectVisualEffect(), making it undispellable and unable to be removed by resting or death. +/// @note If linked with a non-visualeffect or a non-accessorized visualeffect it *will* get removed. +/// @param eEffect An EffectVisualEffect(), does not work for other effect types. +/// @return The accessorized effect or an unchanged effect if not an EffectVisualEffect(). +effect NWNX_Effect_AccessorizeVisualEffect(effect eEffect); + +effect NWNX_Effect_SetEffectExpiredScript(effect e, string script, string data = "") +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Effect_SetEffectExpiredScript"); + return EffectLinkEffects(EffectRunScript("", script, "", 0.0f, data), e); +} + +string NWNX_Effect_GetEffectExpiredData() +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Effect_GetEffectExpiredData"); + return GetEffectString(GetLastRunScriptEffect(), 0); +} + +object NWNX_Effect_GetEffectExpiredCreator() +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Effect_GetEffectExpiredCreator"); + return GetEffectCreator(GetLastRunScriptEffect()); +} + +effect NWNX_Effect_AccessorizeVisualEffect(effect eEffect) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Effect_AccessorizeVisualEffect"); + if (GetEffectType(eEffect) == EFFECT_TYPE_VISUALEFFECT) + return UnyieldingEffect(eEffect); + else + return eEffect; +} + +// *** NWNX_Object + +/// @brief Convert an object id to the actual object. +/// @param id The object id. +/// @return An object from the provided object ID. +/// @remark This is the counterpart to ObjectToString. +/// @deprecated Use the basegame StringToObject() function. This will be removed in a future NWNX release. +object NWNX_Object_StringToObject(string id); + +/// @brief Check if an item can fit in an object's inventory. +/// @param obj The object with an inventory. +/// @param baseitem The base item id to check for a fit. +/// @return TRUE if an item of base item type can fit in object's inventory +int NWNX_Object_CheckFit(object obj, int baseitem); + +/// @brief Add an effect to an object that displays an icon and has no other effect. +/// @remark See effecticons.2da for a list of possible effect icons. +/// @param obj The object to apply the effect. +/// @param nIcon The icon id. +/// @param fDuration If specified the effect will be temporary and last this length in seconds, otherwise the effect +/// will be permanent. +void NWNX_Object_AddIconEffect(object obj, int nIcon, float fDuration=0.0); + +/// @brief Remove an icon effect from an object that was added by the NWNX_Object_AddIconEffect() function. +/// @param obj The object. +/// @param nIcon The icon id. +void NWNX_Object_RemoveIconEffect(object obj, int nIcon); + +/// @brief Cause oObject to face fDirection. +/// @note This function is almost identical to SetFacing(), the only difference being that it allows you to specify +/// the target object without the use of AssignCommand(). This is useful when you want to change the facing of an object +/// in an ExecuteScriptChunk() call where AssignCommand() does not work. +/// @param oObject The object to change its facing of +/// @param fDirection The direction the object should face +void NWNX_Object_SetFacing(object oObject, float fDirection); + +object NWNX_Object_StringToObject(string id) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Object_StringToObject"); + return StringToObject(id); +} + +int NWNX_Object_CheckFit(object obj, int baseitem) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Object_CheckFit"); + return GetBaseItemFitsInInventory(baseitem, obj); +} + +void NWNX_Object_AddIconEffect(object obj, int nIcon, float fDuration=0.0) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Object_AddIconEffect"); + effect eEffect = GetFirstEffect(obj); + while (GetIsEffectValid(eEffect)) + { + if (GetEffectTag(eEffect) == "NWNX_Object_IconEffect" && GetEffectInteger(eEffect, 0) == nIcon) + RemoveEffect(obj, eEffect); + eEffect = GetNextEffect(obj); + } + + effect eIcon = TagEffect(SupernaturalEffect(EffectIcon(nIcon)), "NWNX_Object_IconEffect"); + ApplyEffectToObject(fDuration == 0.0 ? DURATION_TYPE_PERMANENT : DURATION_TYPE_TEMPORARY, eIcon, obj, fDuration); +} + +void NWNX_Object_RemoveIconEffect(object obj, int nIcon) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Object_RemoveIconEffect"); + effect eEffect = GetFirstEffect(obj); + while (GetIsEffectValid(eEffect)) + { + if (GetEffectTag(eEffect) == "NWNX_Object_IconEffect" && GetEffectInteger(eEffect, 0) == nIcon) + RemoveEffect(obj, eEffect); + eEffect = GetNextEffect(obj); + } +} + +void NWNX_Object_SetFacing(object oObject, float fDirection) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Object_SetFacing"); + AssignCommand(oObject, SetFacing(fDirection)); +} + +// *** NWNX_Regex + +/// @param str The string to search. +/// @param regex The regular expression to use when searching. +/// @return TRUE if string matches the regular expression. +int NWNX_Regex_Search(string str, string regex); + +/// @brief Replaces any matches of the regular expression with a string. +/// @param str The string to search. +/// @param regex The regular expression to use when searching. +/// @param replace The string to replace the matches with. +/// @param firstOnly Set to TRUE to only replace the first match. +/// @return A new string with any replacements made. +string NWNX_Regex_Replace(string str, string regex, string replace = "", int firstOnly = FALSE); + +/// @brief Returns all matches in a string that match the regular expression. +/// @param str The string to search. +/// @param regex The regular expression to use. +/// @return A json array with json arrays of all (sub)matches. Returns JsonNull() on error. +json NWNX_Regex_Match(string str, string regex); + +int NWNX_Regex_Search(string str, string regex) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Regex_Search"); + return JsonGetLength(RegExpMatch(regex, str)); +} + +string NWNX_Regex_Replace(string str, string regex, string replace="", int firstOnly=0) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Regex_Replace"); + return RegExpReplace(regex, str, replace, firstOnly ? REGEXP_FORMAT_FIRST_ONLY : REGEXP_FORMAT_DEFAULT); +} + +json NWNX_Regex_Match(string str, string regex) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Regex_Match"); + return RegExpIterate(regex, str); +} + +// *** NWNX_Util + +/// @brief Determines if the supplied resref exists. +/// @param resref The resref to check. +/// @param type The @ref resref_types "Resref Type". +/// @return TRUE/FALSE +int NWNX_Util_IsValidResRef(string resref, int type = RESTYPE_UTC); + +/// @anchor twoda_row_count +/// @brief Gets the row count for a 2da. +/// @param str The 2da to check (do not include the .2da). +/// @return The amount of rows in the 2da. +int NWNX_Util_Get2DARowCount(string str); + +/// @brief Gets the contents of a .nss script file as a string. +/// @param sScriptName The name of the script to get the contents of. +/// @param nMaxLength The max length of the return string, -1 to get everything +/// @return The script file contents or "" on error. +string NWNX_Util_GetNSSContents(string sScriptName, int nMaxLength = -1); + +/// @brief Get the ticks per second of the server. +/// @remark Useful to dynamically detect lag and adjust behavior accordingly. +/// @return The ticks per second. +int NWNX_Util_GetServerTicksPerSecond(); + +int NWNX_Util_IsValidResRef(string resref, int type = RESTYPE_UTC) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Util_IsValidResRef"); + return ResManGetAliasFor(resref, type) != ""; +} + +int NWNX_Util_Get2DARowCount(string str) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Util_Get2DARowCount"); + return Get2DARowCount(str); +} + +string NWNX_Util_GetNSSContents(string sScriptName, int nMaxLength = -1) +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Util_GetNSSContents"); + string s = ResManGetFileContents(sScriptName, RESTYPE_NSS); + return nMaxLength == -1 ? s : GetStringLeft(s, nMaxLength); +} + +int NWNX_Util_GetServerTicksPerSecond() +{ + WriteTimestampedLogEntry("WARNING: Calling deprecated NWNX Function: NWNX_Util_GetServerTicksPerSecond"); + return GetTickRate(); +} diff --git a/_module/nss/nwnx_dialog.nss b/_module/nss/nwnx_dialog.nss index 744943b5..83c5efb6 100644 --- a/_module/nss/nwnx_dialog.nss +++ b/_module/nss/nwnx_dialog.nss @@ -83,7 +83,7 @@ int NWNX_Dialog_GetCurrentNodeType() string sFunc = "GetCurrentNodeType"; NWNX_CallFunction(NWNX_Dialog, sFunc); - return NWNX_GetReturnValueInt(NWNX_Dialog, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Dialog_GetCurrentScriptType() @@ -91,7 +91,7 @@ int NWNX_Dialog_GetCurrentScriptType() string sFunc = "GetCurrentScriptType"; NWNX_CallFunction(NWNX_Dialog, sFunc); - return NWNX_GetReturnValueInt(NWNX_Dialog, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Dialog_GetCurrentNodeID() @@ -99,7 +99,7 @@ int NWNX_Dialog_GetCurrentNodeID() string sFunc = "GetCurrentNodeID"; NWNX_CallFunction(NWNX_Dialog, sFunc); - return NWNX_GetReturnValueInt(NWNX_Dialog, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Dialog_GetCurrentNodeIndex() @@ -107,26 +107,26 @@ int NWNX_Dialog_GetCurrentNodeIndex() string sFunc = "GetCurrentNodeIndex"; NWNX_CallFunction(NWNX_Dialog, sFunc); - return NWNX_GetReturnValueInt(NWNX_Dialog, sFunc); + return NWNX_GetReturnValueInt(); } string NWNX_Dialog_GetCurrentNodeText(int language=NWNX_DIALOG_LANGUAGE_ENGLISH, int gender=GENDER_MALE) { string sFunc = "GetCurrentNodeText"; - NWNX_PushArgumentInt(NWNX_Dialog, sFunc, gender); - NWNX_PushArgumentInt(NWNX_Dialog, sFunc, language); + NWNX_PushArgumentInt(gender); + NWNX_PushArgumentInt(language); NWNX_CallFunction(NWNX_Dialog, sFunc); - return NWNX_GetReturnValueString(NWNX_Dialog, sFunc); + return NWNX_GetReturnValueString(); } void NWNX_Dialog_SetCurrentNodeText(string text, int language=NWNX_DIALOG_LANGUAGE_ENGLISH, int gender=GENDER_MALE) { string sFunc = "SetCurrentNodeText"; - NWNX_PushArgumentInt(NWNX_Dialog, sFunc, gender); - NWNX_PushArgumentInt(NWNX_Dialog, sFunc, language); - NWNX_PushArgumentString(NWNX_Dialog, sFunc, text); + NWNX_PushArgumentInt(gender); + NWNX_PushArgumentInt(language); + NWNX_PushArgumentString(text); NWNX_CallFunction(NWNX_Dialog, sFunc); } @@ -134,6 +134,6 @@ void NWNX_Dialog_End(object oObject) { string sFunc = "End"; - NWNX_PushArgumentObject(NWNX_Dialog, sFunc, oObject); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Dialog, sFunc); } diff --git a/_module/nss/nwnx_effect.nss b/_module/nss/nwnx_effect.nss index fdc61035..ffb619ba 100644 --- a/_module/nss/nwnx_effect.nss +++ b/_module/nss/nwnx_effect.nss @@ -6,9 +6,24 @@ const string NWNX_Effect = "NWNX_Effect"; ///< @private +/// EQUIPPED effects are always associated with a slotted item: +/// Setting this duration type requires the effect creator +/// to be set to the (already equipped) item that should remove +/// this effect when unequipped. +/// Removal behaviour for effects where the creator is NOT a equipped +/// item is undefined. +/// They are not removed by resting, cannot be dispelled, etc. +const int DURATION_TYPE_EQUIPPED = 3; + +/// These are feat/racial effects used internally by the game to +/// implement things like movement speed changes and darkvision. +/// They cannot be removed by resting, dispelling, etc. +const int DURATION_TYPE_INNATE = 4; + /// An unpacked effect struct NWNX_EffectUnpacked { + string sID; ///< @todo Describe int nType; ///< @todo Describe int nSubType; ///< @todo Describe @@ -54,6 +69,8 @@ struct NWNX_EffectUnpacked vector vParam1; ///< @todo Describe string sTag; ///< @todo Describe + + string sItemProp; ///< @todo Describe }; /// @brief Convert native effect type to unpacked structure. @@ -66,194 +83,320 @@ struct NWNX_EffectUnpacked NWNX_Effect_UnpackEffect(effect e); /// @return The effect. effect NWNX_Effect_PackEffect(struct NWNX_EffectUnpacked e); -/// @brief Set a script with optional data that runs when an effect expires -/// @param e The effect. -/// @param script The script to run when the effect expires. -/// @param data Any other data you wish to send back to the script. -/// @remark OBJECT_SELF in the script is the object the effect is applied to. -/// @note Only works for TEMPORARY and PERMANENT effects applied to an object. -effect NWNX_Effect_SetEffectExpiredScript(effect e, string script, string data = ""); - -/// @brief Get the data set with NWNX_Effect_SetEffectExpiredScript() -/// @note Should only be called from a script set with NWNX_Effect_SetEffectExpiredScript(). -/// @return The data attached to the effect. -string NWNX_Effect_GetEffectExpiredData(); - -/// @brief Get the effect creator. -/// @note Should only be called from a script set with NWNX_Effect_SetEffectExpiredScript(). -/// @return The object from which the effect originated. -object NWNX_Effect_GetEffectExpiredCreator(); - /// @brief replace an already applied effect on an object /// Only duration, subtype, tag and spell related fields can be overwritten. /// @note eNew and eOld need to have the same type. /// @return Number of internal effects updated. int NWNX_Effect_ReplaceEffect(object obj, effect eOld, effect eNew); +/// @brief Gets the true effect count +/// @param oObject The object to get the count of. +/// @return the number of effects (item properties and other non-exposed effects included) +int NWNX_Effect_GetTrueEffectCount(object oObject); + +/// @brief Gets a specific effect on an object. This can grab effects normally hidden from developers, such as item properties. +/// @param oObject The object with the effect +/// @param nIndex The point in the array to retrieve (0 to GetTrueEffectCount()) +/// @return A constructed NWNX_EffectUnpacked. +struct NWNX_EffectUnpacked NWNX_Effect_GetTrueEffect(object oObject, int nIndex); + +/// @brief Replaces an already applied effect with another. +/// @param oObject The object with the effect to replace +/// @param nIndex The array element to be replaced +/// @param e The unpacked effect to replace it with. +/// @note Cannot replace an effect with a different type or ID. +void NWNX_Effect_ReplaceEffectByIndex(object oObject, int nIndex, struct NWNX_EffectUnpacked e); + +/// @brief Removes effect by ID +/// @param oObject The object to remove the effect from +/// @param sID The id of the effect, can be retrieved by unpacking effects. +/// @return FALSE/0 on failure TRUE/1 on success. +int NWNX_Effect_RemoveEffectById(object oObject, string sID); + +/// @brief Applys an effect, bypassing any processing done by ApplyEffectToObject +/// @param eEffect The effect to be applied. +/// @param oObject The object to apply it to. +void NWNX_Effect_Apply(effect eEffect, object oObject); + +/// @brief Sets an effect creator. +/// @param eEffect The effect to be modified. +/// @param oObject The effect creator. +/// @return The effect with creator field set. +effect NWNX_Effect_SetEffectCreator(effect eEffect, object oObject); + +/// @brief Checks if the given effect is valid. Unlike the game builtin, this call considers internal types too. +/// @param eEffect The effect to check +/// @return TRUE if the effect is valid (including internal types). +int NWNX_Effect_GetIsEffectValid(effect eEffect); + +/// @brief Returns the number of applied effects on the given object. +/// @param oObject The object to get the applied effect count for. +/// @return The number of applied effects, including internal. +int NWNX_Effect_GetAppliedEffectCount(object oObject); + +/// @brief Returns the nNth applied effect on a object. +/// @param oObject The object to get the applied effect copy for. +/// @param nNth The effect index to get. +/// @note Make sure to check with NWNX_Effect_GetIsEffectValid, as this iterator also includes internal effects. +/// @return A copy of the applied game effect, or a invalid effect. +effect NWNX_Effect_GetAppliedEffect(object oObject, int nNth); + /// @} +struct NWNX_EffectUnpacked __NWNX_Effect_ResolveUnpack(string sFunc, int bLink=TRUE) +{ + struct NWNX_EffectUnpacked n; + + n.sItemProp = NWNX_GetReturnValueString(); + + n.sTag = NWNX_GetReturnValueString(); + + 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(); + + if(bLink) + { + n.bLinkRightValid = NWNX_GetReturnValueInt(); + n.eLinkRight = NWNX_GetReturnValueEffect(); + n.bLinkLeftValid = NWNX_GetReturnValueInt(); + n.eLinkLeft = NWNX_GetReturnValueEffect(); + } + else + { + n.bLinkRightValid = FALSE; + n.bLinkLeftValid = FALSE; + } + + n.nCasterLevel = NWNX_GetReturnValueInt(); + n.bShowIcon = NWNX_GetReturnValueInt(); + n.bExpose = NWNX_GetReturnValueInt(); + n.nSpellId = NWNX_GetReturnValueInt(); + n.oCreator = NWNX_GetReturnValueObject(); + + n.nExpiryTimeOfDay = NWNX_GetReturnValueInt(); + n.nExpiryCalendarDay = NWNX_GetReturnValueInt(); + n.fDuration = NWNX_GetReturnValueFloat(); + + n.nSubType = NWNX_GetReturnValueInt(); + n.nType = NWNX_GetReturnValueInt(); + n.sID = NWNX_GetReturnValueString(); + + return n; +} + +void __NWNX_Effect_ResolvePack(string sFunc, struct NWNX_EffectUnpacked e, int bReplace=FALSE) +{ + if(!bReplace) + NWNX_PushArgumentInt(e.nType); + + NWNX_PushArgumentInt(e.nSubType); + + NWNX_PushArgumentFloat(e.fDuration); + NWNX_PushArgumentInt(e.nExpiryCalendarDay); + NWNX_PushArgumentInt(e.nExpiryTimeOfDay); + + NWNX_PushArgumentObject(e.oCreator); + NWNX_PushArgumentInt(e.nSpellId); + NWNX_PushArgumentInt(e.bExpose); + NWNX_PushArgumentInt(e.bShowIcon); + NWNX_PushArgumentInt(e.nCasterLevel); + + if(!bReplace) + { + NWNX_PushArgumentEffect(e.eLinkLeft); + NWNX_PushArgumentInt(e.bLinkLeftValid); + NWNX_PushArgumentEffect(e.eLinkRight); + NWNX_PushArgumentInt(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); + + NWNX_PushArgumentFloat(e.vParam0.x); + NWNX_PushArgumentFloat(e.vParam0.y); + NWNX_PushArgumentFloat(e.vParam0.z); + + NWNX_PushArgumentFloat(e.vParam1.x); + NWNX_PushArgumentFloat(e.vParam1.y); + NWNX_PushArgumentFloat(e.vParam1.z); + + NWNX_PushArgumentString(e.sTag); + + NWNX_PushArgumentString(e.sItemProp); +} + struct NWNX_EffectUnpacked NWNX_Effect_UnpackEffect(effect e) { string sFunc = "UnpackEffect"; - NWNX_PushArgumentEffect(NWNX_Effect, sFunc, e); + NWNX_PushArgumentEffect(e); NWNX_CallFunction(NWNX_Effect, sFunc); - struct NWNX_EffectUnpacked n; - n.sTag = NWNX_GetReturnValueString(NWNX_Effect, sFunc); - - float fZ = NWNX_GetReturnValueFloat(NWNX_Effect, sFunc); - float fY = NWNX_GetReturnValueFloat(NWNX_Effect, sFunc); - float fX = NWNX_GetReturnValueFloat(NWNX_Effect, sFunc); - n.vParam1 = Vector(fX, fY, fZ); - fZ = NWNX_GetReturnValueFloat(NWNX_Effect, sFunc); - fY = NWNX_GetReturnValueFloat(NWNX_Effect, sFunc); - fX = NWNX_GetReturnValueFloat(NWNX_Effect, sFunc); - n.vParam0 = Vector(fX, fY, fZ); - n.oParam3 = NWNX_GetReturnValueObject(NWNX_Effect, sFunc); - n.oParam2 = NWNX_GetReturnValueObject(NWNX_Effect, sFunc); - n.oParam1 = NWNX_GetReturnValueObject(NWNX_Effect, sFunc); - n.oParam0 = NWNX_GetReturnValueObject(NWNX_Effect, sFunc); - n.sParam5 = NWNX_GetReturnValueString(NWNX_Effect, sFunc); - n.sParam4 = NWNX_GetReturnValueString(NWNX_Effect, sFunc); - n.sParam3 = NWNX_GetReturnValueString(NWNX_Effect, sFunc); - n.sParam2 = NWNX_GetReturnValueString(NWNX_Effect, sFunc); - n.sParam1 = NWNX_GetReturnValueString(NWNX_Effect, sFunc); - n.sParam0 = NWNX_GetReturnValueString(NWNX_Effect, sFunc); - n.fParam3 = NWNX_GetReturnValueFloat(NWNX_Effect, sFunc); - n.fParam2 = NWNX_GetReturnValueFloat(NWNX_Effect, sFunc); - n.fParam1 = NWNX_GetReturnValueFloat(NWNX_Effect, sFunc); - n.fParam0 = NWNX_GetReturnValueFloat(NWNX_Effect, sFunc); - n.nParam7 = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.nParam6 = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.nParam5 = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.nParam4 = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.nParam3 = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.nParam2 = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.nParam1 = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.nParam0 = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.nNumIntegers = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - - n.bLinkRightValid = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.eLinkRight = NWNX_GetReturnValueEffect(NWNX_Effect, sFunc); - n.bLinkLeftValid = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.eLinkLeft = NWNX_GetReturnValueEffect(NWNX_Effect, sFunc); - - n.nCasterLevel = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.bShowIcon = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.bExpose = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.nSpellId = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.oCreator = NWNX_GetReturnValueObject(NWNX_Effect, sFunc); - - n.nExpiryTimeOfDay = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.nExpiryCalendarDay = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.fDuration = NWNX_GetReturnValueFloat(NWNX_Effect, sFunc); - - n.nSubType = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - n.nType = NWNX_GetReturnValueInt(NWNX_Effect, sFunc); - - return n; + return __NWNX_Effect_ResolveUnpack(sFunc); } effect NWNX_Effect_PackEffect(struct NWNX_EffectUnpacked e) { string sFunc = "PackEffect"; - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.nType); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.nSubType); - - NWNX_PushArgumentFloat(NWNX_Effect, sFunc, e.fDuration); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.nExpiryCalendarDay); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.nExpiryTimeOfDay); - - NWNX_PushArgumentObject(NWNX_Effect, sFunc, e.oCreator); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.nSpellId); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.bExpose); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.bShowIcon); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.nCasterLevel); - - NWNX_PushArgumentEffect(NWNX_Effect, sFunc, e.eLinkLeft); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.bLinkLeftValid); - NWNX_PushArgumentEffect(NWNX_Effect, sFunc, e.eLinkRight); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.bLinkRightValid); - - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.nNumIntegers); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.nParam0); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.nParam1); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.nParam2); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.nParam3); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.nParam4); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.nParam5); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.nParam6); - NWNX_PushArgumentInt(NWNX_Effect, sFunc, e.nParam7); - NWNX_PushArgumentFloat(NWNX_Effect, sFunc, e.fParam0); - NWNX_PushArgumentFloat(NWNX_Effect, sFunc, e.fParam1); - NWNX_PushArgumentFloat(NWNX_Effect, sFunc, e.fParam2); - NWNX_PushArgumentFloat(NWNX_Effect, sFunc, e.fParam3); - NWNX_PushArgumentString(NWNX_Effect, sFunc, e.sParam0); - NWNX_PushArgumentString(NWNX_Effect, sFunc, e.sParam1); - NWNX_PushArgumentString(NWNX_Effect, sFunc, e.sParam2); - NWNX_PushArgumentString(NWNX_Effect, sFunc, e.sParam3); - NWNX_PushArgumentString(NWNX_Effect, sFunc, e.sParam4); - NWNX_PushArgumentString(NWNX_Effect, sFunc, e.sParam5); - NWNX_PushArgumentObject(NWNX_Effect, sFunc, e.oParam0); - NWNX_PushArgumentObject(NWNX_Effect, sFunc, e.oParam1); - NWNX_PushArgumentObject(NWNX_Effect, sFunc, e.oParam2); - NWNX_PushArgumentObject(NWNX_Effect, sFunc, e.oParam3); - - NWNX_PushArgumentFloat(NWNX_Effect, sFunc, e.vParam0.x); - NWNX_PushArgumentFloat(NWNX_Effect, sFunc, e.vParam0.y); - NWNX_PushArgumentFloat(NWNX_Effect, sFunc, e.vParam0.z); - - NWNX_PushArgumentFloat(NWNX_Effect, sFunc, e.vParam1.x); - NWNX_PushArgumentFloat(NWNX_Effect, sFunc, e.vParam1.y); - NWNX_PushArgumentFloat(NWNX_Effect, sFunc, e.vParam1.z); - - NWNX_PushArgumentString(NWNX_Effect, sFunc, e.sTag); + __NWNX_Effect_ResolvePack(sFunc, e); NWNX_CallFunction(NWNX_Effect, sFunc); - return NWNX_GetReturnValueEffect(NWNX_Effect, sFunc); -} - -effect NWNX_Effect_SetEffectExpiredScript(effect e, string script, string data = "") -{ - string sFunc = "SetEffectExpiredScript"; - - NWNX_PushArgumentString(NWNX_Effect, sFunc, data); - NWNX_PushArgumentString(NWNX_Effect, sFunc, script); - NWNX_PushArgumentEffect(NWNX_Effect, sFunc, e); - - NWNX_CallFunction(NWNX_Effect, sFunc); - - return NWNX_GetReturnValueEffect(NWNX_Effect, sFunc); -} - -string NWNX_Effect_GetEffectExpiredData() -{ - string sFunc = "GetEffectExpiredData"; - - NWNX_CallFunction(NWNX_Effect, sFunc); - - return NWNX_GetReturnValueString(NWNX_Effect, sFunc); -} - -object NWNX_Effect_GetEffectExpiredCreator() -{ - string sFunc = "GetEffectExpiredCreator"; - - NWNX_CallFunction(NWNX_Effect, sFunc); - - return NWNX_GetReturnValueObject(NWNX_Effect, sFunc); + return NWNX_GetReturnValueEffect(); } int NWNX_Effect_ReplaceEffect(object obj, effect eOld, effect eNew) { string sFunc = "ReplaceEffect"; - NWNX_PushArgumentEffect(NWNX_Effect, sFunc, eNew); - NWNX_PushArgumentEffect(NWNX_Effect, sFunc, eOld); - NWNX_PushArgumentObject(NWNX_Effect, sFunc, obj); + NWNX_PushArgumentEffect(eNew); + NWNX_PushArgumentEffect(eOld); + NWNX_PushArgumentObject(obj); NWNX_CallFunction(NWNX_Effect, sFunc); - return NWNX_GetReturnValueInt(NWNX_Effect, sFunc); + return NWNX_GetReturnValueInt(); +} + +int NWNX_Effect_GetTrueEffectCount(object oObject) +{ + string sFunc = "GetTrueEffectCount"; + NWNX_PushArgumentObject(oObject); + NWNX_CallFunction(NWNX_Effect, sFunc); + + return NWNX_GetReturnValueInt(); +} + +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); +} + +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); +} + +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(); +} + +void NWNX_Effect_Apply(effect eEffect, object oObject) +{ + string sFunc = "Apply"; + NWNX_PushArgumentObject(oObject); + NWNX_PushArgumentEffect(eEffect); + NWNX_CallFunction(NWNX_Effect, sFunc); +} + +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(); +} + +int NWNX_Effect_GetIsEffectValid(effect eEffect) +{ + string sFunc = "GetIsEffectValid"; + + NWNX_PushArgumentEffect(eEffect); + + NWNX_CallFunction(NWNX_Effect, sFunc); + + return NWNX_GetReturnValueInt(); +} + +int NWNX_Effect_GetAppliedEffectCount(object oObject) +{ + string sFunc = "GetAppliedEffectCount"; + + NWNX_PushArgumentObject(oObject); + + NWNX_CallFunction(NWNX_Effect, sFunc); + + return NWNX_GetReturnValueInt(); +} + +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(); } diff --git a/_module/nss/nwnx_elc.nss b/_module/nss/nwnx_elc.nss index 05049633..362bac2e 100644 --- a/_module/nss/nwnx_elc.nss +++ b/_module/nss/nwnx_elc.nss @@ -21,11 +21,8 @@ const int NWNX_ELC_VALIDATION_FAILURE_TYPE_CUSTOM = 6; /// @anchor elc_fail_subtype /// @name ELC Failure Subtypes -/// @note By default these constants are commented out to avoid a -/// limitation on constants. Uncomment them as needed. /// @{ const int NWNX_ELC_SUBTYPE_NONE = 0; -/* const int NWNX_ELC_SUBTYPE_SERVER_LEVEL_RESTRICTION = 1; const int NWNX_ELC_SUBTYPE_LEVEL_HACK = 2; const int NWNX_ELC_SUBTYPE_COLORED_NAME = 3; @@ -75,7 +72,7 @@ const int NWNX_ELC_SUBTYPE_SKILL_LIST_COMPARISON = 48; const int NWNX_ELC_SUBTYPE_FEAT_LIST_COMPARISON = 49; const int NWNX_ELC_SUBTYPE_MISC_SAVING_THROW = 50; const int NWNX_ELC_SUBTYPE_NUM_FEAT_COMPARISON = 51; - */ +const int NWNX_ELC_SUBTYPE_NUM_MULTICLASS = 52; /// @} /// @brief Sets the script that runs whenever an ELC validation failure happens @@ -152,7 +149,7 @@ void NWNX_ELC_SetELCScript(string sScript) { string sFunc = "SetELCScript"; - NWNX_PushArgumentString(NWNX_ELC, sFunc, sScript); + NWNX_PushArgumentString(sScript); NWNX_CallFunction(NWNX_ELC, sFunc); } @@ -160,7 +157,7 @@ void NWNX_ELC_EnableCustomELCCheck(int bEnabled) { string sFunc = "EnableCustomELCCheck"; - NWNX_PushArgumentInt(NWNX_ELC, sFunc, bEnabled); + NWNX_PushArgumentInt(bEnabled); NWNX_CallFunction(NWNX_ELC, sFunc); } @@ -176,7 +173,7 @@ int NWNX_ELC_GetValidationFailureType() string sFunc = "GetValidationFailureType"; NWNX_CallFunction(NWNX_ELC, sFunc); - return NWNX_GetReturnValueInt(NWNX_ELC, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_ELC_GetValidationFailureSubType() @@ -184,7 +181,7 @@ int NWNX_ELC_GetValidationFailureSubType() string sFunc = "GetValidationFailureSubType"; NWNX_CallFunction(NWNX_ELC, sFunc); - return NWNX_GetReturnValueInt(NWNX_ELC, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_ELC_GetValidationFailureMessageStrRef() @@ -192,14 +189,14 @@ int NWNX_ELC_GetValidationFailureMessageStrRef() string sFunc = "GetValidationFailureMessageStrRef"; NWNX_CallFunction(NWNX_ELC, sFunc); - return NWNX_GetReturnValueInt(NWNX_ELC, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_ELC_SetValidationFailureMessageStrRef(int nStrRef) { string sFunc = "SetValidationFailureMessageStrRef"; - NWNX_PushArgumentInt(NWNX_ELC, sFunc, nStrRef); + NWNX_PushArgumentInt(nStrRef); NWNX_CallFunction(NWNX_ELC, sFunc); } @@ -208,7 +205,7 @@ object NWNX_ELC_GetValidationFailureItem() string sFunc = "GetValidationFailureItem"; NWNX_CallFunction(NWNX_ELC, sFunc); - return NWNX_GetReturnValueObject(NWNX_ELC, sFunc); + return NWNX_GetReturnValueObject(); } int NWNX_ELC_GetValidationFailureLevel() @@ -216,7 +213,7 @@ int NWNX_ELC_GetValidationFailureLevel() string sFunc = "GetValidationFailureLevel"; NWNX_CallFunction(NWNX_ELC, sFunc); - return NWNX_GetReturnValueInt(NWNX_ELC, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_ELC_GetValidationFailureSkillID() @@ -224,7 +221,7 @@ int NWNX_ELC_GetValidationFailureSkillID() string sFunc = "GetValidationFailureSkillID"; NWNX_CallFunction(NWNX_ELC, sFunc); - return NWNX_GetReturnValueInt(NWNX_ELC, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_ELC_GetValidationFailureFeatID() @@ -232,7 +229,7 @@ int NWNX_ELC_GetValidationFailureFeatID() string sFunc = "GetValidationFailureFeatID"; NWNX_CallFunction(NWNX_ELC, sFunc); - return NWNX_GetReturnValueInt(NWNX_ELC, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_ELC_GetValidationFailureSpellID() @@ -240,5 +237,5 @@ int NWNX_ELC_GetValidationFailureSpellID() string sFunc = "GetValidationFailureSpellID"; NWNX_CallFunction(NWNX_ELC, sFunc); - return NWNX_GetReturnValueInt(NWNX_ELC, sFunc); + return NWNX_GetReturnValueInt(); } diff --git a/_module/nss/nwnx_encounter.nss b/_module/nss/nwnx_encounter.nss index 8857184f..c067de31 100644 --- a/_module/nss/nwnx_encounter.nss +++ b/_module/nss/nwnx_encounter.nss @@ -15,6 +15,9 @@ struct NWNX_Encounter_CreatureListEntry int alreadyUsed; //< Creature has already been used. }; +/// @brief Immediately destroys the specified encounter object. +/// @param encounter The encounter object. +void NWNX_Encounter_Destroy(object encounter); /// @brief Get the number of creatures in the encounter list /// @param encounter The encounter object. @@ -53,6 +56,16 @@ int NWNX_Encounter_GetPlayerTriggeredOnly(object encounter); /// @param playerTriggeredOnly TRUE/FALSE void NWNX_Encounter_SetPlayerTriggeredOnly(object encounter, int playerTriggeredOnly); +/// @brief Get if the encounter respawns or not. +/// @param encounter The encounter object. +/// @return TRUE if the encounter does respawn, FALSE otherwise. +int NWNX_Encounter_GetCanReset(object encounter); + +/// @brief Set if the encounter respawns or not. +/// @param encounter The encounter object. +/// @param reset Does the encounter respawn TRUE or FALSE. +void NWNX_Encounter_SetCanReset(object encounter, int reset); + /// @brief Get the reset time of encounter. /// @param encounter The encounter object. /// @return The seconds the encounter is defined to reset. @@ -107,14 +120,22 @@ 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); +} + int NWNX_Encounter_GetNumberOfCreaturesInEncounterList(object encounter) { string sFunc = "GetNumberOfCreaturesInEncounterList"; - NWNX_PushArgumentObject(NWNX_Encounter, sFunc, encounter); + NWNX_PushArgumentObject(encounter); NWNX_CallFunction(NWNX_Encounter, sFunc); - return NWNX_GetReturnValueInt(NWNX_Encounter, sFunc); + return NWNX_GetReturnValueInt(); } struct NWNX_Encounter_CreatureListEntry NWNX_Encounter_GetEncounterCreatureByIndex(object encounter, int index) @@ -122,15 +143,15 @@ struct NWNX_Encounter_CreatureListEntry NWNX_Encounter_GetEncounterCreatureByInd string sFunc = "GetEncounterCreatureByIndex"; struct NWNX_Encounter_CreatureListEntry creatureEntry; - NWNX_PushArgumentInt(NWNX_Encounter, sFunc, index); - NWNX_PushArgumentObject(NWNX_Encounter, sFunc, encounter); + NWNX_PushArgumentInt(index); + NWNX_PushArgumentObject(encounter); NWNX_CallFunction(NWNX_Encounter, sFunc); - creatureEntry.alreadyUsed = NWNX_GetReturnValueInt(NWNX_Encounter, sFunc); - creatureEntry.unique = NWNX_GetReturnValueInt(NWNX_Encounter, sFunc); - creatureEntry.challengeRating = NWNX_GetReturnValueFloat(NWNX_Encounter, sFunc); - creatureEntry.resref = NWNX_GetReturnValueString(NWNX_Encounter, sFunc); + creatureEntry.alreadyUsed = NWNX_GetReturnValueInt(); + creatureEntry.unique = NWNX_GetReturnValueInt(); + creatureEntry.challengeRating = NWNX_GetReturnValueFloat(); + creatureEntry.resref = NWNX_GetReturnValueString(); return creatureEntry; } @@ -139,12 +160,12 @@ void NWNX_Encounter_SetEncounterCreatureByIndex(object encounter, int index, str { string sFunc = "SetEncounterCreatureByIndex"; - NWNX_PushArgumentInt(NWNX_Encounter, sFunc, creatureEntry.alreadyUsed); - NWNX_PushArgumentInt(NWNX_Encounter, sFunc, creatureEntry.unique); - NWNX_PushArgumentFloat(NWNX_Encounter, sFunc, creatureEntry.challengeRating); - NWNX_PushArgumentString(NWNX_Encounter, sFunc, creatureEntry.resref); - NWNX_PushArgumentInt(NWNX_Encounter, sFunc, index); - NWNX_PushArgumentObject(NWNX_Encounter, sFunc, encounter); + 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); } @@ -153,18 +174,18 @@ int NWNX_Encounter_GetFactionId(object encounter) { string sFunc = "GetFactionId"; - NWNX_PushArgumentObject(NWNX_Encounter, sFunc, encounter); + NWNX_PushArgumentObject(encounter); NWNX_CallFunction(NWNX_Encounter, sFunc); - return NWNX_GetReturnValueInt(NWNX_Encounter, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Encounter_SetFactionId(object encounter, int factionId) { string sFunc = "SetFactionId"; - NWNX_PushArgumentInt(NWNX_Encounter, sFunc, factionId); - NWNX_PushArgumentObject(NWNX_Encounter, sFunc, encounter); + NWNX_PushArgumentInt(factionId); + NWNX_PushArgumentObject(encounter); NWNX_CallFunction(NWNX_Encounter, sFunc); } @@ -173,18 +194,38 @@ int NWNX_Encounter_GetPlayerTriggeredOnly(object encounter) { string sFunc = "GetPlayerTriggeredOnly"; - NWNX_PushArgumentObject(NWNX_Encounter, sFunc, encounter); + NWNX_PushArgumentObject(encounter); NWNX_CallFunction(NWNX_Encounter, sFunc); - return NWNX_GetReturnValueInt(NWNX_Encounter, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Encounter_SetPlayerTriggeredOnly(object encounter, int playerTriggeredOnly) { string sFunc = "SetPlayerTriggeredOnly"; - NWNX_PushArgumentInt(NWNX_Encounter, sFunc, playerTriggeredOnly); - NWNX_PushArgumentObject(NWNX_Encounter, sFunc, encounter); + NWNX_PushArgumentInt(playerTriggeredOnly); + NWNX_PushArgumentObject(encounter); + + NWNX_CallFunction(NWNX_Encounter, sFunc); +} + +int NWNX_Encounter_GetCanReset(object encounter) +{ + string sFunc = "GetCanReset"; + + NWNX_PushArgumentObject(encounter); + NWNX_CallFunction(NWNX_Encounter, sFunc); + + return NWNX_GetReturnValueInt(); +} + +void NWNX_Encounter_SetCanReset(object encounter, int reset) +{ + string sFunc = "SetCanReset"; + + NWNX_PushArgumentInt(reset); + NWNX_PushArgumentObject(encounter); NWNX_CallFunction(NWNX_Encounter, sFunc); } @@ -193,18 +234,18 @@ int NWNX_Encounter_GetResetTime(object encounter) { string sFunc = "GetResetTime"; - NWNX_PushArgumentObject(NWNX_Encounter, sFunc, encounter); + NWNX_PushArgumentObject(encounter); NWNX_CallFunction(NWNX_Encounter, sFunc); - return NWNX_GetReturnValueInt(NWNX_Encounter, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Encounter_SetResetTime(object encounter, int resetTime) { string sFunc = "SetResetTime"; - NWNX_PushArgumentInt(NWNX_Encounter, sFunc, resetTime); - NWNX_PushArgumentObject(NWNX_Encounter, sFunc, encounter); + NWNX_PushArgumentInt(resetTime); + NWNX_PushArgumentObject(encounter); NWNX_CallFunction(NWNX_Encounter, sFunc); } @@ -213,24 +254,24 @@ int NWNX_Encounter_GetNumberOfSpawnPoints(object encounter) { string sFunc = "GetNumberOfSpawnPoints"; - NWNX_PushArgumentObject(NWNX_Encounter, sFunc, encounter); + NWNX_PushArgumentObject(encounter); NWNX_CallFunction(NWNX_Encounter, sFunc); - return NWNX_GetReturnValueInt(NWNX_Encounter, sFunc); + return NWNX_GetReturnValueInt(); } location NWNX_Encounter_GetSpawnPointByIndex(object encounter, int index) { string sFunc = "GetSpawnPointByIndex"; - NWNX_PushArgumentInt(NWNX_Encounter, sFunc, index); - NWNX_PushArgumentObject(NWNX_Encounter, sFunc, encounter); + NWNX_PushArgumentInt(index); + NWNX_PushArgumentObject(encounter); NWNX_CallFunction(NWNX_Encounter, sFunc); - float o = NWNX_GetReturnValueFloat(NWNX_Encounter, sFunc); - float z = NWNX_GetReturnValueFloat(NWNX_Encounter, sFunc); - float y = NWNX_GetReturnValueFloat(NWNX_Encounter, sFunc); - float x = NWNX_GetReturnValueFloat(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); } @@ -239,47 +280,47 @@ int NWNX_Encounter_GetMinNumSpawned(object encounter) { string sFunc = "GetMinNumSpawned"; - NWNX_PushArgumentObject(NWNX_Encounter, sFunc, encounter); + NWNX_PushArgumentObject(encounter); NWNX_CallFunction(NWNX_Encounter, sFunc); - return NWNX_GetReturnValueInt(NWNX_Encounter, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Encounter_GetMaxNumSpawned(object encounter) { string sFunc = "GetMaxNumSpawned"; - NWNX_PushArgumentObject(NWNX_Encounter, sFunc, encounter); + NWNX_PushArgumentObject(encounter); NWNX_CallFunction(NWNX_Encounter, sFunc); - return NWNX_GetReturnValueInt(NWNX_Encounter, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Encounter_GetCurrentNumSpawned(object encounter) { string sFunc = "GetCurrentNumSpawned"; - NWNX_PushArgumentObject(NWNX_Encounter, sFunc, encounter); + NWNX_PushArgumentObject(encounter); NWNX_CallFunction(NWNX_Encounter, sFunc); - return NWNX_GetReturnValueInt(NWNX_Encounter, sFunc); + return NWNX_GetReturnValueInt(); } string NWNX_Encounter_GetGeometry(object oEncounter) { string sFunc = "GetGeometry"; - NWNX_PushArgumentObject(NWNX_Encounter, sFunc, oEncounter); + NWNX_PushArgumentObject(oEncounter); NWNX_CallFunction(NWNX_Encounter, sFunc); - return NWNX_GetReturnValueString(NWNX_Encounter, sFunc); + return NWNX_GetReturnValueString(); } void NWNX_Encounter_SetGeometry(object oEncounter, string sGeometry) { string sFunc = "SetGeometry"; - NWNX_PushArgumentString(NWNX_Encounter, sFunc, sGeometry); - NWNX_PushArgumentObject(NWNX_Encounter, sFunc, oEncounter); + NWNX_PushArgumentString(sGeometry); + NWNX_PushArgumentObject(oEncounter); NWNX_CallFunction(NWNX_Encounter, sFunc); } diff --git a/_module/nss/nwnx_events.nss b/_module/nss/nwnx_events.nss index 2896b4cc..cd6ce5c8 100644 --- a/_module/nss/nwnx_events.nss +++ b/_module/nss/nwnx_events.nss @@ -61,10 +61,10 @@ _______________________________________ Event Data Tag | Type | Notes ----------------------|--------|------- - FACTION_ID | int | Not the STANDARD_FACTION_* constants. See nwnx_creature->GetFaction(). - SUBJECT_FACTION_ID | int | Not the STANDARD_FACTION_* constants. See nwnx_creature->GetFaction(). - PREVIOUS_REPUTATION | int | - NEW_REPUTATION | int | Not yet clamped between 0-100. In the AFTER event, this will equal the EventResult set in the BEFORE event. + FACTION_ID | int | Not the STANDARD_FACTION_* constants. See nwnx_creature->GetFaction(). | + SUBJECT_FACTION_ID | int | Not the STANDARD_FACTION_* constants. See nwnx_creature->GetFaction(). | + PREVIOUS_REPUTATION | int | | + NEW_REPUTATION | int | Not yet clamped between 0-100. In the AFTER event, this will equal the EventResult set in the BEFORE event. | _______________________________________ ## Validate Use Item Events @@ -174,6 +174,9 @@ _______________________________________ ITEM | object | Convert to object with StringToObject()| SLOT | int | | + @note This event does not run on login as the base game OnPlayerEquipItem event does. (Because this event hooks CNWSCreature::RunEquip which calls CNWSCreature::EquipItem. When the player character is first loaded, EquipItem is called directly.) + @note If the goal is to prevent items from being equiped under certain conditions, and since this event does not run on login, it could be helpful to additionally use NWNX_Creature_RunUnequip() in the OnClientEnter (or similar) event. + _______________________________________ ## Item Unequip Events - NWNX_ON_ITEM_UNEQUIP_BEFORE @@ -232,6 +235,18 @@ _______________________________________ ITEM | object | Convert to object with StringToObject()| NUMBER_SPLIT_OFF | int | | +_______________________________________ + ## Item Merge Events + - NWNX_ON_ITEM_MERGE_BEFORE + - NWNX_ON_ITEM_MERGE_AFTER + + `OBJECT_SELF` = The player attempting to merge an item + + Event Data Tag | Type | Notes | + ----------------------|--------|-----------------------------------------------------------------------------------| + ITEM_TO_MERGE_INTO | object | Convert to object with StringToObject() | + ITEM_TO_MERGE | object | Convert to object with StringToObject() (May be OBJECT_INVALID in the AFTER event)| + _______________________________________ ## Acquire Item Events - NWNX_ON_ITEM_ACQUIRE_BEFORE @@ -267,7 +282,7 @@ _______________________________________ _______________________________________ ## Has Feat Events - - NWNX_ON_HASFEAT_BEFORE + - NWNX_ON_HAS_FEAT_BEFORE - NWNX_ON_HAS_FEAT_AFTER `OBJECT_SELF` = The player being checked for the feat @@ -463,22 +478,72 @@ _______________________________________ ----------------------|--------|------- PASSWORD | string | The password the DM provided, only valid for NWNX_ON_DM_PLAYERDM_LOGIN_* +_______________________________________ + ## DM Set Stat Events + - NWNX_ON_DM_SET_STAT_BEFORE + - NWNX_ON_DM_SET_STAT_AFTER + + `OBJECT_SELF` = The DM + + Event Data Tag | Type | Notes + ----------------------|--------|------- + STAT | int | Returns ABILITY_* constant + VALUE | int | + TARGET | object | Convert to object with StringToObject() + SET | int | TRUE if setting stat, FALSE if modifying + +_______________________________________ + ## DM Get Variable Events + - NWNX_ON_DM_GET_VARIABLE_BEFORE + - NWNX_ON_DM_GET_VARIABLE_AFTER + + `OBJECT_SELF` = The DM + + Event Data Tag | Type | Notes + ----------------------|--------|------- + TYPE | int | Returns NWNX_EVENTS_DM_SET_VARIABLE_TYPE_* + TARGET | object | Convert to object with StringToObject() + KEY | string | Variable name + + @note Vector variable types aren't supported. + +_______________________________________ + ## DM Set Variable Events + - NWNX_ON_DM_SET_VARIABLE_BEFORE + - NWNX_ON_DM_SET_VARIABLE_AFTER + + `OBJECT_SELF` = The DM + + Event Data Tag | Type | Notes + ----------------------|--------|------- + TYPE | int | Returns NWNX_EVENTS_DM_SET_VARIABLE_TYPE_* + TARGET | object | Convert to object with StringToObject() + KEY | string | Variable name + VALUE | string | Variable value + + @note Vector variable types aren't supported. + +_______________________________________ + ## DM Set Faction Events + - NWNX_ON_DM_SET_FACTION_BEFORE + - NWNX_ON_DM_SET_FACTION_AFTER + + `OBJECT_SELF` = The DM + + Event Data Tag | Type | Notes + ----------------------|--------|------- + TARGET | object | Convert to object with StringToObject() + FACTION_ID | int | Not the STANDARD_FACTION_* constants. See nwnx_creature->GetFaction(). + FACTION_NAME | string | + _______________________________________ ## DM Other Events - NWNX_ON_DM_APPEAR_BEFORE - NWNX_ON_DM_APPEAR_AFTER - NWNX_ON_DM_DISAPPEAR_BEFORE - NWNX_ON_DM_DISAPPEAR_AFTER - - NWNX_ON_DM_SET_FACTION_BEFORE - - NWNX_ON_DM_SET_FACTION_AFTER - NWNX_ON_DM_TAKE_ITEM_BEFORE - NWNX_ON_DM_TAKE_ITEM_AFTER - - NWNX_ON_DM_SET_STAT_BEFORE - - NWNX_ON_DM_SET_STAT_AFTER - - NWNX_ON_DM_GET_VARIABLE_BEFORE - - NWNX_ON_DM_GET_VARIABLE_AFTER - - NWNX_ON_DM_SET_VARIABLE_BEFORE - - NWNX_ON_DM_SET_VARIABLE_AFTER - NWNX_ON_DM_SET_TIME_BEFORE - NWNX_ON_DM_SET_TIME_AFTER - NWNX_ON_DM_SET_DATE_BEFORE @@ -513,6 +578,10 @@ _______________________________________ CDKEY | string | Public cdkey of the connecting client IS_DM | int | Whether the client is connect as DM (1/0) IP_ADDRESS | string | The IP address of the connecting client + VERSION_MAJOR | int | The client's major version, eg 8193, or 0 if unavailable. + VERSION_MINOR | int | The client's minor version, eg 34, or 0 if unavailable. + VERSION_POSTFIX | int | The client's postfix version, eg 37, or 0 if unavailable. + PLATFORM_ID | int | The client's platform id, PLAYER_DEVICE_PLATFORM_*, or 0 if unavailable. @note Skipping the _BEFORE event will cause the client's connection to be denied. You can optionally pass a reason for this in the event result. @@ -573,7 +642,7 @@ _______________________________________ PROJECTILE_PATH_TYPE | int | | IS_INSTANT_SPELL | int | Returns TRUE if spell was instant else FALSE | -@note the stock nwscript PRCGetMetaMagicFeat() function will return any metamagic used. +@note the stock nwscript GetMetaMagicFeat() function will return any metamagic used. _______________________________________ ## Set Memorized Spell Slot Events @@ -584,7 +653,7 @@ _______________________________________ Event Data Tag | Type | Notes | ----------------------|--------|-------| - SPELL_MULTICLASS | int | Index of the spell casting class (0-2) | + SPELL_MULTICLASS | int | Index of the spell casting class (0-7) | SPELL_SLOT | int | | SPELL_ID | int | | SPELL_DOMAIN | int | | @@ -601,7 +670,7 @@ _______________________________________ Event Data Tag | Type | Notes | ----------------------|--------|-------| - SPELL_MULTICLASS | int | Index of the spell casting class (0-2) | + SPELL_MULTICLASS | int | Index of the spell casting class (0-7) | SPELL_LEVEL | int | | SPELL_SLOT | int | | @@ -621,6 +690,32 @@ _______________________________________ SPELL_FEAT | int | | SPELL_SPONTANEOUS | int | | +_______________________________________ + ## Spell Failed Events + - NWNX_ON_SPELL_FAILED_BEFORE + - NWNX_ON_SPELL_FAILED_AFTER + + `OBJECT_SELF` = The creature whose spell failed + + Event Data Tag | Type | Notes | + ----------------------|--------|-------| + SPELL_ID | int | | + MULTI_CLASS | int | Index of the spell casting class (0-7) | + DOMAIN | int | | + METAMAGIC | int | | + FEAT | int | | + SPELL_SPONTANEOUS | int | | + DEFENSIVELY_CAST | int | | + TARGET_OBJECT_ID | object | Convert to object with StringToObject() | + TARGET_POSITION_X | float | | + TARGET_POSITION_Y | float | | + TARGET_POSITION_Z | float | | + IS_INSTANT_SPELL | int | | + PROJECTILE_PATH_TYPE | int | | + CASTERLEVEL | int | | + IS_FAKE | int | | + REASON | int | @ref events_spellfailreason "NWNX_EVENTS_SPELLFAIL_REASON_*" | + _______________________________________ ## Healer Kit Use Events - NWNX_ON_HEALER_KIT_BEFORE @@ -695,8 +790,6 @@ _______________________________________ DIRTY_FIGHTING | 10 DEFENSIVE_STANCE | 11 - @note Requires @ref combatmodes "NWNX_CombatModes" plugin to work. - _______________________________________ ## Use Skill Events - NWNX_ON_USE_SKILL_BEFORE @@ -859,6 +952,17 @@ _______________________________________ BARTER_INITIATOR_ITEM_* | object | Convert to object with StringToObject(), only in _BEFORE events BARTER_TARGET_ITEM_* | object | Convert to object with StringToObject(), only in _BEFORE events +_______________________________________ + ## Barter AddItem Events + - NWNX_ON_BARTER_ADD_ITEM_BEFORE + - NWNX_ON_BARTER_ADD_ITEM_AFTER + + `OBJECT_SELF` = The player trying to add an item to the barter window + + Event Data Tag | Type | Notes + ----------------------|--------|------- + ITEM | object | The item being added + BARTER_TARGET | object | The other player involved in the barter _______________________________________ ## Trap Events - NWNX_ON_TRAP_DISARM_BEFORE @@ -879,6 +983,11 @@ _______________________________________ Event Data Tag | Type | Notes ----------------------|--------|------- TRAP_OBJECT_ID | object | Convert to object with StringToObject() + TARGET_OBJECT_ID | object | Convert to object with StringToObject(), only in SET events + TARGET_POSITION_X | float | Only in SET events + TARGET_POSITION_Y | float | Only in SET events + TARGET_POSITION_Z | float | Only in SET events + NEEDS_TO_MOVE | int | TRUE/FALSE, only in _BEFORE events (not ENTER), if TRUE another _BEFORE event will be fired before the actual interaction with the trap TRAP_FORCE_SET | int | TRUE/FALSE, only in ENTER events ACTION_RESULT | int | TRUE/FALSE, only in _AFTER events (not ENTER) @@ -1070,21 +1179,21 @@ _______________________________________ Event Data Tag | Type | Notes ----------------------|--------|------- - TARGET | object | Convert to object with StringToObject() - SPELL_ID | int | - MULTICLASS | int | - DOMAIN_LEVEL | int | - META_TYPE | int | - INSTANT | int | TRUE / FALSE - PROJECTILE_PATH | int | - SPONTANEOUS | int | TRUE / FALSE - FAKE | int | TRUE / FALSE - FEAT | int | -1 when not cast from a feat - CASTER_LEVEL | int | - IS_AREA_TARGET | int | TRUE / FALSE - POS_X | float | - POS_Y | float | - POS_Z | float | + TARGET | object | Convert to object with StringToObject() | + SPELL_ID | int | | + MULTICLASS | int | | + DOMAIN_LEVEL | int | | + META_TYPE | int | | + INSTANT | int | TRUE / FALSE | + PROJECTILE_PATH | int | | + SPONTANEOUS | int | TRUE / FALSE | + FAKE | int | TRUE / FALSE | + FEAT | int | -1 when not cast from a feat | + CASTER_LEVEL | int | | + IS_AREA_TARGET | int | TRUE / FALSE | + POS_X | float | | + POS_Y | float | | + POS_Z | float | | @note This event runs the moment a creature starts casting @@ -1141,10 +1250,10 @@ _______________________________________ Event Data Tag | Type | Notes ----------------------|--------|------- - DOOR | object | Convert to object with StringToObject() - THIEVES_TOOL | object | Convert to object with StringToObject() - ACTIVE_PROPERTY_INDEX | int | - ACTION_RESULT | int | TRUE/FALSE, only in _AFTER events + DOOR | object | Convert to object with StringToObject() | + THIEVES_TOOL | object | Convert to object with StringToObject() | + ACTIVE_PROPERTY_INDEX | int | | + ACTION_RESULT | int | TRUE/FALSE, only in _AFTER events | _______________________________________ ## UUID Collision Events @@ -1229,7 +1338,24 @@ _______________________________________ SPELL_ID | int | | MULTI_CLASS | int | | FEAT | int | 65535 if a feat wasn't used, otherwise the feat ID | + TARGET_OBJECT_ID | object | Convert to object with StringToObject() | + TARGET_POSITION_X | float | | + TARGET_POSITION_Y | float | | + TARGET_POSITION_Z | float | | + SPELL_DOMAIN | int | | + SPELL_SPONTANEOUS | int | | + SPELL_METAMAGIC | int | METAMAGIC_* | + PROJECTILE_PATH_TYPE | int | PROJECTILE_PATH_TYPE_* | + @note TARGET_OBJECT_ID, TARGET_POSITION_*, SPELL_DOMAIN, SPELL_SPONTANEOUS, SPELL_METAMAGIC, and PROJECTILE_PATH_TYPE may + be invalid if BroadcastCastSpell was called outside AIActionCastSpell. + This can be tested for by checking if TARGET_OBJECT_ID is the caster's area and if all three TARGET_POSITION_* equal 0.0. + \code{.c} + if (oTarget == GetArea(oCaster) && Vector(vX, vY, fZ) == Vector()) + { + // ... + } + \endcode _______________________________________ ## RunScript Debug Event - NWNX_ON_DEBUG_RUN_SCRIPT_BEFORE @@ -1259,6 +1385,25 @@ _______________________________________ @note This event also runs for players that do not have permission to execute the command. +_______________________________________ + ## Play Visual Effect Event + - NWNX_ON_DEBUG_PLAY_VISUAL_EFFECT_BEFORE + - NWNX_ON_DEBUG_PLAY_VISUAL_EFFECT_AFTER + + `OBJECT_SELF` = The DM + + Event Data Tag | Type | Notes + ----------------------|--------|------- + TARGET_OBJECT_ID | object | Convert to object with StringToObject() + VISUAL_EFFECT | int | Index into visualeffects.2da + DURATION | float | + TARGET_POSITION_X | float | Will be 0.0 when playing visual effects on an object + TARGET_POSITION_Y | float | Will be 0.0 when playing visual effects on an object + TARGET_POSITION_Z | float | Will be 0.0 when playing visual effects on an object + + @note This is the `dm_visualeffect` console command. + `TARGET_OBJECT_ID` will be `OBJECT_INVALID` when playing visual effects at a position in an area. + _______________________________________ ## Buy/Sell Store Events - NWNX_ON_STORE_REQUEST_BUY_BEFORE @@ -1275,6 +1420,15 @@ _______________________________________ PRICE | int | The buy or sell price | RESULT | int | TRUE/FALSE whether the request was successful. Only in *_AFTER events. + @warning RESULT in NWNX_ON_STORE_REQUEST_BUY_AFTER only fails if it's due to lack of gold. It will not fail if item does not fit in player's inventory. If you want to check and fail on that condition, you can do something like this in the NWNX_ON_STORE_REQUEST_BUY_AFTER event: + ```c + if (!GetBaseItemFitsInInventory(GetBaseItemType(oItem), oPlayer)) + { + NWNX_Events_SetEventResult("0"); + return; + } + ``` + _______________________________________ ## Server Send Area Events - NWNX_ON_SERVER_SEND_AREA_BEFORE @@ -1313,8 +1467,665 @@ _______________________________________ @note Some emotes have a voiceline that will still play when the event is skipped. These voicelines can be skipped in the NWNX_ON_QUICKCHAT_* event. _______________________________________ + ## Combat Damage Resistance/Reduction Broken Event + - NWNX_ON_COMBAT_DR_BROKEN_BEFORE + - NWNX_ON_COMBAT_DR_BROKEN_AFTER + + `OBJECT_SELF` = The creature whose DR gets broken + + Event Data Tag | Type | Notes + ----------------------|--------|------- + TYPE | int | 1 for DamageResistance, 0 for DamageReduction | + + @note This event only fires when DR gets broken in combat. + +_______________________________________ + ## Creature Unpossess Familiar Event + - NWNX_ON_UNPOSSESS_FAMILIAR_BEFORE + - NWNX_ON_UNPOSSESS_FAMILIAR_AFTER + + `OBJECT_SELF` = The creature unpossessing a familiar + + Event Data Tag | Type | Notes + ----------------------|--------|------- + FAMILIAR | object | The familiar. Convert to object with StringToObject() | + +_______________________________________ + ## Client Levelup Begin Event + - NWNX_ON_CLIENT_LEVEL_UP_BEGIN_BEFORE + - NWNX_ON_CLIENT_LEVEL_UP_BEGIN_AFTER + + `OBJECT_SELF` = The player clicking the levelup button + + Event Data Tag | Type | Notes + ----------------------|--------|------- + +_______________________________________ + ## Creature Possess Familiar Event + - NWNX_ON_POSSESS_FAMILIAR_BEFORE + - NWNX_ON_POSSESS_FAMILIAR_AFTER + + `OBJECT_SELF` = The creature possessing a familiar + + Event Data Tag | Type | Notes + ----------------------|--------|------- + FAMILIAR | object | The familiar. Convert to object with StringToObject() | +_______________________________________ + ## Player CharacterSheet Permitted Event + - NWNX_ON_CHARACTER_SHEET_PERMITTED_BEFORE + - NWNX_ON_CHARACTER_SHEET_PERMITTED_AFTER + + `OBJECT_SELF` = The player trying to view a charactersheet + + Event Data Tag | Type | Notes + ----------------------|--------|------- + TARGET | object | Convert to object with StringToObject() | + + @note When skipping this event, be sure to set the event result. +_______________________________________ + ## Player CharacterSheet Open/Close Events + - NWNX_ON_CHARACTER_SHEET_OPEN_BEFORE + - NWNX_ON_CHARACTER_SHEET_OPEN_AFTER + - NWNX_ON_CHARACTER_SHEET_CLOSE_BEFORE + - NWNX_ON_CHARACTER_SHEET_CLOSE_AFTER + + `OBJECT_SELF` = The player opening or closing a charactersheet + + Event Data Tag | Type | Notes + ----------------------|--------|------- + TARGET | object | Convert to object with StringToObject() | +_______________________________________ + ## Player Device Property Events + - NWNX_ON_CLIENT_SET_DEVICE_PROPERTY_BEFORE + - NWNX_ON_CLIENT_SET_DEVICE_PROPERTY_AFTER + + `OBJECT_SELF` = The player changing a device property (window size/gui scale) + + Event Data Tag | Type | Notes + ----------------------|--------|------- + PROPERTY | string | A PLAYER_DEVICE_PROPERTY_GUI_* constant | + OLD_VALUE | int | | + NEW_VALUE | int | | +_______________________________________ + ## Input Drop Item Events + - NWNX_ON_INPUT_DROP_ITEM_BEFORE + - NWNX_ON_INPUT_DROP_ITEM_AFTER + + `OBJECT_SELF` = The player dropping an item + + Event Data Tag | Type | Notes + ----------------------|--------|------- + ITEM | object | Convert to object with StringToObject() | + POS_X | float | | + POS_Y | float | | + POS_Z | float | | +_______________________________________ + ## Decrement Spell Count Events + - NWNX_ON_DECREMENT_SPELL_COUNT_BEFORE + - NWNX_ON_DECREMENT_SPELL_COUNT_AFTER + + `OBJECT_SELF` = The player losing a spell slot + + Event Data Tag | Type | Notes + ----------------------|--------|------- + SPELL_ID | int | | + CLASS | int | Index of the spell casting class (0-2). Returns 254 for spell-like abilities | + DOMAIN | int | Spell level if non-default due to Domain | + METAMAGIC | int | | + CASTERLEVEL | int | Only returns for spell-like abilities | +_______________________________________ + ## EventScript Events + - NWNX_ON_RUN_EVENT_SCRIPT_BEFORE + - NWNX_ON_RUN_EVENT_SCRIPT_AFTER + + `OBJECT_SELF` = The object the event script is running on + + Event Data Tag | Type | Notes + ----------------------|--------|------- + EVENT_TYPE | int | EVENT_SCRIPT_* in nwscript.nss | + EVENT_SCRIPT | int | Script name running (can be empty) | + + @note This event should definitely be used with the Event ID Whitelist, which is turned on by default + for this event. Until you add your EVENT_SCRIPT_ to the whitelist this event will not function: + ```c + NWNX_Events_SubscribeEvent("NWNX_ON_RUN_EVENT_SCRIPT_BEFORE", "creature_hb_ovr"); + NWNX_Events_AddIDToWhitelist("NWNX_ON_RUN_EVENT_SCRIPT", EVENT_SCRIPT_MODULE_ON_HEARTBEAT); + ``` + @warning Toggling the Whitelist to be off for this event will degrade performance. +_______________________________________ + ## Object Use Events (Placeables) + - NWNX_ON_OBJECT_USE_BEFORE + - NWNX_ON_OBJECT_USE_AFTER + + `OBJECT_SELF` = The player using the object + + Event Data Tag | Type | Notes + ----------------------|--------|------- + OBJECT | object | The Object being used | +_______________________________________ + ## Placeable Open Events (Placeables with inventory) + - NWNX_ON_PLACEABLE_OPEN_BEFORE + - NWNX_ON_PLACEABLE_OPEN_AFTER + + `OBJECT_SELF` = The placeable being openeed. + + Event Data Tag | Type | Notes + ----------------------|--------|------- + OBJECT | object | The player opening. | + BEFORE_SKIPPED | int | TRUE/FALSE, only in _AFTER events| +_______________________________________ + ## Placeable Close Events (Placeables with inventory) + - NWNX_ON_PLACEABLE_CLOSE_BEFORE + - NWNX_ON_PLACEABLE_CLOSE_AFTER + + `OBJECT_SELF` = The placeable being closed. + + Event Data Tag | Type | Notes + ----------------------|--------|------- + OBJECT | object | The player closing. | + + @note Skipping event is not allowed (since otherwise client UI will hang and be glitchy) +_______________________________________ + ## Broadcast Safe Projectile Events + - NWNX_ON_BROADCAST_SAFE_PROJECTILE_BEFORE + - NWNX_ON_BROADCAST_SAFE_PROJECTILE_AFTER + + `OBJECT_SELF` = The creature casting the spell + + Event Data Tag | Type | Notes | + ----------------------|--------|-------| + TARGET_OBJECT_ID | string | Convert to object with StringToObject() | + TARGET_POSITION_X | float | | + TARGET_POSITION_Y | float | | + TARGET_POSITION_Z | float | | + DELTA | int | Time in milliseconds before the projectile reaches its destination | + PROJECTILE_TYPE | int | @ref events_projtype "NWNX_EVENTS_BROADCAST_SAFE_PROJECTILE_TYPE_*" | + SPELL_ID | int | | + ATTACK_RESULT | int | 0=n/a, 1=hit, 2=parried, 3=critical hit, 4=miss, 5=resisted, 7=automatic hit, 8=concealed, 9=miss chance, 10=devastating crit | + PROJECTILE_PATH_TYPE | int | @nwn{Projectile_path_type,PROJECTILE_PATH_TYPE_*} | + + @note This event fires for all projectiles. It's recommended to use ID whitelists with this event. You can whitelist the event by the projectile type, spell id, or both: + \code{.c} + NWNX_Events_AddIDToWhitelist("NWNX_ON_BROADCAST_SAFE_PROJECTILE_TYPE", NWNX_EVENTS_BROADCAST_SAFE_PROJECTILE_TYPE_*); + 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 +_______________________________________ + ## Broadcast Attack of Opportunity Events + - NWNX_ON_BROADCAST_ATTACK_OF_OPPORTUNITY_BEFORE + - NWNX_ON_BROADCAST_ATTACK_OF_OPPORTUNITY_AFTER + + `OBJECT_SELF` = The creature broadcasting the Attack of Opportunity event + + Event Data Tag | Type | Notes + ----------------------|--------|------- + TARGET_OBJECT_ID | object | A single object the attack of opportunity is being broadcast to. Convert to object with StringToObject() | + MOVEMENT | int | Whether this attack of opportunity is being triggered from movement | +_______________________________________ + ## Combat Attack of Opportunity Events + - NWNX_ON_COMBAT_ATTACK_OF_OPPORTUNITY_BEFORE + - NWNX_ON_COMBAT_ATTACK_OF_OPPORTUNITY_AFTER + + `OBJECT_SELF` = The creature performing the Attack of Opportunity against the broadcasting target. + + Event Data Tag | Type | Notes + ----------------------|--------|------- + TARGET_OBJECT_ID | object | The target of the attack of opportunity. Convert to object with StringToObject() | + + @note If the BEFORE event is skipped the broadcasting creature will still make a tumble skill roll if moving. +_______________________________________ + ## Area Play Battle Music Events + - NWNX_ON_AREA_PLAY_BATTLE_MUSIC_BEFORE + - NWNX_ON_AREA_PLAY_BATTLE_MUSIC_AFTER + + `OBJECT_SELF` = The area playing or stopping the battle music. + + Event Data Tag | Type | Notes + ----------------------|--------|------- + PLAY | int | TRUE if the area is starting to play battle music, FALSE if stopping. | +_______________________________________ + ## Combat Attack Target Change Events + - NWNX_ON_ATTACK_TARGET_CHANGE_BEFORE + - NWNX_ON_ATTACK_TARGET_CHANGE_AFTER + + `OBJECT_SELF` = The creature changing the target its attacking. + + Event Data Tag | Type | Notes + ----------------------|--------|------- + OLD_TARGET_OBJECT_ID | object | The old attack target. OBJECT_INVALID if there was no old target. Old target may be dead/invalid. Convert to object with StringToObject() | + NEW_TARGET_OBJECT_ID | object | The new attack target. OBJECT_INVALID if there is no new target. Convert to object with StringToObject() | + AUTOMATIC_CHANGE | int | TRUE if the game automatically decided on the new target, FALSE if explicitly chosen | + RETARGETABLE | int | TRUE if the new target can be changed using NWNX_Events_SetEventResult() (Only in BEFORE) | +_______________________________________ + ## Creature Tile Change Events + - NWNX_ON_CREATURE_TILE_CHANGE_BEFORE + - NWNX_ON_CREATURE_TILE_CHANGE_AFTER + + `OBJECT_SELF` = The creature changing tile positions. + + Event Data Tag | Type | Notes + ----------------------|--------|------- + OLD_TILE_INDEX | int | The index of the old tile. | + OLD_TILE_X | int | The tile grid x position of the old tile. | + OLD_TILE_Y | int | The tile grid y position of the old tile. | + NEW_TILE_INDEX | int | The index of the new tile. | + NEW_TILE_X | int | The tile grid x position of the new tile. | + NEW_TILE_Y | int | The tile grid y position of the new tile. | +_______________________________________ + ## Creature Jump To Point Events + - NWNX_ON_CREATURE_JUMP_TO_POINT_BEFORE + - NWNX_ON_CREATURE_JUMP_TO_POINT_AFTER + + `OBJECT_SELF` = The creature jumping. + + Event Data Tag | Type | Notes + ----------------------|--------|------- + TARGET_AREA | object | The target area. Convert to object with StringToObject() | + POS_X | float | The x position the target is being moved to | + POS_Y | float | The y position the target is being moved to | + POS_Z | float | The z position the target is being moved to | +_______________________________________ + ## Creature Jump To Object Events + - NWNX_ON_CREATURE_JUMP_TO_OBJECT_BEFORE + - NWNX_ON_CREATURE_JUMP_TO_OBJECT_AFTER + + `OBJECT_SELF` = The creature jumping. + + Event Data Tag | Type | Notes + ----------------------|--------|------- + OBJECT | object | The object the creature is jumping to. Convert to object with StringToObject() | +_______________________________________ + ## Item Property Effect Apply/Remove Events + - NWNX_ON_ITEMPROPERTY_EFFECT_APPLIED_BEFORE + - NWNX_ON_ITEMPROPERTY_EFFECT_APPLIED_AFTER + - NWNX_ON_ITEMPROPERTY_EFFECT_REMOVED_BEFORE + - NWNX_ON_ITEMPROPERTY_EFFECT_REMOVED_AFTER + + `OBJECT_SELF` = The item source of the item property. + + Event Data Tag | Type | Notes + ----------------------|--------|------- + CREATURE | object | The creature to which Convert to object with StringToObject() | + LOADING_GAME | int | TRUE if the itemproperty is being applied when loading into the game and not due to equipping the item. | + INVENTORY_SLOT | int | The INVENTORY_SLOT_* the item is (un)equipped to/from. | + PROPERTY | int | The ITEM_PROPERTY_* type. | + SUBTYPE | int | The subtype of the itemproperty. | + TAG | string | The optional tag set by TagItemProperty() | + COST_TABLE | int | The index into iprp_costtable.2da | + COST_TABLE_VALUE | int | The index into the 2da pointed at by COST_TABLE | + PARAM1 | int | The index into iprp_paramtable.2da | + PARAM1_VALUE | int | The index into the 2da pointed at by PARAM1 | + + @note These events fire when the game applies or removes the effects from an itemproperty. + Skipping NWNX_ON_ITEMPROPERTY_EFFECT_APPLIED_BEFORE will stop the basegame effects for that itemproperty to not be applied. + If you skip the application of ITEM_PROPERTY_BONUS_SPELL_SLOT_OF_LEVEL_N or ITEM_PROPERTY_UNLIMITED_AMMUNITION you must also skip its removal event. + + @note Any non-DURATION_TYPE_INSTANT effects applied to the creature in NWNX_ON_ITEMPROPERTY_EFFECT_APPLIED_BEFORE **must** be of type DURATION_TYPE_EQUIPPED + See the `NWNX_EFFECT_EXTEND_DURATION_TYPE` environment variable in NWNX_Effect on how to enable this duration type. + + @note See the NWNX_Events README.md for an example script! + + @note The whitelist is enabled by default for these events, to whitelist a particular itemproperty, do the following: + \code{.c} + NWNX_Events_AddIDToWhitelist("NWNX_ON_ITEMPROPERTY_EFFECT", ITEM_PROPERTY_*); + \endcode */ -/* + +/// @name Events Event Constants +/// @anchor events_events +/// @{ +const string NWNX_ON_ADD_ASSOCIATE_BEFORE = "NWNX_ON_ADD_ASSOCIATE_BEFORE"; +const string NWNX_ON_ADD_ASSOCIATE_AFTER = "NWNX_ON_ADD_ASSOCIATE_AFTER"; +const string NWNX_ON_REMOVE_ASSOCIATE_BEFORE = "NWNX_ON_REMOVE_ASSOCIATE_BEFORE"; +const string NWNX_ON_REMOVE_ASSOCIATE_AFTER = "NWNX_ON_REMOVE_ASSOCIATE_AFTER"; +const string NWNX_ON_STEALTH_ENTER_BEFORE = "NWNX_ON_STEALTH_ENTER_BEFORE"; +const string NWNX_ON_STEALTH_ENTER_AFTER = "NWNX_ON_STEALTH_ENTER_AFTER"; +const string NWNX_ON_STEALTH_EXIT_BEFORE = "NWNX_ON_STEALTH_EXIT_BEFORE"; +const string NWNX_ON_STEALTH_EXIT_AFTER = "NWNX_ON_STEALTH_EXIT_AFTER"; +const string NWNX_ON_DETECT_ENTER_BEFORE = "NWNX_ON_DETECT_ENTER_BEFORE"; +const string NWNX_ON_DETECT_ENTER_AFTER = "NWNX_ON_DETECT_ENTER_AFTER"; +const string NWNX_ON_DETECT_EXIT_BEFORE = "NWNX_ON_DETECT_EXIT_BEFORE"; +const string NWNX_ON_DETECT_EXIT_AFTER = "NWNX_ON_DETECT_EXIT_AFTER"; +const string NWNX_ON_EXAMINE_OBJECT_BEFORE = "NWNX_ON_EXAMINE_OBJECT_BEFORE"; +const string NWNX_ON_EXAMINE_OBJECT_AFTER = "NWNX_ON_EXAMINE_OBJECT_AFTER"; +const string NWNX_ON_SET_NPC_FACTION_REPUTATION_BEFORE = "NWNX_ON_SET_NPC_FACTION_REPUTATION_BEFORE"; +const string NWNX_ON_SET_NPC_FACTION_REPUTATION_AFTER = "NWNX_ON_SET_NPC_FACTION_REPUTATION_AFTER"; +const string NWNX_ON_VALIDATE_USE_ITEM_BEFORE = "NWNX_ON_VALIDATE_USE_ITEM_BEFORE"; +const string NWNX_ON_VALIDATE_USE_ITEM_AFTER = "NWNX_ON_VALIDATE_USE_ITEM_AFTER"; +const string NWNX_ON_USE_ITEM_BEFORE = "NWNX_ON_USE_ITEM_BEFORE"; +const string NWNX_ON_USE_ITEM_AFTER = "NWNX_ON_USE_ITEM_AFTER"; +const string NWNX_ON_ITEM_INVENTORY_OPEN_BEFORE = "NWNX_ON_ITEM_INVENTORY_OPEN_BEFORE"; +const string NWNX_ON_ITEM_INVENTORY_OPEN_AFTER = "NWNX_ON_ITEM_INVENTORY_OPEN_AFTER"; +const string NWNX_ON_ITEM_INVENTORY_CLOSE_BEFORE = "NWNX_ON_ITEM_INVENTORY_CLOSE_BEFORE"; +const string NWNX_ON_ITEM_INVENTORY_CLOSE_AFTER = "NWNX_ON_ITEM_INVENTORY_CLOSE_AFTER"; +const string NWNX_ON_ITEM_AMMO_RELOAD_BEFORE = "NWNX_ON_ITEM_AMMO_RELOAD_BEFORE"; +const string NWNX_ON_ITEM_AMMO_RELOAD_AFTER = "NWNX_ON_ITEM_AMMO_RELOAD_AFTER"; +const string NWNX_ON_ITEM_SCROLL_LEARN_BEFORE = "NWNX_ON_ITEM_SCROLL_LEARN_BEFORE"; +const string NWNX_ON_ITEM_SCROLL_LEARN_AFTER = "NWNX_ON_ITEM_SCROLL_LEARN_AFTER"; +const string NWNX_ON_VALIDATE_ITEM_EQUIP_BEFORE = "NWNX_ON_VALIDATE_ITEM_EQUIP_BEFORE"; +const string NWNX_ON_VALIDATE_ITEM_EQUIP_AFTER = "NWNX_ON_VALIDATE_ITEM_EQUIP_AFTER"; +const string NWNX_ON_ITEM_EQUIP_BEFORE = "NWNX_ON_ITEM_EQUIP_BEFORE"; +const string NWNX_ON_ITEM_EQUIP_AFTER = "NWNX_ON_ITEM_EQUIP_AFTER"; +const string NWNX_ON_ITEM_UNEQUIP_BEFORE = "NWNX_ON_ITEM_UNEQUIP_BEFORE"; +const string NWNX_ON_ITEM_UNEQUIP_AFTER = "NWNX_ON_ITEM_UNEQUIP_AFTER"; +const string NWNX_ON_ITEM_DESTROY_OBJECT_BEFORE = "NWNX_ON_ITEM_DESTROY_OBJECT_BEFORE"; +const string NWNX_ON_ITEM_DESTROY_OBJECT_AFTER = "NWNX_ON_ITEM_DESTROY_OBJECT_AFTER"; +const string NWNX_ON_ITEM_DECREMENT_STACKSIZE_BEFORE = "NWNX_ON_ITEM_DECREMENT_STACKSIZE_BEFORE"; +const string NWNX_ON_ITEM_DECREMENT_STACKSIZE_AFTER = "NWNX_ON_ITEM_DECREMENT_STACKSIZE_AFTER"; +const string NWNX_ON_ITEM_USE_LORE_BEFORE = "NWNX_ON_ITEM_USE_LORE_BEFORE"; +const string NWNX_ON_ITEM_USE_LORE_AFTER = "NWNX_ON_ITEM_USE_LORE_AFTER"; +const string NWNX_ON_ITEM_PAY_TO_IDENTIFY_BEFORE = "NWNX_ON_ITEM_PAY_TO_IDENTIFY_BEFORE"; +const string NWNX_ON_ITEM_PAY_TO_IDENTIFY_AFTER = "NWNX_ON_ITEM_PAY_TO_IDENTIFY_AFTER"; +const string NWNX_ON_ITEM_SPLIT_BEFORE = "NWNX_ON_ITEM_SPLIT_BEFORE"; +const string NWNX_ON_ITEM_SPLIT_AFTER = "NWNX_ON_ITEM_SPLIT_AFTER"; +const string NWNX_ON_ITEM_MERGE_BEFORE = "NWNX_ON_ITEM_MERGE_BEFORE"; +const string NWNX_ON_ITEM_MERGE_AFTER = "NWNX_ON_ITEM_MERGE_AFTER"; +const string NWNX_ON_ITEM_ACQUIRE_BEFORE = "NWNX_ON_ITEM_ACQUIRE_BEFORE"; +const string NWNX_ON_ITEM_ACQUIRE_AFTER = "NWNX_ON_ITEM_ACQUIRE_AFTER"; +const string NWNX_ON_USE_FEAT_BEFORE = "NWNX_ON_USE_FEAT_BEFORE"; +const string NWNX_ON_USE_FEAT_AFTER = "NWNX_ON_USE_FEAT_AFTER"; +const string NWNX_ON_HAS_FEAT_BEFORE = "NWNX_ON_HAS_FEAT_BEFORE"; +const string NWNX_ON_HAS_FEAT_AFTER = "NWNX_ON_HAS_FEAT_AFTER"; +const string NWNX_ON_DM_GIVE_GOLD_BEFORE = "NWNX_ON_DM_GIVE_GOLD_BEFORE"; +const string NWNX_ON_DM_GIVE_GOLD_AFTER = "NWNX_ON_DM_GIVE_GOLD_AFTER"; +const string NWNX_ON_DM_GIVE_XP_BEFORE = "NWNX_ON_DM_GIVE_XP_BEFORE"; +const string NWNX_ON_DM_GIVE_XP_AFTER = "NWNX_ON_DM_GIVE_XP_AFTER"; +const string NWNX_ON_DM_GIVE_LEVEL_BEFORE = "NWNX_ON_DM_GIVE_LEVEL_BEFORE"; +const string NWNX_ON_DM_GIVE_LEVEL_AFTER = "NWNX_ON_DM_GIVE_LEVEL_AFTER"; +const string NWNX_ON_DM_GIVE_ALIGNMENT_BEFORE = "NWNX_ON_DM_GIVE_ALIGNMENT_BEFORE"; +const string NWNX_ON_DM_GIVE_ALIGNMENT_AFTER = "NWNX_ON_DM_GIVE_ALIGNMENT_AFTER"; +const string NWNX_ON_DM_SPAWN_OBJECT_BEFORE = "NWNX_ON_DM_SPAWN_OBJECT_BEFORE"; +const string NWNX_ON_DM_SPAWN_OBJECT_AFTER = "NWNX_ON_DM_SPAWN_OBJECT_AFTER"; +const string NWNX_ON_DM_GIVE_ITEM_BEFORE = "NWNX_ON_DM_GIVE_ITEM_BEFORE"; +const string NWNX_ON_DM_GIVE_ITEM_AFTER = "NWNX_ON_DM_GIVE_ITEM_AFTER"; +const string NWNX_ON_DM_HEAL_BEFORE = "NWNX_ON_DM_HEAL_BEFORE"; +const string NWNX_ON_DM_HEAL_AFTER = "NWNX_ON_DM_HEAL_AFTER"; +const string NWNX_ON_DM_KILL_BEFORE = "NWNX_ON_DM_KILL_BEFORE"; +const string NWNX_ON_DM_KILL_AFTER = "NWNX_ON_DM_KILL_AFTER"; +const string NWNX_ON_DM_TOGGLE_INVULNERABLE_BEFORE = "NWNX_ON_DM_TOGGLE_INVULNERABLE_BEFORE"; +const string NWNX_ON_DM_TOGGLE_INVULNERABLE_AFTER = "NWNX_ON_DM_TOGGLE_INVULNERABLE_AFTER"; +const string NWNX_ON_DM_FORCE_REST_BEFORE = "NWNX_ON_DM_FORCE_REST_BEFORE"; +const string NWNX_ON_DM_FORCE_REST_AFTER = "NWNX_ON_DM_FORCE_REST_AFTER"; +const string NWNX_ON_DM_LIMBO_BEFORE = "NWNX_ON_DM_LIMBO_BEFORE"; +const string NWNX_ON_DM_LIMBO_AFTER = "NWNX_ON_DM_LIMBO_AFTER"; +const string NWNX_ON_DM_TOGGLE_AI_BEFORE = "NWNX_ON_DM_TOGGLE_AI_BEFORE"; +const string NWNX_ON_DM_TOGGLE_AI_AFTER = "NWNX_ON_DM_TOGGLE_AI_AFTER"; +const string NWNX_ON_DM_TOGGLE_IMMORTAL_BEFORE = "NWNX_ON_DM_TOGGLE_IMMORTAL_BEFORE"; +const string NWNX_ON_DM_TOGGLE_IMMORTAL_AFTER = "NWNX_ON_DM_TOGGLE_IMMORTAL_AFTER"; +const string NWNX_ON_DM_GOTO_BEFORE = "NWNX_ON_DM_GOTO_BEFORE"; +const string NWNX_ON_DM_GOTO_AFTER = "NWNX_ON_DM_GOTO_AFTER"; +const string NWNX_ON_DM_POSSESS_BEFORE = "NWNX_ON_DM_POSSESS_BEFORE"; +const string NWNX_ON_DM_POSSESS_AFTER = "NWNX_ON_DM_POSSESS_AFTER"; +const string NWNX_ON_DM_POSSESS_FULL_POWER_BEFORE = "NWNX_ON_DM_POSSESS_FULL_POWER_BEFORE"; +const string NWNX_ON_DM_POSSESS_FULL_POWER_AFTER = "NWNX_ON_DM_POSSESS_FULL_POWER_AFTER"; +const string NWNX_ON_DM_TOGGLE_LOCK_BEFORE = "NWNX_ON_DM_TOGGLE_LOCK_BEFORE"; +const string NWNX_ON_DM_TOGGLE_LOCK_AFTER = "NWNX_ON_DM_TOGGLE_LOCK_AFTER"; +const string NWNX_ON_DM_DISABLE_TRAP_BEFORE = "NWNX_ON_DM_DISABLE_TRAP_BEFORE"; +const string NWNX_ON_DM_DISABLE_TRAP_AFTER = "NWNX_ON_DM_DISABLE_TRAP_AFTER"; +const string NWNX_ON_DM_JUMP_TO_POINT_BEFORE = "NWNX_ON_DM_JUMP_TO_POINT_BEFORE"; +const string NWNX_ON_DM_JUMP_TO_POINT_AFTER = "NWNX_ON_DM_JUMP_TO_POINT_AFTER"; +const string NWNX_ON_DM_JUMP_TARGET_TO_POINT_BEFORE = "NWNX_ON_DM_JUMP_TARGET_TO_POINT_BEFORE"; +const string NWNX_ON_DM_JUMP_TARGET_TO_POINT_AFTER = "NWNX_ON_DM_JUMP_TARGET_TO_POINT_AFTER"; +const string NWNX_ON_DM_JUMP_ALL_PLAYERS_TO_POINT_BEFORE = "NWNX_ON_DM_JUMP_ALL_PLAYERS_TO_POINT_BEFORE"; +const string NWNX_ON_DM_JUMP_ALL_PLAYERS_TO_POINT_AFTER = "NWNX_ON_DM_JUMP_ALL_PLAYERS_TO_POINT_AFTER"; +const string NWNX_ON_DM_CHANGE_DIFFICULTY_BEFORE = "NWNX_ON_DM_CHANGE_DIFFICULTY_BEFORE"; +const string NWNX_ON_DM_CHANGE_DIFFICULTY_AFTER = "NWNX_ON_DM_CHANGE_DIFFICULTY_AFTER"; +const string NWNX_ON_DM_VIEW_INVENTORY_BEFORE = "NWNX_ON_DM_VIEW_INVENTORY_BEFORE"; +const string NWNX_ON_DM_VIEW_INVENTORY_AFTER = "NWNX_ON_DM_VIEW_INVENTORY_AFTER"; +const string NWNX_ON_DM_SPAWN_TRAP_ON_OBJECT_BEFORE = "NWNX_ON_DM_SPAWN_TRAP_ON_OBJECT_BEFORE"; +const string NWNX_ON_DM_SPAWN_TRAP_ON_OBJECT_AFTER = "NWNX_ON_DM_SPAWN_TRAP_ON_OBJECT_AFTER"; +const string NWNX_ON_DM_DUMP_LOCALS_BEFORE = "NWNX_ON_DM_DUMP_LOCALS_BEFORE"; +const string NWNX_ON_DM_DUMP_LOCALS_AFTER = "NWNX_ON_DM_DUMP_LOCALS_AFTER"; +const string NWNX_ON_DM_PLAYERDM_LOGIN_BEFORE = "NWNX_ON_DM_PLAYERDM_LOGIN_BEFORE"; +const string NWNX_ON_DM_PLAYERDM_LOGIN_AFTER = "NWNX_ON_DM_PLAYERDM_LOGIN_AFTER"; +const string NWNX_ON_DM_PLAYERDM_LOGOUT_BEFORE = "NWNX_ON_DM_PLAYERDM_LOGOUT_BEFORE"; +const string NWNX_ON_DM_PLAYERDM_LOGOUT_AFTER = "NWNX_ON_DM_PLAYERDM_LOGOUT_AFTER"; +const string NWNX_ON_DM_SET_STAT_BEFORE = "NWNX_ON_DM_SET_STAT_BEFORE"; +const string NWNX_ON_DM_SET_STAT_AFTER = "NWNX_ON_DM_SET_STAT_AFTER"; +const string NWNX_ON_DM_GET_VARIABLE_BEFORE = "NWNX_ON_DM_GET_VARIABLE_BEFORE"; +const string NWNX_ON_DM_GET_VARIABLE_AFTER = "NWNX_ON_DM_GET_VARIABLE_AFTER"; +const string NWNX_ON_DM_SET_VARIABLE_BEFORE = "NWNX_ON_DM_SET_VARIABLE_BEFORE"; +const string NWNX_ON_DM_SET_VARIABLE_AFTER = "NWNX_ON_DM_SET_VARIABLE_AFTER"; +const string NWNX_ON_DM_SET_FACTION_BEFORE = "NWNX_ON_DM_SET_FACTION_BEFORE"; +const string NWNX_ON_DM_SET_FACTION_AFTER = "NWNX_ON_DM_SET_FACTION_AFTER"; +const string NWNX_ON_DM_APPEAR_BEFORE = "NWNX_ON_DM_APPEAR_BEFORE"; +const string NWNX_ON_DM_APPEAR_AFTER = "NWNX_ON_DM_APPEAR_AFTER"; +const string NWNX_ON_DM_DISAPPEAR_BEFORE = "NWNX_ON_DM_DISAPPEAR_BEFORE"; +const string NWNX_ON_DM_DISAPPEAR_AFTER = "NWNX_ON_DM_DISAPPEAR_AFTER"; +const string NWNX_ON_DM_TAKE_ITEM_BEFORE = "NWNX_ON_DM_TAKE_ITEM_BEFORE"; +const string NWNX_ON_DM_TAKE_ITEM_AFTER = "NWNX_ON_DM_TAKE_ITEM_AFTER"; +const string NWNX_ON_DM_SET_TIME_BEFORE = "NWNX_ON_DM_SET_TIME_BEFORE"; +const string NWNX_ON_DM_SET_TIME_AFTER = "NWNX_ON_DM_SET_TIME_AFTER"; +const string NWNX_ON_DM_SET_DATE_BEFORE = "NWNX_ON_DM_SET_DATE_BEFORE"; +const string NWNX_ON_DM_SET_DATE_AFTER = "NWNX_ON_DM_SET_DATE_AFTER"; +const string NWNX_ON_DM_SET_FACTION_REPUTATION_BEFORE = "NWNX_ON_DM_SET_FACTION_REPUTATION_BEFORE"; +const string NWNX_ON_DM_SET_FACTION_REPUTATION_AFTER = "NWNX_ON_DM_SET_FACTION_REPUTATION_AFTER"; +const string NWNX_ON_DM_GET_FACTION_REPUTATION_BEFORE = "NWNX_ON_DM_GET_FACTION_REPUTATION_BEFORE"; +const string NWNX_ON_DM_GET_FACTION_REPUTATION_AFTER = "NWNX_ON_DM_GET_FACTION_REPUTATION_AFTER"; +const string NWNX_ON_CLIENT_DISCONNECT_BEFORE = "NWNX_ON_CLIENT_DISCONNECT_BEFORE"; +const string NWNX_ON_CLIENT_DISCONNECT_AFTER = "NWNX_ON_CLIENT_DISCONNECT_AFTER"; +const string NWNX_ON_CLIENT_CONNECT_BEFORE = "NWNX_ON_CLIENT_CONNECT_BEFORE"; +const string NWNX_ON_CLIENT_CONNECT_AFTER = "NWNX_ON_CLIENT_CONNECT_AFTER"; +const string NWNX_ON_COMBAT_ENTER_BEFORE = "NWNX_ON_COMBAT_ENTER_BEFORE"; +const string NWNX_ON_COMBAT_ENTER_AFTER = "NWNX_ON_COMBAT_ENTER_AFTER"; +const string NWNX_ON_COMBAT_EXIT_BEFORE = "NWNX_ON_COMBAT_EXIT_BEFORE"; +const string NWNX_ON_COMBAT_EXIT_AFTER = "NWNX_ON_COMBAT_EXIT_AFTER"; +const string NWNX_ON_START_COMBAT_ROUND_BEFORE = "NWNX_ON_START_COMBAT_ROUND_BEFORE"; +const string NWNX_ON_START_COMBAT_ROUND_AFTER = "NWNX_ON_START_COMBAT_ROUND_AFTER"; +const string NWNX_ON_DISARM_BEFORE = "NWNX_ON_DISARM_BEFORE"; +const string NWNX_ON_DISARM_AFTER = "NWNX_ON_DISARM_AFTER"; +const string NWNX_ON_CAST_SPELL_BEFORE = "NWNX_ON_CAST_SPELL_BEFORE"; +const string NWNX_ON_CAST_SPELL_AFTER = "NWNX_ON_CAST_SPELL_AFTER"; +const string NWNX_ON_SET_MEMORIZED_SPELL_SLOT_BEFORE = "NWNX_SET_MEMORIZED_SPELL_SLOT_BEFORE"; +const string NWNX_ON_SET_MEMORIZED_SPELL_SLOT_AFTER = "NWNX_SET_MEMORIZED_SPELL_SLOT_AFTER"; +const string NWNX_ON_CLEAR_MEMORIZED_SPELL_SLOT_BEFORE = "NWNX_CLEAR_MEMORIZED_SPELL_SLOT_BEFORE"; +const string NWNX_ON_CLEAR_MEMORIZED_SPELL_SLOT_AFTER = "NWNX_CLEAR_MEMORIZED_SPELL_SLOT_AFTER"; +const string NWNX_ON_SPELL_INTERRUPTED_BEFORE = "NWNX_ON_SPELL_INTERRUPTED_BEFORE"; +const string NWNX_ON_SPELL_INTERRUPTED_AFTER = "NWNX_ON_SPELL_INTERRUPTED_AFTER"; +const string NWNX_ON_SPELL_FAILED_BEFORE = "NWNX_ON_SPELL_FAILED_BEFORE"; +const string NWNX_ON_SPELL_FAILED_AFTER = "NWNX_ON_SPELL_FAILED_AFTER"; +const string NWNX_ON_HEALER_KIT_BEFORE = "NWNX_ON_HEALER_KIT_BEFORE"; +const string NWNX_ON_HEALER_KIT_AFTER = "NWNX_ON_HEALER_KIT_AFTER"; +const string NWNX_ON_HEAL_BEFORE = "NWNX_ON_HEAL_BEFORE"; +const string NWNX_ON_HEAL_AFTER = "NWNX_ON_HEAL_AFTER"; +const string NWNX_ON_PARTY_LEAVE_BEFORE = "NWNX_ON_PARTY_LEAVE_BEFORE"; +const string NWNX_ON_PARTY_LEAVE_AFTER = "NWNX_ON_PARTY_LEAVE_AFTER"; +const string NWNX_ON_PARTY_KICK_BEFORE = "NWNX_ON_PARTY_KICK_BEFORE"; +const string NWNX_ON_PARTY_KICK_AFTER = "NWNX_ON_PARTY_KICK_AFTER"; +const string NWNX_ON_PARTY_TRANSFER_LEADERSHIP_BEFORE = "NWNX_ON_PARTY_TRANSFER_LEADERSHIP_BEFORE"; +const string NWNX_ON_PARTY_TRANSFER_LEADERSHIP_AFTER = "NWNX_ON_PARTY_TRANSFER_LEADERSHIP_AFTER"; +const string NWNX_ON_PARTY_INVITE_BEFORE = "NWNX_ON_PARTY_INVITE_BEFORE"; +const string NWNX_ON_PARTY_INVITE_AFTER = "NWNX_ON_PARTY_INVITE_AFTER"; +const string NWNX_ON_PARTY_IGNORE_INVITATION_BEFORE = "NWNX_ON_PARTY_IGNORE_INVITATION_BEFORE"; +const string NWNX_ON_PARTY_IGNORE_INVITATION_AFTER = "NWNX_ON_PARTY_IGNORE_INVITATION_AFTER"; +const string NWNX_ON_PARTY_ACCEPT_INVITATION_BEFORE = "NWNX_ON_PARTY_ACCEPT_INVITATION_BEFORE"; +const string NWNX_ON_PARTY_ACCEPT_INVITATION_AFTER = "NWNX_ON_PARTY_ACCEPT_INVITATION_AFTER"; +const string NWNX_ON_PARTY_REJECT_INVITATION_BEFORE = "NWNX_ON_PARTY_REJECT_INVITATION_BEFORE"; +const string NWNX_ON_PARTY_REJECT_INVITATION_AFTER = "NWNX_ON_PARTY_REJECT_INVITATION_AFTER"; +const string NWNX_ON_PARTY_KICK_HENCHMAN_BEFORE = "NWNX_ON_PARTY_KICK_HENCHMAN_BEFORE"; +const string NWNX_ON_PARTY_KICK_HENCHMAN_AFTER = "NWNX_ON_PARTY_KICK_HENCHMAN_AFTER"; +const string NWNX_ON_COMBAT_MODE_ON = "NWNX_ON_COMBAT_MODE_ON"; +const string NWNX_ON_COMBAT_MODE_OFF = "NWNX_ON_COMBAT_MODE_OFF"; +const string NWNX_ON_USE_SKILL_BEFORE = "NWNX_ON_USE_SKILL_BEFORE"; +const string NWNX_ON_USE_SKILL_AFTER = "NWNX_ON_USE_SKILL_AFTER"; +const string NWNX_ON_MAP_PIN_ADD_PIN_BEFORE = "NWNX_ON_MAP_PIN_ADD_PIN_BEFORE"; +const string NWNX_ON_MAP_PIN_ADD_PIN_AFTER = "NWNX_ON_MAP_PIN_ADD_PIN_AFTER"; +const string NWNX_ON_MAP_PIN_CHANGE_PIN_BEFORE = "NWNX_ON_MAP_PIN_CHANGE_PIN_BEFORE"; +const string NWNX_ON_MAP_PIN_CHANGE_PIN_AFTER = "NWNX_ON_MAP_PIN_CHANGE_PIN_AFTER"; +const string NWNX_ON_MAP_PIN_DESTROY_PIN_BEFORE = "NWNX_ON_MAP_PIN_DESTROY_PIN_BEFORE"; +const string NWNX_ON_MAP_PIN_DESTROY_PIN_AFTER = "NWNX_ON_MAP_PIN_DESTROY_PIN_AFTER"; +const string NWNX_ON_DO_LISTEN_DETECTION_BEFORE = "NWNX_ON_DO_LISTEN_DETECTION_BEFORE"; +const string NWNX_ON_DO_LISTEN_DETECTION_AFTER = "NWNX_ON_DO_LISTEN_DETECTION_AFTER"; +const string NWNX_ON_DO_SPOT_DETECTION_BEFORE = "NWNX_ON_DO_SPOT_DETECTION_BEFORE"; +const string NWNX_ON_DO_SPOT_DETECTION_AFTER = "NWNX_ON_DO_SPOT_DETECTION_AFTER"; +const string NWNX_ON_POLYMORPH_BEFORE = "NWNX_ON_POLYMORPH_BEFORE"; +const string NWNX_ON_POLYMORPH_AFTER = "NWNX_ON_POLYMORPH_AFTER"; +const string NWNX_ON_UNPOLYMORPH_BEFORE = "NWNX_ON_UNPOLYMORPH_BEFORE"; +const string NWNX_ON_UNPOLYMORPH_AFTER = "NWNX_ON_UNPOLYMORPH_AFTER"; +const string NWNX_ON_EFFECT_APPLIED_BEFORE = "NWNX_ON_EFFECT_APPLIED_BEFORE"; +const string NWNX_ON_EFFECT_APPLIED_AFTER = "NWNX_ON_EFFECT_APPLIED_AFTER"; +const string NWNX_ON_EFFECT_REMOVED_BEFORE = "NWNX_ON_EFFECT_REMOVED_BEFORE"; +const string NWNX_ON_EFFECT_REMOVED_AFTER = "NWNX_ON_EFFECT_REMOVED_AFTER"; +const string NWNX_ON_QUICKCHAT_BEFORE = "NWNX_ON_QUICKCHAT_BEFORE"; +const string NWNX_ON_QUICKCHAT_AFTER = "NWNX_ON_QUICKCHAT_AFTER"; +const string NWNX_ON_INVENTORY_OPEN_BEFORE = "NWNX_ON_INVENTORY_OPEN_BEFORE"; +const string NWNX_ON_INVENTORY_OPEN_AFTER = "NWNX_ON_INVENTORY_OPEN_AFTER"; +const string NWNX_ON_INVENTORY_SELECT_PANEL_BEFORE = "NWNX_ON_INVENTORY_SELECT_PANEL_BEFORE"; +const string NWNX_ON_INVENTORY_SELECT_PANEL_AFTER = "NWNX_ON_INVENTORY_SELECT_PANEL_AFTER"; +const string NWNX_ON_BARTER_START_BEFORE = "NWNX_ON_BARTER_START_BEFORE"; +const string NWNX_ON_BARTER_START_AFTER = "NWNX_ON_BARTER_START_AFTER"; +const string NWNX_ON_BARTER_END_BEFORE = "NWNX_ON_BARTER_END_BEFORE"; +const string NWNX_ON_BARTER_END_AFTER = "NWNX_ON_BARTER_END_AFTER"; +const string NWNX_ON_BARTER_ADD_ITEM_BEFORE = "NWNX_ON_BARTER_ADD_ITEM_BEFORE"; +const string NWNX_ON_BARTER_ADD_ITEM_AFTER = "NWNX_ON_BARTER_ADD_ITEM_AFTER"; +const string NWNX_ON_TRAP_DISARM_BEFORE = "NWNX_ON_TRAP_DISARM_BEFORE"; +const string NWNX_ON_TRAP_DISARM_AFTER = "NWNX_ON_TRAP_DISARM_AFTER"; +const string NWNX_ON_TRAP_ENTER_BEFORE = "NWNX_ON_TRAP_ENTER_BEFORE"; +const string NWNX_ON_TRAP_ENTER_AFTER = "NWNX_ON_TRAP_ENTER_AFTER"; +const string NWNX_ON_TRAP_EXAMINE_BEFORE = "NWNX_ON_TRAP_EXAMINE_BEFORE"; +const string NWNX_ON_TRAP_EXAMINE_AFTER = "NWNX_ON_TRAP_EXAMINE_AFTER"; +const string NWNX_ON_TRAP_FLAG_BEFORE = "NWNX_ON_TRAP_FLAG_BEFORE"; +const string NWNX_ON_TRAP_FLAG_AFTER = "NWNX_ON_TRAP_FLAG_AFTER"; +const string NWNX_ON_TRAP_RECOVER_BEFORE = "NWNX_ON_TRAP_RECOVER_BEFORE"; +const string NWNX_ON_TRAP_RECOVER_AFTER = "NWNX_ON_TRAP_RECOVER_AFTER"; +const string NWNX_ON_TRAP_SET_BEFORE = "NWNX_ON_TRAP_SET_BEFORE"; +const string NWNX_ON_TRAP_SET_AFTER = "NWNX_ON_TRAP_SET_AFTER"; +const string NWNX_ON_TIMING_BAR_START_BEFORE = "NWNX_ON_TIMING_BAR_START_BEFORE"; +const string NWNX_ON_TIMING_BAR_START_AFTER = "NWNX_ON_TIMING_BAR_START_AFTER"; +const string NWNX_ON_TIMING_BAR_STOP_BEFORE = "NWNX_ON_TIMING_BAR_STOP_BEFORE"; +const string NWNX_ON_TIMING_BAR_STOP_AFTER = "NWNX_ON_TIMING_BAR_STOP_AFTER"; +const string NWNX_ON_TIMING_BAR_CANCEL_BEFORE = "NWNX_ON_TIMING_BAR_CANCEL_BEFORE"; +const string NWNX_ON_TIMING_BAR_CANCEL_AFTER = "NWNX_ON_TIMING_BAR_CANCEL_AFTER"; +const string NWNX_ON_WEBHOOK_SUCCESS = "NWNX_ON_WEBHOOK_SUCCESS"; +const string NWNX_ON_WEBHOOK_FAILURE = "NWNX_ON_WEBHOOK_FAILURE"; +const string NWNX_ON_CHECK_STICKY_PLAYER_NAME_RESERVED_BEFORE = "NWNX_ON_CHECK_STICKY_PLAYER_NAME_RESERVED_BEFORE"; +const string NWNX_ON_CHECK_STICKY_PLAYER_NAME_RESERVED_AFTER = "NWNX_ON_CHECK_STICKY_PLAYER_NAME_RESERVED_AFTER"; +const string NWNX_ON_SERVER_CHARACTER_SAVE_BEFORE = "NWNX_ON_SERVER_CHARACTER_SAVE_BEFORE"; +const string NWNX_ON_SERVER_CHARACTER_SAVE_AFTER = "NWNX_ON_SERVER_CHARACTER_SAVE_AFTER"; +const string NWNX_ON_CLIENT_EXPORT_CHARACTER_BEFORE = "NWNX_ON_CLIENT_EXPORT_CHARACTER_BEFORE"; +const string NWNX_ON_CLIENT_EXPORT_CHARACTER_AFTER = "NWNX_ON_CLIENT_EXPORT_CHARACTER_AFTER"; +const string NWNX_ON_LEVEL_UP_BEFORE = "NWNX_ON_LEVEL_UP_BEFORE"; +const string NWNX_ON_LEVEL_UP_AFTER = "NWNX_ON_LEVEL_UP_AFTER"; +const string NWNX_ON_LEVEL_UP_AUTOMATIC_BEFORE = "NWNX_ON_LEVEL_UP_AUTOMATIC_BEFORE"; +const string NWNX_ON_LEVEL_UP_AUTOMATIC_AFTER = "NWNX_ON_LEVEL_UP_AUTOMATIC_AFTER"; +const string NWNX_ON_LEVEL_DOWN_BEFORE = "NWNX_ON_LEVEL_DOWN_BEFORE"; +const string NWNX_ON_LEVEL_DOWN_AFTER = "NWNX_ON_LEVEL_DOWN_AFTER"; +const string NWNX_ON_INVENTORY_ADD_ITEM_BEFORE = "NWNX_ON_INVENTORY_ADD_ITEM_BEFORE"; +const string NWNX_ON_INVENTORY_ADD_ITEM_AFTER = "NWNX_ON_INVENTORY_ADD_ITEM_AFTER"; +const string NWNX_ON_INVENTORY_REMOVE_ITEM_BEFORE = "NWNX_ON_INVENTORY_REMOVE_ITEM_BEFORE"; +const string NWNX_ON_INVENTORY_REMOVE_ITEM_AFTER = "NWNX_ON_INVENTORY_REMOVE_ITEM_AFTER"; +const string NWNX_ON_INVENTORY_ADD_GOLD_BEFORE = "NWNX_ON_INVENTORY_ADD_GOLD_BEFORE"; +const string NWNX_ON_INVENTORY_ADD_GOLD_AFTER = "NWNX_ON_INVENTORY_ADD_GOLD_AFTER"; +const string NWNX_ON_INVENTORY_REMOVE_GOLD_BEFORE = "NWNX_ON_INVENTORY_REMOVE_GOLD_BEFORE"; +const string NWNX_ON_INVENTORY_REMOVE_GOLD_AFTER = "NWNX_ON_INVENTORY_REMOVE_GOLD_AFTER"; +const string NWNX_ON_PVP_ATTITUDE_CHANGE_BEFORE = "NWNX_ON_PVP_ATTITUDE_CHANGE_BEFORE"; +const string NWNX_ON_PVP_ATTITUDE_CHANGE_AFTER = "NWNX_ON_PVP_ATTITUDE_CHANGE_AFTER"; +const string NWNX_ON_INPUT_WALK_TO_WAYPOINT_BEFORE = "NWNX_ON_INPUT_WALK_TO_WAYPOINT_BEFORE"; +const string NWNX_ON_INPUT_WALK_TO_WAYPOINT_AFTER = "NWNX_ON_INPUT_WALK_TO_WAYPOINT_AFTER"; +const string NWNX_ON_MATERIALCHANGE_BEFORE = "NWNX_ON_MATERIALCHANGE_BEFORE"; +const string NWNX_ON_MATERIALCHANGE_AFTER = "NWNX_ON_MATERIALCHANGE_AFTER"; +const string NWNX_ON_INPUT_ATTACK_OBJECT_BEFORE = "NWNX_ON_INPUT_ATTACK_OBJECT_BEFORE"; +const string NWNX_ON_INPUT_ATTACK_OBJECT_AFTER = "NWNX_ON_INPUT_ATTACK_OBJECT_AFTER"; +const string NWNX_ON_INPUT_FORCE_MOVE_TO_OBJECT_BEFORE = "NWNX_ON_INPUT_FORCE_MOVE_TO_OBJECT_BEFORE"; +const string NWNX_ON_INPUT_FORCE_MOVE_TO_OBJECT_AFTER = "NWNX_ON_INPUT_FORCE_MOVE_TO_OBJECT_AFTER"; +const string NWNX_ON_INPUT_CAST_SPELL_BEFORE = "NWNX_ON_INPUT_CAST_SPELL_BEFORE"; +const string NWNX_ON_INPUT_CAST_SPELL_AFTER = "NWNX_ON_INPUT_CAST_SPELL_AFTER"; +const string NWNX_ON_INPUT_KEYBOARD_BEFORE = "NWNX_ON_INPUT_KEYBOARD_BEFORE"; +const string NWNX_ON_INPUT_KEYBOARD_AFTER = "NWNX_ON_INPUT_KEYBOARD_AFTER"; +const string NWNX_ON_INPUT_TOGGLE_PAUSE_BEFORE = "NWNX_ON_INPUT_TOGGLE_PAUSE_BEFORE"; +const string NWNX_ON_INPUT_TOGGLE_PAUSE_AFTER = "NWNX_ON_INPUT_TOGGLE_PAUSE_AFTER"; +const string NWNX_ON_OBJECT_LOCK_BEFORE = "NWNX_ON_OBJECT_LOCK_BEFORE"; +const string NWNX_ON_OBJECT_LOCK_AFTER = "NWNX_ON_OBJECT_LOCK_AFTER"; +const string NWNX_ON_OBJECT_UNLOCK_BEFORE = "NWNX_ON_OBJECT_UNLOCK_BEFORE"; +const string NWNX_ON_OBJECT_UNLOCK_AFTER = "NWNX_ON_OBJECT_UNLOCK_AFTER"; +const string NWNX_ON_UUID_COLLISION_BEFORE = "NWNX_ON_UUID_COLLISION_BEFORE"; +const string NWNX_ON_UUID_COLLISION_AFTER = "NWNX_ON_UUID_COLLISION_AFTER"; +const string NWNX_ON_RESOURCE_ADDED = "NWNX_ON_RESOURCE_ADDED"; +const string NWNX_ON_RESOURCE_REMOVED = "NWNX_ON_RESOURCE_REMOVED"; +const string NWNX_ON_RESOURCE_MODIFIED = "NWNX_ON_RESOURCE_MODIFIED"; +const string NWNX_ON_ELC_VALIDATE_CHARACTER_BEFORE = "NWNX_ON_ELC_VALIDATE_CHARACTER_BEFORE"; +const string NWNX_ON_ELC_VALIDATE_CHARACTER_AFTER = "NWNX_ON_ELC_VALIDATE_CHARACTER_AFTER"; +const string NWNX_ON_QUICKBAR_SET_BUTTON_BEFORE = "NWNX_ON_QUICKBAR_SET_BUTTON_BEFORE"; +const string NWNX_ON_QUICKBAR_SET_BUTTON_AFTER = "NWNX_ON_QUICKBAR_SET_BUTTON_AFTER"; +const string NWNX_ON_CALENDAR_HOUR = "NWNX_ON_CALENDAR_HOUR"; +const string NWNX_ON_CALENDAR_DAY = "NWNX_ON_CALENDAR_DAY"; +const string NWNX_ON_CALENDAR_MONTH = "NWNX_ON_CALENDAR_MONTH"; +const string NWNX_ON_CALENDAR_YEAR = "NWNX_ON_CALENDAR_YEAR"; +const string NWNX_ON_CALENDAR_DAWN = "NWNX_ON_CALENDAR_DAWN"; +const string NWNX_ON_CALENDAR_DUSK = "NWNX_ON_CALENDAR_DUSK"; +const string NWNX_ON_BROADCAST_CAST_SPELL_BEFORE = "NWNX_ON_BROADCAST_CAST_SPELL_BEFORE"; +const string NWNX_ON_BROADCAST_CAST_SPELL_AFTER = "NWNX_ON_BROADCAST_CAST_SPELL_AFTER"; +const string NWNX_ON_DEBUG_RUN_SCRIPT_BEFORE = "NWNX_ON_DEBUG_RUN_SCRIPT_BEFORE"; +const string NWNX_ON_DEBUG_RUN_SCRIPT_AFTER = "NWNX_ON_DEBUG_RUN_SCRIPT_AFTER"; +const string NWNX_ON_DEBUG_RUN_SCRIPT_CHUNK_BEFORE = "NWNX_ON_DEBUG_RUN_SCRIPT_CHUNK_BEFORE"; +const string NWNX_ON_DEBUG_RUN_SCRIPT_CHUNK_AFTER = "NWNX_ON_DEBUG_RUN_SCRIPT_CHUNK_AFTER"; +const string NWNX_ON_DEBUG_PLAY_VISUAL_EFFECT_BEFORE = "NWNX_ON_DEBUG_PLAY_VISUAL_EFFECT_BEFORE"; +const string NWNX_ON_DEBUG_PLAY_VISUAL_EFFECT_AFTER = "NWNX_ON_DEBUG_PLAY_VISUAL_EFFECT_AFTER"; +const string NWNX_ON_STORE_REQUEST_BUY_BEFORE = "NWNX_ON_STORE_REQUEST_BUY_BEFORE"; +const string NWNX_ON_STORE_REQUEST_BUY_AFTER = "NWNX_ON_STORE_REQUEST_BUY_AFTER"; +const string NWNX_ON_STORE_REQUEST_SELL_BEFORE = "NWNX_ON_STORE_REQUEST_SELL_BEFORE"; +const string NWNX_ON_STORE_REQUEST_SELL_AFTER = "NWNX_ON_STORE_REQUEST_SELL_AFTER"; +const string NWNX_ON_SERVER_SEND_AREA_BEFORE = "NWNX_ON_SERVER_SEND_AREA_BEFORE"; +const string NWNX_ON_SERVER_SEND_AREA_AFTER = "NWNX_ON_SERVER_SEND_AREA_AFTER"; +const string NWNX_ON_JOURNAL_OPEN_BEFORE = "NWNX_ON_JOURNAL_OPEN_BEFORE"; +const string NWNX_ON_JOURNAL_OPEN_AFTER = "NWNX_ON_JOURNAL_OPEN_AFTER"; +const string NWNX_ON_JOURNAL_CLOSE_BEFORE = "NWNX_ON_JOURNAL_CLOSE_BEFORE"; +const string NWNX_ON_JOURNAL_CLOSE_AFTER = "NWNX_ON_JOURNAL_CLOSE_AFTER"; +const string NWNX_ON_INPUT_EMOTE_BEFORE = "NWNX_ON_INPUT_EMOTE_BEFORE"; +const string NWNX_ON_INPUT_EMOTE_AFTER = "NWNX_ON_INPUT_EMOTE_AFTER"; +const string NWNX_ON_COMBAT_DR_BROKEN_BEFORE = "NWNX_ON_COMBAT_DR_BROKEN_BEFORE"; +const string NWNX_ON_COMBAT_DR_BROKEN_AFTER = "NWNX_ON_COMBAT_DR_BROKEN_AFTER"; +const string NWNX_ON_UNPOSSESS_FAMILIAR_BEFORE = "NWNX_ON_UNPOSSESS_FAMILIAR_BEFORE"; +const string NWNX_ON_UNPOSSESS_FAMILIAR_AFTER = "NWNX_ON_UNPOSSESS_FAMILIAR_AFTER"; +const string NWNX_ON_CLIENT_LEVEL_UP_BEGIN_BEFORE = "NWNX_ON_CLIENT_LEVEL_UP_BEGIN_BEFORE"; +const string NWNX_ON_CLIENT_LEVEL_UP_BEGIN_AFTER = "NWNX_ON_CLIENT_LEVEL_UP_BEGIN_AFTER"; +const string NWNX_ON_POSSESS_FAMILIAR_BEFORE = "NWNX_ON_POSSESS_FAMILIAR_BEFORE"; +const string NWNX_ON_POSSESS_FAMILIAR_AFTER = "NWNX_ON_POSSESS_FAMILIAR_AFTER"; +const string NWNX_ON_CHARACTER_SHEET_PERMITTED_BEFORE = "NWNX_ON_CHARACTER_SHEET_PERMITTED_BEFORE"; +const string NWNX_ON_CHARACTER_SHEET_PERMITTED_AFTER = "NWNX_ON_CHARACTER_SHEET_PERMITTED_AFTER"; +const string NWNX_ON_CHARACTER_SHEET_OPEN_BEFORE = "NWNX_ON_CHARACTER_SHEET_OPEN_BEFORE"; +const string NWNX_ON_CHARACTER_SHEET_OPEN_AFTER = "NWNX_ON_CHARACTER_SHEET_OPEN_AFTER"; +const string NWNX_ON_CHARACTER_SHEET_CLOSE_BEFORE = "NWNX_ON_CHARACTER_SHEET_CLOSE_BEFORE"; +const string NWNX_ON_CHARACTER_SHEET_CLOSE_AFTER = "NWNX_ON_CHARACTER_SHEET_CLOSE_AFTER"; +const string NWNX_ON_CLIENT_SET_DEVICE_PROPERTY_BEFORE = "NWNX_ON_CLIENT_SET_DEVICE_PROPERTY_BEFORE"; +const string NWNX_ON_CLIENT_SET_DEVICE_PROPERTY_AFTER = "NWNX_ON_CLIENT_SET_DEVICE_PROPERTY_AFTER"; +const string NWNX_ON_INPUT_DROP_ITEM_BEFORE = "NWNX_ON_INPUT_DROP_ITEM_BEFORE"; +const string NWNX_ON_INPUT_DROP_ITEM_AFTER = "NWNX_ON_INPUT_DROP_ITEM_AFTER"; +const string NWNX_ON_DECREMENT_SPELL_COUNT_BEFORE = "NWNX_ON_DECREMENT_SPELL_COUNT_BEFORE"; +const string NWNX_ON_DECREMENT_SPELL_COUNT_AFTER = "NWNX_ON_DECREMENT_SPELL_COUNT_AFTER"; +const string NWNX_ON_RUN_EVENT_SCRIPT_BEFORE = "NWNX_ON_RUN_EVENT_SCRIPT_BEFORE"; +const string NWNX_ON_RUN_EVENT_SCRIPT_AFTER = "NWNX_ON_RUN_EVENT_SCRIPT_AFTER"; +const string NWNX_ON_OBJECT_USE_BEFORE = "NWNX_ON_OBJECT_USE_BEFORE"; +const string NWNX_ON_OBJECT_USE_AFTER = "NWNX_ON_OBJECT_USE_AFTER"; +const string NWNX_ON_PLACEABLE_OPEN_BEFORE = "NWNX_ON_PLACEABLE_OPEN_BEFORE"; +const string NWNX_ON_PLACEABLE_OPEN_AFTER = "NWNX_ON_PLACEABLE_OPEN_AFTER"; +const string NWNX_ON_PLACEABLE_CLOSE_BEFORE = "NWNX_ON_PLACEABLE_CLOSE_BEFORE"; +const string NWNX_ON_PLACEABLE_CLOSE_AFTER = "NWNX_ON_PLACEABLE_CLOSE_AFTER"; +const string NWNX_ON_BROADCAST_SAFE_PROJECTILE_BEFORE = "NWNX_ON_BROADCAST_SAFE_PROJECTILE_BEFORE"; +const string NWNX_ON_BROADCAST_SAFE_PROJECTILE_AFTER = "NWNX_ON_BROADCAST_SAFE_PROJECTILE_AFTER"; +const string NWNX_ON_BROADCAST_ATTACK_OF_OPPORTUNITY_BEFORE = "NWNX_ON_BROADCAST_ATTACK_OF_OPPORTUNITY_BEFORE"; +const string NWNX_ON_BROADCAST_ATTACK_OF_OPPORTUNITY_AFTER = "NWNX_ON_BROADCAST_ATTACK_OF_OPPORTUNITY_AFTER"; +const string NWNX_ON_COMBAT_ATTACK_OF_OPPORTUNITY_BEFORE = "NWNX_ON_COMBAT_ATTACK_OF_OPPORTUNITY_BEFORE"; +const string NWNX_ON_COMBAT_ATTACK_OF_OPPORTUNITY_AFTER = "NWNX_ON_COMBAT_ATTACK_OF_OPPORTUNITY_AFTER"; +const string NWNX_ON_AREA_PLAY_BATTLE_MUSIC_BEFORE = "NWNX_ON_AREA_PLAY_BATTLE_MUSIC_BEFORE"; +const string NWNX_ON_AREA_PLAY_BATTLE_MUSIC_AFTER = "NWNX_ON_AREA_PLAY_BATTLE_MUSIC_AFTER"; +const string NWNX_ON_ATTACK_TARGET_CHANGE_BEFORE = "NWNX_ON_ATTACK_TARGET_CHANGE_BEFORE"; +const string NWNX_ON_ATTACK_TARGET_CHANGE_AFTER = "NWNX_ON_ATTACK_TARGET_CHANGE_AFTER"; +const string NWNX_ON_CREATURE_TILE_CHANGE_BEFORE = "NWNX_ON_CREATURE_TILE_CHANGE_BEFORE"; +const string NWNX_ON_CREATURE_TILE_CHANGE_AFTER = "NWNX_ON_CREATURE_TILE_CHANGE_AFTER"; +const string NWNX_ON_CREATURE_JUMP_TO_POINT_BEFORE = "NWNX_ON_CREATURE_JUMP_TO_POINT_BEFORE"; +const string NWNX_ON_CREATURE_JUMP_TO_POINT_AFTER = "NWNX_ON_CREATURE_JUMP_TO_POINT_AFTER"; +const string NWNX_ON_CREATURE_JUMP_TO_OBJECT_BEFORE = "NWNX_ON_CREATURE_JUMP_TO_OBJECT_BEFORE"; +const string NWNX_ON_CREATURE_JUMP_TO_OBJECT_AFTER = "NWNX_ON_CREATURE_JUMP_TO_OBJECT_AFTER"; +const string NWNX_ON_ITEMPROPERTY_EFFECT_APPLIED_BEFORE = "NWNX_ON_ITEMPROPERTY_EFFECT_APPLIED_BEFORE"; +const string NWNX_ON_ITEMPROPERTY_EFFECT_APPLIED_AFTER = "NWNX_ON_ITEMPROPERTY_EFFECT_APPLIED_AFTER"; +const string NWNX_ON_ITEMPROPERTY_EFFECT_REMOVED_BEFORE = "NWNX_ON_ITEMPROPERTY_EFFECT_REMOVED_BEFORE"; +const string NWNX_ON_ITEMPROPERTY_EFFECT_REMOVED_AFTER = "NWNX_ON_ITEMPROPERTY_EFFECT_REMOVED_AFTER"; +/// @} + +/// @name Events ObjectType Constants +/// @anchor events_objtype +/// @{ const int NWNX_EVENTS_OBJECT_TYPE_CREATURE = 5; const int NWNX_EVENTS_OBJECT_TYPE_ITEM = 6; const int NWNX_EVENTS_OBJECT_TYPE_TRIGGER = 7; @@ -1322,9 +2133,11 @@ const int NWNX_EVENTS_OBJECT_TYPE_PLACEABLE = 9; const int NWNX_EVENTS_OBJECT_TYPE_WAYPOINT = 12; const int NWNX_EVENTS_OBJECT_TYPE_ENCOUNTER = 13; const int NWNX_EVENTS_OBJECT_TYPE_PORTAL = 15; -*/ +/// @} -/* +/// @name Events TimingBar Constants +/// @anchor events_timingbar +/// @{ const int NWNX_EVENTS_TIMING_BAR_TRAP_FLAG = 1; const int NWNX_EVENTS_TIMING_BAR_TRAP_RECOVER = 2; const int NWNX_EVENTS_TIMING_BAR_TRAP_DISARM = 3; @@ -1334,7 +2147,45 @@ const int NWNX_EVENTS_TIMING_BAR_REST = 6; const int NWNX_EVENTS_TIMING_BAR_UNLOCK = 7; const int NWNX_EVENTS_TIMING_BAR_LOCK = 8; const int NWNX_EVENTS_TIMING_BAR_CUSTOM = 10; -*/ +/// @} + +/// @name Events SetVariable Constants +/// @anchor events_setvariable +/// @{ +const int NWNX_EVENTS_DM_SET_VARIABLE_TYPE_INT = 0; +const int NWNX_EVENTS_DM_SET_VARIABLE_TYPE_FLOAT = 1; +const int NWNX_EVENTS_DM_SET_VARIABLE_TYPE_STRING = 2; +const int NWNX_EVENTS_DM_SET_VARIABLE_TYPE_OBJECT = 3; +/// @} + +/// @name Events BroadcastSafeProjectile Constants +/// @anchor events_projtype +/// @{ +const int NWNX_EVENTS_BROADCAST_SAFE_PROJECTILE_TYPE_WEAPON_VFX_NONE = 0; +const int NWNX_EVENTS_BROADCAST_SAFE_PROJECTILE_TYPE_WEAPON_VFX_ACID = 1; +const int NWNX_EVENTS_BROADCAST_SAFE_PROJECTILE_TYPE_WEAPON_VFX_COLD = 2; +const int NWNX_EVENTS_BROADCAST_SAFE_PROJECTILE_TYPE_WEAPON_VFX_ELECTRICAL = 3; +const int NWNX_EVENTS_BROADCAST_SAFE_PROJECTILE_TYPE_WEAPON_VFX_FIRE = 4; +const int NWNX_EVENTS_BROADCAST_SAFE_PROJECTILE_TYPE_WEAPON_VFX_SONIC = 5; +const int NWNX_EVENTS_BROADCAST_SAFE_PROJECTILE_TYPE_SPELL_DEFAULT = 6; +const int NWNX_EVENTS_BROADCAST_SAFE_PROJECTILE_TYPE_SPELL_USE_PATH = 7; +/// @} + +/// @name Spell failed event reasons +/// @anchor events_spellfailreason +/// @{ +const int NWNX_EVENTS_SPELLFAIL_REASON_CANCELED = 0; +const int NWNX_EVENTS_SPELLFAIL_REASON_COUNTERSPELL = 1; +const int NWNX_EVENTS_SPELLFAIL_REASON_ASF = 2; +const int NWNX_EVENTS_SPELLFAIL_REASON_SPELLFAILURE = 3; +const int NWNX_EVENTS_SPELLFAIL_REASON_LOST_TARGET = 4; +const int NWNX_EVENTS_SPELLFAIL_REASON_SILENCED = 5; +const int NWNX_EVENTS_SPELLFAIL_REASON_DEFCAST_CONCENTRATION = 6; +const int NWNX_EVENTS_SPELLFAIL_REASON_ENTANGLE_CONCENTRATION = 7; +const int NWNX_EVENTS_SPELLFAIL_REASON_POLYMORPHED = 8; +const int NWNX_EVENTS_SPELLFAIL_REASON_CANT_CAST = 9; +const int NWNX_EVENTS_SPELLFAIL_REASON_CANT_USE_HANDS = 10; +/// @} /// @brief Scripts can subscribe to events. /// @@ -1349,6 +2200,25 @@ void NWNX_Events_SubscribeEvent(string evt, string script); /// @param script The script. void NWNX_Events_UnsubscribeEvent(string evt, string script); +/// @brief Unsubscribe all scripts from all events starting with prefix. +/// @param prefix the prefix to match against. Can be empty. +void NWNX_Events_UnsubscribeAllStartingWith(string prefix); + +/// @brief Script chunks can subscribe to events. +/// +/// Some events are dispatched via the NWNX plugin (see NWNX_EVENTS_EVENT_* constants). +/// Others can be signalled via script code via NWNX_Events_SignalEvent(). +/// @param sEvent The event name. +/// @param sScriptChunk The script chunk to execute when the event fires. +/// @param bWrapIntoMain TRUE if the script chunk needs to be wrapped into a void main(){}. +void NWNX_Events_SubscribeEventScriptChunk(string sEvent, string sScriptChunk, int bWrapIntoMain = TRUE); + +/// @brief Unsubscribe a script chunk from an event +/// @param sEvent The event name. +/// @param sScriptChunk The script chunk. +/// @param bWrapIntoMain TRUE if the script chunk needs to be wrapped into a void main(){}. Must match the value used when subscribing. +void NWNX_Events_UnsubscribeEventScriptChunk(string sEvent, string sScriptChunk, int bWrapIntoMain = TRUE); + /// Pushes event data at the provided tag, which subscribers can access with GetEventData. /// This should be called BEFORE SignalEvent. void NWNX_Events_PushEventData(string tag, string data); @@ -1384,9 +2254,9 @@ string NWNX_Events_GetEventData(string tag); /// - DMAction events /// - Client connect event /// - Client Export Character event -/// - Spell events +/// - Spell events (except SPELL_FAILED) /// - QuickChat events -/// - Barter event (START only) +/// - Barter event (START/ADD_ITEM only) /// - Trap events /// - Sticky Player Name event /// - Server Character Save Events @@ -1402,6 +2272,16 @@ string NWNX_Events_GetEventData(string tag); /// - Disarm event /// - {Enter|Exit}Detect events /// - Faction events +/// - UnpossessFamiliar event +/// - ClientLevelUpBegin event +/// - CharacterSheetPermitted event +/// - Input Drop Item +/// - Decrement Spell Count event +/// - Play Visual Effect event +/// - EventScript event +/// - Broadcast Safe Projectile event +/// - Attack of Opportunity events +/// - Creature Jump events void NWNX_Events_SkipEvent(); /// Set the return value of the event. @@ -1420,6 +2300,8 @@ void NWNX_Events_SkipEvent(); /// - Has Feat event -> "1" or "0" /// - Stealth event -> "1" to perform HiPS (without the feat), "0" to bypass HiPS /// - Faction set reputation event -> The new reputation to apply instead. ("0" - "100") +/// - CharacterSheetPermitted event -> "1" allow the player to view the character sheet or "0" to disallow +/// - Attack target change event -> The new target object. Convert to string with ObjectToString() void NWNX_Events_SetEventResult(string data); /// Returns the current event name @@ -1427,22 +2309,25 @@ void NWNX_Events_SetEventResult(string data); /// Returns "" on error string NWNX_Events_GetCurrentEvent(); -/// Toggles DispatchListMode for sEvent+sScript -/// If enabled, sEvent for sScript will only be signalled if the target object is on its dispatch list. -void NWNX_Events_ToggleDispatchListMode(string sEvent, string sScript, int bEnable); +/// Toggles DispatchListMode for sEvent+sScript(Chunk) +/// If enabled, sEvent for sScript(Chunk) will only be signalled if the target object is on its dispatch list. +void NWNX_Events_ToggleDispatchListMode(string sEvent, string sScriptOrChunk, int bEnable); -/// Add oObject to the dispatch list for sEvent+sScript. -void NWNX_Events_AddObjectToDispatchList(string sEvent, string sScript, object oObject); +/// Add oObject to the dispatch list for sEvent+sScript(Chunk). +void NWNX_Events_AddObjectToDispatchList(string sEvent, string sScriptOrChunk, object oObject); -/// Remove oObject from the dispatch list for sEvent+sScript. -void NWNX_Events_RemoveObjectFromDispatchList(string sEvent, string sScript, object oObject); +/// Remove oObject from the dispatch list for sEvent+sScript(Chunk). +void NWNX_Events_RemoveObjectFromDispatchList(string sEvent, string sScriptOrChunk, object oObject); /// @brief Toggle the whitelisting of IDs for sEvent. If whitelisting is enabled, the event will only fire for IDs that are /// on its whitelist. /// /// ONLY WORKS WITH THE FOLLOWING EVENTS -> ID TYPES: /// - NWNX_ON_CAST_SPELL -> SpellID +/// - NWNX_ON_SPELL_FAILED -> SpellID /// - NWNX_ON_HAS_FEAT -> FeatID (default enabled) +/// - NWNX_ON_RUN_EVENT_SCRIPT -> EVENT_SCRIPT_* (default enabled) +/// - NWNX_ON_BROADCAST_SAFE_PROJECTILE -> NWNX_ON_BROADCAST_SAFE_PROJECTILE_TYPE for ProjectileType, NWNX_ON_BROADCAST_SAFE_PROJECTILE_SPELL for SpellID /// /// @note This enables the whitelist for ALL scripts subscribed to sEvent. /// @param sEvent The event name without _BEFORE / _AFTER. @@ -1461,14 +2346,19 @@ void NWNX_Events_AddIDToWhitelist(string sEvent, int nID); /// @param nID The ID. void NWNX_Events_RemoveIDFromWhitelist(string sEvent, int nID); +/// @brief Get the number of subscribers to sEvent. +/// @param sEvent The event. +/// @return The number of subscribers sEvent has or 0 on error. +int NWNX_Events_GetNumSubscribers(string sEvent); + /// @} void NWNX_Events_SubscribeEvent(string evt, string script) { string sFunc = "SubscribeEvent"; - NWNX_PushArgumentString(NWNX_Events, sFunc, script); - NWNX_PushArgumentString(NWNX_Events, sFunc, evt); + NWNX_PushArgumentString(script); + NWNX_PushArgumentString(evt); NWNX_CallFunction(NWNX_Events, sFunc); } @@ -1476,8 +2366,36 @@ void NWNX_Events_UnsubscribeEvent(string evt, string script) { string sFunc = "UnsubscribeEvent"; - NWNX_PushArgumentString(NWNX_Events, sFunc, script); - NWNX_PushArgumentString(NWNX_Events, sFunc, evt); + NWNX_PushArgumentString(script); + NWNX_PushArgumentString(evt); + NWNX_CallFunction(NWNX_Events, sFunc); +} + +void NWNX_Events_UnsubscribeAllStartingWith(string prefix) +{ + string sFunc = "UnsubscribeAllStartingWith"; + + NWNX_PushArgumentString(prefix); + NWNX_CallFunction(NWNX_Events, sFunc); +} + +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); +} + +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); } @@ -1485,8 +2403,8 @@ void NWNX_Events_PushEventData(string tag, string data) { string sFunc = "PushEventData"; - NWNX_PushArgumentString(NWNX_Events, sFunc, data); - NWNX_PushArgumentString(NWNX_Events, sFunc, tag); + NWNX_PushArgumentString(data); + NWNX_PushArgumentString(tag); NWNX_CallFunction(NWNX_Events, sFunc); } @@ -1494,19 +2412,19 @@ int NWNX_Events_SignalEvent(string evt, object target) { string sFunc = "SignalEvent"; - NWNX_PushArgumentObject(NWNX_Events, sFunc, target); - NWNX_PushArgumentString(NWNX_Events, sFunc, evt); + NWNX_PushArgumentObject(target); + NWNX_PushArgumentString(evt); NWNX_CallFunction(NWNX_Events, sFunc); - return NWNX_GetReturnValueInt(NWNX_Events, sFunc); + return NWNX_GetReturnValueInt(); } string NWNX_Events_GetEventData(string tag) { string sFunc = "GetEventData"; - NWNX_PushArgumentString(NWNX_Events, sFunc, tag); + NWNX_PushArgumentString(tag); NWNX_CallFunction(NWNX_Events, sFunc); - return NWNX_GetReturnValueString(NWNX_Events, sFunc); + return NWNX_GetReturnValueString(); } void NWNX_Events_SkipEvent() @@ -1520,7 +2438,7 @@ void NWNX_Events_SetEventResult(string data) { string sFunc = "SetEventResult"; - NWNX_PushArgumentString(NWNX_Events, sFunc, data); + NWNX_PushArgumentString(data); NWNX_CallFunction(NWNX_Events, sFunc); } @@ -1529,36 +2447,36 @@ string NWNX_Events_GetCurrentEvent() string sFunc = "GetCurrentEvent"; NWNX_CallFunction(NWNX_Events, sFunc); - return NWNX_GetReturnValueString(NWNX_Events, sFunc); + return NWNX_GetReturnValueString(); } -void NWNX_Events_ToggleDispatchListMode(string sEvent, string sScript, int bEnable) +void NWNX_Events_ToggleDispatchListMode(string sEvent, string sScriptOrChunk, int bEnable) { string sFunc = "ToggleDispatchListMode"; - NWNX_PushArgumentInt(NWNX_Events, sFunc, bEnable); - NWNX_PushArgumentString(NWNX_Events, sFunc, sScript); - NWNX_PushArgumentString(NWNX_Events, sFunc, sEvent); + NWNX_PushArgumentInt(bEnable); + NWNX_PushArgumentString(sScriptOrChunk); + NWNX_PushArgumentString(sEvent); NWNX_CallFunction(NWNX_Events, sFunc); } -void NWNX_Events_AddObjectToDispatchList(string sEvent, string sScript, object oObject) +void NWNX_Events_AddObjectToDispatchList(string sEvent, string sScriptOrChunk, object oObject) { string sFunc = "AddObjectToDispatchList"; - NWNX_PushArgumentObject(NWNX_Events, sFunc, oObject); - NWNX_PushArgumentString(NWNX_Events, sFunc, sScript); - NWNX_PushArgumentString(NWNX_Events, sFunc, sEvent); + NWNX_PushArgumentObject(oObject); + NWNX_PushArgumentString(sScriptOrChunk); + NWNX_PushArgumentString(sEvent); NWNX_CallFunction(NWNX_Events, sFunc); } -void NWNX_Events_RemoveObjectFromDispatchList(string sEvent, string sScript, object oObject) +void NWNX_Events_RemoveObjectFromDispatchList(string sEvent, string sScriptOrChunk, object oObject) { string sFunc = "RemoveObjectFromDispatchList"; - NWNX_PushArgumentObject(NWNX_Events, sFunc, oObject); - NWNX_PushArgumentString(NWNX_Events, sFunc, sScript); - NWNX_PushArgumentString(NWNX_Events, sFunc, sEvent); + NWNX_PushArgumentObject(oObject); + NWNX_PushArgumentString(sScriptOrChunk); + NWNX_PushArgumentString(sEvent); NWNX_CallFunction(NWNX_Events, sFunc); } @@ -1566,8 +2484,8 @@ void NWNX_Events_ToggleIDWhitelist(string sEvent, int bEnable) { string sFunc = "ToggleIDWhitelist"; - NWNX_PushArgumentInt(NWNX_Events, sFunc, bEnable); - NWNX_PushArgumentString(NWNX_Events, sFunc, sEvent); + NWNX_PushArgumentInt(bEnable); + NWNX_PushArgumentString(sEvent); NWNX_CallFunction(NWNX_Events, sFunc); } @@ -1575,8 +2493,8 @@ void NWNX_Events_AddIDToWhitelist(string sEvent, int nID) { string sFunc = "AddIDToWhitelist"; - NWNX_PushArgumentInt(NWNX_Events, sFunc, nID); - NWNX_PushArgumentString(NWNX_Events, sFunc, sEvent); + NWNX_PushArgumentInt(nID); + NWNX_PushArgumentString(sEvent); NWNX_CallFunction(NWNX_Events, sFunc); } @@ -1584,7 +2502,16 @@ void NWNX_Events_RemoveIDFromWhitelist(string sEvent, int nID) { string sFunc = "RemoveIDFromWhitelist"; - NWNX_PushArgumentInt(NWNX_Events, sFunc, nID); - NWNX_PushArgumentString(NWNX_Events, sFunc, sEvent); + NWNX_PushArgumentInt(nID); + NWNX_PushArgumentString(sEvent); NWNX_CallFunction(NWNX_Events, sFunc); } + +int NWNX_Events_GetNumSubscribers(string sEvent) +{ + string sFunc = "GetNumSubscribers"; + + NWNX_PushArgumentString(sEvent); + NWNX_CallFunction(NWNX_Events, sFunc); + return NWNX_GetReturnValueInt(); +} diff --git a/_module/nss/nwnx_feat.nss b/_module/nss/nwnx_feat.nss index 3ee797ce..19746a6d 100644 --- a/_module/nss/nwnx_feat.nss +++ b/_module/nss/nwnx_feat.nss @@ -10,34 +10,37 @@ const string NWNX_Feat = "NWNX_Feat"; ///< @private /// @anchor feat_modifiers /// /// @{ -const int NWNX_FEAT_MODIFIER_INVALID = 0; -const int NWNX_FEAT_MODIFIER_AB = 1; -const int NWNX_FEAT_MODIFIER_ABILITY = 2; -const int NWNX_FEAT_MODIFIER_ABVSRACE = 3; -const int NWNX_FEAT_MODIFIER_AC = 4; -const int NWNX_FEAT_MODIFIER_ACVSRACE = 5; -const int NWNX_FEAT_MODIFIER_ARCANESPELLFAILURE = 6; -const int NWNX_FEAT_MODIFIER_CONCEALMENT = 7; -const int NWNX_FEAT_MODIFIER_DMGIMMUNITY = 8; -const int NWNX_FEAT_MODIFIER_DMGREDUCTION = 9; -const int NWNX_FEAT_MODIFIER_DMGRESIST = 10; -const int NWNX_FEAT_MODIFIER_IMMUNITY = 11; -const int NWNX_FEAT_MODIFIER_MOVEMENTSPEED = 12; -const int NWNX_FEAT_MODIFIER_REGENERATION = 13; -const int NWNX_FEAT_MODIFIER_SAVE = 14; -const int NWNX_FEAT_MODIFIER_SAVEVSRACE = 15; -const int NWNX_FEAT_MODIFIER_SAVEVSTYPE = 16; -const int NWNX_FEAT_MODIFIER_SAVEVSTYPERACE = 17; -const int NWNX_FEAT_MODIFIER_SPELLIMMUNITY = 18; -const int NWNX_FEAT_MODIFIER_SRCHARGEN = 19; -const int NWNX_FEAT_MODIFIER_SRINCLEVEL = 20; -const int NWNX_FEAT_MODIFIER_SPELLSAVEDC = 21; -const int NWNX_FEAT_MODIFIER_BONUSSPELL = 22; -const int NWNX_FEAT_MODIFIER_TRUESEEING = 23; -const int NWNX_FEAT_MODIFIER_SEEINVISIBLE = 24; -const int NWNX_FEAT_MODIFIER_ULTRAVISION = 25; -const int NWNX_FEAT_MODIFIER_HASTE = 26; -const int NWNX_FEAT_MODIFIER_VISUALEFFECT = 27; +const int NWNX_FEAT_MODIFIER_INVALID = 0; +const int NWNX_FEAT_MODIFIER_AB = 1; +const int NWNX_FEAT_MODIFIER_ABILITY = 2; +const int NWNX_FEAT_MODIFIER_ABVSRACE = 3; +const int NWNX_FEAT_MODIFIER_AC = 4; +const int NWNX_FEAT_MODIFIER_ACVSRACE = 5; +const int NWNX_FEAT_MODIFIER_ARCANESPELLFAILURE = 6; +const int NWNX_FEAT_MODIFIER_CONCEALMENT = 7; +const int NWNX_FEAT_MODIFIER_DMGIMMUNITY = 8; +const int NWNX_FEAT_MODIFIER_DMGREDUCTION = 9; +const int NWNX_FEAT_MODIFIER_DMGRESIST = 10; +const int NWNX_FEAT_MODIFIER_IMMUNITY = 11; +const int NWNX_FEAT_MODIFIER_MOVEMENTSPEED = 12; +const int NWNX_FEAT_MODIFIER_REGENERATION = 13; +const int NWNX_FEAT_MODIFIER_SAVE = 14; +const int NWNX_FEAT_MODIFIER_SAVEVSRACE = 15; +const int NWNX_FEAT_MODIFIER_SAVEVSTYPE = 16; +const int NWNX_FEAT_MODIFIER_SAVEVSTYPERACE = 17; +const int NWNX_FEAT_MODIFIER_SPELLIMMUNITY = 18; +const int NWNX_FEAT_MODIFIER_SRCHARGEN = 19; +const int NWNX_FEAT_MODIFIER_SRINCLEVEL = 20; +const int NWNX_FEAT_MODIFIER_SPELLSAVEDC = 21; +const int NWNX_FEAT_MODIFIER_BONUSSPELL = 22; +const int NWNX_FEAT_MODIFIER_TRUESEEING = 23; +const int NWNX_FEAT_MODIFIER_SEEINVISIBLE = 24; +const int NWNX_FEAT_MODIFIER_ULTRAVISION = 25; +const int NWNX_FEAT_MODIFIER_HASTE = 26; +const int NWNX_FEAT_MODIFIER_VISUALEFFECT = 27; +const int NWNX_FEAT_MODIFIER_SPELLSAVEDCFORSCHOOL = 28; +const int NWNX_FEAT_MODIFIER_SPELLSAVEDCFORSPELL = 29; +const int NWNX_FEAT_MODIFIER_DAMAGE = 30; ///@} /// @brief Sets a feat modifier. @@ -52,12 +55,12 @@ void NWNX_Feat_SetFeatModifier(int iFeat, int iMod, int iParam1 = 0xDEADBEEF, in { string sFunc = "SetFeatModifier"; - NWNX_PushArgumentInt(NWNX_Feat, sFunc, iParam4); - NWNX_PushArgumentInt(NWNX_Feat, sFunc, iParam3); - NWNX_PushArgumentInt(NWNX_Feat, sFunc, iParam2); - NWNX_PushArgumentInt(NWNX_Feat, sFunc, iParam1); - NWNX_PushArgumentInt(NWNX_Feat, sFunc, iMod); - NWNX_PushArgumentInt(NWNX_Feat, sFunc, iFeat); + NWNX_PushArgumentInt(iParam4); + NWNX_PushArgumentInt(iParam3); + NWNX_PushArgumentInt(iParam2); + NWNX_PushArgumentInt(iParam1); + NWNX_PushArgumentInt(iMod); + NWNX_PushArgumentInt(iFeat); NWNX_CallFunction(NWNX_Feat, sFunc); } diff --git a/_module/nss/nwnx_feat_2da.nss b/_module/nss/nwnx_feat_2da.nss new file mode 100644 index 00000000..95ba7e1a --- /dev/null +++ b/_module/nss/nwnx_feat_2da.nss @@ -0,0 +1,78 @@ +/// @ingroup feat +/// @file nwnx_feat_2da.nss +/// @brief Parse a column in the feat.2da to load the modifiers. +#include "nwnx_feat" + +/// @ingroup feat +/// @brief Translate a modifier type from a string to its constant. +/// @param featMod The string representation of the constant. +/// @return The constant for the feat modifier. +int NWNX_Feat_GetModifierConstant(string featMod); + +/// @ingroup feat +/// @brief Loops through feat.2da and checks for the column for feat modifications and sets them. +/// @param sColumnName The column name in the feat.2da that defines the 2da for the feat mods. +void NWNX_Feat_LoadFeatModifiers(string sColumnName = "FeatModsTable"); + +int NWNX_Feat_GetModifierConstant(string featMod) +{ + if (featMod == "AB") return NWNX_FEAT_MODIFIER_AB; + else if (featMod == "ABILITY") return NWNX_FEAT_MODIFIER_ABILITY; + else if (featMod == "ABVSRACE") return NWNX_FEAT_MODIFIER_ABVSRACE; + else if (featMod == "AC") return NWNX_FEAT_MODIFIER_AC; + else if (featMod == "ACVSRACE") return NWNX_FEAT_MODIFIER_ACVSRACE; + else if (featMod == "ARCANESPELLFAILURE") return NWNX_FEAT_MODIFIER_ARCANESPELLFAILURE; + else if (featMod == "BONUSSPELL") return NWNX_FEAT_MODIFIER_BONUSSPELL; + else if (featMod == "CONCEALMENT") return NWNX_FEAT_MODIFIER_CONCEALMENT; + else if (featMod == "DMGREDUCTION") return NWNX_FEAT_MODIFIER_DMGREDUCTION; + else if (featMod == "DMGRESIST") return NWNX_FEAT_MODIFIER_DMGRESIST; + else if (featMod == "DMGIMMUNITY") return NWNX_FEAT_MODIFIER_DMGIMMUNITY; + else if (featMod == "IMMUNITY") return NWNX_FEAT_MODIFIER_IMMUNITY; + else if (featMod == "HASTE") return NWNX_FEAT_MODIFIER_HASTE; + else if (featMod == "MOVEMENTSPEED") return NWNX_FEAT_MODIFIER_MOVEMENTSPEED; + else if (featMod == "REGENERATION") return NWNX_FEAT_MODIFIER_REGENERATION; + else if (featMod == "SAVE") return NWNX_FEAT_MODIFIER_SAVE; + else if (featMod == "SAVEVSRACE") return NWNX_FEAT_MODIFIER_SAVEVSRACE; + else if (featMod == "SAVEVSTYPE") return NWNX_FEAT_MODIFIER_SAVEVSTYPE; + else if (featMod == "SAVEVSTYPERACE") return NWNX_FEAT_MODIFIER_SAVEVSTYPERACE; + else if (featMod == "SEEINVISIBLE") return NWNX_FEAT_MODIFIER_SEEINVISIBLE; + else if (featMod == "SPELLIMMUNITY") return NWNX_FEAT_MODIFIER_SPELLIMMUNITY; + else if (featMod == "SRCHARGEN") return NWNX_FEAT_MODIFIER_SRCHARGEN; + else if (featMod == "SRINCLEVEL") return NWNX_FEAT_MODIFIER_SRINCLEVEL; + else if (featMod == "SPELLSAVEDC") return NWNX_FEAT_MODIFIER_SPELLSAVEDC; + else if (featMod == "TRUESEEING") return NWNX_FEAT_MODIFIER_TRUESEEING; + else if (featMod == "ULTRAVISION") return NWNX_FEAT_MODIFIER_ULTRAVISION; + else if (featMod == "VISUALEFFECT") return NWNX_FEAT_MODIFIER_VISUALEFFECT; + else if (featMod == "SPELLSAVEDCFORSCHOOL") return NWNX_FEAT_MODIFIER_SPELLSAVEDCFORSCHOOL; + else if (featMod == "SPELLSAVEDCFORSPELL") return NWNX_FEAT_MODIFIER_SPELLSAVEDCFORSPELL; + + return NWNX_FEAT_MODIFIER_INVALID; +} + +void NWNX_Feat_LoadFeatModifiers(string sColumnName = "FeatModsTable") +{ + int iFeatRows = Get2DARowCount("feat"); + int iFeat; + for (iFeat = 0; iFeat < iFeatRows; iFeat++) + { + string sFeatModTable = Get2DAString("feat", sColumnName, iFeat); + if(sFeatModTable != "") + { + int iFeatModRows = Get2DARowCount(sFeatModTable); + int iFeatMod; + for (iFeatMod = 0; iFeatMod < iFeatModRows; iFeatMod++) + { + string sType = Get2DAString(sFeatModTable, "Type", iFeatMod); + string sParam1 = Get2DAString(sFeatModTable, "Param1", iFeatMod); + string sParam2 = Get2DAString(sFeatModTable, "Param2", iFeatMod); + string sParam3 = Get2DAString(sFeatModTable, "Param3", iFeatMod); + string sParam4 = Get2DAString(sFeatModTable, "Param4", iFeatMod); + int iParam1 = sParam1 == "" ? 0xDEADBEEF : StringToInt(sParam1); + int iParam2 = sParam2 == "" ? 0xDEADBEEF : StringToInt(sParam2); + int iParam3 = sParam3 == "" ? 0xDEADBEEF : StringToInt(sParam3); + int iParam4 = sParam4 == "" ? 0xDEADBEEF : StringToInt(sParam4); + NWNX_Feat_SetFeatModifier(iFeat, NWNX_Feat_GetModifierConstant(sType), iParam1, iParam2, iParam3, iParam4); + } + } + } +} \ No newline at end of file diff --git a/_module/nss/nwnx_feedback.nss b/_module/nss/nwnx_feedback.nss index 19aa0df9..3e56e075 100644 --- a/_module/nss/nwnx_feedback.nss +++ b/_module/nss/nwnx_feedback.nss @@ -17,48 +17,27 @@ const string NWNX_Feedback = "NWNX_Feedback"; ///< @private /// @name Combat Log Message Types /// @anchor combat_log_msgs /// @{ -const int NWNX_FEEDBACK_COMBATLOG_SIMPLE_ADJECTIVE = 1; -/* -const int NWNX_FEEDBACK_COMBATLOG_SIMPLE_DAMAGE = 2; -const int NWNX_FEEDBACK_COMBATLOG_COMPLEX_DAMAGE = 3; -const int NWNX_FEEDBACK_COMBATLOG_COMPLEX_DEATH = 4; -const int NWNX_FEEDBACK_COMBATLOG_COMPLEX_ATTACK = 5; -const int NWNX_FEEDBACK_COMBATLOG_SPECIAL_ATTACK = 6; -const int NWNX_FEEDBACK_COMBATLOG_SAVING_THROW = 7; -const int NWNX_FEEDBACK_COMBATLOG_CAST_SPELL = 8; -const int NWNX_FEEDBACK_COMBATLOG_USE_SKILL = 9; -const int NWNX_FEEDBACK_COMBATLOG_SPELL_RESISTANCE = 10; -const int NWNX_FEEDBACK_COMBATLOG_FEEDBACK = 11; // NOTE: This hides ALL feedback messages, to hide individual messages use NWNX_Feedback_SetFeedbackMessageHidden() -const int NWNX_FEEDBACK_COMBATLOG_COUNTERSPELL = 12; -const int NWNX_FEEDBACK_COMBATLOG_TOUCHATTACK = 13; -const int NWNX_FEEDBACK_COMBATLOG_INITIATIVE = 14; -const int NWNX_FEEDBACK_COMBATLOG_DISPEL_MAGIC = 15; -const int NWNX_FEEDBACK_COMBATLOG_POLYMORPH = 17; -const int NWNX_FEEDBACK_COMBATLOG_FEEDBACKSTRING = 18; -const int NWNX_FEEDBACK_COMBATLOG_VIBRATE = 19; -const int NWNX_FEEDBACK_COMBATLOG_UNLOCKACHIEVEMENT = 20; - -// 1 -> Simple_Adjective: : -// 2 -> Simple_Damage: damaged : -// 3 -> Complex_Damage: damages : -// 4 -> Complex_Death: killed -// 5 -> Complex_Attack: attacks : *hit* / *miss* / *parried* : ( + = ) -// 6 -> Special_Attack: attempts on : *success* / *failure* : ( + = ) -// 7 -> Saving_Throw: : : *success* / *failure* : ( + = ) -// 8 -> Cast_Spell: casts : Spellcraft check *failure* / *success* -// 9 -> Use_Skill: : : *success* / *failure* : ( + = vs ) -// 10 -> Spell_Resistance: : Spell Resistance : *success* / *failure* -// 11 -> Feedback: Reason skill/feat/ability failed. -// 12 -> Counterspel: casts : *spell countered by* : casting -// 13 -> TouchAttack: attempts on : *hit/miss/critical* : ( + = ) -// 14 -> Initiative: : Initiative Roll : : ( + = ) -// 15 -> Dispel_Magic: Dispel Magic : : , , ... -// 17 -> Unused, probably -// 18 -> Same as 11, maybe. Might be unused too -// 19 -> Unused -// 20 -> Unused -*/ - +const int NWNX_FEEDBACK_COMBATLOG_SIMPLE_ADJECTIVE = 1; // Simple_Adjective: : +const int NWNX_FEEDBACK_COMBATLOG_SIMPLE_DAMAGE = 2; // Simple_Damage: damaged : +const int NWNX_FEEDBACK_COMBATLOG_COMPLEX_DAMAGE = 3; // Complex_Damage: damages : +const int NWNX_FEEDBACK_COMBATLOG_COMPLEX_DEATH = 4; // Complex_Death: killed +const int NWNX_FEEDBACK_COMBATLOG_COMPLEX_ATTACK = 5; // Complex_Attack: attacks : *hit* / *miss* / *parried* : ( + = ) +const int NWNX_FEEDBACK_COMBATLOG_SPECIAL_ATTACK = 6; // Special_Attack: attempts on : *success* / *failure* : ( + = ) +const int NWNX_FEEDBACK_COMBATLOG_SAVING_THROW = 7; // Saving_Throw: : : *success* / *failure* : ( + = ) +const int NWNX_FEEDBACK_COMBATLOG_CAST_SPELL = 8; // Cast_Spell: casts : Spellcraft check *failure* / *success* +const int NWNX_FEEDBACK_COMBATLOG_USE_SKILL = 9; // Use_Skill: : : *success* / *failure* : ( + = vs ) +const int NWNX_FEEDBACK_COMBATLOG_SPELL_RESISTANCE = 10; // Spell_Resistance: : Spell Resistance : *success* / *failure* +const int NWNX_FEEDBACK_COMBATLOG_FEEDBACK = 11; // Reason skill/feat/ability failed, SendMessageToPC() NOTE: This hides ALL feedback messages, to hide individual messages use NWNX_Feedback_SetFeedbackMessageHidden() +const int NWNX_FEEDBACK_COMBATLOG_COUNTERSPELL = 12; // Counterspel: casts : *spell countered by* : casting +const int NWNX_FEEDBACK_COMBATLOG_TOUCHATTACK = 13; // TouchAttack: attempts on : *hit/miss/critical* : ( + = ) +const int NWNX_FEEDBACK_COMBATLOG_INITIATIVE = 14; // Initiative: : Initiative Roll : : ( + = ) +const int NWNX_FEEDBACK_COMBATLOG_DISPEL_MAGIC = 15; // Dispel_Magic: Dispel Magic : : , , ... +const int NWNX_FEEDBACK_COMBATLOG_POLYMORPH = 17; // Doesn't go through the function that the plugin hooks, so does nothing. +const int NWNX_FEEDBACK_COMBATLOG_FEEDBACKSTRING = 18; // Custom feedback for objects requiring a key +const int NWNX_FEEDBACK_COMBATLOG_VIBRATE = 19; // Controller vibration +const int NWNX_FEEDBACK_COMBATLOG_UNLOCKACHIEVEMENT = 20; // Unlock Campaign Achievement +const int NWNX_FEEDBACK_COMBATLOG_POSTAURSTRING = 22; // PostString messages +const int NWNX_FEEDBACK_COMBATLOG_ENTERTARGETINGMODE = 23; // Enter Targeting Mode /// @} /// @name Feedback Message Types @@ -66,7 +45,6 @@ const int NWNX_FEEDBACK_COMBATLOG_UNLOCKACHIEVEMENT = 20; /// @{ const int NWNX_FEEDBACK_SKILL_CANT_USE = 0; -/* /// Skill Feedback Messages const int NWNX_FEEDBACK_SKILL_CANT_USE_TIMER = 1; const int NWNX_FEEDBACK_SKILL_ANIMALEMPATHY_VALID_TARGETS = 2; @@ -368,7 +346,6 @@ const int NWNX_FEEDBACK_CAMERA_CHASECAM = 258; const int NWNX_FEEDBACK_SAVING = 225; const int NWNX_FEEDBACK_SAVE_COMPLETE = 226; -*/ /// @} /// @brief Gets if feedback message is hidden. @@ -428,12 +405,12 @@ int NWNX_Feedback_GetFeedbackMessageHidden(int nMessage, object oPC = OBJECT_INV string sFunc = "GetMessageHidden"; int nMessageType = 0; - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, nMessage); - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, nMessageType); - NWNX_PushArgumentObject(NWNX_Feedback, sFunc, oPC); + NWNX_PushArgumentInt(nMessage); + NWNX_PushArgumentInt(nMessageType); + NWNX_PushArgumentObject(oPC); NWNX_CallFunction(NWNX_Feedback, sFunc); - return NWNX_GetReturnValueInt(NWNX_Feedback, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Feedback_SetFeedbackMessageHidden(int nMessage, int isHidden, object oPC = OBJECT_INVALID) @@ -441,10 +418,10 @@ void NWNX_Feedback_SetFeedbackMessageHidden(int nMessage, int isHidden, object o string sFunc = "SetMessageHidden"; int nMessageType = 0; - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, isHidden); - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, nMessage); - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, nMessageType); - NWNX_PushArgumentObject(NWNX_Feedback, sFunc, oPC); + NWNX_PushArgumentInt(isHidden); + NWNX_PushArgumentInt(nMessage); + NWNX_PushArgumentInt(nMessageType); + NWNX_PushArgumentObject(oPC); NWNX_CallFunction(NWNX_Feedback, sFunc); } @@ -453,12 +430,12 @@ int NWNX_Feedback_GetCombatLogMessageHidden(int nMessage, object oPC = OBJECT_IN string sFunc = "GetMessageHidden"; int nMessageType = 1; - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, nMessage); - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, nMessageType); - NWNX_PushArgumentObject(NWNX_Feedback, sFunc, oPC); + NWNX_PushArgumentInt(nMessage); + NWNX_PushArgumentInt(nMessageType); + NWNX_PushArgumentObject(oPC); NWNX_CallFunction(NWNX_Feedback, sFunc); - return NWNX_GetReturnValueInt(NWNX_Feedback, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Feedback_SetCombatLogMessageHidden(int nMessage, int isHidden, object oPC = OBJECT_INVALID) @@ -466,10 +443,10 @@ void NWNX_Feedback_SetCombatLogMessageHidden(int nMessage, int isHidden, object string sFunc = "SetMessageHidden"; int nMessageType = 1; - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, isHidden); - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, nMessage); - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, nMessageType); - NWNX_PushArgumentObject(NWNX_Feedback, sFunc, oPC); + NWNX_PushArgumentInt(isHidden); + NWNX_PushArgumentInt(nMessage); + NWNX_PushArgumentInt(nMessageType); + NWNX_PushArgumentObject(oPC); NWNX_CallFunction(NWNX_Feedback, sFunc); } @@ -478,12 +455,12 @@ int NWNX_Feedback_GetJournalUpdatedMessageHidden(object oPC = OBJECT_INVALID) string sFunc = "GetMessageHidden"; int nMessageType = 2; - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, 0); - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, nMessageType); - NWNX_PushArgumentObject(NWNX_Feedback, sFunc, oPC); + NWNX_PushArgumentInt(0); + NWNX_PushArgumentInt(nMessageType); + NWNX_PushArgumentObject(oPC); NWNX_CallFunction(NWNX_Feedback, sFunc); - return NWNX_GetReturnValueInt(NWNX_Feedback, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Feedback_SetJournalUpdatedMessageHidden(int isHidden, object oPC = OBJECT_INVALID) @@ -491,10 +468,10 @@ void NWNX_Feedback_SetJournalUpdatedMessageHidden(int isHidden, object oPC = OBJ string sFunc = "SetMessageHidden"; int nMessageType = 2; - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, isHidden); - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, 0); - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, nMessageType); - NWNX_PushArgumentObject(NWNX_Feedback, sFunc, oPC); + NWNX_PushArgumentInt(isHidden); + NWNX_PushArgumentInt(0); + NWNX_PushArgumentInt(nMessageType); + NWNX_PushArgumentObject(oPC); NWNX_CallFunction(NWNX_Feedback, sFunc); } @@ -503,8 +480,8 @@ void NWNX_Feedback_SetFeedbackMessageMode(int bWhitelist) string sFunc = "SetFeedbackMode"; int nMessageType = 0; - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, bWhitelist); - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, nMessageType); + NWNX_PushArgumentInt(bWhitelist); + NWNX_PushArgumentInt(nMessageType); NWNX_CallFunction(NWNX_Feedback, sFunc); } @@ -513,7 +490,7 @@ void NWNX_Feedback_SetCombatLogMessageMode(int bWhitelist) string sFunc = "SetFeedbackMode"; int nMessageType = 1; - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, bWhitelist); - NWNX_PushArgumentInt(NWNX_Feedback, sFunc, nMessageType); + NWNX_PushArgumentInt(bWhitelist); + NWNX_PushArgumentInt(nMessageType); NWNX_CallFunction(NWNX_Feedback, sFunc); } diff --git a/_module/nss/nwnx_item.nss b/_module/nss/nwnx_item.nss index ce83ef86..01cd4ac0 100644 --- a/_module/nss/nwnx_item.nss +++ b/_module/nss/nwnx_item.nss @@ -16,6 +16,7 @@ void NWNX_Item_SetWeight(object oItem, int weight); /// @remark Total cost = base_value + additional_value. /// @remark Equivalent to SetGoldPieceValue NWNX2 function. /// @note Will not persist through saving. +/// @note This value will also revert if item is identified or player relogs into server. /// @param oItem The item object. /// @param gold The base gold value. void NWNX_Item_SetBaseGoldPieceValue(object oItem, int gold); @@ -68,7 +69,12 @@ void NWNX_Item_SetBaseItemType(object oItem, int nBaseItem); /// /// [1] When specifying per-part coloring, the value 255 corresponds with the logical /// function 'clear colour override', which clears the per-part override for that part. -void NWNX_Item_SetItemAppearance(object oItem, int nType, int nIndex, int nValue); +/// @param oItem The item +/// @param nType The type +/// @param nIndex The index +/// @param nValue The value +/// @param bUpdateCreatureAppearance If TRUE, also update the appearance of oItem's possessor. Only works for armor/helmets/cloaks. Will remove the item from the quickbar as side effect. +void NWNX_Item_SetItemAppearance(object oItem, int nType, int nIndex, int nValue, int bUpdateCreatureAppearance = FALSE); /// @brief Return a string containing the entire appearance for an item. /// @sa NWNX_Item_RestoreItemAppearance @@ -91,14 +97,47 @@ int NWNX_Item_GetBaseArmorClass(object oItem); /// @return The minimum level required to equip the item. int NWNX_Item_GetMinEquipLevel(object oItem); +/// @brief Move oItem to oTarget +/// @remark Moving items from a container to the inventory of the container's owner (or the other way around) is always "silent" and won't trigger feedback messages +/// @param oItem The item object. +/// @param oTarget The target bag/creature/placeable or store object to move oItem to. +/// @param bHideAllFeedback Hides all feedback messages generated by losing/acquiring items +/// @return TRUE if the item was successfully moved to the target, otherwise FALSE +int NWNX_Item_MoveTo(object oItem, object oTarget, int bHideAllFeedback = FALSE); + +/// @brief Set a modifier to the Minimum Level to Equip (Item Level Restriction). +/// @param oItem The item object. +/// @param nModifier the modifier to apply (After any Override) +/// @param bPersist Whether the modifier should persist to gff field. Strongly Recommended to be TRUE (See warning) +/// @note This function (or override partner) must be used each server reset to reenable persistence. Recommended use on OBJECT_INVALID OnModuleLoad. +/// @warning if Persistence is FALSE, or not renabled, beware characters may trigger ELC logging in with now-invalid ItemLevelRestrictions equipped. +void NWNX_Item_SetMinEquipLevelModifier(object oItem, int nModifier, int bPersist = TRUE); + +/// @brief Gets the applied modifier to the Minimum Level to Equip (Item Level Restriction). +/// @param oItem The item object. +int NWNX_Item_GetMinEquipLevelModifier(object oItem); + +/// @brief Set an override to the Minimum Level to Equip (Item Level Restriction). +/// @param oItem The item object. +/// @param nOverride the nOverride to apply (Before any Modifier) +/// @param bPersist Whether the modifier should persist to gff field. Strongly Recommended to be TRUE (See warning) +/// @note This function (or modifier partner) must be used each server reset to reenable persistence. Recommended use on OBJECT_INVALID OnModuleLoad. +/// @warning if Persistence is FALSE, or not renabled, beware characters may trigger ELC logging in with now-invalid ItemLevelRestrictions equipped. +void NWNX_Item_SetMinEquipLevelOverride(object oItem, int nOverride, int bPersist = TRUE); + +/// @brief Gets the applied override to the Minimum Level to Equip (Item Level Restriction). +/// @param oItem The item object. +int NWNX_Item_GetMinEquipLevelOverride(object oItem); + + /// @} void NWNX_Item_SetWeight(object oItem, int w) { string sFunc = "SetWeight"; - NWNX_PushArgumentInt(NWNX_Item, sFunc, w); - NWNX_PushArgumentObject(NWNX_Item, sFunc, oItem); + NWNX_PushArgumentInt(w); + NWNX_PushArgumentObject(oItem); NWNX_CallFunction(NWNX_Item, sFunc); } @@ -107,8 +146,8 @@ void NWNX_Item_SetBaseGoldPieceValue(object oItem, int g) { string sFunc = "SetBaseGoldPieceValue"; - NWNX_PushArgumentInt(NWNX_Item, sFunc, g); - NWNX_PushArgumentObject(NWNX_Item, sFunc, oItem); + NWNX_PushArgumentInt(g); + NWNX_PushArgumentObject(oItem); NWNX_CallFunction(NWNX_Item, sFunc); } @@ -117,8 +156,8 @@ void NWNX_Item_SetAddGoldPieceValue(object oItem, int g) { string sFunc = "SetAddGoldPieceValue"; - NWNX_PushArgumentInt(NWNX_Item, sFunc, g); - NWNX_PushArgumentObject(NWNX_Item, sFunc, oItem); + NWNX_PushArgumentInt(g); + NWNX_PushArgumentObject(oItem); NWNX_CallFunction(NWNX_Item, sFunc); } @@ -127,40 +166,41 @@ int NWNX_Item_GetBaseGoldPieceValue(object oItem) { string sFunc = "GetBaseGoldPieceValue"; - NWNX_PushArgumentObject(NWNX_Item, sFunc, oItem); + NWNX_PushArgumentObject(oItem); NWNX_CallFunction(NWNX_Item, sFunc); - return NWNX_GetReturnValueInt(NWNX_Item, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Item_GetAddGoldPieceValue(object oItem) { string sFunc = "GetAddGoldPieceValue"; - NWNX_PushArgumentObject(NWNX_Item, sFunc, oItem); + NWNX_PushArgumentObject(oItem); NWNX_CallFunction(NWNX_Item, sFunc); - return NWNX_GetReturnValueInt(NWNX_Item, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Item_SetBaseItemType(object oItem, int nBaseItem) { string sFunc = "SetBaseItemType"; - NWNX_PushArgumentInt(NWNX_Item, sFunc, nBaseItem); - NWNX_PushArgumentObject(NWNX_Item, sFunc, oItem); + NWNX_PushArgumentInt(nBaseItem); + NWNX_PushArgumentObject(oItem); NWNX_CallFunction(NWNX_Item, sFunc); } -void NWNX_Item_SetItemAppearance(object oItem, int nType, int nIndex, int nValue) +void NWNX_Item_SetItemAppearance(object oItem, int nType, int nIndex, int nValue, int bUpdateCreatureAppearance = FALSE) { string sFunc = "SetItemAppearance"; - NWNX_PushArgumentInt(NWNX_Item, sFunc, nValue); - NWNX_PushArgumentInt(NWNX_Item, sFunc, nIndex); - NWNX_PushArgumentInt(NWNX_Item, sFunc, nType); - NWNX_PushArgumentObject(NWNX_Item, sFunc, oItem); + NWNX_PushArgumentInt(bUpdateCreatureAppearance); + NWNX_PushArgumentInt(nValue); + NWNX_PushArgumentInt(nIndex); + NWNX_PushArgumentInt(nType); + NWNX_PushArgumentObject(oItem); NWNX_CallFunction(NWNX_Item, sFunc); @@ -170,18 +210,18 @@ string NWNX_Item_GetEntireItemAppearance(object oItem) { string sFunc = "GetEntireItemAppearance"; - NWNX_PushArgumentObject(NWNX_Item, sFunc, oItem); + NWNX_PushArgumentObject(oItem); NWNX_CallFunction(NWNX_Item, sFunc); - return NWNX_GetReturnValueString(NWNX_Item, sFunc); + return NWNX_GetReturnValueString(); } void NWNX_Item_RestoreItemAppearance(object oItem, string sApp) { string sFunc = "RestoreItemAppearance"; - NWNX_PushArgumentString(NWNX_Item, sFunc, sApp); - NWNX_PushArgumentObject(NWNX_Item, sFunc, oItem); + NWNX_PushArgumentString(sApp); + NWNX_PushArgumentObject(oItem); NWNX_CallFunction(NWNX_Item, sFunc); } @@ -190,18 +230,73 @@ int NWNX_Item_GetBaseArmorClass(object oItem) { string sFunc = "GetBaseArmorClass"; - NWNX_PushArgumentObject(NWNX_Item, sFunc, oItem); + NWNX_PushArgumentObject(oItem); NWNX_CallFunction(NWNX_Item, sFunc); - return NWNX_GetReturnValueInt(NWNX_Item, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Item_GetMinEquipLevel(object oItem) { string sFunc = "GetMinEquipLevel"; - NWNX_PushArgumentObject(NWNX_Item, sFunc, oItem); + NWNX_PushArgumentObject(oItem); NWNX_CallFunction(NWNX_Item, sFunc); - return NWNX_GetReturnValueInt(NWNX_Item, sFunc); + return NWNX_GetReturnValueInt(); +} + +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(); +} + +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); +} + +int NWNX_Item_GetMinEquipLevelModifier(object oItem) +{ + string sFunc = "GetMinEquipLevelModifier"; + + NWNX_PushArgumentObject(oItem); + + NWNX_CallFunction(NWNX_Item, sFunc); + return NWNX_GetReturnValueInt(); +} + +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); +} + +int NWNX_Item_GetMinEquipLevelOverride(object oItem) +{ + string sFunc = "GetMinEquipLevelOverride"; + + NWNX_PushArgumentObject(oItem); + + NWNX_CallFunction(NWNX_Item, sFunc); + return NWNX_GetReturnValueInt(); } diff --git a/_module/nss/nwnx_itemprop.nss b/_module/nss/nwnx_itemprop.nss index 5385c350..2e84b3f0 100644 --- a/_module/nss/nwnx_itemprop.nss +++ b/_module/nss/nwnx_itemprop.nss @@ -9,6 +9,7 @@ const string NWNX_ItemProperty = "NWNX_ItemProperty"; ///< @private /// @brief An unpacked itemproperty. struct NWNX_IPUnpacked { + string sID; ///< @todo Describe int nProperty; ///< @todo Describe int nSubType; ///< @todo Describe int nCostTable; ///< @todo Describe @@ -45,66 +46,68 @@ struct NWNX_IPUnpacked NWNX_ItemProperty_UnpackIP(itemproperty ip) { string sFunc = "UnpackIP"; - NWNX_PushArgumentItemProperty(NWNX_ItemProperty, sFunc, ip); + NWNX_PushArgumentItemProperty(ip); NWNX_CallFunction(NWNX_ItemProperty, sFunc); struct NWNX_IPUnpacked n; - n.nProperty = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.nSubType = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.nCostTable = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.nCostTableValue = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.nParam1 = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.nParam1Value = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.nUsesPerDay = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.nChanceToAppear = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.bUsable = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.nSpellId = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.oCreator = NWNX_GetReturnValueObject(NWNX_ItemProperty, sFunc); - n.sTag = NWNX_GetReturnValueString(NWNX_ItemProperty, sFunc); + 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(); return n; } + itemproperty NWNX_ItemProperty_PackIP(struct NWNX_IPUnpacked n) { string sFunc = "PackIP"; - NWNX_PushArgumentString(NWNX_ItemProperty, sFunc, n.sTag); - NWNX_PushArgumentObject(NWNX_ItemProperty, sFunc, n.oCreator); - NWNX_PushArgumentInt(NWNX_ItemProperty, sFunc, n.nSpellId); - NWNX_PushArgumentInt(NWNX_ItemProperty, sFunc, n.bUsable); - NWNX_PushArgumentInt(NWNX_ItemProperty, sFunc, n.nChanceToAppear); - NWNX_PushArgumentInt(NWNX_ItemProperty, sFunc, n.nUsesPerDay); - NWNX_PushArgumentInt(NWNX_ItemProperty, sFunc, n.nParam1Value); - NWNX_PushArgumentInt(NWNX_ItemProperty, sFunc, n.nParam1); - NWNX_PushArgumentInt(NWNX_ItemProperty, sFunc, n.nCostTableValue); - NWNX_PushArgumentInt(NWNX_ItemProperty, sFunc, n.nCostTable); - NWNX_PushArgumentInt(NWNX_ItemProperty, sFunc, n.nSubType); - NWNX_PushArgumentInt(NWNX_ItemProperty, sFunc, n.nProperty); + 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(NWNX_ItemProperty, sFunc); + return NWNX_GetReturnValueItemProperty(); } struct NWNX_IPUnpacked NWNX_ItemProperty_GetActiveProperty(object oItem, int nIndex) { string sFunc = "GetActiveProperty"; - NWNX_PushArgumentInt(NWNX_ItemProperty, sFunc, nIndex); - NWNX_PushArgumentObject(NWNX_ItemProperty, sFunc, oItem); + NWNX_PushArgumentInt(nIndex); + NWNX_PushArgumentObject(oItem); NWNX_CallFunction(NWNX_ItemProperty, sFunc); struct NWNX_IPUnpacked n; - n.nProperty = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.nSubType = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.nCostTable = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.nCostTableValue = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.nParam1 = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.nParam1Value = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.nUsesPerDay = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.nChanceToAppear = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.bUsable = NWNX_GetReturnValueInt(NWNX_ItemProperty, sFunc); - n.sTag = NWNX_GetReturnValueString(NWNX_ItemProperty, sFunc); + 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(); return n; -} \ No newline at end of file +} diff --git a/_module/nss/nwnx_lua.nss b/_module/nss/nwnx_lua.nss index 70eb707e..60a645ae 100644 --- a/_module/nss/nwnx_lua.nss +++ b/_module/nss/nwnx_lua.nss @@ -27,7 +27,7 @@ void NWNX_Lua_EvalVoid(string sCode) { string sFunc = "EvalVoid"; - NWNX_PushArgumentString(NWNX_Lua, sFunc, sCode); + NWNX_PushArgumentString(sCode); NWNX_CallFunction(NWNX_Lua, sFunc); } @@ -35,17 +35,17 @@ string NWNX_Lua_Eval(string sCode) { string sFunc = "Eval"; - NWNX_PushArgumentString(NWNX_Lua, sFunc, sCode); + NWNX_PushArgumentString(sCode); NWNX_CallFunction(NWNX_Lua, sFunc); - return NWNX_GetReturnValueString(NWNX_Lua, sFunc); + return NWNX_GetReturnValueString(); } void NWNX_Lua_RunEvent(string sEvent, object oObject, string sExtra="") { string sFunc = "RunEvent"; - NWNX_PushArgumentString(NWNX_Lua, sFunc, sExtra); - NWNX_PushArgumentObject(NWNX_Lua, sFunc, oObject); - NWNX_PushArgumentString(NWNX_Lua, sFunc, sEvent); + NWNX_PushArgumentString(sExtra); + NWNX_PushArgumentObject(oObject); + NWNX_PushArgumentString(sEvent); NWNX_CallFunction(NWNX_Lua, sFunc); } diff --git a/_module/nss/nwnx_nostack.nss b/_module/nss/nwnx_nostack.nss new file mode 100644 index 00000000..23a55e1b --- /dev/null +++ b/_module/nss/nwnx_nostack.nss @@ -0,0 +1,40 @@ +/// @addtogroup nostack NoStack +/// @brief Functions to allow more control over ability/skill/bonuses stacking. +/// @{ +/// @file nwnx_nostack.nss +#include "nwnx" + +const string NWNX_NoStack = "NWNX_NoStack"; ///< @private + +/// @name Spell Effect Bonus Types +/// @anchor spell_bonus_types +/// +/// Used with NWNX_NoStack_SetSpellBonusType() these are the effect bonus types. +/// @{ +const int NWNX_NOSTACK_EFFECT_TYPE_ENHANCEMENT = 0; +const int NWNX_NOSTACK_EFFECT_TYPE_CIRCUMSTANCE = 1; +const int NWNX_NOSTACK_EFFECT_TYPE_COMPETENCE = 2; +const int NWNX_NOSTACK_EFFECT_TYPE_INSIGHT = 3; +const int NWNX_NOSTACK_EFFECT_TYPE_LUCK = 4; +const int NWNX_NOSTACK_EFFECT_TYPE_MORALE = 5; +const int NWNX_NOSTACK_EFFECT_TYPE_PROFANE = 6; +const int NWNX_NOSTACK_EFFECT_TYPE_RESISTANCE = 7; +const int NWNX_NOSTACK_EFFECT_TYPE_SACRED = 8; +/// @} + +/// @brief Sets a spell bonus type to be used by the NoStack feature. +/// @param spell The spell ID from spells.2da. +/// @param type The new type. +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); +} diff --git a/_module/nss/nwnx_nwsqliteext.nss b/_module/nss/nwnx_nwsqliteext.nss new file mode 100644 index 00000000..b4b6b717 --- /dev/null +++ b/_module/nss/nwnx_nwsqliteext.nss @@ -0,0 +1,25 @@ +/// @addtogroup nwsqliteextensions NWSQLiteExtensions +/// @brief Various extensions for the game's built-in sqlite database. +/// @{ +/// @file nwnx_nwsqliteext.nss +#include "nwnx" + +const string NWNX_NWSQLiteExtensions = "NWNX_NWSQLiteExtensions"; ///< @private + +/// @brief Create a virtual table for s2DA in the module sqlite database. +/// @param s2DA The 2DA name, cannot be empty. +/// @param sColumnTypeHints A string containing type hints for the 2DA columns. See this plugin's readme file for more info. +/// @param sTableName The table name, will use the 2da name if empty. +/// @return TRUE if the virtual table was created. +int NWNX_NWSQLiteExtensions_CreateVirtual2DATable(string s2DA, string sColumnTypeHints = "", string sTableName = ""); + +/// @} + +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(); +} diff --git a/_module/nss/nwnx_object.nss b/_module/nss/nwnx_object.nss index e6f4eeac..acab7d82 100644 --- a/_module/nss/nwnx_object.nss +++ b/_module/nss/nwnx_object.nss @@ -15,6 +15,7 @@ const int NWNX_OBJECT_LOCALVAR_TYPE_FLOAT = 2; const int NWNX_OBJECT_LOCALVAR_TYPE_STRING = 3; const int NWNX_OBJECT_LOCALVAR_TYPE_OBJECT = 4; const int NWNX_OBJECT_LOCALVAR_TYPE_LOCATION = 5; +const int NWNX_OBJECT_LOCALVAR_TYPE_JSON = 6; /// @} /// @anchor object_internal_types @@ -39,6 +40,13 @@ const int NWNX_OBJECT_TYPE_INTERNAL_PORTAL = 15; const int NWNX_OBJECT_TYPE_INTERNAL_SOUND = 16; /// @} +/// @anchor projectile_types +/// @name Projectile VFX Types +/// @{ +const int NWNX_OBJECT_SPELL_PROJECTILE_TYPE_DEFAULT = 6; +const int NWNX_OBJECT_SPELL_PROJECTILE_TYPE_USE_PATH = 7; +/// @} + /// A local variable structure. struct NWNX_Object_LocalVariable { @@ -61,18 +69,12 @@ int NWNX_Object_GetLocalVariableCount(object obj); /// @note As of build 8193.14, this function takes O(n) time, where n is the number /// of locals on the object. Individual variable access with GetLocalXxx() /// is now O(1) though. -/// @note As of build 8193.14, this function may return variable type UNKNOWN -/// if the value is the default (0/0.0/""/OBJECT_INVALID) for the type. +/// @note As of build 8193.14, this function will not return a variable if the value is +/// the default (0/0.0/""/OBJECT_INVALID/JsonNull()) for the type. They are considered not set. +/// @note Will return type UNKNOWN for cassowary variables. /// @return An NWNX_Object_LocalVariable struct. struct NWNX_Object_LocalVariable NWNX_Object_GetLocalVariable(object obj, int index); -/// @brief Convert an object id to the actual object. -/// @param id The object id. -/// @return An object from the provided object ID. -/// @remark This is the counterpart to ObjectToString. -/// @deprecated Use the basegame StringToObject() function. This will be removed in a future NWNX release. -object NWNX_Object_StringToObject(string id); - /// @brief Set oObject's position. /// @param oObject The object. /// @param vPosition A vector position. @@ -135,12 +137,6 @@ int NWNX_Object_GetAppearance(object oPlaceable); /// @return TRUE if the object has the visual effect applied to it int NWNX_Object_GetHasVisualEffect(object obj, int nVFX); -/// @brief Check if an item can fit in an object's inventory. -/// @param obj The object with an inventory. -/// @param baseitem The base item id to check for a fit. -/// @return TRUE if an item of base item type can fit in object's inventory -int NWNX_Object_CheckFit(object obj, int baseitem); - /// @brief Get an object's damage immunity. /// @param obj The object. /// @param damageType The damage type to check for immunity. Use DAMAGE_TYPE_* constants. @@ -190,23 +186,11 @@ string NWNX_Object_GetTriggerGeometry(object oTrigger); /// @remark The minimum number of vertices is 3. void NWNX_Object_SetTriggerGeometry(object oTrigger, string sGeometry); -/// @brief Add an effect to an object that displays an icon and has no other effect. -/// @remark See effecticons.2da for a list of possible effect icons. -/// @param obj The object to apply the effect. -/// @param nIcon The icon id. -/// @param fDuration If specified the effect will be temporary and last this length in seconds, otherwise the effect -/// will be permanent. -void NWNX_Object_AddIconEffect(object obj, int nIcon, float fDuration=0.0); - -/// @brief Remove an icon effect from an object that was added by the NWNX_Object_AddIconEffect() function. -/// @param obj The object. -/// @param nIcon The icon id. -void NWNX_Object_RemoveIconEffect(object obj, int nIcon); - /// @brief Export an object to the UserDirectory/nwnx folder. /// @param sFileName The filename without extension, 16 or less characters. /// @param oObject The object to export. Valid object types: Creature, Item, Placeable, Waypoint, Door, Store, Trigger -void NWNX_Object_Export(string sFileName, object oObject); +/// @param sAlias The alias of the resource directory to add the .git file to. Default: UserDirectory/nwnx +void NWNX_Object_Export(object oObject, string sFileName, string sAlias = "NWNX"); /// @brief Get oObject's integer variable sVarName. /// @param oObject The object to get the variable from. @@ -287,14 +271,6 @@ int NWNX_Object_GetInternalObjectType(object oObject); /// @return TRUE on success. int NWNX_Object_AcquireItem(object oObject, object oItem); -/// @brief Cause oObject to face fDirection. -/// @note This function is almost identical to SetFacing(), the only difference being that it allows you to specify -/// the target object without the use of AssignCommand(). This is useful when you want to change the facing of an object -/// in an ExecuteScriptChunk() call where AssignCommand() does not work. -/// @param oObject The object to change its facing of -/// @param fDirection The direction the object should face -void NWNX_Object_SetFacing(object oObject, float fDirection); - /// @brief Clear all spell effects oObject has applied to others. /// @param oObject The object that applied the spell effects. void NWNX_Object_ClearSpellEffectsOnOthers(object oObject); @@ -317,14 +293,18 @@ int NWNX_Object_GetIsDestroyable(object oObject); /// @brief Checks for specific spell immunity. Should only be called in spellscripts /// @param oDefender The object defending against the spell. /// @param oCaster The object casting the spell. +/// @param nSpellId The casted spell id. Default value is -1, which corrresponds to the normal game behaviour. /// @return -1 if defender has no immunity, 2 if the defender is immune -int NWNX_Object_DoSpellImmunity(object oDefender, object oCaster); +int NWNX_Object_DoSpellImmunity(object oDefender, object oCaster, int nSpellId=-1); /// @brief Checks for spell school/level immunities and mantles. Should only be called in spellscripts /// @param oDefender The object defending against the spell. /// @param oCaster The object casting the spell. +/// @param nSpellId The casted spell id. Default value is -1, which corrresponds to the normal game behaviour. +/// @param nSpellLevel The level of the casted spell. Default value is -1, which corrresponds to the normal game behaviour. +/// @param nSpellSchool The school of the casted spell (SPELL_SCHOOL_* constant). Default value is -1, which corrresponds to the normal game behaviour. /// @return -1 defender no immunity. 2 if immune. 3 if immune, but the immunity has a limit (example: mantles) -int NWNX_Object_DoSpellLevelAbsorption(object oDefender, object oCaster); +int NWNX_Object_DoSpellLevelAbsorption(object oDefender, object oCaster, int nSpellId=-1, int nSpellLevel=-1, int nSpellSchool=-1); /// @brief Sets if a placeable has an inventory. /// @param obj The placeable. @@ -339,48 +319,155 @@ void NWNX_Object_SetHasInventory(object obj, int bHasInventory); /// @return -1 on error or the engine animation constant int NWNX_Object_GetCurrentAnimation(object oObject); +/// @brief Gets the AI level of an object. +/// @param oObject The object. +/// @return The AI level (AI_LEVEL_* -1 to 4). +int NWNX_Object_GetAILevel(object oObject); + +/// @brief Sets the AI level of an object. +/// @param oObject The object. +/// @param nLevel The level to set (AI_LEVEL_* -1 to 4). +void NWNX_Object_SetAILevel(object oObject, int nLevel); + +/// @brief Retrieves the Map Note (AKA Map Pin) from a waypoint - Returns even if currently disabled. +/// @param oObject The Waypoint object +/// @param nID The Language ID (default English) +/// @param nGender 0 = Male, 1 = Female +string NWNX_Object_GetMapNote(object oObject, int nID = 0, int nGender = 0); + +/// @brief Sets a Map Note (AKA Map Pin) to any waypoint, even if no previous map note. Only updates for clients on area-load. Use SetMapPinEnabled() as required. +/// @param oObject The Waypoint object +/// @param sMapNote The contents to set as the Map Note. +/// @param nID The Language ID (default English) +/// @param nGender 0 = Male, 1 = Female +void NWNX_Object_SetMapNote(object oObject, string sMapNote, int nID = 0, int nGender = 0); + +/// @brief Gets the last spell cast feat of oObject. +/// @note Should be called in a spell script. +/// @param oObject The object. +/// @return The feat ID, or 65535 when not cast by a feat, or -1 on error. +int NWNX_Object_GetLastSpellCastFeat(object oObject); + +/// @brief Sets the last object that triggered door or placeable trap. +/// @note Should be retrieved with GetEnteringObject. +/// @param oObject Door or placeable object +/// @param oLast Object that last triggered trap. +void NWNX_Object_SetLastTriggered(object oObject, object oLast); + +/// @brief Gets the remaining duration of the AoE object. +/// @param oAoE The AreaOfEffect object. +/// @return The remaining duration, in seconds, or the zero on failure. +float NWNX_Object_GetAoEObjectDurationRemaining(object oAoE); + +/// @brief Sets conversations started by oObject to be private or not. +/// @note ActionStartConversation()'s bPrivateConversation parameter will overwrite this flag. +/// @param oObject The object. +/// @param bPrivate TRUE/FALSE. +void NWNX_Object_SetConversationPrivate(object oObject, int bPrivate); + +/// @brief Sets the radius of a circle AoE object. +/// @param oAoE The AreaOfEffect object. +/// @param fRadius The radius, must be bigger than 0.0f. +void NWNX_Object_SetAoEObjectRadius(object oAoE, float fRadius); + +/// @brief Gets the radius of a circle AoE object. +/// @param oAoE The AreaOfEffect object. +/// @return The radius or 0.0f on error +float NWNX_Object_GetAoEObjectRadius(object oAoE); + +/// @brief Gets whether the last spell cast of oObject was spontaneous. +/// @note Should be called in a spell script. +/// @param oObject The object. +/// @return true if the last spell was cast spontaneously +int NWNX_Object_GetLastSpellCastSpontaneous(object oObject); + +/// @brief Gets the last spell cast domain level. +/// @note Should be called in a spell script. +/// @param oObject The object. +/// @return Domain level of the cast spell, 0 if not a domain spell +int NWNX_Object_GetLastSpellCastDomainLevel(object oObject); + +/// @brief Force the given object to carry the given UUID. Any other object currently owning the UUID is stripped of it. +/// @param oObject The object +/// @param sUUID The UUID to force +void NWNX_Object_ForceAssignUUID(object oObject, string sUUID); + +/// @brief Returns how many items are in oObject's inventory. +/// @param oObject A creature, placeable, item or store. +/// @return Returns a count of how many items are in oObject's inventory. +int NWNX_Object_GetInventoryItemCount(object oObject); + +/// @brief Override the projectile visual effect of ranged/throwing weapons and spells. +/// @param oCreature The creature. +/// @param nProjectileType A @ref projectile_types "NWNX_OBJECT_SPELL_PROJECTILE_TYPE_*" constant or -1 to remove the override. +/// @param nProjectilePathType A "PROJECTILE_PATH_TYPE_*" constant or -1 to ignore. +/// @param nSpellID A "SPELL_*" constant. -1 to ignore. +/// @param bPersist Whether the override should persist to the .bic file (for PCs). +/// @note Persistence is enabled after a server reset by the first use of this function. Recommended to trigger on a dummy target OnModuleLoad to enable persistence. +/// This will override all spell projectile VFX from oCreature until the override is removed. +void NWNX_Object_OverrideSpellProjectileVFX(object oCreature, int nProjectileType = -1, int nProjectilePathType = -1, int nSpellID = -1, int bPersist = FALSE); + +/// @brief Returns TRUE if the last spell was cast instantly. This function should only be called in a spell script. +/// @note To initialize the hooks used by this function it is recommended to call this function once in your module load script. +/// @return TRUE if the last spell was instant. +int NWNX_Object_GetLastSpellInstant(); + +/// @brief Sets the creator of a trap on door, placeable, or trigger. Also changes trap Faction to that of the new Creator. +/// @note Triggers (ground traps) will instantly update colour (Green/Red). Placeable/doors will not change if client has already seen them. +/// @param oObject Door, placeable or trigger (trap) object +/// @param oCreator The new creator of the trap. Any non-creature creator will assign OBJECT_INVALID (similar to toolset-laid traps) +void NWNX_Object_SetTrapCreator(object oObject, object oCreator); + +/// @brief Return the name of the object for nLanguage. +/// @param oObject an object +/// @param nLanguage A PLAYER_LANGUAGE constant. +/// @param nGender Gender to use, 0 or 1. +/// @return The localized string. +string NWNX_Object_GetLocalizedName(object oObject, int nLanguage, int nGender = 0); + +/// @brief Set the name of the object as set in the toolset for nLanguage. +/// @note You may have to SetName(oObject, "") for the translated string to show. +/// @param oObject an object +/// @param sName New value to set +/// @param nLanguage A PLAYER_LANGUAGE constant. +/// @param nGender Gender to use, 0 or 1. +void NWNX_Object_SetLocalizedName(object oObject, string sName, int nLanguage, int nGender = 0); + /// @} int NWNX_Object_GetLocalVariableCount(object obj) { string sFunc = "GetLocalVariableCount"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, obj); + NWNX_PushArgumentObject(obj); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(NWNX_Object, sFunc); + return NWNX_GetReturnValueInt(); } struct NWNX_Object_LocalVariable NWNX_Object_GetLocalVariable(object obj, int index) { string sFunc = "GetLocalVariable"; - NWNX_PushArgumentInt(NWNX_Object, sFunc, index); - NWNX_PushArgumentObject(NWNX_Object, sFunc, obj); + NWNX_PushArgumentInt(index); + NWNX_PushArgumentObject(obj); NWNX_CallFunction(NWNX_Object, sFunc); struct NWNX_Object_LocalVariable var; - var.key = NWNX_GetReturnValueString(NWNX_Object, sFunc); - var.type = NWNX_GetReturnValueInt(NWNX_Object, sFunc); + var.key = NWNX_GetReturnValueString(); + var.type = NWNX_GetReturnValueInt(); return var; } -object NWNX_Object_StringToObject(string id) -{ - WriteTimestampedLogEntry("WARNING: NWNX_Object_StringToObject() is deprecated, please use the basegame's StringToObject()"); - - return StringToObject(id); -} - void NWNX_Object_SetPosition(object oObject, vector vPosition, int bUpdateSubareas = TRUE) { string sFunc = "SetPosition"; - NWNX_PushArgumentInt(NWNX_Object, sFunc, bUpdateSubareas); - NWNX_PushArgumentFloat(NWNX_Object, sFunc, vPosition.x); - NWNX_PushArgumentFloat(NWNX_Object, sFunc, vPosition.y); - NWNX_PushArgumentFloat(NWNX_Object, sFunc, vPosition.z); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentInt(bUpdateSubareas); + NWNX_PushArgumentFloat(vPosition.x); + NWNX_PushArgumentFloat(vPosition.y); + NWNX_PushArgumentFloat(vPosition.z); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -389,18 +476,18 @@ int NWNX_Object_GetCurrentHitPoints(object creature) { string sFunc = "GetCurrentHitPoints"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, creature); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(NWNX_Object, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Object_SetCurrentHitPoints(object creature, int hp) { string sFunc = "SetCurrentHitPoints"; - NWNX_PushArgumentInt(NWNX_Object, sFunc, hp); - NWNX_PushArgumentObject(NWNX_Object, sFunc, creature); + NWNX_PushArgumentInt(hp); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -409,8 +496,8 @@ void NWNX_Object_SetMaxHitPoints(object creature, int hp) { string sFunc = "SetMaxHitPoints"; - NWNX_PushArgumentInt(NWNX_Object, sFunc, hp); - NWNX_PushArgumentObject(NWNX_Object, sFunc, creature); + NWNX_PushArgumentInt(hp); + NWNX_PushArgumentObject(creature); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -419,38 +506,38 @@ string NWNX_Object_Serialize(object obj) { string sFunc = "Serialize"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, obj); + NWNX_PushArgumentObject(obj); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueString(NWNX_Object, sFunc); + return NWNX_GetReturnValueString(); } object NWNX_Object_Deserialize(string serialized) { string sFunc = "Deserialize"; - NWNX_PushArgumentString(NWNX_Object, sFunc, serialized); + NWNX_PushArgumentString(serialized); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueObject(NWNX_Object, sFunc); + return NWNX_GetReturnValueObject(); } string NWNX_Object_GetDialogResref(object obj) { string sFunc = "GetDialogResref"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, obj); + NWNX_PushArgumentObject(obj); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueString(NWNX_Object, sFunc); + return NWNX_GetReturnValueString(); } void NWNX_Object_SetDialogResref(object obj, string dialog) { string sFunc = "SetDialogResref"; - NWNX_PushArgumentString(NWNX_Object, sFunc, dialog); - NWNX_PushArgumentObject(NWNX_Object, sFunc, obj); + NWNX_PushArgumentString(dialog); + NWNX_PushArgumentObject(obj); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -459,8 +546,8 @@ void NWNX_Object_SetAppearance(object oPlaceable, int nAppearance) { string sFunc = "SetAppearance"; - NWNX_PushArgumentInt(NWNX_Object, sFunc, nAppearance); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oPlaceable); + NWNX_PushArgumentInt(nAppearance); + NWNX_PushArgumentObject(oPlaceable); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -469,57 +556,45 @@ int NWNX_Object_GetAppearance(object oPlaceable) { string sFunc = "GetAppearance"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, oPlaceable); + NWNX_PushArgumentObject(oPlaceable); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(NWNX_Object, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Object_GetHasVisualEffect(object obj, int nVFX) { string sFunc = "GetHasVisualEffect"; - NWNX_PushArgumentInt(NWNX_Object, sFunc, nVFX); - NWNX_PushArgumentObject(NWNX_Object, sFunc, obj); + NWNX_PushArgumentInt(nVFX); + NWNX_PushArgumentObject(obj); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(NWNX_Object, sFunc); -} - -int NWNX_Object_CheckFit(object obj, int baseitem) -{ - string sFunc = "CheckFit"; - - NWNX_PushArgumentInt(NWNX_Object, sFunc, baseitem); - NWNX_PushArgumentObject(NWNX_Object, sFunc, obj); - - NWNX_CallFunction(NWNX_Object, sFunc); - - return NWNX_GetReturnValueInt(NWNX_Object, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Object_GetDamageImmunity(object obj, int damageType) { string sFunc = "GetDamageImmunity"; - NWNX_PushArgumentInt(NWNX_Object, sFunc, damageType); - NWNX_PushArgumentObject(NWNX_Object, sFunc, obj); + NWNX_PushArgumentInt(damageType); + NWNX_PushArgumentObject(obj); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(NWNX_Object, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Object_AddToArea(object obj, object area, vector pos) { string sFunc = "AddToArea"; - NWNX_PushArgumentFloat(NWNX_Object, sFunc, pos.z); - NWNX_PushArgumentFloat(NWNX_Object, sFunc, pos.y); - NWNX_PushArgumentFloat(NWNX_Object, sFunc, pos.x); - NWNX_PushArgumentObject(NWNX_Object, sFunc, area); - NWNX_PushArgumentObject(NWNX_Object, sFunc, obj); + NWNX_PushArgumentFloat(pos.z); + NWNX_PushArgumentFloat(pos.y); + NWNX_PushArgumentFloat(pos.x); + NWNX_PushArgumentObject(area); + NWNX_PushArgumentObject(obj); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -527,18 +602,18 @@ int NWNX_Object_GetPlaceableIsStatic(object obj) { string sFunc = "GetPlaceableIsStatic"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, obj); + NWNX_PushArgumentObject(obj); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(NWNX_Object, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Object_SetPlaceableIsStatic(object obj, int isStatic) { string sFunc = "SetPlaceableIsStatic"; - NWNX_PushArgumentInt(NWNX_Object, sFunc, isStatic); - NWNX_PushArgumentObject(NWNX_Object, sFunc, obj); + NWNX_PushArgumentInt(isStatic); + NWNX_PushArgumentObject(obj); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -547,18 +622,18 @@ int NWNX_Object_GetAutoRemoveKey(object obj) { string sFunc = "GetAutoRemoveKey"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, obj); + NWNX_PushArgumentObject(obj); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(NWNX_Object, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Object_SetAutoRemoveKey(object obj, int bRemoveKey) { string sFunc = "SetAutoRemoveKey"; - NWNX_PushArgumentInt(NWNX_Object, sFunc, bRemoveKey); - NWNX_PushArgumentObject(NWNX_Object, sFunc, obj); + NWNX_PushArgumentInt(bRemoveKey); + NWNX_PushArgumentObject(obj); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -567,46 +642,28 @@ string NWNX_Object_GetTriggerGeometry(object oTrigger) { string sFunc = "GetTriggerGeometry"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, oTrigger); + NWNX_PushArgumentObject(oTrigger); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueString(NWNX_Object, sFunc); + return NWNX_GetReturnValueString(); } void NWNX_Object_SetTriggerGeometry(object oTrigger, string sGeometry) { string sFunc = "SetTriggerGeometry"; - NWNX_PushArgumentString(NWNX_Object, sFunc, sGeometry); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oTrigger); + NWNX_PushArgumentString(sGeometry); + NWNX_PushArgumentObject(oTrigger); NWNX_CallFunction(NWNX_Object, sFunc); } -void NWNX_Object_AddIconEffect(object obj, int nIcon, float fDuration=0.0) -{ - string sFunc = "AddIconEffect"; - - NWNX_PushArgumentFloat(NWNX_Object, sFunc, fDuration); - NWNX_PushArgumentInt(NWNX_Object, sFunc, nIcon); - NWNX_PushArgumentObject(NWNX_Object, sFunc, obj); - NWNX_CallFunction(NWNX_Object, sFunc); -} - -void NWNX_Object_RemoveIconEffect(object obj, int nIcon) -{ - string sFunc = "RemoveIconEffect"; - - NWNX_PushArgumentInt(NWNX_Object, sFunc, nIcon); - NWNX_PushArgumentObject(NWNX_Object, sFunc, obj); - NWNX_CallFunction(NWNX_Object, sFunc); -} - -void NWNX_Object_Export(string sFileName, object oObject) +void NWNX_Object_Export(object oObject, string sFileName, string sAlias = "NWNX") { string sFunc = "Export"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); - NWNX_PushArgumentString(NWNX_Object, sFunc, sFileName); + NWNX_PushArgumentString(sAlias); + NWNX_PushArgumentString(sFileName); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -614,21 +671,21 @@ int NWNX_Object_GetInt(object oObject, string sVarName) { string sFunc = "GetInt"; - NWNX_PushArgumentString(NWNX_Object, sFunc, sVarName); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentString(sVarName); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(NWNX_Object, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Object_SetInt(object oObject, string sVarName, int nValue, int bPersist) { string sFunc = "SetInt"; - NWNX_PushArgumentInt(NWNX_Object, sFunc, bPersist); - NWNX_PushArgumentInt(NWNX_Object, sFunc, nValue); - NWNX_PushArgumentString(NWNX_Object, sFunc, sVarName); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentInt(bPersist); + NWNX_PushArgumentInt(nValue); + NWNX_PushArgumentString(sVarName); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -636,8 +693,8 @@ void NWNX_Object_DeleteInt(object oObject, string sVarName) { string sFunc = "DeleteInt"; - NWNX_PushArgumentString(NWNX_Object, sFunc, sVarName); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentString(sVarName); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -645,21 +702,21 @@ string NWNX_Object_GetString(object oObject, string sVarName) { string sFunc = "GetString"; - NWNX_PushArgumentString(NWNX_Object, sFunc, sVarName); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentString(sVarName); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueString(NWNX_Object, sFunc); + return NWNX_GetReturnValueString(); } void NWNX_Object_SetString(object oObject, string sVarName, string sValue, int bPersist) { string sFunc = "SetString"; - NWNX_PushArgumentInt(NWNX_Object, sFunc, bPersist); - NWNX_PushArgumentString(NWNX_Object, sFunc, sValue); - NWNX_PushArgumentString(NWNX_Object, sFunc, sVarName); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentInt(bPersist); + NWNX_PushArgumentString(sValue); + NWNX_PushArgumentString(sVarName); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -667,8 +724,8 @@ void NWNX_Object_DeleteString(object oObject, string sVarName) { string sFunc = "DeleteString"; - NWNX_PushArgumentString(NWNX_Object, sFunc, sVarName); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentString(sVarName); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -676,21 +733,21 @@ float NWNX_Object_GetFloat(object oObject, string sVarName) { string sFunc = "GetFloat"; - NWNX_PushArgumentString(NWNX_Object, sFunc, sVarName); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentString(sVarName); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueFloat(NWNX_Object, sFunc); + return NWNX_GetReturnValueFloat(); } void NWNX_Object_SetFloat(object oObject, string sVarName, float fValue, int bPersist) { string sFunc = "SetFloat"; - NWNX_PushArgumentInt(NWNX_Object, sFunc, bPersist); - NWNX_PushArgumentFloat(NWNX_Object, sFunc, fValue); - NWNX_PushArgumentString(NWNX_Object, sFunc, sVarName); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentInt(bPersist); + NWNX_PushArgumentFloat(fValue); + NWNX_PushArgumentString(sVarName); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -698,8 +755,8 @@ void NWNX_Object_DeleteFloat(object oObject, string sVarName) { string sFunc = "DeleteFloat"; - NWNX_PushArgumentString(NWNX_Object, sFunc, sVarName); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentString(sVarName); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -707,8 +764,8 @@ void NWNX_Object_DeleteVarRegex(object oObject, string sRegex) { string sFunc = "DeleteVarRegex"; - NWNX_PushArgumentString(NWNX_Object, sFunc, sRegex); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentString(sRegex); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -716,50 +773,41 @@ int NWNX_Object_GetPositionIsInTrigger(object oTrigger, vector vPosition) { string sFunc = "GetPositionIsInTrigger"; - NWNX_PushArgumentFloat(NWNX_Object, sFunc, vPosition.z); - NWNX_PushArgumentFloat(NWNX_Object, sFunc, vPosition.y); - NWNX_PushArgumentFloat(NWNX_Object, sFunc, vPosition.x); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oTrigger); + NWNX_PushArgumentFloat(vPosition.z); + NWNX_PushArgumentFloat(vPosition.y); + NWNX_PushArgumentFloat(vPosition.x); + NWNX_PushArgumentObject(oTrigger); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(NWNX_Object, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Object_GetInternalObjectType(object oObject) { string sFunc = "GetInternalObjectType"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(NWNX_Object, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Object_AcquireItem(object oObject, object oItem) { string sFunc = "AcquireItem"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, oItem); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentObject(oItem); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(NWNX_Object, sFunc); -} - -void NWNX_Object_SetFacing(object oObject, float fDirection) -{ - string sFunc = "SetFacing"; - - NWNX_PushArgumentFloat(NWNX_Object, sFunc, fDirection); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); - NWNX_CallFunction(NWNX_Object, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Object_ClearSpellEffectsOnOthers(object oObject) { string sFunc = "ClearSpellEffectsOnOthers"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -767,58 +815,62 @@ string NWNX_Object_PeekUUID(object oObject) { string sFunc = "PeekUUID"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueString(NWNX_Object, sFunc); + return NWNX_GetReturnValueString(); } int NWNX_Object_GetDoorHasVisibleModel(object oDoor) { string sFunc = "GetDoorHasVisibleModel"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, oDoor); + NWNX_PushArgumentObject(oDoor); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(NWNX_Object, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Object_GetIsDestroyable(object oObject) { string sFunc = "GetIsDestroyable"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(NWNX_Object, sFunc); + return NWNX_GetReturnValueInt(); } -int NWNX_Object_DoSpellImmunity(object oDefender, object oCaster) +int NWNX_Object_DoSpellImmunity(object oDefender, object oCaster, int nSpellId=-1) { string sFunc = "DoSpellImmunity"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, oCaster); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oDefender); + NWNX_PushArgumentInt(nSpellId); + NWNX_PushArgumentObject(oCaster); + NWNX_PushArgumentObject(oDefender); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(NWNX_Object,sFunc); + return NWNX_GetReturnValueInt(); } -int NWNX_Object_DoSpellLevelAbsorption(object oDefender, object oCaster) +int NWNX_Object_DoSpellLevelAbsorption(object oDefender, object oCaster, int nSpellId=-1, int nSpellLevel=-1, int nSpellSchool=-1) { string sFunc = "DoSpellLevelAbsorption"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, oCaster); - NWNX_PushArgumentObject(NWNX_Object, sFunc, oDefender); + NWNX_PushArgumentInt(nSpellSchool); + NWNX_PushArgumentInt(nSpellLevel); + NWNX_PushArgumentInt(nSpellId); + NWNX_PushArgumentObject(oCaster); + NWNX_PushArgumentObject(oDefender); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(NWNX_Object,sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Object_SetHasInventory(object obj, int bHasInventory) { string sFunc = "SetHasInventory"; - NWNX_PushArgumentInt(NWNX_Object, sFunc, bHasInventory); - NWNX_PushArgumentObject(NWNX_Object, sFunc, obj); + NWNX_PushArgumentInt(bHasInventory); + NWNX_PushArgumentObject(obj); NWNX_CallFunction(NWNX_Object, sFunc); } @@ -827,8 +879,199 @@ int NWNX_Object_GetCurrentAnimation(object oObject) { string sFunc = "GetCurrentAnimation"; - NWNX_PushArgumentObject(NWNX_Object, sFunc, oObject); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Object, sFunc); - return NWNX_GetReturnValueInt(NWNX_Object, sFunc); + return NWNX_GetReturnValueInt(); +} + +int NWNX_Object_GetAILevel(object oObject) +{ + string sFunc = "GetAILevel"; + + NWNX_PushArgumentObject(oObject); + NWNX_CallFunction(NWNX_Object, sFunc); + + return NWNX_GetReturnValueInt(); +} + +void NWNX_Object_SetAILevel(object oObject, int nLevel) +{ + string sFunc = "SetAILevel"; + + NWNX_PushArgumentInt(nLevel); + NWNX_PushArgumentObject(oObject); + + NWNX_CallFunction(NWNX_Object, sFunc); +} + +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(); +} + +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); +} + +int NWNX_Object_GetLastSpellCastFeat(object oObject) +{ + string sFunc = "GetLastSpellCastFeat"; + + NWNX_PushArgumentObject(oObject); + NWNX_CallFunction(NWNX_Object, sFunc); + + return NWNX_GetReturnValueInt(); +} + +void NWNX_Object_SetLastTriggered(object oObject, object oLast) +{ + string sFunc = "SetLastTriggered"; + + NWNX_PushArgumentObject(oLast); + NWNX_PushArgumentObject(oObject); + + NWNX_CallFunction(NWNX_Object, sFunc); +} + +float NWNX_Object_GetAoEObjectDurationRemaining(object oAoE) +{ + string sFunc = "GetAoEObjectDurationRemaining"; + + NWNX_PushArgumentObject(oAoE); + NWNX_CallFunction(NWNX_Object, sFunc); + + return NWNX_GetReturnValueFloat(); +} + +void NWNX_Object_SetConversationPrivate(object oObject, int bPrivate) +{ + string sFunc = "SetConversationPrivate"; + + NWNX_PushArgumentInt(bPrivate); + NWNX_PushArgumentObject(oObject); + + NWNX_CallFunction(NWNX_Object, sFunc); +} + +void NWNX_Object_SetAoEObjectRadius(object oAoE, float fRadius) +{ + string sFunc = "SetAoEObjectRadius"; + + NWNX_PushArgumentFloat(fRadius); + NWNX_PushArgumentObject(oAoE); + NWNX_CallFunction(NWNX_Object, sFunc); +} + +float NWNX_Object_GetAoEObjectRadius(object oAoE) +{ + string sFunc = "GetAoEObjectRadius"; + + NWNX_PushArgumentObject(oAoE); + NWNX_CallFunction(NWNX_Object, sFunc); + + return NWNX_GetReturnValueFloat(); +} + +int NWNX_Object_GetLastSpellCastSpontaneous(object oObject) +{ + string sFunc = "GetLastSpellCastSpontaneous"; + + NWNX_PushArgumentObject(oObject); + NWNX_CallFunction(NWNX_Object, sFunc); + + return NWNX_GetReturnValueInt(); +} + +int NWNX_Object_GetLastSpellCastDomainLevel(object oObject) +{ + string sFunc = "GetLastSpellCastDomainLevel"; + + NWNX_PushArgumentObject(oObject); + NWNX_CallFunction(NWNX_Object, sFunc); + + return NWNX_GetReturnValueInt(); +} + +void NWNX_Object_ForceAssignUUID(object oObject, string sUUID) +{ + string sFunc = "ForceAssignUUID"; + + NWNX_PushArgumentString(sUUID); + NWNX_PushArgumentObject(oObject); + NWNX_CallFunction(NWNX_Object, sFunc); +} + +int NWNX_Object_GetInventoryItemCount(object oObject) +{ + string sFunc = "GetInventoryItemCount"; + + NWNX_PushArgumentObject(oObject); + NWNX_CallFunction(NWNX_Object, sFunc); + return NWNX_GetReturnValueInt(); +} + +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); +} + +int NWNX_Object_GetLastSpellInstant() +{ + string sFunc = "GetLastSpellInstant"; + NWNX_CallFunction(NWNX_Object, sFunc); + return NWNX_GetReturnValueInt(); +} + +void NWNX_Object_SetTrapCreator(object oObject, object oCreator) +{ + string sFunc = "SetTrapCreator"; + NWNX_PushArgumentObject(oCreator); + NWNX_PushArgumentObject(oObject); + NWNX_CallFunction(NWNX_Object, sFunc); +} + +string NWNX_Object_GetLocalizedName(object oObject, int nLanguage, int nGender = 0) +{ + string sFunc = "GetLocalizedName"; + + NWNX_PushArgumentInt(nGender); + NWNX_PushArgumentInt(nLanguage); + NWNX_PushArgumentObject(oObject); + + NWNX_CallFunction(NWNX_Object, sFunc); + return NWNX_GetReturnValueString(); +} + +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); + + NWNX_CallFunction(NWNX_Object, sFunc); } diff --git a/_module/nss/nwnx_player.nss b/_module/nss/nwnx_player.nss index 60c4a1c1..3f4ab659 100644 --- a/_module/nss/nwnx_player.nss +++ b/_module/nss/nwnx_player.nss @@ -135,7 +135,10 @@ string NWNX_Player_GetBicFileName(object player); /// @param player The player object. /// @param effectId The effect id. /// @param position The position to play the visual effect. -void NWNX_Player_ShowVisualEffect(object player, int effectId, vector position); +/// @param scale The scale of the effect +/// @param translate A translation vector to offset the position of the effect +/// @param rotate A rotation vector to rotate the effect +void NWNX_Player_ShowVisualEffect(object player, int effectId, vector position, float scale=1.0f, vector translate=[], vector rotate=[]); /// @brief Changes the daytime music track for the given player only /// @param player The player object. @@ -190,8 +193,11 @@ void NWNX_Player_SetRestDuration(object player, int duration); /// @param player The player object. /// @param target The target object to play the effect upon. /// @param visualeffect The visual effect id. +/// @param scale The scale of the effect +/// @param translate A translation vector to offset the position of the effect +/// @param rotate A rotation vector to rotate the effect /// @note Only works with instant effects: VFX_COM_*, VFX_FNF_*, VFX_IMP_* -void NWNX_Player_ApplyInstantVisualEffectToObject(object player, object target, int visualeffect); +void NWNX_Player_ApplyInstantVisualEffectToObject(object player, object target, int visualeffect, float scale=1.0f, vector translate=[], vector rotate=[]); /// @brief Refreshes the players character sheet /// @param player The player object. @@ -323,7 +329,8 @@ void NWNX_Player_SetCreatureNameOverride(object oPlayer, object oCreature, strin /// @param oPlayer The player to display the text to. /// @param oCreature The creature to display the text above. /// @param sText The text to display. -void NWNX_Player_FloatingTextStringOnCreature(object oPlayer, object oCreature, string sText); +/// @param bChatWindow If TRUE, sText will be displayed in oPlayer's chat window. +void NWNX_Player_FloatingTextStringOnCreature(object oPlayer, object oCreature, string sText, int bChatWindow = TRUE); /// @brief Toggle oPlayer's PlayerDM status. /// @note This function does nothing for actual DMClient DMs or players with a client version < 8193.14 @@ -382,14 +389,79 @@ struct NWNX_Player_JournalEntry NWNX_Player_GetJournalEntry(object oPlayer, stri /// @param oPlayer The player object. void NWNX_Player_CloseStore(object oPlayer); +/// @brief Override nStrRef from the TlkTable with sOverride for oPlayer only. +/// @param oPlayer The player. +/// @param nStrRef The StrRef. +/// @param sOverride The new value for nStrRef or "" to remove the override. +/// @param bRestoreGlobal If TRUE, when removing a personal override it will attempt to restore the global override if it exists. +/// @note Overrides will not persist through relogging. +void NWNX_Player_SetTlkOverride(object oPlayer, int nStrRef, string sOverride, int bRestoreGlobal = TRUE); + +/// @brief Make the player reload it's TlkTable. +/// @param oPlayer The player. +void NWNX_Player_ReloadTlk(object oPlayer); + +/// @brief Update wind for oPlayer only. +/// @param oPlayer The player. +/// @param vDirection The Wind's direction. +/// @param fMagnitude The Wind's magnitude. +/// @param fYaw The Wind's yaw. +/// @param fPitch The Wind's pitch. +void NWNX_Player_UpdateWind(object oPlayer, vector vDirection, float fMagnitude, float fYaw, float fPitch); + +/// @brief Update the SkyBox for oPlayer only. +/// @param oPlayer The player. +/// @param nSkyBox The Skybox ID. +void NWNX_Player_UpdateSkyBox(object oPlayer, int nSkyBox); + +/// @brief Update Sun and Moon Fog Color for oPlayer only. +/// @param oPlayer The player. +/// @param nSunFogColor The int value of Sun Fog color. +/// @param nMoonFogColor The int value of Moon Fog color. +void NWNX_Player_UpdateFogColor(object oPlayer, int nSunFogColor, int nMoonFogColor); + + +/// @brief Update Sun and Moon Fog Amount for oPlayer only. +/// @param oPlayer The player. +/// @param nSunFogAmount The int value of Sun Fog amount (range 0-255). +/// @param nMoonFogAmount The int value of Moon Fog amount (range 0-255). +void NWNX_Player_UpdateFogAmount(object oPlayer, int nSunFogAmount, int nMoonFogAmount); + +/// @brief Return's the currently-possessed game object of a player. +/// @param oPlayer The player object (e.g. from GetFirst/NextPC()). +/// @return the actual game object of oPlayer, or OBJECT_INVALID on error. +object NWNX_Player_GetGameObject(object oPlayer); + +/// @brief Override the ui discovery mask of oObject for oPlayer only +/// @param oPlayer The player object. +/// @param oObject The target object. +/// @param nMask A mask of OBJECT_UI_DISCOVERY_*, or -1 to clear the override +void NWNX_Player_SetObjectUiDiscoveryMaskOverride(object oPlayer, object oObject, int nMask); + +/// @brief Send a party invite from oInviter to oPlayer +/// @param oPlayer The player to invite +/// @param oInviter The one inviting the player +/// @param bForceInvite TRUE: Sends the invite even if the target ignores invites +/// @param bHideDialog TRUE: Does not show the party invitation dialog +void NWNX_Player_SendPartyInvite(object oPlayer, object oInviter, int bForceInvite = FALSE, int bHideDialog = FALSE); + +/// @brief Get the TURD for oPlayer +/// @param oPlayer The offline player to get the TURD from +/// @return the TURD object of oPlayer, or OBJECT_INVALID if no TURD exists +object NWNX_Player_GetTURD(object oPlayer); + +/// @brief Reloads the color palettes for oPlayer +/// @param oPlayer The player to reload the color palette for +void NWNX_Player_ReloadColorPalettes(object oPlayer); + /// @} void NWNX_Player_ForcePlaceableExamineWindow(object player, object placeable) { string sFunc = "ForcePlaceableExamineWindow"; - NWNX_PushArgumentObject(NWNX_Player, sFunc, placeable); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentObject(placeable); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -398,8 +470,8 @@ void NWNX_Player_ForcePlaceableInventoryWindow(object player, object placeable) { string sFunc = "ForcePlaceableInventoryWindow"; - NWNX_PushArgumentObject(NWNX_Player, sFunc, placeable); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentObject(placeable); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -418,7 +490,7 @@ void NWNX_Player_INTERNAL_StopGuiTimingBar(object player, string script = "", in DeleteLocalInt(player, "NWNX_PLAYER_GUI_TIMING_ACTIVE"); string sFunc = "StopGuiTimingBar"; - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); if(script != "") @@ -433,9 +505,9 @@ void NWNX_Player_StartGuiTimingBar(object player, float seconds, string script = return; string sFunc = "StartGuiTimingBar"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, type); - NWNX_PushArgumentFloat(NWNX_Player, sFunc, seconds); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentInt(type); + NWNX_PushArgumentFloat(seconds); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); @@ -455,8 +527,8 @@ void NWNX_Player_SetAlwaysWalk(object player, int bWalk=TRUE) { string sFunc = "SetAlwaysWalk"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, bWalk); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentInt(bWalk); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -466,23 +538,23 @@ struct NWNX_Player_QuickBarSlot NWNX_Player_GetQuickBarSlot(object player, int s string sFunc = "GetQuickBarSlot"; struct NWNX_Player_QuickBarSlot qbs; - NWNX_PushArgumentInt(NWNX_Player, sFunc, slot); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentInt(slot); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); - qbs.oAssociate = NWNX_GetReturnValueObject(NWNX_Player, sFunc); - qbs.nAssociateType = NWNX_GetReturnValueInt(NWNX_Player, sFunc); - qbs.nDomainLevel = NWNX_GetReturnValueInt(NWNX_Player, sFunc); - qbs.nMetaType = NWNX_GetReturnValueInt(NWNX_Player, sFunc); - qbs.nINTParam1 = NWNX_GetReturnValueInt(NWNX_Player, sFunc); - qbs.sToolTip = NWNX_GetReturnValueString(NWNX_Player, sFunc); - qbs.sCommandLine = NWNX_GetReturnValueString(NWNX_Player, sFunc); - qbs.sCommandLabel = NWNX_GetReturnValueString(NWNX_Player, sFunc); - qbs.sResRef = NWNX_GetReturnValueString(NWNX_Player, sFunc); - qbs.nMultiClass = NWNX_GetReturnValueInt(NWNX_Player, sFunc); - qbs.nObjectType = NWNX_GetReturnValueInt(NWNX_Player, sFunc); - qbs.oSecondaryItem = NWNX_GetReturnValueObject(NWNX_Player, sFunc); - qbs.oItem = NWNX_GetReturnValueObject(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(); return qbs; } @@ -491,22 +563,22 @@ void NWNX_Player_SetQuickBarSlot(object player, int slot, struct NWNX_Player_Qui { string sFunc = "SetQuickBarSlot"; - NWNX_PushArgumentObject(NWNX_Player, sFunc, qbs.oItem); - NWNX_PushArgumentObject(NWNX_Player, sFunc, qbs.oSecondaryItem); - NWNX_PushArgumentInt(NWNX_Player, sFunc, qbs.nObjectType); - NWNX_PushArgumentInt(NWNX_Player, sFunc, qbs.nMultiClass); - NWNX_PushArgumentString(NWNX_Player, sFunc, qbs.sResRef); - NWNX_PushArgumentString(NWNX_Player, sFunc, qbs.sCommandLabel); - NWNX_PushArgumentString(NWNX_Player, sFunc, qbs.sCommandLine); - NWNX_PushArgumentString(NWNX_Player, sFunc, qbs.sToolTip); - NWNX_PushArgumentInt(NWNX_Player, sFunc, qbs.nINTParam1); - NWNX_PushArgumentInt(NWNX_Player, sFunc, qbs.nMetaType); - NWNX_PushArgumentInt(NWNX_Player, sFunc, qbs.nDomainLevel); - NWNX_PushArgumentInt(NWNX_Player, sFunc, qbs.nAssociateType); - NWNX_PushArgumentObject(NWNX_Player, sFunc, qbs.oAssociate); + 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(NWNX_Player, sFunc, slot); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentInt(slot); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -514,20 +586,27 @@ string NWNX_Player_GetBicFileName(object player) { string sFunc = "GetBicFileName"; - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); - return NWNX_GetReturnValueString(NWNX_Player, sFunc); + return NWNX_GetReturnValueString(); } -void NWNX_Player_ShowVisualEffect(object player, int effectId, vector position) +void NWNX_Player_ShowVisualEffect(object player, int effectId, vector position, float scale=1.0f, vector translate=[], vector rotate=[]) { string sFunc = "ShowVisualEffect"; - NWNX_PushArgumentFloat(NWNX_Player, sFunc, position.x); - NWNX_PushArgumentFloat(NWNX_Player, sFunc, position.y); - NWNX_PushArgumentFloat(NWNX_Player, sFunc, position.z); - NWNX_PushArgumentInt(NWNX_Player, sFunc, effectId); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + 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); } @@ -536,9 +615,9 @@ void NWNX_Player_MusicBackgroundChangeDay(object player, int track) { string sFunc = "ChangeBackgroundMusic"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, track); - NWNX_PushArgumentInt(NWNX_Player, sFunc, TRUE); // bool day = TRUE - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentInt(track); + NWNX_PushArgumentInt(TRUE); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -547,9 +626,9 @@ void NWNX_Player_MusicBackgroundChangeNight(object player, int track) { string sFunc = "ChangeBackgroundMusic"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, track); - NWNX_PushArgumentInt(NWNX_Player, sFunc, FALSE); // bool day = FALSE - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentInt(track); + NWNX_PushArgumentInt(FALSE); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -558,8 +637,8 @@ void NWNX_Player_MusicBackgroundStart(object player) { string sFunc = "PlayBackgroundMusic"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, TRUE); // bool play = TRUE - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentInt(TRUE); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -568,8 +647,8 @@ void NWNX_Player_MusicBackgroundStop(object player) { string sFunc = "PlayBackgroundMusic"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, FALSE); // bool play = FALSE - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentInt(FALSE); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -578,8 +657,8 @@ void NWNX_Player_MusicBattleChange(object player, int track) { string sFunc = "ChangeBattleMusic"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, track); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentInt(track); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -588,8 +667,8 @@ void NWNX_Player_MusicBattleStart(object player) { string sFunc = "PlayBattleMusic"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, TRUE); // bool play = TRUE - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentInt(TRUE); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -598,8 +677,8 @@ void NWNX_Player_MusicBattleStop(object player) { string sFunc = "PlayBattleMusic"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, FALSE); // bool play = FALSE - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentInt(FALSE); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -608,9 +687,9 @@ void NWNX_Player_PlaySound(object player, string sound, object target = OBJECT_I { string sFunc = "PlaySound"; - NWNX_PushArgumentObject(NWNX_Player, sFunc, target); - NWNX_PushArgumentString(NWNX_Player, sFunc, sound); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentObject(target); + NWNX_PushArgumentString(sound); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -619,9 +698,9 @@ void NWNX_Player_SetPlaceableUsable(object player, object placeable, int usable) { string sFunc = "SetPlaceableUsable"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, usable); - NWNX_PushArgumentObject(NWNX_Player, sFunc, placeable); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentInt(usable); + NWNX_PushArgumentObject(placeable); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -630,19 +709,26 @@ void NWNX_Player_SetRestDuration(object player, int duration) { string sFunc = "SetRestDuration"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, duration); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentInt(duration); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } -void NWNX_Player_ApplyInstantVisualEffectToObject(object player, object target, int visualeffect) +void NWNX_Player_ApplyInstantVisualEffectToObject(object player, object target, int visualeffect, float scale=1.0f, vector translate=[], vector rotate=[]) { string sFunc = "ApplyInstantVisualEffectToObject"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, visualeffect); - NWNX_PushArgumentObject(NWNX_Player, sFunc, target); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + 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); } @@ -651,7 +737,7 @@ void NWNX_Player_UpdateCharacterSheet(object player) { string sFunc = "UpdateCharacterSheet"; - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -660,9 +746,9 @@ void NWNX_Player_OpenInventory(object player, object target, int open = TRUE) { string sFunc = "OpenInventory"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, open); - NWNX_PushArgumentObject(NWNX_Player, sFunc, target); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentInt(open); + NWNX_PushArgumentObject(target); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -671,20 +757,20 @@ string NWNX_Player_GetAreaExplorationState(object player, object area) { string sFunc = "GetAreaExplorationState"; - NWNX_PushArgumentObject(NWNX_Player, sFunc, area); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentObject(area); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); - return NWNX_GetReturnValueString(NWNX_Player, sFunc); + return NWNX_GetReturnValueString(); } void NWNX_Player_SetAreaExplorationState(object player, object area, string str) { string sFunc = "SetAreaExplorationState"; - NWNX_PushArgumentString(NWNX_Player, sFunc, str); - NWNX_PushArgumentObject(NWNX_Player, sFunc, area); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentString(str); + NWNX_PushArgumentObject(area); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -693,8 +779,8 @@ void NWNX_Player_SetRestAnimation(object oPlayer, int nAnimation) { string sFunc = "SetRestAnimation"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, nAnimation); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + NWNX_PushArgumentInt(nAnimation); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -703,10 +789,10 @@ void NWNX_Player_SetObjectVisualTransformOverride(object oPlayer, object oObject { string sFunc = "SetObjectVisualTransformOverride"; - NWNX_PushArgumentFloat(NWNX_Player, sFunc, fValue); - NWNX_PushArgumentInt(NWNX_Player, sFunc, nTransform); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oObject); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + NWNX_PushArgumentFloat(fValue); + NWNX_PushArgumentInt(nTransform); + NWNX_PushArgumentObject(oObject); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -715,9 +801,9 @@ void NWNX_Player_ApplyLoopingVisualEffectToObject(object player, object target, { string sFunc = "ApplyLoopingVisualEffectToObject"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, visualeffect); - NWNX_PushArgumentObject(NWNX_Player, sFunc, target); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentInt(visualeffect); + NWNX_PushArgumentObject(target); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -726,9 +812,9 @@ void NWNX_Player_SetPlaceableNameOverride(object player, object placeable, strin { string sFunc = "SetPlaceableNameOverride"; - NWNX_PushArgumentString(NWNX_Player, sFunc, name); - NWNX_PushArgumentObject(NWNX_Player, sFunc, placeable); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentString(name); + NWNX_PushArgumentObject(placeable); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -737,21 +823,21 @@ int NWNX_Player_GetQuestCompleted(object player, string sQuestName) { string sFunc = "GetQuestCompleted"; - NWNX_PushArgumentString(NWNX_Player, sFunc, sQuestName); - NWNX_PushArgumentObject(NWNX_Player, sFunc, player); + NWNX_PushArgumentString(sQuestName); + NWNX_PushArgumentObject(player); NWNX_CallFunction(NWNX_Player, sFunc); - return NWNX_GetReturnValueInt(NWNX_Player, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Player_SetPersistentLocation(string sCDKeyOrCommunityName, string sBicFileName, object oWP, int bFirstConnectOnly = TRUE) { string sFunc = "SetPersistentLocation"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, bFirstConnectOnly); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oWP); - NWNX_PushArgumentString(NWNX_Player, sFunc, sBicFileName); - NWNX_PushArgumentString(NWNX_Player, sFunc, sCDKeyOrCommunityName); + NWNX_PushArgumentInt(bFirstConnectOnly); + NWNX_PushArgumentObject(oWP); + NWNX_PushArgumentString(sBicFileName); + NWNX_PushArgumentString(sCDKeyOrCommunityName); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -760,8 +846,8 @@ void NWNX_Player_UpdateItemName(object oPlayer, object oItem) { string sFunc = "UpdateItemName"; - NWNX_PushArgumentObject(NWNX_Player, sFunc, oItem); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + NWNX_PushArgumentObject(oItem); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -770,43 +856,43 @@ int NWNX_Player_PossessCreature(object oPossessor, object oPossessed, int bMindI { string sFunc = "PossessCreature"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, bCreateDefaultQB); - NWNX_PushArgumentInt(NWNX_Player, sFunc, bMindImmune); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPossessed); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPossessor); + NWNX_PushArgumentInt(bCreateDefaultQB); + NWNX_PushArgumentInt(bMindImmune); + NWNX_PushArgumentObject(oPossessed); + NWNX_PushArgumentObject(oPossessor); NWNX_CallFunction(NWNX_Player, sFunc); - return NWNX_GetReturnValueInt(NWNX_Player, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Player_GetPlatformId(object oPlayer) { string sFunc = "GetPlatformId"; - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Player, sFunc); - return NWNX_GetReturnValueInt(NWNX_Player, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Player_GetLanguage(object oPlayer) { string sFunc = "GetLanguage"; - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Player, sFunc); - return NWNX_GetReturnValueInt(NWNX_Player, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Player_SetResManOverride(object oPlayer, int nResType, string sOldResName, string sNewResName) { string sFunc = "SetResManOverride"; - NWNX_PushArgumentString(NWNX_Player, sFunc, sNewResName); - NWNX_PushArgumentString(NWNX_Player, sFunc, sOldResName); - NWNX_PushArgumentInt(NWNX_Player, sFunc, nResType); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + NWNX_PushArgumentString(sNewResName); + NWNX_PushArgumentString(sOldResName); + NWNX_PushArgumentInt(nResType); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -815,9 +901,9 @@ void NWNX_Player_SetCustomToken(object oPlayer, int nCustomTokenNumber, string s { string sFunc = "SetCustomToken"; - NWNX_PushArgumentString(NWNX_Player, sFunc, sTokenValue); - NWNX_PushArgumentInt(NWNX_Player, sFunc, nCustomTokenNumber); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + NWNX_PushArgumentString(sTokenValue); + NWNX_PushArgumentInt(nCustomTokenNumber); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -826,20 +912,21 @@ void NWNX_Player_SetCreatureNameOverride(object oPlayer, object oCreature, strin { string sFunc = "SetCreatureNameOverride"; - NWNX_PushArgumentString(NWNX_Player, sFunc, sName); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oCreature); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + NWNX_PushArgumentString(sName); + NWNX_PushArgumentObject(oCreature); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Player, sFunc); } -void NWNX_Player_FloatingTextStringOnCreature(object oPlayer, object oCreature, string sText) +void NWNX_Player_FloatingTextStringOnCreature(object oPlayer, object oCreature, string sText, int bChatWindow = TRUE) { string sFunc = "FloatingTextStringOnCreature"; - NWNX_PushArgumentString(NWNX_Player, sFunc, sText); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oCreature); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + NWNX_PushArgumentInt(bChatWindow); + NWNX_PushArgumentString(sText); + NWNX_PushArgumentObject(oCreature); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -848,8 +935,8 @@ void NWNX_Player_ToggleDM(object oPlayer, int bIsDM) { string sFunc = "ToggleDM"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, bIsDM); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + NWNX_PushArgumentInt(bIsDM); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -858,9 +945,9 @@ void NWNX_Player_SetObjectMouseCursorOverride(object oPlayer, object oObject, in { string sFunc = "SetObjectMouseCursorOverride"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, nCursor); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oObject); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + NWNX_PushArgumentInt(nCursor); + NWNX_PushArgumentObject(oObject); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -869,9 +956,9 @@ void NWNX_Player_SetObjectHiliteColorOverride(object oPlayer, object oObject, in { string sFunc = "SetObjectHiliteColorOverride"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, nColor); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oObject); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + NWNX_PushArgumentInt(nColor); + NWNX_PushArgumentObject(oObject); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -880,8 +967,8 @@ void NWNX_Player_RemoveEffectFromTURD(object oPlayer, string sEffectTag) { string sFunc = "RemoveEffectFromTURD"; - NWNX_PushArgumentString(NWNX_Player, sFunc, sEffectTag); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + NWNX_PushArgumentString(sEffectTag); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Player, sFunc); } @@ -892,12 +979,12 @@ void NWNX_Player_SetSpawnLocation(object oPlayer, location locSpawn) vector vPosition = GetPositionFromLocation(locSpawn); - NWNX_PushArgumentFloat(NWNX_Player, sFunc, GetFacingFromLocation(locSpawn)); - NWNX_PushArgumentFloat(NWNX_Player, sFunc, vPosition.z); - NWNX_PushArgumentFloat(NWNX_Player, sFunc, vPosition.y); - NWNX_PushArgumentFloat(NWNX_Player, sFunc, vPosition.x); - NWNX_PushArgumentObject(NWNX_Player, sFunc, GetAreaFromLocation(locSpawn)); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + 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); } @@ -905,27 +992,27 @@ void NWNX_Player_SetSpawnLocation(object oPlayer, location locSpawn) void NWNX_Player_SendDMAllCreatorLists(object oPlayer) { string sFunc = "SendDMAllCreatorLists"; - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Player, sFunc); } int NWNX_Player_AddCustomJournalEntry(object oPlayer, struct NWNX_Player_JournalEntry journalEntry, int nSilentUpdate = 0) { string sFunc = "AddCustomJournalEntry"; - NWNX_PushArgumentInt(NWNX_Player, sFunc, nSilentUpdate); - NWNX_PushArgumentInt(NWNX_Player, sFunc, journalEntry.nTimeOfDay); - NWNX_PushArgumentInt(NWNX_Player, sFunc, journalEntry.nCalendarDay); - NWNX_PushArgumentInt(NWNX_Player, sFunc, journalEntry.nUpdated); - NWNX_PushArgumentInt(NWNX_Player, sFunc, journalEntry.nQuestDisplayed); - NWNX_PushArgumentInt(NWNX_Player, sFunc, journalEntry.nQuestCompleted); - NWNX_PushArgumentInt(NWNX_Player, sFunc, journalEntry.nPriority); - NWNX_PushArgumentInt(NWNX_Player, sFunc, journalEntry.nState); - NWNX_PushArgumentString(NWNX_Player, sFunc, journalEntry.sTag); - NWNX_PushArgumentString(NWNX_Player, sFunc, journalEntry.sText); - NWNX_PushArgumentString(NWNX_Player, sFunc, journalEntry.sName); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + 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(NWNX_Player, sFunc); + return NWNX_GetReturnValueInt(); } struct NWNX_Player_JournalEntry NWNX_Player_GetJournalEntry(object oPlayer, string questTag) @@ -933,23 +1020,23 @@ struct NWNX_Player_JournalEntry NWNX_Player_GetJournalEntry(object oPlayer, stri string sFunc = "GetJournalEntry"; struct NWNX_Player_JournalEntry entry; - NWNX_PushArgumentString(NWNX_Player, sFunc, questTag); - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + NWNX_PushArgumentString(questTag); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Player, sFunc); - entry.nUpdated = NWNX_GetReturnValueInt(NWNX_Player, sFunc); + entry.nUpdated = NWNX_GetReturnValueInt(); if(entry.nUpdated == -1) // -1 set as an indicator to say that the entry was not found { return entry; } - entry.nQuestDisplayed = NWNX_GetReturnValueInt(NWNX_Player, sFunc); - entry.nQuestCompleted = NWNX_GetReturnValueInt(NWNX_Player, sFunc); - entry.nPriority = NWNX_GetReturnValueInt(NWNX_Player, sFunc); - entry.nState = NWNX_GetReturnValueInt(NWNX_Player, sFunc); - entry.nTimeOfDay = NWNX_GetReturnValueInt(NWNX_Player, sFunc); - entry.nCalendarDay = NWNX_GetReturnValueInt(NWNX_Player, sFunc); - entry.sName = NWNX_GetReturnValueString(NWNX_Player, sFunc); - entry.sText = NWNX_GetReturnValueString(NWNX_Player, sFunc); + 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.sTag = questTag; return entry; } @@ -958,6 +1045,118 @@ void NWNX_Player_CloseStore(object oPlayer) { string sFunc = "CloseStore"; - NWNX_PushArgumentObject(NWNX_Player, sFunc, oPlayer); + NWNX_PushArgumentObject(oPlayer); + NWNX_CallFunction(NWNX_Player, sFunc); +} + +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); +} + +void NWNX_Player_ReloadTlk(object oPlayer) +{ + string sFunc = "ReloadTlk"; + + NWNX_PushArgumentObject(oPlayer); + NWNX_CallFunction(NWNX_Player, sFunc); +} + +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); +} + +void NWNX_Player_UpdateSkyBox(object oPlayer, int nSkyBox) +{ + string sFunc = "UpdateSkyBox"; + + NWNX_PushArgumentInt(nSkyBox); + NWNX_PushArgumentObject(oPlayer); + NWNX_CallFunction(NWNX_Player, sFunc); +} + +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); +} + +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); +} + +object NWNX_Player_GetGameObject(object oPlayer) +{ + string sFunc = "GetGameObject"; + + NWNX_PushArgumentObject(oPlayer); + NWNX_CallFunction(NWNX_Player, sFunc); + return NWNX_GetReturnValueObject(); +} + +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); +} + +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); +} + +object NWNX_Player_GetTURD(object oPlayer) +{ + string sFunc = "GetTURD"; + + NWNX_PushArgumentObject(oPlayer); + NWNX_CallFunction(NWNX_Player, sFunc); + + return NWNX_GetReturnValueObject(); +} + +void NWNX_Player_ReloadColorPalettes(object oPlayer) +{ + string sFunc = "ReloadColorPalettes"; + + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Player, sFunc); } diff --git a/_module/nss/nwnx_profiler.nss b/_module/nss/nwnx_profiler.nss index 4c7393e8..9f641068 100644 --- a/_module/nss/nwnx_profiler.nss +++ b/_module/nss/nwnx_profiler.nss @@ -41,12 +41,12 @@ void NWNX_Profiler_PushPerfScope(string name, string tag0_tag = "", string tag0_ { string sFunc = "PushPerfScope"; - NWNX_PushArgumentString(NWNX_Profiler, sFunc, name); + NWNX_PushArgumentString(name); if (tag0_value != "" && tag0_tag != "") { - NWNX_PushArgumentString(NWNX_Profiler, sFunc, tag0_value); - NWNX_PushArgumentString(NWNX_Profiler, sFunc, tag0_tag); + NWNX_PushArgumentString(tag0_value); + NWNX_PushArgumentString(tag0_tag); } NWNX_CallFunction(NWNX_Profiler, sFunc); diff --git a/_module/nss/nwnx_race.nss b/_module/nss/nwnx_race.nss index 48360c30..de8c636c 100644 --- a/_module/nss/nwnx_race.nss +++ b/_module/nss/nwnx_race.nss @@ -60,11 +60,11 @@ void NWNX_Race_SetRacialModifier(int iRace, int iMod, int iParam1, int iParam2 = { string sFunc = "SetRacialModifier"; - NWNX_PushArgumentInt(NWNX_Race, sFunc, iParam3); - NWNX_PushArgumentInt(NWNX_Race, sFunc, iParam2); - NWNX_PushArgumentInt(NWNX_Race, sFunc, iParam1); - NWNX_PushArgumentInt(NWNX_Race, sFunc, iMod); - NWNX_PushArgumentInt(NWNX_Race, sFunc, iRace); + NWNX_PushArgumentInt(iParam3); + NWNX_PushArgumentInt(iParam2); + NWNX_PushArgumentInt(iParam1); + NWNX_PushArgumentInt(iMod); + NWNX_PushArgumentInt(iRace); NWNX_CallFunction(NWNX_Race, sFunc); } @@ -73,18 +73,18 @@ int NWNX_Race_GetParentRace(int iRace) { string sFunc = "GetParentRace"; - NWNX_PushArgumentInt(NWNX_Race, sFunc, iRace); + NWNX_PushArgumentInt(iRace); NWNX_CallFunction(NWNX_Race, sFunc); - return NWNX_GetReturnValueInt(NWNX_Race, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Race_SetFavoredEnemyFeat(int iRace, int iFeat) { string sFunc = "SetFavoredEnemyFeat"; - NWNX_PushArgumentInt(NWNX_Race, sFunc, iFeat); - NWNX_PushArgumentInt(NWNX_Race, sFunc, iRace); + NWNX_PushArgumentInt(iFeat); + NWNX_PushArgumentInt(iRace); NWNX_CallFunction(NWNX_Race, sFunc); } diff --git a/_module/nss/nwnx_race_2da.nss b/_module/nss/nwnx_race_2da.nss index 5b6f8021..cacd9d24 100644 --- a/_module/nss/nwnx_race_2da.nss +++ b/_module/nss/nwnx_race_2da.nss @@ -2,7 +2,6 @@ /// @file nwnx_race_2da.nss /// @brief Parse a column in the racialtypes.2da to load the modifiers. #include "nwnx_race" -#include "nwnx_util" /// @ingroup race /// @brief Translate a modifier type from a string to its constant. @@ -45,14 +44,14 @@ int NWNX_Race_GetModifierConstant(string raceMod) void NWNX_Race_LoadRacialModifiers(string sColumnName = "RacialModsTable") { - int iRaceRows = NWNX_Util_Get2DARowCount("racialtypes"); + int iRaceRows = Get2DARowCount("racialtypes"); int iRace; for (iRace = 0; iRace < iRaceRows; iRace++) { string sRaceModTable = Get2DAString("racialtypes", sColumnName, iRace); if(sRaceModTable != "") { - int iRaceModRows = NWNX_Util_Get2DARowCount(sRaceModTable); + int iRaceModRows = Get2DARowCount(sRaceModTable); int iRaceMod; for (iRaceMod = 0; iRaceMod < iRaceModRows; iRaceMod++) { diff --git a/_module/nss/nwnx_redis.nss b/_module/nss/nwnx_redis.nss index 56d00967..26c97a5b 100644 --- a/_module/nss/nwnx_redis.nss +++ b/_module/nss/nwnx_redis.nss @@ -77,7 +77,7 @@ int NWNX_Redis_BITCOUNT( * Perform arbitrary bitfield integer operations on strings * * Time complexity: O(1) for each subcommand specified - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_BITFIELD( string key, @@ -211,7 +211,7 @@ int NWNX_Redis_BZPOPMAX( * Returns the client ID for the current connection * * Time complexity: O(1) - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_CLIENT_ID(); @@ -299,7 +299,7 @@ int NWNX_Redis_CLIENT_SETNAME( * Time complexity: O(log N) where N is the number of client connections * - Valid values for unblock_type: "TIMEOUT", "ERROR" - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_CLIENT_UNBLOCK( string client_id, @@ -521,7 +521,7 @@ int NWNX_Redis_CLUSTER_SETSLOT( * List replica nodes of the specified master node * * Time complexity: O(1) - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_CLUSTER_SLAVES( string node_id @@ -533,7 +533,7 @@ int NWNX_Redis_CLUSTER_SLAVES( * List replica nodes of the specified master node * * Time complexity: O(1) - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_CLUSTER_REPLICAS( string node_id @@ -736,7 +736,7 @@ int NWNX_Redis_ECHO( * Execute a Lua script server side * * Time complexity: Depends on the script that is executed. - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_EVAL( string script, @@ -752,7 +752,7 @@ int NWNX_Redis_EVAL( * Execute a Lua script server side * * Time complexity: Depends on the script that is executed. - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_EVALSHA( string sha1, @@ -961,7 +961,7 @@ int NWNX_Redis_GEORADIUS( * - Valid values for withhash: "WITHHASH" * - Valid values for order: "ASC", "DESC" - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_GEORADIUSBYMEMBER( string key, @@ -1557,7 +1557,7 @@ int NWNX_Redis_MIGRATE( * MONITOR * * Listen for all requests received by the server in real time - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_MONITOR(); @@ -1615,7 +1615,7 @@ int NWNX_Redis_MULTI(); * Inspect the internals of Redis objects * * Time complexity: O(1) for all the currently implemented subcommands. - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_OBJECT( string subcommand, @@ -1720,7 +1720,7 @@ int NWNX_Redis_PING( * Set the value and expiration in milliseconds of a key * * Time complexity: O(1) - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_PSETEX( string key, @@ -2218,7 +2218,7 @@ int NWNX_Redis_REPLICAOF( * SLOWLOG * * Manages the Redis slow queries log - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_SLOWLOG( string subcommand, @@ -2382,7 +2382,7 @@ int NWNX_Redis_SWAPDB( * SYNC * * Internal command used for replication - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_SYNC(); @@ -2889,7 +2889,7 @@ int NWNX_Redis_ZUNIONSTORE( * Time complexity: O(1) for every call. O(N) for a complete iteration, including enough command * calls for the cursor to return back to 0. N is the number of elements inside * the collection. - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_SCAN( // Redis type: integer @@ -2909,7 +2909,7 @@ int NWNX_Redis_SCAN( * Time complexity: O(1) for every call. O(N) for a complete iteration, including enough command * calls for the cursor to return back to 0. N is the number of elements inside * the collection.. - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_SSCAN( string key, @@ -2929,7 +2929,7 @@ int NWNX_Redis_SSCAN( * Time complexity: O(1) for every call. O(N) for a complete iteration, including enough command * calls for the cursor to return back to 0. N is the number of elements inside * the collection.. - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_HSCAN( string key, @@ -2949,7 +2949,7 @@ int NWNX_Redis_HSCAN( * Time complexity: O(1) for every call. O(N) for a complete iteration, including enough command * calls for the cursor to return back to 0. N is the number of elements inside * the collection.. - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_ZSCAN( string key, @@ -2971,7 +2971,7 @@ int NWNX_Redis_ZSCAN( * items in the stream. * - Valid values for help: "HELP" - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_XINFO( // Redis type: key @@ -3119,7 +3119,7 @@ int NWNX_Redis_XREAD( * Time complexity: O(1) for all the subcommands, with the exception of the DESTROY subcommand * which takes an additional O(M) time in order to delete the M entries inside * the consumer group pending entries list (PEL). - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_XGROUP( // Redis type: key @@ -3153,7 +3153,7 @@ int NWNX_Redis_XGROUP( * - Valid values for noack: "NOACK" * - Valid values for streams: "STREAMS" - * Annotated return value: + * Annotated return value: */ int NWNX_Redis_XREADGROUP( string group_group, @@ -3235,32 +3235,32 @@ int NWNX_Redis_APPEND( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "APPEND"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("APPEND"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_AUTH( string password ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "AUTH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", password); + NWNX_PushArgumentString("AUTH"); + NWNX_PushArgumentString(password); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_BGREWRITEAOF() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BGREWRITEAOF"); + NWNX_PushArgumentString("BGREWRITEAOF"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_BGSAVE() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BGSAVE"); + NWNX_PushArgumentString("BGSAVE"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_BITCOUNT( @@ -3270,12 +3270,12 @@ int NWNX_Redis_BITCOUNT( // Redis type: integer int end = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BITCOUNT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (start != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(start)); - if (end != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(end)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_BITFIELD( @@ -3297,18 +3297,18 @@ int NWNX_Redis_BITFIELD( // Redis type: integer int incrby_increment = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BITFIELD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (get_type != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", get_type); - if (get_offset != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(get_offset)); - if (set_type != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", set_type); - if (set_offset != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(set_offset)); - if (set_value != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(set_value)); - if (incrby_type != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", incrby_type); - if (incrby_offset != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(incrby_offset)); - if (incrby_increment != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(incrby_increment)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_BITOP( @@ -3317,12 +3317,12 @@ int NWNX_Redis_BITOP( string destkey, string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BITOP"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", operation); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destkey); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("BITOP"); + NWNX_PushArgumentString(operation); + NWNX_PushArgumentString(destkey); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_BITPOS( @@ -3334,13 +3334,13 @@ int NWNX_Redis_BITPOS( // Redis type: integer int end = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BITPOS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(bit)); - if (start != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(start)); - if (end != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(end)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_BLPOP( @@ -3348,11 +3348,11 @@ int NWNX_Redis_BLPOP( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BLPOP"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(timeout)); + NWNX_PushArgumentString("BLPOP"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(timeout)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_BRPOP( @@ -3360,11 +3360,11 @@ int NWNX_Redis_BRPOP( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BRPOP"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(timeout)); + NWNX_PushArgumentString("BRPOP"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(timeout)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_BRPOPLPUSH( @@ -3375,12 +3375,12 @@ int NWNX_Redis_BRPOPLPUSH( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BRPOPLPUSH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", source); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destination); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(timeout)); + NWNX_PushArgumentString("BRPOPLPUSH"); + NWNX_PushArgumentString(source); + NWNX_PushArgumentString(destination); + NWNX_PushArgumentString(IntToString(timeout)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_BZPOPMIN( @@ -3388,11 +3388,11 @@ int NWNX_Redis_BZPOPMIN( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BZPOPMIN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(timeout)); + NWNX_PushArgumentString("BZPOPMIN"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(timeout)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_BZPOPMAX( @@ -3400,17 +3400,17 @@ int NWNX_Redis_BZPOPMAX( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BZPOPMAX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(timeout)); + NWNX_PushArgumentString("BZPOPMAX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(timeout)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLIENT_ID() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLIENT_ID"); + NWNX_PushArgumentString("CLIENT_ID"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLIENT_KILL( @@ -3420,54 +3420,54 @@ int NWNX_Redis_CLIENT_KILL( string addr_ip_port = "", string skipme_yes_no = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLIENT_KILL"); - if (ip_port != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", ip_port); - if (id_client_id != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(id_client_id)); - if (addr_ip_port != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", addr_ip_port); - if (skipme_yes_no != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLIENT_LIST() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLIENT_LIST"); + NWNX_PushArgumentString("CLIENT_LIST"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLIENT_GETNAME() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLIENT_GETNAME"); + NWNX_PushArgumentString("CLIENT_GETNAME"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLIENT_PAUSE( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLIENT_PAUSE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(timeout)); + NWNX_PushArgumentString("CLIENT_PAUSE"); + NWNX_PushArgumentString(IntToString(timeout)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLIENT_REPLY( // Redis type: enum string reply_mode ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLIENT_REPLY"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", reply_mode); + NWNX_PushArgumentString("CLIENT_REPLY"); + NWNX_PushArgumentString(reply_mode); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLIENT_SETNAME( string connection_name ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLIENT_SETNAME"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", connection_name); + NWNX_PushArgumentString("CLIENT_SETNAME"); + NWNX_PushArgumentString(connection_name); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLIENT_UNBLOCK( @@ -3475,69 +3475,69 @@ int NWNX_Redis_CLIENT_UNBLOCK( // Redis type: enum string unblock_type = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLIENT_UNBLOCK"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", client_id); - if (unblock_type != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_ADDSLOTS( // Redis type: integer int slot ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_ADDSLOTS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(slot)); + NWNX_PushArgumentString("CLUSTER_ADDSLOTS"); + NWNX_PushArgumentString(IntToString(slot)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_COUNT_FAILURE_REPORTS( string node_id ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_COUNT_FAILURE_REPORTS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", node_id); + NWNX_PushArgumentString("CLUSTER_COUNT_FAILURE_REPORTS"); + NWNX_PushArgumentString(node_id); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_COUNTKEYSINSLOT( // Redis type: integer int slot ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_COUNTKEYSINSLOT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(slot)); + NWNX_PushArgumentString("CLUSTER_COUNTKEYSINSLOT"); + NWNX_PushArgumentString(IntToString(slot)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_DELSLOTS( // Redis type: integer int slot ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_DELSLOTS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(slot)); + NWNX_PushArgumentString("CLUSTER_DELSLOTS"); + NWNX_PushArgumentString(IntToString(slot)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_FAILOVER( // Redis type: enum string options = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_FAILOVER"); - if (options != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", options); + NWNX_PushArgumentString("CLUSTER_FAILOVER"); + if (options != "") NWNX_PushArgumentString(options); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_FORGET( string node_id ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_FORGET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", node_id); + NWNX_PushArgumentString("CLUSTER_FORGET"); + NWNX_PushArgumentString(node_id); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_GETKEYSINSLOT( @@ -3546,26 +3546,26 @@ int NWNX_Redis_CLUSTER_GETKEYSINSLOT( // Redis type: integer int count ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_GETKEYSINSLOT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(slot)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count)); + NWNX_PushArgumentString("CLUSTER_GETKEYSINSLOT"); + NWNX_PushArgumentString(IntToString(slot)); + NWNX_PushArgumentString(IntToString(count)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_INFO() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_INFO"); + NWNX_PushArgumentString("CLUSTER_INFO"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_KEYSLOT( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_KEYSLOT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("CLUSTER_KEYSLOT"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_MEET( @@ -3573,52 +3573,52 @@ int NWNX_Redis_CLUSTER_MEET( // Redis type: integer int port ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_MEET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", ip); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(port)); + NWNX_PushArgumentString("CLUSTER_MEET"); + NWNX_PushArgumentString(ip); + NWNX_PushArgumentString(IntToString(port)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_NODES() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_NODES"); + NWNX_PushArgumentString("CLUSTER_NODES"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_REPLICATE( string node_id ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_REPLICATE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", node_id); + NWNX_PushArgumentString("CLUSTER_REPLICATE"); + NWNX_PushArgumentString(node_id); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_RESET( // Redis type: enum string reset_type = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_RESET"); - if (reset_type != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", reset_type); + NWNX_PushArgumentString("CLUSTER_RESET"); + if (reset_type != "") NWNX_PushArgumentString(reset_type); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_SAVECONFIG() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_SAVECONFIG"); + NWNX_PushArgumentString("CLUSTER_SAVECONFIG"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_SET_CONFIG_EPOCH( // Redis type: integer int config_epoch ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_SET_CONFIG_EPOCH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(config_epoch)); + NWNX_PushArgumentString("CLUSTER_SET_CONFIG_EPOCH"); + NWNX_PushArgumentString(IntToString(config_epoch)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_SETSLOT( @@ -3628,125 +3628,125 @@ int NWNX_Redis_CLUSTER_SETSLOT( string subcommand, string node_id = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_SETSLOT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(slot)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", subcommand); - if (node_id != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_SLAVES( string node_id ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_SLAVES"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", node_id); + NWNX_PushArgumentString("CLUSTER_SLAVES"); + NWNX_PushArgumentString(node_id); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_REPLICAS( string node_id ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_REPLICAS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", node_id); + NWNX_PushArgumentString("CLUSTER_REPLICAS"); + NWNX_PushArgumentString(node_id); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CLUSTER_SLOTS() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_SLOTS"); + NWNX_PushArgumentString("CLUSTER_SLOTS"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_COMMAND() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "COMMAND"); + NWNX_PushArgumentString("COMMAND"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_COMMAND_COUNT() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "COMMAND_COUNT"); + NWNX_PushArgumentString("COMMAND_COUNT"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_COMMAND_GETKEYS() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "COMMAND_GETKEYS"); + NWNX_PushArgumentString("COMMAND_GETKEYS"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_COMMAND_INFO( string command_name ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "COMMAND_INFO"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", command_name); + NWNX_PushArgumentString("COMMAND_INFO"); + NWNX_PushArgumentString(command_name); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CONFIG_GET( string parameter ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CONFIG_GET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", parameter); + NWNX_PushArgumentString("CONFIG_GET"); + NWNX_PushArgumentString(parameter); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CONFIG_REWRITE() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CONFIG_REWRITE"); + NWNX_PushArgumentString("CONFIG_REWRITE"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CONFIG_SET( string parameter, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CONFIG_SET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", parameter); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("CONFIG_SET"); + NWNX_PushArgumentString(parameter); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_CONFIG_RESETSTAT() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CONFIG_RESETSTAT"); + NWNX_PushArgumentString("CONFIG_RESETSTAT"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_DBSIZE() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "DBSIZE"); + NWNX_PushArgumentString("DBSIZE"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_DEBUG_OBJECT( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "DEBUG_OBJECT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("DEBUG_OBJECT"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_DEBUG_SEGFAULT() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "DEBUG_SEGFAULT"); + NWNX_PushArgumentString("DEBUG_SEGFAULT"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_DECR( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "DECR"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("DECR"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_DECRBY( @@ -3754,44 +3754,44 @@ int NWNX_Redis_DECRBY( // Redis type: integer int decrement ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "DECRBY"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(decrement)); + NWNX_PushArgumentString("DECRBY"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(decrement)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_DEL( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "DEL"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("DEL"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_DISCARD() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "DISCARD"); + NWNX_PushArgumentString("DISCARD"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_DUMP( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "DUMP"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("DUMP"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ECHO( string message ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ECHO"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", message); + NWNX_PushArgumentString("ECHO"); + NWNX_PushArgumentString(message); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_EVAL( @@ -3801,13 +3801,13 @@ int NWNX_Redis_EVAL( string key, string arg ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "EVAL"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", script); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(numkeys)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_EVALSHA( @@ -3817,28 +3817,28 @@ int NWNX_Redis_EVALSHA( string key, string arg ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "EVALSHA"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", sha1); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(numkeys)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_EXEC() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "EXEC"); + NWNX_PushArgumentString("EXEC"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_EXISTS( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "EXISTS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("EXISTS"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_EXPIRE( @@ -3846,11 +3846,11 @@ int NWNX_Redis_EXPIRE( // Redis type: integer int seconds ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "EXPIRE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(seconds)); + NWNX_PushArgumentString("EXPIRE"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(seconds)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_EXPIREAT( @@ -3858,31 +3858,31 @@ int NWNX_Redis_EXPIREAT( // Redis type: posix time string timestamp ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "EXPIREAT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", timestamp); + NWNX_PushArgumentString("EXPIREAT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(timestamp); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_FLUSHALL( // Redis type: enum string async = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "FLUSHALL"); - if (async != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", async); + NWNX_PushArgumentString("FLUSHALL"); + if (async != "") NWNX_PushArgumentString(async); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_FLUSHDB( // Redis type: enum string async = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "FLUSHDB"); - if (async != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", async); + NWNX_PushArgumentString("FLUSHDB"); + if (async != "") NWNX_PushArgumentString(async); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_GEOADD( @@ -3893,35 +3893,35 @@ int NWNX_Redis_GEOADD( float latitude, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GEOADD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(longitude, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(latitude, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_GEOHASH( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GEOHASH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("GEOHASH"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_GEOPOS( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GEOPOS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("GEOPOS"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_GEODIST( @@ -3930,13 +3930,13 @@ int NWNX_Redis_GEODIST( string member2, string unit = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GEODIST"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member1); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member2); - if (unit != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_GEORADIUS( @@ -3964,21 +3964,21 @@ int NWNX_Redis_GEORADIUS( // Redis type: key string storedist_key = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GEORADIUS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(longitude, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(latitude, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(radius, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", unit); - if (withcoord != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", withcoord); - if (withdist != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", withdist); - if (withhash != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", withhash); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); - if (order != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", order); - if (store_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", store_key); - if (storedist_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_GEORADIUSBYMEMBER( @@ -4003,29 +4003,29 @@ int NWNX_Redis_GEORADIUSBYMEMBER( // Redis type: key string storedist_key = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GEORADIUSBYMEMBER"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(radius, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", unit); - if (withcoord != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", withcoord); - if (withdist != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", withdist); - if (withhash != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", withhash); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); - if (order != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", order); - if (store_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", store_key); - if (storedist_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_GET( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("GET"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_GETBIT( @@ -4033,11 +4033,11 @@ int NWNX_Redis_GETBIT( // Redis type: integer int offset ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GETBIT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(offset)); + NWNX_PushArgumentString("GETBIT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(offset)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_GETRANGE( @@ -4047,65 +4047,65 @@ int NWNX_Redis_GETRANGE( // Redis type: integer int end ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GETRANGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(start)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(end)); + NWNX_PushArgumentString("GETRANGE"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(start)); + NWNX_PushArgumentString(IntToString(end)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_GETSET( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GETSET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("GETSET"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_HDEL( string key, string field ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HDEL"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); + NWNX_PushArgumentString("HDEL"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_HEXISTS( string key, string field ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HEXISTS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); + NWNX_PushArgumentString("HEXISTS"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_HGET( string key, string field ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HGET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); + NWNX_PushArgumentString("HGET"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_HGETALL( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HGETALL"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("HGETALL"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_HINCRBY( @@ -4114,12 +4114,12 @@ int NWNX_Redis_HINCRBY( // Redis type: integer int increment ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HINCRBY"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(increment)); + NWNX_PushArgumentString("HINCRBY"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); + NWNX_PushArgumentString(IntToString(increment)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_HINCRBYFLOAT( @@ -4128,41 +4128,41 @@ int NWNX_Redis_HINCRBYFLOAT( // Redis type: double float increment ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HINCRBYFLOAT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(increment, 0)); + NWNX_PushArgumentString("HINCRBYFLOAT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); + NWNX_PushArgumentString(FloatToString(increment, 0)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_HKEYS( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HKEYS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("HKEYS"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_HLEN( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HLEN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("HLEN"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_HMGET( string key, string field ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HMGET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); + NWNX_PushArgumentString("HMGET"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_HMSET( @@ -4170,12 +4170,12 @@ int NWNX_Redis_HMSET( string field, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HMSET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("HMSET"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_HSET( @@ -4183,12 +4183,12 @@ int NWNX_Redis_HSET( string field, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HSET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("HSET"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_HSETNX( @@ -4196,41 +4196,41 @@ int NWNX_Redis_HSETNX( string field, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HSETNX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("HSETNX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_HSTRLEN( string key, string field ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HSTRLEN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); + NWNX_PushArgumentString("HSTRLEN"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_HVALS( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HVALS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("HVALS"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_INCR( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "INCR"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("INCR"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_INCRBY( @@ -4238,11 +4238,11 @@ int NWNX_Redis_INCRBY( // Redis type: integer int increment ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "INCRBY"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(increment)); + NWNX_PushArgumentString("INCRBY"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(increment)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_INCRBYFLOAT( @@ -4250,35 +4250,35 @@ int NWNX_Redis_INCRBYFLOAT( // Redis type: double float increment ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "INCRBYFLOAT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(increment, 0)); + NWNX_PushArgumentString("INCRBYFLOAT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(FloatToString(increment, 0)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_INFO( string section = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "INFO"); - if (section != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", section); + NWNX_PushArgumentString("INFO"); + if (section != "") NWNX_PushArgumentString(section); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_KEYS( string pattern ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "KEYS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", pattern); + NWNX_PushArgumentString("KEYS"); + NWNX_PushArgumentString(pattern); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_LASTSAVE() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LASTSAVE"); + NWNX_PushArgumentString("LASTSAVE"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_LINDEX( @@ -4286,11 +4286,11 @@ int NWNX_Redis_LINDEX( // Redis type: integer int index ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LINDEX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(index)); + NWNX_PushArgumentString("LINDEX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(index)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_LINSERT( @@ -4300,53 +4300,53 @@ int NWNX_Redis_LINSERT( string pivot, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LINSERT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", where); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", pivot); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("LINSERT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(where); + NWNX_PushArgumentString(pivot); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_LLEN( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LLEN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("LLEN"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_LPOP( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LPOP"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("LPOP"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_LPUSH( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LPUSH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("LPUSH"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_LPUSHX( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LPUSHX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("LPUSHX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_LRANGE( @@ -4356,12 +4356,12 @@ int NWNX_Redis_LRANGE( // Redis type: integer int stop ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LRANGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(start)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(stop)); + NWNX_PushArgumentString("LRANGE"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(start)); + NWNX_PushArgumentString(IntToString(stop)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_LREM( @@ -4370,12 +4370,12 @@ int NWNX_Redis_LREM( int count, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LREM"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("LREM"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(count)); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_LSET( @@ -4384,12 +4384,12 @@ int NWNX_Redis_LSET( int index, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LSET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(index)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("LSET"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(index)); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_LTRIM( @@ -4399,42 +4399,42 @@ int NWNX_Redis_LTRIM( // Redis type: integer int stop ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LTRIM"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(start)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(stop)); + NWNX_PushArgumentString("LTRIM"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(start)); + NWNX_PushArgumentString(IntToString(stop)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_MEMORY_DOCTOR() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MEMORY_DOCTOR"); + NWNX_PushArgumentString("MEMORY_DOCTOR"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_MEMORY_HELP() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MEMORY_HELP"); + NWNX_PushArgumentString("MEMORY_HELP"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_MEMORY_MALLOC_STATS() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MEMORY_MALLOC_STATS"); + NWNX_PushArgumentString("MEMORY_MALLOC_STATS"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_MEMORY_PURGE() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MEMORY_PURGE"); + NWNX_PushArgumentString("MEMORY_PURGE"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_MEMORY_STATS() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MEMORY_STATS"); + NWNX_PushArgumentString("MEMORY_STATS"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_MEMORY_USAGE( @@ -4442,20 +4442,20 @@ int NWNX_Redis_MEMORY_USAGE( // Redis type: integer int samples_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MEMORY_USAGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (samples_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(samples_count)); + NWNX_PushArgumentString("MEMORY_USAGE"); + NWNX_PushArgumentString(key); + if (samples_count != 0) NWNX_PushArgumentString(IntToString(samples_count)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_MGET( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MGET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("MGET"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_MIGRATE( @@ -4475,24 +4475,24 @@ int NWNX_Redis_MIGRATE( // Redis type: key string keys_key = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MIGRATE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", host); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", port); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(destination_db)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(timeout)); - if (copy != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", copy); - if (replace != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", replace); - if (auth_password != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", auth_password); - if (keys_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_MONITOR() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MONITOR"); + NWNX_PushArgumentString("MONITOR"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_MOVE( @@ -4500,59 +4500,59 @@ int NWNX_Redis_MOVE( // Redis type: integer int db ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MOVE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(db)); + NWNX_PushArgumentString("MOVE"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(db)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_MSET( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MSET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("MSET"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_MSETNX( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MSETNX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("MSETNX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_MULTI() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MULTI"); + NWNX_PushArgumentString("MULTI"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_OBJECT( string subcommand, string arguments = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "OBJECT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", subcommand); - if (arguments != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", arguments); + NWNX_PushArgumentString("OBJECT"); + NWNX_PushArgumentString(subcommand); + if (arguments != "") NWNX_PushArgumentString(arguments); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_PERSIST( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PERSIST"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("PERSIST"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_PEXPIRE( @@ -4560,11 +4560,11 @@ int NWNX_Redis_PEXPIRE( // Redis type: integer int milliseconds ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PEXPIRE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(milliseconds)); + NWNX_PushArgumentString("PEXPIRE"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(milliseconds)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_PEXPIREAT( @@ -4572,31 +4572,31 @@ int NWNX_Redis_PEXPIREAT( // Redis type: posix time string milliseconds_timestamp ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PEXPIREAT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", milliseconds_timestamp); + NWNX_PushArgumentString("PEXPIREAT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(milliseconds_timestamp); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_PFADD( string key, string element ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PFADD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", element); + NWNX_PushArgumentString("PFADD"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(element); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_PFCOUNT( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PFCOUNT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("PFCOUNT"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_PFMERGE( @@ -4605,20 +4605,20 @@ int NWNX_Redis_PFMERGE( // Redis type: key string sourcekey ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PFMERGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destkey); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", sourcekey); + NWNX_PushArgumentString("PFMERGE"); + NWNX_PushArgumentString(destkey); + NWNX_PushArgumentString(sourcekey); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_PING( string message = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PING"); - if (message != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", message); + NWNX_PushArgumentString("PING"); + if (message != "") NWNX_PushArgumentString(message); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_PSETEX( @@ -4627,67 +4627,67 @@ int NWNX_Redis_PSETEX( int milliseconds, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PSETEX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(milliseconds)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("PSETEX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(milliseconds)); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_PUBSUB( string subcommand, string argument = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PUBSUB"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", subcommand); - if (argument != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", argument); + NWNX_PushArgumentString("PUBSUB"); + NWNX_PushArgumentString(subcommand); + if (argument != "") NWNX_PushArgumentString(argument); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_PTTL( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PTTL"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("PTTL"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_PUBLISH( string channel, string message ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PUBLISH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", channel); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", message); + NWNX_PushArgumentString("PUBLISH"); + NWNX_PushArgumentString(channel); + NWNX_PushArgumentString(message); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_QUIT() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "QUIT"); + NWNX_PushArgumentString("QUIT"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_RANDOMKEY() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "RANDOMKEY"); + NWNX_PushArgumentString("RANDOMKEY"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_READONLY() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "READONLY"); + NWNX_PushArgumentString("READONLY"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_READWRITE() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "READWRITE"); + NWNX_PushArgumentString("READWRITE"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_RENAME( @@ -4695,11 +4695,11 @@ int NWNX_Redis_RENAME( // Redis type: key string newkey ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "RENAME"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", newkey); + NWNX_PushArgumentString("RENAME"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(newkey); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_RENAMENX( @@ -4707,11 +4707,11 @@ int NWNX_Redis_RENAMENX( // Redis type: key string newkey ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "RENAMENX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", newkey); + NWNX_PushArgumentString("RENAMENX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(newkey); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_RESTORE( @@ -4728,31 +4728,31 @@ int NWNX_Redis_RESTORE( // Redis type: integer int freq_frequency = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "RESTORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(ttl)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", serialized_value); - if (replace != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", replace); - if (absttl != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", absttl); - if (idletime_seconds != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(idletime_seconds)); - if (freq_frequency != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(freq_frequency)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ROLE() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ROLE"); + NWNX_PushArgumentString("ROLE"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_RPOP( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "RPOP"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("RPOP"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_RPOPLPUSH( @@ -4761,108 +4761,108 @@ int NWNX_Redis_RPOPLPUSH( // Redis type: key string destination ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "RPOPLPUSH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", source); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destination); + NWNX_PushArgumentString("RPOPLPUSH"); + NWNX_PushArgumentString(source); + NWNX_PushArgumentString(destination); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_RPUSH( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "RPUSH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("RPUSH"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_RPUSHX( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "RPUSHX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("RPUSHX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SADD( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SADD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("SADD"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SAVE() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SAVE"); + NWNX_PushArgumentString("SAVE"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SCARD( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SCARD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("SCARD"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SCRIPT_DEBUG( // Redis type: enum string mode ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SCRIPT_DEBUG"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", mode); + NWNX_PushArgumentString("SCRIPT_DEBUG"); + NWNX_PushArgumentString(mode); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SCRIPT_EXISTS( string sha1 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SCRIPT_EXISTS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", sha1); + NWNX_PushArgumentString("SCRIPT_EXISTS"); + NWNX_PushArgumentString(sha1); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SCRIPT_FLUSH() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SCRIPT_FLUSH"); + NWNX_PushArgumentString("SCRIPT_FLUSH"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SCRIPT_KILL() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SCRIPT_KILL"); + NWNX_PushArgumentString("SCRIPT_KILL"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SCRIPT_LOAD( string script ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SCRIPT_LOAD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", script); + NWNX_PushArgumentString("SCRIPT_LOAD"); + NWNX_PushArgumentString(script); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SDIFF( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SDIFF"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("SDIFF"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SDIFFSTORE( @@ -4870,21 +4870,21 @@ int NWNX_Redis_SDIFFSTORE( string destination, string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SDIFFSTORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destination); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("SDIFFSTORE"); + NWNX_PushArgumentString(destination); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SELECT( // Redis type: integer int index ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SELECT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(index)); + NWNX_PushArgumentString("SELECT"); + NWNX_PushArgumentString(IntToString(index)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SET( @@ -4893,12 +4893,12 @@ int NWNX_Redis_SET( // Redis type: enum string condition = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); - if (condition != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", condition); + NWNX_PushArgumentString("SET"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); + if (condition != "") NWNX_PushArgumentString(condition); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SETBIT( @@ -4907,12 +4907,12 @@ int NWNX_Redis_SETBIT( int offset, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SETBIT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(offset)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("SETBIT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(offset)); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SETEX( @@ -4921,23 +4921,23 @@ int NWNX_Redis_SETEX( int seconds, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SETEX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(seconds)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("SETEX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(seconds)); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SETNX( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SETNX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("SETNX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SETRANGE( @@ -4946,31 +4946,31 @@ int NWNX_Redis_SETRANGE( int offset, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SETRANGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(offset)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("SETRANGE"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(offset)); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SHUTDOWN( // Redis type: enum string save_mode = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SHUTDOWN"); - if (save_mode != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", save_mode); + NWNX_PushArgumentString("SHUTDOWN"); + if (save_mode != "") NWNX_PushArgumentString(save_mode); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SINTER( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SINTER"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("SINTER"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SINTERSTORE( @@ -4978,64 +4978,64 @@ int NWNX_Redis_SINTERSTORE( string destination, string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SINTERSTORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destination); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("SINTERSTORE"); + NWNX_PushArgumentString(destination); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SISMEMBER( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SISMEMBER"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("SISMEMBER"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SLAVEOF( string host, string port ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SLAVEOF"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", host); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", port); + NWNX_PushArgumentString("SLAVEOF"); + NWNX_PushArgumentString(host); + NWNX_PushArgumentString(port); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_REPLICAOF( string host, string port ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "REPLICAOF"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", host); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", port); + NWNX_PushArgumentString("REPLICAOF"); + NWNX_PushArgumentString(host); + NWNX_PushArgumentString(port); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SLOWLOG( string subcommand, string argument = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SLOWLOG"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", subcommand); - if (argument != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", argument); + NWNX_PushArgumentString("SLOWLOG"); + NWNX_PushArgumentString(subcommand); + if (argument != "") NWNX_PushArgumentString(argument); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SMEMBERS( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SMEMBERS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("SMEMBERS"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SMOVE( @@ -5045,12 +5045,12 @@ int NWNX_Redis_SMOVE( string destination, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SMOVE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", source); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destination); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("SMOVE"); + NWNX_PushArgumentString(source); + NWNX_PushArgumentString(destination); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SORT( @@ -5069,17 +5069,17 @@ int NWNX_Redis_SORT( // Redis type: key string store_destination = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SORT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (by_pattern != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", by_pattern); - if (limit_offset != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_count)); - if (get_pattern != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", get_pattern); - if (order != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", order); - if (sorting != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", sorting); - if (store_destination != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SPOP( @@ -5087,11 +5087,11 @@ int NWNX_Redis_SPOP( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SPOP"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count)); + NWNX_PushArgumentString("SPOP"); + NWNX_PushArgumentString(key); + if (count != 0) NWNX_PushArgumentString(IntToString(count)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SRANDMEMBER( @@ -5099,40 +5099,40 @@ int NWNX_Redis_SRANDMEMBER( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SRANDMEMBER"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count)); + NWNX_PushArgumentString("SRANDMEMBER"); + NWNX_PushArgumentString(key); + if (count != 0) NWNX_PushArgumentString(IntToString(count)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SREM( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SREM"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("SREM"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_STRLEN( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "STRLEN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("STRLEN"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SUNION( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SUNION"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("SUNION"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SUNIONSTORE( @@ -5140,11 +5140,11 @@ int NWNX_Redis_SUNIONSTORE( string destination, string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SUNIONSTORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destination); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("SUNIONSTORE"); + NWNX_PushArgumentString(destination); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SWAPDB( @@ -5153,65 +5153,65 @@ int NWNX_Redis_SWAPDB( // Redis type: integer int index_1 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SWAPDB"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(index)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(index_1)); + NWNX_PushArgumentString("SWAPDB"); + NWNX_PushArgumentString(IntToString(index)); + NWNX_PushArgumentString(IntToString(index_1)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SYNC() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SYNC"); + NWNX_PushArgumentString("SYNC"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_TIME() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "TIME"); + NWNX_PushArgumentString("TIME"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_TOUCH( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "TOUCH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("TOUCH"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_TTL( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "TTL"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("TTL"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_TYPE( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "TYPE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("TYPE"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_UNLINK( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "UNLINK"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("UNLINK"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_UNWATCH() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "UNWATCH"); + NWNX_PushArgumentString("UNWATCH"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_WAIT( @@ -5220,20 +5220,20 @@ int NWNX_Redis_WAIT( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "WAIT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(numreplicas)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(timeout)); + NWNX_PushArgumentString("WAIT"); + NWNX_PushArgumentString(IntToString(numreplicas)); + NWNX_PushArgumentString(IntToString(timeout)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_WATCH( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "WATCH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("WATCH"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZADD( @@ -5248,24 +5248,24 @@ int NWNX_Redis_ZADD( float score = 0.0, string member = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZADD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (condition != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", condition); - if (change != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", change); - if (increment != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", increment); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(score, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZCARD( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZCARD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("ZCARD"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZCOUNT( @@ -5275,12 +5275,12 @@ int NWNX_Redis_ZCOUNT( // Redis type: double float max ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZCOUNT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(min, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(max, 0)); + NWNX_PushArgumentString("ZCOUNT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(FloatToString(min, 0)); + NWNX_PushArgumentString(FloatToString(max, 0)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZINCRBY( @@ -5289,12 +5289,12 @@ int NWNX_Redis_ZINCRBY( int increment, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZINCRBY"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(increment)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("ZINCRBY"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(increment)); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZINTERSTORE( @@ -5308,14 +5308,14 @@ int NWNX_Redis_ZINTERSTORE( // Redis type: enum string aggregate_aggregate = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZINTERSTORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destination); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(numkeys)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (weights_weight != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(weights_weight)); - if (aggregate_aggregate != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZLEXCOUNT( @@ -5323,12 +5323,12 @@ int NWNX_Redis_ZLEXCOUNT( string min, string max ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZLEXCOUNT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", min); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", max); + NWNX_PushArgumentString("ZLEXCOUNT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(min); + NWNX_PushArgumentString(max); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZPOPMAX( @@ -5336,11 +5336,11 @@ int NWNX_Redis_ZPOPMAX( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZPOPMAX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count)); + NWNX_PushArgumentString("ZPOPMAX"); + NWNX_PushArgumentString(key); + if (count != 0) NWNX_PushArgumentString(IntToString(count)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZPOPMIN( @@ -5348,11 +5348,11 @@ int NWNX_Redis_ZPOPMIN( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZPOPMIN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count)); + NWNX_PushArgumentString("ZPOPMIN"); + NWNX_PushArgumentString(key); + if (count != 0) NWNX_PushArgumentString(IntToString(count)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZRANGE( @@ -5364,13 +5364,13 @@ int NWNX_Redis_ZRANGE( // Redis type: enum string withscores = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZRANGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(start)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(stop)); - if (withscores != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZRANGEBYLEX( @@ -5382,14 +5382,14 @@ int NWNX_Redis_ZRANGEBYLEX( // Redis type: integer int limit_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZRANGEBYLEX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", min); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", max); - if (limit_offset != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZREVRANGEBYLEX( @@ -5401,14 +5401,14 @@ int NWNX_Redis_ZREVRANGEBYLEX( // Redis type: integer int limit_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZREVRANGEBYLEX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", max); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", min); - if (limit_offset != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZRANGEBYSCORE( @@ -5424,37 +5424,37 @@ int NWNX_Redis_ZRANGEBYSCORE( // Redis type: integer int limit_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZRANGEBYSCORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(min, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(max, 0)); - if (withscores != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", withscores); - if (limit_offset != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZRANK( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZRANK"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("ZRANK"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZREM( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZREM"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("ZREM"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZREMRANGEBYLEX( @@ -5462,12 +5462,12 @@ int NWNX_Redis_ZREMRANGEBYLEX( string min, string max ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZREMRANGEBYLEX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", min); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", max); + NWNX_PushArgumentString("ZREMRANGEBYLEX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(min); + NWNX_PushArgumentString(max); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZREMRANGEBYRANK( @@ -5477,12 +5477,12 @@ int NWNX_Redis_ZREMRANGEBYRANK( // Redis type: integer int stop ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZREMRANGEBYRANK"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(start)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(stop)); + NWNX_PushArgumentString("ZREMRANGEBYRANK"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(start)); + NWNX_PushArgumentString(IntToString(stop)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZREMRANGEBYSCORE( @@ -5492,12 +5492,12 @@ int NWNX_Redis_ZREMRANGEBYSCORE( // Redis type: double float max ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZREMRANGEBYSCORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(min, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(max, 0)); + NWNX_PushArgumentString("ZREMRANGEBYSCORE"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(FloatToString(min, 0)); + NWNX_PushArgumentString(FloatToString(max, 0)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZREVRANGE( @@ -5509,13 +5509,13 @@ int NWNX_Redis_ZREVRANGE( // Redis type: enum string withscores = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZREVRANGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(start)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(stop)); - if (withscores != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZREVRANGEBYSCORE( @@ -5531,37 +5531,37 @@ int NWNX_Redis_ZREVRANGEBYSCORE( // Redis type: integer int limit_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZREVRANGEBYSCORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(max, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(min, 0)); - if (withscores != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", withscores); - if (limit_offset != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZREVRANK( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZREVRANK"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("ZREVRANK"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZSCORE( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZSCORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("ZSCORE"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZUNIONSTORE( @@ -5575,14 +5575,14 @@ int NWNX_Redis_ZUNIONSTORE( // Redis type: enum string aggregate_aggregate = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZUNIONSTORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destination); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(numkeys)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (weights_weight != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(weights_weight)); - if (aggregate_aggregate != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SCAN( @@ -5594,13 +5594,13 @@ int NWNX_Redis_SCAN( int count_count = 0, string type_type = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SCAN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(cursor)); - if (match_pattern != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", match_pattern); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); - if (type_type != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_SSCAN( @@ -5612,13 +5612,13 @@ int NWNX_Redis_SSCAN( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SSCAN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(cursor)); - if (match_pattern != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", match_pattern); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_HSCAN( @@ -5630,13 +5630,13 @@ int NWNX_Redis_HSCAN( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HSCAN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(cursor)); - if (match_pattern != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", match_pattern); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_ZSCAN( @@ -5648,13 +5648,13 @@ int NWNX_Redis_ZSCAN( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZSCAN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(cursor)); - if (match_pattern != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", match_pattern); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_XINFO( @@ -5668,14 +5668,14 @@ int NWNX_Redis_XINFO( // Redis type: enum string help = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XINFO"); - if (consumers_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", consumers_key); - if (consumers_groupname != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", consumers_groupname); - if (groups_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", groups_key); - if (stream_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", stream_key); - if (help != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_XADD( @@ -5685,13 +5685,13 @@ int NWNX_Redis_XADD( string field, string str ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XADD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", ID); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", str); + NWNX_PushArgumentString("XADD"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(ID); + NWNX_PushArgumentString(field); + NWNX_PushArgumentString(str); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_XTRIM( @@ -5703,24 +5703,24 @@ int NWNX_Redis_XTRIM( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XTRIM"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", strategy); - if (approx != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", approx); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_XDEL( string key, string ID ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XDEL"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", ID); + NWNX_PushArgumentString("XDEL"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(ID); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_XRANGE( @@ -5730,13 +5730,13 @@ int NWNX_Redis_XRANGE( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XRANGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", start); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", end); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_XREVRANGE( @@ -5746,22 +5746,22 @@ int NWNX_Redis_XREVRANGE( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XREVRANGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", end); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", start); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_XLEN( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XLEN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("XLEN"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_XREAD( @@ -5774,14 +5774,14 @@ int NWNX_Redis_XREAD( string key = "", string ID = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XREAD"); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); - if (block_milliseconds != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(block_milliseconds)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", streams); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_XGROUP( @@ -5801,20 +5801,20 @@ int NWNX_Redis_XGROUP( string delconsumer_groupname = "", string delconsumer_consumername = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XGROUP"); - if (create_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", create_key); - if (create_groupname != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", create_groupname); - if (create_id_or__ != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", create_id_or__); - if (setid_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", setid_key); - if (setid_groupname != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", setid_groupname); - if (setid_id_or__ != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", setid_id_or__); - if (destroy_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", destroy_key); - if (destroy_groupname != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", destroy_groupname); - if (delconsumer_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", delconsumer_key); - if (delconsumer_groupname != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", delconsumer_groupname); - if (delconsumer_consumername != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_XREADGROUP( @@ -5831,17 +5831,17 @@ int NWNX_Redis_XREADGROUP( string key = "", string ID = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XREADGROUP"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", group_group); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", group_consumer); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); - if (block_milliseconds != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(block_milliseconds)); - if (noack != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", noack); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", streams); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_XACK( @@ -5849,12 +5849,12 @@ int NWNX_Redis_XACK( string group, string ID ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XACK"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", group); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", ID); + NWNX_PushArgumentString("XACK"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(group); + NWNX_PushArgumentString(ID); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_XCLAIM( @@ -5870,17 +5870,17 @@ int NWNX_Redis_XCLAIM( // Redis type: integer int retrycount_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XCLAIM"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", group); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", consumer); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", min_idle_time); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", ID); - if (idle_ms != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(idle_ms)); - if (time_ms_unix_time != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(time_ms_unix_time)); - if (retrycount_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(retrycount_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_XPENDING( @@ -5892,15 +5892,15 @@ int NWNX_Redis_XPENDING( int count = 0, string consumer = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XPENDING"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", group); - if (start != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", start); - if (end != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", end); - if (count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count)); - if (consumer != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } /// @} diff --git a/_module/nss/nwnx_redis_lib.nss b/_module/nss/nwnx_redis_lib.nss index 759c61e1..1593345f 100644 --- a/_module/nss/nwnx_redis_lib.nss +++ b/_module/nss/nwnx_redis_lib.nss @@ -65,44 +65,44 @@ string NWNX_Redis_GetResultAsString(int resultId); int NWNX_Redis_GetResultType(int resultId) { - NWNX_PushArgumentInt("NWNX_Redis", "GetResultType", resultId); + NWNX_PushArgumentInt(resultId); NWNX_CallFunction("NWNX_Redis", "GetResultType"); - return NWNX_GetReturnValueInt("NWNX_Redis", "GetResultType"); + return NWNX_GetReturnValueInt(); } int NWNX_Redis_GetArrayLength(int resultId) { - NWNX_PushArgumentInt("NWNX_Redis", "GetResultArrayLength", resultId); + NWNX_PushArgumentInt(resultId); NWNX_CallFunction("NWNX_Redis", "GetResultArrayLength"); - return NWNX_GetReturnValueInt("NWNX_Redis", "GetResultArrayLength"); + return NWNX_GetReturnValueInt(); } // Returns the last int NWNX_Redis_GetArrayElement(int resultId, int idx) { - NWNX_PushArgumentInt("NWNX_Redis", "GetResultArrayElement", resultId); - NWNX_PushArgumentInt("NWNX_Redis", "GetResultArrayElement", idx); + NWNX_PushArgumentInt(resultId); + NWNX_PushArgumentInt(idx); NWNX_CallFunction("NWNX_Redis", "GetResultArrayElement"); - return NWNX_GetReturnValueInt("NWNX_Redis", "GetResultArrayElement"); + return NWNX_GetReturnValueInt(); } float NWNX_Redis_GetResultAsFloat(int resultId) { - NWNX_PushArgumentInt("NWNX_Redis", "GetResultAsString", resultId); + NWNX_PushArgumentInt(resultId); NWNX_CallFunction("NWNX_Redis", "GetResultAsString"); - return StringToFloat(NWNX_GetReturnValueString("NWNX_Redis", "GetResultAsString")); + return StringToFloat(NWNX_GetReturnValueString()); } int NWNX_Redis_GetResultAsInt(int resultId) { - NWNX_PushArgumentInt("NWNX_Redis", "GetResultAsString", resultId); + NWNX_PushArgumentInt(resultId); NWNX_CallFunction("NWNX_Redis", "GetResultAsString"); - return StringToInt(NWNX_GetReturnValueString("NWNX_Redis", "GetResultAsString")); + return StringToInt(NWNX_GetReturnValueString()); } string NWNX_Redis_GetResultAsString(int resultId) { - NWNX_PushArgumentInt("NWNX_Redis", "GetResultAsString", resultId); + NWNX_PushArgumentInt(resultId); NWNX_CallFunction("NWNX_Redis", "GetResultAsString"); - return NWNX_GetReturnValueString("NWNX_Redis", "GetResultAsString"); + return NWNX_GetReturnValueString(); } diff --git a/_module/nss/nwnx_redis_ps.nss b/_module/nss/nwnx_redis_ps.nss index 1d59dd15..83ca4485 100644 --- a/_module/nss/nwnx_redis_ps.nss +++ b/_module/nss/nwnx_redis_ps.nss @@ -16,8 +16,8 @@ struct NWNX_Redis_PubSubMessageData NWNX_Redis_GetPubSubMessageData() { struct NWNX_Redis_PubSubMessageData ret; NWNX_CallFunction("NWNX_Redis", "GetPubSubData"); - ret.message = NWNX_GetReturnValueString("NWNX_Redis", "GetPubSubData"); - ret.channel = NWNX_GetReturnValueString("NWNX_Redis", "GetPubSubData"); + ret.message = NWNX_GetReturnValueString(); + ret.channel = NWNX_GetReturnValueString(); return ret; } /// @} diff --git a/_module/nss/nwnx_redis_short.nss b/_module/nss/nwnx_redis_short.nss index c8adc656..53b2d01f 100644 --- a/_module/nss/nwnx_redis_short.nss +++ b/_module/nss/nwnx_redis_short.nss @@ -72,7 +72,7 @@ int BITCOUNT( * Perform arbitrary bitfield integer operations on strings * * Time complexity: O(1) for each subcommand specified - * Annotated return value: + * Annotated return value: */ int BITFIELD( string key, @@ -206,7 +206,7 @@ int BZPOPMAX( * Returns the client ID for the current connection * * Time complexity: O(1) - * Annotated return value: + * Annotated return value: */ int CLIENT_ID(); @@ -294,7 +294,7 @@ int CLIENT_SETNAME( * Time complexity: O(log N) where N is the number of client connections * - Valid values for unblock_type: "TIMEOUT", "ERROR" - * Annotated return value: + * Annotated return value: */ int CLIENT_UNBLOCK( string client_id, @@ -516,7 +516,7 @@ int CLUSTER_SETSLOT( * List replica nodes of the specified master node * * Time complexity: O(1) - * Annotated return value: + * Annotated return value: */ int CLUSTER_SLAVES( string node_id @@ -528,7 +528,7 @@ int CLUSTER_SLAVES( * List replica nodes of the specified master node * * Time complexity: O(1) - * Annotated return value: + * Annotated return value: */ int CLUSTER_REPLICAS( string node_id @@ -731,7 +731,7 @@ int ECHO( * Execute a Lua script server side * * Time complexity: Depends on the script that is executed. - * Annotated return value: + * Annotated return value: */ int EVAL( string script, @@ -747,7 +747,7 @@ int EVAL( * Execute a Lua script server side * * Time complexity: Depends on the script that is executed. - * Annotated return value: + * Annotated return value: */ int EVALSHA( string sha1, @@ -956,7 +956,7 @@ int GEORADIUS( * - Valid values for withhash: "WITHHASH" * - Valid values for order: "ASC", "DESC" - * Annotated return value: + * Annotated return value: */ int GEORADIUSBYMEMBER( string key, @@ -1552,7 +1552,7 @@ int MIGRATE( * MONITOR * * Listen for all requests received by the server in real time - * Annotated return value: + * Annotated return value: */ int MONITOR(); @@ -1610,7 +1610,7 @@ int MULTI(); * Inspect the internals of Redis objects * * Time complexity: O(1) for all the currently implemented subcommands. - * Annotated return value: + * Annotated return value: */ int OBJECT( string subcommand, @@ -1715,7 +1715,7 @@ int PING( * Set the value and expiration in milliseconds of a key * * Time complexity: O(1) - * Annotated return value: + * Annotated return value: */ int PSETEX( string key, @@ -2213,7 +2213,7 @@ int REPLICAOF( * SLOWLOG * * Manages the Redis slow queries log - * Annotated return value: + * Annotated return value: */ int SLOWLOG( string subcommand, @@ -2377,7 +2377,7 @@ int SWAPDB( * SYNC * * Internal command used for replication - * Annotated return value: + * Annotated return value: */ int SYNC(); @@ -2884,7 +2884,7 @@ int ZUNIONSTORE( * Time complexity: O(1) for every call. O(N) for a complete iteration, including enough command * calls for the cursor to return back to 0. N is the number of elements inside * the collection. - * Annotated return value: + * Annotated return value: */ int SCAN( // Redis type: integer @@ -2904,7 +2904,7 @@ int SCAN( * Time complexity: O(1) for every call. O(N) for a complete iteration, including enough command * calls for the cursor to return back to 0. N is the number of elements inside * the collection.. - * Annotated return value: + * Annotated return value: */ int SSCAN( string key, @@ -2924,7 +2924,7 @@ int SSCAN( * Time complexity: O(1) for every call. O(N) for a complete iteration, including enough command * calls for the cursor to return back to 0. N is the number of elements inside * the collection.. - * Annotated return value: + * Annotated return value: */ int HSCAN( string key, @@ -2944,7 +2944,7 @@ int HSCAN( * Time complexity: O(1) for every call. O(N) for a complete iteration, including enough command * calls for the cursor to return back to 0. N is the number of elements inside * the collection.. - * Annotated return value: + * Annotated return value: */ int ZSCAN( string key, @@ -2966,7 +2966,7 @@ int ZSCAN( * items in the stream. * - Valid values for help: "HELP" - * Annotated return value: + * Annotated return value: */ int XINFO( // Redis type: key @@ -3114,7 +3114,7 @@ int XREAD( * Time complexity: O(1) for all the subcommands, with the exception of the DESTROY subcommand * which takes an additional O(M) time in order to delete the M entries inside * the consumer group pending entries list (PEL). - * Annotated return value: + * Annotated return value: */ int XGROUP( // Redis type: key @@ -3148,7 +3148,7 @@ int XGROUP( * - Valid values for noack: "NOACK" * - Valid values for streams: "STREAMS" - * Annotated return value: + * Annotated return value: */ int XREADGROUP( string group_group, @@ -3230,32 +3230,32 @@ int APPEND( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "APPEND"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("APPEND"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int AUTH( string password ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "AUTH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", password); + NWNX_PushArgumentString("AUTH"); + NWNX_PushArgumentString(password); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int BGREWRITEAOF() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BGREWRITEAOF"); + NWNX_PushArgumentString("BGREWRITEAOF"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int BGSAVE() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BGSAVE"); + NWNX_PushArgumentString("BGSAVE"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int BITCOUNT( @@ -3265,12 +3265,12 @@ int BITCOUNT( // Redis type: integer int end = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BITCOUNT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (start != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(start)); - if (end != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(end)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int BITFIELD( @@ -3292,18 +3292,18 @@ int BITFIELD( // Redis type: integer int incrby_increment = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BITFIELD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (get_type != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", get_type); - if (get_offset != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(get_offset)); - if (set_type != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", set_type); - if (set_offset != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(set_offset)); - if (set_value != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(set_value)); - if (incrby_type != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", incrby_type); - if (incrby_offset != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(incrby_offset)); - if (incrby_increment != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(incrby_increment)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int BITOP( @@ -3312,12 +3312,12 @@ int BITOP( string destkey, string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BITOP"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", operation); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destkey); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("BITOP"); + NWNX_PushArgumentString(operation); + NWNX_PushArgumentString(destkey); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int BITPOS( @@ -3329,13 +3329,13 @@ int BITPOS( // Redis type: integer int end = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BITPOS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(bit)); - if (start != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(start)); - if (end != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(end)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int BLPOP( @@ -3343,11 +3343,11 @@ int BLPOP( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BLPOP"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(timeout)); + NWNX_PushArgumentString("BLPOP"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(timeout)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int BRPOP( @@ -3355,11 +3355,11 @@ int BRPOP( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BRPOP"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(timeout)); + NWNX_PushArgumentString("BRPOP"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(timeout)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int BRPOPLPUSH( @@ -3370,12 +3370,12 @@ int BRPOPLPUSH( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BRPOPLPUSH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", source); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destination); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(timeout)); + NWNX_PushArgumentString("BRPOPLPUSH"); + NWNX_PushArgumentString(source); + NWNX_PushArgumentString(destination); + NWNX_PushArgumentString(IntToString(timeout)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int BZPOPMIN( @@ -3383,11 +3383,11 @@ int BZPOPMIN( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BZPOPMIN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(timeout)); + NWNX_PushArgumentString("BZPOPMIN"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(timeout)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int BZPOPMAX( @@ -3395,17 +3395,17 @@ int BZPOPMAX( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "BZPOPMAX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(timeout)); + NWNX_PushArgumentString("BZPOPMAX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(timeout)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLIENT_ID() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLIENT_ID"); + NWNX_PushArgumentString("CLIENT_ID"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLIENT_KILL( @@ -3415,54 +3415,54 @@ int CLIENT_KILL( string addr_ip_port = "", string skipme_yes_no = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLIENT_KILL"); - if (ip_port != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", ip_port); - if (id_client_id != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(id_client_id)); - if (addr_ip_port != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", addr_ip_port); - if (skipme_yes_no != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLIENT_LIST() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLIENT_LIST"); + NWNX_PushArgumentString("CLIENT_LIST"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLIENT_GETNAME() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLIENT_GETNAME"); + NWNX_PushArgumentString("CLIENT_GETNAME"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLIENT_PAUSE( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLIENT_PAUSE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(timeout)); + NWNX_PushArgumentString("CLIENT_PAUSE"); + NWNX_PushArgumentString(IntToString(timeout)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLIENT_REPLY( // Redis type: enum string reply_mode ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLIENT_REPLY"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", reply_mode); + NWNX_PushArgumentString("CLIENT_REPLY"); + NWNX_PushArgumentString(reply_mode); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLIENT_SETNAME( string connection_name ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLIENT_SETNAME"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", connection_name); + NWNX_PushArgumentString("CLIENT_SETNAME"); + NWNX_PushArgumentString(connection_name); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLIENT_UNBLOCK( @@ -3470,69 +3470,69 @@ int CLIENT_UNBLOCK( // Redis type: enum string unblock_type = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLIENT_UNBLOCK"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", client_id); - if (unblock_type != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_ADDSLOTS( // Redis type: integer int slot ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_ADDSLOTS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(slot)); + NWNX_PushArgumentString("CLUSTER_ADDSLOTS"); + NWNX_PushArgumentString(IntToString(slot)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_COUNT_FAILURE_REPORTS( string node_id ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_COUNT_FAILURE_REPORTS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", node_id); + NWNX_PushArgumentString("CLUSTER_COUNT_FAILURE_REPORTS"); + NWNX_PushArgumentString(node_id); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_COUNTKEYSINSLOT( // Redis type: integer int slot ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_COUNTKEYSINSLOT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(slot)); + NWNX_PushArgumentString("CLUSTER_COUNTKEYSINSLOT"); + NWNX_PushArgumentString(IntToString(slot)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_DELSLOTS( // Redis type: integer int slot ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_DELSLOTS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(slot)); + NWNX_PushArgumentString("CLUSTER_DELSLOTS"); + NWNX_PushArgumentString(IntToString(slot)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_FAILOVER( // Redis type: enum string options = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_FAILOVER"); - if (options != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", options); + NWNX_PushArgumentString("CLUSTER_FAILOVER"); + if (options != "") NWNX_PushArgumentString(options); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_FORGET( string node_id ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_FORGET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", node_id); + NWNX_PushArgumentString("CLUSTER_FORGET"); + NWNX_PushArgumentString(node_id); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_GETKEYSINSLOT( @@ -3541,26 +3541,26 @@ int CLUSTER_GETKEYSINSLOT( // Redis type: integer int count ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_GETKEYSINSLOT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(slot)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count)); + NWNX_PushArgumentString("CLUSTER_GETKEYSINSLOT"); + NWNX_PushArgumentString(IntToString(slot)); + NWNX_PushArgumentString(IntToString(count)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_INFO() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_INFO"); + NWNX_PushArgumentString("CLUSTER_INFO"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_KEYSLOT( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_KEYSLOT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("CLUSTER_KEYSLOT"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_MEET( @@ -3568,52 +3568,52 @@ int CLUSTER_MEET( // Redis type: integer int port ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_MEET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", ip); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(port)); + NWNX_PushArgumentString("CLUSTER_MEET"); + NWNX_PushArgumentString(ip); + NWNX_PushArgumentString(IntToString(port)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_NODES() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_NODES"); + NWNX_PushArgumentString("CLUSTER_NODES"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_REPLICATE( string node_id ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_REPLICATE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", node_id); + NWNX_PushArgumentString("CLUSTER_REPLICATE"); + NWNX_PushArgumentString(node_id); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_RESET( // Redis type: enum string reset_type = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_RESET"); - if (reset_type != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", reset_type); + NWNX_PushArgumentString("CLUSTER_RESET"); + if (reset_type != "") NWNX_PushArgumentString(reset_type); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_SAVECONFIG() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_SAVECONFIG"); + NWNX_PushArgumentString("CLUSTER_SAVECONFIG"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_SET_CONFIG_EPOCH( // Redis type: integer int config_epoch ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_SET_CONFIG_EPOCH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(config_epoch)); + NWNX_PushArgumentString("CLUSTER_SET_CONFIG_EPOCH"); + NWNX_PushArgumentString(IntToString(config_epoch)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_SETSLOT( @@ -3623,125 +3623,125 @@ int CLUSTER_SETSLOT( string subcommand, string node_id = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_SETSLOT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(slot)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", subcommand); - if (node_id != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_SLAVES( string node_id ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_SLAVES"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", node_id); + NWNX_PushArgumentString("CLUSTER_SLAVES"); + NWNX_PushArgumentString(node_id); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_REPLICAS( string node_id ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_REPLICAS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", node_id); + NWNX_PushArgumentString("CLUSTER_REPLICAS"); + NWNX_PushArgumentString(node_id); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CLUSTER_SLOTS() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CLUSTER_SLOTS"); + NWNX_PushArgumentString("CLUSTER_SLOTS"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int COMMAND() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "COMMAND"); + NWNX_PushArgumentString("COMMAND"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int COMMAND_COUNT() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "COMMAND_COUNT"); + NWNX_PushArgumentString("COMMAND_COUNT"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int COMMAND_GETKEYS() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "COMMAND_GETKEYS"); + NWNX_PushArgumentString("COMMAND_GETKEYS"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int COMMAND_INFO( string command_name ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "COMMAND_INFO"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", command_name); + NWNX_PushArgumentString("COMMAND_INFO"); + NWNX_PushArgumentString(command_name); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CONFIG_GET( string parameter ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CONFIG_GET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", parameter); + NWNX_PushArgumentString("CONFIG_GET"); + NWNX_PushArgumentString(parameter); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CONFIG_REWRITE() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CONFIG_REWRITE"); + NWNX_PushArgumentString("CONFIG_REWRITE"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CONFIG_SET( string parameter, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CONFIG_SET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", parameter); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("CONFIG_SET"); + NWNX_PushArgumentString(parameter); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int CONFIG_RESETSTAT() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "CONFIG_RESETSTAT"); + NWNX_PushArgumentString("CONFIG_RESETSTAT"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int DBSIZE() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "DBSIZE"); + NWNX_PushArgumentString("DBSIZE"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int DEBUG_OBJECT( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "DEBUG_OBJECT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("DEBUG_OBJECT"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int DEBUG_SEGFAULT() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "DEBUG_SEGFAULT"); + NWNX_PushArgumentString("DEBUG_SEGFAULT"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int DECR( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "DECR"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("DECR"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int DECRBY( @@ -3749,44 +3749,44 @@ int DECRBY( // Redis type: integer int decrement ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "DECRBY"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(decrement)); + NWNX_PushArgumentString("DECRBY"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(decrement)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int DEL( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "DEL"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("DEL"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int DISCARD() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "DISCARD"); + NWNX_PushArgumentString("DISCARD"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int DUMP( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "DUMP"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("DUMP"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ECHO( string message ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ECHO"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", message); + NWNX_PushArgumentString("ECHO"); + NWNX_PushArgumentString(message); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int EVAL( @@ -3796,13 +3796,13 @@ int EVAL( string key, string arg ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "EVAL"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", script); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(numkeys)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int EVALSHA( @@ -3812,28 +3812,28 @@ int EVALSHA( string key, string arg ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "EVALSHA"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", sha1); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(numkeys)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int EXEC() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "EXEC"); + NWNX_PushArgumentString("EXEC"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int EXISTS( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "EXISTS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("EXISTS"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int EXPIRE( @@ -3841,11 +3841,11 @@ int EXPIRE( // Redis type: integer int seconds ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "EXPIRE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(seconds)); + NWNX_PushArgumentString("EXPIRE"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(seconds)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int EXPIREAT( @@ -3853,31 +3853,31 @@ int EXPIREAT( // Redis type: posix time string timestamp ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "EXPIREAT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", timestamp); + NWNX_PushArgumentString("EXPIREAT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(timestamp); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int FLUSHALL( // Redis type: enum string async = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "FLUSHALL"); - if (async != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", async); + NWNX_PushArgumentString("FLUSHALL"); + if (async != "") NWNX_PushArgumentString(async); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int FLUSHDB( // Redis type: enum string async = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "FLUSHDB"); - if (async != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", async); + NWNX_PushArgumentString("FLUSHDB"); + if (async != "") NWNX_PushArgumentString(async); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int GEOADD( @@ -3888,35 +3888,35 @@ int GEOADD( float latitude, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GEOADD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(longitude, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(latitude, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int GEOHASH( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GEOHASH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("GEOHASH"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int GEOPOS( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GEOPOS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("GEOPOS"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int GEODIST( @@ -3925,13 +3925,13 @@ int GEODIST( string member2, string unit = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GEODIST"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member1); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member2); - if (unit != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int GEORADIUS( @@ -3959,21 +3959,21 @@ int GEORADIUS( // Redis type: key string storedist_key = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GEORADIUS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(longitude, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(latitude, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(radius, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", unit); - if (withcoord != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", withcoord); - if (withdist != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", withdist); - if (withhash != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", withhash); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); - if (order != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", order); - if (store_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", store_key); - if (storedist_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int GEORADIUSBYMEMBER( @@ -3998,29 +3998,29 @@ int GEORADIUSBYMEMBER( // Redis type: key string storedist_key = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GEORADIUSBYMEMBER"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(radius, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", unit); - if (withcoord != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", withcoord); - if (withdist != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", withdist); - if (withhash != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", withhash); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); - if (order != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", order); - if (store_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", store_key); - if (storedist_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int GET( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("GET"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int GETBIT( @@ -4028,11 +4028,11 @@ int GETBIT( // Redis type: integer int offset ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GETBIT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(offset)); + NWNX_PushArgumentString("GETBIT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(offset)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int GETRANGE( @@ -4042,65 +4042,65 @@ int GETRANGE( // Redis type: integer int end ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GETRANGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(start)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(end)); + NWNX_PushArgumentString("GETRANGE"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(start)); + NWNX_PushArgumentString(IntToString(end)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int GETSET( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "GETSET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("GETSET"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int HDEL( string key, string field ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HDEL"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); + NWNX_PushArgumentString("HDEL"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int HEXISTS( string key, string field ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HEXISTS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); + NWNX_PushArgumentString("HEXISTS"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int HGET( string key, string field ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HGET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); + NWNX_PushArgumentString("HGET"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int HGETALL( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HGETALL"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("HGETALL"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int HINCRBY( @@ -4109,12 +4109,12 @@ int HINCRBY( // Redis type: integer int increment ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HINCRBY"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(increment)); + NWNX_PushArgumentString("HINCRBY"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); + NWNX_PushArgumentString(IntToString(increment)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int HINCRBYFLOAT( @@ -4123,41 +4123,41 @@ int HINCRBYFLOAT( // Redis type: double float increment ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HINCRBYFLOAT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(increment, 0)); + NWNX_PushArgumentString("HINCRBYFLOAT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); + NWNX_PushArgumentString(FloatToString(increment, 0)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int HKEYS( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HKEYS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("HKEYS"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int HLEN( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HLEN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("HLEN"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int HMGET( string key, string field ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HMGET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); + NWNX_PushArgumentString("HMGET"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int HMSET( @@ -4165,12 +4165,12 @@ int HMSET( string field, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HMSET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("HMSET"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int HSET( @@ -4178,12 +4178,12 @@ int HSET( string field, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HSET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("HSET"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int HSETNX( @@ -4191,41 +4191,41 @@ int HSETNX( string field, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HSETNX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("HSETNX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int HSTRLEN( string key, string field ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HSTRLEN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); + NWNX_PushArgumentString("HSTRLEN"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(field); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int HVALS( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HVALS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("HVALS"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int INCR( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "INCR"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("INCR"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int INCRBY( @@ -4233,11 +4233,11 @@ int INCRBY( // Redis type: integer int increment ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "INCRBY"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(increment)); + NWNX_PushArgumentString("INCRBY"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(increment)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int INCRBYFLOAT( @@ -4245,35 +4245,35 @@ int INCRBYFLOAT( // Redis type: double float increment ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "INCRBYFLOAT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(increment, 0)); + NWNX_PushArgumentString("INCRBYFLOAT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(FloatToString(increment, 0)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int INFO( string section = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "INFO"); - if (section != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", section); + NWNX_PushArgumentString("INFO"); + if (section != "") NWNX_PushArgumentString(section); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int KEYS( string pattern ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "KEYS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", pattern); + NWNX_PushArgumentString("KEYS"); + NWNX_PushArgumentString(pattern); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int LASTSAVE() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LASTSAVE"); + NWNX_PushArgumentString("LASTSAVE"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int LINDEX( @@ -4281,11 +4281,11 @@ int LINDEX( // Redis type: integer int index ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LINDEX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(index)); + NWNX_PushArgumentString("LINDEX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(index)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int LINSERT( @@ -4295,53 +4295,53 @@ int LINSERT( string pivot, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LINSERT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", where); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", pivot); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("LINSERT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(where); + NWNX_PushArgumentString(pivot); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int LLEN( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LLEN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("LLEN"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int LPOP( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LPOP"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("LPOP"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int LPUSH( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LPUSH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("LPUSH"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int LPUSHX( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LPUSHX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("LPUSHX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int LRANGE( @@ -4351,12 +4351,12 @@ int LRANGE( // Redis type: integer int stop ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LRANGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(start)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(stop)); + NWNX_PushArgumentString("LRANGE"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(start)); + NWNX_PushArgumentString(IntToString(stop)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int LREM( @@ -4365,12 +4365,12 @@ int LREM( int count, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LREM"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("LREM"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(count)); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int LSET( @@ -4379,12 +4379,12 @@ int LSET( int index, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LSET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(index)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("LSET"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(index)); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int LTRIM( @@ -4394,42 +4394,42 @@ int LTRIM( // Redis type: integer int stop ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "LTRIM"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(start)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(stop)); + NWNX_PushArgumentString("LTRIM"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(start)); + NWNX_PushArgumentString(IntToString(stop)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int MEMORY_DOCTOR() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MEMORY_DOCTOR"); + NWNX_PushArgumentString("MEMORY_DOCTOR"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int MEMORY_HELP() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MEMORY_HELP"); + NWNX_PushArgumentString("MEMORY_HELP"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int MEMORY_MALLOC_STATS() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MEMORY_MALLOC_STATS"); + NWNX_PushArgumentString("MEMORY_MALLOC_STATS"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int MEMORY_PURGE() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MEMORY_PURGE"); + NWNX_PushArgumentString("MEMORY_PURGE"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int MEMORY_STATS() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MEMORY_STATS"); + NWNX_PushArgumentString("MEMORY_STATS"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int MEMORY_USAGE( @@ -4437,20 +4437,20 @@ int MEMORY_USAGE( // Redis type: integer int samples_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MEMORY_USAGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (samples_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(samples_count)); + NWNX_PushArgumentString("MEMORY_USAGE"); + NWNX_PushArgumentString(key); + if (samples_count != 0) NWNX_PushArgumentString(IntToString(samples_count)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int MGET( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MGET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("MGET"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int MIGRATE( @@ -4470,24 +4470,24 @@ int MIGRATE( // Redis type: key string keys_key = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MIGRATE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", host); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", port); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(destination_db)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(timeout)); - if (copy != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", copy); - if (replace != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", replace); - if (auth_password != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", auth_password); - if (keys_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int MONITOR() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MONITOR"); + NWNX_PushArgumentString("MONITOR"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int MOVE( @@ -4495,59 +4495,59 @@ int MOVE( // Redis type: integer int db ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MOVE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(db)); + NWNX_PushArgumentString("MOVE"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(db)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int MSET( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MSET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("MSET"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int MSETNX( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MSETNX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("MSETNX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int MULTI() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "MULTI"); + NWNX_PushArgumentString("MULTI"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int OBJECT( string subcommand, string arguments = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "OBJECT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", subcommand); - if (arguments != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", arguments); + NWNX_PushArgumentString("OBJECT"); + NWNX_PushArgumentString(subcommand); + if (arguments != "") NWNX_PushArgumentString(arguments); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int PERSIST( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PERSIST"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("PERSIST"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int PEXPIRE( @@ -4555,11 +4555,11 @@ int PEXPIRE( // Redis type: integer int milliseconds ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PEXPIRE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(milliseconds)); + NWNX_PushArgumentString("PEXPIRE"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(milliseconds)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int PEXPIREAT( @@ -4567,31 +4567,31 @@ int PEXPIREAT( // Redis type: posix time string milliseconds_timestamp ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PEXPIREAT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", milliseconds_timestamp); + NWNX_PushArgumentString("PEXPIREAT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(milliseconds_timestamp); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int PFADD( string key, string element ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PFADD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", element); + NWNX_PushArgumentString("PFADD"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(element); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int PFCOUNT( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PFCOUNT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("PFCOUNT"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int PFMERGE( @@ -4600,20 +4600,20 @@ int PFMERGE( // Redis type: key string sourcekey ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PFMERGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destkey); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", sourcekey); + NWNX_PushArgumentString("PFMERGE"); + NWNX_PushArgumentString(destkey); + NWNX_PushArgumentString(sourcekey); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int PING( string message = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PING"); - if (message != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", message); + NWNX_PushArgumentString("PING"); + if (message != "") NWNX_PushArgumentString(message); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int PSETEX( @@ -4622,67 +4622,67 @@ int PSETEX( int milliseconds, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PSETEX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(milliseconds)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("PSETEX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(milliseconds)); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int PUBSUB( string subcommand, string argument = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PUBSUB"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", subcommand); - if (argument != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", argument); + NWNX_PushArgumentString("PUBSUB"); + NWNX_PushArgumentString(subcommand); + if (argument != "") NWNX_PushArgumentString(argument); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int PTTL( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PTTL"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("PTTL"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int PUBLISH( string channel, string message ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "PUBLISH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", channel); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", message); + NWNX_PushArgumentString("PUBLISH"); + NWNX_PushArgumentString(channel); + NWNX_PushArgumentString(message); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int QUIT() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "QUIT"); + NWNX_PushArgumentString("QUIT"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int RANDOMKEY() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "RANDOMKEY"); + NWNX_PushArgumentString("RANDOMKEY"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int READONLY() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "READONLY"); + NWNX_PushArgumentString("READONLY"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int READWRITE() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "READWRITE"); + NWNX_PushArgumentString("READWRITE"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int RENAME( @@ -4690,11 +4690,11 @@ int RENAME( // Redis type: key string newkey ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "RENAME"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", newkey); + NWNX_PushArgumentString("RENAME"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(newkey); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int RENAMENX( @@ -4702,11 +4702,11 @@ int RENAMENX( // Redis type: key string newkey ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "RENAMENX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", newkey); + NWNX_PushArgumentString("RENAMENX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(newkey); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int RESTORE( @@ -4723,31 +4723,31 @@ int RESTORE( // Redis type: integer int freq_frequency = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "RESTORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(ttl)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", serialized_value); - if (replace != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", replace); - if (absttl != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", absttl); - if (idletime_seconds != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(idletime_seconds)); - if (freq_frequency != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(freq_frequency)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ROLE() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ROLE"); + NWNX_PushArgumentString("ROLE"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int RPOP( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "RPOP"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("RPOP"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int RPOPLPUSH( @@ -4756,108 +4756,108 @@ int RPOPLPUSH( // Redis type: key string destination ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "RPOPLPUSH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", source); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destination); + NWNX_PushArgumentString("RPOPLPUSH"); + NWNX_PushArgumentString(source); + NWNX_PushArgumentString(destination); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int RPUSH( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "RPUSH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("RPUSH"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int RPUSHX( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "RPUSHX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("RPUSHX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SADD( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SADD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("SADD"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SAVE() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SAVE"); + NWNX_PushArgumentString("SAVE"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SCARD( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SCARD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("SCARD"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SCRIPT_DEBUG( // Redis type: enum string mode ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SCRIPT_DEBUG"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", mode); + NWNX_PushArgumentString("SCRIPT_DEBUG"); + NWNX_PushArgumentString(mode); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SCRIPT_EXISTS( string sha1 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SCRIPT_EXISTS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", sha1); + NWNX_PushArgumentString("SCRIPT_EXISTS"); + NWNX_PushArgumentString(sha1); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SCRIPT_FLUSH() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SCRIPT_FLUSH"); + NWNX_PushArgumentString("SCRIPT_FLUSH"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SCRIPT_KILL() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SCRIPT_KILL"); + NWNX_PushArgumentString("SCRIPT_KILL"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SCRIPT_LOAD( string script ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SCRIPT_LOAD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", script); + NWNX_PushArgumentString("SCRIPT_LOAD"); + NWNX_PushArgumentString(script); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SDIFF( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SDIFF"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("SDIFF"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SDIFFSTORE( @@ -4865,21 +4865,21 @@ int SDIFFSTORE( string destination, string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SDIFFSTORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destination); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("SDIFFSTORE"); + NWNX_PushArgumentString(destination); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SELECT( // Redis type: integer int index ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SELECT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(index)); + NWNX_PushArgumentString("SELECT"); + NWNX_PushArgumentString(IntToString(index)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SET( @@ -4888,12 +4888,12 @@ int SET( // Redis type: enum string condition = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SET"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); - if (condition != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", condition); + NWNX_PushArgumentString("SET"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); + if (condition != "") NWNX_PushArgumentString(condition); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SETBIT( @@ -4902,12 +4902,12 @@ int SETBIT( int offset, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SETBIT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(offset)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("SETBIT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(offset)); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SETEX( @@ -4916,23 +4916,23 @@ int SETEX( int seconds, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SETEX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(seconds)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("SETEX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(seconds)); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SETNX( string key, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SETNX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("SETNX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SETRANGE( @@ -4941,31 +4941,31 @@ int SETRANGE( int offset, string value ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SETRANGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(offset)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", value); + NWNX_PushArgumentString("SETRANGE"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(offset)); + NWNX_PushArgumentString(value); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SHUTDOWN( // Redis type: enum string save_mode = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SHUTDOWN"); - if (save_mode != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", save_mode); + NWNX_PushArgumentString("SHUTDOWN"); + if (save_mode != "") NWNX_PushArgumentString(save_mode); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SINTER( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SINTER"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("SINTER"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SINTERSTORE( @@ -4973,64 +4973,64 @@ int SINTERSTORE( string destination, string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SINTERSTORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destination); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("SINTERSTORE"); + NWNX_PushArgumentString(destination); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SISMEMBER( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SISMEMBER"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("SISMEMBER"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SLAVEOF( string host, string port ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SLAVEOF"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", host); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", port); + NWNX_PushArgumentString("SLAVEOF"); + NWNX_PushArgumentString(host); + NWNX_PushArgumentString(port); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int REPLICAOF( string host, string port ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "REPLICAOF"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", host); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", port); + NWNX_PushArgumentString("REPLICAOF"); + NWNX_PushArgumentString(host); + NWNX_PushArgumentString(port); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SLOWLOG( string subcommand, string argument = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SLOWLOG"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", subcommand); - if (argument != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", argument); + NWNX_PushArgumentString("SLOWLOG"); + NWNX_PushArgumentString(subcommand); + if (argument != "") NWNX_PushArgumentString(argument); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SMEMBERS( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SMEMBERS"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("SMEMBERS"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SMOVE( @@ -5040,12 +5040,12 @@ int SMOVE( string destination, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SMOVE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", source); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destination); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("SMOVE"); + NWNX_PushArgumentString(source); + NWNX_PushArgumentString(destination); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SORT( @@ -5064,17 +5064,17 @@ int SORT( // Redis type: key string store_destination = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SORT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (by_pattern != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", by_pattern); - if (limit_offset != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_count)); - if (get_pattern != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", get_pattern); - if (order != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", order); - if (sorting != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", sorting); - if (store_destination != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SPOP( @@ -5082,11 +5082,11 @@ int SPOP( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SPOP"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count)); + NWNX_PushArgumentString("SPOP"); + NWNX_PushArgumentString(key); + if (count != 0) NWNX_PushArgumentString(IntToString(count)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SRANDMEMBER( @@ -5094,40 +5094,40 @@ int SRANDMEMBER( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SRANDMEMBER"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count)); + NWNX_PushArgumentString("SRANDMEMBER"); + NWNX_PushArgumentString(key); + if (count != 0) NWNX_PushArgumentString(IntToString(count)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SREM( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SREM"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("SREM"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int STRLEN( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "STRLEN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("STRLEN"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SUNION( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SUNION"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("SUNION"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SUNIONSTORE( @@ -5135,11 +5135,11 @@ int SUNIONSTORE( string destination, string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SUNIONSTORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destination); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("SUNIONSTORE"); + NWNX_PushArgumentString(destination); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SWAPDB( @@ -5148,65 +5148,65 @@ int SWAPDB( // Redis type: integer int index_1 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SWAPDB"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(index)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(index_1)); + NWNX_PushArgumentString("SWAPDB"); + NWNX_PushArgumentString(IntToString(index)); + NWNX_PushArgumentString(IntToString(index_1)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SYNC() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SYNC"); + NWNX_PushArgumentString("SYNC"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int TIME() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "TIME"); + NWNX_PushArgumentString("TIME"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int TOUCH( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "TOUCH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("TOUCH"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int TTL( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "TTL"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("TTL"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int TYPE( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "TYPE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("TYPE"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int UNLINK( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "UNLINK"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("UNLINK"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int UNWATCH() { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "UNWATCH"); + NWNX_PushArgumentString("UNWATCH"); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int WAIT( @@ -5215,20 +5215,20 @@ int WAIT( // Redis type: integer int timeout ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "WAIT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(numreplicas)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(timeout)); + NWNX_PushArgumentString("WAIT"); + NWNX_PushArgumentString(IntToString(numreplicas)); + NWNX_PushArgumentString(IntToString(timeout)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int WATCH( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "WATCH"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("WATCH"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZADD( @@ -5243,24 +5243,24 @@ int ZADD( float score = 0.0, string member = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZADD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (condition != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", condition); - if (change != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", change); - if (increment != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", increment); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(score, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZCARD( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZCARD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("ZCARD"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZCOUNT( @@ -5270,12 +5270,12 @@ int ZCOUNT( // Redis type: double float max ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZCOUNT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(min, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(max, 0)); + NWNX_PushArgumentString("ZCOUNT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(FloatToString(min, 0)); + NWNX_PushArgumentString(FloatToString(max, 0)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZINCRBY( @@ -5284,12 +5284,12 @@ int ZINCRBY( int increment, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZINCRBY"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(increment)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("ZINCRBY"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(increment)); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZINTERSTORE( @@ -5303,14 +5303,14 @@ int ZINTERSTORE( // Redis type: enum string aggregate_aggregate = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZINTERSTORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destination); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(numkeys)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (weights_weight != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(weights_weight)); - if (aggregate_aggregate != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZLEXCOUNT( @@ -5318,12 +5318,12 @@ int ZLEXCOUNT( string min, string max ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZLEXCOUNT"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", min); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", max); + NWNX_PushArgumentString("ZLEXCOUNT"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(min); + NWNX_PushArgumentString(max); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZPOPMAX( @@ -5331,11 +5331,11 @@ int ZPOPMAX( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZPOPMAX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count)); + NWNX_PushArgumentString("ZPOPMAX"); + NWNX_PushArgumentString(key); + if (count != 0) NWNX_PushArgumentString(IntToString(count)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZPOPMIN( @@ -5343,11 +5343,11 @@ int ZPOPMIN( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZPOPMIN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count)); + NWNX_PushArgumentString("ZPOPMIN"); + NWNX_PushArgumentString(key); + if (count != 0) NWNX_PushArgumentString(IntToString(count)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZRANGE( @@ -5359,13 +5359,13 @@ int ZRANGE( // Redis type: enum string withscores = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZRANGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(start)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(stop)); - if (withscores != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZRANGEBYLEX( @@ -5377,14 +5377,14 @@ int ZRANGEBYLEX( // Redis type: integer int limit_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZRANGEBYLEX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", min); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", max); - if (limit_offset != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZREVRANGEBYLEX( @@ -5396,14 +5396,14 @@ int ZREVRANGEBYLEX( // Redis type: integer int limit_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZREVRANGEBYLEX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", max); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", min); - if (limit_offset != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZRANGEBYSCORE( @@ -5419,37 +5419,37 @@ int ZRANGEBYSCORE( // Redis type: integer int limit_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZRANGEBYSCORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(min, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(max, 0)); - if (withscores != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", withscores); - if (limit_offset != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZRANK( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZRANK"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("ZRANK"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZREM( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZREM"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("ZREM"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZREMRANGEBYLEX( @@ -5457,12 +5457,12 @@ int ZREMRANGEBYLEX( string min, string max ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZREMRANGEBYLEX"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", min); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", max); + NWNX_PushArgumentString("ZREMRANGEBYLEX"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(min); + NWNX_PushArgumentString(max); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZREMRANGEBYRANK( @@ -5472,12 +5472,12 @@ int ZREMRANGEBYRANK( // Redis type: integer int stop ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZREMRANGEBYRANK"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(start)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(stop)); + NWNX_PushArgumentString("ZREMRANGEBYRANK"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(IntToString(start)); + NWNX_PushArgumentString(IntToString(stop)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZREMRANGEBYSCORE( @@ -5487,12 +5487,12 @@ int ZREMRANGEBYSCORE( // Redis type: double float max ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZREMRANGEBYSCORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(min, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(max, 0)); + NWNX_PushArgumentString("ZREMRANGEBYSCORE"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(FloatToString(min, 0)); + NWNX_PushArgumentString(FloatToString(max, 0)); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZREVRANGE( @@ -5504,13 +5504,13 @@ int ZREVRANGE( // Redis type: enum string withscores = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZREVRANGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(start)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(stop)); - if (withscores != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZREVRANGEBYSCORE( @@ -5526,37 +5526,37 @@ int ZREVRANGEBYSCORE( // Redis type: integer int limit_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZREVRANGEBYSCORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(max, 0)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", FloatToString(min, 0)); - if (withscores != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", withscores); - if (limit_offset != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_offset)); - if (limit_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(limit_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZREVRANK( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZREVRANK"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("ZREVRANK"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZSCORE( string key, string member ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZSCORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", member); + NWNX_PushArgumentString("ZSCORE"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(member); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZUNIONSTORE( @@ -5570,14 +5570,14 @@ int ZUNIONSTORE( // Redis type: enum string aggregate_aggregate = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZUNIONSTORE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", destination); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(numkeys)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - if (weights_weight != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(weights_weight)); - if (aggregate_aggregate != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SCAN( @@ -5589,13 +5589,13 @@ int SCAN( int count_count = 0, string type_type = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SCAN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(cursor)); - if (match_pattern != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", match_pattern); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); - if (type_type != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int SSCAN( @@ -5607,13 +5607,13 @@ int SSCAN( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "SSCAN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(cursor)); - if (match_pattern != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", match_pattern); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int HSCAN( @@ -5625,13 +5625,13 @@ int HSCAN( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "HSCAN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(cursor)); - if (match_pattern != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", match_pattern); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int ZSCAN( @@ -5643,13 +5643,13 @@ int ZSCAN( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "ZSCAN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(cursor)); - if (match_pattern != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", match_pattern); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int XINFO( @@ -5663,14 +5663,14 @@ int XINFO( // Redis type: enum string help = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XINFO"); - if (consumers_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", consumers_key); - if (consumers_groupname != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", consumers_groupname); - if (groups_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", groups_key); - if (stream_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", stream_key); - if (help != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int XADD( @@ -5680,13 +5680,13 @@ int XADD( string field, string str ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XADD"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", ID); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", field); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", str); + NWNX_PushArgumentString("XADD"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(ID); + NWNX_PushArgumentString(field); + NWNX_PushArgumentString(str); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int XTRIM( @@ -5698,24 +5698,24 @@ int XTRIM( // Redis type: integer int count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XTRIM"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", strategy); - if (approx != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", approx); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int XDEL( string key, string ID ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XDEL"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", ID); + NWNX_PushArgumentString("XDEL"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(ID); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int XRANGE( @@ -5725,13 +5725,13 @@ int XRANGE( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XRANGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", start); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", end); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int XREVRANGE( @@ -5741,22 +5741,22 @@ int XREVRANGE( // Redis type: integer int count_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XREVRANGE"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", end); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", start); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int XLEN( string key ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XLEN"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); + NWNX_PushArgumentString("XLEN"); + NWNX_PushArgumentString(key); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int XREAD( @@ -5769,14 +5769,14 @@ int XREAD( string key = "", string ID = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XREAD"); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); - if (block_milliseconds != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(block_milliseconds)); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", streams); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int XGROUP( @@ -5796,20 +5796,20 @@ int XGROUP( string delconsumer_groupname = "", string delconsumer_consumername = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XGROUP"); - if (create_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", create_key); - if (create_groupname != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", create_groupname); - if (create_id_or__ != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", create_id_or__); - if (setid_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", setid_key); - if (setid_groupname != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", setid_groupname); - if (setid_id_or__ != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", setid_id_or__); - if (destroy_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", destroy_key); - if (destroy_groupname != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", destroy_groupname); - if (delconsumer_key != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", delconsumer_key); - if (delconsumer_groupname != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", delconsumer_groupname); - if (delconsumer_consumername != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int XREADGROUP( @@ -5826,17 +5826,17 @@ int XREADGROUP( string key = "", string ID = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XREADGROUP"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", group_group); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", group_consumer); - if (count_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count_count)); - if (block_milliseconds != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(block_milliseconds)); - if (noack != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", noack); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", streams); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int XACK( @@ -5844,12 +5844,12 @@ int XACK( string group, string ID ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XACK"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", group); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", ID); + NWNX_PushArgumentString("XACK"); + NWNX_PushArgumentString(key); + NWNX_PushArgumentString(group); + NWNX_PushArgumentString(ID); NWNX_CallFunction("NWNX_Redis", "Deferred"); - return NWNX_GetReturnValueInt("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int XCLAIM( @@ -5865,17 +5865,17 @@ int XCLAIM( // Redis type: integer int retrycount_count = 0 ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XCLAIM"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", group); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", consumer); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", min_idle_time); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", ID); - if (idle_ms != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(idle_ms)); - if (time_ms_unix_time != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(time_ms_unix_time)); - if (retrycount_count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(retrycount_count)); + 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } int XPENDING( @@ -5887,14 +5887,13 @@ int XPENDING( int count = 0, string consumer = "" ) { - NWNX_PushArgumentString("NWNX_Redis", "Deferred", "XPENDING"); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", key); - NWNX_PushArgumentString("NWNX_Redis", "Deferred", group); - if (start != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", start); - if (end != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", end); - if (count != 0) NWNX_PushArgumentString("NWNX_Redis", "Deferred", IntToString(count)); - if (consumer != "") NWNX_PushArgumentString("NWNX_Redis", "Deferred", 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("NWNX_Redis", "Deferred"); + return NWNX_GetReturnValueInt(); } - diff --git a/_module/nss/nwnx_rename.nss b/_module/nss/nwnx_rename.nss index 053fb2a5..fbd3cfc8 100644 --- a/_module/nss/nwnx_rename.nss +++ b/_module/nss/nwnx_rename.nss @@ -48,12 +48,12 @@ void NWNX_Rename_SetPCNameOverride(object oTarget, string sNewName, string sPref { string sFunc = "SetPCNameOverride"; - NWNX_PushArgumentObject(NWNX_Rename, sFunc, oObserver); - NWNX_PushArgumentInt(NWNX_Rename, sFunc, iPlayerNameState); - NWNX_PushArgumentString(NWNX_Rename, sFunc, sSuffix); - NWNX_PushArgumentString(NWNX_Rename, sFunc, sPrefix); - NWNX_PushArgumentString(NWNX_Rename, sFunc, sNewName); - NWNX_PushArgumentObject(NWNX_Rename, sFunc, oTarget); + NWNX_PushArgumentObject(oObserver); + NWNX_PushArgumentInt(iPlayerNameState); + NWNX_PushArgumentString(sSuffix); + NWNX_PushArgumentString(sPrefix); + NWNX_PushArgumentString(sNewName); + NWNX_PushArgumentObject(oTarget); NWNX_CallFunction(NWNX_Rename, sFunc); } @@ -61,20 +61,20 @@ string NWNX_Rename_GetPCNameOverride(object oTarget, object oObserver = OBJECT_I { string sFunc = "GetPCNameOverride"; - NWNX_PushArgumentObject(NWNX_Rename, sFunc, oObserver); - NWNX_PushArgumentObject(NWNX_Rename, sFunc, oTarget); + NWNX_PushArgumentObject(oObserver); + NWNX_PushArgumentObject(oTarget); NWNX_CallFunction(NWNX_Rename, sFunc); - return NWNX_GetReturnValueString(NWNX_Rename, sFunc); + return NWNX_GetReturnValueString(); } void NWNX_Rename_ClearPCNameOverride(object oTarget, object oObserver = OBJECT_INVALID, int clearAll = FALSE) { string sFunc = "ClearPCNameOverride"; - NWNX_PushArgumentInt(NWNX_Rename, sFunc, clearAll); - NWNX_PushArgumentObject(NWNX_Rename, sFunc, oObserver); - NWNX_PushArgumentObject(NWNX_Rename, sFunc, oTarget); + NWNX_PushArgumentInt(clearAll); + NWNX_PushArgumentObject(oObserver); + NWNX_PushArgumentObject(oTarget); NWNX_CallFunction(NWNX_Rename, sFunc); } diff --git a/_module/nss/nwnx_reveal.nss b/_module/nss/nwnx_reveal.nss index 8ddf2f1f..4615e886 100644 --- a/_module/nss/nwnx_reveal.nss +++ b/_module/nss/nwnx_reveal.nss @@ -30,9 +30,9 @@ void NWNX_Reveal_RevealTo(object oHiding, object oObserver, int iDetectionMethod { string sFunc = "RevealTo"; - NWNX_PushArgumentInt(NWNX_Reveal, sFunc, iDetectionMethod); - NWNX_PushArgumentObject(NWNX_Reveal, sFunc, oObserver); - NWNX_PushArgumentObject(NWNX_Reveal, sFunc, oHiding); + NWNX_PushArgumentInt(iDetectionMethod); + NWNX_PushArgumentObject(oObserver); + NWNX_PushArgumentObject(oHiding); NWNX_CallFunction(NWNX_Reveal, sFunc); } @@ -41,9 +41,9 @@ void NWNX_Reveal_SetRevealToParty(object oHiding, int bReveal, int iDetectionMet { string sFunc = "SetRevealToParty"; - NWNX_PushArgumentInt(NWNX_Reveal, sFunc, iDetectionMethod); - NWNX_PushArgumentInt(NWNX_Reveal, sFunc, bReveal); - NWNX_PushArgumentObject(NWNX_Reveal, sFunc, oHiding); + NWNX_PushArgumentInt(iDetectionMethod); + NWNX_PushArgumentInt(bReveal); + NWNX_PushArgumentObject(oHiding); NWNX_CallFunction(NWNX_Reveal, sFunc); } diff --git a/_module/nss/nwnx_ruby.nss b/_module/nss/nwnx_ruby.nss index 24c8f85d..3c31819a 100644 --- a/_module/nss/nwnx_ruby.nss +++ b/_module/nss/nwnx_ruby.nss @@ -6,7 +6,7 @@ const string NWNX_Ruby = "NWNX_Ruby"; ///< @private -string NWNX_Ruby_Evaluate (string sCode); +string NWNX_Ruby_Evaluate(string sCode); /// @brief Evaluates some ruby code. /// @param sCode The code to evaluate. @@ -15,9 +15,9 @@ string NWNX_Ruby_Evaluate(string sCode) { string sFunc = "Evaluate"; - NWNX_PushArgumentString (NWNX_Ruby, sFunc, sCode); - NWNX_CallFunction (NWNX_Ruby, sFunc); - return NWNX_GetReturnValueString (NWNX_Ruby, sFunc); + NWNX_PushArgumentString(sCode); + NWNX_CallFunction(NWNX_Ruby, sFunc); + return NWNX_GetReturnValueString(); } /// @} diff --git a/_module/nss/nwnx_skillranks.nss b/_module/nss/nwnx_skillranks.nss index cc884831..9cab9883 100644 --- a/_module/nss/nwnx_skillranks.nss +++ b/_module/nss/nwnx_skillranks.nss @@ -146,33 +146,33 @@ int NWNX_SkillRanks_GetSkillFeatCountForSkill(int iSkill) { string sFunc = "GetSkillFeatCountForSkill"; - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, iSkill); + NWNX_PushArgumentInt(iSkill); NWNX_CallFunction(NWNX_SkillRanks, sFunc); - return NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); + return NWNX_GetReturnValueInt(); } struct NWNX_SkillRanks_SkillFeat NWNX_SkillRanks_GetSkillFeatForSkillByIndex(int iSkill, int iIndex) { string sFunc = "GetSkillFeatForSkillByIndex"; - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, iIndex); - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, iSkill); + NWNX_PushArgumentInt(iIndex); + NWNX_PushArgumentInt(iSkill); NWNX_CallFunction(NWNX_SkillRanks, sFunc); struct NWNX_SkillRanks_SkillFeat skillFeat; skillFeat.iSkill = iSkill; - skillFeat.iFeat = NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); - skillFeat.iModifier = NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); - skillFeat.iFocusFeat = NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); - skillFeat.sClasses = NWNX_GetReturnValueString(NWNX_SkillRanks, sFunc); - skillFeat.fClassLevelMod = NWNX_GetReturnValueFloat(NWNX_SkillRanks, sFunc); - skillFeat.iAreaFlagsRequired = NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); - skillFeat.iAreaFlagsForbidden = NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); - skillFeat.iDayOrNight = NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); - skillFeat.bBypassArmorCheckPenalty = NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); - skillFeat.iKeyAbilityMask = NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); + 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(); return skillFeat; } @@ -181,23 +181,23 @@ struct NWNX_SkillRanks_SkillFeat NWNX_SkillRanks_GetSkillFeat(int iSkill, int iF { string sFunc = "GetSkillFeat"; - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, iFeat); - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, iSkill); + NWNX_PushArgumentInt(iFeat); + NWNX_PushArgumentInt(iSkill); NWNX_CallFunction(NWNX_SkillRanks, sFunc); struct NWNX_SkillRanks_SkillFeat skillFeat; skillFeat.iSkill = iSkill; skillFeat.iFeat = iFeat; - skillFeat.iModifier = NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); - skillFeat.iFocusFeat = NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); - skillFeat.sClasses = NWNX_GetReturnValueString(NWNX_SkillRanks, sFunc); - skillFeat.fClassLevelMod = NWNX_GetReturnValueFloat(NWNX_SkillRanks, sFunc); - skillFeat.iAreaFlagsRequired = NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); - skillFeat.iAreaFlagsForbidden = NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); - skillFeat.iDayOrNight = NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); - skillFeat.bBypassArmorCheckPenalty = NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); - skillFeat.iKeyAbilityMask = NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); + 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(); return skillFeat; } @@ -206,19 +206,19 @@ void NWNX_SkillRanks_SetSkillFeat(struct NWNX_SkillRanks_SkillFeat skillFeat, in { string sFunc = "SetSkillFeat"; - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, createIfNonExistent); - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, skillFeat.iKeyAbilityMask); - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, skillFeat.bBypassArmorCheckPenalty); - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, skillFeat.iDayOrNight); - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, skillFeat.iAreaFlagsForbidden); - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, skillFeat.iAreaFlagsRequired); - NWNX_PushArgumentFloat(NWNX_SkillRanks, sFunc, skillFeat.fClassLevelMod); + 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); // We only need to send the string from the point of the first set bit - NWNX_PushArgumentString(NWNX_SkillRanks, sFunc, GetStringRight(skillFeat.sClasses, GetStringLength(skillFeat.sClasses)-FindSubString(skillFeat.sClasses, "1"))); - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, skillFeat.iFocusFeat); - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, skillFeat.iModifier); - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, skillFeat.iFeat); - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, skillFeat.iSkill); + 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); } @@ -239,8 +239,8 @@ void NWNX_SkillRanks_SetSkillFeatFocusModifier(int iModifier, int epicFocus = FA { string sFunc = "SetSkillFeatFocusModifier"; - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, epicFocus); - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, iModifier); + NWNX_PushArgumentInt(epicFocus); + NWNX_PushArgumentInt(iModifier); NWNX_CallFunction(NWNX_SkillRanks, sFunc); } @@ -250,14 +250,14 @@ int NWNX_SkillRanks_GetBlindnessPenalty() NWNX_CallFunction(NWNX_SkillRanks, sFunc); - return NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_SkillRanks_SetBlindnessPenalty(int iModifier) { string sFunc = "SetBlindnessPenalty"; - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, iModifier); + NWNX_PushArgumentInt(iModifier); NWNX_CallFunction(NWNX_SkillRanks, sFunc); } @@ -265,19 +265,19 @@ int NWNX_SkillRanks_GetAreaModifier(object oArea, int iSkill) { string sFunc = "GetAreaModifier"; - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, iSkill); - NWNX_PushArgumentObject(NWNX_SkillRanks, sFunc, oArea); + NWNX_PushArgumentInt(iSkill); + NWNX_PushArgumentObject(oArea); NWNX_CallFunction(NWNX_SkillRanks, sFunc); - return NWNX_GetReturnValueInt(NWNX_SkillRanks, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_SkillRanks_SetAreaModifier(object oArea, int iSkill, int iModifier) { string sFunc = "SetAreaModifier"; - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, iModifier); - NWNX_PushArgumentInt(NWNX_SkillRanks, sFunc, iSkill); - NWNX_PushArgumentObject(NWNX_SkillRanks, sFunc, oArea); + NWNX_PushArgumentInt(iModifier); + NWNX_PushArgumentInt(iSkill); + NWNX_PushArgumentObject(oArea); NWNX_CallFunction(NWNX_SkillRanks, sFunc); } diff --git a/_module/nss/nwnx_spellcheck.nss b/_module/nss/nwnx_spellcheck.nss index 5c75bee0..5a6b268d 100644 --- a/_module/nss/nwnx_spellcheck.nss +++ b/_module/nss/nwnx_spellcheck.nss @@ -29,15 +29,15 @@ string NWNX_SpellChecker_FindMisspell(string sentence) { string sFunc = "FindMisspell"; - NWNX_PushArgumentString(NWNX_SpellChecker, sFunc, sentence); + NWNX_PushArgumentString(sentence); NWNX_CallFunction(NWNX_SpellChecker, sFunc); - return NWNX_GetReturnValueString(NWNX_SpellChecker, sFunc); + return NWNX_GetReturnValueString(); } string NWNX_SpellChecker_GetSuggestSpell(string word) { string sFunc = "GetSuggestSpell"; - NWNX_PushArgumentString(NWNX_SpellChecker, sFunc, word); + NWNX_PushArgumentString(word); NWNX_CallFunction(NWNX_SpellChecker, sFunc); - return NWNX_GetReturnValueString(NWNX_SpellChecker, sFunc); + return NWNX_GetReturnValueString(); } diff --git a/_module/nss/nwnx_sql.nss b/_module/nss/nwnx_sql.nss index fdd583fb..f3ab3d20 100644 --- a/_module/nss/nwnx_sql.nss +++ b/_module/nss/nwnx_sql.nss @@ -61,6 +61,16 @@ void NWNX_SQL_PreparedObjectId(int position, object value); /// @param base64 Use base64-encoded string format if TRUE (default), otherwise use binary format. void NWNX_SQL_PreparedObjectFull(int position, object value, int base64 = TRUE); +/// @brief Set the NULL value of a prepared statement at given position. +/// @param position The nth ? in a prepared statement. +void NWNX_SQL_PreparedNULL(int position); + +/// @brief Set the Json value of a prepared statement at given position. +/// Convienence function to match other Prepared(type) functions. +/// @param position The nth ? in a prepared statement. +/// @param value The value to set. +void NWNX_SQL_PreparedJson(int position, json value); + /// @brief Like NWNX_SQL_ReadDataInActiveRow, but for full serialized objects. /// /// The object will be deserialized and created in the game. New object ID is returned. @@ -98,15 +108,19 @@ string NWNX_SQL_GetLastError(); /// @return Returns the number of parameters expected by the prepared query or -1 if no query is prepared. int NWNX_SQL_GetPreparedQueryParamCount(); +/// @brief Set the next query to return full binary results **ON THE FIRST COLUMN ONLY**. +/// @note This is ONLY needed on PostgreSQL, and ONLY if you want to deserialize raw bytea in NWNX_SQL_ReadFullObjectInActiveRow with base64=FALSE. +void NWNX_SQL_PostgreSQL_SetNextQueryResultsBinaryMode(); + /// @} int NWNX_SQL_PrepareQuery(string query) { string sFunc = "PrepareQuery"; - NWNX_PushArgumentString(NWNX_SQL, sFunc, query); + NWNX_PushArgumentString(query); NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueInt(NWNX_SQL, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_SQL_ExecutePreparedQuery() @@ -114,7 +128,7 @@ int NWNX_SQL_ExecutePreparedQuery() string sFunc = "ExecutePreparedQuery"; NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueInt(NWNX_SQL, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_SQL_ExecuteQuery(string query) @@ -135,7 +149,7 @@ int NWNX_SQL_ReadyToReadNextRow() string sFunc = "ReadyToReadNextRow"; NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueInt(NWNX_SQL, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_SQL_ReadNextRow() @@ -149,9 +163,9 @@ string NWNX_SQL_ReadDataInActiveRow(int column = 0) { string sFunc = "ReadDataInActiveRow"; - NWNX_PushArgumentInt(NWNX_SQL, sFunc, column); + NWNX_PushArgumentInt(column); NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueString(NWNX_SQL, sFunc); + return NWNX_GetReturnValueString(); } @@ -159,59 +173,70 @@ void NWNX_SQL_PreparedInt(int position, int value) { string sFunc = "PreparedInt"; - NWNX_PushArgumentInt(NWNX_SQL, sFunc, value); - NWNX_PushArgumentInt(NWNX_SQL, sFunc, position); + NWNX_PushArgumentInt(value); + NWNX_PushArgumentInt(position); NWNX_CallFunction(NWNX_SQL, sFunc); } void NWNX_SQL_PreparedString(int position, string value) { string sFunc = "PreparedString"; - NWNX_PushArgumentString(NWNX_SQL, sFunc, value); - NWNX_PushArgumentInt(NWNX_SQL, sFunc, position); + NWNX_PushArgumentString(value); + NWNX_PushArgumentInt(position); NWNX_CallFunction(NWNX_SQL, sFunc); - } void NWNX_SQL_PreparedFloat(int position, float value) { string sFunc = "PreparedFloat"; - NWNX_PushArgumentFloat(NWNX_SQL, sFunc, value); - NWNX_PushArgumentInt(NWNX_SQL, sFunc, position); + NWNX_PushArgumentFloat(value); + NWNX_PushArgumentInt(position); NWNX_CallFunction(NWNX_SQL, sFunc); - } void NWNX_SQL_PreparedObjectId(int position, object value) { string sFunc = "PreparedObjectId"; - NWNX_PushArgumentObject(NWNX_SQL, sFunc, value); - NWNX_PushArgumentInt(NWNX_SQL, sFunc, position); + NWNX_PushArgumentObject(value); + NWNX_PushArgumentInt(position); NWNX_CallFunction(NWNX_SQL, sFunc); - } void NWNX_SQL_PreparedObjectFull(int position, object value, int base64 = TRUE) { string sFunc = "PreparedObjectFull"; - NWNX_PushArgumentInt(NWNX_SQL, sFunc, base64); - NWNX_PushArgumentObject(NWNX_SQL, sFunc, value); - NWNX_PushArgumentInt(NWNX_SQL, sFunc, position); + NWNX_PushArgumentInt(base64); + NWNX_PushArgumentObject(value); + NWNX_PushArgumentInt(position); NWNX_CallFunction(NWNX_SQL, sFunc); } +void NWNX_SQL_PreparedNULL(int position) +{ + string sFunc = "PreparedNULL"; + + NWNX_PushArgumentInt(position); + NWNX_CallFunction(NWNX_SQL, sFunc); +} +void NWNX_SQL_PreparedJson(int position, json value) +{ + // Dump to string and continue as a string from here. + // Famously assuming we're sent valid Json here. + NWNX_SQL_PreparedString(position, JsonDump(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(NWNX_SQL, sFunc, base64); - NWNX_PushArgumentFloat(NWNX_SQL, sFunc, z); - NWNX_PushArgumentFloat(NWNX_SQL, sFunc, y); - NWNX_PushArgumentFloat(NWNX_SQL, sFunc, x); - NWNX_PushArgumentObject(NWNX_SQL, sFunc, owner); - NWNX_PushArgumentInt(NWNX_SQL, sFunc, column); + 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(NWNX_SQL, sFunc); + return NWNX_GetReturnValueObject(); } int NWNX_SQL_GetAffectedRows() @@ -219,7 +244,7 @@ int NWNX_SQL_GetAffectedRows() string sFunc = "GetAffectedRows"; NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueInt(NWNX_SQL, sFunc); + return NWNX_GetReturnValueInt(); } string NWNX_SQL_GetDatabaseType() @@ -227,7 +252,7 @@ string NWNX_SQL_GetDatabaseType() string sFunc = "GetDatabaseType"; NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueString(NWNX_SQL, sFunc); + return NWNX_GetReturnValueString(); } void NWNX_SQL_DestroyPreparedQuery() @@ -242,7 +267,7 @@ string NWNX_SQL_GetLastError() string sFunc = "GetLastError"; NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueString(NWNX_SQL, sFunc); + return NWNX_GetReturnValueString(); } int NWNX_SQL_GetPreparedQueryParamCount() @@ -250,5 +275,12 @@ int NWNX_SQL_GetPreparedQueryParamCount() string sFunc = "GetPreparedQueryParamCount"; NWNX_CallFunction(NWNX_SQL, sFunc); - return NWNX_GetReturnValueInt(NWNX_SQL, sFunc); + return NWNX_GetReturnValueInt(); +} + +void NWNX_SQL_PostgreSQL_SetNextQueryResultsBinaryMode() +{ + string sFunc = "PostgreSQL_SetNextQueryResultsBinaryMode"; + + NWNX_CallFunction(NWNX_SQL, sFunc); } diff --git a/_module/nss/nwnx_store.nss b/_module/nss/nwnx_store.nss new file mode 100644 index 00000000..00b2014d --- /dev/null +++ b/_module/nss/nwnx_store.nss @@ -0,0 +1,131 @@ +/// @addtogroup store +/// @brief Functions exposing additional store properties. +/// @{ +/// @file nwnx_store.nss +#include "nwnx" + +const string NWNX_Store = "NWNX_Store"; ///< @private + +/// @brief Return status of a base item purchase status. +/// @param oStore The store object. +/// @param nBaseItem A BASE_ITEM_* value +/// @return TRUE if the quest has been completed. -1 if the player does not have the journal entry. +int NWNX_Store_GetIsRestrictedBuyItem(object oStore, int nBaseItem); + +/// @brief Return the blackmarket mark down of a store +/// @param oStore The store object. +/// @return mark down of a store, -1 on error +int NWNX_Store_GetBlackMarketMarkDown(object oStore); + +/// @brief Set the blackmarket mark down of a store +/// @param oStore The store object. +/// @param nValue The amount. +void NWNX_Store_SetBlackMarketMarkDown(object oStore, int nValue); + +/// @brief Return the mark down of a store +/// @param oStore The store object. +/// @return mark down of a store, -1 on error +int NWNX_Store_GetMarkDown(object oStore); + +/// @brief Set the mark down of a store +/// @param oStore The store object. +/// @param nValue The amount. +void NWNX_Store_SetMarkDown(object oStore, int nValue); + +/// @brief Return the mark up of a store +/// @param oStore The store object. +/// @return mark up of a store, -1 on error +int NWNX_Store_GetMarkUp(object oStore); + +/// @brief Set the mark up of a store +/// @param oStore The store object. +/// @param nValue The amount. +void NWNX_Store_SetMarkUp(object oStore, int nValue); + +/// @brief Return current customer count +/// @param oStore The store object. +/// @return count, or -1 on error +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(); +} + +int NWNX_Store_GetBlackMarketMarkDown(object oStore) +{ + string sFunc = "GetBlackMarketMarkDown"; + + NWNX_PushArgumentObject(oStore); + + NWNX_CallFunction(NWNX_Store, sFunc); + return NWNX_GetReturnValueInt(); +} + +void NWNX_Store_SetBlackMarketMarkDown(object oStore, int nValue) +{ + string sFunc = "SetBlackMarketMarkDown"; + + NWNX_PushArgumentInt(nValue); + NWNX_PushArgumentObject(oStore); + + NWNX_CallFunction(NWNX_Store, sFunc); +} + +int NWNX_Store_GetMarkDown(object oStore) +{ + string sFunc = "GetMarkDown"; + + NWNX_PushArgumentObject(oStore); + + NWNX_CallFunction(NWNX_Store, sFunc); + return NWNX_GetReturnValueInt(); +} + +void NWNX_Store_SetMarkDown(object oStore, int nValue) +{ + string sFunc = "SetMarkDown"; + + NWNX_PushArgumentInt(nValue); + NWNX_PushArgumentObject(oStore); + + NWNX_CallFunction(NWNX_Store, sFunc); +} + +int NWNX_Store_GetMarkUp(object oStore) +{ + string sFunc = "GetMarkUp"; + + NWNX_PushArgumentObject(oStore); + + NWNX_CallFunction(NWNX_Store, sFunc); + return NWNX_GetReturnValueInt(); +} + +void NWNX_Store_SetMarkUp(object oStore, int nValue) +{ + string sFunc = "SetMarkUp"; + + NWNX_PushArgumentInt(nValue); + NWNX_PushArgumentObject(oStore); + + NWNX_CallFunction(NWNX_Store, sFunc); +} + +int NWNX_Store_GetCurrentCustomersCount(object oStore) +{ + string sFunc = "GetCurrentCustomersCount"; + + NWNX_PushArgumentObject(oStore); + + NWNX_CallFunction(NWNX_Store, sFunc); + return NWNX_GetReturnValueInt(); +} diff --git a/_module/nss/nwnx_tileset.nss b/_module/nss/nwnx_tileset.nss index 3b9f71db..eab4e289 100644 --- a/_module/nss/nwnx_tileset.nss +++ b/_module/nss/nwnx_tileset.nss @@ -95,11 +95,12 @@ string NWNX_Tileset_GetTilesetCrosser(string sTileset, int nIndex); /// @return A NWNX_Tileset_TilesetGroupData struct. struct NWNX_Tileset_TilesetGroupData NWNX_Tileset_GetTilesetGroupData(string sTileset, int nIndex); -/// @brief Get tile ID of the tile at nIndex. -/// @note NWNX_Tileset_GetTilesetGroupData() needs to be called first. -/// @param nIndex The index of the tile. Range: (NWNX_Tileset_TilesetGroupData.nRows * NWNX_Tileset_TilesetGroupData.nColumns) > nIndex >= 0 +/// @brief Get the tile ID at nTileIndex in nGroupIndex of sTileset. +/// @param sTileset The tileset. +/// @param nGroupIndex The index of the group. Range: NWNX_Tileset_TilesetData.nNumGroups > nGroupIndex >= 0 +/// @param nTileIndex The index of the tile. Range: (NWNX_Tileset_TilesetGroupData.nRows * NWNX_Tileset_TilesetGroupData.nColumns) > nTileIndex >= 0 /// @return The tile ID or 0 on error. -int NWNX_Tileset_GetTilesetGroupTile(int nIndex); +int NWNX_Tileset_GetTilesetGroupTile(string sTileset, int nGroupIndex, int nTileIndex); /// @brief Get the model name of a tile in sTileset. /// @param sTileset The tileset. @@ -165,207 +166,174 @@ void NWNX_Tileset_DeleteOverrideTileData(string sOverrideName, int nIndex); struct NWNX_Tileset_TilesetData NWNX_Tileset_GetTilesetData(string sTileset) { - string sFunc = "GetTilesetData"; - - NWNX_PushArgumentString(NWNX_Tileset, sFunc, sTileset); - NWNX_CallFunction(NWNX_Tileset, sFunc); + NWNX_PushArgumentString(sTileset); + NWNX_CallFunction(NWNX_Tileset, "GetTilesetData"); struct NWNX_Tileset_TilesetData str; - str.bHasHeightTransition = NWNX_GetReturnValueInt(NWNX_Tileset, sFunc); - str.bInterior = NWNX_GetReturnValueInt(NWNX_Tileset, sFunc); - str.sUnlocalizedName = NWNX_GetReturnValueString(NWNX_Tileset, sFunc); - str.nDisplayNameStrRef = NWNX_GetReturnValueInt(NWNX_Tileset, sFunc); - str.sFloorTerrain = NWNX_GetReturnValueString(NWNX_Tileset, sFunc); - str.sDefaultTerrain = NWNX_GetReturnValueString(NWNX_Tileset, sFunc); - str.sBorderTerrain = NWNX_GetReturnValueString(NWNX_Tileset, sFunc); - str.nNumGroups = NWNX_GetReturnValueInt(NWNX_Tileset, sFunc); - str.nNumCrossers = NWNX_GetReturnValueInt(NWNX_Tileset, sFunc); - str.nNumTerrain = NWNX_GetReturnValueInt(NWNX_Tileset, sFunc); - str.fHeightTransition = NWNX_GetReturnValueFloat(NWNX_Tileset, sFunc); - str.nNumTileData = NWNX_GetReturnValueInt(NWNX_Tileset, sFunc); + 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(); return str; } string NWNX_Tileset_GetTilesetTerrain(string sTileset, int nIndex) { - string sFunc = "GetTilesetTerrain"; + NWNX_PushArgumentInt(nIndex); + NWNX_PushArgumentString(sTileset); + NWNX_CallFunction(NWNX_Tileset, "GetTilesetTerrain"); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, nIndex); - NWNX_PushArgumentString(NWNX_Tileset, sFunc, sTileset); - NWNX_CallFunction(NWNX_Tileset, sFunc); - - return NWNX_GetReturnValueString(NWNX_Tileset, sFunc); + return NWNX_GetReturnValueString(); } string NWNX_Tileset_GetTilesetCrosser(string sTileset, int nIndex) { - string sFunc = "GetTilesetCrosser"; + NWNX_PushArgumentInt(nIndex); + NWNX_PushArgumentString(sTileset); + NWNX_CallFunction(NWNX_Tileset, "GetTilesetCrosser"); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, nIndex); - NWNX_PushArgumentString(NWNX_Tileset, sFunc, sTileset); - NWNX_CallFunction(NWNX_Tileset, sFunc); - - return NWNX_GetReturnValueString(NWNX_Tileset, sFunc); + return NWNX_GetReturnValueString(); } struct NWNX_Tileset_TilesetGroupData NWNX_Tileset_GetTilesetGroupData(string sTileset, int nIndex) { - string sFunc = "GetTilesetGroupData"; - - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, nIndex); - NWNX_PushArgumentString(NWNX_Tileset, sFunc, sTileset); - NWNX_CallFunction(NWNX_Tileset, sFunc); + NWNX_PushArgumentInt(nIndex); + NWNX_PushArgumentString(sTileset); + NWNX_CallFunction(NWNX_Tileset, "GetTilesetGroupData"); struct NWNX_Tileset_TilesetGroupData str; - str.nColumns = NWNX_GetReturnValueInt(NWNX_Tileset, sFunc); - str.nRows = NWNX_GetReturnValueInt(NWNX_Tileset, sFunc); - str.nStrRef = NWNX_GetReturnValueInt(NWNX_Tileset, sFunc); - str.sName = NWNX_GetReturnValueString(NWNX_Tileset, sFunc); + str.nColumns = NWNX_GetReturnValueInt(); + str.nRows = NWNX_GetReturnValueInt(); + str.nStrRef = NWNX_GetReturnValueInt(); + str.sName = NWNX_GetReturnValueString(); return str; } -int NWNX_Tileset_GetTilesetGroupTile(int nIndex) +int NWNX_Tileset_GetTilesetGroupTile(string sTileset, int nGroupIndex, int nTileIndex) { - string sFunc = "GetTilesetGroupTile"; + NWNX_PushArgumentInt(nTileIndex); + NWNX_PushArgumentInt(nGroupIndex); + NWNX_PushArgumentString(sTileset); + NWNX_CallFunction(NWNX_Tileset, "GetTilesetGroupTile"); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, nIndex); - NWNX_CallFunction(NWNX_Tileset, sFunc); - - return NWNX_GetReturnValueInt(NWNX_Tileset, sFunc); + return NWNX_GetReturnValueInt(); } string NWNX_Tileset_GetTileModel(string sTileset, int nTileID) { - string sFunc = "GetTileModel"; + NWNX_PushArgumentInt(nTileID); + NWNX_PushArgumentString(sTileset); + NWNX_CallFunction(NWNX_Tileset, "GetTileModel"); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, nTileID); - NWNX_PushArgumentString(NWNX_Tileset, sFunc, sTileset); - NWNX_CallFunction(NWNX_Tileset, sFunc); - - return NWNX_GetReturnValueString(NWNX_Tileset, sFunc); + return NWNX_GetReturnValueString(); } string NWNX_Tileset_GetTileMinimapTexture(string sTileset, int nTileID) { - string sFunc = "GetTileMinimapTexture"; + NWNX_PushArgumentInt(nTileID); + NWNX_PushArgumentString(sTileset); + NWNX_CallFunction(NWNX_Tileset, "GetTileMinimapTexture"); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, nTileID); - NWNX_PushArgumentString(NWNX_Tileset, sFunc, sTileset); - NWNX_CallFunction(NWNX_Tileset, sFunc); - - return NWNX_GetReturnValueString(NWNX_Tileset, sFunc); + return NWNX_GetReturnValueString(); } struct NWNX_Tileset_TileEdgesAndCorners NWNX_Tileset_GetTileEdgesAndCorners(string sTileset, int nTileID) { - string sFunc = "GetTileEdgesAndCorners"; - - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, nTileID); - NWNX_PushArgumentString(NWNX_Tileset, sFunc, sTileset); - NWNX_CallFunction(NWNX_Tileset, sFunc); + NWNX_PushArgumentInt(nTileID); + NWNX_PushArgumentString(sTileset); + NWNX_CallFunction(NWNX_Tileset, "GetTileEdgesAndCorners"); struct NWNX_Tileset_TileEdgesAndCorners str; - str.sLeft = NWNX_GetReturnValueString(NWNX_Tileset, sFunc); - str.sBottomLeft = NWNX_GetReturnValueString(NWNX_Tileset, sFunc); - str.sBottom = NWNX_GetReturnValueString(NWNX_Tileset, sFunc); - str.sBottomRight = NWNX_GetReturnValueString(NWNX_Tileset, sFunc); - str.sRight = NWNX_GetReturnValueString(NWNX_Tileset, sFunc); - str.sTopRight = NWNX_GetReturnValueString(NWNX_Tileset, sFunc); - str.sTop = NWNX_GetReturnValueString(NWNX_Tileset, sFunc); - str.sTopLeft = NWNX_GetReturnValueString(NWNX_Tileset, sFunc); + 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(); return str; } int NWNX_Tileset_GetTileNumDoors(string sTileset, int nTileID) { - string sFunc = "GetTileNumDoors"; + NWNX_PushArgumentInt(nTileID); + NWNX_PushArgumentString(sTileset); + NWNX_CallFunction(NWNX_Tileset, "GetTileNumDoors"); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, nTileID); - NWNX_PushArgumentString(NWNX_Tileset, sFunc, sTileset); - NWNX_CallFunction(NWNX_Tileset, sFunc); - - return NWNX_GetReturnValueInt(NWNX_Tileset, sFunc); + return NWNX_GetReturnValueInt(); } struct NWNX_Tileset_TileDoorData NWNX_Tileset_GetTileDoorData(string sTileset, int nTileID, int nIndex = 0) { - string sFunc = "GetTileDoorData"; - - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, nIndex); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, nTileID); - NWNX_PushArgumentString(NWNX_Tileset, sFunc, sTileset); - NWNX_CallFunction(NWNX_Tileset, sFunc); + NWNX_PushArgumentInt(nIndex); + NWNX_PushArgumentInt(nTileID); + NWNX_PushArgumentString(sTileset); + NWNX_CallFunction(NWNX_Tileset, "GetTileDoorData"); struct NWNX_Tileset_TileDoorData str; - str.fOrientation = NWNX_GetReturnValueFloat(NWNX_Tileset, sFunc); - str.fZ = NWNX_GetReturnValueFloat(NWNX_Tileset, sFunc); - str.fY = NWNX_GetReturnValueFloat(NWNX_Tileset, sFunc); - str.fX = NWNX_GetReturnValueFloat(NWNX_Tileset, sFunc); - str.nType = NWNX_GetReturnValueInt(NWNX_Tileset, sFunc); + str.fOrientation = NWNX_GetReturnValueFloat(); + str.fZ = NWNX_GetReturnValueFloat(); + str.fY = NWNX_GetReturnValueFloat(); + str.fX = NWNX_GetReturnValueFloat(); + str.nType = NWNX_GetReturnValueInt(); return str; } void NWNX_Tileset_SetAreaTileOverride(string sAreaResRef, string sOverrideName) { - string sFunc = "SetAreaTileOverride"; - - NWNX_PushArgumentString(NWNX_Tileset, sFunc, sOverrideName); - NWNX_PushArgumentString(NWNX_Tileset, sFunc, sAreaResRef); - - NWNX_CallFunction(NWNX_Tileset, sFunc); + NWNX_PushArgumentString(sOverrideName); + NWNX_PushArgumentString(sAreaResRef); + NWNX_CallFunction(NWNX_Tileset, "SetAreaTileOverride"); } void NWNX_Tileset_CreateTileOverride(string sOverrideName, string sTileSet, int nWidth, int nHeight) { - string sFunc = "CreateTileOverride"; - - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, nHeight); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, nWidth); - NWNX_PushArgumentString(NWNX_Tileset, sFunc, sTileSet); - NWNX_PushArgumentString(NWNX_Tileset, sFunc, sOverrideName); - - NWNX_CallFunction(NWNX_Tileset, sFunc); + NWNX_PushArgumentInt(nHeight); + NWNX_PushArgumentInt(nWidth); + NWNX_PushArgumentString(sTileSet); + NWNX_PushArgumentString(sOverrideName); + NWNX_CallFunction(NWNX_Tileset, "CreateTileOverride"); } void NWNX_Tileset_DeleteTileOverride(string sOverrideName) { - string sFunc = "DeleteTileOverride"; - - NWNX_PushArgumentString(NWNX_Tileset, sFunc, sOverrideName); - - NWNX_CallFunction(NWNX_Tileset, sFunc); + NWNX_PushArgumentString(sOverrideName); + NWNX_CallFunction(NWNX_Tileset, "DeleteTileOverride"); } void NWNX_Tileset_SetOverrideTileData(string sOverrideName, int nIndex, struct NWNX_Tileset_CustomTileData strCustomTileData) { - string sFunc = "SetOverrideTileData"; - - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, strCustomTileData.bAnimLoop3); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, strCustomTileData.bAnimLoop2); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, strCustomTileData.bAnimLoop1); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, strCustomTileData.nSourceLightColor2); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, strCustomTileData.nSourceLightColor1); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, strCustomTileData.nMainLightColor2); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, strCustomTileData.nMainLightColor1); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, strCustomTileData.nHeight); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, strCustomTileData.nOrientation); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, strCustomTileData.nTileID); - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, nIndex); - NWNX_PushArgumentString(NWNX_Tileset, sFunc, sOverrideName); - - NWNX_CallFunction(NWNX_Tileset, sFunc); + 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"); } void NWNX_Tileset_DeleteOverrideTileData(string sOverrideName, int nIndex) { - string sFunc = "DeleteOverrideTileData"; - - NWNX_PushArgumentInt(NWNX_Tileset, sFunc, nIndex); - NWNX_PushArgumentString(NWNX_Tileset, sFunc, sOverrideName); - - NWNX_CallFunction(NWNX_Tileset, sFunc); + NWNX_PushArgumentInt(nIndex); + NWNX_PushArgumentString(sOverrideName); + NWNX_CallFunction(NWNX_Tileset, "DeleteOverrideTileData"); } diff --git a/_module/nss/nwnx_time.nss b/_module/nss/nwnx_time.nss index 1e4e71bf..44d949e9 100644 --- a/_module/nss/nwnx_time.nss +++ b/_module/nss/nwnx_time.nss @@ -3,17 +3,22 @@ /// @{ /// @file nwnx_time.nss #include "nwnx" +#include "nwnx_util" +#include "inc_sqlite_time" const string NWNX_Time = "NWNX_Time"; ///< @private /// @brief Returns the current date. +/// @deprecated Use SQLite functions (see inc_sqlite_time). This will be removed in future NWNX releases. /// @return The date in the format (mm/dd/yyyy). string NWNX_Time_GetSystemDate(); /// @brief Returns current time. +/// @deprecated Use SQLite functions (see inc_sqlite_time). This will be removed in future NWNX releases. /// @return The current time in the format (24:mm:ss). string NWNX_Time_GetSystemTime(); +/// @deprecated Use SQLite functions (see inc_sqlite_time). This will be removed in future NWNX releases. /// @return Returns the number of seconds since midnight on January 1, 1970. int NWNX_Time_GetTimeStamp(); @@ -24,6 +29,7 @@ struct NWNX_Time_HighResTimestamp int microseconds; ///< Microseconds }; +/// @deprecated Use NWNX_Util_GetHighResTimeStamp(). This will be removed in future NWNX releases. /// @return Returns the number of microseconds since midnight on January 1, 1970. struct NWNX_Time_HighResTimestamp NWNX_Time_GetHighResTimeStamp(); @@ -31,33 +37,28 @@ struct NWNX_Time_HighResTimestamp NWNX_Time_GetHighResTimeStamp(); string NWNX_Time_GetSystemDate() { - string sFunc = "GetSystemDate"; - NWNX_CallFunction(NWNX_Time, sFunc); - return NWNX_GetReturnValueString(NWNX_Time, sFunc); + WriteTimestampedLogEntry("WARNING: NWNX_Time is deprecated. You should migrate to SQLite based functions (see inc_sqlite_time)."); + return SQLite_GetSystemDate(); } string NWNX_Time_GetSystemTime() { - string sFunc = "GetSystemTime"; - NWNX_CallFunction(NWNX_Time, sFunc); - return NWNX_GetReturnValueString(NWNX_Time, sFunc); + WriteTimestampedLogEntry("WARNING: NWNX_Time is deprecated. You should migrate to SQLite based functions (see inc_sqlite_time)."); + return SQLite_GetSystemTime(); } int NWNX_Time_GetTimeStamp() { - string sFunc = "GetTimeStamp"; - - NWNX_CallFunction(NWNX_Time, sFunc); - return NWNX_GetReturnValueInt(NWNX_Time, sFunc); + WriteTimestampedLogEntry("WARNING: NWNX_Time is deprecated. You should migrate to SQLite based functions (see inc_sqlite_time)."); + return SQLite_GetTimeStamp(); } struct NWNX_Time_HighResTimestamp NWNX_Time_GetHighResTimeStamp() { + WriteTimestampedLogEntry("WARNING: NWNX_Time is deprecated. NWNX_Time_GetHighResTimeStamp is moving to NWNX_Util."); + struct NWNX_Util_HighResTimestamp u = NWNX_Util_GetHighResTimeStamp(); struct NWNX_Time_HighResTimestamp t; - string sFunc = "GetHighResTimeStamp"; - - NWNX_CallFunction(NWNX_Time, sFunc); - t.microseconds = NWNX_GetReturnValueInt(NWNX_Time, sFunc); - t.seconds = NWNX_GetReturnValueInt(NWNX_Time, sFunc); + t.seconds = u.seconds; + t.microseconds = u.microseconds; return t; } diff --git a/_module/nss/nwnx_util.nss b/_module/nss/nwnx_util.nss index 929a5f62..ef32e355 100644 --- a/_module/nss/nwnx_util.nss +++ b/_module/nss/nwnx_util.nss @@ -35,6 +35,13 @@ struct NWNX_Util_WorldTime int nTimeOfDay; ///< The time of day }; +/// @brief A high resolution timestamp +struct NWNX_Util_HighResTimestamp +{ + int seconds; ///< Seconds since epoch + int microseconds; ///< Microseconds +}; + /// @brief Gets the name of the currently executing script. /// @note If depth is > 0, it will return the name of the script that called this one via ExecuteScript(). /// @param depth to seek the executing script. @@ -51,6 +58,14 @@ string NWNX_Util_GetAsciiTableString(); /// @return The hashed string as an integer. int NWNX_Util_Hash(string str); +/// @brief Gets the last modified timestamp (mtime) of the module file in seconds. +/// @return The mtime of the module file. +int NWNX_Util_GetModuleMtime(); + +/// @brief Gets the module short file name. +/// @return The module file as a string. +string NWNX_Util_GetModuleFile(); + /// @brief Gets the value of customTokenNumber. /// @param customTokenNumber The token number to query. /// @return The string representation of the token value. @@ -61,7 +76,6 @@ string NWNX_Util_GetCustomToken(int customTokenNumber); /// @return The converted itemproperty. itemproperty NWNX_Util_EffectToItemProperty(effect e); -/// /// @brief Convert an itemproperty type to an effect type. /// @param ip The itemproperty to convert to an effect. /// @return The converted effect. @@ -72,12 +86,6 @@ effect NWNX_Util_ItemPropertyToEffect(itemproperty ip); /// @return The new string without any color codes. string NWNX_Util_StripColors(string str); -/// @brief Determines if the supplied resref exists. -/// @param resref The resref to check. -/// @param type The @ref resref_types "Resref Type". -/// @return TRUE/FALSE -int NWNX_Util_IsValidResRef(string resref, int type = NWNX_UTIL_RESREF_TYPE_CREATURE); - /// @brief Retrieves an environment variable. /// @param sVarname The environment variable to query. /// @return The value of the environment variable. @@ -97,12 +105,6 @@ void NWNX_Util_SetMinutesPerHour(int minutes); /// @return The url encoded string. string NWNX_Util_EncodeStringForURL(string str); -/// @anchor twoda_row_count -/// @brief Gets the row count for a 2da. -/// @param str The 2da to check (do not include the .2da). -/// @return The amount of rows in the 2da. -int NWNX_Util_Get2DARowCount(string str); - /// @brief Get the first resref of nType. /// @param nType A @ref resref_types "Resref Type". /// @param sRegexFilter Lets you filter out resrefs using a regexfilter. @@ -116,11 +118,6 @@ string NWNX_Util_GetFirstResRef(int nType, string sRegexFilter = "", int bModule /// @return The next resref found or "" if none is found. string NWNX_Util_GetNextResRef(); -/// @brief Get the ticks per second of the server. -/// @remark Useful to dynamically detect lag and adjust behavior accordingly. -/// @return The ticks per second. -int NWNX_Util_GetServerTicksPerSecond(); - /// @brief Get the last created object. /// @param nObjectType Does not take the NWScript OBJECT_TYPE_* constants. /// Use NWNX_Consts_TranslateNWScriptObjectType() to get their NWNX equivalent. @@ -137,12 +134,6 @@ object NWNX_Util_GetLastCreatedObject(int nObjectType, int nNthLast = 1); /// @return "" on success, or the compilation error. string NWNX_Util_AddScript(string sFileName, string sScriptData, int bWrapIntoMain = FALSE, string sAlias = "NWNX"); -/// @brief Gets the contents of a .nss script file as a string. -/// @param sScriptName The name of the script to get the contents of. -/// @param nMaxLength The max length of the return string, -1 to get everything -/// @return The script file contents or "" on error. -string NWNX_Util_GetNSSContents(string sScriptName, int nMaxLength = -1); - /// @brief Adds a nss file to the UserDirectory/nwnx folder, or to the location of sAlias. /// @note Will override existing nss files that are in the module /// @param sFileName The script filename without extension, 16 or less characters. @@ -241,91 +232,125 @@ void NWNX_Util_SetDawnHour(int nDawnHour); /// @param nDuskHour The new dusk hour void NWNX_Util_SetDuskHour(int nDuskHour); +/// @return Returns the number of microseconds since midnight on January 1, 1970. +struct NWNX_Util_HighResTimestamp NWNX_Util_GetHighResTimeStamp(); + +/// @return Return name of a terminal, "" if not a TTY +string NWNX_Util_GetTTY(); + +/// @brief Set the currently running script event. +/// @param nEventID The ID of the event. +void NWNX_Util_SetCurrentlyRunningEvent(int nEventID); + +/// @brief Calculate the levenshtein distance of two strings +/// @param sString The string to compare with. +/// @param sCompareTo The string to compare sString to. +/// @return The number of characters different between the compared strings. +int NWNX_Util_GetStringLevenshteinDistance(string sString, string sCompareTo); + +/// @brief Sends a full object update of oObjectToUpdate to all clients +/// @param oObjectToUpdate The object to update +/// @param oPlayer The player for which the objects needs to update, OBJECT_INVALID for all players +void NWNX_Util_UpdateClientObject(object oObjectToUpdate, object oPlayer = OBJECT_INVALID); + +/// @brief Clean a resource directory, deleting all files of nResType. +/// @param sAlias A resource directory alias, NWNX or one defined in the custom resource directory file. +/// @param nResType The type of file to delete or 0xFFFF for all types. +/// @return TRUE if successful, FALSE on error. +int NWNX_Util_CleanResourceDirectory(string sAlias, int nResType = 0xFFFF); + +/// @brief Return the filename of the tlk file. +/// @return The name +string NWNX_Util_GetModuleTlkFile(); + /// @} string NWNX_Util_GetCurrentScriptName(int depth = 0) { string sFunc = "GetCurrentScriptName"; - NWNX_PushArgumentInt(NWNX_Util, sFunc, depth); + NWNX_PushArgumentInt(depth); NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(NWNX_Util, sFunc); + return NWNX_GetReturnValueString(); } string NWNX_Util_GetAsciiTableString() { string sFunc = "GetAsciiTableString"; NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(NWNX_Util, sFunc); + return NWNX_GetReturnValueString(); } int NWNX_Util_Hash(string str) { string sFunc = "Hash"; - NWNX_PushArgumentString(NWNX_Util, sFunc, str); + NWNX_PushArgumentString(str); NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueInt(NWNX_Util, sFunc); + return NWNX_GetReturnValueInt(); +} + +int NWNX_Util_GetModuleMtime() +{ + NWNX_CallFunction(NWNX_Util, "GetModuleMtime"); + return NWNX_GetReturnValueInt(); +} + +string NWNX_Util_GetModuleFile() +{ + NWNX_CallFunction(NWNX_Util, "GetModuleFile"); + return NWNX_GetReturnValueString(); } string NWNX_Util_GetCustomToken(int customTokenNumber) { string sFunc = "GetCustomToken"; - NWNX_PushArgumentInt(NWNX_Util, sFunc, customTokenNumber); + NWNX_PushArgumentInt(customTokenNumber); NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(NWNX_Util, sFunc); + return NWNX_GetReturnValueString(); } itemproperty NWNX_Util_EffectToItemProperty(effect e) { string sFunc = "EffectTypeCast"; - NWNX_PushArgumentEffect(NWNX_Util, sFunc, e); + NWNX_PushArgumentEffect(e); NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueItemProperty(NWNX_Util, sFunc); + return NWNX_GetReturnValueItemProperty(); } effect NWNX_Util_ItemPropertyToEffect(itemproperty ip) { string sFunc = "EffectTypeCast"; - NWNX_PushArgumentItemProperty(NWNX_Util, sFunc, ip); + NWNX_PushArgumentItemProperty(ip); NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueEffect(NWNX_Util, sFunc); + return NWNX_GetReturnValueEffect(); } string NWNX_Util_StripColors(string str) { string sFunc = "StripColors"; - NWNX_PushArgumentString(NWNX_Util, sFunc, str); + NWNX_PushArgumentString(str); NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(NWNX_Util, sFunc); -} - -int NWNX_Util_IsValidResRef(string resref, int type = NWNX_UTIL_RESREF_TYPE_CREATURE) -{ - string sFunc = "IsValidResRef"; - NWNX_PushArgumentInt(NWNX_Util, sFunc, type); - NWNX_PushArgumentString(NWNX_Util, sFunc, resref); - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueInt(NWNX_Util, sFunc); + return NWNX_GetReturnValueString(); } string NWNX_Util_GetEnvironmentVariable(string sVarname) { string sFunc = "GetEnvironmentVariable"; - NWNX_PushArgumentString(NWNX_Util, sFunc, sVarname); + NWNX_PushArgumentString(sVarname); NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(NWNX_Util, sFunc); + return NWNX_GetReturnValueString(); } int NWNX_Util_GetMinutesPerHour() { string sFunc = "GetMinutesPerHour"; NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueInt(NWNX_Util, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Util_SetMinutesPerHour(int minutes) { string sFunc = "SetMinutesPerHour"; - NWNX_PushArgumentInt(NWNX_Util, sFunc, minutes); + NWNX_PushArgumentInt(minutes); NWNX_CallFunction(NWNX_Util, sFunc); } @@ -333,30 +358,22 @@ string NWNX_Util_EncodeStringForURL(string sURL) { string sFunc = "EncodeStringForURL"; - NWNX_PushArgumentString(NWNX_Util, sFunc, sURL); + NWNX_PushArgumentString(sURL); NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(NWNX_Util, sFunc); -} - -int NWNX_Util_Get2DARowCount(string str) -{ - string sFunc = "Get2DARowCount"; - NWNX_PushArgumentString(NWNX_Util, sFunc, str); - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueInt(NWNX_Util, sFunc); + return NWNX_GetReturnValueString(); } string NWNX_Util_GetFirstResRef(int nType, string sRegexFilter = "", int bModuleResourcesOnly = TRUE) { string sFunc = "GetFirstResRef"; - NWNX_PushArgumentInt(NWNX_Util, sFunc, bModuleResourcesOnly); - NWNX_PushArgumentString(NWNX_Util, sFunc, sRegexFilter); - NWNX_PushArgumentInt(NWNX_Util, sFunc, nType); + NWNX_PushArgumentInt(bModuleResourcesOnly); + NWNX_PushArgumentString(sRegexFilter); + NWNX_PushArgumentInt(nType); NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(NWNX_Util, sFunc); + return NWNX_GetReturnValueString(); } string NWNX_Util_GetNextResRef() @@ -365,82 +382,62 @@ string NWNX_Util_GetNextResRef() NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(NWNX_Util, sFunc); -} - -int NWNX_Util_GetServerTicksPerSecond() -{ - string sFunc = "GetServerTicksPerSecond"; - - NWNX_CallFunction(NWNX_Util, sFunc); - - return NWNX_GetReturnValueInt(NWNX_Util, sFunc); + return NWNX_GetReturnValueString(); } object NWNX_Util_GetLastCreatedObject(int nObjectType, int nNthLast = 1) { string sFunc = "GetLastCreatedObject"; - NWNX_PushArgumentInt(NWNX_Util, sFunc, nNthLast); - NWNX_PushArgumentInt(NWNX_Util, sFunc, nObjectType); + NWNX_PushArgumentInt(nNthLast); + NWNX_PushArgumentInt(nObjectType); NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueObject(NWNX_Util, sFunc); + return NWNX_GetReturnValueObject(); } string NWNX_Util_AddScript(string sFileName, string sScriptData, int bWrapIntoMain = FALSE, string sAlias = "NWNX") { string sFunc = "AddScript"; - NWNX_PushArgumentString(NWNX_Util, sFunc, sAlias); - NWNX_PushArgumentInt(NWNX_Util, sFunc, bWrapIntoMain); - NWNX_PushArgumentString(NWNX_Util, sFunc, sScriptData); - NWNX_PushArgumentString(NWNX_Util, sFunc, sFileName); + NWNX_PushArgumentString(sAlias); + NWNX_PushArgumentInt(bWrapIntoMain); + NWNX_PushArgumentString(sScriptData); + NWNX_PushArgumentString(sFileName); NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(NWNX_Util, sFunc); -} - -string NWNX_Util_GetNSSContents(string sScriptName, int nMaxLength = -1) -{ - string sFunc = "GetNSSContents"; - - NWNX_PushArgumentInt(NWNX_Util, sFunc, nMaxLength); - NWNX_PushArgumentString(NWNX_Util, sFunc, sScriptName); - NWNX_CallFunction(NWNX_Util, sFunc); - - return NWNX_GetReturnValueString(NWNX_Util, sFunc); + return NWNX_GetReturnValueString(); } int NWNX_Util_AddNSSFile(string sFileName, string sContents, string sAlias = "NWNX") { string sFunc = "AddNSSFile"; - NWNX_PushArgumentString(NWNX_Util, sFunc, sAlias); - NWNX_PushArgumentString(NWNX_Util, sFunc, sContents); - NWNX_PushArgumentString(NWNX_Util, sFunc, sFileName); + NWNX_PushArgumentString(sAlias); + NWNX_PushArgumentString(sContents); + NWNX_PushArgumentString(sFileName); NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueInt(NWNX_Util, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Util_RemoveNWNXResourceFile(string sFileName, int nType, string sAlias = "NWNX") { string sFunc = "RemoveNWNXResourceFile"; - NWNX_PushArgumentString(NWNX_Util, sFunc, sAlias); - NWNX_PushArgumentInt(NWNX_Util, sFunc, nType); - NWNX_PushArgumentString(NWNX_Util, sFunc, sFileName); + NWNX_PushArgumentString(sAlias); + NWNX_PushArgumentInt(nType); + NWNX_PushArgumentString(sFileName); NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueInt(NWNX_Util, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Util_SetInstructionLimit(int nInstructionLimit) { string sFunc = "SetInstructionLimit"; - NWNX_PushArgumentInt(NWNX_Util, sFunc, nInstructionLimit); + NWNX_PushArgumentInt(nInstructionLimit); NWNX_CallFunction(NWNX_Util, sFunc); } @@ -450,14 +447,14 @@ int NWNX_Util_GetInstructionLimit() NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueInt(NWNX_Util, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Util_SetInstructionsExecuted(int nInstructions) { string sFunc = "SetInstructionsExecuted"; - NWNX_PushArgumentInt(NWNX_Util, sFunc, nInstructions); + NWNX_PushArgumentInt(nInstructions); NWNX_CallFunction(NWNX_Util, sFunc); } @@ -467,41 +464,39 @@ int NWNX_Util_GetInstructionsExecuted() NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueInt(NWNX_Util, sFunc); + return NWNX_GetReturnValueInt(); } int NWNX_Util_RegisterServerConsoleCommand(string sCommand, string sScriptChunk) { string sFunc = "RegisterServerConsoleCommand"; - NWNX_PushArgumentString(NWNX_Util, sFunc, sScriptChunk); - NWNX_PushArgumentString(NWNX_Util, sFunc, sCommand); + NWNX_PushArgumentString(sScriptChunk); + NWNX_PushArgumentString(sCommand); NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueInt(NWNX_Util, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Util_UnregisterServerConsoleCommand(string sCommand) { string sFunc = "UnregisterServerConsoleCommand"; - NWNX_PushArgumentString(NWNX_Util, sFunc, sCommand); + NWNX_PushArgumentString(sCommand); NWNX_CallFunction(NWNX_Util, sFunc); } int NWNX_Util_PluginExists(string sPlugin) { - string sFunc = "PluginExists"; - NWNX_PushArgumentString(NWNX_Util, sFunc, sPlugin); - NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueInt(NWNX_Util, sFunc); + WriteTimestampedLogEntry("WARNING: NWNX_Util_PluginExists is deprecated. You should migrate to NWNX_PluginExists."); + return NWNX_PluginExists(sPlugin); } string NWNX_Util_GetUserDirectory() { string sFunc = "GetUserDirectory"; NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(NWNX_Util, sFunc); + return NWNX_GetReturnValueString(); } int NWNX_Util_GetScriptReturnValue() @@ -510,7 +505,7 @@ int NWNX_Util_GetScriptReturnValue() NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueInt(NWNX_Util, sFunc); + return NWNX_GetReturnValueInt(); } object NWNX_Util_CreateDoor(string sResRef, location locLocation, string sNewTag = "", int nAppearanceType = -1) @@ -519,24 +514,24 @@ object NWNX_Util_CreateDoor(string sResRef, location locLocation, string sNewTag vector vPosition = GetPositionFromLocation(locLocation); - NWNX_PushArgumentInt(NWNX_Util, sFunc, nAppearanceType); - NWNX_PushArgumentString(NWNX_Util, sFunc, sNewTag); - NWNX_PushArgumentFloat(NWNX_Util, sFunc, GetFacingFromLocation(locLocation)); - NWNX_PushArgumentFloat(NWNX_Util, sFunc, vPosition.z); - NWNX_PushArgumentFloat(NWNX_Util, sFunc, vPosition.y); - NWNX_PushArgumentFloat(NWNX_Util, sFunc, vPosition.x); - NWNX_PushArgumentObject(NWNX_Util, sFunc, GetAreaFromLocation(locLocation)); - NWNX_PushArgumentString(NWNX_Util, sFunc, sResRef); + 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(NWNX_Util, sFunc); + return NWNX_GetReturnValueObject(); } void NWNX_Util_SetItemActivator(object oObject) { string sFunc = "SetItemActivator"; - NWNX_PushArgumentObject(NWNX_Util, sFunc, oObject); + NWNX_PushArgumentObject(oObject); NWNX_CallFunction(NWNX_Util, sFunc); } @@ -544,12 +539,12 @@ struct NWNX_Util_WorldTime NWNX_Util_GetWorldTime(float fAdjustment = 0.0f) { string sFunc = "GetWorldTime"; - NWNX_PushArgumentFloat(NWNX_Util, sFunc, fAdjustment); + NWNX_PushArgumentFloat(fAdjustment); NWNX_CallFunction(NWNX_Util, sFunc); struct NWNX_Util_WorldTime strWorldTime; - strWorldTime.nTimeOfDay = NWNX_GetReturnValueInt(NWNX_Util, sFunc); - strWorldTime.nCalendarDay = NWNX_GetReturnValueInt(NWNX_Util, sFunc); + strWorldTime.nTimeOfDay = NWNX_GetReturnValueInt(); + strWorldTime.nCalendarDay = NWNX_GetReturnValueInt(); return strWorldTime; } @@ -558,9 +553,9 @@ void NWNX_Util_SetResourceOverride(int nResType, string sOldName, string sNewNam { string sFunc = "SetResourceOverride"; - NWNX_PushArgumentString(NWNX_Util, sFunc, sNewName); - NWNX_PushArgumentString(NWNX_Util, sFunc, sOldName); - NWNX_PushArgumentInt(NWNX_Util, sFunc, nResType); + NWNX_PushArgumentString(sNewName); + NWNX_PushArgumentString(sOldName); + NWNX_PushArgumentInt(nResType); NWNX_CallFunction(NWNX_Util, sFunc); } @@ -568,28 +563,28 @@ string NWNX_Util_GetResourceOverride(int nResType, string sName) { string sFunc = "GetResourceOverride"; - NWNX_PushArgumentString(NWNX_Util, sFunc, sName); - NWNX_PushArgumentInt(NWNX_Util, sFunc, nResType); + NWNX_PushArgumentString(sName); + NWNX_PushArgumentInt(nResType); NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueString(NWNX_Util, sFunc); + return NWNX_GetReturnValueString(); } int NWNX_Util_GetScriptParamIsSet(string sParamName) { string sFunc = "GetScriptParamIsSet"; - NWNX_PushArgumentString(NWNX_Util, sFunc, sParamName); + NWNX_PushArgumentString(sParamName); NWNX_CallFunction(NWNX_Util, sFunc); - return NWNX_GetReturnValueInt(NWNX_Util, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Util_SetDawnHour(int nDawnHour) { string sFunc = "SetDawnHour"; - NWNX_PushArgumentInt(NWNX_Util, sFunc, nDawnHour); + NWNX_PushArgumentInt(nDawnHour); NWNX_CallFunction(NWNX_Util, sFunc); } @@ -597,6 +592,68 @@ void NWNX_Util_SetDuskHour(int nDuskHour) { string sFunc = "SetDuskHour"; - NWNX_PushArgumentInt(NWNX_Util, sFunc, nDuskHour); + NWNX_PushArgumentInt(nDuskHour); NWNX_CallFunction(NWNX_Util, sFunc); } + +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(); + return t; +} + +string NWNX_Util_GetTTY() +{ + string sFunc = "GetTTY"; + + NWNX_CallFunction(NWNX_Util, sFunc); + return NWNX_GetReturnValueString(); +} + +void NWNX_Util_SetCurrentlyRunningEvent(int nEventID) +{ + string sFunc = "SetCurrentlyRunningEvent"; + + NWNX_PushArgumentInt(nEventID); + NWNX_CallFunction(NWNX_Util, sFunc); +} + +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(); +} + +void NWNX_Util_UpdateClientObject(object oObjectToUpdate, object oPlayer = OBJECT_INVALID) +{ + string sFunc = "UpdateClientObject"; + + NWNX_PushArgumentObject(oPlayer); + NWNX_PushArgumentObject(oObjectToUpdate); + NWNX_CallFunction(NWNX_Util, sFunc); +} + +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(); +} + +string NWNX_Util_GetModuleTlkFile() +{ + string sFunc = "GetModuleTlkFile"; + NWNX_CallFunction(NWNX_Util, sFunc); + return NWNX_GetReturnValueString(); +} diff --git a/_module/nss/nwnx_visibility.nss b/_module/nss/nwnx_visibility.nss index 31406370..3ef03b1f 100644 --- a/_module/nss/nwnx_visibility.nss +++ b/_module/nss/nwnx_visibility.nss @@ -59,19 +59,19 @@ int NWNX_Visibility_GetVisibilityOverride(object oPlayer, object oTarget) { string sFunc = "GetVisibilityOverride"; - NWNX_PushArgumentObject(NWNX_Visibility, sFunc, oTarget); - NWNX_PushArgumentObject(NWNX_Visibility, sFunc, oPlayer); + NWNX_PushArgumentObject(oTarget); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Visibility, sFunc); - return NWNX_GetReturnValueInt(NWNX_Visibility, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Visibility_SetVisibilityOverride(object oPlayer, object oTarget, int nOverride) { string sFunc = "SetVisibilityOverride"; - NWNX_PushArgumentInt(NWNX_Visibility, sFunc, nOverride); - NWNX_PushArgumentObject(NWNX_Visibility, sFunc, oTarget); - NWNX_PushArgumentObject(NWNX_Visibility, sFunc, oPlayer); + NWNX_PushArgumentInt(nOverride); + NWNX_PushArgumentObject(oTarget); + NWNX_PushArgumentObject(oPlayer); NWNX_CallFunction(NWNX_Visibility, sFunc); } diff --git a/_module/nss/nwnx_weapon.nss b/_module/nss/nwnx_weapon.nss index 6f57d15e..8470d9ff 100644 --- a/_module/nss/nwnx_weapon.nss +++ b/_module/nss/nwnx_weapon.nss @@ -93,8 +93,8 @@ void NWNX_Weapon_SetGreaterWeaponSpecializationFeat(int nBaseItem, int nFeat); void NWNX_Weapon_SetGreaterWeaponFocusFeat(int nBaseItem, int nFeat); /// @brief Set base item as monk weapon. -/// @note Requires activation of CombatModes plugin for Flurry of Blows. /// @param nBaseItem The base item id. +/// @deprecated Use baseitems.2da. This will be removed in future NWNX releases. void NWNX_Weapon_SetWeaponIsMonkWeapon(int nBaseItem); /// @brief Set plugin options. @@ -126,14 +126,22 @@ void NWNX_Weapon_SetOneHalfStrength(object oWeapon, int nEnable, int bPersist = /// @return FALSE/0 if weapon is not receiving the bonus. TRUE/1 if it does. int NWNX_Weapon_GetOneHalfStrength(object oWeapon); +/// @brief Override the max attack distance of ranged weapons. +/// @param nBaseItem The baseitem id. +/// @param fMax The maximum attack distance. Default is 40.0f. +/// @param fMaxPassive The maximum passive attack distance. Default is 20.0f. Seems to be used by the engine to determine a new nearby target when needed. +/// @param fPreferred The preferred attack distance. See the PrefAttackDist column in baseitems.2da, default seems to be 30.0f for ranged weapons. +/// @note fMaxPassive should probably be lower than fMax, half of fMax seems to be a good start. fPreferred should be at least ~0.5f lower than fMax. +void NWNX_Weapon_SetMaxRangedAttackDistanceOverride(int nBaseItem, float fMax, float fMaxPassive, float fPreferred); + /// @} void NWNX_Weapon_SetWeaponFocusFeat(int nBaseItem, int nFeat) { string sFunc = "SetWeaponFocusFeat"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nFeat); - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nBaseItem); + NWNX_PushArgumentInt(nFeat); + NWNX_PushArgumentInt(nBaseItem); NWNX_CallFunction(NWNX_Weapon, sFunc); } @@ -142,8 +150,8 @@ void NWNX_Weapon_SetEpicWeaponFocusFeat(int nBaseItem, int nFeat) { string sFunc = "SetEpicWeaponFocusFeat"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nFeat); - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nBaseItem); + NWNX_PushArgumentInt(nFeat); + NWNX_PushArgumentInt(nBaseItem); NWNX_CallFunction(NWNX_Weapon, sFunc); } @@ -152,8 +160,8 @@ void NWNX_Weapon_SetGreaterWeaponFocusFeat(int nBaseItem, int nFeat) { string sFunc = "SetGreaterWeaponFocusFeat"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nFeat); - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nBaseItem); + NWNX_PushArgumentInt(nFeat); + NWNX_PushArgumentInt(nBaseItem); NWNX_CallFunction(NWNX_Weapon, sFunc); } @@ -162,8 +170,8 @@ void NWNX_Weapon_SetWeaponFinesseSize(int nBaseItem, int nSize) { string sFunc = "SetWeaponFinesseSize"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nSize); - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nBaseItem); + NWNX_PushArgumentInt(nSize); + NWNX_PushArgumentInt(nBaseItem); NWNX_CallFunction(NWNX_Weapon, sFunc); } @@ -172,27 +180,29 @@ int NWNX_Weapon_GetWeaponFinesseSize(int nBaseItem) { string sFunc = "GetWeaponFinesseSize"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nBaseItem); + NWNX_PushArgumentInt(nBaseItem); NWNX_CallFunction(NWNX_Weapon, sFunc); - return NWNX_GetReturnValueInt(NWNX_Weapon, sFunc); + return NWNX_GetReturnValueInt(); } void NWNX_Weapon_SetWeaponUnarmed(int nBaseItem) { string sFunc = "SetWeaponUnarmed"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nBaseItem); + NWNX_PushArgumentInt(nBaseItem); NWNX_CallFunction(NWNX_Weapon, sFunc); } void NWNX_Weapon_SetWeaponIsMonkWeapon(int nBaseItem) { + WriteTimestampedLogEntry("NWNX_Weapon_SetWeaponIsMonkWeapon() is deprecated. Please use baseitems.2da instead."); + string sFunc = "SetWeaponIsMonkWeapon"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nBaseItem); + NWNX_PushArgumentInt(nBaseItem); NWNX_CallFunction(NWNX_Weapon, sFunc); } @@ -201,8 +211,8 @@ void NWNX_Weapon_SetWeaponImprovedCriticalFeat(int nBaseItem, int nFeat) { string sFunc = "SetWeaponImprovedCriticalFeat"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nFeat); - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nBaseItem); + NWNX_PushArgumentInt(nFeat); + NWNX_PushArgumentInt(nBaseItem); NWNX_CallFunction(NWNX_Weapon, sFunc); } @@ -211,8 +221,8 @@ void NWNX_Weapon_SetWeaponSpecializationFeat(int nBaseItem, int nFeat) { string sFunc = "SetWeaponSpecializationFeat"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nFeat); - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nBaseItem); + NWNX_PushArgumentInt(nFeat); + NWNX_PushArgumentInt(nBaseItem); NWNX_CallFunction(NWNX_Weapon, sFunc); } @@ -221,8 +231,8 @@ void NWNX_Weapon_SetGreaterWeaponSpecializationFeat(int nBaseItem, int nFeat) { string sFunc = "SetGreaterWeaponSpecializationFeat"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nFeat); - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nBaseItem); + NWNX_PushArgumentInt(nFeat); + NWNX_PushArgumentInt(nBaseItem); NWNX_CallFunction(NWNX_Weapon, sFunc); } @@ -231,8 +241,8 @@ void NWNX_Weapon_SetEpicWeaponSpecializationFeat(int nBaseItem, int nFeat) { string sFunc = "SetEpicWeaponSpecializationFeat"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nFeat); - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nBaseItem); + NWNX_PushArgumentInt(nFeat); + NWNX_PushArgumentInt(nBaseItem); NWNX_CallFunction(NWNX_Weapon, sFunc); } @@ -241,8 +251,8 @@ void NWNX_Weapon_SetEpicWeaponOverwhelmingCriticalFeat(int nBaseItem, int nFeat) { string sFunc = "SetEpicWeaponOverwhelmingCriticalFeat"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nFeat); - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nBaseItem); + NWNX_PushArgumentInt(nFeat); + NWNX_PushArgumentInt(nBaseItem); NWNX_CallFunction(NWNX_Weapon, sFunc); } @@ -251,8 +261,8 @@ void NWNX_Weapon_SetEpicWeaponDevastatingCriticalFeat(int nBaseItem, int nFeat) { string sFunc = "SetEpicWeaponDevastatingCriticalFeat"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nFeat); - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nBaseItem); + NWNX_PushArgumentInt(nFeat); + NWNX_PushArgumentInt(nBaseItem); NWNX_CallFunction(NWNX_Weapon, sFunc); } @@ -261,8 +271,8 @@ void NWNX_Weapon_SetWeaponOfChoiceFeat(int nBaseItem, int nFeat) { string sFunc = "SetWeaponOfChoiceFeat"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nFeat); - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nBaseItem); + NWNX_PushArgumentInt(nFeat); + NWNX_PushArgumentInt(nBaseItem); NWNX_CallFunction(NWNX_Weapon, sFunc); } @@ -271,8 +281,8 @@ void NWNX_Weapon_SetOption(int nOption, int nVal) { string sFunc = "SetOption"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nVal); - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nOption); + NWNX_PushArgumentInt(nVal); + NWNX_PushArgumentInt(nOption); NWNX_CallFunction(NWNX_Weapon, sFunc); } @@ -281,7 +291,7 @@ void NWNX_Weapon_SetDevastatingCriticalEventScript(string sScript) { string sFunc = "SetDevastatingCriticalEventScript"; - NWNX_PushArgumentString(NWNX_Weapon, sFunc, sScript); + NWNX_PushArgumentString(sScript); NWNX_CallFunction(NWNX_Weapon, sFunc); } @@ -290,8 +300,8 @@ void NWNX_Weapon_BypassDevastatingCritical() { string sFunc = "SetEventData"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, 1); - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, NWNX_WEAPON_SETDATA_DC_BYPASS); + NWNX_PushArgumentInt(1); + NWNX_PushArgumentInt(NWNX_WEAPON_SETDATA_DC_BYPASS); NWNX_CallFunction(NWNX_Weapon, sFunc); } @@ -301,12 +311,12 @@ struct NWNX_Weapon_DevastatingCriticalEvent_Data NWNX_Weapon_GetDevastatingCriti string sFunc = "GetEventData"; struct NWNX_Weapon_DevastatingCriticalEvent_Data data; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, NWNX_WEAPON_GETDATA_DC); + NWNX_PushArgumentInt(NWNX_WEAPON_GETDATA_DC); NWNX_CallFunction(NWNX_Weapon, sFunc); - data.oWeapon = NWNX_GetReturnValueObject(NWNX_Weapon, sFunc); - data.oTarget = NWNX_GetReturnValueObject(NWNX_Weapon, sFunc); - data.nDamage = NWNX_GetReturnValueInt(NWNX_Weapon, sFunc); + data.oWeapon = NWNX_GetReturnValueObject(); + data.oTarget = NWNX_GetReturnValueObject(); + data.nDamage = NWNX_GetReturnValueInt(); return data; } @@ -314,17 +324,28 @@ struct NWNX_Weapon_DevastatingCriticalEvent_Data NWNX_Weapon_GetDevastatingCriti void NWNX_Weapon_SetOneHalfStrength(object oWeapon, int nEnable, int bPersist = FALSE) { string sFunc = "SetOneHalfStrength"; - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, bPersist); - NWNX_PushArgumentInt(NWNX_Weapon, sFunc, nEnable); - NWNX_PushArgumentObject(NWNX_Weapon, sFunc, oWeapon); + NWNX_PushArgumentInt(bPersist); + NWNX_PushArgumentInt(nEnable); + NWNX_PushArgumentObject(oWeapon); NWNX_CallFunction(NWNX_Weapon, sFunc); } int NWNX_Weapon_GetOneHalfStrength(object oWeapon) { string sFunc = "GetOneHalfStrength"; - NWNX_PushArgumentObject(NWNX_Weapon, sFunc, oWeapon); + NWNX_PushArgumentObject(oWeapon); NWNX_CallFunction(NWNX_Weapon, sFunc); - return NWNX_GetReturnValueInt(NWNX_Weapon, sFunc); + return NWNX_GetReturnValueInt(); +} + +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); } diff --git a/_module/nss/nwnx_webhook.nss b/_module/nss/nwnx_webhook.nss index 755b6321..f1f2e82f 100644 --- a/_module/nss/nwnx_webhook.nss +++ b/_module/nss/nwnx_webhook.nss @@ -29,11 +29,11 @@ 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(NWNX_WebHook, sFunc, mrkdwn); - NWNX_PushArgumentString(NWNX_WebHook, sFunc, username); - NWNX_PushArgumentString(NWNX_WebHook, sFunc, message); - NWNX_PushArgumentString(NWNX_WebHook, sFunc, path); - NWNX_PushArgumentString(NWNX_WebHook, sFunc, host); + NWNX_PushArgumentInt(mrkdwn); + NWNX_PushArgumentString(username); + NWNX_PushArgumentString(message); + NWNX_PushArgumentString(path); + NWNX_PushArgumentString(host); NWNX_CallFunction(NWNX_WebHook, sFunc); } diff --git a/_module/nss/pw_stmlng_dth.nss b/_module/nss/pw_stmlng_dth.nss index 3a68886c..a8960ca4 100644 --- a/_module/nss/pw_stmlng_dth.nss +++ b/_module/nss/pw_stmlng_dth.nss @@ -15,7 +15,6 @@ void main() { - object oKiller = GetLastKiller(); object oArea=GetArea(oKiller); object oWorm=GetLocalObject(oArea, "Worm"); diff --git a/_module/nss/spawn_cfg_camp.nss b/_module/nss/spawn_cfg_camp.nss index aecc91bb..60040793 100644 --- a/_module/nss/spawn_cfg_camp.nss +++ b/_module/nss/spawn_cfg_camp.nss @@ -54,6 +54,7 @@ void SetCampSpawn(object oCamp, string sCamp, location lCamp) // Place Custom Camps Here // ------------------------------------------- + /* Horsefly Swamp Wandering Monsters Check for encounters at 4 a.m. (just before dawn), 9 a.m., noon, dusk, 9 p.m., and midnight. @@ -8887,7 +8888,7 @@ at night. */ // Set Placeable 0 and Spawn Flags // First Placeable always Spawns at Center of Camp // If CampCenter Is Not Set - SetLocalString(oCamp, "CampP0", "plc_campfrwspit"); + SetLocalString(oCamp, "CampP0", "poa_corpse001"); SetLocalString(oCamp, "CampP0_Flags", "SP_SF"); // Set Placeable 1 and Spawn Flags diff --git a/_module/ra_tdog.mod b/_module/ra_tdog.mod index 9951634e..40c4f277 100644 Binary files a/_module/ra_tdog.mod and b/_module/ra_tdog.mod differ diff --git a/_module/utd/inn2pcrooms.utd.json b/_module/utd/inn2pcrooms.utd.json new file mode 100644 index 00000000..894e905a --- /dev/null +++ b/_module/utd/inn2pcrooms.utd.json @@ -0,0 +1,213 @@ +{ + "__data_type": "UTD ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 0 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "\"Create Area\" Door" + }, + "Conversation": { + "type": "resref", + "value": "doorcv_inn_room" + }, + "CurrentHP": { + "type": "short", + "value": 15 + }, + "Description": { + "type": "cexolocstring", + "value": { + "0": "This door leads to the inn rooms above.", + "id": 9078 + } + }, + "DisarmDC": { + "type": "byte", + "value": 15 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 16 + }, + "GenericType_New": { + "type": "dword", + "value": 12 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HP": { + "type": "short", + "value": 15 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 1 + }, + "LinkedTo": { + "type": "cexostring", + "value": "" + }, + "LinkedToFlags": { + "type": "byte", + "value": 0 + }, + "LoadScreenID": { + "type": "word", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 0 + }, + "Locked": { + "type": "byte", + "value": 1 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "\"Create Area\" Door", + "id": 5349 + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "x2_door_death" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnFailToOpen": { + "type": "resref", + "value": "cv_inn_door" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 18 + }, + "PaletteID": { + "type": "byte", + "value": 0 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 2624 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "inn2pcrooms" + }, + "TemplateResRef": { + "type": "resref", + "value": "inn2pcrooms" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/uti/cr_hide_hezrou01.uti.json b/_module/uti/cr_hide_hezrou01.uti.json new file mode 100644 index 00000000..8ba95f73 --- /dev/null +++ b/_module/uti/cr_hide_hezrou01.uti.json @@ -0,0 +1,334 @@ +{ + "__data_type": "UTI ", + "AddCost": { + "type": "dword", + "value": 0 + }, + "BaseItem": { + "type": "int", + "value": 73 + }, + "Charges": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "Hezrou Hide" + }, + "Cost": { + "type": "dword", + "value": 628755 + }, + "Cursed": { + "type": "byte", + "value": 0 + }, + "DescIdentified": { + "type": "cexolocstring", + "value": { + "0": "Hezrou Hide" + } + }, + "Description": { + "type": "cexolocstring", + "value": { + "0": "Hezrou Hide" + } + }, + "Identified": { + "type": "byte", + "value": 1 + }, + "LocalizedName": { + "type": "cexolocstring", + "value": { + "0": "Hezrou Hide" + } + }, + "ModelPart1": { + "type": "byte", + "value": 1 + }, + "PaletteID": { + "type": "byte", + "value": 14 + }, + "Plot": { + "type": "byte", + "value": 0 + }, + "PropertiesList": { + "type": "list", + "value": [ + { + "__struct_id": 0, + "ChanceAppear": { + "type": "byte", + "value": 100 + }, + "CostTable": { + "type": "byte", + "value": 6 + }, + "CostValue": { + "type": "word", + "value": 2 + }, + "Param1": { + "type": "byte", + "value": 255 + }, + "Param1Value": { + "type": "byte", + "value": 0 + }, + "PropertyName": { + "type": "word", + "value": 22 + }, + "Subtype": { + "type": "word", + "value": 1 + } + }, + { + "__struct_id": 0, + "ChanceAppear": { + "type": "byte", + "value": 100 + }, + "CostTable": { + "type": "byte", + "value": 7 + }, + "CostValue": { + "type": "word", + "value": 2 + }, + "Param1": { + "type": "byte", + "value": 255 + }, + "Param1Value": { + "type": "byte", + "value": 0 + }, + "PropertyName": { + "type": "word", + "value": 23 + }, + "Subtype": { + "type": "word", + "value": 6 + } + }, + { + "__struct_id": 0, + "ChanceAppear": { + "type": "byte", + "value": 100 + }, + "CostTable": { + "type": "byte", + "value": 7 + }, + "CostValue": { + "type": "word", + "value": 2 + }, + "Param1": { + "type": "byte", + "value": 255 + }, + "Param1Value": { + "type": "byte", + "value": 0 + }, + "PropertyName": { + "type": "word", + "value": 23 + }, + "Subtype": { + "type": "word", + "value": 7 + } + }, + { + "__struct_id": 0, + "ChanceAppear": { + "type": "byte", + "value": 100 + }, + "CostTable": { + "type": "byte", + "value": 7 + }, + "CostValue": { + "type": "word", + "value": 2 + }, + "Param1": { + "type": "byte", + "value": 255 + }, + "Param1Value": { + "type": "byte", + "value": 0 + }, + "PropertyName": { + "type": "word", + "value": 23 + }, + "Subtype": { + "type": "word", + "value": 10 + } + }, + { + "__struct_id": 0, + "ChanceAppear": { + "type": "byte", + "value": 100 + }, + "CostTable": { + "type": "byte", + "value": 0 + }, + "CostValue": { + "type": "word", + "value": 0 + }, + "Param1": { + "type": "byte", + "value": 255 + }, + "Param1Value": { + "type": "byte", + "value": 0 + }, + "PropertyName": { + "type": "word", + "value": 26 + }, + "Subtype": { + "type": "word", + "value": 0 + } + }, + { + "__struct_id": 0, + "ChanceAppear": { + "type": "byte", + "value": 100 + }, + "CostTable": { + "type": "byte", + "value": 5 + }, + "CostValue": { + "type": "word", + "value": 7 + }, + "Param1": { + "type": "byte", + "value": 255 + }, + "Param1Value": { + "type": "byte", + "value": 0 + }, + "PropertyName": { + "type": "word", + "value": 20 + }, + "Subtype": { + "type": "word", + "value": 9 + } + }, + { + "__struct_id": 0, + "ChanceAppear": { + "type": "byte", + "value": 100 + }, + "CostTable": { + "type": "byte", + "value": 0 + }, + "CostValue": { + "type": "word", + "value": 0 + }, + "Param1": { + "type": "byte", + "value": 255 + }, + "Param1Value": { + "type": "byte", + "value": 0 + }, + "PropertyName": { + "type": "word", + "value": 37 + }, + "Subtype": { + "type": "word", + "value": 3 + } + }, + { + "__struct_id": 0, + "ChanceAppear": { + "type": "byte", + "value": 100 + }, + "CostTable": { + "type": "byte", + "value": 11 + }, + "CostValue": { + "type": "word", + "value": 4 + }, + "Param1": { + "type": "byte", + "value": 255 + }, + "Param1Value": { + "type": "byte", + "value": 0 + }, + "PropertyName": { + "type": "word", + "value": 39 + }, + "Subtype": { + "type": "word", + "value": 0 + } + } + ] + }, + "StackSize": { + "type": "word", + "value": 1 + }, + "Stolen": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "CR_HIDE_HEZROU01" + }, + "TemplateResRef": { + "type": "resref", + "value": "cr_hide_hezrou01" + }, + "xModelPart1": { + "type": "word", + "value": 1 + } +} diff --git a/_module/utp/blueprint.utp.json b/_module/utp/blueprint.utp.json new file mode 100644 index 00000000..b9cfece6 --- /dev/null +++ b/_module/utp/blueprint.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 865 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Merchant House 1: Ruined" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MerchantHouse1Ruined" + }, + "TemplateResRef": { + "type": "resref", + "value": "blueprint" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/blueprint001.utp.json b/_module/utp/blueprint001.utp.json new file mode 100644 index 00000000..5d4c6c66 --- /dev/null +++ b/_module/utp/blueprint001.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 883 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Rural House 1 - Burnt" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "RuralHouse1Burnt" + }, + "TemplateResRef": { + "type": "resref", + "value": "blueprint001" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/blueprint002.utp.json b/_module/utp/blueprint002.utp.json new file mode 100644 index 00000000..a947b15b --- /dev/null +++ b/_module/utp/blueprint002.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 884 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Rural House 2 - Burnt" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "RuralHouse2Burnt" + }, + "TemplateResRef": { + "type": "resref", + "value": "blueprint002" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/blueprint003.utp.json b/_module/utp/blueprint003.utp.json new file mode 100644 index 00000000..e400617b --- /dev/null +++ b/_module/utp/blueprint003.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 885 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Rural House 3 - Burnt" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "RuralHouse3Burnt" + }, + "TemplateResRef": { + "type": "resref", + "value": "blueprint003" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/blueprint004.utp.json b/_module/utp/blueprint004.utp.json new file mode 100644 index 00000000..7aeff3c1 --- /dev/null +++ b/_module/utp/blueprint004.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 886 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Rural House 4 - Burnt" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "RuralHouse4Burnt" + }, + "TemplateResRef": { + "type": "resref", + "value": "blueprint004" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/blueprint005.utp.json b/_module/utp/blueprint005.utp.json new file mode 100644 index 00000000..64dd96af --- /dev/null +++ b/_module/utp/blueprint005.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 887 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Rural House 5 - Burnt" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "RuralHouse5Burnt" + }, + "TemplateResRef": { + "type": "resref", + "value": "blueprint005" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/blueprint006.utp.json b/_module/utp/blueprint006.utp.json new file mode 100644 index 00000000..f9b1919c --- /dev/null +++ b/_module/utp/blueprint006.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 888 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Rural House 6 - Burnt" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "RuralHouse6Burnt" + }, + "TemplateResRef": { + "type": "resref", + "value": "blueprint006" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/blueprint008.utp.json b/_module/utp/blueprint008.utp.json new file mode 100644 index 00000000..24b41b56 --- /dev/null +++ b/_module/utp/blueprint008.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 0 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Tree, Fallen 1" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 121 + }, + "Plot": { + "type": "byte", + "value": 0 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "TreeFallen1" + }, + "TemplateResRef": { + "type": "resref", + "value": "blueprint008" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/blueprint013.utp.json b/_module/utp/blueprint013.utp.json new file mode 100644 index 00000000..147107da --- /dev/null +++ b/_module/utp/blueprint013.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 912 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Hut/Tent" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "HutTent" + }, + "TemplateResRef": { + "type": "resref", + "value": "blueprint013" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/blueprint014.utp.json b/_module/utp/blueprint014.utp.json new file mode 100644 index 00000000..3be996b3 --- /dev/null +++ b/_module/utp/blueprint014.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 904 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Swamp House 1 : Stilts" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SwampHouse1Stilts" + }, + "TemplateResRef": { + "type": "resref", + "value": "blueprint014" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/buildingadorn001.utp.json b/_module/utp/buildingadorn001.utp.json new file mode 100644 index 00000000..e241cfda --- /dev/null +++ b/_module/utp/buildingadorn001.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 850 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Dock House 4 : Inn" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "BuildingAdornments001" + }, + "TemplateResRef": { + "type": "resref", + "value": "buildingadorn001" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/dockhouse1.utp.json b/_module/utp/dockhouse1.utp.json new file mode 100644 index 00000000..164a3a4b --- /dev/null +++ b/_module/utp/dockhouse1.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 847 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Dock House 1" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "DockHouse1" + }, + "TemplateResRef": { + "type": "resref", + "value": "dockhouse1" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/dockhouse2.utp.json b/_module/utp/dockhouse2.utp.json new file mode 100644 index 00000000..f88ac4a2 --- /dev/null +++ b/_module/utp/dockhouse2.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 848 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Dock House 2" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "DockHouse2" + }, + "TemplateResRef": { + "type": "resref", + "value": "dockhouse2" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/dockhouse3.utp.json b/_module/utp/dockhouse3.utp.json new file mode 100644 index 00000000..f9947f66 --- /dev/null +++ b/_module/utp/dockhouse3.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 849 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Dock House 3 : Bordello" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "DockHouse3" + }, + "TemplateResRef": { + "type": "resref", + "value": "dockhouse3" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/dockhouse5.utp.json b/_module/utp/dockhouse5.utp.json new file mode 100644 index 00000000..130f3fd8 --- /dev/null +++ b/_module/utp/dockhouse5.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 851 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Dock House 5 : Bordello" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "DockHouse5" + }, + "TemplateResRef": { + "type": "resref", + "value": "dockhouse5" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/dockhouse6.utp.json b/_module/utp/dockhouse6.utp.json new file mode 100644 index 00000000..71dbe40c --- /dev/null +++ b/_module/utp/dockhouse6.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 852 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Dock House 6" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "DockHouse6" + }, + "TemplateResRef": { + "type": "resref", + "value": "dockhouse6" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/house_rmb1.utp.json b/_module/utp/house_rmb1.utp.json new file mode 100644 index 00000000..650e75ff --- /dev/null +++ b/_module/utp/house_rmb1.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 853 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "house_rmb1" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "house_rmb1" + }, + "TemplateResRef": { + "type": "resref", + "value": "house_rmb1" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/house_rmb10.utp.json b/_module/utp/house_rmb10.utp.json new file mode 100644 index 00000000..bdb39a84 --- /dev/null +++ b/_module/utp/house_rmb10.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 862 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "house_rmb10" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "house_rmb10" + }, + "TemplateResRef": { + "type": "resref", + "value": "house_rmb10" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/house_rmb11.utp.json b/_module/utp/house_rmb11.utp.json new file mode 100644 index 00000000..e018f9e2 --- /dev/null +++ b/_module/utp/house_rmb11.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 863 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "house_rmb11" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "house_rmb11" + }, + "TemplateResRef": { + "type": "resref", + "value": "house_rmb11" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/house_rmb2.utp.json b/_module/utp/house_rmb2.utp.json new file mode 100644 index 00000000..d5ef2d98 --- /dev/null +++ b/_module/utp/house_rmb2.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 854 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "house_rmb2" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "house_rmb2" + }, + "TemplateResRef": { + "type": "resref", + "value": "house_rmb2" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/house_rmb3.utp.json b/_module/utp/house_rmb3.utp.json new file mode 100644 index 00000000..ecc2039b --- /dev/null +++ b/_module/utp/house_rmb3.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 855 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "house_rmb3" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "house_rmb3" + }, + "TemplateResRef": { + "type": "resref", + "value": "house_rmb3" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/house_rmb4.utp.json b/_module/utp/house_rmb4.utp.json new file mode 100644 index 00000000..795b198d --- /dev/null +++ b/_module/utp/house_rmb4.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 856 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "house_rmb4" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "house_rmb4" + }, + "TemplateResRef": { + "type": "resref", + "value": "house_rmb4" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/house_rmb5.utp.json b/_module/utp/house_rmb5.utp.json new file mode 100644 index 00000000..de100a90 --- /dev/null +++ b/_module/utp/house_rmb5.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 857 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "house_rmb5" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "house_rmb5" + }, + "TemplateResRef": { + "type": "resref", + "value": "house_rmb5" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/house_rmb6.utp.json b/_module/utp/house_rmb6.utp.json new file mode 100644 index 00000000..b0a6dafa --- /dev/null +++ b/_module/utp/house_rmb6.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 858 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "house_rmb6" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "house_rmb6" + }, + "TemplateResRef": { + "type": "resref", + "value": "house_rmb6" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/house_rmb7.utp.json b/_module/utp/house_rmb7.utp.json new file mode 100644 index 00000000..1560e19f --- /dev/null +++ b/_module/utp/house_rmb7.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 859 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "house_rmb7" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "house_rmb7" + }, + "TemplateResRef": { + "type": "resref", + "value": "house_rmb7" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/house_rmb8.utp.json b/_module/utp/house_rmb8.utp.json new file mode 100644 index 00000000..a7423263 --- /dev/null +++ b/_module/utp/house_rmb8.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 860 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "house_rmb8" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "house_rmb8" + }, + "TemplateResRef": { + "type": "resref", + "value": "house_rmb8" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/house_rmb9.utp.json b/_module/utp/house_rmb9.utp.json new file mode 100644 index 00000000..3cb455f7 --- /dev/null +++ b/_module/utp/house_rmb9.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 861 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "house_rmb9" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "house_rmb9" + }, + "TemplateResRef": { + "type": "resref", + "value": "house_rmb9" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/merchanthouse1.utp.json b/_module/utp/merchanthouse1.utp.json new file mode 100644 index 00000000..173073c8 --- /dev/null +++ b/_module/utp/merchanthouse1.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 864 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Merchant House 1" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MerchantHouse1" + }, + "TemplateResRef": { + "type": "resref", + "value": "merchanthouse1" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/merchanthouse2.utp.json b/_module/utp/merchanthouse2.utp.json new file mode 100644 index 00000000..140052cf --- /dev/null +++ b/_module/utp/merchanthouse2.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 866 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Merchant House 2" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MerchantHouse2" + }, + "TemplateResRef": { + "type": "resref", + "value": "merchanthouse2" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/merchanthouse3.utp.json b/_module/utp/merchanthouse3.utp.json new file mode 100644 index 00000000..dd7ccdf1 --- /dev/null +++ b/_module/utp/merchanthouse3.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 869 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Merchant House 3" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MerchantHouse3" + }, + "TemplateResRef": { + "type": "resref", + "value": "merchanthouse3" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/merchanthouse4.utp.json b/_module/utp/merchanthouse4.utp.json new file mode 100644 index 00000000..1099e354 --- /dev/null +++ b/_module/utp/merchanthouse4.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 870 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Merchant House 4" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MerchantHouse4" + }, + "TemplateResRef": { + "type": "resref", + "value": "merchanthouse4" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/merchanthouse5.utp.json b/_module/utp/merchanthouse5.utp.json new file mode 100644 index 00000000..48c2975c --- /dev/null +++ b/_module/utp/merchanthouse5.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 871 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Merchant House 5" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MerchantHouse5" + }, + "TemplateResRef": { + "type": "resref", + "value": "merchanthouse5" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/merchantstall1.utp.json b/_module/utp/merchantstall1.utp.json new file mode 100644 index 00000000..e18982d6 --- /dev/null +++ b/_module/utp/merchantstall1.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 867 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Merchant Stall 1" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MerchantStall1" + }, + "TemplateResRef": { + "type": "resref", + "value": "merchantstall1" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/merchantstall2.utp.json b/_module/utp/merchantstall2.utp.json new file mode 100644 index 00000000..7272a48f --- /dev/null +++ b/_module/utp/merchantstall2.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 868 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Merchant Stall 2" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MerchantStall2" + }, + "TemplateResRef": { + "type": "resref", + "value": "merchantstall2" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/mulsantirhouse1.utp.json b/_module/utp/mulsantirhouse1.utp.json new file mode 100644 index 00000000..42dcece8 --- /dev/null +++ b/_module/utp/mulsantirhouse1.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 889 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Mulsantir House 1" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MulsantirHouse1" + }, + "TemplateResRef": { + "type": "resref", + "value": "mulsantirhouse1" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/mulsantirhouse2.utp.json b/_module/utp/mulsantirhouse2.utp.json new file mode 100644 index 00000000..ca74ffc8 --- /dev/null +++ b/_module/utp/mulsantirhouse2.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 890 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Mulsantir House 2" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MulsantirHouse2" + }, + "TemplateResRef": { + "type": "resref", + "value": "mulsantirhouse2" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/mulsantirhouse3.utp.json b/_module/utp/mulsantirhouse3.utp.json new file mode 100644 index 00000000..c5ea75a5 --- /dev/null +++ b/_module/utp/mulsantirhouse3.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 891 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Mulsantir House 3" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MulsantirHouse3" + }, + "TemplateResRef": { + "type": "resref", + "value": "mulsantirhouse3" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/mulsantirhouse4.utp.json b/_module/utp/mulsantirhouse4.utp.json new file mode 100644 index 00000000..cd5e29d1 --- /dev/null +++ b/_module/utp/mulsantirhouse4.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 892 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Mulsantir House 4" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MulsantirHouse4" + }, + "TemplateResRef": { + "type": "resref", + "value": "mulsantirhouse4" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/mulsantirhouse5.utp.json b/_module/utp/mulsantirhouse5.utp.json new file mode 100644 index 00000000..7c8b9ab6 --- /dev/null +++ b/_module/utp/mulsantirhouse5.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 893 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Mulsantir House 5" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MulsantirHouse5" + }, + "TemplateResRef": { + "type": "resref", + "value": "mulsantirhouse5" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/mulsantirsnow003.utp.json b/_module/utp/mulsantirsnow003.utp.json new file mode 100644 index 00000000..bb790ffc --- /dev/null +++ b/_module/utp/mulsantirsnow003.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 895 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Mulsantir Snowy House 2" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MulsantirSnowyHouse2" + }, + "TemplateResRef": { + "type": "resref", + "value": "mulsantirsnow003" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/mulsantirsnow004.utp.json b/_module/utp/mulsantirsnow004.utp.json new file mode 100644 index 00000000..502f2c1f --- /dev/null +++ b/_module/utp/mulsantirsnow004.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 896 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Mulsantir Snowy House 3" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MulsantirSnowyHouse3" + }, + "TemplateResRef": { + "type": "resref", + "value": "mulsantirsnow004" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/mulsantirsnow005.utp.json b/_module/utp/mulsantirsnow005.utp.json new file mode 100644 index 00000000..5afeb22e --- /dev/null +++ b/_module/utp/mulsantirsnow005.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 897 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Mulsantir Snowy House 4" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MulsantirSnowyHouse4" + }, + "TemplateResRef": { + "type": "resref", + "value": "mulsantirsnow005" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/mulsantirsnow006.utp.json b/_module/utp/mulsantirsnow006.utp.json new file mode 100644 index 00000000..c0753fae --- /dev/null +++ b/_module/utp/mulsantirsnow006.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 898 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Mulsantir Snowy House 5" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "MulsantirSnowyHouse5" + }, + "TemplateResRef": { + "type": "resref", + "value": "mulsantirsnow006" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/mulsantirsnowyho.utp.json b/_module/utp/mulsantirsnowyho.utp.json new file mode 100644 index 00000000..e052842e --- /dev/null +++ b/_module/utp/mulsantirsnowyho.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 894 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Mulsantir Snowy House 1" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "MulsantirSnowyHouse1" + }, + "TemplateResRef": { + "type": "resref", + "value": "mulsantirsnowyho" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/ore.utp.json b/_module/utp/ore.utp.json new file mode 100644 index 00000000..e7c9faae --- /dev/null +++ b/_module/utp/ore.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 513 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Ore" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 44 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 1084 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "Ore" + }, + "TemplateResRef": { + "type": "resref", + "value": "ore" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 1 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/ruralhouse1.utp.json b/_module/utp/ruralhouse1.utp.json new file mode 100644 index 00000000..04ebac71 --- /dev/null +++ b/_module/utp/ruralhouse1.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 877 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Rural House 1" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "RuralHouse1" + }, + "TemplateResRef": { + "type": "resref", + "value": "ruralhouse1" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/ruralhouse2.utp.json b/_module/utp/ruralhouse2.utp.json new file mode 100644 index 00000000..f592049b --- /dev/null +++ b/_module/utp/ruralhouse2.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 878 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Rural House 2" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "RuralHouse2" + }, + "TemplateResRef": { + "type": "resref", + "value": "ruralhouse2" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/ruralhouse3.utp.json b/_module/utp/ruralhouse3.utp.json new file mode 100644 index 00000000..212b5a2e --- /dev/null +++ b/_module/utp/ruralhouse3.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 879 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Rural House 3" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "RuralHouse3" + }, + "TemplateResRef": { + "type": "resref", + "value": "ruralhouse3" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/ruralhouse4.utp.json b/_module/utp/ruralhouse4.utp.json new file mode 100644 index 00000000..fcbcc72d --- /dev/null +++ b/_module/utp/ruralhouse4.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 880 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Rural House 4" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "RuralHouse4" + }, + "TemplateResRef": { + "type": "resref", + "value": "ruralhouse4" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/ruralhouse5.utp.json b/_module/utp/ruralhouse5.utp.json new file mode 100644 index 00000000..fe3f4189 --- /dev/null +++ b/_module/utp/ruralhouse5.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 881 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Rural House 5" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "RuralHouse5" + }, + "TemplateResRef": { + "type": "resref", + "value": "ruralhouse5" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/ruralhouse6.utp.json b/_module/utp/ruralhouse6.utp.json new file mode 100644 index 00000000..9aff971b --- /dev/null +++ b/_module/utp/ruralhouse6.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 882 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Rural House 6" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "RuralHouse6" + }, + "TemplateResRef": { + "type": "resref", + "value": "ruralhouse6" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/samarachhouse1.utp.json b/_module/utp/samarachhouse1.utp.json new file mode 100644 index 00000000..c04e3525 --- /dev/null +++ b/_module/utp/samarachhouse1.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 913 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Samarach House 1" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 0 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SamarachHouse1" + }, + "TemplateResRef": { + "type": "resref", + "value": "samarachhouse1" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/samarachhouse2.utp.json b/_module/utp/samarachhouse2.utp.json new file mode 100644 index 00000000..cb702ef7 --- /dev/null +++ b/_module/utp/samarachhouse2.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 914 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Samarach House 2" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 0 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SamarachHouse2" + }, + "TemplateResRef": { + "type": "resref", + "value": "samarachhouse2" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/samarachhouse3.utp.json b/_module/utp/samarachhouse3.utp.json new file mode 100644 index 00000000..070b5e47 --- /dev/null +++ b/_module/utp/samarachhouse3.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 915 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Samarach House 3" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 0 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SamarachHouse3" + }, + "TemplateResRef": { + "type": "resref", + "value": "samarachhouse3" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/samarachhouse4.utp.json b/_module/utp/samarachhouse4.utp.json new file mode 100644 index 00000000..974ed80f --- /dev/null +++ b/_module/utp/samarachhouse4.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 916 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Samarach House 4" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 0 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SamarachHouse4" + }, + "TemplateResRef": { + "type": "resref", + "value": "samarachhouse4" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/samarachhouse5.utp.json b/_module/utp/samarachhouse5.utp.json new file mode 100644 index 00000000..c91b24e1 --- /dev/null +++ b/_module/utp/samarachhouse5.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 917 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Samarach House 5" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 0 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SamarachHouse5" + }, + "TemplateResRef": { + "type": "resref", + "value": "samarachhouse5" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/samarachhouse6.utp.json b/_module/utp/samarachhouse6.utp.json new file mode 100644 index 00000000..a7a1e45f --- /dev/null +++ b/_module/utp/samarachhouse6.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 918 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Samarach House 6" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 0 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SamarachHouse6" + }, + "TemplateResRef": { + "type": "resref", + "value": "samarachhouse6" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/slumhouse1.utp.json b/_module/utp/slumhouse1.utp.json new file mode 100644 index 00000000..aab946f4 --- /dev/null +++ b/_module/utp/slumhouse1.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 872 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Slum House 1" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "SlumHouse1" + }, + "TemplateResRef": { + "type": "resref", + "value": "slumhouse1" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/slumhouse2.utp.json b/_module/utp/slumhouse2.utp.json new file mode 100644 index 00000000..07ce431c --- /dev/null +++ b/_module/utp/slumhouse2.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 873 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Slum House 2" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "SlumHouse2" + }, + "TemplateResRef": { + "type": "resref", + "value": "slumhouse2" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/slumhouse3.utp.json b/_module/utp/slumhouse3.utp.json new file mode 100644 index 00000000..af2c575f --- /dev/null +++ b/_module/utp/slumhouse3.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 874 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Slum House 3" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "SlumHouse3" + }, + "TemplateResRef": { + "type": "resref", + "value": "slumhouse3" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/slumhouse4.utp.json b/_module/utp/slumhouse4.utp.json new file mode 100644 index 00000000..2a0de24b --- /dev/null +++ b/_module/utp/slumhouse4.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 875 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Slum House 4" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "SlumHouse4" + }, + "TemplateResRef": { + "type": "resref", + "value": "slumhouse4" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/slumhouse5.utp.json b/_module/utp/slumhouse5.utp.json new file mode 100644 index 00000000..3fed5c4d --- /dev/null +++ b/_module/utp/slumhouse5.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 876 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Slum House 5" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "SlumHouse5" + }, + "TemplateResRef": { + "type": "resref", + "value": "slumhouse5" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/swamphouse1.utp.json b/_module/utp/swamphouse1.utp.json new file mode 100644 index 00000000..b4276f0b --- /dev/null +++ b/_module/utp/swamphouse1.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 899 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Swamp House 1" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SwampHouse1" + }, + "TemplateResRef": { + "type": "resref", + "value": "swamphouse1" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/swamphouse2.utp.json b/_module/utp/swamphouse2.utp.json new file mode 100644 index 00000000..5c216a6f --- /dev/null +++ b/_module/utp/swamphouse2.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 900 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Swamp House 2" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SwampHouse2" + }, + "TemplateResRef": { + "type": "resref", + "value": "swamphouse2" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/swamphouse3.utp.json b/_module/utp/swamphouse3.utp.json new file mode 100644 index 00000000..dec8ca75 --- /dev/null +++ b/_module/utp/swamphouse3.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 901 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Swamp House 3" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "SwampHouse3" + }, + "TemplateResRef": { + "type": "resref", + "value": "swamphouse3" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/swamphouse4.utp.json b/_module/utp/swamphouse4.utp.json new file mode 100644 index 00000000..db542fb9 --- /dev/null +++ b/_module/utp/swamphouse4.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 902 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Swamp House 4" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SwampHouse4" + }, + "TemplateResRef": { + "type": "resref", + "value": "swamphouse4" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/swamphouse5.utp.json b/_module/utp/swamphouse5.utp.json new file mode 100644 index 00000000..889f4f6b --- /dev/null +++ b/_module/utp/swamphouse5.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 903 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Swamp House 5" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SwampHouse5" + }, + "TemplateResRef": { + "type": "resref", + "value": "swamphouse5" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/swamphouse6.utp.json b/_module/utp/swamphouse6.utp.json new file mode 100644 index 00000000..82414f2b --- /dev/null +++ b/_module/utp/swamphouse6.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 905 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Swamp House 6" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SwampHouse6" + }, + "TemplateResRef": { + "type": "resref", + "value": "swamphouse6" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/swampruin1.utp.json b/_module/utp/swampruin1.utp.json new file mode 100644 index 00000000..68a0adcb --- /dev/null +++ b/_module/utp/swampruin1.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 906 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Swamp Ruin 1" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SwampRuin1" + }, + "TemplateResRef": { + "type": "resref", + "value": "swampruin1" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/swampruin2.utp.json b/_module/utp/swampruin2.utp.json new file mode 100644 index 00000000..059074e8 --- /dev/null +++ b/_module/utp/swampruin2.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 907 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Swamp Ruin 2" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SwampRuin2" + }, + "TemplateResRef": { + "type": "resref", + "value": "swampruin2" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/swampruin3.utp.json b/_module/utp/swampruin3.utp.json new file mode 100644 index 00000000..006b7b2f --- /dev/null +++ b/_module/utp/swampruin3.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 908 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Swamp Ruin 3" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SwampRuin3" + }, + "TemplateResRef": { + "type": "resref", + "value": "swampruin3" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/swampruin4.utp.json b/_module/utp/swampruin4.utp.json new file mode 100644 index 00000000..816c7296 --- /dev/null +++ b/_module/utp/swampruin4.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 909 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Swamp Ruin 4" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SwampRuin4" + }, + "TemplateResRef": { + "type": "resref", + "value": "swampruin4" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/swampruin5.utp.json b/_module/utp/swampruin5.utp.json new file mode 100644 index 00000000..88bbdff8 --- /dev/null +++ b/_module/utp/swampruin5.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 910 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Swamp Ruin 5" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SwampRuin5" + }, + "TemplateResRef": { + "type": "resref", + "value": "swampruin5" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +} diff --git a/_module/utp/swampruin6.utp.json b/_module/utp/swampruin6.utp.json new file mode 100644 index 00000000..69c3289a --- /dev/null +++ b/_module/utp/swampruin6.utp.json @@ -0,0 +1,217 @@ +{ + "__data_type": "UTP ", + "AnimationState": { + "type": "byte", + "value": 0 + }, + "Appearance": { + "type": "dword", + "value": 911 + }, + "AutoRemoveKey": { + "type": "byte", + "value": 0 + }, + "BodyBag": { + "type": "byte", + "value": 0 + }, + "CloseLockDC": { + "type": "byte", + "value": 0 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Conversation": { + "type": "resref", + "value": "" + }, + "CurrentHP": { + "type": "short", + "value": 10 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "DisarmDC": { + "type": "byte", + "value": 0 + }, + "Faction": { + "type": "dword", + "value": 1 + }, + "Fort": { + "type": "byte", + "value": 5 + }, + "Hardness": { + "type": "byte", + "value": 5 + }, + "HasInventory": { + "type": "byte", + "value": 0 + }, + "HP": { + "type": "short", + "value": 10 + }, + "Interruptable": { + "type": "byte", + "value": 1 + }, + "KeyName": { + "type": "cexostring", + "value": "" + }, + "KeyRequired": { + "type": "byte", + "value": 0 + }, + "Lockable": { + "type": "byte", + "value": 1 + }, + "Locked": { + "type": "byte", + "value": 0 + }, + "LocName": { + "type": "cexolocstring", + "value": { + "0": "Swamp Ruin 6" + } + }, + "OnClick": { + "type": "resref", + "value": "" + }, + "OnClosed": { + "type": "resref", + "value": "" + }, + "OnDamaged": { + "type": "resref", + "value": "" + }, + "OnDeath": { + "type": "resref", + "value": "" + }, + "OnDisarm": { + "type": "resref", + "value": "" + }, + "OnHeartbeat": { + "type": "resref", + "value": "" + }, + "OnInvDisturbed": { + "type": "resref", + "value": "" + }, + "OnLock": { + "type": "resref", + "value": "" + }, + "OnMeleeAttacked": { + "type": "resref", + "value": "" + }, + "OnOpen": { + "type": "resref", + "value": "" + }, + "OnSpellCastAt": { + "type": "resref", + "value": "" + }, + "OnTrapTriggered": { + "type": "resref", + "value": "" + }, + "OnUnlock": { + "type": "resref", + "value": "" + }, + "OnUsed": { + "type": "resref", + "value": "" + }, + "OnUserDefined": { + "type": "resref", + "value": "" + }, + "OpenLockDC": { + "type": "byte", + "value": 0 + }, + "PaletteID": { + "type": "byte", + "value": 22 + }, + "Plot": { + "type": "byte", + "value": 1 + }, + "PortraitId": { + "type": "word", + "value": 0 + }, + "Ref": { + "type": "byte", + "value": 0 + }, + "Static": { + "type": "byte", + "value": 1 + }, + "Tag": { + "type": "cexostring", + "value": "SwampRuin6" + }, + "TemplateResRef": { + "type": "resref", + "value": "swampruin6" + }, + "TrapDetectable": { + "type": "byte", + "value": 1 + }, + "TrapDetectDC": { + "type": "byte", + "value": 0 + }, + "TrapDisarmable": { + "type": "byte", + "value": 1 + }, + "TrapFlag": { + "type": "byte", + "value": 0 + }, + "TrapOneShot": { + "type": "byte", + "value": 1 + }, + "TrapType": { + "type": "byte", + "value": 0 + }, + "Type": { + "type": "byte", + "value": 0 + }, + "Useable": { + "type": "byte", + "value": 0 + }, + "Will": { + "type": "byte", + "value": 0 + } +}