diff --git a/_module/ifo/module.ifo.json b/_module/ifo/module.ifo.json index 52b4229..b570bea 100644 --- a/_module/ifo/module.ifo.json +++ b/_module/ifo/module.ifo.json @@ -2496,7 +2496,7 @@ "Mod_Description": { "type": "cexolocstring", "value": { - "0": "Trinity II\nThe Return of Cain\n\n(Requires PRC8 v4.1.10+)\n\nThe day began like any other in Trinity, commoners awoke to yet another peaceful day, going about their daily business. As the city bustled to life, the practitioners of the Arcane Arts noticed an increase in the frequency and occurrence of Time Rifts emerging around the Realm. \n\nBy midday, the skies had darkened, and clouds hung heavily above. Huge lightning bolts pulsed from the heavens, and the sulphuric stench was in-escapable. The followers of the Arcane Arts noticed further disturbances in the Time Rifts as they began to appear in larger masses throughout the Realm, but seemed concentrated above Trinity. This no longer seemed a time for petty squabbles, and so they gathered together to pool their wisdom and knowledge to ascertain the source of the Magical Disturbances. Something was obviously askew as even the practitioners of the Divine Arts hurried to their Diving Pools. They began to catch images, glimpses, vague, yet unspeakably terrifying. \n\nWarriors intuitively began to leave their bunks and guild members came out into the City Square; years of battle-honed senses sent alarms throughout their collective conscious. A purple haze had begun to fill the air, and the bolts from the heavens called their attention. \n\nThe Time Rifts were pulsing with ever increasing frequency, as no being had ever seen before. The disturbances were visible as far as one could see, and the citizens of Trinity gathered in the City Square, some bewildered, some frightened, some curious, but all enthralled by the heavenly spectacle. \n\nSuddenly the very ground they stood on began to shake as though it would open up and swallow them all. The sky flashed red as the Time Rifts imploded in a flash of mystical purple, sending shock waves through the air. The concussion from the blasts pounded the citizens below, driving them to the ground. The skies lit up in flames, and a gaping hole appeared directly above the city. Flames surrounded the void, as balls of flame spewed from its very center. Lightning flashed from all sides, as fireballs showered the citizens below. \n\nRemarkably, an image began to appear from the void, vague and translucent at first, then larger and larger as the mass began to form. It was first discernable as a fiery chariot, pulled by Seth Souls. What horrible abomination could possible harness such evil? As the image of the chariot solidified in the skies above, the rider came into focus....... in the chariot was CAIN. \n\nThe Evil One had returned. Inescapable terror gripped the very souls of the Citizens of Trinity as a great wail of anguish arose from the huddled masses. Cain's chariot cut through the deafening wail, trailing flames in its wake. \n\nBut the glorious and proud citizens of Trinity did not lament for long; warriors grabbed for their weapons, mages began to conjure spells, clerics called upon the divine spirits. Just then an evil and deafening roar echoed through the skies as two more flaming chariots flashed across the sky. Cain paused briefly as he looked down at the army amassed below. As he turned to leave the skies above Trinity, he bellowed REVENGE...... Cain had returned. \n\nDoomsday or Blessing? \n\nAs it was, Trinity was amassing an army to defend against Drow insurgence. The Drow had begun to appear within the last year, detected by Trinity's Ranger Scouts near Shogun. \n\nA small army of the Drow had already been defeated by the Shogun Warriors. But those who had fought the Drow in other worlds knew they were only testing the defenses of the surface world and a large scale assault was imminent. However, the resurgence of Cain threatened all, and an alliance between the surface dwellers, and those of the Underdark would have to be formed.\n" + "0": "Trinity II\nThe Return of Cain\n\n(Requires PRC8 v4.1.10+)\n\nThe day began like any other in Trinity, commoners awoke to yet another peaceful day, going about their daily business. As the city bustled to life, the practitioners of the Arcane Arts noticed an increase in the frequency and occurrence of Time Rifts emerging around the Realm. \n\nBy midday, the skies had darkened, and clouds hung heavily above. Huge lightning bolts pulsed from the heavens, and the sulphuric stench was in-escapable. The followers of the Arcane Arts noticed further disturbances in the Time Rifts as they began to appear in larger masses throughout the Realm, but seemed concentrated above Trinity. This no longer seemed a time for petty squabbles, and so they gathered together to pool their wisdom and knowledge to ascertain the source of the Magical Disturbances. Something was obviously askew as even the practitioners of the Divine Arts hurried to their divining pools. They began to catch images, glimpses, vague, yet unspeakably terrifying. \n\nWarriors intuitively began to leave their bunks and guild members came out into the City Square; years of battle-honed senses sent alarms throughout their collective conscious. A purple haze had begun to fill the air, and the bolts from the heavens called their attention. \n\nThe Time Rifts were pulsing with ever increasing frequency, as no being had ever seen before. The disturbances were visible as far as one could see, and the citizens of Trinity gathered in the City Square, some bewildered, some frightened, some curious, but all enthralled by the heavenly spectacle. \n\nSuddenly the very ground they stood on began to shake as though it would open up and swallow them all. The sky flashed red as the Time Rifts imploded in a flash of mystical purple, sending shock waves through the air. The concussion from the blasts pounded the citizens below, driving them to the ground. The skies lit up in flames, and a gaping hole appeared directly above the city. Flames surrounded the void, as balls of flame spewed from its very center. Lightning flashed from all sides, as fireballs showered the citizens below. \n\nRemarkably, an image began to appear from the void, vague and translucent at first, then larger and larger as the mass began to form. It was first discernable as a fiery chariot, pulled by Seth Souls. What horrible abomination could possible harness such evil? As the image of the chariot solidified in the skies above, the rider came into focus....... in the chariot was CAIN. \n\nThe Evil One had returned. Inescapable terror gripped the very souls of the Citizens of Trinity as a great wail of anguish arose from the huddled masses. Cain's chariot cut through the deafening wail, trailing flames in its wake. \n\nBut the glorious and proud citizens of Trinity did not lament for long; warriors grabbed for their weapons, mages began to conjure spells, clerics called upon the divine spirits. Just then an evil and deafening roar echoed through the skies as two more flaming chariots flashed across the sky. Cain paused briefly as he looked down at the army amassed below. As he turned to leave the skies above Trinity, he bellowed REVENGE...... Cain had returned. \n\nDoomsday or Blessing? \n\nAs it was, Trinity was amassing an army to defend against Drow insurgence. The Drow had begun to appear within the last year, detected by Trinity's Ranger Scouts near Shogun. \n\nA small army of the Drow had already been defeated by the Shogun Warriors. But those who had fought the Drow in other worlds knew they were only testing the defenses of the surface world and a large scale assault was imminent. However, the resurgence of Cain threatened all, and an alliance between the surface dwellers, and those of the Underdark would have to be formed.\n" } }, "Mod_DuskHour": { @@ -2758,7 +2758,7 @@ }, "Mod_XPScale": { "type": "byte", - "value": 5 + "value": 0 }, "VarTable": { "type": "list", @@ -3032,6 +3032,21 @@ "type": "int", "value": 1 } + }, + { + "__struct_id": 0, + "Name": { + "type": "cexostring", + "value": "PRC_DISABLE_WOL_AREA" + }, + "Type": { + "type": "dword", + "value": 1 + }, + "Value": { + "type": "int", + "value": 1 + } } ] } diff --git a/_module/ncs/mod_onplaytarget.ncs b/_module/ncs/mod_onplaytarget.ncs index e3f4278..bd8cfda 100644 Binary files a/_module/ncs/mod_onplaytarget.ncs and b/_module/ncs/mod_onplaytarget.ncs differ diff --git a/_module/ncs/prc_pwondeath.ncs b/_module/ncs/prc_pwondeath.ncs index d48d2ce..2c16279 100644 Binary files a/_module/ncs/prc_pwondeath.ncs and b/_module/ncs/prc_pwondeath.ncs differ diff --git a/_module/ncs/tab_xpscript.ncs b/_module/ncs/tab_xpscript.ncs index 189eb8c..08c5182 100644 Binary files a/_module/ncs/tab_xpscript.ncs and b/_module/ncs/tab_xpscript.ncs differ diff --git a/_module/ncs/tab_xpscript3.ncs b/_module/ncs/tab_xpscript3.ncs index 5567928..5d4c316 100644 Binary files a/_module/ncs/tab_xpscript3.ncs and b/_module/ncs/tab_xpscript3.ncs differ diff --git a/_module/nss/mod_onplaytarget.nss b/_module/nss/mod_onplaytarget.nss index 1536816..100c53a 100644 --- a/_module/nss/mod_onplaytarget.nss +++ b/_module/nss/mod_onplaytarget.nss @@ -2,7 +2,7 @@ void main() { - ExecuteScript("prc_onplaytarget"); - NUI_HandleEvents(GetLastPlayerToSelectTarget()); + + ExecuteScript("prc_onplaytarget"); } \ No newline at end of file diff --git a/_module/nss/prc_pwondeath.nss b/_module/nss/prc_pwondeath.nss index 14c3ecd..c2d7a85 100644 --- a/_module/nss/prc_pwondeath.nss +++ b/_module/nss/prc_pwondeath.nss @@ -10,8 +10,6 @@ void main() { - - ExecuteScript("tab_xpscript",OBJECT_SELF); //SpawnScriptDebugger(); //Change NPC_XP to 1 to initiate modified XP code int NPC_XP = 0; @@ -20,6 +18,13 @@ void main() int nAlign = GetAlignmentGoodEvil(OBJECT_SELF); object oKiller = GetLastKiller(); + + if (GetStandardFactionReputation(STANDARD_FACTION_MERCHANT, OBJECT_SELF) == 100) + { + return; + } + + ExecuteScript("tab_xpscript",OBJECT_SELF); SpeakString("NW_I_AM_DEAD", TALKVOLUME_SILENT_TALK); //Shout Attack my target, only works with the On Spawn In setup diff --git a/_module/nss/tab_xpscript.nss b/_module/nss/tab_xpscript.nss index 503cb85..601bf59 100644 --- a/_module/nss/tab_xpscript.nss +++ b/_module/nss/tab_xpscript.nss @@ -198,7 +198,7 @@ float PWFXP_CR_MODIFIER = PWFXP_SCALAR / (PWFXP_CR_NOXP - PWFXP_CR_REDUCTION); int PWFXP_GetTotalClassLevel(object oPC) { - return GetLevelByPosition(1,oPC) + GetLevelByPosition(2,oPC) + GetLevelByPosition(3,oPC) + GetLevelByPosition(4,oPC)+ GetLevelByPosition(5,oPC) + GetLevelByPosition(6,oPC); + return GetLevelByPosition(1,oPC) + GetLevelByPosition(2,oPC) + GetLevelByPosition(3,oPC) + GetLevelByPosition(4,oPC)+ GetLevelByPosition(5,oPC) + GetLevelByPosition(6,oPC)+ GetLevelByPosition(7,oPC) + GetLevelByPosition(8,oPC); } float PWFXP_GetECLModifier(object oPC) diff --git a/_release/Realms of Trinity II [PRC].7z b/_release/Realms of Trinity II [PRC].7z index f69be6a..8737111 100644 Binary files a/_release/Realms of Trinity II [PRC].7z and b/_release/Realms of Trinity II [PRC].7z differ