diff --git a/_module/are/adventurers_inn.are.json b/_module/are/adventurers_inn.are.json index 2ca5b4f2..38f2c9aa 100644 --- a/_module/are/adventurers_inn.are.json +++ b/_module/are/adventurers_inn.are.json @@ -677,7 +677,7 @@ }, "Version": { "type": "dword", - "value": 50 + "value": 51 }, "Width": { "type": "int", diff --git a/_module/are/area048.are.json b/_module/are/area048.are.json index 0997adfa..fca4d8f8 100644 --- a/_module/are/area048.are.json +++ b/_module/are/area048.are.json @@ -849,7 +849,7 @@ }, "Version": { "type": "dword", - "value": 7 + "value": 8 }, "Width": { "type": "int", diff --git a/_module/are/celebrationfield.are.json b/_module/are/celebrationfield.are.json index e410cd86..1584971e 100644 --- a/_module/are/celebrationfield.are.json +++ b/_module/are/celebrationfield.are.json @@ -11169,7 +11169,7 @@ }, "Version": { "type": "dword", - "value": 6 + "value": 7 }, "Width": { "type": "int", diff --git a/_module/are/starting_area.are.json b/_module/are/starting_area.are.json index b7f0ee03..cb762979 100644 --- a/_module/are/starting_area.are.json +++ b/_module/are/starting_area.are.json @@ -1709,7 +1709,7 @@ }, "Version": { "type": "dword", - "value": 75 + "value": 76 }, "Width": { "type": "int", diff --git a/_module/dlg/cv_blackjack.dlg.json b/_module/dlg/cv_blackjack.dlg.json index 30f0b0ad..36f6f172 100644 --- a/_module/dlg/cv_blackjack.dlg.json +++ b/_module/dlg/cv_blackjack.dlg.json @@ -52,7 +52,7 @@ "__struct_id": 0, "Active": { "type": "resref", - "value": "jcoutcasts1" + "value": "qst_chk_outcst02" }, "ConditionParams": { "type": "list", diff --git a/_module/dlg/cv_kupra.dlg.json b/_module/dlg/cv_kupra.dlg.json index 99bbd5e5..6dea60eb 100644 --- a/_module/dlg/cv_kupra.dlg.json +++ b/_module/dlg/cv_kupra.dlg.json @@ -71,7 +71,7 @@ "__struct_id": 1, "Active": { "type": "resref", - "value": "jckupra1x" + "value": "qst_ch_kupra01" }, "ConditionParams": { "type": "list", diff --git a/_module/dlg/cv_oldhermit.dlg.json b/_module/dlg/cv_oldhermit.dlg.json index 68d9afec..06c91bc3 100644 --- a/_module/dlg/cv_oldhermit.dlg.json +++ b/_module/dlg/cv_oldhermit.dlg.json @@ -432,6 +432,25 @@ "value": [ { "__struct_id": 0, + "Active": { + "type": "resref", + "value": "sc_047" + }, + "ConditionParams": { + "type": "list", + "value": [] + }, + "Index": { + "type": "dword", + "value": 9 + }, + "IsChild": { + "type": "byte", + "value": 0 + } + }, + { + "__struct_id": 1, "Active": { "type": "resref", "value": "" @@ -542,12 +561,81 @@ "0": "Well, I'm not asking you to go on some huge quest for it, it's just that if you see something like that to please bring it back here to me. If it's true, it's an opportunity I can't pass up, and if you get it for me, I promise that the reward will be substantial indeed." } } + }, + { + "__struct_id": 7, + "ActionParams": { + "type": "list", + "value": [] + }, + "Animation": { + "type": "dword", + "value": 0 + }, + "AnimLoop": { + "type": "byte", + "value": 1 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Delay": { + "type": "dword", + "value": 4294967295 + }, + "Quest": { + "type": "cexostring", + "value": "" + }, + "RepliesList": { + "type": "list", + "value": [ + { + "__struct_id": 0, + "Active": { + "type": "resref", + "value": "" + }, + "ConditionParams": { + "type": "list", + "value": [] + }, + "Index": { + "type": "dword", + "value": 10 + }, + "IsChild": { + "type": "byte", + "value": 0 + } + } + ] + }, + "Script": { + "type": "resref", + "value": "hermitquest1" + }, + "Sound": { + "type": "resref", + "value": "" + }, + "Speaker": { + "type": "cexostring", + "value": "" + }, + "Text": { + "type": "cexolocstring", + "value": { + "0": "By the gods! It's real. *he takes it and swallows it in one gulp* For a moment it looks like he's choking, and then you see a flash of mystical light, and the man transforms, shedding his beard, his wrinkles and his age until he appears to be a small boy dressed in oversized clothing." + } + } } ] }, "NumWords": { "type": "dword", - "value": 335 + "value": 399 }, "PreventZoomIn": { "type": "byte", @@ -1060,6 +1148,116 @@ "0": "Very well, I'll keep my eye out for it." } } + }, + { + "__struct_id": 9, + "ActionParams": { + "type": "list", + "value": [] + }, + "Animation": { + "type": "dword", + "value": 0 + }, + "AnimLoop": { + "type": "byte", + "value": 1 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Delay": { + "type": "dword", + "value": 4294967295 + }, + "EntriesList": { + "type": "list", + "value": [ + { + "__struct_id": 0, + "Active": { + "type": "resref", + "value": "" + }, + "ConditionParams": { + "type": "list", + "value": [] + }, + "Index": { + "type": "dword", + "value": 7 + }, + "IsChild": { + "type": "byte", + "value": 0 + } + } + ] + }, + "Quest": { + "type": "cexostring", + "value": "" + }, + "Script": { + "type": "resref", + "value": "at_147" + }, + "Sound": { + "type": "resref", + "value": "" + }, + "Text": { + "type": "cexolocstring", + "value": { + "0": "Is this the mushroom you are referring to?" + } + } + }, + { + "__struct_id": 10, + "ActionParams": { + "type": "list", + "value": [] + }, + "Animation": { + "type": "dword", + "value": 0 + }, + "AnimLoop": { + "type": "byte", + "value": 1 + }, + "Comment": { + "type": "cexostring", + "value": "" + }, + "Delay": { + "type": "dword", + "value": 4294967295 + }, + "EntriesList": { + "type": "list", + "value": [] + }, + "Quest": { + "type": "cexostring", + "value": "" + }, + "Script": { + "type": "resref", + "value": "" + }, + "Sound": { + "type": "resref", + "value": "" + }, + "Text": { + "type": "cexolocstring", + "value": { + "0": "End." + } + } } ] }, diff --git a/_module/git/celebrationfield.git.json b/_module/git/celebrationfield.git.json index d704fa7d..85406fd7 100644 --- a/_module/git/celebrationfield.git.json +++ b/_module/git/celebrationfield.git.json @@ -56514,7 +56514,9 @@ }, "Description": { "type": "cexolocstring", - "value": {} + "value": { + "0": "This child appears terrified." + } }, "Dex": { "type": "byte", @@ -56711,102 +56713,6 @@ "value": -1.0 } }, - { - "__struct_id": 16, - "AddCost": { - "type": "dword", - "value": 0 - }, - "BaseItem": { - "type": "int", - "value": 22 - }, - "Charges": { - "type": "byte", - "value": 0 - }, - "Cost": { - "type": "dword", - "value": 4 - }, - "Cursed": { - "type": "byte", - "value": 0 - }, - "DescIdentified": { - "type": "cexolocstring", - "value": {} - }, - "Description": { - "type": "cexolocstring", - "value": {} - }, - "Identified": { - "type": "byte", - "value": 1 - }, - "LocalizedName": { - "id": 191, - "type": "cexolocstring", - "value": {} - }, - "ModelPart1": { - "type": "byte", - "value": 11 - }, - "ModelPart2": { - "type": "byte", - "value": 21 - }, - "ModelPart3": { - "type": "byte", - "value": 11 - }, - "Plot": { - "type": "byte", - "value": 0 - }, - "PropertiesList": { - "type": "list", - "value": [] - }, - "StackSize": { - "type": "word", - "value": 1 - }, - "Stolen": { - "type": "byte", - "value": 0 - }, - "Tag": { - "type": "cexostring", - "value": "NW_WSWDG001" - }, - "TemplateResRef": { - "type": "resref", - "value": "nw_wswdg001" - }, - "XOrientation": { - "type": "float", - "value": 0.0 - }, - "XPosition": { - "type": "float", - "value": -1.0 - }, - "YOrientation": { - "type": "float", - "value": 1.0 - }, - "YPosition": { - "type": "float", - "value": -1.0 - }, - "ZPosition": { - "type": "float", - "value": -1.0 - } - }, { "__struct_id": 8192, "AddCost": { @@ -58758,6 +58664,110 @@ "type": "float", "value": -1.0 } + }, + { + "__struct_id": 9, + "AddCost": { + "type": "dword", + "value": 0 + }, + "BaseItem": { + "type": "int", + "value": 22 + }, + "Charges": { + "type": "byte", + "value": 0 + }, + "Cost": { + "type": "dword", + "value": 4 + }, + "Cursed": { + "type": "byte", + "value": 0 + }, + "DescIdentified": { + "type": "cexolocstring", + "value": {} + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "Identified": { + "type": "byte", + "value": 1 + }, + "LocalizedName": { + "id": 191, + "type": "cexolocstring", + "value": {} + }, + "ModelPart1": { + "type": "byte", + "value": 11 + }, + "ModelPart2": { + "type": "byte", + "value": 21 + }, + "ModelPart3": { + "type": "byte", + "value": 11 + }, + "Plot": { + "type": "byte", + "value": 0 + }, + "PropertiesList": { + "type": "list", + "value": [] + }, + "Repos_PosX": { + "type": "word", + "value": 6 + }, + "Repos_Posy": { + "type": "word", + "value": 1 + }, + "StackSize": { + "type": "word", + "value": 1 + }, + "Stolen": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "NW_WSWDG001" + }, + "TemplateResRef": { + "type": "resref", + "value": "nw_wswdg001" + }, + "XOrientation": { + "type": "float", + "value": 0.0 + }, + "XPosition": { + "type": "float", + "value": -1.0 + }, + "YOrientation": { + "type": "float", + "value": 1.0 + }, + "YPosition": { + "type": "float", + "value": -1.0 + }, + "ZPosition": { + "type": "float", + "value": -1.0 + } } ] }, @@ -58845,7 +58855,7 @@ }, "ScriptOnNotice": { "type": "resref", - "value": "" + "value": "talktopc" }, "ScriptRested": { "type": "resref", @@ -59143,7 +59153,7 @@ }, "SoundSetFile": { "type": "word", - "value": 34 + "value": 120 }, "SpecAbilityList": { "type": "list", @@ -59159,11 +59169,11 @@ }, "Subrace": { "type": "cexostring", - "value": "" + "value": "Human" }, "Tag": { "type": "cexostring", - "value": "Kupra" + "value": "NPC_KUPRA" }, "Tail_New": { "type": "dword", @@ -59177,6 +59187,26 @@ "type": "resref", "value": "kupra" }, + "VarTable": { + "type": "list", + "value": [ + { + "__struct_id": 0, + "Name": { + "type": "cexostring", + "value": "SET_NAME" + }, + "Type": { + "type": "dword", + "value": 3 + }, + "Value": { + "type": "cexostring", + "value": "Kupra" + } + } + ] + }, "WalkRate": { "type": "int", "value": 4 diff --git a/_module/git/level5lab.git.json b/_module/git/level5lab.git.json index 8f96a64a..d633f07e 100644 --- a/_module/git/level5lab.git.json +++ b/_module/git/level5lab.git.json @@ -29073,7 +29073,7 @@ }, "Conversation": { "type": "resref", - "value": "kupra" + "value": "cv_kupra" }, "CRAdjust": { "type": "int", @@ -29093,7 +29093,9 @@ }, "Description": { "type": "cexolocstring", - "value": {} + "value": { + "0": "This child appears terrified." + } }, "Dex": { "type": "byte", @@ -29290,102 +29292,6 @@ "value": -1.0 } }, - { - "__struct_id": 16, - "AddCost": { - "type": "dword", - "value": 0 - }, - "BaseItem": { - "type": "int", - "value": 22 - }, - "Charges": { - "type": "byte", - "value": 0 - }, - "Cost": { - "type": "dword", - "value": 4 - }, - "Cursed": { - "type": "byte", - "value": 0 - }, - "DescIdentified": { - "type": "cexolocstring", - "value": {} - }, - "Description": { - "type": "cexolocstring", - "value": {} - }, - "Identified": { - "type": "byte", - "value": 1 - }, - "LocalizedName": { - "id": 191, - "type": "cexolocstring", - "value": {} - }, - "ModelPart1": { - "type": "byte", - "value": 11 - }, - "ModelPart2": { - "type": "byte", - "value": 21 - }, - "ModelPart3": { - "type": "byte", - "value": 11 - }, - "Plot": { - "type": "byte", - "value": 0 - }, - "PropertiesList": { - "type": "list", - "value": [] - }, - "StackSize": { - "type": "word", - "value": 1 - }, - "Stolen": { - "type": "byte", - "value": 0 - }, - "Tag": { - "type": "cexostring", - "value": "NW_WSWDG001" - }, - "TemplateResRef": { - "type": "resref", - "value": "nw_wswdg001" - }, - "XOrientation": { - "type": "float", - "value": 0.0 - }, - "XPosition": { - "type": "float", - "value": -1.0 - }, - "YOrientation": { - "type": "float", - "value": 1.0 - }, - "YPosition": { - "type": "float", - "value": -1.0 - }, - "ZPosition": { - "type": "float", - "value": -1.0 - } - }, { "__struct_id": 8192, "AddCost": { @@ -31337,6 +31243,110 @@ "type": "float", "value": -1.0 } + }, + { + "__struct_id": 9, + "AddCost": { + "type": "dword", + "value": 0 + }, + "BaseItem": { + "type": "int", + "value": 22 + }, + "Charges": { + "type": "byte", + "value": 0 + }, + "Cost": { + "type": "dword", + "value": 4 + }, + "Cursed": { + "type": "byte", + "value": 0 + }, + "DescIdentified": { + "type": "cexolocstring", + "value": {} + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "Identified": { + "type": "byte", + "value": 1 + }, + "LocalizedName": { + "id": 191, + "type": "cexolocstring", + "value": {} + }, + "ModelPart1": { + "type": "byte", + "value": 11 + }, + "ModelPart2": { + "type": "byte", + "value": 21 + }, + "ModelPart3": { + "type": "byte", + "value": 11 + }, + "Plot": { + "type": "byte", + "value": 0 + }, + "PropertiesList": { + "type": "list", + "value": [] + }, + "Repos_PosX": { + "type": "word", + "value": 6 + }, + "Repos_Posy": { + "type": "word", + "value": 1 + }, + "StackSize": { + "type": "word", + "value": 1 + }, + "Stolen": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "NW_WSWDG001" + }, + "TemplateResRef": { + "type": "resref", + "value": "nw_wswdg001" + }, + "XOrientation": { + "type": "float", + "value": 0.0 + }, + "XPosition": { + "type": "float", + "value": -1.0 + }, + "YOrientation": { + "type": "float", + "value": 1.0 + }, + "YPosition": { + "type": "float", + "value": -1.0 + }, + "ZPosition": { + "type": "float", + "value": -1.0 + } } ] }, @@ -31722,7 +31732,7 @@ }, "SoundSetFile": { "type": "word", - "value": 227 + "value": 120 }, "SpecAbilityList": { "type": "list", @@ -31738,11 +31748,11 @@ }, "Subrace": { "type": "cexostring", - "value": "" + "value": "Human" }, "Tag": { "type": "cexostring", - "value": "Kupra" + "value": "NPC_KUPRA" }, "Tail_New": { "type": "dword", @@ -31756,6 +31766,26 @@ "type": "resref", "value": "kupra" }, + "VarTable": { + "type": "list", + "value": [ + { + "__struct_id": 0, + "Name": { + "type": "cexostring", + "value": "SET_NAME" + }, + "Type": { + "type": "dword", + "value": 3 + }, + "Value": { + "type": "cexostring", + "value": "Kupra" + } + } + ] + }, "WalkRate": { "type": "int", "value": 4 diff --git a/_module/invalid_2383.0 b/_module/invalid_2383.0 deleted file mode 100644 index e69de29b..00000000 diff --git a/_module/ncs/jcoutcasts1.ncs b/_module/ncs/jcoutcasts1.ncs index cd0754c3..ca1dad61 100644 Binary files a/_module/ncs/jcoutcasts1.ncs and b/_module/ncs/jcoutcasts1.ncs differ diff --git a/_module/ncs/qst_ch_kupra01.ncs b/_module/ncs/qst_ch_kupra01.ncs new file mode 100644 index 00000000..499ad56f Binary files /dev/null and b/_module/ncs/qst_ch_kupra01.ncs differ diff --git a/_module/ncs/qst_chk_outcst01.ncs b/_module/ncs/qst_chk_outcst01.ncs new file mode 100644 index 00000000..5a5aae63 Binary files /dev/null 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 new file mode 100644 index 00000000..59f3b7a1 Binary files /dev/null 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 25af4caf..6d8e5d29 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_spiders_03.ncs b/_module/ncs/qst_spiders_03.ncs index 1974828b..7f58d35e 100644 Binary files a/_module/ncs/qst_spiders_03.ncs and b/_module/ncs/qst_spiders_03.ncs differ diff --git a/_module/nss/qst_ch_kupra01.nss b/_module/nss/qst_ch_kupra01.nss new file mode 100644 index 00000000..1d59eff8 --- /dev/null +++ b/_module/nss/qst_ch_kupra01.nss @@ -0,0 +1,30 @@ +//:://///////////////////////////////////////////// +//:: qst_ch_kupra01 +//:: Copyright (c) 2022 Project RATDOG +//::////////////////////////////////////////////// +/* + Checks for the "Kupra" quest having been + started. +*/ +//::////////////////////////////////////////////// +//:: Created By: Jaysyn +//:: Created On: 20220617 +//::////////////////////////////////////////////// + +#include "pqj_inc" + +int StartingConditional() +{ +//Declare major variables + object oPC = GetPCSpeaker(); + int nInt; + + + nInt = RetrieveQuestState("kupra", oPC); + //nInt=GetLocalInt(oPC, "NW_JOURNAL_ENTRYkupra"); + + if (!nInt == 1) + return FALSE; + + return TRUE; +} diff --git a/_module/nss/qst_chk_outcst01.nss b/_module/nss/qst_chk_outcst01.nss new file mode 100644 index 00000000..5deebc83 --- /dev/null +++ b/_module/nss/qst_chk_outcst01.nss @@ -0,0 +1,29 @@ +//:://///////////////////////////////////////////// +//:: qst_chk_outcst01.nss +//:: Copyright (c) 2022 Project RATDOG +//::////////////////////////////////////////////// +/* + Checks for start of the "Outcasts" quest. +*/ +//::////////////////////////////////////////////// +//:: Created By: Jaysyn +//:: Created On: 20220628 +//::////////////////////////////////////////////// + +#include "pqj_inc" + +int StartingConditional() +{ +//: Declare major variables + object oPC = GetPCSpeaker(); + int nInt; + +//:: Inspect quest state + nInt = RetrieveQuestState("outcasts", oPC); + if (!nInt == 1) + return FALSE; + + //nInt=GetLocalInt(oPC, "NW_JOURNAL_ENTRYoutcasts"); + + return TRUE; +} diff --git a/_module/nss/qst_chk_outcst02.nss b/_module/nss/qst_chk_outcst02.nss new file mode 100644 index 00000000..684f50f4 --- /dev/null +++ b/_module/nss/qst_chk_outcst02.nss @@ -0,0 +1,29 @@ +//:://///////////////////////////////////////////// +//:: qst_chk_outcst02.nss +//:: Copyright (c) 2022 Project RATDOG +//::////////////////////////////////////////////// +/* + Checks that the "Outcasts" was refused. +*/ +//::////////////////////////////////////////////// +//:: Created By: Jaysyn +//:: Created On: 20220628 +//::////////////////////////////////////////////// + +#include "pqj_inc" + +int StartingConditional() +{ +//: Declare major variables + object oPC = GetPCSpeaker(); + int nInt; + +//:: Inspect quest state + nInt = RetrieveQuestState("outcasts", oPC); + if (!nInt == 2) + return FALSE; + + //nInt=GetLocalInt(oPC, "NW_JOURNAL_ENTRYoutcasts"); + + return TRUE; +} diff --git a/_module/nss/qst_chk_outcst03.nss b/_module/nss/qst_chk_outcst03.nss index 2722cd88..a89953d6 100644 --- a/_module/nss/qst_chk_outcst03.nss +++ b/_module/nss/qst_chk_outcst03.nss @@ -14,13 +14,16 @@ int StartingConditional() { -object oPC = GetPCSpeaker(); +//: Declare major variables + object oPC = GetPCSpeaker(); + int nInt; -int nInt; -//nInt=GetLocalInt(oPC, "NW_JOURNAL_ENTRYoutcasts"); -nInt = RetrieveQuestState("outcasts", oPC); -if (nInt >= 3) - return TRUE; +//:: Inspect quest state + nInt = RetrieveQuestState("outcasts", oPC); + if (!nInt == 3) + return FALSE; -return FALSE; + //nInt=GetLocalInt(oPC, "NW_JOURNAL_ENTRYoutcasts"); + + return TRUE; } diff --git a/_module/nss/qst_spiders_03.nss b/_module/nss/qst_spiders_03.nss index 59368ec7..75f3d4bb 100644 --- a/_module/nss/qst_spiders_03.nss +++ b/_module/nss/qst_spiders_03.nss @@ -26,7 +26,7 @@ int StartingConditional() nInt = RetrieveQuestState("spiders", oPC); // nInt=GetLocalInt(oPC, "NW_JOURNAL_ENTRYspiders"); - if (nInt >= 3) return TRUE; + if (!nInt == 3) return FALSE; - return FALSE; + return TRUE; } diff --git a/_module/ra_tdog.mod b/_module/ra_tdog.mod index 74d63ee1..d9525c65 100644 Binary files a/_module/ra_tdog.mod and b/_module/ra_tdog.mod differ