diff --git a/_module/are/coastfarsoutheas.are.json b/_module/are/coastfarsoutheas.are.json index 4923fedd..76dd1146 100644 --- a/_module/are/coastfarsoutheas.are.json +++ b/_module/are/coastfarsoutheas.are.json @@ -11163,13 +11163,17 @@ } ] }, + "TileBrdrDisabled": { + "type": "byte", + "value": 0 + }, "Tileset": { "type": "resref", "value": "ttr01" }, "Version": { "type": "dword", - "value": 30 + "value": 31 }, "Width": { "type": "int", diff --git a/_module/are/serisislandbugbe.are.json b/_module/are/serisislandbugbe.are.json index 8d10c704..e1d18f55 100644 --- a/_module/are/serisislandbugbe.are.json +++ b/_module/are/serisislandbugbe.are.json @@ -2907,13 +2907,17 @@ } ] }, + "TileBrdrDisabled": { + "type": "byte", + "value": 0 + }, "Tileset": { "type": "resref", "value": "tdm01" }, "Version": { "type": "dword", - "value": 14 + "value": 15 }, "Width": { "type": "int", diff --git a/_module/git/coastfarsoutheas.git.json b/_module/git/coastfarsoutheas.git.json index 12b95f70..1548e8a0 100644 --- a/_module/git/coastfarsoutheas.git.json +++ b/_module/git/coastfarsoutheas.git.json @@ -83,7 +83,7 @@ }, "CR": { "type": "float", - "value": 3.0 + "value": 4.0 }, "ResRef": { "type": "resref", @@ -102,7 +102,7 @@ }, "CR": { "type": "float", - "value": 5.0 + "value": 6.0 }, "ResRef": { "type": "resref", @@ -414,7 +414,7 @@ }, "CR": { "type": "float", - "value": 3.0 + "value": 4.0 }, "ResRef": { "type": "resref", @@ -433,7 +433,7 @@ }, "CR": { "type": "float", - "value": 5.0 + "value": 6.0 }, "ResRef": { "type": "resref", @@ -821,7 +821,7 @@ }, "CR": { "type": "float", - "value": 2.0 + "value": 3.0 }, "ResRef": { "type": "resref", @@ -954,7 +954,7 @@ }, "CR": { "type": "float", - "value": 3.0 + "value": 4.0 }, "ResRef": { "type": "resref", @@ -1106,7 +1106,7 @@ }, "CR": { "type": "float", - "value": 7.0 + "value": 8.0 }, "ResRef": { "type": "resref", @@ -1144,7 +1144,7 @@ }, "CR": { "type": "float", - "value": 8.0 + "value": 9.0 }, "ResRef": { "type": "resref", @@ -1201,7 +1201,7 @@ }, "CR": { "type": "float", - "value": 11.0 + "value": 13.0 }, "ResRef": { "type": "resref", @@ -1220,7 +1220,7 @@ }, "CR": { "type": "float", - "value": 15.0 + "value": 17.0 }, "ResRef": { "type": "resref", @@ -4062,7 +4062,7 @@ }, "XPosition": { "type": "float", - "value": 59.24752044677734 + "value": 89.33706665039063 }, "YOrientation": { "type": "float", @@ -4070,133 +4070,11 @@ }, "YPosition": { "type": "float", - "value": 91.84621429443359 + "value": 53.48279571533203 }, "ZPosition": { "type": "float", - "value": -2.384185791015625e-007 - } - }, - { - "__struct_id": 5, - "Appearance": { - "type": "byte", - "value": 3 - }, - "Description": { - "type": "cexolocstring", - "value": {} - }, - "HasMapNote": { - "type": "byte", - "value": 0 - }, - "LinkedTo": { - "type": "cexostring", - "value": "" - }, - "LocalizedName": { - "type": "cexolocstring", - "value": { - "0": "PLANT15, offset 5" - } - }, - "MapNote": { - "type": "cexolocstring", - "value": {} - }, - "MapNoteEnabled": { - "type": "byte", - "value": 0 - }, - "Tag": { - "type": "cexostring", - "value": "cnr_resourcepoint" - }, - "TemplateResRef": { - "type": "resref", - "value": "cnr_resourcep078" - }, - "XOrientation": { - "type": "float", - "value": 0.0 - }, - "XPosition": { - "type": "float", - "value": 109.2264099121094 - }, - "YOrientation": { - "type": "float", - "value": 1.0 - }, - "YPosition": { - "type": "float", - "value": 66.25148010253906 - }, - "ZPosition": { - "type": "float", - "value": 4.76837158203125e-007 - } - }, - { - "__struct_id": 5, - "Appearance": { - "type": "byte", - "value": 3 - }, - "Description": { - "type": "cexolocstring", - "value": {} - }, - "HasMapNote": { - "type": "byte", - "value": 0 - }, - "LinkedTo": { - "type": "cexostring", - "value": "" - }, - "LocalizedName": { - "type": "cexolocstring", - "value": { - "0": "PLANT15, offset 5" - } - }, - "MapNote": { - "type": "cexolocstring", - "value": {} - }, - "MapNoteEnabled": { - "type": "byte", - "value": 0 - }, - "Tag": { - "type": "cexostring", - "value": "cnr_resourcepoint" - }, - "TemplateResRef": { - "type": "resref", - "value": "cnr_resourcep078" - }, - "XOrientation": { - "type": "float", - "value": 0.0 - }, - "XPosition": { - "type": "float", - "value": 83.95709991455078 - }, - "YOrientation": { - "type": "float", - "value": 1.0 - }, - "YPosition": { - "type": "float", - "value": 52.73037719726563 - }, - "ZPosition": { - "type": "float", - "value": 9.5367431640625e-006 + "value": -5.222045729169622e-006 } }, { @@ -4503,6 +4381,128 @@ "type": "float", "value": 2.384185791015625e-007 } + }, + { + "__struct_id": 5, + "Appearance": { + "type": "byte", + "value": 3 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "HasMapNote": { + "type": "byte", + "value": 0 + }, + "LinkedTo": { + "type": "cexostring", + "value": "" + }, + "LocalizedName": { + "type": "cexolocstring", + "value": { + "0": "PLANT12, offset 15" + } + }, + "MapNote": { + "type": "cexolocstring", + "value": {} + }, + "MapNoteEnabled": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "cnr_resourcepoint" + }, + "TemplateResRef": { + "type": "resref", + "value": "cnr_resourcep075" + }, + "XOrientation": { + "type": "float", + "value": 0.0 + }, + "XPosition": { + "type": "float", + "value": 41.85053253173828 + }, + "YOrientation": { + "type": "float", + "value": 1.0 + }, + "YPosition": { + "type": "float", + "value": 72.16269683837891 + }, + "ZPosition": { + "type": "float", + "value": 0.0 + } + }, + { + "__struct_id": 5, + "Appearance": { + "type": "byte", + "value": 3 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "HasMapNote": { + "type": "byte", + "value": 0 + }, + "LinkedTo": { + "type": "cexostring", + "value": "" + }, + "LocalizedName": { + "type": "cexolocstring", + "value": { + "0": "PLANT12, offset 15" + } + }, + "MapNote": { + "type": "cexolocstring", + "value": {} + }, + "MapNoteEnabled": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "cnr_resourcepoint" + }, + "TemplateResRef": { + "type": "resref", + "value": "cnr_resourcep075" + }, + "XOrientation": { + "type": "float", + "value": 0.0 + }, + "XPosition": { + "type": "float", + "value": 128.8268585205078 + }, + "YOrientation": { + "type": "float", + "value": 1.0 + }, + "YPosition": { + "type": "float", + "value": 101.8759689331055 + }, + "ZPosition": { + "type": "float", + "value": 0.0 + } } ] } diff --git a/_module/git/serisislandbugbe.git.json b/_module/git/serisislandbugbe.git.json index 13619cb7..76863c08 100644 --- a/_module/git/serisislandbugbe.git.json +++ b/_module/git/serisislandbugbe.git.json @@ -1063,7 +1063,7 @@ }, "CR": { "type": "float", - "value": 17.0 + "value": 19.0 }, "ResRef": { "type": "resref", @@ -8155,67 +8155,6 @@ "value": 4.76837158203125e-007 } }, - { - "__struct_id": 5, - "Appearance": { - "type": "byte", - "value": 3 - }, - "Description": { - "type": "cexolocstring", - "value": {} - }, - "HasMapNote": { - "type": "byte", - "value": 0 - }, - "LinkedTo": { - "type": "cexostring", - "value": "" - }, - "LocalizedName": { - "type": "cexolocstring", - "value": { - "0": "GEM002, offset 0" - } - }, - "MapNote": { - "type": "cexolocstring", - "value": {} - }, - "MapNoteEnabled": { - "type": "byte", - "value": 0 - }, - "Tag": { - "type": "cexostring", - "value": "cnr_resourcepoint" - }, - "TemplateResRef": { - "type": "resref", - "value": "cnr_resourcep026" - }, - "XOrientation": { - "type": "float", - "value": 0.0 - }, - "XPosition": { - "type": "float", - "value": 29.95540618896484 - }, - "YOrientation": { - "type": "float", - "value": 1.0 - }, - "YPosition": { - "type": "float", - "value": 56.12564468383789 - }, - "ZPosition": { - "type": "float", - "value": -2.980232238769531e-008 - } - }, { "__struct_id": 5, "Appearance": { @@ -8323,7 +8262,7 @@ }, "XPosition": { "type": "float", - "value": 10.80532455444336 + "value": 10.46947956085205 }, "YOrientation": { "type": "float", @@ -8331,11 +8270,11 @@ }, "YPosition": { "type": "float", - "value": 53.81195449829102 + "value": 53.47609329223633 }, "ZPosition": { "type": "float", - "value": 0.2499990463256836 + "value": 0.2499980926513672 } }, { @@ -8495,6 +8434,67 @@ "type": "float", "value": 0.2499970197677612 } + }, + { + "__struct_id": 5, + "Appearance": { + "type": "byte", + "value": 3 + }, + "Description": { + "type": "cexolocstring", + "value": {} + }, + "HasMapNote": { + "type": "byte", + "value": 0 + }, + "LinkedTo": { + "type": "cexostring", + "value": "" + }, + "LocalizedName": { + "type": "cexolocstring", + "value": { + "0": "GEM006, offset 0" + } + }, + "MapNote": { + "type": "cexolocstring", + "value": {} + }, + "MapNoteEnabled": { + "type": "byte", + "value": 0 + }, + "Tag": { + "type": "cexostring", + "value": "cnr_resourcepoint" + }, + "TemplateResRef": { + "type": "resref", + "value": "cnr_resourcep030" + }, + "XOrientation": { + "type": "float", + "value": 0.0 + }, + "XPosition": { + "type": "float", + "value": 29.85896492004395 + }, + "YOrientation": { + "type": "float", + "value": 1.0 + }, + "YPosition": { + "type": "float", + "value": 54.84780120849609 + }, + "ZPosition": { + "type": "float", + "value": 0.05505180358886719 + } } ] } diff --git a/_module/ncs/cnrtailorstable.ncs b/_module/ncs/cnrtailorstable.ncs index cc0bd38a..cbdf5e8b 100644 Binary files a/_module/ncs/cnrtailorstable.ncs and b/_module/ncs/cnrtailorstable.ncs differ diff --git a/_module/ncs/displ_onspawn.ncs b/_module/ncs/displ_onspawn.ncs index 7ec5ed6f..0ef8b72c 100644 Binary files a/_module/ncs/displ_onspawn.ncs and b/_module/ncs/displ_onspawn.ncs differ diff --git a/_module/ncs/ranzisnotfree.ncs b/_module/ncs/ranzisnotfree.ncs index 2c713f44..1d6c7e13 100644 Binary files a/_module/ncs/ranzisnotfree.ncs and b/_module/ncs/ranzisnotfree.ncs differ diff --git a/_module/nss/cnr_source_init.nss b/_module/nss/cnr_source_init.nss index 352d40a5..730ee0eb 100644 --- a/_module/nss/cnr_source_init.nss +++ b/_module/nss/cnr_source_init.nss @@ -95,5 +95,6 @@ void main() CnrMobOnDeathInitialize("zep_beetlefiret", "nw_it_msmlmisc08"); CnrMobOnDeathInitialize("zep_beetlespitt", "nw_it_msmlmisc08"); + } diff --git a/_module/nss/cnrtailorstable.nss b/_module/nss/cnrtailorstable.nss index 4645d8d5..14947b33 100644 --- a/_module/nss/cnrtailorstable.nss +++ b/_module/nss/cnrtailorstable.nss @@ -415,7 +415,7 @@ void main() CnrRecipeSetRecipeXP(sKeyToRecipe, 110, 110); CnrRecipeSetRecipeAbilityPercentages(sKeyToRecipe, 0, 65, 0, 35, 0, 0); - sKeyToRecipe = CnrRecipeCreateRecipe(sMenuTailorHideArmor, "Lion Hide Armor", "cnrArmorHideLion", 1); + sKeyToRecipe = CnrRecipeCreateRecipe(sMenuTailorHideArmor, "Lion Hide Armor", "cnrArmorHidLion", 1); CnrRecipeAddComponent(sKeyToRecipe, "cnrHideCureLion", 4, 0); CnrRecipeAddComponent(sKeyToRecipe, "cnrPattern", 1, 0); CnrRecipeAddComponent(sKeyToRecipe, "cnrCloth", 1, 0);