commit 7edd2fef1f63e86f66c6a988ebcdaaa522be42d0
parent b581bb012cddfc5ac20d2ba94ed461c68c01f304
Author: NovaBryan <29001820+NovaBryan@users.noreply.github.com>
Date: Thu, 15 Oct 2026 13:31:45 +0000
Auto-dump EVE code: 24.01.3619879 (20261015_3619879_code)
Diffstat:
10 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/README.md b/README.md
@@ -8,6 +8,7 @@ A timeline of all version captures and synchronizations is documented here:
| Update Date | Target Version Tag | Version | Notes |
| :--- | :--- | :--- | :--- |
+| **2026-10-15** | `eve-24_01_3619879` | 24.01.3619879 | Automated unpack and sync |
| **2026-10-14** | `eve-24_01_3615610` | 24.01.3615610 | Automated unpack and sync |
| **2026-10-13** | `eve-24_01_3611656` | 24.01.3611656 | Automated unpack and sync |
| **2026-10-12** | `eve-24_01_3607705` | 24.01.3607705 | Automated unpack and sync |
diff --git a/caching/client/ttl_cache.py b/caching/client/ttl_cache.py
@@ -31,7 +31,7 @@ class TTLCache(MutableMapping):
return self.get(key)
def __iter__(self):
- for key in self._cache.iterkeys():
+ for key in self._cache.keys():
yield key
def __len__(self):
diff --git a/eve/client/script/environment/effects/StellarHarvester.py b/eve/client/script/environment/effects/StellarHarvester.py
@@ -27,8 +27,9 @@ class StellarHarvester(GenericEffect):
self.gfx.sourceObject = None
self.gfx = None
self.gfxModel = None
- tmp = self.sunSuckerZScaleComponent.scaling
- self.sunSuckerZScaleComponent.scaling = (tmp[0], tmp[1], 0.0)
+ if self.sunSuckerZScaleComponent is not None:
+ tmp = self.sunSuckerZScaleComponent.scaling
+ self.sunSuckerZScaleComponent.scaling = (tmp[0], tmp[1], 0.0)
self.sunRotComponent = None
self.sunSuckerZScaleComponent = None
@@ -99,6 +100,8 @@ class StellarHarvester(GenericEffect):
self.gfx.dest = targetBall
sun = targetBall.GetModel()
sunLaser = sun.effectChildren.FindByName('Lazer')
+ if sunLaser is None:
+ return
self.sunRotComponent = sunLaser
sunSuckerXYScaleComponent = self.sunRotComponent.objects.FindByName('Scale_X_Y')
self.sunSuckerZScaleComponent = sunSuckerXYScaleComponent.objects.FindByName('Scale_Z')
diff --git a/eve/client/script/ui/view/hangarBehaviours/baseHangarBehaviours.py b/eve/client/script/ui/view/hangarBehaviours/baseHangarBehaviours.py
@@ -180,6 +180,11 @@ class BaseHangarShipBehaviour(object):
def ShouldSwitchSkin(self, skinID):
return skinID != getattr(self._activeSkinID, 'skinID', None) and not self.shipSwitchingInProcess
+ def GetLocatorsFromSet(self, model, locatorSetName):
+ if model is None:
+ return []
+ return model.GetTransformedLocatorsFromSet(locatorSetName)
+
def SetAnchorPoint(self, hangarModel, hangarScene):
raise NotImplementedError("%s does not implement 'SetAnchorPoint'", self)
diff --git a/eve/client/script/ui/view/hangarBehaviours/modularHangarBehaviours.py b/eve/client/script/ui/view/hangarBehaviours/modularHangarBehaviours.py
@@ -152,32 +152,21 @@ class ModularHangarShipBehaviour(BaseHangarShipBehaviour):
def _CreateDocks(self, hangarModel, hangarScene):
enlistment = self._GetEnlistment()
- additionalSmallDocks, additionalBigDocks, smallDockSet, bigDockSet = ([],
- [],
- [],
- [])
+ smallDockLocators, bigDockLocators = [], []
if enlistment is None:
- smallDockSet = hangarModel.locatorSets.FindByName(hConst.LOCATORSET_SMALL_DOCK_SHIPS)
- bigDockSet = hangarModel.locatorSets.FindByName(hConst.LOCATORSET_MEDIUM_DOCK_SHIPS)
+ smallDockLocators = self.GetLocatorsFromSet(hangarModel, hConst.LOCATORSET_SMALL_DOCK_SHIPS)
+ bigDockLocators = self.GetLocatorsFromSet(hangarModel, hConst.LOCATORSET_MEDIUM_DOCK_SHIPS)
if enlistment is not None:
- smallDockSet = hangarModel.locatorSets.FindByName(hConst.LOCATORSET_SMALL_DEATHLESS_DOCK)
- bigDockSet = hangarModel.locatorSets.FindByName(hConst.LOCATORSET_MEDIUM_DEATHLESS_DOCK)
+ smallDockLocators = self.GetLocatorsFromSet(hangarModel, hConst.LOCATORSET_SMALL_DEATHLESS_DOCK)
+ bigDockLocators = self.GetLocatorsFromSet(hangarModel, hConst.LOCATORSET_MEDIUM_DEATHLESS_DOCK)
if self.isEnlistmentDockingEnabled and enlistment == factionAngelCartel:
- additionalSmallDocks = hangarModel.locatorSets.FindByName(hConst.LOCATORSET_SMALL_ANGEL_DOCK)
- additionalBigDocks = hangarModel.locatorSets.FindByName(hConst.LOCATORSET_MEDIUM_ANGEL_DOCK)
+ smallDockLocators += self.GetLocatorsFromSet(hangarModel, hConst.LOCATORSET_SMALL_ANGEL_DOCK)
+ bigDockLocators += self.GetLocatorsFromSet(hangarModel, hConst.LOCATORSET_MEDIUM_ANGEL_DOCK)
elif self.isEnlistmentDockingEnabled and enlistment == factionGuristasPirates:
- additionalSmallDocks = hangarModel.locatorSets.FindByName(hConst.LOCATORSET_SMALL_GURISTAS_DOCK)
- additionalBigDocks = hangarModel.locatorSets.FindByName(hConst.LOCATORSET_MEDIUM_GURISTAS_DOCK)
- if hasattr(additionalSmallDocks, 'locators'):
- for each in additionalSmallDocks.locators:
- smallDockSet.locators.append(each)
-
- if hasattr(additionalBigDocks, 'locators'):
- for each in additionalBigDocks.locators:
- bigDockSet.locators.append(each)
-
+ smallDockLocators += self.GetLocatorsFromSet(hangarModel, hConst.LOCATORSET_SMALL_GURISTAS_DOCK)
+ bigDockLocators += self.GetLocatorsFromSet(hangarModel, hConst.LOCATORSET_MEDIUM_GURISTAS_DOCK)
hallwayLocatorSetName = hConst.LOCATORSET_HALLWAY_POINTS
- if smallDockSet is None or bigDockSet is None:
+ if not smallDockLocators or not bigDockLocators:
self.log.error('ModularHangarShipBehaviour.SetAnchorPoint: not all required LocatorSets are defined.')
return
smallDockObjects = []
@@ -253,8 +242,8 @@ class ModularHangarShipBehaviour(BaseHangarShipBehaviour):
return
return dock
- def CreateDocks(locSet, setToAddTo, isSmall):
- for locator in locSet.locators:
+ def CreateDocks(locators, setToAddTo, isSmall):
+ for locator in locators:
pos = locator[0]
rot = locator[1]
potentialChildObject = GetClosestDockObject(isSmall, pos)
@@ -271,10 +260,10 @@ class ModularHangarShipBehaviour(BaseHangarShipBehaviour):
exitPointSetName = hConst.LOCATORSET_SMALL_DOCK_EXITS
cameraExitPointSetName = hConst.LOCATORSET_SMALL_DOCK_CAMERA_EXITS
- CreateDocks(smallDockSet, self.smallDocks, True)
+ CreateDocks(smallDockLocators, self.smallDocks, True)
exitPointSetName = hConst.LOCATORSET_MEDIUM_DOCK_EXITS
cameraExitPointSetName = hConst.LOCATORSET_MEDIUM_DOCK_CAMERA_EXITS
- CreateDocks(bigDockSet, self.bigDocks, False)
+ CreateDocks(bigDockLocators, self.bigDocks, False)
def IsInitialized(self):
return self.isInitialized
@@ -712,12 +701,14 @@ class ModularHangarShipBehaviour(BaseHangarShipBehaviour):
else:
capitalShips.append(ship)
- smallDock = rnd.choice(self.smallDocks)
- bigDock = rnd.choice(self.bigDocks)
- smallDock.isPlayer = True
- smallDock.isActive = True
- bigDock.isPlayer = True
- bigDock.isActive = True
+ if self.smallDocks:
+ smallDock = rnd.choice(self.smallDocks)
+ smallDock.isPlayer = True
+ smallDock.isActive = True
+ if self.bigDocks:
+ bigDock = rnd.choice(self.bigDocks)
+ bigDock.isPlayer = True
+ bigDock.isActive = True
def _placeShipInDock(ship, dock):
multiEffect = self._GetDockingMultieffect()
@@ -783,16 +774,16 @@ class ModularHangarShipBehaviour(BaseHangarShipBehaviour):
uthread.new(_placeShipInDock, ship, dock)
def _LoadAndPlaceCapitalShip(ship):
- positionLocator = hangar.locatorSets.FindByName(hConst.LOCATORSET_CAPITAL_SHIP)
- if positionLocator is None or len(positionLocator.locators) != 1:
+ positionLocators = self.GetLocatorsFromSet(hangar, hConst.LOCATORSET_CAPITAL_SHIP)
+ if len(positionLocators) != 1:
self.log.info('ModularHangarShipBehaviour.populateDocksWithInventoryShips: capital locator missing')
return
model = self.LoadShipModel(ship.itemID, ship.typeID, False)
if model is None:
return
self._WaitForShipBoundingBox(model)
- position = positionLocator.locators[0][0]
- rotation = positionLocator.locators[0][1]
+ position = positionLocators[0][0]
+ rotation = positionLocators[0][1]
shipTranslation = trinity.Tr2TranslationAdapter()
shipBBOffset = self.GetShipOffset(model, ship.typeID)
shipTranslation.value = geo2.Vec3Add(position, shipBBOffset)
diff --git a/eve/client/script/ui/view/hangarBehaviours/modularHangarCapitalBehaviours.py b/eve/client/script/ui/view/hangarBehaviours/modularHangarCapitalBehaviours.py
@@ -47,12 +47,12 @@ class ModularCapitalHangarShipBehaviour(ModularHangarShipBehaviour):
return [self.playerShip]
def _CreateDock(self, hangarModel, hangarScene):
- shipPlacement = hangarModel.locatorSets.FindByName('ship_placement')
+ shipPlacement = self.GetLocatorsFromSet(hangarModel, 'ship_placement')
MEResPath = GetGraphicFile(hConst.DOCKER_CAPITAL_MULTIEFFECT_GRAPHIC_ID)
- if shipPlacement is None or len(shipPlacement.locators) != 1:
+ if len(shipPlacement) != 1:
self.log.error('ModularHangarShipBehaviour._CreateDock: ship_placement locatorSet missconfigured')
return
- for locator in shipPlacement.locators:
+ for locator in shipPlacement:
self.shipTranslation = locator[0]
self.shipRotation = locator[1]
ME = blue.resMan.LoadObject(MEResPath)
diff --git a/evegraphics/environments/postProcess.py b/evegraphics/environments/postProcess.py
@@ -115,7 +115,8 @@ class PostProcess(BaseEnvironmentObject):
continue
newPPVal = getattr(self.postProcess, member, None)
if newPPVal is not None:
- setattr(self.scenePostProcess, member, newPPVal.CopyTo())
+ copyTo = getattr(newPPVal, 'CopyTo', None)
+ setattr(self.scenePostProcess, member, copyTo() if copyTo is not None else newPPVal)
except ValueError as ex:
log.error('Error when applying post processing to scene' + ex.message)
diff --git a/evegraphics/spaceSubway/spaceSubwayEffect.py b/evegraphics/spaceSubway/spaceSubwayEffect.py
@@ -92,9 +92,9 @@ class SpaceSubwayCamera(object):
newPos = pos.GetValue() if pos else self.position
newPoi = poi.GetValue() if poi else self.pointOfInterest
with ExceptionEater('Got error while updating camera'):
- if newPos != (0, 0, 0) and newPoi != (0, 0, 0):
- self.position = pos.GetValue() if pos else self.position
- self.pointOfInterest = poi.GetValue() if poi else self.pointOfInterest
+ if newPos != (0, 0, 0) and newPoi != (0, 0, 0) and newPos != newPoi:
+ self.position = newPos
+ self.pointOfInterest = newPoi
self.fov = fov.GetValue() if fov else self.fov
uthread2.Yield()
diff --git a/multiprocessing/pool.pyc b/multiprocessing/pool.pyc
Binary files differ.
diff --git a/trinity/__init__.py b/trinity/__init__.py
@@ -202,6 +202,7 @@ def _init():
device.SetRenderJobs(renderJobs)
settings.SetValue('newBloom', False)
settings.SetValue('dynamicExposureQualityRequirement', 2)
+ settings.SetValue('grannyDeprecationLevel', 0)
_init()
