From 29665a77ee282a1a2618db28bca31d38809fc6a0 Mon Sep 17 00:00:00 2001 From: Jaysyn904 <68194417+Jaysyn904@users.noreply.github.com> Date: Sun, 22 Dec 2024 20:54:47 -0500 Subject: [PATCH] Fixed bug creating Lion Hide Armor Fixed bug creating Lion Hide Armor. Tweaked resource locations. Full Compile. --- _module/are/coastfarsoutheas.are.json | 6 +- _module/are/serisislandbugbe.are.json | 6 +- _module/git/coastfarsoutheas.git.json | 270 +++++++++++++------------- _module/git/serisislandbugbe.git.json | 130 ++++++------- _module/ncs/cnrtailorstable.ncs | Bin 26422 -> 26421 bytes _module/ncs/displ_onspawn.ncs | Bin 234 -> 186 bytes _module/ncs/ranzisnotfree.ncs | Bin 208 -> 224 bytes _module/nss/cnr_source_init.nss | 1 + _module/nss/cnrtailorstable.nss | 2 +- 9 files changed, 212 insertions(+), 203 deletions(-) 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 cc0bd38a4ec6ae49dedfff37ea7aa1ccbeb17e93..cbdf5e8bba9ffe073a34ba622b87b9531b13a93d 100644 GIT binary patch delta 3106 zcmZYBdu&_P9S89IP6MS*Qs>68lQ_wB()w-3k2sF=aQsThqj@^cOKKT}mPTPPSOtu= z8D*lBp#q}&b)ZeCtef^|hgj399U6?5!G_SF1=?vq5m0qws>Zg8O$<;`ckb6s*0Z28*ZP z7uWD?dnNBGQ|SxIYxspSD@C~6=(9{-tLIZ8@Tsl*O`}iDxKV!UC_lNjhfZGgH6r(= z4Dg%Z(EEx1NpGVj$^Eilt@+9A{H8HO4_|HGLNBBG_!H2gaMih!9IjMF?lV-Md=7r1 zn^!9t8ed*~_7MbRZ`22jKa7C!69}02E&_6;oT%ub8V-Bv`NtI&%E6C0^*%cWpWO|g z>xa*t;cuCG=%cINEJm$-$>cZxQ}4&Bq_@#9XDj_=gdY15AFj;MK|a5!p3BV^x`67# z$Mt$dmXOOIwV?XgJMg2M`S0coZR5t_dhWAW=o$E-oq9if5PtYW_|XIKBYsw^+NlRG zPgQHh-~vBZNaJ)kk>AiO$-B_63x1X~!s^~il*gwLT>mqcUg!P=VSuNKe09i4~y???)^$|$l z4nAEUr6(n+VO6c8)4W(_7d;1gRyENXJleYkkM=&muc{GwujC)C72WT0*yc4qiyEs6 z+v<6T@3h%yE!_3r8HysbB==z9`hpHHHEJG9N*qxBL%K!51(l8(h;miyJXUz zU?0-2=nH24B@3#e+YZ^ipPy-r(R0f(^{FN)#i^u)C)ZV&e}ae=vz~q(hbe4a!9n7 zv&p+OByIU2SzUOl+V@Lrqx_6?jKG?Fm_y&v9LD4v`m{OJ%CzO@u)Q0Ps(v?3qRj1n zh4x@kt(&o^>k7-n9_8o#Hu*KtJ~C}xu=XaeynMA5zsi=2=mWsfje6Yrpv0Cf8{vdBNx3bj9=?+vW=2kZT&fxq@1zaIImAo8%vs7duqpo=1%P0%CT? zz4Yl)44;WBD>w(Rbq_Ur5Fw-6?#qPxa9Sx9pCjk^fC6IA;x|VF^)+&ca^L9=eHa! IOL<)X2ht69`2YX_ delta 3077 zcmZYBeQaCR83ypYC+RwzX7P<<=flZ$OJX~|*WZrq#Bm(kNt>ieo48JsOo}!_TZL7v z%7;2O+OFMHD4@~}UP{p>RMt)VC?H4+?GS9G2!_N)Mn#zh>ozj6F(#E|LQ}`q(VhDw zRF3XHNfe*o^PY3=dC&E8b982osy6l(SC2=6;e1)yOk%bwY@rs;SaiC=+bwN0$1MLo z!RIU<+QWafXf(=7rH6dnQK{1w-dY)4xuc@ItgOt!1xuY6dzMdCYV;E4oXxzjs?Poi zKBRKGcJ11wvI

oNVDjwJIjR$n%Y1G5HpMZB;uhK!mM!F|P6aDv!O~3?~AB6I%>e zG4Thnf~Pxc`Cyew|B<|bU#x1RcD7dQj?F90d^`d^KEttfP}^5f6)u`l$|`6b^V zivN`Xe*2u+kNsPE7X>Bv%lR6U-@J$4tj^Q@OOtodE2zHd7_=x|b@4n$YE@CZg6f-} zhacnAJp==b=U+B}`)NVb`+b_czW z>Ko3Q^+s7jE`OvB)koifAKA(u*zNcpv=mX}}E<)+ebSa98~rx{DvI55$MzDoP*Q&{y%lGW={? z{E5#mE*|EgClNU8VRu7_24tXz_cSQ<4bJs=9E0N!pDRsVe}EtKsAByYz@acZ8zZu- z3^?Jlih+9|2fhS(L#Z6Rm(Mr4=ob=3sDo|J08L4kq=yV5`nU7FahQy}C5L|2U6Ms-pjGz=09I+7zRm5;k+z)#zAz0%TbyulqGR zs$YQg@8#b#$LUc?8dz1E=uMujY88Dad0Ms6MGReM!O(RF`872r@0G=&PSN`=M_iiy zY1Ak$omSsFe5=bv)o^R?-{KKm)S6{W8C67O8?q8hlq!+dVFMyIhF z=Y zGq1bnHRzuIp>+06l>S?5fDS>Y-3t92xcjIXXU+j<{sr8#3wXiprvnmud2d6tNS}dD zAAw$Wvb%pKPqvFb;#p6GZh^hx@zd8)`0{$I=z1Eq>yX)|XVDeu4^X*#8v0XjfNq0! z4qHX)$Iz+$X5IBu=&nCOr{$YP?)QSbf-OD|?T`sc6DG`v&jQ=Qd33hT@3FU z!|+N?lYL@5o+<6KKIvHOla-|htMj z!%(MRr*V|o=~w75mXz3vC4IiMO!5f7;CIOvit(Q5$iS`%1myi|Oz~>LD&hx$<5Omw zxJP1DBwmD0CZK&mjRv9b3M#Z8xP8Km?>9;aLQ?~88wKO1b17_r($Bg_hm}eCD3-W?ag^`p;rl{Fjjtm_f$Xq({Cgjhz|pP~_X%*hKAaWN2SD zXXy7KLq8{R56L&MgoB+5Jp<^w7tnXJ8ES_CwU<#`Pouau)k^X^jLg`bQV54%v`rzS zErAS6X#@Fg;tx|UdIS-g6%oa*R&pB=H50pTpDEo`?tj& zj)=DR5wSn5(Z`s@TWN(nQ0`AL3-|BLv+xRJcsr2cJ%x9Y?cIM*w6S5b(%?NOh>~Y#_<&L0&pB8j%uvt3iGhLPfgF%v;80*-Vgo{E7G@xik&*HL|NlQ2Sfm+%^q-0H F8v#ZC4!{5a delta 39 scmaFBc!5#g&pB8j%uvt3iGhLPf*g=w;80*-Vq;=sVFt1pC+cqm0HF2;oB#j- 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);