From 9ce1d5e4640360c4903b0ca762dff0c02a137e68 Mon Sep 17 00:00:00 2001 From: Nekololizu Date: Thu, 11 Jun 2020 02:27:19 +0200 Subject: [PATCH] Changed Fishing folder structure --- .vs/NekoTweakMod/v16/.suo | Bin 93184 -> 90112 bytes Fishing/AddModdedCrateToForest.cs | 4 ++-- Fishing/{ => Items}/AddItemToCrate.cs | 2 +- Fishing/{ => Items}/FishingRods.cs | 2 +- Fishing/{ => Items}/ForestCrate.cs | 4 ++-- Fishing/{ => Items}/ForestCrate.png | Bin Fishing/{ => Tiles}/ForestCratePlaced.cs | 4 ++-- Fishing/{ => Tiles}/ForestCratePlaced.png | Bin ...NekoTweakMod.csprojAssemblyReference.cache | Bin 424 -> 424 bytes 9 files changed, 8 insertions(+), 8 deletions(-) rename Fishing/{ => Items}/AddItemToCrate.cs (99%) rename Fishing/{ => Items}/FishingRods.cs (96%) rename Fishing/{ => Items}/ForestCrate.cs (91%) rename Fishing/{ => Items}/ForestCrate.png (100%) rename Fishing/{ => Tiles}/ForestCratePlaced.cs (89%) rename Fishing/{ => Tiles}/ForestCratePlaced.png (100%) diff --git a/.vs/NekoTweakMod/v16/.suo b/.vs/NekoTweakMod/v16/.suo index 58fe12c8feebe660e713a510c7fa7bc8d5845b18..c9d1ad395c5d09191c7fe1dea7ed3ed75ce6d1ed 100644 GIT binary patch delta 6222 zcmds53s_Xw5#CvLadCkzZ^A>@1r!u;Q9x9b6%fHF0-|Dq%7$GO<)Q4Z5sdb)HZFuCSSfDzJKS; zoOACzcg}xi=F<3)vawCMAw9@nCX*=$x4OEzNXUQ?&{FsZnrDOO0Mg5pxYT2!N=@Au0+t!IsF$l6DoEKmoPMZz68=UvcQ+;J{IC#` zY~zau6Ye2o5W)y-A5Sut;75og#1r^FCX!wRo}(q1Ku{5e68aK;CX+SDW>JS1m`WH( zNFod&j3DrZnNA4j zC5)xcy@Wx8DF|L64HKxBM+hQJBupZ((z&54Tw!ZesI8QnDC3B2_yB|Ga(gP8=T!7|CtG?-5KS2W;jxiJkA z3CjsCOG8(en+9x{LId}A54xuG@1Zj>TvnGG-F=o!43=)s#gRTovIY0J&Pe@vgg$Hw z=NZo(ddL$W7|9E28a?gW*F$q4Lc0>yX*!ZA9tT6A2pWYBqMN+HAw4d0UR~i0_F$b;=YJ09iZr2ZD1eBRd~>dds*uHi0IP(Vb`oE)CK4iYFNO)%;B! z2WKAxMJ2D0J#D4exJe4@;x-f&sbg>Rv?ExjGSY;(Jjw0p6q@uM-pGqX$Lu1{y`;$j zZ|23KL#tD9*k>xZXR9~!Y%)+2_Qb-2!jTGy_v?If#ppMDA5&k2$A0t5vzPP4wJy3i z3XY2}bs&@8=lZutZnf)d$nEp2;E%R>U7$o;WrG+)xwfH(UDfrpEA=(20p7)?u#CNi zGk}IGi(O96+cfd1Nrz%`{lkURSDNI{@uJiwT9C81 z5Z_-LkA`(g{i*WTOMl#(N4Yy=$Fti$SUvmECk(kQdisZFHwYmuEQ3O~MQ;Qbx8j@Ck3 z)v`pUk>8|Rk=?ZY+NsQLkpgfYk3Mg}qb_anv`b;WsPjL5`AVptw_GiTV zM)bcNg=^Z!+28iXhdw@rhF84M@O+#7qQan|Ww<|2_{fUsRr*;c>GXLbb7$1`)PJ0? zQ5wVSrSoF;ON#sA1EjYQ4icP%Lj=maL*d|oM(|J2rzQ_e8?H}DP92fF9Aw$-gc^Hb zmKSg-Hh|!cG-wT+;wAGZ3)io1t2;yU<4is6l%a!~?TywSCMSApiMiM5dE9W%^&#Za zAgAGA8`lCtQ3g<9aO;f88%%X zyIBqf;bjj{3-@|J3UoM+&RPwMo*4$Ma|(WptR@zT?i?s)H8BV31`Wiw?g-Q zZ`m-lZthy+vwYeV96f|a4=^13(%{NFVA7QU8 zo}7|EEKf@qnQE$-;PvU}n}ykf&dizo`G*@ureo*HL4BFgSp@HlR`7-{56W&mGe^p> z%>SRvvET>I8BV{gBjIj&qVp#a-?w9P``Ft;uaG$kw5?h#bSPCdb4x3&=4uPRbu|YT zAY7Ocl*f8$PHi1k4q0_Zt2wdU!Xx7yS0JRe_(8LA0j0IloJz|)Dk@6F>G->Av-|Sb z6n|M|pP`t#MQN?9GF#C2(HKX^e)R&JWe>I5#dAqZ@eK}}3G`O0k zt(&oA=#DLWE`@u6Y;I}q+YaazXl(yH?z40J#UOe|1Py#~Ab=dFypwU)P`WRc2LJoW z$F=C@!EhG75SpT3m-~Bx-fOh*X$*|{&*OySOAs=LLY+|N3mQBU6WV%U2&|9`hkRgn zuk@~gG5m=AST#Se_3K2K2nWA1fLPkfEvL9p73^_P)%s*UYzE<&0S06IrQ-il+=;r| zE}BX!Br3U>cp`G3Kgh=Q&eRIjUr+3{uZITlzoTS#a?#DqqFR$hqHfqfYW0oprFal! z9i1RX&CA!MsA;aVl$y*nHI*c4%WZc=%|$Qifr4cOfG2K>9^1NP6tsb$^MiG$P4#cx zt^-Paci+za-@hq7{2#*iDI|}g`fZwUxdgUh{D|Pzi|J6%NAMpC4%dE70)MX;4Up!E zbyrNS+h>DGDHwbp6JrHv@EX)UM4z?Fbza zPA#av8!4FFlKJ$jHt@NK7h0-U7>P`#&Td|VsP$6SH O1o5|(`-x3K5czlbXZfc9 delta 5684 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 diff --git a/Fishing/AddModdedCrateToForest.cs b/Fishing/AddModdedCrateToForest.cs index 30a9a96..870ca63 100644 --- a/Fishing/AddModdedCrateToForest.cs +++ b/Fishing/AddModdedCrateToForest.cs @@ -28,12 +28,12 @@ public override void CatchFish(Item fishingRod, Item bait, int power, int liquid // Main.rand.Next(1) == 0) is the catch % chance to catch the Crate // n/100 chance or 1 = 100% { - caughtType = ItemType(); + caughtType = ItemType(); } { if (liquidType == 2 && Main.rand.Next(1) == 0) // if prehardmode { - caughtType = ItemType(); + caughtType = ItemType(); } } } diff --git a/Fishing/AddItemToCrate.cs b/Fishing/Items/AddItemToCrate.cs similarity index 99% rename from Fishing/AddItemToCrate.cs rename to Fishing/Items/AddItemToCrate.cs index 8dc2fa7..0feb47f 100644 --- a/Fishing/AddItemToCrate.cs +++ b/Fishing/Items/AddItemToCrate.cs @@ -2,7 +2,7 @@ using Terraria; using Terraria.ModLoader; -namespace NekoTweakMod.Fishing +namespace NekoTweakMod.Fishing.Items { public class AddItemToCrate : GlobalItem { diff --git a/Fishing/FishingRods.cs b/Fishing/Items/FishingRods.cs similarity index 96% rename from Fishing/FishingRods.cs rename to Fishing/Items/FishingRods.cs index cf6bc78..c9dbbd3 100644 --- a/Fishing/FishingRods.cs +++ b/Fishing/Items/FishingRods.cs @@ -2,7 +2,7 @@ using Terraria; using Terraria.ModLoader; -namespace NekoTweakMod.Fishing +namespace NekoTweakMod.Fishing.Items { public class FishingRods : GlobalItem // class name & vanilla hook { diff --git a/Fishing/ForestCrate.cs b/Fishing/Items/ForestCrate.cs similarity index 91% rename from Fishing/ForestCrate.cs rename to Fishing/Items/ForestCrate.cs index 0ed81c1..6c3af1f 100644 --- a/Fishing/ForestCrate.cs +++ b/Fishing/Items/ForestCrate.cs @@ -3,7 +3,7 @@ using static Terraria.ModLoader.ModContent; using Terraria; -namespace NekoTweakMod.Fishing // where this file is located in the mods folders +namespace NekoTweakMod.Fishing.Items // where this file is located in the mods folders { public class ForestCrate : ModItem // Here we are setting up the crate as an item while in the players inventory, and making it so it creates a tile when placed { @@ -25,7 +25,7 @@ public override void SetDefaults() item.consumable = true; // if doing something with the item consumes/removes it item.value = Item.sellPrice(0, 1, 0, 0); ; // sets the sale/purchase value of the item ( plat,gold,silver,copper) item.rare = ItemRarityID.Green; // sets the rarity of the item - item.createTile = TileType(); // where the class is located in the namespace, where file is located in the mod folders~ + item.createTile = TileType(); // where the class is located in the namespace, where file is located in the mod folders~ // for NekoTweakMod this is located in the Tiles folder } public override bool CanRightClick() diff --git a/Fishing/ForestCrate.png b/Fishing/Items/ForestCrate.png similarity index 100% rename from Fishing/ForestCrate.png rename to Fishing/Items/ForestCrate.png diff --git a/Fishing/ForestCratePlaced.cs b/Fishing/Tiles/ForestCratePlaced.cs similarity index 89% rename from Fishing/ForestCratePlaced.cs rename to Fishing/Tiles/ForestCratePlaced.cs index 1219bee..241c248 100644 --- a/Fishing/ForestCratePlaced.cs +++ b/Fishing/Tiles/ForestCratePlaced.cs @@ -5,7 +5,7 @@ using static Terraria.ModLoader.ModContent; -namespace NekoTweakMod.Fishing // // where this file is located in the mods folders +namespace NekoTweakMod.Fishing.Tiles // // where this file is located in the mods folders { public class ForestCratePlaced : ModTile // Here we are setting up everything for the tile while the item is placed { @@ -29,7 +29,7 @@ public override void SetDefaults() } public override void KillMultiTile(int i, int j, int frameX, int frameY) // makes it possible to set/change what happens when a tile break { - Item.NewItem(i * 16, j * 16, 32, 16, ItemType()); // where the class is located in the namespace, where file is located in the mod folders~ + Item.NewItem(i * 16, j * 16, 32, 16, ItemType()); // where the class is located in the namespace, where file is located in the mod folders~ } } } diff --git a/Fishing/ForestCratePlaced.png b/Fishing/Tiles/ForestCratePlaced.png similarity index 100% rename from Fishing/ForestCratePlaced.png rename to Fishing/Tiles/ForestCratePlaced.png diff --git a/obj/Debug/net45/NekoTweakMod.csprojAssemblyReference.cache b/obj/Debug/net45/NekoTweakMod.csprojAssemblyReference.cache index 548e28df48d92f881f0b89adadf5460b641865c2..c15212c63a2a04202ad75990e0e10c4285b487fd 100644 GIT binary patch delta 13 UcmZ3%yn=ayKO^I`$pMTJ03S#MDgXcg delta 13 UcmZ3%yn=ayKO