SteamWar/FightSystem
Archiviert
13
1

Merge pull request 'Move Spawnoffset to GameMode config' (#394) from spawnoffset into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Reviewed-on: #394
Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>
Dieser Commit ist enthalten in:
Lixfel 2023-08-19 11:26:41 +02:00
Commit 19d12df834
2 geänderte Dateien mit 8 neuen und 8 gelöschten Zeilen

Datei anzeigen

@ -37,6 +37,11 @@ Arena:
Schem2Border: Schem2Border:
x: 24 # defaults to 24 if missing x: 24 # defaults to 24 if missing
z: 24 # defaults to 24 if missing z: 24 # defaults to 24 if missing
# The offset the teams spawn relative to the center of their area
SpawnOffset:
x: 0 # defaults to 0 if missing
y: 0 # defaults to Schematic.Size.y if missing
z: 0 # defaults to 0 if missing
# The size of the team areas are expanded around the schematics # The size of the team areas are expanded around the schematics
BorderFromSchematic: 12 # defaults to 12 if missing BorderFromSchematic: 12 # defaults to 12 if missing
# If ground walkable, teams can walk below the lower arena border during setup # If ground walkable, teams can walk below the lower arena border during setup
@ -165,8 +170,3 @@ Techhider:
# x: 0 # defaults to 0 if missing # x: 0 # defaults to 0 if missing
# y: 0 # defaults to 0 if missing # y: 0 # defaults to 0 if missing
# z: 0 # defaults to Schematic.Size.z + 50 if missing # z: 0 # defaults to Schematic.Size.z + 50 if missing
# # The offset the teams spawn relative to the center of their area
# SpawnOffset:
# x: 0 # defaults to 0 if missing
# y: 0 # defaults to Schematic.Size.y if missing
# z: 0 # defaults to 0 if missing

Datei anzeigen

@ -227,9 +227,9 @@ public class Config {
BlueToRedX = worldconfig.getInt("BlueToRed.x", 0); BlueToRedX = worldconfig.getInt("BlueToRed.x", 0);
BlueToRedY = worldconfig.getInt("BlueToRed.y", 0); BlueToRedY = worldconfig.getInt("BlueToRed.y", 0);
BlueToRedZ = worldconfig.getInt("BlueToRed.z", schemsizeZ + 50); BlueToRedZ = worldconfig.getInt("BlueToRed.z", schemsizeZ + 50);
double teamBlueSpawnOffsetX = worldconfig.getDouble("SpawnOffset.x", 0); double teamBlueSpawnOffsetX = config.getDouble("Arena.SpawnOffset.x", 0);
double teamBlueSpawnOffsetY = worldconfig.getDouble("SpawnOffset.y", schemsizeY); double teamBlueSpawnOffsetY = config.getDouble("Arena.SpawnOffset.y", schemsizeY);
double teamBlueSpawnOffsetZ = worldconfig.getDouble("SpawnOffset.z", 0); double teamBlueSpawnOffsetZ = config.getDouble("Arena.SpawnOffset.z", 0);
int teamRedCornerX = BlueToRedX + blueCornerX; int teamRedCornerX = BlueToRedX + blueCornerX;
int teamRedCornerY = BlueToRedY + blueCornerY; int teamRedCornerY = BlueToRedY + blueCornerY;