From 602eb4bcff799392c488a8d6d59d41393e73aace Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Wed, 29 May 2013 14:45:14 -0400 Subject: [PATCH] more mob tweaks, texture tweaks --- .../mod_pocketDim/DungeonGenerator.java | 3 ++- .../mod_pocketDim/mod_pocketDim.java | 2 +- .../mod_pocketDim/ticking/MobObelisk.java | 20 ++++++++++++------ .../textures/blocks/BlockLimbo.png | Bin 3233 -> 3156 bytes .../textures/blocks/BlockLimbo.psd | Bin 24344 -> 24754 bytes .../textures/blocks/BlockLimbo0.png | Bin 3233 -> 3156 bytes 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/StevenDimDoors/mod_pocketDim/DungeonGenerator.java b/StevenDimDoors/mod_pocketDim/DungeonGenerator.java index 3ba08dc..7301860 100644 --- a/StevenDimDoors/mod_pocketDim/DungeonGenerator.java +++ b/StevenDimDoors/mod_pocketDim/DungeonGenerator.java @@ -1,5 +1,6 @@ package StevenDimDoors.mod_pocketDim; +import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; import java.util.Random; @@ -8,7 +9,7 @@ import net.minecraft.world.World; -public class DungeonGenerator +public class DungeonGenerator implements Serializable { public int weight; diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index a520e6f..0be3738 100644 --- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -583,7 +583,7 @@ public class mod_pocketDim this.complexHalls.add(new DungeonGenerator(0, "brokenPillarsO.schematic", true)); this.complexHalls.add(new DungeonGenerator(0, "buggyTopEntry1.schematic", true)); this.complexHalls.add(new DungeonGenerator(0, "exitRuinsWithHiddenDoor.schematic", true)); - this.complexHalls.add(new DungeonGenerator(0, "hallwayHiddenTreasure.schematic", true)); + this.complexHalls.add(new DungeonGenerator(0, "hallwayHiddenTreasure.schematic", false)); this.complexHalls.add(new DungeonGenerator(0, "mediumPillarStairs.schematic", true)); this.complexHalls.add(new DungeonGenerator(0, "ruinsO.schematic", true)); this.complexHalls.add(new DungeonGenerator(0, "pitStairs.schematic", true)); diff --git a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java index 3533003..870586c 100644 --- a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java +++ b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java @@ -120,7 +120,7 @@ public class MobObelisk extends EntityFlying implements IMob - EntityPlayer entityPlayer = this.worldObj.getClosestPlayerToEntity(this, 30); + EntityPlayer entityPlayer = this.worldObj.getClosestPlayerToEntity(this, 35); if(entityPlayer != null) { @@ -141,13 +141,13 @@ public class MobObelisk extends EntityFlying implements IMob } if(aggro<470) { - if(rand.nextInt(11)>this.textureState) + if(rand.nextInt(11)>this.textureState||this.aggro>=300||rand.nextInt(13)>this.textureState) { aggro++; } - if(this.worldObj.provider instanceof pocketProvider) + if(this.worldObj.provider instanceof pocketProvider||this.worldObj.getClosestPlayerToEntity(this, 5)!=null) { aggro++; @@ -185,14 +185,18 @@ public class MobObelisk extends EntityFlying implements IMob dimHelper.instance.teleportToPocket(worldObj, link, entityPlayer); entityPlayer.worldObj.playSoundAtEntity(entityPlayer,"mods.DimensionalDoors.sounds.wylkermaxcrack",13, 1); + if(!(this.worldObj.provider instanceof LimboProvider ||this.worldObj.provider instanceof pocketProvider)) + { + this.setDead(); + } } - if(!(this.worldObj.provider instanceof LimboProvider)) + if(!(this.worldObj.provider instanceof LimboProvider || this.worldObj.getClosestPlayerToEntity(this, 5)!=null)||this.aggro>300) { - for (int i = 0; i < -1+this.textureState/3; ++i) + for (int i = 0; i < -1+this.textureState/2; ++i) { entityPlayer.worldObj.spawnParticle("portal", entityPlayer.posX + (this.rand.nextDouble() - 0.5D) * (double)this.width, entityPlayer.posY + this.rand.nextDouble() * (double)entityPlayer.height - 0.75D, entityPlayer.posZ + (this.rand.nextDouble() - 0.5D) * (double)entityPlayer.width, (this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(), (this.rand.nextDouble() - 0.5D) * 2.0D); } @@ -321,7 +325,11 @@ public class MobObelisk extends EntityFlying implements IMob } public boolean attackEntityFrom(DamageSource par1DamageSource, int par2) { - return false; + if(!(par1DamageSource==DamageSource.inWall)) + { + this.aggro=400; + } + return false; } public void faceEntity(Entity par1Entity, float par2, float par3) { diff --git a/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo.png b/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo.png index e11d7cdfc89ceb74da19334a715054045d189053..e71f8304d976db0e6d6dcbbed86cb1d792ba41b4 100644 GIT binary patch delta 415 zcmV;Q0bu^28PpiCzzTnVNkl{i302vYN zy%7=CT8IdliMs=^)*>P}=djiSz}-3LAR>~P$z7^SMDX+TLu-x9WX@TAGebl;=a8AG zh+t-nG3u4So0)Sm=cMvK~WkjTiq`RlP=NKb_boW%%+5>532~=Hx{4dbn zyO6x^TS8t$s)~rvT4TBN=XstIEHl5T+&CBi4gh&sF+hGp;oblM002ov JPDHLkV1gfS&Q$;a delta 492 zcmVJ9dDcA7qgdC*%!IqE)~XPK zN-4@Y|4N*u>DK`%B>^KoZt(A7R~^u@Eb5qjV@FFV$x10Y&l7hirG%uRaBGd6Gw#lD z97v*+!u$OOAm@J!W~NfgsBC8Aw3O2DM8}%v`Bx5I&5w_d!D?o5cLCbAO)y-G`TqVMtN`n}B8l@n zhYKaKZ5yxG3o~O`7A)ti`@TsjF-;S#HDZjs-*4QV`@UpxcO>!i^MjcIU}m(|AcXMu zQU?61CRhv~H#@SWn*f{a3sj50L#=dAx5aWxV(6^`ex*bzMBq iL(X}ixH~aM{tN(C$t!tq#DJv$0000X#(~6t)i{vy}a3-H#_rv-}|y3cKORbzpjkl`P%N@SX8BA zjg|QUx$(*CZ!VR~2M@=7Jl$D8Io!?O?HxT|{@piGv~@N%y9%HKSG zk|>p0)@#nqH=6bKe7je#)v~mDt=nz2vPN^Nwa{3IFZ_(=o7T&3hPnTC=a-Y|Qg*j` zN*8~IZ}s?ndXiakn@!or&g_|y3v~!%#K>t>i5yZHjmwMY#BU!>y!{wAZk7J&j$5}6 zJ)h6lmZA;@gU7LQ?<)J%?PpJ3=4Y2K##i^>yS_OED(o>hq*4$_VDor89K{7ALpfoi zz==9^uy=tRJ1*KWiBRtYP}mu(A`{dc2~Y}=MqY7p0c6gQvky)T!+ll(63{4+MYs6ssr$Us1EqzC$L{@;ac1P delta 271 zcmdmVka5O7#t8~;K^7KHp1v$B3?RTS!x+WDEUoG;!^FS$t~lQWs@VeHN8nKm;`p2DHTUXfei>ucpX z*@0bT^L$o$md$zGB1QttpTK5wF);iGgUvOz+Kh}0lULXoGcs?!W5+2VX$4fl2*d(V zY{0<43}iCNZT{yc%*1=&o~7UZ-n99zA58M9-z*l$1$W10^`P6Vlh=jDPfm;ootzX_ hKiM?$C~HFh6$!`9|0B0BFHVkTT$~uiI5{!uKLE+5PU-*v diff --git a/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo0.png b/resources/mods/DimensionalDoors/textures/blocks/BlockLimbo0.png index e11d7cdfc89ceb74da19334a715054045d189053..e71f8304d976db0e6d6dcbbed86cb1d792ba41b4 100644 GIT binary patch delta 415 zcmV;Q0bu^28PpiCzzTnVNkl{i302vYN zy%7=CT8IdliMs=^)*>P}=djiSz}-3LAR>~P$z7^SMDX+TLu-x9WX@TAGebl;=a8AG zh+t-nG3u4So0)Sm=cMvK~WkjTiq`RlP=NKb_boW%%+5>532~=Hx{4dbn zyO6x^TS8t$s)~rvT4TBN=XstIEHl5T+&CBi4gh&sF+hGp;oblM002ov JPDHLkV1gfS&Q$;a delta 492 zcmVJ9dDcA7qgdC*%!IqE)~XPK zN-4@Y|4N*u>DK`%B>^KoZt(A7R~^u@Eb5qjV@FFV$x10Y&l7hirG%uRaBGd6Gw#lD z97v*+!u$OOAm@J!W~NfgsBC8Aw3O2DM8}%v`Bx5I&5w_d!D?o5cLCbAO)y-G`TqVMtN`n}B8l@n zhYKaKZ5yxG3o~O`7A)ti`@TsjF-;S#HDZjs-*4QV`@UpxcO>!i^MjcIU}m(|AcXMu zQU?61CRhv~H#@SWn*f{a3sj50L#=dAx5aWxV(6^`ex*bzMBq iL(X}ixH~aM{tN(C$t!tq#DJv$0000