Skip to content
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

Jump to bottom

Misc fixes #63

Merged
merged 5 commits into from Oct 4, 2017
Merged

Misc fixes #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a7d96c7
Misc fix: BA Blackmarket Talk to Boss showed blank screen
gcabbage Sep 23, 2017
e451207
Kronosaurus mission fixes
gcabbage Sep 23, 2017
88c2b99
Only offer militia mission 1 to experienced pilots
gcabbage Sep 23, 2017
2a3e0be
Typo
gcabbage Sep 23, 2017
3183a64
Fix Antarctica achievement text
gcabbage Sep 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion TransCore/Antarctica02.xml
View file
Open in desktop
Expand Up @@ -303,7 +303,7 @@ changing sys will unregister from owner
(if achievementText
(list
(list
(msnTranslate theMission achievementText)
(typTranslate &msEscapeFromDantalion; achievementText)
Nil
"achievements & regrets"
)
Expand Down
6 changes: 3 additions & 3 deletions TransCore/BattleArena.xml
View file
Open in desktop
Expand Up @@ -1896,7 +1896,7 @@

<Boss>
<Panes>
<GetOut>
<Default>
<OnPaneInit>
(scrSetDesc gScreen "You ask to see the station boss. Everyone turns to stare at you for a second, but then they go about their business and continue to ignore you.")
</OnPaneInit>
Expand All @@ -1906,7 +1906,7 @@
(scrShowScreen gScreen "Main")
</Action>
</Actions>
</GetOut>
</Default>
</Panes>
</Boss>

Expand Down Expand Up @@ -2958,4 +2958,4 @@
<Image UNID="&rsBattleArenaBkgnd;" bitmap="Resources\BattleArenaScreen.jpg" loadOnUse="true" />
<Image UNID="&rsBattleArenaSegments;" bitmap="Resources\BattleArenaSegments.jpg" bitmask="Resources\BattleArenaSegmentsMask.bmp" hitMask="Resources\BattleArenaSegmentsHitMask.bmp" loadOnUse="true" />

</TranscendenceModule>
</TranscendenceModule>
4 changes: 2 additions & 2 deletions TransCore/CommonwealthMilitiaMission01.xml
View file
Open in desktop
Expand Up @@ -29,8 +29,8 @@
)
(switch
; Check if player is experienced enough
;(not (milCanEnterCC))
; (msnDestroy gSource)
(not (milCanEnterCC))
(msnDestroy gSource)

; Make sure there are at least 2 gates
(ls (count gateList) 2)
Expand Down
2 changes: 1 addition & 1 deletion TransCore/KorolovShipping.xml
View file
Open in desktop
Expand Up @@ -1224,7 +1224,7 @@
<String id="msgArmorDamage">
"Armor integrity at %armorIntegrity%%"
</String>
<String id="msgShieldlDamage">
<String id="msgShieldDamage">
"Shields at %shieldLevel%%"
</String>
<String id="msgHullDamage">
Expand Down
4 changes: 3 additions & 1 deletion TransCore/KronosaurusMission01.xml
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@

<MissionType UNID="&msKronosaurus;"
name= "The Kronosaurus"
attributes= "special"
attributes= "korolov, special"

maxAppearing= "1"
>
Expand Down Expand Up @@ -117,6 +117,8 @@
(objSetProperty kronosaurus 'dockingEnabled Nil)
(shpCancelOrders kronosaurus)
(shpOrder kronosaurus 'attack gPlayerShip)
(msnSetData gSource 'targetID (objGetID kronosaurus))
(msnRegisterForEvents gSource kronosaurus)
)
)

Expand Down