Commit Graph

68 Commits

Author SHA1 Message Date
Boaz1111 886f6aaca0
Fix for the salvage ice labs map. (#26928)
* done

* more work

(cherry picked from commit 1bf97c94eecfb9b76d4e2f08765ee5e8a7472151)
2024-04-21 21:54:58 +02:00
Velcroboy ca1173a4dd
Makes asteroids great-ish again (#1079)
* Makes asteroids better?

* remove unfinished prototype

* oops

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-04-11 13:25:42 -05:00
Emisse 2c493a1fd0
Haunted dungeon template (#23768)
* haunted dungeon

* Initial work

Still needs prefab gen work to make it interesting.

* ime a worm

* weh

* Work

* Slight tweaks

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 952b7f4c4e8e957c0c3765f7b20f2745c9297e27)
2024-03-27 18:28:44 +01:00
deltanedas e45cbd7282
remove rped (#26316)
* remove rped

* trol

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

(cherry picked from commit 5ac88d9b2788182f607aeaf08eea8d26b1bb4d18)
2024-03-24 00:12:25 +01:00
metalgearsloth f102e8ff75
Shuttle console + FTL rework (#24430)
* Add shuttle interior drawing back

Just do it per-tile she'll be right, at least it's done with 1 draw call.

* Revamp shuttle console

* Bunch of cleanup work

* Lables sortito

* dok

* Pixel alignment and colours

* Fix a bunch of drawing bugs

* Shuttle map drawing

* Drawing fixes

* Map parallax working finally

* weh

* Commit all my stuff

* mic

* deez

* Update everything

* Xamlify everything

* uh

* Rudimentary blocker range

* My enemies have succeeded

* Bunch of changes to FTL

* Heaps of cleanup

* Fix FTL bugs

* FTL

* weewoo

* FTL fallback

* wew

* weh

* Basic FTL working

* FTL working

* FTL destination fixes

* a

* Exclusion zones

* Fix drawing / FTL

* Beacons working

* Coordinates drawing

* Fix unknown map names

* Dorks beginning

* State + docking cleanup start

* Basic dock drawing

* Bunch of drawing fixes

* Batching / color fixes

* Cleanup and beacons support

* weh

* weh

* Begin pings

* First draft at map objects

* Map fixup

* Faster drawing

* Fix perf + FTL

* Cached drawing

* Fix drawing

* Best I got

* strips

* Back to lists but with caching

* Final optimisation

* Fix dock bounds

* Docking work

* stinker

* kobolds

* Btns

* Docking vis working

* Fix docking pre-vis

* canasses

* Helldivers 2

* a

* Array life

* Fix

* Fix TODOs

* liltenhead feature club

* dorking

* Merge artifacts

* Last-minute touchup

(cherry picked from commit c5486873db0d6826122eb1f30007e392fc101082)
2024-03-08 12:54:53 +01:00
Ed 56f5304511
Frozen hydroponic dungeon (#25837)
+dungen

(cherry picked from commit bdcf1444423cffdb88e3398077ad7b770a224341)
2024-03-07 01:24:50 +01:00
Ed da5758ba4e
Mineshaft (#25733)
* content

* catwalks

* fix fucking icons

* finish PR

* +1 room

* fix

(cherry picked from commit ace82854406631bad58cd731899fc8e20ef21e65)
2024-03-07 01:24:40 +01:00
Zadeon a48c9cc1e2
Adds minable salt "ore" (#25324)
* Added salt to ore.yml
Added salt to ores.yml
Added salt walls to asteroid.yml
Added salt to BaseAsteroidDebris' list of ores to generate in asteroids.yml
Added OreSalt to biome_ore_templates.yml
Added salt to guaranteed salvageLoot in salvage_loot.yml
Added salt entry under salvage-magnet-resources in salvage-magnet.ftl
Added WIP sprites for salt.

* Renamed salt's id to SaltOre inside Entities/Objects/Materials/ore.yml
Fixed salt not being grindable due to using an incorrect reagent name
Added salt to ore.rsi/meta.json and rock.rsi/meta.json

* Added chlorine to the list of solutions salt gives when used in the grinder.

* Gave salt ore and salt rock overlay unique sprites.

* Added raw salt to materials/materials.ftl
Updated SaltOre definition in ore.yml to have RawSalt under materialComposition

* Updated saltore definition to give 10 units of tablesalt and 5 units of iodine when ground.

(cherry picked from commit 133bd0353a16a3b2260555318a1389b1c2c0f0e9)
2024-03-07 00:59:54 +01:00
deltanedas 508568a6bb
Add carp pocket (#24888)
* texture

* add the item

* add it to present and salv loot

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 604748534ebd72efafa11344ee33d563c2ff93c3)
2024-02-08 12:32:24 +01:00
mac6na6na db8726cd0d
Remove tiered part crates from expeditions (#24810)
Remove part crates

(cherry picked from commit 8b292671f498db9b7f9f4db8cb7b569440259782)
2024-02-08 12:20:58 +01:00
metalgearsloth 4c7c904549
Remove vehicles (#24681)
* Remove wheelchairs

Vehicle code is dogwater and wheelchairs just keeps exposing edgecases. If someone wants it brought it back they can do vehicle refactor.

* Also this one

* Remove vehicles

* goodbye vehicles

* Remove this check

* sasd

* Cronch

* Add sprites back

* jani

(cherry picked from commit d2f20d8955a25a32aa5fb9b3631a41921b464cd4)
2024-02-08 12:06:49 +01:00
Nemanja 3b3e9abb7b
Make procgen use weighted variants (#24669)
(cherry picked from commit 2a6705818bf510aee3026c7f3c3a4ed56f188189)
2024-02-08 11:54:39 +01:00
metalgearsloth 2d3c0accff
Add artifact fragments to salvage magnet (#23791)
slavage

(cherry picked from commit 5d658fc0fa98db9e053b82d491265422b0dcf28c)
2024-01-26 22:21:22 +01:00
metalgearsloth 8f0f8368cb
Bump blob asteroid iterations (#23660)
Occasionally the big blob is too small.

(cherry picked from commit fe91132f4e3246510ca748d195b2d0e6cf48d9c3)
2024-01-26 22:05:12 +01:00
Ed 41751ecaef
Tesla Gun (#23175)
* add content

* u cant pickup lightning

* -5 heat damage

* Update battery_guns.yml

(cherry picked from commit 7d30b5ae63c99d10394dac4841d20dc99465946d)
2024-01-26 21:48:53 +01:00
Nemanja 3d4fa26e22
Fix iron naming, add specific materials for ores (#23590)
add materials for ores, fix iron naming

(cherry picked from commit 86c1e36cd54c474f87a9873e34f78a517b6410bd)
2024-01-26 21:47:38 +01:00
metalgearsloth f128143d13
Salvage magnet revamp (#23119)
* Generic offering window

* More work

* weh

* Parity

* Progression meter

* magnet

* rona

* PG asteroid work

* code red

* Asteroid spawnings

* clams

* a

* Marker fixes

* More fixes

* Workings of biome asteroids

* A

* Fix this loading code

* a

* Fix masking

* weh

* Fixes

* Magnet claiming

* toe

* petogue

* magnet

* Bunch of fixes

* Fix default

* Fixes

* asteroids

* Fix offerings

* Localisation and a bunch of fixes

* a

* Fixes

* Preliminary draft

* Announcement fixes

* Fixes and bump spawn rate

* Fix asteroid spawns and UI

* More fixes

* Expeditions fix

* fix

* Gravity

* Fix announcement rounding

* a

* Offset tweak

* sus

* jankass

* Fix merge

(cherry picked from commit bf79acd127483d64f96dc23f2e64c74ceb84303d)
2024-01-26 21:35:22 +01:00
Velcroboy a04b02bc62 Add coal distribution to progen (#22755)
* Add coal distribution to progen

* Add sprite

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-22 23:07:52 +01:00
Kara 4fcb1365da Remove chasm from lava planetgen (#22560)
* Remove chasm from lava planetgen

* REmove chasm from lava planetgen real

* Revert "Remove chasm from lava planetgen"

This reverts commit f432334b43e8b1dd17f15b19e50c2ba3d80df297.
2023-12-16 20:32:27 +01:00
metalgearsloth 222a98654b Update desert planet walls to WallRockSand (#21783)
* Update desert planet walls to WallRockSand

* This
2023-12-02 19:00:03 +01:00
metalgearsloth 625c2b037c Biome niceties (#21692)
- Use floor variants for caves.
- Add stalagmites to caves.
- Use variants for existing biomes too ig.
2023-11-19 22:16:38 +01:00
metalgearsloth 81a5f97a2e Gateway destinations (#21040)
* Gateway generation

* Gateway stuff

* gatewehs

* mercenaries

* play area

* Range fixes and tweaks

* weh

* Gateway UI polish

* Lots of fixes

* Knock some items off

* Fix dungeon spawning

Realistically we should probably be using a salvage job.

* wahwah

* wehvs

* expression

* weh

* eee

* a

* a

* WEH

* frfr

* Gatwey

* Fix gateway windows

* Fix gateway windows

* a

* a

* Better layer masking

* a

* a

* Noise fixes

* a

* Fix fractal calculations

* a

* More fixes

* Fixes

* Add layers back in

* Fixes

* namespaces and ftl

* Other TODO

* Fix distance

* Cleanup

* Fix test
2023-11-19 22:09:46 +01:00
metalgearsloth 32bc263207 Add shadow biome (#21276) 2023-11-19 22:03:31 +01:00
deltanedas b88ff3be1d add rainbow fish (#20955)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-20 15:29:03 +02:00
Tad "Taddy" Johnson b4d69ceefa
Reworked riot suit, resprited helmets (#165)
Riot suit now fits palette and theme, and should be more balanced as compared to plate carrier and duravest

Also helmets now resprited
2023-10-13 13:31:14 -05:00
Tad "Taddy" Johnson b4a91df857
Quickerfix (#138)
* Plate Carriers and Stabproof Vests

Replaces the vast majority of armour in organic play with Delta V variants which: A) look nicer, B) are specialised, C) are less cringe B-)

* Adds Resistances to Winter Coats

Captain's winter coat and security winter coat are updated, greatcoat updated to match sec winter coat
2023-10-09 23:43:44 -05:00
metalgearsloth b1c988627a Expeditions rework (#18960) 2023-09-27 21:59:12 +02:00
Kara cd9ceb2378
Ice & snow tile modernization (#19689)
* Add snow tile edges

* Changes for edge tile prio

* Add support for tile weightlessness

* Add weightlessness to ice

* snow duggy moments

* fix ice thing yeah

* actually why even use weightless movement

* upd8 nukieplanet

* i have no idea what im doing

* sprite modifications
2023-08-31 15:31:23 -06:00
Kara 70e0520a2c
Watchers (#19367) 2023-08-27 16:14:57 +10:00
Kara cfccb5959a
Lavaland chasms (#19154) 2023-08-15 12:29:24 +10:00
Kara 42b38b7a5d
Liquid plasma floor entity (#18957) 2023-08-11 00:16:51 +10:00
Vordenburg cc8b642444
Add linter-friendly WeightedRandom prototypes (#18729) 2023-08-06 12:31:25 +10:00
metalgearsloth c31c848afd
Shooting NPCs and more (#18042)
* Add pirate shooting

* Shooting working

* Basics working

* Refactor time

* More conversion

* Update primitives

* Update yml

* weh

* Building again

* Draft

* weh

* b

* Start shutdown

* Starting to take form

* Code side done

* is it worky

* Fix prototypes

* stuff

* Shitty working

* Juke events working

* Even more cleanup

* RTX

* Fix interaction combat mode and compquery

* GetAmmoCount relays

* Fix rotation speed

* Juke fixes

* fixes

* weh

* The collision avoidance never ends

* Fixes

* Pause support

* framework

* lazy

* Fix idling

* Fix drip

* goobed

* Fix takeover shutdown bug

* Merge fixes

* shitter

* Fix carpos
2023-08-01 19:48:56 -05:00
AjexRose f579818f24
Adding Ammofab (#17538) 2023-07-26 20:41:51 -04:00
Jackal298 e95350ee5e
Small addition to the rewards for expeditions (#17990) 2023-07-18 15:09:14 -06:00
Nemanja 6dbfbc52c0
Good Intercoms (#17950)
* crystal anomaly

* Good intercoms

* fixes

* fix construction fail

* Revert "crystal anomaly"

This reverts commit 0d9e3f62ff82c79e72f882b9c7f4ca1b9c6e6dd8.

* migration
2023-07-11 17:58:18 -06:00
Nemanja d2e6e55ed1
Expedition balance pass (#17969)
* Expedition balance pass

* better
2023-07-11 17:56:43 -06:00
metalgearsloth 982e8f3865
Xeno salvage tweaks (#17909)
- Add turret spawns.
- Mark warding tower as anchored.
2023-07-09 13:20:30 -06:00
metalgearsloth 9509757155
Add sub-biomes (#17855) 2023-07-09 15:26:16 +10:00
metalgearsloth 6d19acd708
Make planets have significantly more rocks (#17875) 2023-07-08 13:30:29 +10:00
metalgearsloth 6f371375c5
Fix cave ores (#17733) 2023-06-29 22:36:28 +10:00
deltanedas 9cd8d25ae7
more expedition changes (#17403)
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-06-29 00:01:27 +10:00
metalgearsloth 9cec3238b8
Add basalt walls for lavaland (#17709) 2023-06-28 22:57:40 +10:00
metalgearsloth 4fefd8b8b7
Add snow rocks to planets (#17692) 2023-06-28 21:32:01 +10:00
metalgearsloth cca1a78384
Dungeon generation refactor (#17121) 2023-06-27 19:17:42 +10:00
Nemanja ea767b742b
Buff ores, add quartz (#17453) 2023-06-18 22:03:41 -06:00
Flareguy 0e238dabc9
Adds the SWAT Helmet (#17384)
* adds swat helmet

* joever

* epic > rare

* A
2023-06-18 17:38:55 -06:00
Nemanja 580c57926f
Remove security techfab board from expedition loot (#17448) 2023-06-18 17:37:34 -06:00
Nemanja 0b5ccf3395
Artifact Fragments (#17420) 2023-06-19 00:56:45 +10:00
Nemanja ac9d6c94a0
Add bananium ore to expedition loot (#17421) 2023-06-18 17:11:29 +10:00