From bc978f177be6cd6dd1b5858d65d3e13ba1e4eee4 Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie Date: Mon, 26 May 2025 07:17:26 -0400 Subject: [PATCH 1/3] normal minus bfr --- .../resources/overrides/game_objects0.adb.lst | 9 ++ .../overrides/game_objects31.adb.lst | 98 ------------------- .../containable/ContainableBehavior.scala | 4 +- 3 files changed, 11 insertions(+), 100 deletions(-) diff --git a/server/src/main/resources/overrides/game_objects0.adb.lst b/server/src/main/resources/overrides/game_objects0.adb.lst index 5e08278e5..d476e61a9 100644 --- a/server/src/main/resources/overrides/game_objects0.adb.lst +++ b/server/src/main/resources/overrides/game_objects0.adb.lst @@ -96,3 +96,12 @@ add_property suppressor holstertime 600 add_property trek equiptime 500 add_property trek holstertime 500 add_property vulture requirement_award0 false +add_property aphelion allowed false +add_property aphelion_flight allowed false +add_property aphelion_gunner allowed false +add_property colossus allowed false +add_property colossus_flight allowed false +add_property colossus_gunner allowed false +add_property peregrine allowed false +add_property peregrine_flight allowed false +add_property peregrine_gunner allowed false diff --git a/server/src/main/resources/overrides/game_objects31.adb.lst b/server/src/main/resources/overrides/game_objects31.adb.lst index d0101a6eb..86dcd92ee 100644 --- a/server/src/main/resources/overrides/game_objects31.adb.lst +++ b/server/src/main/resources/overrides/game_objects31.adb.lst @@ -156,101 +156,3 @@ add_property portable_order_terminal forsale_six_shooter ordertype_weapon add_property portable_order_terminal forsale_six_shooter_ammo add_property portable_order_terminal forsale_winchester ordertype_weapon add_property portable_order_terminal forsale_winchester_ammo -add_property bullet_105mm purchase_empire all -add_property bullet_150mm purchase_empire all -add_property bullet_15mm purchase_empire all -add_property anniversary_gun purchase_empire all -add_property anniversary_guna purchase_empire all -add_property anniversary_gunb purchase_empire all -add_property apc_nc purchase_empire all -add_property apc_tr purchase_empire all -add_property apc_vs purchase_empire all -add_property aphelion purchase_empire all -add_property aphelion_flight purchase_empire all -add_property aphelion_gunner purchase_empire all -add_property aphelion_armor_siphon purchase_empire all -add_property aphelion_immolation_cannon purchase_empire all -add_property aphelion_immolation_cannon_ammo purchase_empire all -add_property aphelion_laser purchase_empire all -add_property aphelion_laser_ammo purchase_empire all -add_property aphelion_ntu_siphon purchase_empire all -add_property aphelion_plasma_rocket_ammo purchase_empire all -add_property aphelion_plasma_rocket_pod purchase_empire all -add_property aphelion_ppa purchase_empire all -add_property aphelion_ppa_ammo purchase_empire all -add_property aphelion_starfire purchase_empire all -add_property aphelion_starfire_ammo purchase_empire all -add_property aurora purchase_empire all -add_property battlewagon purchase_empire all -add_property beamer purchase_empire all -add_property burster_ammo purchase_empire all -add_property colossus purchase_empire all -add_property colossus_flight purchase_empire all -add_property colossus_gunner purchase_empire all -add_property colossus_100mm_cannon_ammo purchase_empire all -add_property colossus_armor_siphon purchase_empire all -add_property colossus_burster purchase_empire all -add_property colossus_burster_ammo purchase_empire all -add_property colossus_chaingun purchase_empire all -add_property colossus_chaingun_ammo purchase_empire all -add_property colossus_cluster_bomb_ammo purchase_empire all -add_property colossus_cluster_bomb_pod purchase_empire all -add_property colossus_dual_100mm_cannons purchase_empire all -add_property colossus_ntu_siphon purchase_empire all -add_property colossus_tank_cannon purchase_empire all -add_property colossus_tank_cannon_ammo purchase_empire all -add_property comet_ammo purchase_empire all -add_property cycler purchase_empire all -add_property cycler_v2 purchase_empire all -add_property cycler_v3 purchase_empire all -add_property cycler_v4 purchase_empire all -add_property dualcycler_ammo purchase_empire all -add_property energy_cell purchase_empire all -add_property falcon_ammo purchase_empire all -add_property firebird_missile purchase_empire all -add_property flux_cannon_thresher_battery purchase_empire all -add_property fluxpod_ammo purchase_empire all -add_property gauss purchase_empire all -add_property gauss_cannon_ammo purchase_empire all -add_property heavy_rail_beam_battery purchase_empire all -add_property hunter_seeker_missile purchase_empire all -add_property hunterseeker purchase_empire all -add_property isp purchase_empire all -add_property lancer purchase_empire all -add_property lancer_cartridge purchase_empire all -add_property lasher purchase_empire all -add_property magrider purchase_empire all -add_property mini_chaingun purchase_empire all -add_property peregrine purchase_empire all -add_property peregrine_flight purchase_empire all -add_property peregrine_gunner purchase_empire all -add_property peregrine_armor_siphon purchase_empire all -add_property peregrine_dual_machine_gun purchase_empire all -add_property peregrine_dual_machine_gun_ammo purchase_empire all -add_property peregrine_dual_rocket_pods purchase_empire all -add_property peregrine_mechhammer purchase_empire all -add_property peregrine_mechhammer_ammo purchase_empire all -add_property peregrine_ntu_siphon purchase_empire all -add_property peregrine_particle_cannon purchase_empire all -add_property peregrine_particle_cannon_ammo purchase_empire all -add_property peregrine_rocket_pod_ammo purchase_empire all -add_property peregrine_sparrow purchase_empire all -add_property peregrine_sparrow_ammo purchase_empire all -add_property phoenix_missile purchase_empire all -add_property pounder_ammo purchase_empire all -add_property prowler purchase_empire all -add_property pulsar purchase_empire all -add_property pulse_battery purchase_empire all -add_property quasar_ammo purchase_empire all -add_property r_shotgun purchase_empire all -add_property repeater purchase_empire all -add_property scattercannon_ammo purchase_empire all -add_property sparrow_ammo purchase_empire all -add_property starfire_ammo purchase_empire all -add_property striker purchase_empire all -add_property striker_missile_ammo purchase_empire all -add_property threemanheavybuggy purchase_empire all -add_property thunderer purchase_empire all -add_property twomanheavybuggy purchase_empire all -add_property twomanhoverbuggy purchase_empire all -add_property vanguard purchase_empire all diff --git a/src/main/scala/net/psforever/objects/serverobject/containable/ContainableBehavior.scala b/src/main/scala/net/psforever/objects/serverobject/containable/ContainableBehavior.scala index 04ffa27a0..d3680de99 100644 --- a/src/main/scala/net/psforever/objects/serverobject/containable/ContainableBehavior.scala +++ b/src/main/scala/net/psforever/objects/serverobject/containable/ContainableBehavior.scala @@ -678,8 +678,8 @@ object ContainableBehavior { val faction = GlobalDefinitions.isFactionEquipment(objDef) GlobalDefinitions.isCavernEquipment(objDef) || objDef == GlobalDefinitions.router_telepad || - entry.obj.isInstanceOf[BoomerTrigger] /*|| - (faction != tplayer.Faction && faction != PlanetSideEmpire.NEUTRAL)*/ + entry.obj.isInstanceOf[BoomerTrigger] || + (faction != tplayer.Faction && faction != PlanetSideEmpire.NEUTRAL) } } From a1b7fe01ff4eb266a54723fd258582df60ac8688 Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie Date: Mon, 26 May 2025 17:54:39 -0400 Subject: [PATCH 2/3] sideness check --- .../net/psforever/objects/avatar/interaction/WithEntrance.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/net/psforever/objects/avatar/interaction/WithEntrance.scala b/src/main/scala/net/psforever/objects/avatar/interaction/WithEntrance.scala index 8263b7627..9064efb16 100644 --- a/src/main/scala/net/psforever/objects/avatar/interaction/WithEntrance.scala +++ b/src/main/scala/net/psforever/objects/avatar/interaction/WithEntrance.scala @@ -65,7 +65,7 @@ class WithEntrance() obj: InteractsWithZone, door: Door ): Sidedness = { - //debugInteriorCheck(obj, door) + debugInteriorCheck(obj, door) strictInteriorCheck(obj, door) } From 2f2fcd94f15c1e9d9762491f8d0e5c865f678677 Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie Date: Mon, 26 May 2025 21:01:22 -0400 Subject: [PATCH 3/3] force spit sideness --- .../psforever/actors/session/normal/GeneralLogic.scala | 8 +++++++- .../objects/avatar/interaction/WithEntrance.scala | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala b/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala index 3a84a4324..32e9bc6c2 100644 --- a/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala +++ b/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala @@ -18,6 +18,7 @@ import net.psforever.objects.serverobject.affinity.FactionAffinity import net.psforever.objects.serverobject.containable.Containable import net.psforever.objects.serverobject.doors.Door import net.psforever.objects.serverobject.generator.Generator +import net.psforever.objects.serverobject.interior.Sidedness.OutsideOf import net.psforever.objects.serverobject.llu.CaptureFlag import net.psforever.objects.serverobject.locks.IFFLock import net.psforever.objects.serverobject.mblocker.Locker @@ -406,7 +407,12 @@ class GeneralLogic(val ops: GeneralOperations, implicit val context: ActorContex } log.info(s"${player.Name} is constructing a $ammoType deployable") sessionLogic.zoning.CancelZoningProcessWithDescriptiveReason("cancel_use") - ops.handleDeployObject(continent, ammoType, pos, orient, player.WhichSide, player.Faction, player, obj) + if (obj.AmmoType == DeployedItem.spitfire_turret || obj.AmmoType == DeployedItem.spitfire_cloaked) { + ops.handleDeployObject(continent, ammoType, pos, orient, OutsideOf, player.Faction, player, obj) + } + else { + ops.handleDeployObject(continent, ammoType, pos, orient, player.WhichSide, player.Faction, player, obj) + } case Some(obj) => log.warn(s"DeployObject: what is $obj, ${player.Name}? It's not a construction tool!") case None => diff --git a/src/main/scala/net/psforever/objects/avatar/interaction/WithEntrance.scala b/src/main/scala/net/psforever/objects/avatar/interaction/WithEntrance.scala index 9064efb16..8263b7627 100644 --- a/src/main/scala/net/psforever/objects/avatar/interaction/WithEntrance.scala +++ b/src/main/scala/net/psforever/objects/avatar/interaction/WithEntrance.scala @@ -65,7 +65,7 @@ class WithEntrance() obj: InteractsWithZone, door: Door ): Sidedness = { - debugInteriorCheck(obj, door) + //debugInteriorCheck(obj, door) strictInteriorCheck(obj, door) }