vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

REFACTOR SOON

Browse Source
This commit is contained in:
Evil Factory
2021-02-15 11:11:59 -03:00
parent 585a629c6f
commit 318333f466
3 changed files with 97 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs
View File

@@ -15,8 +15,7 @@ namespace Barotrauma
public Script lua;
public Hook hook;
public bool overrideTraitors = false;
public Game game;
public void DoString(string code)
{
@@ -91,6 +90,11 @@ namespace Barotrauma
GameMain.Server.SetClientCharacter(client, character);
}
public static void SetCharacterTeam(Character character, int team)
{
character.TeamID = (CharacterTeamType)team;
}
public static void Kick(Client client, string reason="")
{
GameMain.Server.KickClient(client.Connection, reason);
@@ -115,10 +119,14 @@ namespace Barotrauma
}
}
private class Game
public class Game
{
LuaSetup env;
public bool overrideTraitors = false;
public bool overrideRespawnSub = false;
public Game(LuaSetup e)
{
env = e;
@@ -145,7 +153,12 @@ namespace Barotrauma
public void OverrideTraitors(bool o)
{
env.overrideTraitors = o;
overrideTraitors = o;
}
public void OverrideRespawnSub(bool o)
{
overrideRespawnSub = o;
}
public static void Log(string message, int type)
@@ -158,11 +171,51 @@ namespace Barotrauma
new Explosion(range, force, damage, structureDamage, itemDamage, empStrength, ballastFloraStrength).Explode(pos, null);
}
public static string Spawn(string name, Vector2 pos)
public static Character Spawn(string name, Vector2 worldPos)
{
string error;
DebugConsole.SpawnCharacter(new string[] {name, "cursor"}, pos, out error);
return error;
Character spawnedCharacter = null;
Vector2 spawnPosition = worldPos;
string characterLowerCase = name.ToLowerInvariant();
JobPrefab job = null;
if (!JobPrefab.Prefabs.ContainsKey(characterLowerCase))
{
job = JobPrefab.Prefabs.Find(jp => jp.Name != null && jp.Name.Equals(characterLowerCase, StringComparison.OrdinalIgnoreCase));
}
else
{
job = JobPrefab.Prefabs[characterLowerCase];
}
bool human = job != null || characterLowerCase == CharacterPrefab.HumanSpeciesName;
if (string.IsNullOrWhiteSpace(name)) { return null; }
if (human)
{
var variant = job != null ? Rand.Range(0, job.Variants, Rand.RandSync.Server) : 0;
CharacterInfo characterInfo = new CharacterInfo(CharacterPrefab.HumanSpeciesName, jobPrefab: job, variant: variant);
spawnedCharacter = Character.Create(characterInfo, spawnPosition, ToolBox.RandomSeed(8));
if (GameMain.GameSession != null)
{
//TODO: a way to select which team to spawn to?
spawnedCharacter.TeamID = Character.Controlled != null ? Character.Controlled.TeamID : CharacterTeamType.Team1;
#if CLIENT
GameMain.GameSession.CrewManager.AddCharacter(spawnedCharacter);
#endif
}
spawnedCharacter.GiveJobItems(null);
spawnedCharacter.Info.StartItemsGiven = true;
}
else
{
if (CharacterPrefab.FindBySpeciesName(name) != null)
{
Character.Create(name, spawnPosition, ToolBox.RandomSeed(8));
}
}
return spawnedCharacter;
}
public static string SpawnItem(string name, Vector2 pos, bool inventory = false, Character character=null)
@@ -171,6 +224,16 @@ namespace Barotrauma
DebugConsole.SpawnItem(new string[] { name, inventory ? "inventory" : "cursor" }, pos, character, out error);
return error;
}
public static Submarine GetRespawnSub()
{
return GameMain.Server.RespawnManager.RespawnShuttle;
}
public static void DispatchRespawnSub()
{
GameMain.Server.RespawnManager.DispatchShuttle();
}
}
@@ -297,8 +360,13 @@ namespace Barotrauma
LuaScriptLoader luaScriptLoader = new LuaScriptLoader();
LuaCustomConverters.RegisterAll();
// GameMain.Server.RespawnManager.RespawnShuttle.SetPosition();
//UserData.RegisterAssembly();
UserData.RegisterType<Character>();
UserData.RegisterType<Submarine>();
UserData.RegisterType<Client>();
UserData.RegisterType<Player>();
UserData.RegisterType<Hook>();
@@ -314,9 +382,10 @@ namespace Barotrauma
lua.Options.ScriptLoader = luaScriptLoader;
hook = new Hook(lua);
game = new Game(this);
lua.Globals["Player"] = new Player();
lua.Globals["Game"] = new Game(this);
lua.Globals["Game"] = game;
lua.Globals["Hook"] = hook;
lua.Globals["Random"] = new LuaRandom();
lua.Globals["Timer"] = new LuaTimer(this);

2
Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs
View File

@@ -2395,7 +2395,7 @@ namespace Barotrauma.Networking
{
if (!(GameMain.GameSession?.GameMode is CampaignMode))
{
if (!GameMain.Lua.overrideTraitors)
if (!GameMain.Lua.game.overrideTraitors)
{
TraitorManager = new TraitorManager();
TraitorManager.Start(this);

21
Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs
View File

@@ -84,6 +84,10 @@ namespace Barotrauma.Networking
private bool ShouldStartRespawnCountdown(int characterToRespawnCount)
{
if (GameMain.Lua.game.overrideRespawnSub)
{
characterToRespawnCount = 0;
}
int totalCharacterCount = GameMain.Server.ConnectedClients.Count;
return (float)characterToRespawnCount >= Math.Max((float)totalCharacterCount * GameMain.Server.ServerSettings.MinRespawnRatio, 1.0f);
}
@@ -125,11 +129,18 @@ namespace Barotrauma.Networking
}
}
private void DispatchShuttle()
public void DispatchShuttle()
{
if (RespawnShuttle != null)
{
CurrentState = State.Transporting;
if (GameMain.Lua.game.overrideRespawnSub)
{
CurrentState = State.Waiting;
}
else
{
CurrentState = State.Transporting;
}
GameMain.Server.CreateEntityEvent(this);
ResetShuttle();
@@ -142,7 +153,11 @@ namespace Barotrauma.Networking
GameServer.Log("Dispatching the respawn shuttle.", ServerLog.MessageType.Spawning);
Vector2 spawnPos = FindSpawnPos();
RespawnCharacters(spawnPos);
if (!GameMain.Lua.game.overrideRespawnSub)
{
RespawnCharacters(spawnPos);
}
CoroutineManager.StopCoroutines("forcepos");
if (spawnPos.Y > Level.Loaded.Size.Y)