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.

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

Pirate jobs #1935

Closed
wants to merge 48 commits into from
Closed
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
0bcc515
Pirate jobs
Amazinite Dec 27, 2016
9324029
Typo fixes
Amazinite Dec 27, 2016
c7791ce
More cargo names
Amazinite Dec 28, 2016
5beed0d
Selling passengers into slavery
Amazinite Dec 28, 2016
9a1ccfb
Payment in dialogs
Amazinite Dec 28, 2016
55d8fd1
Fake ID job
Amazinite Dec 28, 2016
13d6924
Only set number of fake IDs buyable
Amazinite Dec 28, 2016
e6271d0
Changes to slavery jobs
Amazinite Dec 29, 2016
6dcfe6b
Conversations instead of dialog
Amazinite Dec 29, 2016
eb0f62c
Regional passenger slavery jobs
Amazinite Dec 29, 2016
9ab3e4f
Reputation requirement on normal passenger jobs
Amazinite Dec 29, 2016
74a2d14
Release slave jobs
Amazinite Dec 29, 2016
bc4eca8
Hunted by state mission
Amazinite Dec 29, 2016
935ae7c
Lower level bounty hunters
Amazinite Dec 29, 2016
a29db71
Payment and fine changes
Amazinite Dec 29, 2016
7af3da4
Fixing mistake on reputation changes
Amazinite Dec 29, 2016
efb29b6
Handful of changes
Amazinite Dec 30, 2016
1877a51
Giving some flavor to the fake ID jobs
Amazinite Dec 30, 2016
5a2edc1
Typo fix
Amazinite Dec 30, 2016
9c4baef
Readding bounty governments
Amazinite Dec 30, 2016
203a6f4
Typo fix
Amazinite Dec 30, 2016
6925806
A few changes
Amazinite Dec 31, 2016
5a521e2
Fixing names for job NPCs
Amazinite Dec 31, 2016
a495f41
Selling into slavery now also affects Oathkeeper rep
Amazinite Dec 31, 2016
71f32ba
More job balance
Amazinite Dec 31, 2016
51cc089
Changed attitudes of bounty governments
Amazinite Jan 3, 2017
2fdce2b
Renaming bounty governments to target governments
Amazinite Jan 7, 2017
4e3fd45
Merge remote-tracking branch 'refs/remotes/endless-sky/master' into p…
Amazinite Jan 16, 2017
78ceba8
Merge branch 'master' into pirate-jobs
Amazinite Jan 16, 2017
6cfd5a9
Reputation block on escort jobs
Amazinite Jan 21, 2017
65bfa9d
Moving commodities to commodities
Amazinite Jan 26, 2017
22babd8
Lowercasing drug names
Amazinite Jan 27, 2017
3db4229
Removing quotes around drugs
Amazinite Jan 29, 2017
e34dfed
Changes some stuff with slave jobs
Amazinite Feb 7, 2017
eda823e
Typo fix
Amazinite Feb 9, 2017
0f02e61
Wording changes
Amazinite Feb 23, 2017
7d4d108
Wording change
Amazinite Feb 23, 2017
9d0a36c
Changed escort jobs to always have pirate destinations
Amazinite Feb 27, 2017
d8c3a4b
Can't buy fake ID's if you've officially joined one of the sides of t…
Amazinite Mar 24, 2017
7e919aa
Dropping slave transport payment by 25%
Amazinite Mar 24, 2017
17d42aa
Making sure you don't get swarmed by bounty hunters during the war
Amazinite Mar 24, 2017
098badb
Merge branch 'master' into pirate-jobs
Amazinite Apr 8, 2017
20dee52
Merge remote-tracking branch 'refs/remotes/endless-sky/master' into p…
Amazinite May 27, 2017
69544e8
Alphabetizing commodity names
Amazinite May 27, 2017
c734e5a
Changing conditions on Hunted by State missions
Amazinite May 27, 2017
e022c73
New drug related hail and new illegal cargo
Amazinite May 27, 2017
5fb9d76
ID missions fail if you choose sides or are hostile to pirates
Amazinite May 27, 2017
e5f1e28
Changing some reputation conditions on general jobs
Amazinite Jun 8, 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
8 changes: 8 additions & 0 deletions data/deep jobs.txt
Expand Up @@ -18,6 +18,7 @@ mission "Deep Mystery Cube [0]"
to offer
random < 10
"combat rating" > 35
"reputation: Republic" > 0
source
attributes deep
destination
Expand Down Expand Up @@ -45,6 +46,7 @@ mission "Deep Mystery Cube [1]"
to offer
random < 10
"combat rating" > 35
"reputation: Republic" > 0
source
attributes deep
destination
Expand Down Expand Up @@ -72,6 +74,7 @@ mission "Deep Mystery Cube [2]"
to offer
random < 10
"combat rating" > 35
"reputation: Republic" > 0
source
attributes deep
destination
Expand Down Expand Up @@ -99,6 +102,7 @@ mission "Deep Mystery Cube [3]"
to offer
random < 10
"combat rating" > 35
"reputation: Republic" > 0
source
attributes deep
destination
Expand All @@ -125,6 +129,7 @@ mission "Mystery retrieval"
to offer
random < 10
"combat rating" > 35
"reputation: Republic" > 0
source
attributes deep
stopover
Expand All @@ -150,6 +155,7 @@ mission "Transport scientists"
repeat
to offer
random < 15
"reputation: Republic" > 0
passengers 5 16
source
attributes deep
Expand All @@ -171,6 +177,7 @@ mission "Escort science vessel"
to offer
random < 15
"combat rating" > 50
"reputation: Republic" > 0
source
attributes research
stopover
Expand Down Expand Up @@ -208,6 +215,7 @@ mission "Record academic conference"
cargo "recording equipment" 1
to offer
random < 15
"reputation: Republic" > 0
source
attributes deep
destination
Expand Down
61 changes: 61 additions & 0 deletions data/fleets.txt
Expand Up @@ -2340,3 +2340,64 @@ fleet "Marauder fleet X"
"Marauder Quicksilver"
"Marauder Arrow"
"Marauder Bounder"

