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

feat(code): Custom outfit/ship prices and sell type #122

Open
wants to merge 49 commits into
base: experimental
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
50a47dd
Custom outfit prices and sell type
TheGiraffe3 Nov 2, 2024
17d327f
Rerun checks
TheGiraffe3 Nov 2, 2024
767b9df
Small fixes
TheGiraffe3 Nov 2, 2024
6eb5d7d
Most of the way toward ship support
TheGiraffe3 Nov 4, 2024
caa4962
Merge branch 'experimental' into f(c)-customizable-sales
TheGiraffe3 Nov 4, 2024
26740c3
Publicity is good, right?
TheGiraffe3 Nov 4, 2024
8216788
Probably a bad idea to change code that I didn't add, but...
TheGiraffe3 Nov 4, 2024
01895b1
Not surprising
TheGiraffe3 Nov 4, 2024
f702f2a
Update source/CustomSaleManager.h
TheGiraffe3 Nov 4, 2024
3e927e3
static
TheGiraffe3 Nov 4, 2024
17cf7f6
in-line
TheGiraffe3 Nov 4, 2024
2f3a235
Update CustomShipSale.h
TheGiraffe3 Nov 4, 2024
51d13dd
I don't know why...
TheGiraffe3 Nov 4, 2024
0ee4b0d
... I thought that...
TheGiraffe3 Nov 4, 2024
b2c9b62
Thanks for the help, warp-core!
TheGiraffe3 Nov 4, 2024
b9026f2
Merge branch 'experimental' into f(c)-customizable-sales
TheGiraffe3 Nov 5, 2024
45fbb6f
Merge branch 'experimental' into f(c)-customizable-sales
TheGiraffe3 Nov 6, 2024
0535b47
test: Remnant should buy "Quantum Keystones" for more then they're bo…
TheGiraffe3 Nov 6, 2024
57d9e33
Merge branch 'experimental' into f(c)-customizable-sales
TheGiraffe3 Nov 6, 2024
0a3c1dc
Merge branch 'experimental' into f(c)-customizable-sales
TheGiraffe3 Nov 11, 2024
099b56a
Remnant buy JD for a greater price
TheGiraffe3 Nov 12, 2024
e5aed86
Unfettered buy JD for more
TheGiraffe3 Nov 12, 2024
86463ed
Merge branch 'experimental' into f(c)-customizable-sales
TheGiraffe3 Nov 12, 2024
e2c783c
Pirate Shuttle Sales
TheGiraffe3 Nov 12, 2024
81bef9a
GitHub doesn't like me
TheGiraffe3 Nov 12, 2024
78ea15b
Update pirate costs.txt
TheGiraffe3 Nov 12, 2024
32d6be1
Revert changes to hai.txt
TheGiraffe3 Nov 12, 2024
b0f8aef
Revert changes to remnant.txt
TheGiraffe3 Nov 12, 2024
fe7aa5f
Put all changes into custom sales.txt
TheGiraffe3 Nov 12, 2024
d1db143
Set prices for Quarg technology
TheGiraffe3 Nov 12, 2024
51010c9
Independancè
TheGiraffe3 Nov 12, 2024
e6c384f
But fix
TheGiraffe3 Nov 13, 2024
2110da9
Are ships not actually supported?
TheGiraffe3 Nov 13, 2024
71e61a2
Maybe
TheGiraffe3 Nov 13, 2024
66c72a1
Update custom sales.txt
TheGiraffe3 Nov 13, 2024
94b410d
Merge branch 'experimental' into f(c)-customizable-sales
Zitchas Nov 15, 2024
c266f65
Merge branch 'experimental' into f(c)-customizable-sales
Zitchas Nov 22, 2024
e832676
Update data/custom sales.txt
TheGiraffe3 Nov 22, 2024
ae255bf
Merge branch 'experimental' into f(c)-customizable-sales
TheGiraffe3 Nov 27, 2024
54e5680
Merge branch 'experimental' into f(c)-customizable-sales
TheGiraffe3 Dec 17, 2024
b7d34af
Apply suggestions from code review
TheGiraffe3 Dec 17, 2024
432a586
GitHub resolves conflicts in strange ways
TheGiraffe3 Dec 17, 2024
58f29c6
Let's try this
TheGiraffe3 Dec 18, 2024
f2285e4
Let's try this II
TheGiraffe3 Dec 18, 2024
c88d505
Merge branch 'experimental' into f(c)-customizable-sales
TheGiraffe3 Jan 3, 2025
004c4ae
Merge branch 'experimental' into f(c)-customizable-sales
TheGiraffe3 Jan 21, 2025
8675c1d
Merge branch 'experimental' into f(c)-customizable-sales
TheGiraffe3 Jan 22, 2025
70dcac0
Merge branch 'experimental' into f(c)-customizable-sales
Zitchas Feb 2, 2025
7270aca
Tentative attempt at reverting customizable ship sales
TheGiraffe3 Feb 2, 2025
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
68 changes: 68 additions & 0 deletions data/custom sales.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# Copyright (c) 2024 by Loymdayddaud
#
# Endless Sky is free software: you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation, either version 3 of the License, or (at your option) any later version.
#
# Endless Sky is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# this program. If not, see <https://www.gnu.org/licenses/>.


pricing outfits "Quarg Technology Friendly Groups"
location
government "Free Worlds" "Hai" "Neutral" "Republic" "Syndicate"
offset
"Nanotech Battery" 0.01 %
"Antimatter Core" 0.01 %
"Quarg Skylance" 0.01 %
"Quarg Anti-Missile" 0.01 %
"Intrusion Countermeasures" 0.01 %
"Medium Graviton Thruster" 0.01 %
"Medium Graviton Steering" 0.01 %
"Quantum Shield Generator" 0.01 %

pricing outfits "Quarg Technology Hostile Groups"
location
government "Hai (Unfettered)" "Independent" "Pirate"
offset
"Nanotech Battery" 2 %
"Antimatter Core" 2 %
"Quarg Skylance" 2 %
"Quarg Anti-Missile" 2 %
"Intrusion Countermeasures" 2 %
"Medium Graviton Thruster" 2 %
"Medium Graviton Steering" 2 %
"Quantum Shield Generator" 2 %


pricing outfits "Remnant Hai Keystones"
import
location
government "Remnant"
conditions
or
has "Remnant: Key Stones: done"
has "Remnant: Key Stones (Pre-Hai) 2: done"
value
"Quantum Keystone" 230000

pricing outfits "Remnant Jump Drives"
import
location
government "Remnant"
value
"Jump Drive" 500000


pricing outfits "Unfettered Jump Drives"
import
location
government "Hai (Unfettered)"
conditions
has "Unfettered Jump Drive 1: done"
value
"Jump Drive" 1000000
6 changes: 6 additions & 0 deletions source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ target_sources(EndlessSkyLib PRIVATE
ConversationPanel.h
CoreStartData.cpp
CoreStartData.h
CustomOutfitSale.cpp
CustomOutfitSale.h
CustomSaleManager.cpp
CustomSaleManager.h
CustomShipSale.cpp
CustomShipSale.h
DamageDealt.h
DamageProfile.cpp
DamageProfile.h
Expand Down
Loading
Loading