Skip to content

Commit

Permalink
Update to Rocket 3.9.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zamirathe
Zamirathe committed May 9, 2015
1 parent cd0945f commit d760115
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 23 deletions.
17 changes: 8 additions & 9 deletions Uconomy_Extension/CommandApay.cs
View file
Expand Up @@ -30,32 +30,31 @@ public string Help
return "Allows an allowed person to pay someone else not using their own currency.";
}
}
public void Execute(RocketPlayer playerid, string msg)
public void Execute(RocketPlayer playerid, string[] msg)
{
string message;
if (string.IsNullOrEmpty(msg))
if (msg.Length == 0)
{
message = Uconomy_Essentials.Instance.Translate("apay_usage_msg", new object[] {});
// We are going to print how to use
RocketChatManager.Say(playerid, message);
return;
}
string[] command = Parser.getComponentsFromSerial(msg, '/');
if (command.Length != 2)
if (msg.Length != 2)
{
message = Uconomy_Essentials.Instance.Translate("apay_usage_msg", new object[] { });
// Print how to use
RocketChatManager.Say(playerid, message);
return;
}
RocketPlayer rp = RocketPlayer.FromName(command[0]);
RocketPlayer rp = RocketPlayer.FromName(msg[0]);
if (rp == null)
{
ulong id;
ulong.TryParse(command[0], out id);
ulong.TryParse(msg[0], out id);
if (!((CSteamID)id).IsValid())
{
message = Uconomy_Essentials.Instance.Translate("not_valid_player_msg", new object[] {command[0]});
message = Uconomy_Essentials.Instance.Translate("not_valid_player_msg", new object[] {msg[0]});
RocketChatManager.Say(playerid, message);
return;
}
Expand All @@ -66,10 +65,10 @@ public void Execute(RocketPlayer playerid, string msg)

}
uint amt;
uint.TryParse(command[1], out amt);
uint.TryParse(msg[1], out amt);
if (amt <= 0)
{
message = Uconomy_Essentials.Instance.Translate("not_valid_amount", new object[] { command[1] });
message = Uconomy_Essentials.Instance.Translate("not_valid_amount", new object[] { msg[1] });
RocketChatManager.Say(playerid, message);
return;
}
Expand Down
19 changes: 9 additions & 10 deletions Uconomy_Extension/CommandExchange.cs
View file
Expand Up @@ -30,29 +30,28 @@ public string Help
return "Exchanges experience for economy currency.";
}
}
public void Execute(RocketPlayer playerid, string amt)
public void Execute(RocketPlayer playerid, string[] amt)
{
string message;
if (string.IsNullOrEmpty(amt))
if (amt.Length == 0)
{
message = Uconomy_Essentials.Instance.Translate("exchange_usage_msg", new object[] { });
RocketChatManager.Say(playerid, message);
return;
}
string[] components0 = Parser.getComponentsFromSerial(amt, '/');
if (components0.Length > 2)
if (amt.Length > 2)
{
message = Uconomy_Essentials.Instance.Translate("exchange_usage_msg", new object[] { });
RocketChatManager.Say(playerid, message);
return;
}
if (!Uconomy_Essentials.Instance.Configuration.ExpExchange && components0.Length == 1)
if (!Uconomy_Essentials.Instance.Configuration.ExpExchange && amt.Length == 1)
{
message = Uconomy_Essentials.Instance.Translate("experience_exchange_not_available", new object[] { });
RocketChatManager.Say(playerid, message);
return;
}
if (!Uconomy_Essentials.Instance.Configuration.MoneyExchange && components0.Length == 2)
if (!Uconomy_Essentials.Instance.Configuration.MoneyExchange && amt.Length == 2)
{
message = Uconomy_Essentials.Instance.Translate("money_exchange_not_available", new object[] { });
RocketChatManager.Say(playerid, message);
Expand All @@ -61,28 +60,28 @@ public void Execute(RocketPlayer playerid, string amt)
// Get expereience balance first
uint exp = playerid.Experience;
uint examt = 0;
UInt32.TryParse(components0[0], out examt);
UInt32.TryParse(amt[0], out examt);
if (examt <= 0)
{
message = Uconomy_Essentials.Instance.Translate("exchange_zero_amount_error", new object[] { });
RocketChatManager.Say(playerid, message);
return;
}
if (exp < examt && components0.Length == 1)
if (exp < examt && amt.Length == 1)
{
message = Uconomy_Essentials.Instance.Translate("exchange_insufficient_experience", new object[] { examt.ToString() });
RocketChatManager.Say(playerid, message);
return;
}
// Get balance first
decimal bal = Uconomy.Instance.Database.GetBalance(playerid.CSteamID);
if (components0.Length > 1 && bal < examt)
if (amt.Length > 1 && bal < examt)
{
message = Uconomy_Essentials.Instance.Translate("exchange_insufficient_money", new object[] { examt.ToString(), Uconomy.Instance.Configuration.MoneyName });
RocketChatManager.Say(playerid, message);
return;
}
switch (components0.Length)
switch (amt.Length)
{
case 1:
decimal gain = (decimal)((float)examt * Uconomy_Essentials.Instance.Configuration.ExpExchangerate);
Expand Down
4 changes: 2 additions & 2 deletions Uconomy_Extension/Properties/AssemblyInfo.cs
View file
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0.1")]
[assembly: AssemblyFileVersion("1.2.0.1")]
[assembly: AssemblyVersion("1.2.0.2")]
[assembly: AssemblyFileVersion("1.2.0.2")]
4 changes: 2 additions & 2 deletions Uconomy_Extension/Uconomy_Essentials.cs
View file
Expand Up @@ -89,11 +89,11 @@ public class Uconomy_Essentials : RocketPlugin<UconomyEConfiguration>
},
{
"apay_usage_msg",
"Usage: /apay <player name or id>/<amt>"
"Usage: /apay <player name or id> <amt>"
},
{
"exchange_usage_msg",
"Usage: /exchange <amount>[/money] (including /money will exchange money to xp otherwise defaults xp to money)"
"Usage: /exchange <amount>[ money] (including money will exchange money to xp otherwise defaults xp to money)"
},
{
"not_valid_player_msg",
Expand Down

0 comments on commit d760115

Please sign in to comment.