From d4cc44cf220cac1785e418c84fe3410f238ca7d1 Mon Sep 17 00:00:00 2001 From: TabakaSIM <78695622+TabakaSIM@users.noreply.github.com> Date: Tue, 23 Jan 2024 08:07:58 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=A6=AFMisc=20Thaumcraft=20fixes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix [Mithrillium Scythe] augmenting (+ lore validation) * Changed quest rewards for thaumcraft focus tiers * Update pills textures * Added some mithminite scythe effects as exception to bosses --- .../normal/chapters/6bbc9f95/5ace7aee.snbt | 33 +---------- .../normal/chapters/6bbc9f95/a0d7c6a4.snbt | 40 +------------- .../normal/chapters/6bbc9f95/a2857370.snbt | 34 +----------- .../normal/chapters/6bbc9f95/bb955ac0.snbt | 38 +------------ .../normal/chapters/87b91368/a5033afa.snbt | 2 +- .../normal/reward_tables/15309327.snbt | 6 ++ .../normal/reward_tables/315e942a.snbt | 50 +++++++++++++++++ .../normal/reward_tables/3e27363f.snbt | 46 ++++++++++++++++ .../normal/reward_tables/98b4b988.snbt | 52 ++++++++++++++++++ .../normal/reward_tables/c5015ec6.snbt | 45 +++++++++++++++ .../ftbquests/normal/reward_tables/index.snbt | 6 +- .../textures/items/dairy_pill.png | Bin 642 -> 5812 bytes .../textures/items/fruit_pill.png | Bin 660 -> 6346 bytes .../textures/items/grain_pill.png | Bin 694 -> 6206 bytes .../textures/items/protein_pill.png | Bin 701 -> 6156 bytes .../textures/items/vegetable_pill.png | Bin 677 -> 6239 bytes scripts/do/mithminite_scythe.zs | 20 +++++-- scripts/mods/thaumadditions.zs | 52 ++++++++++++++++-- 18 files changed, 279 insertions(+), 145 deletions(-) create mode 100644 config/ftbquests/normal/reward_tables/315e942a.snbt create mode 100644 config/ftbquests/normal/reward_tables/3e27363f.snbt create mode 100644 config/ftbquests/normal/reward_tables/98b4b988.snbt create mode 100644 config/ftbquests/normal/reward_tables/c5015ec6.snbt diff --git a/config/ftbquests/normal/chapters/6bbc9f95/5ace7aee.snbt b/config/ftbquests/normal/chapters/6bbc9f95/5ace7aee.snbt index 45862a277..b0552b693 100644 --- a/config/ftbquests/normal/chapters/6bbc9f95/5ace7aee.snbt +++ b/config/ftbquests/normal/chapters/6bbc9f95/5ace7aee.snbt @@ -17,35 +17,8 @@ ignore_nbt: 1b }], rewards: [{ - uid: "8a5473f9", - type: "item", - item: { - id: "thaumcraft:focus_2", - tag: { - display: { - Name: "Riftmaker" - }, - package: { - index: 0, - power: 1.0f, - complexity: 18, - nodes: [{ - type: "MEDIUM", - key: "ROOT" - }, - { - type: "MEDIUM", - key: "thaumcraft.TOUCH" - }, - { - type: "EFFECT", - key: "thaumcraft.RIFT", - setting.duration: 10, - setting.depth: 32 - }] - }, - color: -13692571 - } - } + uid: "72b5d6d4", + type: "choice", + table: 149 }] } diff --git a/config/ftbquests/normal/chapters/6bbc9f95/a0d7c6a4.snbt b/config/ftbquests/normal/chapters/6bbc9f95/a0d7c6a4.snbt index 5e17c16cc..c042a96b4 100644 --- a/config/ftbquests/normal/chapters/6bbc9f95/a0d7c6a4.snbt +++ b/config/ftbquests/normal/chapters/6bbc9f95/a0d7c6a4.snbt @@ -18,42 +18,8 @@ ignore_nbt: 1b }], rewards: [{ - uid: "6b72fe30", - type: "item", - item: { - id: "thaumicaugmentation:focus_ancient", - tag: { - display: { - Name: "Cursed Bats" - }, - package: { - index: 0, - power: 1.0f, - complexity: 34, - nodes: [{ - type: "MEDIUM", - key: "ROOT" - }, - { - type: "MOD", - key: "thaumcraft.SCATTER", - setting.forks: 10, - setting.cone: 360 - }, - { - type: "MEDIUM", - key: "thaumcraft.SPELLBAT", - setting.target: 0 - }, - { - type: "EFFECT", - key: "thaumcraft.CURSE", - setting.duration: 10, - setting.power: 4 - }] - }, - color: -9830395 - } - } + uid: "6cdce789", + type: "choice", + table: 150 }] } diff --git a/config/ftbquests/normal/chapters/6bbc9f95/a2857370.snbt b/config/ftbquests/normal/chapters/6bbc9f95/a2857370.snbt index b96559199..832348ec8 100644 --- a/config/ftbquests/normal/chapters/6bbc9f95/a2857370.snbt +++ b/config/ftbquests/normal/chapters/6bbc9f95/a2857370.snbt @@ -16,36 +16,8 @@ ignore_nbt: 1b }], rewards: [{ - uid: "ced81c89", - type: "item", - item: { - id: "thaumcraft:focus_1", - tag: { - display: { - Name: "Block Exchange" - }, - package: { - index: 0, - power: 1.0f, - complexity: 7, - nodes: [{ - type: "MEDIUM", - key: "ROOT" - }, - { - type: "MEDIUM", - key: "thaumcraft.PLAN", - setting.method: 1 - }, - { - type: "EFFECT", - key: "thaumcraft.EXCHANGE", - setting.silk: 1, - setting.fortune: 0 - }] - }, - color: -11041961 - } - } + uid: "4d2cee0d", + type: "choice", + table: 148 }] } diff --git a/config/ftbquests/normal/chapters/6bbc9f95/bb955ac0.snbt b/config/ftbquests/normal/chapters/6bbc9f95/bb955ac0.snbt index 0164059be..89a3070b7 100644 --- a/config/ftbquests/normal/chapters/6bbc9f95/bb955ac0.snbt +++ b/config/ftbquests/normal/chapters/6bbc9f95/bb955ac0.snbt @@ -17,40 +17,8 @@ ignore_nbt: 1b }], rewards: [{ - uid: "0562d4d3", - type: "item", - item: { - id: "thaumcraft:focus_3", - tag: { - display: { - Name: "Fountain of Artemis" - }, - package: { - index: 0, - power: 1.0f, - complexity: 41, - nodes: [{ - type: "MEDIUM", - key: "ROOT" - }, - { - type: "MEDIUM", - key: "thaumcraft.BOLT" - }, - { - type: "MEDIUM", - key: "thaumcraft.CLOUD", - setting.duration: 30, - setting.radius: 3 - }, - { - type: "EFFECT", - key: "thaumcraft.HEAL", - setting.power: 5 - }] - }, - color: -2228219 - } - } + uid: "bc4292a0", + type: "choice", + table: 151 }] } diff --git a/config/ftbquests/normal/chapters/87b91368/a5033afa.snbt b/config/ftbquests/normal/chapters/87b91368/a5033afa.snbt index 1086d7870..0e7dfb63c 100644 --- a/config/ftbquests/normal/chapters/87b91368/a5033afa.snbt +++ b/config/ftbquests/normal/chapters/87b91368/a5033afa.snbt @@ -27,7 +27,7 @@ uid: "c678ca62", type: "item", items: [{ - item: "rats:rat_nugget_ore 1 49" + item: "rats:rat_nugget_ore 1 51" }], ignore_damage: true, ignore_nbt: 1b diff --git a/config/ftbquests/normal/reward_tables/15309327.snbt b/config/ftbquests/normal/reward_tables/15309327.snbt index 9fcaf4f0a..430553b5a 100644 --- a/config/ftbquests/normal/reward_tables/15309327.snbt +++ b/config/ftbquests/normal/reward_tables/15309327.snbt @@ -273,6 +273,12 @@ bullets: 6 }, bullets: [] + }, + ForgeCaps: { + Parent: { + Items: [], + Size: 21 + } } } }, diff --git a/config/ftbquests/normal/reward_tables/315e942a.snbt b/config/ftbquests/normal/reward_tables/315e942a.snbt new file mode 100644 index 000000000..b31159b3c --- /dev/null +++ b/config/ftbquests/normal/reward_tables/315e942a.snbt @@ -0,0 +1,50 @@ +{ + title: "Focus tier 3", + loot_size: 1, + rewards: [{ + item: { + id: "thaumcraft:focus_3", + tag: { + display: { + Name: "Fountain of Artemis" + }, + package: { + index: 0, + power: 1.0f, + complexity: 41, + nodes: [{ + type: "MEDIUM", + key: "ROOT" + }, + { + type: "MEDIUM", + key: "thaumcraft.BOLT" + }, + { + type: "MEDIUM", + key: "thaumcraft.CLOUD", + setting.duration: 30, + setting.radius: 3 + }, + { + type: "EFFECT", + key: "thaumcraft.HEAL", + setting.power: 5 + }] + }, + color: -2228219 + } + } + }, + { + item: "thaumcraft:focus_3" + }, + { + item: { + id: "ftbquests:lootcrate", + tag: { + type: "uncommon" + } + } + }] +} diff --git a/config/ftbquests/normal/reward_tables/3e27363f.snbt b/config/ftbquests/normal/reward_tables/3e27363f.snbt new file mode 100644 index 000000000..57bd99ebf --- /dev/null +++ b/config/ftbquests/normal/reward_tables/3e27363f.snbt @@ -0,0 +1,46 @@ +{ + title: "Focus tier 1", + loot_size: 1, + rewards: [{ + item: { + id: "thaumcraft:focus_1", + tag: { + display: { + Name: "Block Exchange" + }, + package: { + index: 0, + power: 1.0f, + complexity: 7, + nodes: [{ + type: "MEDIUM", + key: "ROOT" + }, + { + type: "MEDIUM", + key: "thaumcraft.PLAN", + setting.method: 1 + }, + { + type: "EFFECT", + key: "thaumcraft.EXCHANGE", + setting.silk: 1, + setting.fortune: 0 + }] + }, + color: -11041961 + } + } + }, + { + item: "thaumcraft:focus_1" + }, + { + item: { + id: "ftbquests:lootcrate", + tag: { + type: "common" + } + } + }] +} diff --git a/config/ftbquests/normal/reward_tables/98b4b988.snbt b/config/ftbquests/normal/reward_tables/98b4b988.snbt new file mode 100644 index 000000000..a583fbbdf --- /dev/null +++ b/config/ftbquests/normal/reward_tables/98b4b988.snbt @@ -0,0 +1,52 @@ +{ + title: "Focus tier 2.5", + loot_size: 1, + rewards: [{ + item: { + id: "thaumicaugmentation:focus_ancient", + tag: { + display: { + Name: "Cursed Bats" + }, + package: { + index: 0, + power: 1.0f, + complexity: 34, + nodes: [{ + type: "MEDIUM", + key: "ROOT" + }, + { + type: "MOD", + key: "thaumcraft.SCATTER", + setting.forks: 10, + setting.cone: 360 + }, + { + type: "MEDIUM", + key: "thaumcraft.SPELLBAT", + setting.target: 0 + }, + { + type: "EFFECT", + key: "thaumcraft.CURSE", + setting.duration: 10, + setting.power: 4 + }] + }, + color: -9830395 + } + } + }, + { + item: "thaumicaugmentation:focus_ancient" + }, + { + item: { + id: "ftbquests:lootcrate", + tag: { + type: "uncommon" + } + } + }] +} diff --git a/config/ftbquests/normal/reward_tables/c5015ec6.snbt b/config/ftbquests/normal/reward_tables/c5015ec6.snbt new file mode 100644 index 000000000..09507e80e --- /dev/null +++ b/config/ftbquests/normal/reward_tables/c5015ec6.snbt @@ -0,0 +1,45 @@ +{ + title: "Focus tier 2", + loot_size: 1, + rewards: [{ + item: { + id: "thaumcraft:focus_2", + tag: { + display: { + Name: "Riftmaker" + }, + package: { + index: 0, + power: 1.0f, + complexity: 18, + nodes: [{ + type: "MEDIUM", + key: "ROOT" + }, + { + type: "MEDIUM", + key: "thaumcraft.TOUCH" + }, + { + type: "EFFECT", + key: "thaumcraft.RIFT", + setting.duration: 10, + setting.depth: 32 + }] + }, + color: -13692571 + } + } + }, + { + item: "thaumcraft:focus_2" + }, + { + item: { + id: "ftbquests:lootcrate", + tag: { + type: "common" + } + } + }] +} diff --git a/config/ftbquests/normal/reward_tables/index.snbt b/config/ftbquests/normal/reward_tables/index.snbt index cd4994d9f..6e8ae54b4 100644 --- a/config/ftbquests/normal/reward_tables/index.snbt +++ b/config/ftbquests/normal/reward_tables/index.snbt @@ -147,6 +147,10 @@ "6dcc7951", "d80ba6df", "064cd9a3", - "2c161331" + "2c161331", + "3e27363f", + "c5015ec6", + "98b4b988", + "315e942a" ] } diff --git a/resources/contenttweaker/textures/items/dairy_pill.png b/resources/contenttweaker/textures/items/dairy_pill.png index 0a7791fff402e2273c14352bb061546ce5006f26..f6d73ad4381d8fde305db1bc8df6ee1bfab40804 100644 GIT binary patch literal 5812 zcmeHLX;c%*7LI~|VG$5;mk`khNN4S=vTu?o$^Z(8TPNwnDA@x99TgE&6mes4Tu=lQ z+(!iza6v>CLD>`pWf$Rr;yCC40{S}Odfxo;yqWjQoYU#9aiDe2}}L`qI%tzRi0-Kq!=^^LoDkr4JN_k;)}}VK9tQhD%`#tP=83C{=yC ze^6GNmEMrR^opjX;hy&22_0ny>j!)v@7U00*>IqzJd5k?#(7T!O$T95Ij=iTA_s#@9Q2?^;=`z70af+oI| zVFzKy20dWD*rUMk9Vz~xMNzFLpwV8RpwGDbDk#0^QCI^jXC`@CLeX!pnl@^#U(sAd zG><##-u)DvcfV+wKgMv`wyOBamldyrDaNQj&}kcCH;|wH{$!QL+@R#zw&xELI!?BV zG20t%O{ZC23}l@6@VqW<_UkrP=|O9*q_bQQd#o^9@FKY%m42r_Ufdp^B*OCINN^M0Cc;jbs1c-4hy8FBG%Muj|a zmbb<%&@5d(_FUia;pH^#FyXH8iZ^rEdc;B#g>A{~v)jAQT;!}xzjW&GI-%$B=SMOsI17NQRoS_5y(!ygZs^KB zxYZ!Fs$~Kr-)N8WS&Ck2y_DZ?F)Nl{Rh$xBV|IRVpZ2**&hEvhPH~=|gFp|8b1!{g z$rPPCK~Z_Cqb8UW;d1`O@bUxMC5P_Eo-y>;OJa0`Q#7`|$0Ru4OKjOyS@P8UH9vWC z^X|UfU9p7joN4e#J28K}`Sr8MHuQ>HtKUn=&+6&pnpYO< zI@GWO4@_Tj_Q`J<6_ZWhr_Tqby|wMiKJB`6bLNF?!*^3K4_Fl9&pB`I7e&yYrLtFE zeNtdM$#y}%d{xLAv;2SGgjWPmz%=$Lo5Q!dxHEGOXZerQboAK1^C$nPn{Uo(74?mg zP4gUAn)IUarilV7S&)gmmfT z;4(H9%>tMB&tB>pPxCoSsMx5+vd~$>GrgYrsWQzCD52L&aMVEkj2kiffBYVV z@8(Ut>U6q1@qX0LV=DcrPil?G~Gs7n?HT8vAQAN-o56 z@oAeTbOqg?oLF|GA>Gw|cT05U>&^bo&qczz#PCi2odJmc1YUQFNcDv?!d+Jm9;cjkZCoVfi`k1_{^ z8WSyab@gVsx_(+rkR{~k#(ncV?|7SR`*4cwKG(p^R95VrXuAVHJrnJoZn!pj>5PTq z;}xkEESbz?xvqhO*;xbJgB<2HbY!zeLEUXur90b>W}UI)bzb|Xp}rx+v&xfiF}~bwl#Qcua>PhMTqQSw(S>6AN_%P*K z)#3MY{a*(xZ`41`pYK#omC70(#@jc`wI{2pVAoJfN5JBsMq_#Bkt(NGKt=ZR2j^vR z)!G==m7Pr}?d^G<$1c~}H#Srgio5x28tv@FEfZYY&CeJrn`?n9yH(DEyF367K^mBq4Gx>>dh>m9xHv;Bi0uOGD(rBjxb8 zcsLjqA*Ko>D)F0;^I2ZrpFPwR2!tZ(h!;ZkHy01}Ny13(%G0UR2M3lKp%k4PrcU@n#a z6~tn>5K$!*{B>4pD4rUM1T)AW1q2vGA_RbB9tYr%U_QX*kU$2FLgT`8(g+lf%k+@Q zMG!KaLJ=f@@lvs1q(e!o^gi(8r$QxrfIw+n(1!57dR{TfJ`@*u(x6vsOEF9^=U`Axigt((Y6i_J48wrH? zjdpR@Kw<%m%&sF_XzXgr8UCQ)g829^75(*JvjWFnIU{{KpZxCAl;)A#_D z$Ke7XM56%^gUSOadDCVaU&&SuK^nD{EH8KM&M{`Xvu9T- z28NM8DPmY|&VKaLNBiwdTfI%9j?cZ_Z}hTteno`UW1YxfvO=lvm(4YL=%G8$!Z6At zIogA8Z;7#~>%Vz!8)-uwe^zOIpIR~6;L*5PF>@QxOz1+rn z_BN<_&>?$yT<<_EG+9qe6=#k8%$i(aWGei@?kGMYx;J5;^1&xcaGanQStjr+araC0}|ZNFP+$ACUiJHx2dl( zWJWdE#EEE;S~;w34W{}!8)Bj`I%Df!{wa}tK$rJE49#6Kk#Rz? M+!wiBa9JJsACEx8^8f$< delta 618 zcmV-w0+s!=ErJD*BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D0vAa{K~y+T&5}Q88c`g_f4#GEqIflkAV?joLZ)C4C0fz8$=boO zOP#V5q3P7A(5X|EKuO~w4jm;rO9N5b6aNj01qT(e9(edCMt}T=XkXtuuTs)B9lG=b z?;h`Wzkl!he(t^3OJ zA7ioDVX;_5Hzsg8om+0V`?<&CdCD-%-SKz~DwPU)y&m8$J_iDU`@cz-6wl4 z*DI}7dyi#V(0}Q4U@#cO1l?{Irqd}zB9Vu`XkfG1WPZQ@?9u-ION+&_H5!e;WHN!- zYzDbpF8W|CfTAd<*Xvo)K(O2GR4^EPolGXLve_&e4u@#9TA^~ej5?hTx=y>@M!49v z80>I3=x{jv1&gxm_xqB|8r%U&rBc#qO{393rzaY`3?RjO0_x~cUGHA&UF+<#cLHOLqmqKI z0t^OIqC45SL%*t$OHKy*)*tx{z+f^jqdYf=+<|boK*(ov13|bbQUJoi2re52i|9DB z-sj?*WecV_n%+`sQm6a2-dNXeeKg~iT*hshrIAi++k&l#e4ixwk&Np@!`c>&TL0-S zxapiQzBeJb*6PK~rT#T*(P+@8)z^mX6Qh-QMpr+_tFCE%wr6&1h(K zUEd(ddIw{pE>@;i`h=o$mG&L!OFXYtIin@=txubRS2a&74c?k4?C9RPI&RG279}Ba zne)Q2!@j#NT~l+fjS+AHHyYg9kgh|299NC7oEVs1M5s7c@Zm)cI4Xq$JK3D zPV?8842|5Lu$tg_E@|CK^?u|y6?%Q zS@+b&U5!%8E7AvXz6xI944`fa+BfabMFO!QA+OnWBr@zZV{L@YxkZ@pHBF~;>TgY3 zyFalfwX(Q|(&^K?HmO~&co0%_b4mI`4I`BruVr#R8snpyJ0@$Qiy835PoET`uxO6$ z{R1KiwWxd~|2+3)%eA3)k|1%TEkq zy{LB;@vvLga(i2)=gHkuEXgyhQ7n)1COCMq;txdvM1O?Ld{C|bq;l9UQkG)*=Qy9d z57MNW;yZEDVs!GP`jrfZUg3gK*$a!~8uGD-Pw%L@0n8Hn&!%=y&`nnJLtSz7`2I1g zqTwiaho$YE`#*-s=QO4GM=pu9?`XqkW=<7taz*Pl8JB2md28I1g-eM&TXztDW}@h< zj-1Wr$1f|h?$L19E@N=3&-t0>ZV~a!%7zT^jv9CR@5$KunkM(QqoJlZ6%pMhE zwwLMH-796?CVM2Aa^xp(7ZJq=i+Wvb1S+`>W=o8fcOxj|a^i8oJNx!$$|zP`p5OHH zp}N%5;ArHvr!C(8AMyI+3=h=emj(nMwu+F=GOv->~U2;ZeGHnuzsDHM!<;K%P4>&D& z9Sdo*vW{t#PE_jpM32QfcWW1HYWeuM{b85RQ5&VR@1EotjK%~w4uxgu1qP4rUX-wX zKf}$xBORq{9Cd+0)K1>AF73BGX(LP8+q!htzs>!+05G2;yt^G&l}TqF1~K74l_M1=&{|ic(HH3&)Jou>R9R2r>8G$ZAO@^ z$h;AlNDf`tw?yeoET_|FFQ;zcfWy+VN9prbkKSq@-|c4FFU*gK#z#6Gi_{Ng+dLB< z%PL#eRDsCaR_?q!roCNkbY^f^4>9O%R#>T9dLsZh@6tb+|iaFv2<63WiT2bz)~x zx<2EeyW5_%iT!^eH*=WYi`(9*R2X%wYoSeqzZb~(UQ$PFo;Vm=H$~Lm@#d1}$-mIv zPaETTxvZ>tr?SWU@)ce0tw_vF zyXNi_q0F<(ohj-HVHQSF34b%*WUto_6xE+U=6iZ$Pwy_rVv0*H#*9LKd8Ht2W`C02 z`dqc`y;-VSVTsZ+CKG!0YtUm}Pales%PwQy&X>ygH1l`LTczMBgQ`7oJLf&JwR$#c z(l-f%&5PsO+A`?2wqM_P(0eX5I@!#rmZ1^ zEp`dYcyJm)4-VGwRaCanDpWSPUqLNXi0%2UuDzPxZ0~GNT5)Ob`x|{brpBf$$I=z$ zO4U5>UB+5HUS+UwUt<2pf<+N=D$%cOEOS`w*CB^A_Hd%b9;C;cc5@=froF`{itfTP zoXi_Uwa6}bdeg z`Rix;qA9g<4WVZBoeMEI&pQY7r&M+{J!y3PvyxuD{K1T0r+%%~R_(m?yvfP7%Y#NS zpLNPwQf7oo$0rQ0c08(av}z&>g2j&x(|Uxmiy~S;+b}~*6yn%#T}`h}wpb0J9+bbl ze>V8QLs>YzB(WPNyXS^e`o&gSm$;dFW#=EdBa`#uTZP3}#AGvQYckD+wjdi^U8qbx z&jeuc{Xmllo&egSz+mQ<5dwf20E*y#Acq@7Lk?A5N5Z)*8gjji5((MiU*qEmTwTA>2Zel5 z0n!5<0SM4o6AYTiLx1lPBC-#INWKL0Up+!Rp`9Gs9Sq@z3YnmN7#Jin_@08r{N^tR z6$Z|x!(yVrK#&JPL!eo)KTPRJcV&F@kVwGc@&vP9kk~&UMO^kjV*L=C#4?-C_klp} z-*|sOf6aXs453_Isdjv3s3bhP9Std&pUUDhxh(4JEgnlE5iuA73cvvr6oE(}qx>*z zB8tq!Fo{f45(!|lzN4ZCg@}M4CMcnT$W6Eq51YisLqHPBk3z(v2n16Kip(ZqQ6vn2 zVd4PL6ic9dN8u*qLR|?2ejk;DiUm>Oa3BQ_5Fjd$$V3r90v-hrh!m6`8N?BZWC94V zNV8NdCe?v22K(8e^8fx(nTl51XoVaXF{P*y~DwU>Q0PfKwHMpe&U7dpX<>2}th+K;QRR6M$B+AV&?F;`%a|dsPW_HTGQ3=+GZ#2 zmFKU$%;eQqR%omo+Hlq4KQG6cAGSJ%p=?pt2ZoOKR9~%ZNsV^0FD2t54{TkP*g2Se zzLZ{#8O}S`t!KWm3jKC9zb!SPBzj`O3lHsqcI_MOT6rz<3Z4y1jnClBj9(SH^@RzQ zf_Yj^g)08{sD1G_-i9Gj2_0d(6hft49^}0ENakU|DUo;H zYKleWDw`KZYd6NmFSdxj>t5e4AFnL0*%LRj;pn+8mK!pz1cYhD*V>=WJiny9;Z#m$ z%Ce&|A3Kxs64Qn+terQNcQB(>$Ay(Cy(M~6TfGdKVC80TF;})(fi4Mf{8w8@<7HX1_YR~wt2k7iVSP-9dGk*V@BP9gc zDn?*)`s(L2O~miC#yibxo8Koi^=tRus=>bw($fTj{XR(9+SWcV-Z5=)EV+F2Qt$Pe Z@MSkkk2>Pox+Uj-y8Rlvb2eLJ{|7v!{QCd^ delta 636 zcmV-?0)zd^F_Z<6BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D0x3yEK~y+TW1ti;LurD*!NGxvo12?OQc{w|&d%=twQJY@gTxuZ zvIKykp&@TjP|##SK|xKPuRp|||NFhCva&K2B!|}kD=RAjTYp>IQWJKbnBRv_$^8}+ zVc-Yi51eca@BaTjTGZWTgVg|_jm#!SM*l6Xt#2}K-mAj-`5S{uVibd_p9cdE4-doZ z*RL7Aef!2RZ{9o)^e|vDF)?9CNJv<3_MdebXZv&^CSNB8liE@SO*?A_Ha0e}B4AiB zFflPP+`W7E7=H^`1PIK`%ormgA|@;U{2%jw{a!wi6Bih`e*I)6#{(z z{F!0Ff(3`6Tn2_I^^K1=JNW%S%%$-E0+TcxA7hvMzqPsJKQg#?@816z)220n^f8&6 zn==AUI-+~{qKxdJvkbgHeuE7Jf$yx$3@_B>8CXR{z<+#@zpq}s`fS_g%{duaS#=;W z7KUHH7zA!TwB|c_3akhQUh{A;e2fcZ_^%|(@NnNDhU0o#3=bYWSP~T#6$@1Y228(z z#7}OHj}INp7(TPJFudU7WOyFw&A>Rfo8j~8Hw&qsG3251sJl- z|5%vcy>({#%m1e&g@J>Gm4OKuxzAQ@VEC=4`RF|h!;}qk=k}aDc@muR&;dLhtXRJM z`v3jMH5i2i7@h$=`$>qWy`iC@1uBgbpd_S{k`j+UfBx_sJ9cdCsZ*!0+Bnz%0|Nku WTh&E#l5C{_0000 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 FV1i}=P0|1W diff --git a/resources/contenttweaker/textures/items/protein_pill.png b/resources/contenttweaker/textures/items/protein_pill.png index e1c532676c7fb78fff5c741bf954fb984cb8ffaf..646342b0a876fcc626dbbd4fcb88055aa64f9d80 100644 GIT binary patch literal 6156 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 M07*qoM6N<$f;h!QumAu6 diff --git a/resources/contenttweaker/textures/items/vegetable_pill.png b/resources/contenttweaker/textures/items/vegetable_pill.png index 3fc5f524bb1ce6421da8bac0f933592db725e6a1..9950bde51c8ab9dcbed3dfc3c1e534c1283b9575 100644 GIT binary patch literal 6239 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 diff --git a/scripts/do/mithminite_scythe.zs b/scripts/do/mithminite_scythe.zs index d0fa969a8..c0664725a 100644 --- a/scripts/do/mithminite_scythe.zs +++ b/scripts/do/mithminite_scythe.zs @@ -28,6 +28,7 @@ import crafttweaker.entity.AttributeModifier; import mods.randomtweaker.botania.IManaItemHandler; import crafttweaker.liquid.ILiquidDefinition; import crafttweaker.entity.IEntityThrowable; +import crafttweaker.text.ITextComponent; /* "aer" : C Tornado, pulls nearby enemies (motion) @@ -541,6 +542,7 @@ function rattusInsanity(target as IEntityLivingBase) as void{ || !entity.isAlive() || target.id==entity.id || target.getDistanceSqToEntity(entity)>20 + || target.isBoss || entity.y<1) continue; val entityAdd as IEntityLivingBase = entity; @@ -762,8 +764,6 @@ function scytheEffectElemental(scythe as IEntity, target as IEntityLivingBase, p if(augments has "aer") aerTornado(scythe, colorCount[4]); if(augments has "vacuos") vacuosHole(scythe, target, colorCount[0]); #EFFECT ASPECTS - if(augments has "alienis") alienisTeleport(target); - if(augments has "alkimia") alkimiaPotion(target, colorCount[2]); if(augments has "amogus") amogusVent(scythe, target); if(augments has "auram") auramVisAdd(scythe, colorCount[6]); if(augments has "caeles") caelesAstralExp(scythe, colorCount[2]); @@ -780,19 +780,24 @@ function scytheEffectElemental(scythe as IEntity, target as IEntityLivingBase, p if(augments has "instrumentum") instrumentumRepair(player, colorCount[2]); if(augments has "lux") luxLight(target, player); if(augments has "mortuus") mortuusWither(target, colorCount[3]); - if(augments has "motus") motusSwap(scythe, target, player); - if(augments has "mythus") mythusPetrification(target); if(augments has "ordo") ordoWarp(player, colorCount[1]); if(augments has "perditio") perditioWarp(player, colorCount[0]); if(augments has "potentia") potentiaLightning(target, colorCount[1]); if(augments has "rattus") rattusInsanity(target); - if(augments has "spiritus") spiritusHaunted(target, colorCount[1]); if(augments has "tenebrae") tenebraeBlind(target, colorCount[0]); if(augments has "ventus") ventusLaunch(target); if(augments has "vinculum") vinculumTrap(target, colorCount[4]); if(augments has "visum") visumGlow(target,player); if(augments has "volatus") volatusLevitation(target); + if(!target.isBoss){ + if(augments has "alienis") alienisTeleport(target); + if(augments has "alkimia") alkimiaPotion(target, colorCount[2]); + if(augments has "motus") motusSwap(scythe, target, player); + if(augments has "mythus") mythusPetrification(target); + if(augments has "spiritus") spiritusHaunted(target, colorCount[1]); if(augments has "vitreus") vitreusCrystalize(scythe, target, dmg); + } + #PROJECTILES if(augments has "sonus") sonusSplit(scythe, target, colorCount[4]); if(augments has "mana") {if(augments has "rattus") {scytheCreateChaos(scythe, target);} else {manaCreateStar(scythe, target);}} @@ -836,6 +841,11 @@ function getAugments(player as IPlayer) as string[]{ if(lore.length == 0) return result; + if(scripts.mods.thaumadditions.haveLoremError(lore)) { + player.sendRichTextStatusMessage(ITextComponent.fromString("§cYour scythe is too sus! Please check your augments!§r")); + return result; + } + for i in 0 to lore.length { result += scripts.mods.thaumadditions.loreUnColor[lore[i]]; } diff --git a/scripts/mods/thaumadditions.zs b/scripts/mods/thaumadditions.zs index 453b1d291..9a35e832a 100644 --- a/scripts/mods/thaumadditions.zs +++ b/scripts/mods/thaumadditions.zs @@ -5,6 +5,7 @@ import crafttweaker.item.IItemStack; import mods.zenutils.DataUpdateOperation.APPEND; import mods.zenutils.DataUpdateOperation.MERGE; import mods.zenutils.DataUpdateOperation.REMOVE; +import mods.zenutils.DataUpdateOperation.OVERWRITE; mods.thaumcraft.Infusion.removeRecipe(); @@ -1547,29 +1548,70 @@ function calcColor(lore as IData) as int { return r / l * 65536 + g / l * 256 + b / l; } +function haveLoremError(lorem as IData) as bool{ + if(lorem.length==0) return false; + + for i in 0 .. lorem.length{ + if(!(loreUnColor has lorem[i])) return true; + } + + return false; +} + recipes.addShapeless('augmentMithminiteScythe', , [.marked('scythe'), .marked('seal')], function (out, ins, cInfo) { val scythe = ins.scythe; val lorem as IData = (isNull(scythe.tag) || isNull(scythe.tag.display) || isNull(scythe.tag.display.Lore)) ? [] : scythe.tag.display.Lore; - + if(haveLoremError(lorem)) return ; if (lorem.length > 7 || lorem has loreColor[ins.seal.tag.Aspect]) return null; - return scythe.withTag(scythe.tag.deepUpdate({ display: { Lore: [loreColor[ins.seal.tag.Aspect]] } }, APPEND).deepUpdate({ ench: [{ lvl: 1 as short, id: 30 as short }] }, { ench: MERGE }) + { enchantmentColor: calcColor(lorem + [loreColor[ins.seal.tag.Aspect]]) }); + var newTag = scythe.tag; + + newTag = newTag.deepUpdate({ display: { Lore: [loreColor[ins.seal.tag.Aspect]] } }, APPEND) //Add aspect lore + .deepUpdate({ enchantmentColor: calcColor(lorem + [loreColor[ins.seal.tag.Aspect]]) }, {enchantmentColor: OVERWRITE}); //Update enchantment color + + if(lorem.length == 0) newTag += { ench: [{ lvl: 1 as short, id: 30 as short }] }; //Add Shimmer + + return scythe.withTag(newTag); + }, null); //################################################################################# +function removeOnlyShimmer(data as IData) as IData{ + var result as IData = []; + for i in 0 .. data.length{ + if(data[i].id!=30){ + result = result + [data[i]] as IData; + } + } + return result; +} + recipes.addShapeless('REMOVEaugmentMithminiteScythe', , [ .transformNew( function (item) { val lore = item.tag.display.Lore; + if(haveLoremError(lore)) return ; + var newTag = item.tag; + + if(lore.length == 1){ + newTag = newTag.deepUpdate({ display: { Lore: [lore[lore.length - 1]] } }, { display: { Lore: REMOVE } }) + .deepUpdate({ enchantmentColor: 0 }, REMOVE); + if(newTag.ench.length==1) + {newTag -= {ench: []};} + else + {newTag = newTag.deepUpdate({ench: removeOnlyShimmer(newTag.ench)},{ench: OVERWRITE});} + } else { + newTag = newTag.deepUpdate({ display: { Lore: lore.deepUpdate([lore[lore.length - 1]], REMOVE) } }, { display: { Lore: OVERWRITE } }) + .deepUpdate({ enchantmentColor: calcColor(lore.deepUpdate([lore[lore.length - 1]], REMOVE)) },{enchantmentColor: OVERWRITE}); + } + + return item.withTag(newTag); - return lore.length != 1 - ? item.withTag(item.tag.deepUpdate({ display: { Lore: [lore[lore.length - 1]] } }, { display: { Lore: REMOVE } } + { enchantmentColor: calcColor(lore.deepUpdate([lore[lore.length - 1]], REMOVE)) })) - : item.withTag(item.tag.deepUpdate({ display: { Lore: [lore[lore.length - 1]] } }, { display: { Lore: REMOVE } }).deepUpdate({ enchantmentColor: 0 }, REMOVE).deepUpdate({ ench: [{ lvl: 1 as short, id: 30 as short }] }, { ench: REMOVE })); }) .marked('scythe'), ]