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

Fix description in config for chatoverheads, as well as fix handling of health/mana item usage for SSC

Browse source
This commit is contained in:
Zack Piispanen 2013-10-07 22:41:37 -04:00
parent 01263424ae
commit fe00e3a195
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/ConfigFile.cs
View file

@ -169,7 +169,7 @@ namespace TShockAPI
"Changes ingame chat format: {0} = Group Name, {1} = Group Prefix, {2} = Player Name, {3} = Group Suffix, {4} = Chat Message" "Changes ingame chat format: {0} = Group Name, {1} = Group Prefix, {2} = Player Name, {3} = Group Suffix, {4} = Chat Message"
)] public string ChatFormat = "{1}{2}{3}: {4}"; )] public string ChatFormat = "{1}{2}{3}: {4}";
[Description("Change the player name when using chat above heads. This begins with a player name wrapped in brackets, as per Terraria's formatting. Same formatting as ChatFormat(minus the text).")] public string ChatAboveHeadsFormat = "{2}"; [Description("Change the player name when using chat above heads. This begins with a player name wrapped in brackets, as per Terraria's formatting. Same formatting as ChatFormat(minus the text aka {4}).")] public string ChatAboveHeadsFormat = "{2}";
[Description("Force the world time to be normal, day, or night.")] public string ForceTime = "normal"; [Description("Force the world time to be normal, day, or night.")] public string ForceTime = "normal";

6
TShockAPI/GetDataHandlers.cs
View file

@ -2242,19 +2242,19 @@ namespace TShockAPI
args.TPlayer.inventory[item].name), Color.Red); args.TPlayer.inventory[item].name), Color.Red);
} }
if (args.TPlayer.inventory[item].name == "Mana Crystal" && args.Player.PlayerData.maxMana <= 180) if (args.TPlayer.inventory[item].name == "Mana Crystal" && args.Player.TPlayer.statManaMax <= 180)
{ {
args.Player.TPlayer.statMana += 20; args.Player.TPlayer.statMana += 20;
args.Player.TPlayer.statManaMax += 20; args.Player.TPlayer.statManaMax += 20;
args.Player.PlayerData.maxMana += 20; args.Player.PlayerData.maxMana += 20;
} }
else if (args.TPlayer.inventory[item].name == "Life Crystal" && args.Player.PlayerData.maxHealth <= 380) else if (args.TPlayer.inventory[item].name == "Life Crystal" && args.Player.TPlayer.statLifeMax <= 380)
{ {
args.TPlayer.statLife += 20; args.TPlayer.statLife += 20;
args.TPlayer.statLifeMax += 20; args.TPlayer.statLifeMax += 20;
args.Player.PlayerData.maxHealth += 20; args.Player.PlayerData.maxHealth += 20;
} }
else if (args.TPlayer.inventory[item].name == "Life Fruit" && args.Player.PlayerData.maxHealth >= 400) else if (args.TPlayer.inventory[item].name == "Life Fruit" && args.Player.TPlayer.statLifeMax >= 400 && args.Player.TPlayer.statLifeMax <= 480)
{ {
args.TPlayer.statLife += 5; args.TPlayer.statLife += 5;
args.TPlayer.statLifeMax += 5; args.TPlayer.statLifeMax += 5;