Skip to content

Commit 1c1fbe3

Browse files
TheGiraffe3TheGiraffe3
authored
Merge branch 'jibauni' into Jibauni
2 parents 970cbbe + 5e89bf2 commit 1c1fbe3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+436
-273
lines changed

‎copyright

+2
Original file line numberDiff line numberDiff line change
@@ -2865,6 +2865,7 @@ Files:
28652865
images/ship/frigate*
28662866
images/ship/gunboat*
28672867
images/ship/lance*
2868+
images/ship/modified?carrier*
28682869
images/ship/rainmaker*
28692870
images/ship/raven*
28702871
images/ship/splinter*
@@ -2878,6 +2879,7 @@ Files:
28782879
images/thumbnail/frigate*
28792880
images/thumbnail/gunboat*
28802881
images/thumbnail/lance*
2882+
images/thumbnail/modified?carrier*
28812883
images/thumbnail/rainmaker*
28822884
images/thumbnail/raven*
28832885
images/thumbnail/splinter*

‎credits.txt

+2
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ Artwork
103103
@Karirawri (CC-BY-SA-4.0)
104104
Gef. Taubenbrust (CC-BY-SA-4.0)
105105
Saugia (CC-BY-SA-4.0)
106+
Rising Leaf (CC-BY-SA-4.0)
107+
Unordered Sigh (CC-BY-SA-3.0)
106108
Heinrich (CC-BY-SA-4.0)
107109
Loymdayddaud (CC-BY-SA-4.0)
108110

‎data/_ui/interfaces.txt

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ color "logbook background" .125 .125 .125 1.
5151
color "logbook line" .2 .2 .2 1.
5252
color "message log background" .125 .125 .125 1.
5353
color "item selected" 0. 0. 0. .3
54+
color "outfitter difference highlight" 1. .5 0. 1.
5455

5556
# Colors used to draw certain HUD elements in-flight.
5657
color "shields" .43 .55 .85 .8

‎data/_ui/tooltips.txt

+3
Original file line numberDiff line numberDiff line change
@@ -1488,3 +1488,6 @@ tip "Date format"
14881488

14891489
tip "Show parenthesis"
14901490
`Toggle parenthesis around the trade prices in the ports map mode.`
1491+
1492+
tip "Notify on destination"
1493+
`If you enter a system with a planet you must land on for a mission, plays a notification sound.`

‎data/human/campaign events.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1506,11 +1506,11 @@ event "navy using mark ii ships"
15061506
"Rainmaker (Mark II)"
15071507
add variant 6
15081508
"Carrier (Mark II)"
1509-
"Lance" 4
1509+
"Lance" 8
15101510
"Combat Drone" 6
15111511
add variant 3
15121512
"Carrier (Mark II)"
1513-
"Lance" 4
1513+
"Lance" 8
15141514
"Combat Drone" 6
15151515
"Cruiser (Mark II)"
15161516
"Combat Drone" 4
@@ -1556,11 +1556,11 @@ event "navy using mark ii ships"
15561556
"Rainmaker (Mark II)"
15571557
add variant 6
15581558
"Carrier (Mark II)"
1559-
"Lance" 4
1559+
"Lance" 8
15601560
"Combat Drone" 6
15611561
add variant 3
15621562
"Carrier (Mark II)"
1563-
"Lance" 4
1563+
"Lance" 8
15641564
"Combat Drone" 6
15651565
"Cruiser (Mark II)"
15661566
"Combat Drone" 4

‎data/human/deep missions.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ mission "Deep: Mystery Cubes 4"
570570
variant
571571
"Carrier"
572572
"Combat Drone" 6
573-
"Dagger" 4
573+
"Dagger" 8
574574
npc
575575
government "Merchant"
576576
personality staying vindictive
@@ -602,7 +602,7 @@ mission "Deep: Mystery Cubes 4"
602602
names "deep fighter"
603603
variant
604604
"Aerie" 2
605-
"Dagger" 4
605+
"Dagger" 8
606606
"Corvette (Speedy)"
607607
npc
608608
government "Republic"
@@ -616,7 +616,7 @@ mission "Deep: Mystery Cubes 4"
616616
"Carrier"
617617
"Cruiser" 2
618618
"Combat Drone" 14
619-
"Lance" 4
619+
"Lance" 8
620620
"Frigate" 2
621621
npc evade
622622
government "Pirate"
@@ -2208,7 +2208,7 @@ mission "Deep: Scientist Rescue 1: Escorts"
22082208
names "deep fighter"
22092209
variant
22102210
"Aerie"
2211-
"Dagger" 2
2211+
"Dagger" 4
22122212

