Commit Graph

54 Commits

Author SHA1 Message Date
metalgearsloth 1d63b4cfcb
Content update for UI prediction (#27214)
* Content update for UI refactor

* Big update

* Sharing

* Remaining content updates

* First big update

* Prototype updates

* AUGH

* Fix UI comp ref

* Cleanup

- Fix predicted message, fix item slots, fix interaction range check.

* Fix regressions

* Make this predictive

idk why it wasn't.

* Fix slime merge

* Merge conflict

* Fix merge

(cherry picked from commit 5896e6875266b22c565009b5d45f60ceb981d90a)
2024-05-03 00:15:32 +02:00
icekot8 c2f49864fd
cargo console radio messages on approving (#27038)
* 1

* void --> "Unknown"

(cherry picked from commit fd109d61b88468a1b623975ce7258462fc40b7f6)
2024-04-21 22:07:14 +02:00
deltanedas 3d09479269
trade station markers and debug assert fix (#1080) 2024-04-11 18:14:15 +00:00
blueDev2 3b03c5d498 Allow cargo bounties to be sold off-station (#26469)
closes #955

* Ported over code for delta-v to fix bounties

* Added requested changes

* Removed the station arg from "IsBountyComplete". It is unneeded and all calls just use a null value for it anyways
2024-03-28 17:14:50 +00:00
wafehling 17ca360528
Trading Outpost now has half buy-only and half sell-only pallets (#25955)
* Added new Buy & Sell specific cargo pallets

* Remapped trading outpost with new pallets, tweaked texture

* Removed debug message

* Fixed/Compacted conditional checking to let old pallets still work for backwards compatability

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

Alright, updating all the references to it.

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Changed textures, changed to enum instead of string for pallet type check

* Few minor code tweaks/formatting fixes

* Missed the prototype change

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

* Update Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit c0bbbc33c19eafcc8defaa7f1ec2df42e485b435)
2024-03-17 15:06:02 +01:00
Debug 6bd5092853
Fix some trading post oopsies (#956)
Fix 2 oopsies
2024-03-11 19:57:03 +00:00
Flesh 44613e6544
Made ordering multiple crates at cargo order multiple crates (#25518)
* please tell me this is empty

* it wasn't empty, fixing that

* This should fix it

* fix for the fix

* address changes

* fix

* Added some comments, hoping that failed test was a fluke.

(cherry picked from commit aa4e7c061939fbe314be97a2e7f559477b941c07)
2024-03-08 12:54:53 +01:00
Debug 76d06416ab
Modify trade station for Delta 2024-03-08 12:54:50 +01:00
metalgearsloth fa61952f51
Add trade stations (#23863) 2024-03-08 09:52:50 +01:00
Nemanja 30fccbbc8d
Chill bounties + fixes (#23411)
* Chill bounties + fixes

* localize

* fix arbitage

(cherry picked from commit 4662d463b8f5cbef5d93ca00b67bae6d8bf5db47)
2024-01-26 21:30:40 +01:00
Leon Friedrich b87fcdb622 Remove uses of `TransformComponent.ChildEntities` (#22442)
* Make output of ChildEnumerator non-nullable

* Remove uses of ChildEntities

* poke tests

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-12-16 20:38:06 +01:00
Debug ea39152f39
Reimplement pallet selling (#66) 2023-09-30 01:24:04 +02:00
metalgearsloth c9648da984 Content update for NetEntities (#18935) 2023-09-27 21:59:12 +02:00
metalgearsloth d1236ff995
Fix cargo trading post (#19656) 2023-08-30 21:02:58 +10:00
Leon Friedrich 9c2af43af6
Deduplicate & fix prediction reconciliation test (#18635) 2023-08-04 12:21:44 +10:00
metalgearsloth 68b56878bc
Cargo selling fixes (#17876)
- Prevent selling dead mobs (getting used as easy corpse disposal).
- Fix a broadcast event being raised O(n) times instead of O(1)
2023-07-09 13:24:48 -06:00
TemporalOroboros 3ac4cf85db
Cleaner BoundUserInterfaces (#17736) 2023-07-09 02:02:17 +10:00
Nemanja 7ab5127286
Cargo Bounties (#17344)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-06-22 21:49:33 +10:00
deltanedas b9f24b2681
expedition rewards (#16972)
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-06-16 15:19:02 +10:00
metalgearsloth 7d178555e1
Cargo shuttle fixes (#17118) 2023-06-05 13:37:00 +10:00
metalgearsloth 57858f802f
Shuttle drone improvements (#16931) 2023-05-31 11:13:02 +10:00
Tom Leys db81e59013
NanoTrasen might send Gifts to the station via Cargo (#16556)
* Rebase Cargo Gifts

* Remove Chaos values from gifts (for now)

* Translate CargoGifts, rename fields

* Fix gift errors, detect missing products

* Fix order Id, some crate IDs

* Fix get Station. Gifts for Sec, Med, Fire, spacing

* Minimum players for various gifts

# Conflicts:
#	Resources/Prototypes/GameRules/cargo_gifts.yml
2023-05-22 15:55:27 -06:00
metalgearsloth e75d9d7e33
Fix accidentally selling mobs (#15578) 2023-04-20 22:09:48 +10:00
metalgearsloth b65bfd1fcf
Don't sell non-dead mobs on cargo (#15228) 2023-04-09 11:59:41 +10:00
metalgearsloth 92dff4a630
Fix cargo (again) (#14800) 2023-03-23 19:21:12 +11:00
metalgearsloth 569f30b721
Cargo shuttle changes (#14363) 2023-03-23 16:10:49 +11:00
Checkraze b329abc9ee
Cargo Pallet Sale Console (#14422) 2023-03-13 16:36:35 -04:00
metalgearsloth 86895f9735
Don't preload content maps in tests (#14577) 2023-03-11 12:45:48 +11:00
eoineoineoin 6722adcd83
Cleanup cargo shuttle/telepad order code (#13591)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2023-03-05 15:27:30 +11:00
Visne c6d3e4f3bd
Fix warnings and code cleanup/fixes (#13570) 2023-01-19 13:56:45 +11:00
eoineoineoin bda5f8248f
Improve Paper UI, allow an to entity configure how it's UI looks (#13494)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2023-01-17 19:32:46 +11:00
eoineoineoin cd10d6fb5e
Minor changes to display of cargo order manifests (#12618)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2023-01-14 21:49:00 -04:00
Jezithyr eeb5b17b34
Mobstate Refactor (#13389)
Refactors mobstate and moves mob health thresholds to their own component

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-01-13 16:57:10 -08:00
Checkraze 66a01ccbf2
cargo system cleanup (#13396) 2023-01-10 20:55:59 +11:00
Checkraze 1edd00e50c
makes GetDocks and FoundOrganics public (#13260) 2023-01-01 17:44:30 +11:00
Leon Friedrich 881a2b2ece
PopupSystem public methods rejig (#12830) 2022-12-19 08:41:47 +11:00
Pieter-Jan Briers 55c61b9c35
Config presets system. (#12824) 2022-12-16 23:26:24 +01:00
metalgearsloth 3b3963083b
Replace GridEntityId with Owner (#12743) 2022-12-12 14:59:02 +11:00
metalgearsloth 6c76061887
Content changes for mapgrid kill (#12567) 2022-11-22 13:12:04 +11:00
metalgearsloth 6ab864fcda
Update content to mapsystem (#12387) 2022-11-13 17:47:48 +11:00
metalgearsloth c0abea8047
Content side for removing IMap / IMapGrid comps (#12357) 2022-11-04 10:12:25 +11:00
metalgearsloth c9a2ab1cee
Remove transform methods from mapgrid (#12233) 2022-11-01 11:27:18 +11:00
Leon Friedrich 12503e57a5
Fix construction/crafting and maybe cargo selling (#12306) 2022-10-31 13:26:05 +11:00
metalgearsloth fae8b0173b
Fix cargo order amounts (#12070) 2022-10-22 14:55:13 -07:00
metalgearsloth 434da2df36
Use query for cargo sell blacklist (#11887) 2022-10-15 13:17:03 -07:00
metalgearsloth ed442a7d3b
Cargo price tweaks 2 (#11307)
* Cargo price tweaks 2

* Allow cargo selling dead organics
2022-09-15 12:29:07 -05:00
Leon Friedrich c65d1c51ce
Load grid error related changes (#10817) 2022-08-25 23:33:40 +10:00
metalgearsloth 797a11a6ed
Fix cargo shuttle (#10397) 2022-08-08 09:22:46 +10:00
Kara 5784c248ac
Nuke anchor fixes + cargo sell blacklist (#10286) 2022-08-03 20:01:14 -07:00
metalgearsloth 1251b3aeda
Add FTL destinations (#9685) 2022-07-15 14:11:41 +10:00