PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-01-19 18:14:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix ugd03 GUIDs + Sanctuary repair silos (#500)

Browse source 
* Allow zone owned terminals to be used (e.g. repair silos in sanctuaries)

* Zone owned repair silos for Sanctuaries

* GUID fix for ugd03
This commit is contained in:
Mazo 2020-06-25 04:03:12 +01:00 committed by GitHub
parent 6aa8f627db
commit 7af8961864
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 421 additions and 358 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pslogin/src/main/scala/WorldSessionActor.scala
View file

@ -5183,7 +5183,7 @@ class WorldSessionActor extends Actor
CancelZoningProcessWithDescriptiveReason("cancel_use")
terminal.Actor ! CommonMessages.Use(player, Some(item))
case None if terminal.Faction == player.Faction || terminal.HackedBy.nonEmpty =>
case None if terminal.Owner == Building.NoBuilding || terminal.Faction == player.Faction || terminal.HackedBy.nonEmpty =>
val tdef = terminal.Definition
if(tdef.isInstanceOf[MatrixTerminalDefinition]) {
//TODO matrix spawn point; for now, just blindly bind to show work (and hope nothing breaks)

17
pslogin/src/main/scala/zonemaps/Map11.scala
View file

@ -1451,6 +1451,23 @@ object Map11 { // HOME1 (NEW CONGLOMORATE SANCTUARY)
LocalBuilding("WG_NCSanc_to_Esamir", 94, 3, FoundationBuilder(WarpGate.Structure(Vector3(5174f, 3174f, 56.06128f))))
}
ZoneOwnedObjects()
def ZoneOwnedObjects(): Unit = {
LocalObject(4, ProximityTerminal.Constructor(Vector3(2215.26f, 5474.73f, 65.38f), repair_silo), owning_building_guid = 0)
LocalObject(5, Terminal.Constructor(Vector3(2215.26f, 5474.73f, 65.38f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(8, ProximityTerminal.Constructor(Vector3(2300.3f, 5585.29f, 65.29f), repair_silo), owning_building_guid = 0)
LocalObject(9, Terminal.Constructor(Vector3(2300.3f, 5585.29f, 65.29f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(12, ProximityTerminal.Constructor(Vector3(4109.72f, 6006.86f, 44.07f), repair_silo), owning_building_guid = 0)
LocalObject(13, Terminal.Constructor(Vector3(4109.72f, 6006.86f, 44.07f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(16, ProximityTerminal.Constructor(Vector3(4194.53f, 6116.86f, 44.19f), repair_silo), owning_building_guid = 0)
LocalObject(17, Terminal.Constructor(Vector3(4194.53f, 6116.86f, 44.19f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(20, ProximityTerminal.Constructor(Vector3(4800.67f, 3580.72f, 68.85f), repair_silo), owning_building_guid = 0)
LocalObject(21, Terminal.Constructor(Vector3(4800.67f, 3580.72f, 68.85f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(24, ProximityTerminal.Constructor(Vector3(4820.75f, 3442.89f, 68.87f), repair_silo), owning_building_guid = 0)
LocalObject(25, Terminal.Constructor(Vector3(4820.75f, 3442.89f, 68.87f), ground_rearm_terminal), owning_building_guid = 0)
}
def Lattice(): Unit = {
}

29
pslogin/src/main/scala/zonemaps/Map12.scala
View file

@ -1340,6 +1340,35 @@ object Map12 { // HOME2 (TERRAN REPUBLIC SANCTUARY)
LocalBuilding("WG_TRSanc_to_Forseral", 115, 2, FoundationBuilder(WarpGate.Structure(Vector3(5300f, 4504f, 40.2132f))))
}
ZoneOwnedObjects()
def ZoneOwnedObjects(): Unit = {
LocalObject(4, ProximityTerminal.Constructor(Vector3(2880.28f, 5166.25f, 36.19f), repair_silo), owning_building_guid = 0)
LocalObject(5, Terminal.Constructor(Vector3(2880.28f, 5166.25f, 36.19f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(8, ProximityTerminal.Constructor(Vector3(2880.72f, 5277.02f, 36.17f), repair_silo), owning_building_guid = 0)
LocalObject(9, Terminal.Constructor(Vector3(2880.72f, 5277.02f, 36.17f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(12, ProximityTerminal.Constructor(Vector3(2963.38f, 5277.73f, 36.19f), repair_silo), owning_building_guid = 0)
LocalObject(13, Terminal.Constructor(Vector3(2963.38f, 5277.73f, 36.19f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(16, ProximityTerminal.Constructor(Vector3(2963.61f, 5166.41f, 36.09f), repair_silo), owning_building_guid = 0)
LocalObject(17, Terminal.Constructor(Vector3(2963.61f, 5166.41f, 36.09f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(20, ProximityTerminal.Constructor(Vector3(2964.83f, 2920.37f, 35.08f), repair_silo), owning_building_guid = 0)
LocalObject(21, Terminal.Constructor(Vector3(2964.83f, 2920.37f, 35.08f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(24, ProximityTerminal.Constructor(Vector3(2964.89f, 3031.69f, 35.04f), repair_silo), owning_building_guid = 0)
LocalObject(25, Terminal.Constructor(Vector3(2964.89f, 3031.69f, 35.04f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(28, ProximityTerminal.Constructor(Vector3(3047.44f, 3031.66f, 35.03f), repair_silo), owning_building_guid = 0)
LocalObject(29, Terminal.Constructor(Vector3(3047.44f, 3031.66f, 35.03f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(32, ProximityTerminal.Constructor(Vector3(3048.11f, 2920.91f, 35.08f), repair_silo), owning_building_guid = 0)
LocalObject(33, Terminal.Constructor(Vector3(3048.11f, 2920.91f, 35.08f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(36, ProximityTerminal.Constructor(Vector3(5190.58f, 3955.38f, 36.01f), repair_silo), owning_building_guid = 0)
LocalObject(37, Terminal.Constructor(Vector3(5190.58f, 3955.38f, 36.01f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(40, ProximityTerminal.Constructor(Vector3(5190.87f, 3843.73f, 36.08f), repair_silo), owning_building_guid = 0)
LocalObject(41, Terminal.Constructor(Vector3(5190.87f, 3843.73f, 36.08f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(44, ProximityTerminal.Constructor(Vector3(5273.65f, 3955.55f, 36.09f), repair_silo), owning_building_guid = 0)
LocalObject(45, Terminal.Constructor(Vector3(5273.65f, 3955.55f, 36.09f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(48, ProximityTerminal.Constructor(Vector3(5273.88f, 3844.68f, 36.02f), repair_silo), owning_building_guid = 0)
LocalObject(49, Terminal.Constructor(Vector3(5273.88f, 3844.68f, 36.02f), ground_rearm_terminal), owning_building_guid = 0)
}
def Lattice(): Unit = {
}

17
pslogin/src/main/scala/zonemaps/Map13.scala
View file

@ -1340,6 +1340,23 @@ object Map13 { // HOME3 (VANU SOVREIGNTY SANCTUARY)
LocalBuilding("WG_VSSanc_to_Hossin", 91, 2, FoundationBuilder(WarpGate.Structure(Vector3(5656f, 4868f, 97.27775f))))
}
ZoneOwnedObjects()
def ZoneOwnedObjects(): Unit = {
LocalObject(4, ProximityTerminal.Constructor(Vector3(2936.77f, 4897.82f, 56.28f), repair_silo), owning_building_guid = 0)
LocalObject(5, Terminal.Constructor(Vector3(2936.77f, 4897.82f, 56.28f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(8, ProximityTerminal.Constructor(Vector3(3019.16f, 4897.24f, 56.23f), repair_silo), owning_building_guid = 0)
LocalObject(9, Terminal.Constructor(Vector3(3019.16f, 4897.24f, 56.23f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(12, ProximityTerminal.Constructor(Vector3(3646.24f, 2871.09f, 91.04f), repair_silo), owning_building_guid = 0)
LocalObject(13, Terminal.Constructor(Vector3(3646.24f, 2871.09f, 91.04f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(16, ProximityTerminal.Constructor(Vector3(3729.31f, 2871.99f, 91.01f), repair_silo), owning_building_guid = 0)
LocalObject(17, Terminal.Constructor(Vector3(3729.31f, 2871.99f, 91.01f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(20, ProximityTerminal.Constructor(Vector3(5568.43f, 4301.41f, 103.4f), repair_silo), owning_building_guid = 0)
LocalObject(21, Terminal.Constructor(Vector3(5568.43f, 4301.41f, 103.4f), ground_rearm_terminal), owning_building_guid = 0)
LocalObject(24, ProximityTerminal.Constructor(Vector3(5651.46f, 4301.03f, 103.41f), repair_silo), owning_building_guid = 0)
LocalObject(25, Terminal.Constructor(Vector3(5651.46f, 4301.03f, 103.41f), ground_rearm_terminal), owning_building_guid = 0)
}
def Lattice(): Unit = {
}

714
pslogin/src/main/scala/zonemaps/Ugd03.scala
View file

File diff suppressed because it is too large Load diff