22132213

22142214

‎data/human/fleets.txt

+28-28
Original file line numberDiff line numberDiff line change
@@ -1047,10 +1047,10 @@ fleet "Human Miners"
10471047
"Mining Drone" 2
10481048
variant
10491049
"Aerie (Miner)"
1050-
"Dagger" 2
1050+
"Dagger" 4
10511051
variant
10521052
"Aerie"
1053-
"Dagger (Miner)" 2
1053+
"Dagger (Miner)" 4
10541054
variant
10551055
"Behemoth (Miner)"
10561056

@@ -1388,11 +1388,11 @@ fleet "Large Republic"
13881388
"Rainmaker"
13891389
variant 2
13901390
"Carrier"
1391-
"Lance" 4
1391+
"Lance" 8
13921392
"Combat Drone" 6
13931393
variant 1
13941394
"Carrier"
1395-
"Lance" 4
1395+
"Lance" 8
13961396
"Combat Drone" 6
13971397
"Cruiser"
13981398
"Combat Drone" 4
@@ -1483,7 +1483,7 @@ fleet "Small Deep Merchants"
14831483
heroic
14841484
variant 4
14851485
"Aerie"
1486-
"Dagger" 2
1486+
"Dagger" 4
14871487
variant 6
14881488
"Mule"
14891489
"Dagger"
@@ -1517,17 +1517,17 @@ fleet "Large Deep Merchants"
15171517
heroic
15181518
variant 5
15191519
"Aerie"
1520-
"Dagger" 2
1520+
"Dagger" 4
15211521
"Corvette"
15221522
variant 3
15231523
"Aerie"
1524-
"Dagger" 2
1524+
"Dagger" 4
15251525
"Raven"
15261526
variant 3
15271527
"Headhunter" 2
15281528
variant 3
15291529
"Aerie" 2
1530-
"Dagger" 4
1530+
"Dagger" 8
15311531
variant 8
15321532
"Bactrian"
15331533
"Dagger" 3
@@ -1536,13 +1536,13 @@ fleet "Large Deep Merchants"
15361536
"Dagger" 3
15371537
"Raven"
15381538
"Aerie"
1539-
"Dagger" 2
1539+
"Dagger" 4
15401540
variant 2
15411541
"Bactrian"
15421542
"Dagger" 3
15431543
"Raven (Heavy)"
15441544
"Aerie"
1545-
"Dagger" 2
1545+
"Dagger" 4
15461546
variant 5
15471547
"Bactrian"
15481548
"Dagger" 3
@@ -1580,7 +1580,7 @@ fleet "Small Deep Security"
15801580
heroic
15811581
variant 4
15821582
"Aerie"
1583-
"Dagger" 2
1583+
"Dagger" 4
15841584
variant 3
15851585
"Raven"
15861586
variant 1
@@ -1610,27 +1610,27 @@ fleet "Large Deep Security"
16101610
heroic
16111611
variant 5
16121612
"Aerie"
1613-
"Dagger" 2
1613+
"Dagger" 4
16141614
"Corvette"
16151615
variant 2
16161616
"Aerie"
1617-
"Dagger" 2
1617+
"Dagger" 4
16181618
"Corvette (Missile)"
16191619
variant 2
16201620
"Aerie"
1621-
"Dagger" 2
1621+
"Dagger" 4
16221622
"Corvette (Speedy)"
16231623
variant 3
16241624
"Aerie"
1625-
"Dagger" 2
1625+
"Dagger" 4
16261626
"Raven"
16271627
variant 1
16281628
"Aerie"
1629-
"Dagger" 2
1629+
"Dagger" 4
16301630
"Raven (Heavy)"
16311631
variant 1
16321632
"Aerie"
1633-
"Dagger" 2
1633+
"Dagger" 4
16341634
"Raven (Afterburner)"
16351635
variant 4
16361636
"Raven" 2
@@ -1645,7 +1645,7 @@ fleet "Large Deep Security"
16451645
"Headhunter (Strike)"
16461646
variant 3
16471647
"Aerie" 2
1648-
"Dagger" 4
1648+
"Dagger" 8
16491649
variant 8
16501650
"Corvette"
16511651
"Raven"
@@ -1703,11 +1703,11 @@ fleet "Large Oathkeeper"
17031703
"Rainmaker"
17041704
variant 2
17051705
"Carrier"
1706-
"Lance" 4
1706+
"Lance" 8
17071707
"Combat Drone" 6
17081708
variant 1
17091709
"Carrier"
1710-
"Lance" 4
1710+
"Lance" 8
17111711
"Combat Drone" 6
17121712
"Cruiser"
17131713
"Combat Drone" 4
@@ -2406,10 +2406,10 @@ fleet "Small Northern Pirates"
24062406
"Sparrow"
24072407
variant 1
24082408
"Aerie"
2409-
"Lance" 2
2409+
"Lance" 4
24102410
variant 1
24112411
"Aerie"
2412-
"Dagger" 2
2412+
"Dagger" 4
24132413
variant 3
24142414
"Headhunter"
24152415
variant 2
@@ -2490,22 +2490,22 @@ fleet "Large Northern Pirates"
24902490
"Headhunter (Strike)"
24912491
variant 2
24922492
"Aerie"
2493-
"Dagger" 2
2493+
"Dagger" 4
24942494
"Corvette"
24952495
variant 2
24962496
"Aerie"
2497-
"Dagger" 2
2497+
"Dagger" 4
24982498
"Raven"
24992499
variant 4
25002500
"Aerie" 2
2501-
"Dagger" 4
2501+
"Dagger" 8
25022502
variant 4
25032503
"Aerie"
25042504
"Dagger" 2
25052505
"Corvette (Missile)"
25062506
variant 2
25072507
"Aerie" 2
2508-
"Dagger" 4
2508+
"Dagger" 8
25092509
"Firebird"
25102510
variant 4
25112511
"Mule"
@@ -2881,7 +2881,7 @@ fleet "Bounty Hunters"
28812881
"Fury (Missile)"
28822882
variant 1
28832883
"Aerie"
2884-
"Lance" 2
2884+
"Lance" 4
28852885
variant 1
28862886
"Corvette"
28872887
"Fury (Missile)"
@@ -3470,7 +3470,7 @@ fleet "Human Wormhole Guards"
34703470
variant 2
34713471
"Carrier (Mark II)"
34723472
"Combat Drone" 6
3473-
"Lance (Gatling)" 4
3473+
"Lance (Gatling)" 8
34743474
variant 1
34753475
"Auxiliary (Transport Mark II)"
34763476
variant 2

