diff --git a/_module/are/area017.are.json b/_module/are/area017.are.json index b72f7dea..a0e62a56 100644 --- a/_module/are/area017.are.json +++ b/_module/are/area017.are.json @@ -96,7 +96,7 @@ }, "OnEnter": { "type": "resref", - "value": "ra_onareaenter" + "value": "ra_areaonenter" }, "OnExit": { "type": "resref", @@ -849,7 +849,7 @@ }, "Version": { "type": "dword", - "value": 14 + "value": 16 }, "Width": { "type": "int", diff --git a/_module/are/area048.are.json b/_module/are/area048.are.json index f2c7f23a..0997adfa 100644 --- a/_module/are/area048.are.json +++ b/_module/are/area048.are.json @@ -96,7 +96,7 @@ }, "OnEnter": { "type": "resref", - "value": "ra_onareaenter" + "value": "ra_areaonenter" }, "OnExit": { "type": "resref", @@ -849,7 +849,7 @@ }, "Version": { "type": "dword", - "value": 6 + "value": 7 }, "Width": { "type": "int", diff --git a/_module/are/area099.are.json b/_module/are/area099.are.json index 7a775c97..ead204bd 100644 --- a/_module/are/area099.are.json +++ b/_module/are/area099.are.json @@ -96,7 +96,7 @@ }, "OnEnter": { "type": "resref", - "value": "ra_onareaenter" + "value": "ra_areaonenter" }, "OnExit": { "type": "resref", @@ -11169,7 +11169,7 @@ }, "Version": { "type": "dword", - "value": 11 + "value": 12 }, "Width": { "type": "int", diff --git a/_module/are/area100.are.json b/_module/are/area100.are.json index 9481e629..0d521e0c 100644 --- a/_module/are/area100.are.json +++ b/_module/are/area100.are.json @@ -96,7 +96,7 @@ }, "OnEnter": { "type": "resref", - "value": "ra_onareaenter" + "value": "ra_areaonenter" }, "OnExit": { "type": "resref", @@ -2913,7 +2913,7 @@ }, "Version": { "type": "dword", - "value": 12 + "value": 13 }, "Width": { "type": "int", diff --git a/_module/are/area106.are.json b/_module/are/area106.are.json index 07ef0e0f..ffe837a0 100644 --- a/_module/are/area106.are.json +++ b/_module/are/area106.are.json @@ -96,7 +96,7 @@ }, "OnEnter": { "type": "resref", - "value": "spawn_smpl_onen2" + "value": "ra_areaonenter" }, "OnExit": { "type": "resref", @@ -2913,7 +2913,7 @@ }, "Version": { "type": "dword", - "value": 30 + "value": 31 }, "Width": { "type": "int", diff --git a/_module/are/area107.are.json b/_module/are/area107.are.json index 55774a72..8d2862c2 100644 --- a/_module/are/area107.are.json +++ b/_module/are/area107.are.json @@ -96,7 +96,7 @@ }, "OnEnter": { "type": "resref", - "value": "" + "value": "ra_areaonenter" }, "OnExit": { "type": "resref", @@ -2913,7 +2913,7 @@ }, "Version": { "type": "dword", - "value": 11 + "value": 12 }, "Width": { "type": "int", diff --git a/_module/are/area110.are.json b/_module/are/area110.are.json index cdd9b045..6b0acc47 100644 --- a/_module/are/area110.are.json +++ b/_module/are/area110.are.json @@ -96,7 +96,7 @@ }, "OnEnter": { "type": "resref", - "value": "ra_onareaenter" + "value": "ra_areaonenter" }, "OnExit": { "type": "resref", @@ -849,7 +849,7 @@ }, "Version": { "type": "dword", - "value": 13 + "value": 14 }, "Width": { "type": "int", diff --git a/_module/are/beholdercave.are.json b/_module/are/beholdercave.are.json index d60d957c..2e82a490 100644 --- a/_module/are/beholdercave.are.json +++ b/_module/are/beholdercave.are.json @@ -96,7 +96,7 @@ }, "OnEnter": { "type": "resref", - "value": "ra_onareaenter" + "value": "ra_areaonenter" }, "OnExit": { "type": "resref", @@ -2913,7 +2913,7 @@ }, "Version": { "type": "dword", - "value": 11 + "value": 12 }, "Width": { "type": "int", diff --git a/_module/are/celebrationfield.are.json b/_module/are/celebrationfield.are.json index 85e562df..e410cd86 100644 --- a/_module/are/celebrationfield.are.json +++ b/_module/are/celebrationfield.are.json @@ -96,7 +96,7 @@ }, "OnEnter": { "type": "resref", - "value": "" + "value": "ra_areaonenter" }, "OnExit": { "type": "resref", @@ -11169,7 +11169,7 @@ }, "Version": { "type": "dword", - "value": 5 + "value": 6 }, "Width": { "type": "int", diff --git a/_module/are/cityofbaleas.are.json b/_module/are/cityofbaleas.are.json index 67c56612..ab925c56 100644 --- a/_module/are/cityofbaleas.are.json +++ b/_module/are/cityofbaleas.are.json @@ -96,7 +96,7 @@ }, "OnEnter": { "type": "resref", - "value": "ra_onareaenter" + "value": "ra_areaonenter" }, "OnExit": { "type": "resref", @@ -11169,7 +11169,7 @@ }, "Version": { "type": "dword", - "value": 84 + "value": 85 }, "Width": { "type": "int", diff --git a/_module/are/innoftheflyingmo.are.json b/_module/are/innoftheflyingmo.are.json index f3bd42e2..3a11826d 100644 --- a/_module/are/innoftheflyingmo.are.json +++ b/_module/are/innoftheflyingmo.are.json @@ -96,7 +96,7 @@ }, "OnEnter": { "type": "resref", - "value": "" + "value": "ra_areaonenter" }, "OnExit": { "type": "resref", @@ -2913,7 +2913,7 @@ }, "Version": { "type": "dword", - "value": 13 + "value": 14 }, "Width": { "type": "int", diff --git a/_module/are/schoolofbardickn.are.json b/_module/are/schoolofbardickn.are.json index 2bdb1e31..a543c1b0 100644 --- a/_module/are/schoolofbardickn.are.json +++ b/_module/are/schoolofbardickn.are.json @@ -96,7 +96,7 @@ }, "OnEnter": { "type": "resref", - "value": "ra_onareaenter" + "value": "ra_areaonenter" }, "OnExit": { "type": "resref", @@ -2913,7 +2913,7 @@ }, "Version": { "type": "dword", - "value": 9 + "value": 10 }, "Width": { "type": "int", diff --git a/_module/dlg/cv_antony.dlg.json b/_module/dlg/cv_antony.dlg.json index 5d13874f..209d9c12 100644 --- a/_module/dlg/cv_antony.dlg.json +++ b/_module/dlg/cv_antony.dlg.json @@ -159,7 +159,7 @@ }, "Script": { "type": "resref", - "value": "destroyselfnofx" + "value": "cv_destselfnofx" }, "Sound": { "type": "resref", diff --git a/_module/ncs/marthek_ondeath.ncs b/_module/ncs/marthek_ondeath.ncs index 502bf2d2..907c3e5c 100644 Binary files a/_module/ncs/marthek_ondeath.ncs and b/_module/ncs/marthek_ondeath.ncs differ diff --git a/_module/ncs/ra_areaonenter.ncs b/_module/ncs/ra_areaonenter.ncs new file mode 100644 index 00000000..4921b511 Binary files /dev/null and b/_module/ncs/ra_areaonenter.ncs differ diff --git a/_module/nss/marthek_ondeath.nss b/_module/nss/marthek_ondeath.nss index a8d44334..3c1aa6ff 100644 --- a/_module/nss/marthek_ondeath.nss +++ b/_module/nss/marthek_ondeath.nss @@ -233,11 +233,12 @@ int nVFX = GetLocalInt(OBJECT_SELF,"SpawnVFX"); //:: Set quest stage & update DB. AddPersistentJournalQuestEntry("marthek", 2, oKiller); +//:: Give "Marthek's Head" to the PC. + CreateItemOnObject("item065", oKiller); //:: Execute Default NPC OnDeath script ExecuteScript("nw_c2_default7", OBJECT_SELF); - //:: Execute PRC NPC OnDeath script ExecuteScript("prc_npc_death", OBJECT_SELF); } diff --git a/_module/nss/qst_aragnak_01.nss b/_module/nss/qst_aragnak_01.nss index 53b5396f..d6d7e2a6 100644 --- a/_module/nss/qst_aragnak_01.nss +++ b/_module/nss/qst_aragnak_01.nss @@ -19,7 +19,7 @@ int StartingConditional() object oPC = GetPCSpeaker(); int nInt; - nInt=GetLocalInt(oPC, "NW_JOURNAL_ENTRYaragnak"); + nInt = RetrieveQuestState("aragnak", oPC); if (nInt == 1) return TRUE; diff --git a/_module/nss/qst_justicar_st.nss b/_module/nss/qst_justicar_st.nss index da506470..d9faecbf 100644 --- a/_module/nss/qst_justicar_st.nss +++ b/_module/nss/qst_justicar_st.nss @@ -17,7 +17,7 @@ void main() { //:: Declare major variables - object oPC = GetPCSpeaker(); + object oPC = GetPCSpeaker(); //:: Set quest stage & update DB. AddPersistentJournalQuestEntry("justicar", 1, oPC); diff --git a/_module/nss/qst_scramge_strt.nss b/_module/nss/qst_scramge_strt.nss index e57acb8c..6f40fb10 100644 --- a/_module/nss/qst_scramge_strt.nss +++ b/_module/nss/qst_scramge_strt.nss @@ -5,7 +5,7 @@ //: //::////////////////////////////////////////////// /* - Start & tracks the "Scramge the Orace" quest + Start & tracks the "Scramge the Oracle" quest */ //::////////////////////////////////////////////// //:: diff --git a/_module/nss/ra_areaonenter.nss b/_module/nss/ra_areaonenter.nss new file mode 100644 index 00000000..63343473 --- /dev/null +++ b/_module/nss/ra_areaonenter.nss @@ -0,0 +1,41 @@ +//::////////////////////////////////////////////// +//:: +//:: ra_areaonenter.nss +//:: Copyright (c) 2022 Project RATDOG +//:: +//::////////////////////////////////////////////// +/* + Default Area OnEnter script for NESS spawn + functions. +*/ +//::////////////////////////////////////////////// +//:: +//:: Created By: Jaysyn +//:: Created On: 20220620 +//:: +//::////////////////////////////////////////////// + +#include "spawn_functions" +#include "tgdc_explore_inc" + +void main() +{ + // Spawn_OnAreaEnter() can take three arguments - the name of the heartbeat + // script to execute, the heartbeat duration, and a delay for the first + // heartbeat. They default to spawn_sample_hb, 6.0, and 0.0 respectively; as + // if it were called like: + // Spawn_OnAreaEnter( "spawn_sample_hb", 6.0, 0.0 ); + + if ( GetIsAreaAboveGround( OBJECT_SELF ) && + ! GetIsAreaNatural( OBJECT_SELF ) ) + { + // Indoors - no delay on the first HB + Spawn_OnAreaEnter( "spawn_sample_hb", 6.0, 0.0 ); + } + + else + { + // Outdoors or underground - do a 3 second delay on the first HB + Spawn_OnAreaEnter( "spawn_sample_hb", 6.0, 3.0 ); + } +} diff --git a/_module/nss/spawn_sc_spawn.nss b/_module/nss/spawn_sc_spawn.nss index 76044f12..48ae074a 100644 --- a/_module/nss/spawn_sc_spawn.nss +++ b/_module/nss/spawn_sc_spawn.nss @@ -1,7 +1,10 @@ // // Spawn and Despawn Scripts // + #include "spawn_functions" +#include "pqj_inc" + // object GetChildByTag(object oSpawn, string sChildTag); object GetChildByNumber(object oSpawn, int nChildNum); @@ -39,8 +42,9 @@ void main() { return; } - // - + // End Script 00 + + // Script 01 [Lamplighter] if (nSpawnScript == 1) { // lamplighter @@ -77,7 +81,9 @@ void main() return; } }// end spawn script 1 - + // End Script 01 [Lamplighter] + + // ------------------------------------------- // Only Make Modifications Between These Lines // diff --git a/_module/ra_tdog.mod b/_module/ra_tdog.mod index cde88df1..40b3b8c6 100644 Binary files a/_module/ra_tdog.mod and b/_module/ra_tdog.mod differ