fleet "Hired Guns"
government "Bounty Hunter"
names "bounty hunter"
personality
nemesis waiting heroic
variant 1
"Leviathan (Laser)"
"Modified Argosy" 2
variant 1
"Leviathan (Laser)"
"Mule (Heavy)"
"Dagger"
variant 1
"Leviathan (Laser)"
"Corvette"
variant 1
"Leviathan (Laser)"
"Splinter (Laser)"
variant 1
"Falcon (Laser)"
"Modified Argosy" 2
variant 1
"Falcon (Laser)"
"Mule (Heavy)"
"Dagger"
variant 1
"Falcon (Laser)"
"Corvette"
variant 1
"Falcon (Laser)"
"Splinter (Laser)"
variant 1
"Vanguard (Particle)"
"Modified Argosy" 2
variant 1
"Vanguard (Particle)"
"Mule (Heavy)"
"Dagger"
variant 1
"Vanguard (Particle)"
"Corvette"
variant 1
"Vanguard (Particle)"
"Splinter (Laser)"
variant 1
"Bactrian (Hired Gun)"
"Dagger" 3
"Modified Argosy" 2
variant 1
"Bactrian (Hired Gun)"
"Dagger" 4
"Mule (Heavy)"
variant 1
"Bactrian (Hired Gun)"
"Dagger" 3
"Corvette"
variant 1
"Bactrian (Hired Gun)"
"Dagger" 3
"Splinter (Laser)"
61 changes: 61 additions & 0 deletions data/governments.txt
Expand Up @@ -23,6 +23,52 @@ government "Bounty"
"fine" 0
"hostile hail" "hostile pirate"

government "Bounty: Merchant"
swizzle 5
"player reputation" -1000
"attitude toward"
"Pirate" -.01
"Korath" -.01
"bribe" .05
"fine" 0
"friendly hail" "friendly civilian"
"hostile hail" "hostile civilian"