‎data/human/free worlds 0 prologue.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2285,7 +2285,7 @@ mission "Defend Sabik"
22852285
names "republic fighter"
22862286
variant
22872287
"Carrier"
2288-
"Lance" 4
2288+
"Lance" 8
22892289
"Combat Drone" 6
22902290
"Frigate" 2
22912291
"Gunboat" 3
@@ -2300,7 +2300,7 @@ mission "Defend Sabik"
23002300
names "republic fighter"
23012301
variant
23022302
"Carrier"
2303-
"Lance" 4
2303+
"Lance" 8
23042304
"Combat Drone" 6
23052305
"Frigate" 2
23062306
"Gunboat" 3

‎data/human/free worlds 1 start.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1436,7 +1436,7 @@ mission "FW Pirates: Attack 2"
14361436
variant
14371437
"Aerie" 2
14381438
"Mule (Heavy)"
1439-
"Dagger" 5
1439+
"Dagger" 9
14401440

14411441
on visit
14421442
dialog `You've landed on <planet>, but there are still pirates defending the system. All pirates in the system must be eliminated before <planet> can be taken.`

‎data/human/free worlds 2 middle.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ mission "FW Southern Battle 2"
489489
names "republic fighter"
490490
variant
491491
"Carrier (Mark II)"
492-
"Lance" 4
492+
"Lance" 8
493493
"Combat Drone" 6
494494
fleet 3
495495
names "republic capital"
@@ -1942,7 +1942,7 @@ mission "FW Rand 1"
19421942
names "republic fighter"
19431943
variant
19441944
"Carrier (Mark II)"
1945-
"Lance" 4
1945+
"Lance" 8
19461946
"Combat Drone" 6
19471947
"Gunboat (Mark II)"
19481948

@@ -2312,7 +2312,7 @@ mission "FW Liberate Delta Sagittarii"
23122312
names "republic fighter"
23132313
variant
23142314
"Carrier (Mark II)"
2315-
"Lance" 4
2315+
"Lance" 8
23162316
"Combat Drone" 6
23172317
"Gunboat (Mark II)" 4
23182318
fleet

0 commit comments

Comments
 (0)