diff --git a/_module/are/trinity.are.json b/_module/are/trinity.are.json index 270e815..1a7e4d3 100644 --- a/_module/are/trinity.are.json +++ b/_module/are/trinity.are.json @@ -6347,13 +6347,17 @@ } ] }, + "TileBrdrDisabled": { + "type": "byte", + "value": 0 + }, "Tileset": { "type": "resref", "value": "tcn01" }, "Version": { "type": "dword", - "value": 117 + "value": 119 }, "Width": { "type": "int", diff --git a/_module/dlg/cs_conv_dmspirit.dlg.json b/_module/dlg/cs_conv_dmspirit.dlg.json index 27f2dea..4ed47ae 100644 --- a/_module/dlg/cs_conv_dmspirit.dlg.json +++ b/_module/dlg/cs_conv_dmspirit.dlg.json @@ -21,6 +21,10 @@ "value": [ { "__struct_id": 0, + "ActionParams": { + "type": "list", + "value": [] + }, "Animation": { "type": "dword", "value": 0 @@ -50,6 +54,10 @@ "type": "resref", "value": "" }, + "ConditionParams": { + "type": "list", + "value": [] + }, "Index": { "type": "dword", "value": 4 @@ -65,6 +73,10 @@ "type": "resref", "value": "" }, + "ConditionParams": { + "type": "list", + "value": [] + }, "Index": { "type": "dword", "value": 0 @@ -97,6 +109,10 @@ }, { "__struct_id": 1, + "ActionParams": { + "type": "list", + "value": [] + }, "Animation": { "type": "dword", "value": 0 @@ -126,6 +142,10 @@ "type": "resref", "value": "" }, + "ConditionParams": { + "type": "list", + "value": [] + }, "Index": { "type": "dword", "value": 2 @@ -141,6 +161,10 @@ "type": "resref", "value": "" }, + "ConditionParams": { + "type": "list", + "value": [] + }, "Index": { "type": "dword", "value": 1 @@ -167,12 +191,16 @@ "Text": { "type": "cexolocstring", "value": { - "0": "Well... not an easy thing to do... turn back time.....there will be no re-leveling, in Addition it will cost you 100,000 gold." + "0": "Well... not an easy thing to do... turn back time.....there will be no re-leveling, additionally it will cost you 100,000 gold." } } }, { "__struct_id": 2, + "ActionParams": { + "type": "list", + "value": [] + }, "Animation": { "type": "dword", "value": 0 @@ -202,6 +230,10 @@ "type": "resref", "value": "" }, + "ConditionParams": { + "type": "list", + "value": [] + }, "Index": { "type": "dword", "value": 3 @@ -234,6 +266,10 @@ }, { "__struct_id": 3, + "ActionParams": { + "type": "list", + "value": [] + }, "Animation": { "type": "dword", "value": 0 @@ -279,6 +315,10 @@ }, { "__struct_id": 4, + "ActionParams": { + "type": "list", + "value": [] + }, "Animation": { "type": "dword", "value": 0 @@ -326,7 +366,7 @@ }, "NumWords": { "type": "dword", - "value": 88 + "value": 87 }, "PreventZoomIn": { "type": "byte", @@ -337,6 +377,10 @@ "value": [ { "__struct_id": 0, + "ActionParams": { + "type": "list", + "value": [] + }, "Animation": { "type": "dword", "value": 0 @@ -362,6 +406,10 @@ "type": "resref", "value": "" }, + "ConditionParams": { + "type": "list", + "value": [] + }, "Index": { "type": "dword", "value": 1 @@ -394,6 +442,10 @@ }, { "__struct_id": 1, + "ActionParams": { + "type": "list", + "value": [] + }, "Animation": { "type": "dword", "value": 0 @@ -435,6 +487,10 @@ }, { "__struct_id": 2, + "ActionParams": { + "type": "list", + "value": [] + }, "Animation": { "type": "dword", "value": 0 @@ -460,6 +516,10 @@ "type": "resref", "value": "cb_chk_100k" }, + "ConditionParams": { + "type": "list", + "value": [] + }, "Index": { "type": "dword", "value": 2 @@ -492,6 +552,10 @@ }, { "__struct_id": 3, + "ActionParams": { + "type": "list", + "value": [] + }, "Animation": { "type": "dword", "value": 0 @@ -517,6 +581,10 @@ "type": "resref", "value": "" }, + "ConditionParams": { + "type": "list", + "value": [] + }, "Index": { "type": "dword", "value": 3 @@ -549,6 +617,10 @@ }, { "__struct_id": 4, + "ActionParams": { + "type": "list", + "value": [] + }, "Animation": { "type": "dword", "value": 0 @@ -574,6 +646,10 @@ "type": "resref", "value": "" }, + "ConditionParams": { + "type": "list", + "value": [] + }, "Index": { "type": "dword", "value": 4 @@ -615,6 +691,10 @@ "type": "resref", "value": "" }, + "ConditionParams": { + "type": "list", + "value": [] + }, "Index": { "type": "dword", "value": 0 diff --git a/_module/git/trinity.git.json b/_module/git/trinity.git.json index 615d731..2b4e626 100644 --- a/_module/git/trinity.git.json +++ b/_module/git/trinity.git.json @@ -449,6 +449,82 @@ "type": "resref", "value": "noblerobe" }, + "xArmorPart_Belt": { + "type": "word", + "value": 4 + }, + "xArmorPart_LBice": { + "type": "word", + "value": 4 + }, + "xArmorPart_LFArm": { + "type": "word", + "value": 4 + }, + "xArmorPart_LFoot": { + "type": "word", + "value": 4 + }, + "xArmorPart_LHand": { + "type": "word", + "value": 4 + }, + "xArmorPart_LShin": { + "type": "word", + "value": 4 + }, + "xArmorPart_LShou": { + "type": "word", + "value": 4 + }, + "xArmorPart_LThig": { + "type": "word", + "value": 4 + }, + "xArmorPart_Neck": { + "type": "word", + "value": 1 + }, + "xArmorPart_Pelvi": { + "type": "word", + "value": 4 + }, + "xArmorPart_RBice": { + "type": "word", + "value": 4 + }, + "xArmorPart_RFArm": { + "type": "word", + "value": 4 + }, + "xArmorPart_RFoot": { + "type": "word", + "value": 4 + }, + "xArmorPart_RHand": { + "type": "word", + "value": 4 + }, + "xArmorPart_Robe": { + "type": "word", + "value": 4 + }, + "xArmorPart_RShin": { + "type": "word", + "value": 4 + }, + "xArmorPart_RShou": { + "type": "word", + "value": 4 + }, + "xArmorPart_RThig": { + "type": "word", + "value": 4 + }, + "xArmorPart_Torso": { + "type": "word", + "value": 53 + }, "XOrientation": { "type": "float", "value": 0.0 @@ -697,6 +773,10 @@ "type": "resref", "value": "claw9d8plus007" }, + "xModelPart1": { + "type": "word", + "value": 1 + }, "XOrientation": { "type": "float", "value": 0.0 @@ -945,6 +1025,10 @@ "type": "resref", "value": "claw9d8plus008" }, + "xModelPart1": { + "type": "word", + "value": 1 + }, "XOrientation": { "type": "float", "value": 0.0 @@ -1193,6 +1277,10 @@ "type": "resref", "value": "bite9d10plus5" }, + "xModelPart1": { + "type": "word", + "value": 1 + }, "XOrientation": { "type": "float", "value": 0.0 @@ -1982,6 +2070,82 @@ "type": "byte", "value": 20 }, + "xAppearance_Head": { + "type": "word", + "value": 18 + }, + "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": -0.7242461442947388 @@ -2019,7 +2183,7 @@ }, "ChallengeRating": { "type": "float", - "value": 8.0 + "value": 9.0 }, "ClassList": { "type": "list", @@ -2210,6 +2374,10 @@ "type": "resref", "value": "nw_it_crewpsp011" }, + "xModelPart1": { + "type": "word", + "value": 1 + }, "XOrientation": { "type": "float", "value": 0.0 @@ -2548,6 +2716,10 @@ "type": "resref", "value": "nw_it_creitem033" }, + "xModelPart1": { + "type": "word", + "value": 1 + }, "XOrientation": { "type": "float", "value": 0.0 @@ -3819,6 +3991,82 @@ "type": "resref", "value": "trinitynoob" }, + "xArmorPart_Belt": { + "type": "word", + "value": 0 + }, + "xArmorPart_LBice": { + "type": "word", + "value": 10 + }, + "xArmorPart_LFArm": { + "type": "word", + "value": 8 + }, + "xArmorPart_LFoot": { + "type": "word", + "value": 4 + }, + "xArmorPart_LHand": { + "type": "word", + "value": 1 + }, + "xArmorPart_LShin": { + "type": "word", + "value": 16 + }, + "xArmorPart_LShou": { + "type": "word", + "value": 0 + }, + "xArmorPart_LThig": { + "type": "word", + "value": 8 + }, + "xArmorPart_Neck": { + "type": "word", + "value": 1 + }, + "xArmorPart_Pelvi": { + "type": "word", + "value": 23 + }, + "xArmorPart_RBice": { + "type": "word", + "value": 10 + }, + "xArmorPart_RFArm": { + "type": "word", + "value": 8 + }, + "xArmorPart_RFoot": { + "type": "word", + "value": 4 + }, + "xArmorPart_RHand": { + "type": "word", + "value": 1 + }, + "xArmorPart_Robe": { + "type": "word", + "value": 0 + }, + "xArmorPart_RShin": { + "type": "word", + "value": 16 + }, + "xArmorPart_RShou": { + "type": "word", + "value": 0 + }, + "xArmorPart_RThig": { + "type": "word", + "value": 8 + }, + "xArmorPart_Torso": { + "type": "word", + "value": 39 + }, "XOrientation": { "type": "float", "value": 0.0 @@ -4489,6 +4737,82 @@ "type": "byte", "value": 16 }, + "xAppearance_Head": { + "type": "word", + "value": 2 + }, + "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": -0.992479681968689 @@ -5074,6 +5398,82 @@ "type": "resref", "value": "trinitygaurdarmo" }, + "xArmorPart_Belt": { + "type": "word", + "value": 4 + }, + "xArmorPart_LBice": { + "type": "word", + "value": 7 + }, + "xArmorPart_LFArm": { + "type": "word", + "value": 21 + }, + "xArmorPart_LFoot": { + "type": "word", + "value": 7 + }, + "xArmorPart_LHand": { + "type": "word", + "value": 4 + }, + "xArmorPart_LShin": { + "type": "word", + "value": 12 + }, + "xArmorPart_LShou": { + "type": "word", + "value": 22 + }, + "xArmorPart_LThig": { + "type": "word", + "value": 10 + }, + "xArmorPart_Neck": { + "type": "word", + "value": 4 + }, + "xArmorPart_Pelvi": { + "type": "word", + "value": 4 + }, + "xArmorPart_RBice": { + "type": "word", + "value": 7 + }, + "xArmorPart_RFArm": { + "type": "word", + "value": 21 + }, + "xArmorPart_RFoot": { + "type": "word", + "value": 7 + }, + "xArmorPart_RHand": { + "type": "word", + "value": 4 + }, + "xArmorPart_Robe": { + "type": "word", + "value": 0 + }, + "xArmorPart_RShin": { + "type": "word", + "value": 12 + }, + "xArmorPart_RShou": { + "type": "word", + "value": 22 + }, + "xArmorPart_RThig": { + "type": "word", + "value": 10 + }, + "xArmorPart_Torso": { + "type": "word", + "value": 4 + }, "XOrientation": { "type": "float", "value": 0.0 @@ -5776,6 +6176,82 @@ "type": "byte", "value": 16 }, + "xAppearance_Head": { + "type": "word", + "value": 6 + }, + "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": -0.2430108338594437 diff --git a/_module/ncs/at_takexp.ncs b/_module/ncs/at_takexp.ncs index 6a3e2ef..450bed6 100644 Binary files a/_module/ncs/at_takexp.ncs and b/_module/ncs/at_takexp.ncs differ diff --git a/_module/ncs/cs_pctostone.ncs b/_module/ncs/cs_pctostone.ncs index 6634532..b220486 100644 Binary files a/_module/ncs/cs_pctostone.ncs and b/_module/ncs/cs_pctostone.ncs differ diff --git a/_module/nss/at_takexp.nss b/_module/nss/at_takexp.nss index 446bb1e..13fe189 100644 --- a/_module/nss/at_takexp.nss +++ b/_module/nss/at_takexp.nss @@ -24,9 +24,10 @@ void main() object oPC = GetPCSpeaker(); -RemoveXPFromParty(10000, oPC, FALSE); +//RemoveXPFromParty(10000, oPC, FALSE); + +SetXP(oPC, 1); AssignCommand(oPC, TakeGoldFromCreature(100000, oPC, TRUE)); } - diff --git a/_module/nss/cs_pctostone.nss b/_module/nss/cs_pctostone.nss index f8d8ae3..01d4a69 100644 --- a/_module/nss/cs_pctostone.nss +++ b/_module/nss/cs_pctostone.nss @@ -2,9 +2,11 @@ void main() { object oTarget = GetPCSpeaker(); effect eStone = EffectPetrify(); - float nDelay = IntToFloat(Random(60)+1); + //float nDelay = IntToFloat(Random(60)+1); + + int nRandom = 4 + d4(1); AssignCommand(oTarget, ApplyEffectAtLocation(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_DUR_PETRIFY), GetLocation(oTarget))); - AssignCommand(oTarget, ApplyEffectToObject(DURATION_TYPE_PERMANENT, eStone, oTarget)); - DelayCommand(nDelay, ActionCastSpellAtObject(SPELL_STONE_TO_FLESH, oTarget, METAMAGIC_NONE, TRUE)); + AssignCommand(oTarget, ApplyEffectToObject(DURATION_TYPE_TEMPORARY, eStone, oTarget, TurnsToSeconds(nRandom))); + //DelayCommand(nDelay, ActionCastSpellAtObject(SPELL_STONE_TO_FLESH, oTarget, METAMAGIC_NONE, TRUE)); } diff --git a/_release/Realms of Trinity II [PRC].7z b/_release/Realms of Trinity II [PRC].7z index 8737111..8f84b98 100644 Binary files a/_release/Realms of Trinity II [PRC].7z and b/_release/Realms of Trinity II [PRC].7z differ