Skip to content
This repository was archived by the owner on Nov 7, 2023. It is now read-only.

Commit 679db1d

Browse files
committed
Terraria 1.3.4.3 update.
1 parent 89a0cfd commit 679db1d

9 files changed

Lines changed: 115 additions & 22 deletions

File tree

Plugin Common Library.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@
127127
</Reference>
128128
<Reference Include="MySql.Data, Version=6.9.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
129129
<HintPath>..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll</HintPath>
130-
<Private>False</Private>
130+
<Private>True</Private>
131131
</Reference>
132132
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
133133
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
134-
<Private>False</Private>
134+
<Private>True</Private>
135135
</Reference>
136136
<Reference Include="System" />
137137
<Reference Include="System.Core" />
@@ -260,6 +260,7 @@
260260
</ProjectReference>
261261
</ItemGroup>
262262
<ItemGroup>
263+
<None Include="app.config" />
263264
<None Include="packages.config" />
264265
</ItemGroup>
265266
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

TerrariaNpcs.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ public IEnumerable<int> EnumerateShopNPCIndexes() {
5959
}
6060

6161
public bool Spawn(int npcType, DPoint location, out int npcIndex, int lifeOverride = 0, int valueOverride = -1, bool noDrops = false) {
62-
// Thread static.
63-
if (Main.rand == null)
64-
Main.rand = new Random();
65-
6662
npcIndex = NPC.NewNPC(location.X, location.Y, npcType);
6763
if (npcIndex == Main.npc.Length) {
6864
npcIndex = -1;

TerrariaTiles.cs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ public void PlaceObject(
8181
DPoint objectSize = this.GetObjectSize(objectType);
8282
DPoint textureTileSize = this.GetBlockTextureTileSize(objectType);
8383

84-
// WorldGen.genRand is thread static.
85-
if (WorldGen.genRand == null)
86-
WorldGen.genRand = new Random();
87-
8884
for (int x = 0; x < objectSize.X; x++) {
8985
for (int y = 0; y < objectSize.Y; y++) {
9086
Tile objectTile;
@@ -137,10 +133,6 @@ public void SetBlock(DPoint tileLocation, BlockType blockType, bool localOnly =
137133
tile.active(false);
138134
}
139135

140-
// WorldGen.genRand is thread static.
141-
if (WorldGen.genRand == null)
142-
WorldGen.genRand = new Random();
143-
144136
if (squareFrame)
145137
WorldGen.SquareTileFrame(tileLocation.X, tileLocation.Y, true);
146138
if (!localOnly)
@@ -156,10 +148,6 @@ public void RemoveBlock(DPoint tileLocation, bool squareFrames = true, bool loca
156148
tile.frameY = -1;
157149
tile.frameNumber(0);
158150

159-
// WorldGen.genRand is thread static.
160-
if (WorldGen.genRand == null)
161-
WorldGen.genRand = new Random();
162-
163151
if (squareFrames)
164152
WorldGen.SquareTileFrame(tileLocation.X, tileLocation.Y);
165153
if (!localOnly)
@@ -1460,7 +1448,12 @@ public IEnumerable<Tile> EnumerateTilesRectangularAroundPoint(DPoint tileLocatio
14601448
new DPoint(1, 1), // SnowFallBlock = 459
14611449
new DPoint(1, 1), // SnowCloud = 460
14621450
new DPoint(1, 1), // SandDrip = 461
1463-
new DPoint(2, 1), // DjinnLamp = 46
1451+
new DPoint(2, 1), // DjinnLamp = 462
1452+
// 1.3.4
1453+
new DPoint(3, 4), // DefendersForge = 463
1454+
new DPoint(5, 4), // WarTable = 464
1455+
new DPoint(2, 3), // WarTableBanner = 465
1456+
new DPoint(5, 3) // ElderCrystalStand = 466
14641457
};
14651458
});
14661459
public DPoint GetObjectSize(BlockType objectType) {

_Enums and Structs/BlockType.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,11 @@ public enum BlockType {
469469
SnowFallBlock = 459,
470470
SnowCloud = 460,
471471
SandDrip = 461,
472-
DjinnLamp = 462
472+
DjinnLamp = 462,
473+
// 1.3.4
474+
DefendersForge = 463,
475+
WarTable = 464,
476+
WarTableBanner = 465,
477+
ElderCrystalStand = 466
473478
}
474479
}

_Enums and Structs/InvasionType.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ public enum InvasionType {
77
FrostLegion,
88
Pirate,
99
Pumpkin,
10-
Frost
10+
Frost,
11+
Martians
1112
}
1213
}

_Enums and Structs/ItemType.cs

Lines changed: 89 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3806,6 +3806,94 @@ public enum ItemType: short {
38063806
TumbleweedBanner = 3793,
38073807
AncientCloth = 3794,
38083808
DjinnLamp = 3795,
3809-
MusicBoxSandstorm = 3796
3809+
MusicBoxSandstorm = 3796,
3810+
// 1.3.4
3811+
ApprenticeHat = 3797,
3812+
ApprenticeRobe = 3798,
3813+
ApprenticeTrousers = 3799,
3814+
SquireGreatHelm = 3800,
3815+
SquirePlating = 3801,
3816+
SquireGreaves = 3802,
3817+
HuntressWig = 3803,
3818+
HuntressJerkin = 3804,
3819+
HuntressPants = 3805,
3820+
MonkBrows = 3806,
3821+
MonkShirt = 3807,
3822+
MonkPants = 3808,
3823+
ApprenticeScarf = 3809,
3824+
SquireShield = 3810,
3825+
HuntressBuckler = 3811,
3826+
MonkBelt = 3812,
3827+
DefendersForge = 3813,
3828+
WarTable = 3814,
3829+
WarTableBanner = 3815,
3830+
DD2ElderCrystalStand = 3816,
3831+
DefenderMedal = 3817,
3832+
DD2FlameBurstTowerT1Popper = 3818,
3833+
DD2FlameBurstTowerT2Popper = 3819,
3834+
DD2FlameBurstTowerT3Popper = 3820,
3835+
AleThrowingGlove = 3821,
3836+
DD2EnergyCrystal = 3822,
3837+
DD2SquireDemonSword = 3823,
3838+
DD2BallistraTowerT1Popper = 3824,
3839+
DD2BallistraTowerT2Popper = 3825,
3840+
DD2BallistraTowerT3Popper = 3826,
3841+
DD2SquireBetsySword = 3827,
3842+
DD2ElderCrystal = 3828,
3843+
DD2LightningAuraT1Popper = 3829,
3844+
DD2LightningAuraT2Popper = 3830,
3845+
DD2LightningAuraT3Popper = 3831,
3846+
DD2ExplosiveTrapT1Popper = 3832,
3847+
DD2ExplosiveTrapT2Popper = 3833,
3848+
DD2ExplosiveTrapT3Popper = 3834,
3849+
MonkStaffT1 = 3835,
3850+
MonkStaffT2 = 3836,
3851+
DD2GoblinBomberBanner = 3837,
3852+
DD2GoblinBanner = 3838,
3853+
DD2SkeletonBanner = 3839,
3854+
DD2DrakinBanner = 3840,
3855+
DD2KoboldFlyerBanner = 3841,
3856+
DD2KoboldBanner = 3842,
3857+
DD2WitherBeastBanner = 3843,
3858+
DD2WyvernBanner = 3844,
3859+
DD2JavelinThrowerBanner = 3845,
3860+
DD2LightningBugBanner = 3846,
3861+
OgreMask = 3847,
3862+
GoblinMask = 3848,
3863+
GoblinBomberCap = 3849,
3864+
EtherianJavelin = 3850,
3865+
KoboldDynamiteBackpack = 3851,
3866+
BookStaff = 3852,
3867+
BoringBow = 3853,
3868+
DD2PhoenixBow = 3854,
3869+
DD2PetGato = 3855,
3870+
DD2PetGhost = 3856,
3871+
DD2PetDragon = 3857,
3872+
MonkStaffT3 = 3858,
3873+
DD2BetsyBow = 3859,
3874+
BossBagBetsy = 3860,
3875+
BossBagOgre = 3861,
3876+
BossBagDarkMage = 3862,
3877+
BossMaskBetsy = 3863,
3878+
BossMaskDarkMage = 3864,
3879+
BossMaskOgre = 3865,
3880+
BossTrophyBetsy = 3866,
3881+
BossTrophyDarkmage = 3867,
3882+
BossTrophyOgre = 3868,
3883+
MusicBoxDD2 = 3869,
3884+
ApprenticeStaffT3 = 3870,
3885+
SquireAltHead = 3871,
3886+
SquireAltShirt = 3872,
3887+
SquireAltPants = 3873,
3888+
ApprenticeAltHead = 3874,
3889+
ApprenticeAltShirt = 3875,
3890+
ApprenticeAltPants = 3876,
3891+
HuntressAltHead = 3877,
3892+
HuntressAltShirt = 3878,
3893+
HuntressAltPants = 3879,
3894+
MonkAltHead = 3880,
3895+
MonkAltShirt = 3881,
3896+
MonkAltPants = 3882,
3897+
BetsyWings = 3883,
38103898
}
38113899
}

app.config

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<system.data>
4+
<DbProviderFactories>
5+
<remove invariant="MySql.Data.MySqlClient" />
6+
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
7+
</DbProviderFactories>
8+
</system.data>
9+
</configuration>
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)