From 313868f7ab20dbbf97663cc1dc181aa8be0297f8 Mon Sep 17 00:00:00 2001
From: Zoey <friendlypossum@netc.fr>
Date: Sat, 8 Jun 2024 19:52:41 +0200
Subject: [PATCH] small additions to largetext,

---
 __pycache__/load.cpython-312.pyc | Bin 15803 -> 17427 bytes
 load.py                          |  30 +++++++++++++++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/__pycache__/load.cpython-312.pyc b/__pycache__/load.cpython-312.pyc
index 64f028acebbcbb3898f9d769e0f12e64aeba1233..60f66d7a548f32ac25daff617dbd975164919418 100644
GIT binary patch
delta 2759
zcmd5+ZD?Cn7{2EwP4jJCo2F^g=HA<nG+UB3?jttcN4KPfSU2s~m4TV8?#3>5xs#hr
zy0q7V$WTGpc77;Br0kd4ibxPe{ozk#f=T<MS?rt$YJXNMD!3oM=Y$(>*rbXudf~q3
zocDd6_kGWE&b^<_;#ZLUrp;z%;HkSVKD%?zhxW3Eebb6JIs|Ox^5|Xs1-G9S4Vd#f
z9rZ52Eg2UP!81$_UeQD%PBV>Iv=PN5TCefWZky^<EOT|Do&Xi2XjjbHMv{a);zPKh
z(}NoD9PdI8!@NDDTiT)WBrUR0^(ysO^wOmnBsNX=GK{>P`_xG{p-%_x^Tz+xbM)Wn
z*<4l0FsB!tM02r)*6+}$?jlML>%~@jcnvD2M(;M&3wrCMF4%{g=J6p$lSw_l{!WLt
zUBh6d-+|Gw1w(tLtn?)?JX<hoYg`8gM;QbE)K%qH`82l*_QOgEVDglC>|SPfRS|`#
zh^UIf3yiGQu#;#wuNS+hhFjlRRx&}&Zd$XUre;r7H-qSf?vV5wAbTm&h#2U=M`}!(
zA@VascG8H8L`KA2v^hU<T|sh5b2Nc_(tZWxASL(IG|)%364i_SbSt4MuO3QM-=qaf
zzYXk1DBBDE-2^KOHF@?x9yk8fYYAy`08<9$UdkMy+o^CpnqK#*OlOrTX~hn!@n|(p
zh4Mn?M`>nzO()uGf}|!u4N#O5F=B-Lx4H)DUiVk`YLfm0)B%bbgD%Mr3rD?&w)_M3
z-uDkE-GFQd|9iH+`)7L`vK^w?_?mqVsk-nQU8ElIFvW5jg{x<SLV0`dRfLY<1)qQ3
z#?5iFnRBV<rO9+sDH~6~^cYNisBBc-IlBr<iAgD|luZN`Cv$+A2#f}Dmgv#gac=f(
zT9g$Zl3#@zQZ^>V^B1NrWYW1Eaf!=Z%4Cyis7Ob}m%r;XBJ^>-Zr5>i)D%l)lIdqA
z<>_4e$xKR`;<D$GfW4T?p1ml`q%=ns!LsE94AF`YTCiv!Wy3H{fhYX08QvpzbP@mL
zziPP!(~scIoT<kz1v2xe&#xx3#YA?4Vdhbcg<+U|g8hZ8o@5J&>?XsUMq|VwjFIR`
zHp%|MFym~R_{adx8CD^~i)>s6&KdSG9jr(U*yHRdaSEflg0-V0^sVyYA|L)_yugQ7
z_#;i!>3zps6m}P^o|51Pi$Cad;g^G6<ixiE?(N*750?XN+p@v@Qg9QYWxUXT>cFzq
zecRTu=HV7RE1pngRT2)b^6?@cFHAgDNTiAr&lULi3O`-6cHFi(N<#HW9`q5=2AVYu
ztnop-7H~~Jz?+JPLeaVnGh=e*FNcQo*3ZcoY^Z#}_?x|7qauE5-xO-e>%(oV`&)?m
zjPe~A<nM`jnwTGnS;vC|f_a@z!G!VDz#_VX8zV9F9X=HqauiAE2VyQ0vqH==em@eU
nAFBKYS+C=}k#_V~zIE_*w&@H)t-p@w+^Bi;paFHt!+`i3`)7jK

delta 1515
zcma)4OH30{6rEQ}=@$`bp-?*Q6lkaXX`x~Y6iYGj7eWkiVN3`E#sEVc)DUr^D<TUF
z_!hb{Zqx-V)QJg+3*90t+Eghb2IATngRWe8-y>~if{IOg^5))q?m6$w;JfJcOyQc%
zW@g~G-aa_`t>H!C7OQ({!r$E-wt5sakKcNtI@yGaf@L;lxnK#AS%#4<c$W_p%SOQ{
zo3EAZ7a2wXCdVQ(F7i2%1<qC7dCS%;NmNhTvQ@cYAy4F{kx)1mU>K<nG5^{(@<01@
zVg~jdq5HZu`-*a^hFf~!s1u9}#dOZCQY|6Q6MCVP^q0+9j>f+|TLu3*5rdwC?%_3h
z**yAd?EW$hV+0uGhcMI`>BI;yoQE*98YW;=P)5h!T<yOlUX?1`2Z?LItfb6y2bndw
zL}Zd8qA9v=Fp@gMDw5%Cz2K%99{vp=aT+vPs#&Db^yG3g2wv)L7$!M7X+#V-@DYt6
zGx#2aPBrZ~NvBV!q2_8yX#q(mRWI3pVC^v=2PnB#V}K`DiR*<Ry-Hn<R{+wqHe>;5
z8?fv5*-&pFvyxY{rxD)?_?uLG@e6R8C?`QLvd>~wE}IFbEXNVm5x0<DG}n_0#D}o2
zmF}}?lvSUFI14i&I@5;m4$tHFeAFeI#4}J2)4JAm8&UD9RceKHI_FXOq<2Gg%Fo~;
zLJ>S$Utej7pY0v+%nVNmlFTD%4g%RSj0oeCmnRihLlr`ba=dW>;jN}Q!&8#hGkm3a
z(UOAWEBH^{)8qV>sj$_($u(uXk(4*Gaz5#eq`fDSQ1jJgxKN4<t=Ly?raDd~xlo!r
zowTx>Trg?HJ>d#m-OA(p;c{FW;+3zVJ%mztr|m*8Wp#bFm2b12$84Hyp-+xKZ^KvH
z-55vWdAml3@+lJ2n^uU;Cji(VT}P|f+RR}`X95|Oi=CA^R~kCJQQ9C=83LCGY!leQ
zxSKQY&?A5!zv*5=8+a_%i$37zv6y|8v_2A;C9p=|9nSCR<w+pY0|J!(h@27x;sC#l
i(TPdn`uIqfw5Lct^SaW0gevw%buQ%i(PcnBI{F(Ub42+7

diff --git a/load.py b/load.py
index 401b703..6e33d1b 100644
--- a/load.py
+++ b/load.py
@@ -190,16 +190,24 @@ def journal_entry(cmdr, is_beta, system, station, entry, state):
 
     match entry['event']:
         case 'StartUp':
-            presence_largetext = get_ship_name(('{ship}').format(ship=state['ShipType']))
-            presence_smalltext = ('CMDR {cmdr}').format(cmdr=cmdr)
-            presence_largeimage = ('{ship}').format(ship=state['ShipType'])
-            presence_smallimage = 'edlogo'
+            presence_largetext = get_ship_name(('{ship}').format(ship=state['ShipType'])) + (' | {shipname}').format(shipname=state['ShipName']) + (' | {shipident}').format(shipident=state['ShipIdent'])
+            presence_smalltext = ('CMDR {cmdr}').format(cmdr=cmdr)# + ('{power}').format(power=entry['event', 'Powerplay'])
+            presence_largeimage = state['ShipType']
+            presence_smallimage = 'edlogosm'
             presence_state = _('In system {system}').format(system=system)
             presence_details = _('Docked at {station}').format(station=station) if station else _('Flying in normal space')
         case 'Location':
+            presence_largetext = get_ship_name(('{ship}').format(ship=state['ShipType'])) + (' | {shipname}').format(shipname=state['ShipName']) + (' | {shipident}').format(shipident=state['ShipIdent'])
+            presence_smalltext = ('CMDR {cmdr}').format(cmdr=cmdr)#, power=state['Power'])
+            presence_largeimage = state['ShipType']
+            presence_smallimage = 'edlogosm'
             presence_state = _('In system {system}').format(system=system)
             presence_details = _('Docked at {station}').format(station=station) if station else _('Flying in normal space')
         case 'StartJump':
+            presence_largetext = get_ship_name(('{ship}').format(ship=state['ShipType'])) + (' | {shipname}').format(shipname=state['ShipName']) + (' | {shipident}').format(shipident=state['ShipIdent'])
+            presence_smalltext = ('CMDR {cmdr}').format(cmdr=cmdr)#, power=state['Power'])
+            presence_largeimage = state['ShipType']
+            presence_smallimage = 'edlogosm'
             presence_state = _('Jumping')
             presence_details = _('Jumping to system {system}').format(system=entry['StarSystem']) if entry['JumpType'] == 'Hyperspace' else _('Preparing for supercruise')
         case 'SupercruiseEntry':
@@ -235,9 +243,14 @@ def journal_entry(cmdr, is_beta, system, station, entry, state):
             presence_details = _('Flying around {body}').format(body=planet) if entry['PlayerControlled'] else _('In SRV on {body}, ship in orbit').format(body=planet)
         case 'LeaveBody':
             presence_details = _('Supercruising')
-        case 'Loadout':
-            presence_largeimage = ('{ship}').format(ship=state['ShipType'])
-            presence_largetext = get_ship_name(('{ship}').format(ship=state['ShipType']))
+        case 'Disembark':
+            presence_largetext = ('Using the {suitcurrent} suit.').format(suitcurrent=state['SuitCurrent'])
+        case 'Embark':
+            presence_largeimage = state['ShipType']
+            presence_largetext = get_ship_name(('{ship}').format(ship=state['ShipType'])) + (' | {shipname}').format(shipname=state['ShipName']) + (' | {shipident}').format(shipident=state['ShipIdent'])
+        case 'Loadout': # when switching ships
+            presence_largeimage = state['ShipType']
+            presence_largetext = get_ship_name(('{ship}').format(ship=state['ShipType'])) + (' | {shipname}').format(shipname=state['ShipName']) + (' | {shipident}').format(shipident=state['ShipIdent'])
         case 'LaunchSRV':
             presence_details = _('In SRV on {body}').format(body=planet)
         case 'DockSRV':
@@ -246,6 +259,9 @@ def journal_entry(cmdr, is_beta, system, station, entry, state):
             # No specific action for other events
             pass
 
+    #if entry['TimePledged']:
+    #    presence_smalltext = presence_smalltext + (' | {power}').format(power=state['Power'])
+
     if (presence_state != this.presence_state or
     presence_details != this.presence_details or
     presence_largeimage != this.presence_large_image or