commit 4ea59e350c027a4a36beb2121906df1cc87679db
parent c316d53d1c66320a79f513e1e89d69849e711ac0
Author: NovaBryan <29001820+NovaBryan@users.noreply.github.com>
Date: Tue, 13 Oct 2026 13:32:36 +0000
Auto-dump EVE code: 24.01.3611656 (20261013_3611656_code)
Diffstat:
12 files changed, 47 insertions(+), 13 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-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 |
| **2026-10-09** | `eve-24_01_3599281` | 24.01.3599281 | Automated unpack and sync |
| **2026-10-08** | `eve-24_01_3593370` | 24.01.3593370 | Automated unpack and sync |
diff --git a/eve/client/script/environment/effects/GenericEffect.py b/eve/client/script/environment/effects/GenericEffect.py
@@ -260,12 +260,14 @@ class ShipEffect(GenericEffect):
bBox = (max(-shipBBoxMin[0], shipBBoxMax[0]) * 1.2, max(-shipBBoxMin[1], shipBBoxMax[1]) * 1.2, max(-shipBBoxMin[2], shipBBoxMax[2]) * 1.2)
self.gfxModel.scaling = bBox
elif effectConst.FX_TF_SCALE_SYMMETRIC in self.transformFlags:
- radius = effectBall.model.GetBoundingSphereRadius()
- self.gfxModel.scaling = (radius, radius, radius)
- self.gfx.translation = (0, 0, 0)
+ if effectBall.model is not None:
+ radius = effectBall.model.GetBoundingSphereRadius()
+ self.gfxModel.scaling = (radius, radius, radius)
+ self.gfx.translation = (0, 0, 0)
elif effectConst.FX_TF_SCALE_RADIUS in self.transformFlags:
- radius = effectBall.model.GetBoundingSphereRadius()
- self.gfxModel.scaling = (radius, radius, radius)
+ if effectBall.model is not None:
+ radius = effectBall.model.GetBoundingSphereRadius()
+ self.gfxModel.scaling = (radius, radius, radius)
if effectConst.FX_TF_ROTATION_BALL in self.transformFlags:
self.gfxModel.rotationCurve = effectBall
self.gfxModel.name = self.__guid__
diff --git a/eve/client/script/environment/effects/Jump.py b/eve/client/script/environment/effects/Jump.py
@@ -620,11 +620,12 @@ class JumpOutWormhole(JumpDriveIn):
self.PlayNamedAnimations(wormholeBall.model, 'Activate')
def Stop(self, reason = STOP_REASON_DEFAULT):
- JumpDriveIn.Stop(self, reason)
shipID = self.ballIDs[0]
shipBall = self.fxSequencer.GetBall(shipID)
if shipBall is not None and shipBall.model is not None:
shipBall.model.display = True
+ if self.gfx is not None:
+ JumpDriveIn.Stop(self, reason)
class JumpOutAbyssal(JumpOut):
diff --git a/eve/client/script/parklife/fxSequencer.py b/eve/client/script/parklife/fxSequencer.py
@@ -52,7 +52,8 @@ FX_PROTECTED_EFFECT_GUIDS = ['effects.GateActivity',
'effects.WarpDisruptFieldGenerating',
'effects.WarpScramble',
'effects.Tethering',
- 'effects.StellarHarvester']
+ 'effects.StellarHarvester',
+ 'effects.DynamicDisruptionBubble']
FX_LONG_ONESHOT_GUIDS = ['effects.SuperWeaponAmarr',
'effects.SuperWeaponCaldari',
'effects.SuperWeaponGallente',
diff --git a/eve/client/script/parklife/sceneManager.py b/eve/client/script/parklife/sceneManager.py
@@ -658,9 +658,7 @@ class SceneManager(Service):
desaturateObject.intensity = self.currentDesaturateLevel
if registerKey is not None:
self.RegisterScene(scene, registerKey)
- self.SetActiveScene(scene, registerKey)
- else:
- self.SetActiveScene(scene, registerKey)
+ self.SetActiveScene(scene, registerKey)
sm.ScatterEvent('OnLoadScene', scene, registerKey)
def GetOrCreateCamera(self, cameraID):
diff --git a/eve/client/script/parklife/spaceMgr.py b/eve/client/script/parklife/spaceMgr.py
@@ -105,8 +105,16 @@ class SpaceMgr(Service):
def OnWormholeJumpCancel(self):
HudActionIndicationController.get_instance().clear_indication()
HudActionIndicationController.get_instance().clear_shortcut_indication()
+ self._AbortWormholeJumpAnimation()
prompt_player_fsd_dialog('CustomInfo', {'info': GetByLabel('UI/Wormholes/EnterCollapsed')})
+ def _AbortWormholeJumpAnimation(self):
+ transition = sm.GetService('viewState').GetTransitionByName('inflight', 'inflight')
+ effect = getattr(transition, 'effect', None) if transition is not None else None
+ if effect is not None and hasattr(effect, 'Abort'):
+ effect.Abort()
+ self.FxSequencer.OnSpecialFX(session.shipid, None, None, None, None, 'effects.JumpOutWormhole', 0, 0, 0)
+
def GetTypeData(self, slimItem):
data = {}
data['slimItem'] = slimItem
diff --git a/eve/client/script/parklife/subwaySvc.py b/eve/client/script/parklife/subwaySvc.py
@@ -477,6 +477,8 @@ class SubwayService(Service):
gateModel = targetBall.GetModel()
elif destinationSystem is not None:
originOrientation = self._GetOriginOrientation(destinationSystem)
+ if IsStargate(targetID):
+ sm.GetService('audio').SendUIEvent('global_stop_all_stargate')
self.spaceSubwayEffect.StartEffectForOwner(gateModel, shipModel, originOrientation)
def FinishJump(self):
diff --git a/eve/client/script/ui/view/transitions.py b/eve/client/script/ui/view/transitions.py
@@ -85,7 +85,7 @@ class DeathTransition(Transition):
sm.GetService('loading').FadeIn(500)
def EndTransition(self, fromView, toView):
- sm.GetService('audio').SendUIEvent('transition_pod_reanimate')
+ sm.GetService('audio').SendUIEvent('npe_pod_reanimate')
self.notifyContainer.Close()
sm.GetService('loading').FadeOut(500)
duration = max(blue.os.desiredSimDilation, 0.3) * 2
@@ -243,6 +243,7 @@ class CharSelectCreateToSpaceTransition(Transition):
def StartTransition(self, fromView, toView):
Transition.StartTransition(self, fromView, toView)
+ sm.GetService('audio').SendUIEvent('cinematic_ship_intro_state_off')
if self._ShouldFadeLoadingLayer():
sm.GetService('loading').FadeIn(self.fadeInTimeMS)
sm.GetService('gameui').ResetResourceLoadingIndicatorPosition()
@@ -273,6 +274,7 @@ class ToHangarTransition(FadeToBlackTransition):
FadeToBlackTransition.__init__(self, fadeTimeMS, fadeInTimeMS, fadeOutTimeMS, **kwargs)
def StartTransition(self, fromView, toView):
+ sm.GetService('audio').SendUIEvent('global_stop_all_hangar')
sm.ScatterEvent('OnDockingTransitionStart')
super(ToHangarTransition, self).StartTransition(fromView, toView)
diff --git a/multiprocessing/pool.pyc b/multiprocessing/pool.pyc
Binary files differ.
diff --git a/platformtools/__init__.py b/platformtools/__init__.py
@@ -1,8 +1,8 @@
#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\platformtools\__init__.py
VERSION_YEAR = 2026
VERSION_MONTH = 7
-VERSION_MINOR = 1
-VERSION_PATCH = 5
+VERSION_MINOR = 2
+VERSION_PATCH = 68
VERSION_MAJOR = '{}.{:0>2}'.format(VERSION_YEAR, VERSION_MONTH)
__version_info__ = (VERSION_YEAR,
VERSION_MONTH,
diff --git a/platformtools/common/dnahelper/__init__.py b/platformtools/common/dnahelper/__init__.py
@@ -1,5 +1,6 @@
#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\platformtools\common\dnahelper\__init__.py
from ._dnaparts import DNAParts, DNAPartNames, DNAElementKinds, HFR_PARTS, MATERIAL_PARTS, PATTERN_PARTS, PATTERN_MATERIAL_PARTS, ALL_PATTERN_PARTS, OTHER_PARTS, LAYOUT_PARTS, DNA_DATA_PARTS, DNA_ALL_PARTS, LAYOUT_DESCRIPTOR_PARTS
+from ._sofelements import GetSOFElementKind, SOF_ELEMENT_KINDS, SOF_GENERIC_ELEMENT_KIND, SOF_ROOT_TYPE_PREFIX
def IsDNAValid(dna):
try:
diff --git a/platformtools/common/dnahelper/_sofelements.py b/platformtools/common/dnahelper/_sofelements.py
@@ -0,0 +1,18 @@
+#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\platformtools\common\dnahelper\_sofelements.py
+from ._dnaparts import DNAElementKinds
+SOF_ROOT_TYPE_PREFIX = 'EveSOFData'
+SOF_GENERIC_ELEMENT_KIND = 'generic'
+SOF_ELEMENT_KINDS = (DNAElementKinds.HULL,
+ DNAElementKinds.FACTION,
+ DNAElementKinds.RACE,
+ DNAElementKinds.MATERIAL,
+ DNAElementKinds.PATTERN,
+ DNAElementKinds.LAYOUT,
+ SOF_GENERIC_ELEMENT_KIND)
+
+def GetSOFElementKind(rootType):
+ if not rootType or not rootType.startswith(SOF_ROOT_TYPE_PREFIX):
+ return None
+ elementKind = rootType[len(SOF_ROOT_TYPE_PREFIX):].lower()
+ if elementKind in SOF_ELEMENT_KINDS:
+ return elementKind
