From 81e7df1701e8d5bd8e33ec4024135ab6323220da Mon Sep 17 00:00:00 2001 From: KeyLime17 Date: Wed, 9 Apr 2025 16:09:32 -0400 Subject: [PATCH] Ivory Block rework, Skeletons no longer eat bread --- .../entity/corrupt/CorruptHobbit.java | 3 ++- .../cinder_loe/entity/corrupt/CorruptMan.java | 2 ++ .../entity/corrupt/CorruptSkeleton.java | 8 +++++++- .../entity/corrupt/CorruptSkeletonArcher.java | 6 ------ .../textures/blocks/ivory_block_side_0.png | Bin 2754 -> 608 bytes .../textures/blocks/ivory_block_side_90.png | Bin 140 -> 578 bytes .../lotr/textures/blocks/ivory_block_top.png | Bin 2814 -> 654 bytes 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptHobbit.java b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptHobbit.java index 36021e6..6a57528 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptHobbit.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptHobbit.java @@ -1,5 +1,6 @@ package com.zivilon.cinder_loe.entity.corrupt; +import com.zivilon.cinder_loe.CinderLoE_Config; import lotr.common.LOTRAchievement; import lotr.common.LOTRFoods; import lotr.common.LOTRMod; @@ -58,7 +59,7 @@ public class CorruptHobbit extends LOTREntityHobbitBounder { } @Override public LOTRFaction getFaction() { - return this.faction != null ? this.faction : LOTRFaction.UTUMNO; + return LOTRFaction.valueOf(CinderLoE_Config.corrupt_faction); } @Override protected float getSoundPitch() { diff --git a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptMan.java b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptMan.java index 0a46069..ab2d75b 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptMan.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptMan.java @@ -21,6 +21,8 @@ public class CorruptMan extends LOTREntityGondorMan { public CorruptMan(World world) { super(world); + ((EntityLiving) this).tasks.addTask(6, (EntityAIBase) new LOTREntityAIEat(this, LOTRFoods.ORC, 8000)); + ((EntityLiving) this).tasks.addTask(6, (EntityAIBase) new LOTREntityAIDrink(this, LOTRFoods.ORC_DRINK, 8000)); this.addTargetTasks(true); } @Override diff --git a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeleton.java b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeleton.java index 94777c3..79d2b9c 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeleton.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeleton.java @@ -1,6 +1,7 @@ package com.zivilon.cinder_loe.entity.corrupt; import com.zivilon.cinder_loe.CinderLoE_Config; +import lotr.common.LOTRLevelData; import lotr.common.entity.ai.LOTREntityAIAttackOnCollide; import lotr.common.entity.npc.LOTREntityGondorMan; import lotr.common.entity.npc.LOTRNames; @@ -41,7 +42,12 @@ public class CorruptSkeleton extends CorruptMan { @Override public LOTRFaction getFaction() { - return LOTRFaction.UTUMNO; + if (hiredNPCInfo.getHiringPlayer() != null) { + if (LOTRLevelData.getData(hiredNPCInfo.getHiringPlayer()).getPledgeFaction() != null) { + return LOTRFaction.valueOf(String.valueOf(LOTRLevelData.getData(hiredNPCInfo.getHiringPlayer()).getPledgeFaction())); + } + } + return LOTRFaction.valueOf(CinderLoE_Config.corrupt_faction); } @Override diff --git a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeletonArcher.java b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeletonArcher.java index 58ef61e..a6b7fe5 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeletonArcher.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeletonArcher.java @@ -57,12 +57,6 @@ public class CorruptSkeletonArcher extends CorruptSkeleton { } } - - @Override - public LOTRFaction getFaction() { - return LOTRFaction.UTUMNO; - } - @Override public String getNPCName() { return this.familyInfo.getName(); diff --git a/src/main/resources/assets/lotr/textures/blocks/ivory_block_side_0.png b/src/main/resources/assets/lotr/textures/blocks/ivory_block_side_0.png index e42752862ed0f73129b3a2a3ff17af74b3b07e40..373ac6a1b6e793c45692427d78980687c451505c 100644 GIT binary patch delta 584 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 delta 111 zcmX@a(!)4GC4;5d$uool2x>S|Iv5xjoIPC}Lo9le_tYi6u4m(75LTTfDIp;dv7>@T z!>FN1d_!>o?*{IO8$Z~tu`=f~oSq*)pX~;#eSM8|f_TmEPl*Y!3=Ai(^R%y6_UAUx OI0jEwKbLh*2~7Zt{Uz4` diff --git a/src/main/resources/assets/lotr/textures/blocks/ivory_block_top.png b/src/main/resources/assets/lotr/textures/blocks/ivory_block_top.png index 74ac7de93d609565d36baed1de928a93aef0b26b..72e33ce9d8bb15795be92f0849a186f7e13884b7 100644 GIT binary patch delta 630 zcmV-+0*U?p6^;dvBYyw^b5ch_0olnce*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFT zCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^ z000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2k8U}5;`n>#DB~r0005fNklUM>R{j=D^(>a4VHzu)1GW2dSBs47H+UT%m89t*B&L!W=A4W%*|w8n%;Qc`)rcw%(3Mo5 zm{}*uzCY0COxz7KyNDDnLcbs{3Aus?Rn46F2mrboReuG6s>E;5u2#C;KsOs5wLqt$HDG|E+^g?%I=2!${?6^DC#k#By zGmUX2GH=WRy}V!^myBJQ$N9nIlt>iS)1~X}nWi|ljaY7|o&%_y_}Jg5E+Q7z*Dse6 z4Slv|<{+ocFCT?t+pq|#n|Zw9a~=TPo?foXk9GEVzsgU~FJvai_7l4K11d@*@M@{z QumAu607*qoM6N<$f?q@uEdT%j delta 2807 zcmVf6Xi@@54ZTQ_E-Enz5K6$103tR-RB%L5k){YTDBysjLy@r}iiH7D zvFijGMAUI`6dRUFWUU$Bym{}n6@-c&M->OB3XhmR+Dq`EL(i`nPm?-^D=}y8Ow9d z;$`sU+$ZCWIe!wqjFDg&7v~80xiY>cV}o=_hCs$| zGJ-ARc>v%@$zSl&FIdda6Uz_9&dgda5+tXH875p)hK-XGi{a1DP3Mcn%rFi&jU(bQ z*qIqw9N}^RX3zXt6nSkKvLZX!I5{{lZ7prSDAa#l{C}I0_jZd|Vn*3Spb<2KHgFhp zfn(q_I0r6)%U}fD0a7pyo`5Ov3d}$dgoVfu6;g+EAVbI;vV~ZX8{`88LlICMln5n5 zLP!D?K>Y--nTj(fs8oB@tL${z&XcGDrdIuvg38ukXun}wpvtUm+2#$mo z!GFo{GB_VDg15kxa07f0?u1Xnm*5dt3O|9T5r7a8I--j(5f;KmLXmhR2@xTykP@T< zX+YYL9;6?+ib#>C$XgT!MMW`COq2`C9~Fh-qL!gnp*EwcQ3p_+s6NzH)F^5S^$|@* zYog83&gcMiEIJvTi!Mf2pqtPg=(Fe%^nW<|6$XQ$V~jD57=KJ0CKa;+vl+7+(~dcX z8ODrZrm<$p&MEX9c8L*Y@1DEla9C}UKFs!wH8xzu&kM(SDW zI1NKHrUlSaX{EGpXoIvV6^e?TO0-IzN{z~K6)7E|8_@&k>GU%CVfuCYJ5?=JPgTC^ zCe=38E2^*6=BRn7@zqMy+SNwX-l;Rxebm#`x2boj-_t;8m}!J-LZ@rEqJ6o12AhW&=Gjf{@^*$g(bH%l?AF&i?6%^l1I=DW>@EzlND7D9^#iyKT5)03IQY-NsG z(k+863oW}WpII4L#anH&>bLr6ZEu}!-DrKshGG+FQ)ts;^Q*0yEq~Xx#`fA=@?77! ztLJvleQsxN$G6*KchjC~A7a13zSsVPgQJ7Uq0M2^(ZDg$vDWbhi^d9LZDyT!LOXdm zt#&%*^w!zIS?qk+`4<^t4d)BzcZGt`fY9xs_ri?BmW6#EjtLJ7uL*w`VG~gh(SN^yx?stImIbdOy&}sZ z??jnINuqkA6{8cPo1V8I2F~=-fTgudr?_nHF76Ya2X6;& zlJCkd=T9WLCV!PDJxX>>-kv;};+|5G@>IYUR12P``lr^VzD^5G+n@F+Jtn<91DBDQ zaa2eVrV0BpwKMZFhqKJHinFB4oR{rfHYExYHDyEDi?X}LG}+J8fW$Z{}{k_?699m0x|@lC)*8%%N=0R?Jr6*6Z8cw;d=~F3&F?+a9vL za|dHb$$yTQJD2RdP+?b5w~Me#vP)VST-jY^P_?z{eRWFpNR3xbd#z^errOuLdAqOd z@z~Q=r&U*4_inFX@6CF@`pyQUhKhZdeL4FcHbyu0f6e;3xk;m`wCTfs;eP3Xhy#7i zj?K+2nk{9maI2(s@?gTj%inl^)7{2wt8b^bmwz4tha`s{f1CL2^}|7jdylY=w0&pz zU2O-oqofn+T;4g=mC_~cj_V#i8hEs~$EBy^d&}?lAJaWnb6n+k*$Kjlq7$D^=AWEC zm38Xr>EzR6y-RxUoQXYituMT9@NCf8^XGieo$2@NKY8Bu{ILtp7mi+JUF^E#aH(^^ zet)3j2m2p71|0@Fha88xFFRfC8J;(M;)?r~(^tK(p1T%s?b68nk>Tr6*KgiPxFNmC zyZPu=`mN`;b8gSvS#uYCx8$DEy^8yq_ZxmR{jpu@AU!_nJv#7U!Gk+v+_5J=W&iYk zyyzkMVa0^bMDrutN5>|8Coex<_;~zD)_;?kr^P=j|6Kdbc>FRj6+1QlT=e|Y zubW?}zu5oM?q%VJ1 zz-)f~;t@$2MJ42@