diff --git a/_module/are/hopevalley.are.json b/_module/are/hopevalley.are.json index 69762399..e4e1bf21 100644 --- a/_module/are/hopevalley.are.json +++ b/_module/are/hopevalley.are.json @@ -148,7 +148,7 @@ }, "Tag": { "type": "cexostring", - "value": "ZN100_HopeCanyon" + "value": "ZN100_HopeCanS" }, "Tile_List": { "type": "list", @@ -11163,13 +11163,17 @@ } ] }, + "TileBrdrDisabled": { + "type": "byte", + "value": 0 + }, "Tileset": { "type": "resref", "value": "ttf01" }, "Version": { "type": "dword", - "value": 70 + "value": 71 }, "Width": { "type": "int", diff --git a/_module/are/hopevalleyn.are.json b/_module/are/hopevalleyn.are.json index f67526ca..18c23ac8 100644 --- a/_module/are/hopevalleyn.are.json +++ b/_module/are/hopevalleyn.are.json @@ -148,7 +148,7 @@ }, "Tag": { "type": "cexostring", - "value": "ZN100_HopeCanyon" + "value": "ZN100_HopeCanN" }, "Tile_List": { "type": "list", @@ -11163,13 +11163,17 @@ } ] }, + "TileBrdrDisabled": { + "type": "byte", + "value": 0 + }, "Tileset": { "type": "resref", "value": "ttf01" }, "Version": { "type": "dword", - "value": 73 + "value": 74 }, "Width": { "type": "int", diff --git a/_module/are/hopevalleyw.are.json b/_module/are/hopevalleyw.are.json index 4ba8cca0..51a13a6e 100644 --- a/_module/are/hopevalleyw.are.json +++ b/_module/are/hopevalleyw.are.json @@ -148,7 +148,7 @@ }, "Tag": { "type": "cexostring", - "value": "ZN100_HopeCanyon" + "value": "ZN100_HopeCanSW" }, "Tile_List": { "type": "list", @@ -11163,13 +11163,17 @@ } ] }, + "TileBrdrDisabled": { + "type": "byte", + "value": 0 + }, "Tileset": { "type": "resref", "value": "ttf01" }, "Version": { "type": "dword", - "value": 67 + "value": 68 }, "Width": { "type": "int", diff --git a/_module/git/hopevalley.git.json b/_module/git/hopevalley.git.json index 4327f60b..2017958b 100644 --- a/_module/git/hopevalley.git.json +++ b/_module/git/hopevalley.git.json @@ -370,7 +370,7 @@ }, "CR": { "type": "float", - "value": 11.0 + "value": 12.0 }, "ResRef": { "type": "resref", @@ -769,7 +769,7 @@ }, "CR": { "type": "float", - "value": 21.0 + "value": 23.0 }, "ResRef": { "type": "resref", @@ -1174,7 +1174,7 @@ }, "CR": { "type": "float", - "value": 9.0 + "value": 10.0 }, "ResRef": { "type": "resref", @@ -1193,7 +1193,7 @@ }, "CR": { "type": "float", - "value": 10.0 + "value": 11.0 }, "ResRef": { "type": "resref", @@ -1269,7 +1269,7 @@ }, "CR": { "type": "float", - "value": 12.0 + "value": 13.0 }, "ResRef": { "type": "resref", @@ -1288,7 +1288,7 @@ }, "CR": { "type": "float", - "value": 13.0 + "value": 14.0 }, "ResRef": { "type": "resref", @@ -1326,7 +1326,7 @@ }, "CR": { "type": "float", - "value": 23.0 + "value": 24.0 }, "ResRef": { "type": "resref", @@ -1732,7 +1732,7 @@ }, "CR": { "type": "float", - "value": 9.0 + "value": 10.0 }, "ResRef": { "type": "resref", @@ -1751,7 +1751,7 @@ }, "CR": { "type": "float", - "value": 10.0 + "value": 11.0 }, "ResRef": { "type": "resref", @@ -1827,7 +1827,7 @@ }, "CR": { "type": "float", - "value": 12.0 + "value": 13.0 }, "ResRef": { "type": "resref", @@ -1846,7 +1846,7 @@ }, "CR": { "type": "float", - "value": 13.0 + "value": 14.0 }, "ResRef": { "type": "resref", @@ -1865,7 +1865,7 @@ }, "CR": { "type": "float", - "value": 23.0 + "value": 24.0 }, "ResRef": { "type": "resref", @@ -2252,7 +2252,7 @@ }, "CR": { "type": "float", - "value": 10.0 + "value": 11.0 }, "ResRef": { "type": "resref", @@ -2309,7 +2309,7 @@ }, "CR": { "type": "float", - "value": 11.0 + "value": 12.0 }, "ResRef": { "type": "resref", @@ -2347,7 +2347,7 @@ }, "CR": { "type": "float", - "value": 12.0 + "value": 13.0 }, "ResRef": { "type": "resref", @@ -2366,7 +2366,7 @@ }, "CR": { "type": "float", - "value": 13.0 + "value": 14.0 }, "ResRef": { "type": "resref", @@ -2385,7 +2385,7 @@ }, "CR": { "type": "float", - "value": 13.0 + "value": 14.0 }, "ResRef": { "type": "resref", @@ -2423,7 +2423,7 @@ }, "CR": { "type": "float", - "value": 23.0 + "value": 24.0 }, "ResRef": { "type": "resref", @@ -2905,7 +2905,7 @@ }, "CR": { "type": "float", - "value": 5.0 + "value": 6.0 }, "ResRef": { "type": "resref", @@ -2962,7 +2962,7 @@ }, "CR": { "type": "float", - "value": 9.0 + "value": 10.0 }, "ResRef": { "type": "resref", @@ -2981,7 +2981,7 @@ }, "CR": { "type": "float", - "value": 10.0 + "value": 11.0 }, "ResRef": { "type": "resref", @@ -3038,7 +3038,7 @@ }, "CR": { "type": "float", - "value": 11.0 + "value": 12.0 }, "ResRef": { "type": "resref", @@ -3076,7 +3076,7 @@ }, "CR": { "type": "float", - "value": 12.0 + "value": 13.0 }, "ResRef": { "type": "resref", @@ -3463,7 +3463,7 @@ }, "CR": { "type": "float", - "value": 10.0 + "value": 11.0 }, "ResRef": { "type": "resref", @@ -3539,7 +3539,7 @@ }, "CR": { "type": "float", - "value": 12.0 + "value": 13.0 }, "ResRef": { "type": "resref", @@ -3558,7 +3558,7 @@ }, "CR": { "type": "float", - "value": 13.0 + "value": 14.0 }, "ResRef": { "type": "resref", @@ -3577,7 +3577,7 @@ }, "CR": { "type": "float", - "value": 23.0 + "value": 24.0 }, "ResRef": { "type": "resref", @@ -3964,7 +3964,7 @@ }, "CR": { "type": "float", - "value": 10.0 + "value": 11.0 }, "ResRef": { "type": "resref", @@ -4040,7 +4040,7 @@ }, "CR": { "type": "float", - "value": 12.0 + "value": 13.0 }, "ResRef": { "type": "resref", @@ -4059,7 +4059,7 @@ }, "CR": { "type": "float", - "value": 13.0 + "value": 14.0 }, "ResRef": { "type": "resref", @@ -4078,7 +4078,7 @@ }, "CR": { "type": "float", - "value": 23.0 + "value": 24.0 }, "ResRef": { "type": "resref", @@ -4465,7 +4465,7 @@ }, "CR": { "type": "float", - "value": 12.0 + "value": 13.0 }, "ResRef": { "type": "resref", @@ -4484,7 +4484,7 @@ }, "CR": { "type": "float", - "value": 13.0 + "value": 14.0 }, "ResRef": { "type": "resref", @@ -4503,7 +4503,7 @@ }, "CR": { "type": "float", - "value": 13.0 + "value": 14.0 }, "ResRef": { "type": "resref", @@ -4541,7 +4541,7 @@ }, "CR": { "type": "float", - "value": 23.0 + "value": 24.0 }, "ResRef": { "type": "resref", @@ -5891,6 +5891,10 @@ "type": "resref", "value": "cnrblkcohoshroot" }, + "xModelPart1": { + "type": "word", + "value": 47 + }, "XOrientation": { "type": "float", "value": 0.0 diff --git a/_module/git/hopevalleyn.git.json b/_module/git/hopevalleyn.git.json index 6e151a29..ed4f6401 100644 --- a/_module/git/hopevalleyn.git.json +++ b/_module/git/hopevalleyn.git.json @@ -35,7 +35,7 @@ }, "MusicDelay": { "type": "int", - "value": 88000 + "value": 45000 }, "MusicNight": { "type": "int", @@ -845,7 +845,7 @@ }, "CR": { "type": "float", - "value": 5.0 + "value": 6.0 }, "ResRef": { "type": "resref", @@ -902,7 +902,7 @@ }, "CR": { "type": "float", - "value": 9.0 + "value": 10.0 }, "ResRef": { "type": "resref", @@ -921,7 +921,7 @@ }, "CR": { "type": "float", - "value": 10.0 + "value": 11.0 }, "ResRef": { "type": "resref", @@ -997,7 +997,7 @@ }, "CR": { "type": "float", - "value": 12.0 + "value": 13.0 }, "ResRef": { "type": "resref", @@ -1852,7 +1852,7 @@ }, "CR": { "type": "float", - "value": 5.0 + "value": 6.0 }, "ResRef": { "type": "resref", @@ -1909,7 +1909,7 @@ }, "CR": { "type": "float", - "value": 9.0 + "value": 10.0 }, "ResRef": { "type": "resref", @@ -1928,7 +1928,7 @@ }, "CR": { "type": "float", - "value": 10.0 + "value": 11.0 }, "ResRef": { "type": "resref", @@ -2004,7 +2004,7 @@ }, "CR": { "type": "float", - "value": 12.0 + "value": 13.0 }, "ResRef": { "type": "resref", @@ -2340,7 +2340,7 @@ "__struct_id": 2, "Orientation": { "type": "float", - "value": 1.938934326171875 + "value": 1.938934087753296 }, "X": { "type": "float", @@ -2471,7 +2471,7 @@ }, "CR": { "type": "float", - "value": 18.0 + "value": 19.0 }, "ResRef": { "type": "resref", @@ -2490,7 +2490,7 @@ }, "CR": { "type": "float", - "value": 19.0 + "value": 20.0 }, "ResRef": { "type": "resref", diff --git a/_module/git/hopevalleyw.git.json b/_module/git/hopevalleyw.git.json index 4c3090e6..8044a379 100644 --- a/_module/git/hopevalleyw.git.json +++ b/_module/git/hopevalleyw.git.json @@ -950,7 +950,7 @@ }, "CR": { "type": "float", - "value": 5.0 + "value": 6.0 }, "ResRef": { "type": "resref", @@ -1007,7 +1007,7 @@ }, "CR": { "type": "float", - "value": 9.0 + "value": 10.0 }, "ResRef": { "type": "resref", @@ -1026,7 +1026,7 @@ }, "CR": { "type": "float", - "value": 10.0 + "value": 11.0 }, "ResRef": { "type": "resref", @@ -1102,7 +1102,7 @@ }, "CR": { "type": "float", - "value": 12.0 + "value": 13.0 }, "ResRef": { "type": "resref", @@ -1984,7 +1984,7 @@ }, "CR": { "type": "float", - "value": 5.0 + "value": 6.0 }, "ResRef": { "type": "resref", @@ -2041,7 +2041,7 @@ }, "CR": { "type": "float", - "value": 9.0 + "value": 10.0 }, "ResRef": { "type": "resref", @@ -2060,7 +2060,7 @@ }, "CR": { "type": "float", - "value": 10.0 + "value": 11.0 }, "ResRef": { "type": "resref", @@ -2136,7 +2136,7 @@ }, "CR": { "type": "float", - "value": 12.0 + "value": 13.0 }, "ResRef": { "type": "resref", diff --git a/_module/ncs/hcrh_setbonusxp.ncs b/_module/ncs/hcrh_setbonusxp.ncs index 8da25edf..dd82613d 100644 Binary files a/_module/ncs/hcrh_setbonusxp.ncs and b/_module/ncs/hcrh_setbonusxp.ncs differ diff --git a/_module/ncs/hcrh_setbrntorch.ncs b/_module/ncs/hcrh_setbrntorch.ncs index 2fc98c6b..24880d35 100644 Binary files a/_module/ncs/hcrh_setbrntorch.ncs and b/_module/ncs/hcrh_setbrntorch.ncs differ diff --git a/_module/ncs/hcrh_setdmresrv.ncs b/_module/ncs/hcrh_setdmresrv.ncs index d458cfb7..7950af50 100644 Binary files a/_module/ncs/hcrh_setdmresrv.ncs and b/_module/ncs/hcrh_setdmresrv.ncs differ diff --git a/_module/ncs/hcrh_setgivelvl.ncs b/_module/ncs/hcrh_setgivelvl.ncs index ea29c7eb..a26c956c 100644 Binary files a/_module/ncs/hcrh_setgivelvl.ncs and b/_module/ncs/hcrh_setgivelvl.ncs differ diff --git a/_module/ncs/hcrh_setlvlcost.ncs b/_module/ncs/hcrh_setlvlcost.ncs index 7ae725ec..20810542 100644 Binary files a/_module/ncs/hcrh_setlvlcost.ncs and b/_module/ncs/hcrh_setlvlcost.ncs differ diff --git a/_module/ncs/hcrh_setpktrack.ncs b/_module/ncs/hcrh_setpktrack.ncs index f45c35a7..aa0f6819 100644 Binary files a/_module/ncs/hcrh_setpktrack.ncs and b/_module/ncs/hcrh_setpktrack.ncs differ diff --git a/_module/ncs/hcrh_setrest.ncs b/_module/ncs/hcrh_setrest.ncs index 5aa35b69..53b01d3f 100644 Binary files a/_module/ncs/hcrh_setrest.ncs and b/_module/ncs/hcrh_setrest.ncs differ diff --git a/_module/ncs/hcrh_setrezchnce.ncs b/_module/ncs/hcrh_setrezchnce.ncs index 77f0c7e0..2604ed8d 100644 Binary files a/_module/ncs/hcrh_setrezchnce.ncs and b/_module/ncs/hcrh_setrezchnce.ncs differ diff --git a/_module/ncs/hcrh_setsumtime.ncs b/_module/ncs/hcrh_setsumtime.ncs index 8d24ccae..1313c925 100644 Binary files a/_module/ncs/hcrh_setsumtime.ncs and b/_module/ncs/hcrh_setsumtime.ncs differ diff --git a/_module/ncs/pat_ini_areas.ncs b/_module/ncs/pat_ini_areas.ncs index d749adb5..92d44e2e 100644 Binary files a/_module/ncs/pat_ini_areas.ncs and b/_module/ncs/pat_ini_areas.ncs differ diff --git a/_module/ncs/ranzisnotfree.ncs b/_module/ncs/ranzisnotfree.ncs index 1d6c7e13..2c713f44 100644 Binary files a/_module/ncs/ranzisnotfree.ncs and b/_module/ncs/ranzisnotfree.ncs differ diff --git a/_module/ncs/trap_on_unacq.ncs b/_module/ncs/trap_on_unacq.ncs index 91426480..c01ddb7d 100644 Binary files a/_module/ncs/trap_on_unacq.ncs and b/_module/ncs/trap_on_unacq.ncs differ diff --git a/_module/nss/pat_ini_areas.nss b/_module/nss/pat_ini_areas.nss index 75068a42..b3598e02 100644 --- a/_module/nss/pat_ini_areas.nss +++ b/_module/nss/pat_ini_areas.nss @@ -111,9 +111,9 @@ void main() pat_AddArea("cleavenforesti", "ZN100_HiddenCleavenForest", "Hidden Cleaven Forest", -1); pat_AddArea("homeofthegods001", "HomeoftheGods_ud", "Home of the Gods", -1); pat_AddArea("hopecanyongraths", "HopeCanyonLamirs_in", "Hope Canyon - Lamirs'", -1); - pat_AddArea("hopevalleyn", "ZN100_HopeCanyon", "Hope Canyon - North", 11); - pat_AddArea("hopevalley", "ZN100_HopeCanyon", "Hope Canyon - South", 12); - pat_AddArea("hopevalleyw", "ZN100_HopeCanyon", "Hope Canyon - Southwest", 11); + pat_AddArea("hopevalleyn", "ZN100_HopeCanN", "Hope Canyon - North", 11); + pat_AddArea("hopevalley", "ZN100_HopeCanS", "Hope Canyon - South", 12); + pat_AddArea("hopevalleyw", "ZN100_HopeCanSW", "Hope Canyon - Southwest", 11); pat_AddArea("insanemagelai001", "InsaneMageLair_in", "Insane Mage Lair", -1); pat_AddArea("kahalalacanyons", "ZN103_KahalalaCanyons", "Kahalala Canyons", 13); pat_AddArea("desert2", "ZN103_KahalalaEast", "Kahalala East", 11);