Skip to content

feat: 105769, 105771: updates to korolov (continuous sandbox mode, up… #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ArisayaDragon wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

feat: 105769, 105771: updates to korolov (continuous sandbox mode, up… #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5eef3a3
feat: 105769, 105771: updates to korolov (continuous sandbox mode, up…
ArisayaDragon Dec 25, 2025
3bc64e1
Merge remote-tracking branch 'origin/master' into feature/105771-Koro…
ArisayaDragon Jan 8, 2026
14878b5
chore: 105771: implement gcabbage suggestions
ArisayaDragon Jan 8, 2026
1981a02
chore: 105771: update legacy method to use more flexible get@ call
ArisayaDragon Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions Transcendence/TransCore/KSMission01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
(and
(not (objGetObjRefData theFreighter "korolovDest"))
(not (objGetData theFreighter "korolovPlayerEscort"))
(geq playerLevel (objGetStaticData theFreighter "korolovMinLevel"))
(geq playerLevel (korObjGetMinLevel theFreighter))
(geq (shpGetMaxSpeed gPlayerShip) (+ (shpGetMaxSpeed theFreighter) 2))
)
)
Expand Down Expand Up @@ -75,18 +75,6 @@
destObj
)
(switch
; Finite number of missions per station
(ls (objGetData aOwnerObj 'remainingMissions) 1)
(msnDestroy gSource)

; Only offer to new pilots and levels 1-3
(not (find '(0 1 2 3) playerLevel))
(msnDestroy gSource)

; No missions once the stronghold is destroyed
(objIsAbandoned (objGetObjRefData aOwnerObj 'charonStronghold))
(msnDestroy gSource)

; Pick a random freighter. If we can't find one there is no mission
(and (not freighterObj)
(not (setq freighterObj (random dockedFreighters)))
Expand Down Expand Up @@ -120,7 +108,7 @@

; Remember the minimum player level to escort and the minimum
; player speed.
(msnSetData gSource 'minPlayerLevel (objGetStaticData freighterObj "korolovMinLevel"))
(msnSetData gSource 'minPlayerLevel (korObjGetMinLevel freighterObj))
(msnSetData gSource 'minPlayerSpeed (+ (shpGetMaxSpeed freighterObj) 2))

; Remember the mission for this transport, so we don't
Expand Down
16 changes: 2 additions & 14 deletions Transcendence/TransCore/KSMission02.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
dockedFreighters
theFreighter
(and
(geq playerLevel (objGetStaticData theFreighter "korolovMinLevel"))
(geq playerLevel (korObjGetMinLevel theFreighter))
(geq (shpGetMaxSpeed gPlayerShip) (+ (shpGetMaxSpeed theFreighter) 2))
)
)
Expand All @@ -61,18 +61,6 @@


(switch
; Finite number of missions per station
(ls (objGetData aOwnerObj 'remainingMissions) 1)
(msnDestroy gSource)

; Only offer to new pilots and levels 1-3
(not (find '(0 1 2 3) playerLevel))
(msnDestroy gSource)

; No missions once the stronghold is destroyed
(objIsAbandoned (objGetObjRefData aOwnerObj 'charonStronghold))
(msnDestroy gSource)

; If we're too close to the gates then no mission
(not (setq gateObj (random (sysFindObject aOwnerObj "GR:300; -uncharted;"))))
(msnDestroy gSource)
Expand Down Expand Up @@ -101,7 +89,7 @@

; Remember the minimum player level to escort and the minimum
; player speed.
(msnSetData gSource 'minPlayerLevel (typGetStaticData escortType "korolovMinLevel"))
(msnSetData gSource 'minPlayerLevel (korTypGetMinLevel escortType))
(msnSetData gSource 'minPlayerSpeed (+ (typGetProperty escortType 'maxSpeed) 2))
)

Expand Down
Loading