government "Bounty: Republic"
swizzle 0
"player reputation" -1000
"attitude toward"
"Merchant" .01
"Militia" .01
"Pirate" -.01
"Navy (Oathkeeper)" .01
"Neutral" .01
"friendly hail" "friendly navy"
"hostile hail" "hostile navy"

government "Bounty: Syndicate"
swizzle 4
"player reputation" -1000
"attitude toward"
"Merchant" .01
"Pirate" -.01
"Korath" -.01
"bribe" .08
"friendly hail" "friendly syndicate"
"hostile hail" "hostile syndicate"

government "Bounty: Militia"
swizzle 2
"player reputation" -1000
"attitude toward"
"Merchant" .01
"Pirate" -.01
"Militia" .01
"Free Worlds" .01
"bribe" .1
"friendly hail" "friendly militia"
"hostile hail" "hostile militia"

government "Bounty Hunter"
swizzle 6
color .78 0 0
Expand Down Expand Up @@ -58,6 +104,7 @@ government "Free Worlds"
"attitude toward"
"Merchant" .3
"Militia" .3
"Bounty: Militia" .01
"Pirate" -.4
"Neutral" .1
"bribe" .1
Expand Down Expand Up @@ -87,6 +134,7 @@ government "Hai (Unfettered)"
"Wanderer" -.01
"Pug" -.01
"Merchant" -.01
"Bounty: Merchant" -.01
"bribe" .02
"fine" 0
"hostile hail" "hostile unfettered"
Expand Down Expand Up @@ -168,6 +216,7 @@ government "Militia"
"player reputation" 0
"attitude toward"
"Merchant" .3
"Bounty: Merchant" .01
"Pirate" -.4
"bribe" .1
"friendly hail" "friendly militia"
Expand All @@ -187,7 +236,9 @@ government "Navy (Oathkeeper)"
"attitude toward"
"Alpha" -.3
"Merchant" .25
"Bounty: Merchant" .01
"Militia" .1
"Bounty: Militia" .01
"Pirate" -.3
"Kor Sestor" -.1
"Kor Mereti" -.1
Expand All @@ -201,6 +252,7 @@ government "Neutral"
"player reputation" 1
"attitude toward"
"Merchant" .3
"Bounty: Merchant" .01
"Pirate" -.2
"bribe" .05
"friendly hail" "friendly civilian"
Expand All @@ -219,7 +271,9 @@ government "Pirate"
"player reputation" -10
"attitude toward"
"Merchant" -.1
"Bounty: Merchant" -.01
"Syndicate" -.1
"Bounty: Syndicate" -.01
"Korath" -.1
"Author" -.1
"bribe" .05
Expand All @@ -234,6 +288,7 @@ government "Pug"
"player reputation" 1
"attitude toward"
"Merchant" .1
"Bounty: Merchant" .01
"Pirate" -.1
"friendly hail" "friendly pug"
"hostile hail" "hostile pug"
Expand All @@ -245,6 +300,7 @@ government "Quarg"
"player reputation" 1
"attitude toward"
"Merchant" .01
"Bounty: Merchant" .01
"Kor Efret" .01
"Kor Mereti" -.01
"Kor Sestor" -.01
Expand All @@ -260,7 +316,9 @@ government "Republic"
"attitude toward"
"Alpha" -.3
"Merchant" .25
"Bounty: Merchant" .01
"Militia" .1
"Bounty: Militia" .01
"Pirate" -.3
"Navy (Oathkeeper)" 1
"Neutral" .1
Expand All @@ -275,6 +333,7 @@ government "Syndicate"
"player reputation" 2
"attitude toward"
"Merchant" .3
"Bounty: Merchant" .01
"Pirate" -.4
"Korath" -.5
"bribe" .08
Expand All @@ -289,7 +348,9 @@ government "Syndicate (Extremist)"
"player reputation" -1000
"attitude toward"
"Syndicate" -.01
"Bounty: Syndicate" -.01
"Republic" -.01
"Bounty: Republic" -.01
"Free Worlds" -.01
"bribe" 0
"hostile hail" "hostile syndicate"
Expand Down