AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-26 14:54:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move /os weather to more logical /os env weather.

Browse Source
This commit is contained in:
UnknownShadow200 2016-03-27 23:28:34 +11:00
parent effafece44
commit f227631255
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Commands/CmdOverseer.cs
View File

@ -70,16 +70,6 @@ namespace MCGalaxy.Commands
Command.all.Find("setspawn").Use(p, ""); Command.all.Find("setspawn").Use(p, "");
} else if (cmd == "PRESET") { } else if (cmd == "PRESET") {
Command.all.Find("env").Use(p, "l preset " + arg); Command.all.Find("env").Use(p, "l preset " + arg);
} else if (cmd == "WEATHER") {
if (arg == "SUN" || arg == "NORMAL") {
Command.all.Find("env").Use(p, "l weather 0");
} else if (arg == "RAIN") {
Command.all.Find("env").Use(p, "l weather 1");
} else if (arg == "SNOW") {
Command.all.Find("env").Use(p, "l weather 2");
} else {
Player.SendMessage(p, "/os weather [sun/rain/snow/normal] -- Changes the weather of your map.");
}
} else if (cmd == "ENV") { } else if (cmd == "ENV") {
HandleEnvCommand(p, arg, arg2); HandleEnvCommand(p, arg, arg2);
} else if (cmd == "MAP") { } else if (cmd == "MAP") {
@ -147,12 +137,23 @@ namespace MCGalaxy.Commands
} else if (type == "BORDER") { } else if (type == "BORDER") {
string block = value == "" ? "normal" : value; string block = value == "" ? "normal" : value;
Command.all.Find("env").Use(p, "l border " + block); Command.all.Find("env").Use(p, "l border " + block);
} else if (type == "WEATHER") {
if (value == "SUN" || value == "NORMAL") {
Command.all.Find("env").Use(p, "weather 0");
} else if (value == "RAIN") {
Command.all.Find("env").Use(p, "weather 1");
} else if (value == "SNOW") {
Command.all.Find("env").Use(p, "weather 2");
} else {
Player.SendMessage(p, "/os env weather [sun/rain/snow/normal] -- Changes the weather of your map.");
}
} else { } else {
Player.SendMessage(p, "/os env [fog/cloud/sky/shadow/sun] [hex color code] -- Changes env colors of your map"); Player.SendMessage(p, "/os env [fog/cloud/sky/shadow/sun] [hex color code] -- Changes env colors of your map");
Player.SendMessage(p, "/os env level -- Sets the water height of your map"); Player.SendMessage(p, "/os env level -- Sets the water height of your map");
Player.SendMessage(p, "/os env horizon -- Sets what block the \"ocean\" shows outside your map"); Player.SendMessage(p, "/os env horizon -- Sets what block the \"ocean\" shows outside your map");
Player.SendMessage(p, "/os env border -- Sets what block replaces the bedrock below sea level in your map"); Player.SendMessage(p, "/os env border -- Sets what block replaces the bedrock below sea level in your map");
Player.SendMessage(p, " Warning: Air,Shrub,Glass,Flowers,Mushroom,Rope,Fire cannot be used for horizon/bedrock."); Player.SendMessage(p, "/os env weather [sun/rain/snow/normal] -- Changes the weather of your map.");
Player.SendMessage(p, " Warning: Shrub,Flowers,Mushroom,Rope,Fire cannot be used for horizon/bedrock.");
Player.SendMessage(p, " Note: If no hex or block is given, the default will be used."); Player.SendMessage(p, " Note: If no hex or block is given, the default will be used.");
} }
} }
@ -381,7 +382,7 @@ namespace MCGalaxy.Commands
Player.SendMessage(p, "/os [command string] - sends command to The Overseer"); Player.SendMessage(p, "/os [command string] - sends command to The Overseer");
Player.SendMessage(p, "Accepted commands:"); Player.SendMessage(p, "Accepted commands:");
Player.SendMessage(p, "go, map, spawn, zone, kick, kickall, env, " + Player.SendMessage(p, "go, map, spawn, zone, kick, kickall, env, " +
"weather, preset, levelblock/lb"); "preset, levelblock/lb");
} }
} }
} }

2
Games/ZombieSurvival/ZombieGame.Core.cs
View File

@ -288,7 +288,7 @@ namespace MCGalaxy.Games {
} else if (alive.Length == 0) { } else if (alive.Length == 0) {
money = rand.Next(1, 5 + pl.playersInfected); money = rand.Next(1, 5 + pl.playersInfected);
} else if (alive.Length == 1 && !pl.infected) { } else if (alive.Length == 1 && !pl.infected) {
money = rand.Next(5, 15); money = rand.Next(5, 10);
} else if (alive.Length > 1 && !pl.infected) { } else if (alive.Length > 1 && !pl.infected) {
money = rand.Next(2, 6); money = rand.Next(2, 6);
} }