themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #1895 from Olink/fix-1890

Browse source 
Fixes #1890.  Added support for two new invasions.
This commit is contained in:
Lucas Nicodemus 2020-05-24 13:45:32 -07:00 • committed by GitHub
commit 2368a55834
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.md
View file

@ -7,10 +7,12 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Fixed /wind command. (@AxeelAnder) * Fixed /wind command. (@AxeelAnder)
* Fixed NPC buff bouncer. (@AxeelAnder) * Fixed NPC buff bouncer. (@AxeelAnder)
* Fixed players are unable to remove an NPC. Change `byte NPCHomeChangeEventArgs.Homeless` to `HouseholdStatus NPCHomeChangeEventArgs.HouseholdStatus`. (@AxeelAnder) * Fixed players are unable to remove an NPC. Change `byte NPCHomeChangeEventArgs.Homeless` to `HouseholdStatus NPCHomeChangeEventArgs.HouseholdStatus`. (@AxeelAnder)
* Fixed lava, wet, honey, and dry bombs; * Fixed lava, wet, honey, and dry bombs;
and lava, wet, honey, and dry grenades; and lava, wet, honey, and dry grenades;
and lava, wet, honey, and dry rockets; and lava, wet, honey, and dry rockets;
and lava, wet, honey, and dry mines. (@Olink) and lava, wet, honey, and dry mines. (@Olink)
* Fix Bloody Tear displaying the wrong text when used. (@Olink)
## TShock 4.4.0 (Pre-release 7 (Entangled)) ## TShock 4.4.0 (Pre-release 7 (Entangled))
* Fixed bed spawn issues when trying to remove spawn point in SSC. (@Olink) * Fixed bed spawn issues when trying to remove spawn point in SSC. (@Olink)

28
TShockAPI/GetDataHandlers.cs
View file

@ -2850,38 +2850,44 @@ namespace TShockAPI
string thing; string thing;
switch (thingType) switch (thingType)
{ {
case -11:
thing = "applied advanced combat techniques";
break;
case -10:
thing = "summoned a Blood Moon";
break;
case -8: case -8:
thing = "a Moon Lord"; thing = "summoned a Moon Lord";
break; break;
case -7: case -7:
thing = "a Martian invasion"; thing = "summoned a Martian invasion";
break; break;
case -6: case -6:
thing = "an eclipse"; thing = "summoned an eclipse";
break; break;
case -5: case -5:
thing = "a frost moon"; thing = "summoned a frost moon";
break; break;
case -4: case -4:
thing = "a pumpkin moon"; thing = "summoned a pumpkin moon";
break; break;
case -3: case -3:
thing = "the Pirates"; thing = "summoned the Pirates";
break; break;
case -2: case -2:
thing = "the Snow Legion"; thing = "summoned the Snow Legion";
break; break;
case -1: case -1:
thing = "a Goblin Invasion"; thing = "summoned a Goblin Invasion";
break; break;
default: default:
thing = String.Format("the {0}", npc.FullName); thing = String.Format("summoned the {0}", npc.FullName);
break; break;
} }
if (TShock.Config.AnonymousBossInvasions) if (TShock.Config.AnonymousBossInvasions)
TShock.Utils.SendLogs(string.Format("{0} summoned {1}!", args.Player.Name, thing), Color.PaleVioletRed, args.Player); TShock.Utils.SendLogs(string.Format("{0} {1}!", args.Player.Name, thing), Color.PaleVioletRed, args.Player);
else else
TShock.Utils.Broadcast(String.Format("{0} summoned {1}!", args.Player.Name, thing), 175, 75, 255); TShock.Utils.Broadcast(String.Format("{0} {1}!", args.Player.Name, thing), 175, 75, 255);
return false; return false;
} }