Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,901 Commits 4 Branches 180 Tags
c7e9ff7b6fdacc5dd54810df6f6e36795fd06c4e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MEEPofFaith 3e8a40b1e6 Mention default value 2025-02-08 21:52:31 -08:00
MEEPofFaith 70e9d6d4f8 oops 2025-02-08 21:45:28 -08:00
MEEPofFaith 6eb463f5ed oops 2025-02-08 21:44:56 -08:00
MEEPofFaith 35972a6fd9 oops 2025-02-08 21:44:33 -08:00
MEEPofFaith 78aa3b1848 Move back to UnitType 2025-02-08 21:43:56 -08:00
MEEPofFaith 3561562624 oopsies 2025-02-08 21:41:26 -08:00
MEEPofFaith 81b576e8d3 Mine beam wobbles 2025-02-08 21:38:10 -08:00
MEEPofFaith 178f98b6ea Mining beam weapon 2025-02-08 21:33:43 -08:00
MEEPofFaithandGitHub 848249a6dd Consistent engine whites (#10482) 2025-02-09 00:32:34 -05:00
MEEPofFaith d7589ca97c Make mining beam drawing consistent with build beam drawing 2025-02-08 21:29:30 -08:00
MEEPofFaith f724e5639f BuildWeapon call super 
idk if it matters if name is null, but just in case
 2025-02-08 21:18:02 -08:00
MEEPofFaithandGitHub e8a4ecc61e Formatting Icons (#10359) 
* formatIcons

* Smarter end check

I think it's smarter?

* unecessary

* oop

* Update UI.java

* Just don't check for adjacent colons.

The hasUnicodeStr already checks for validity

* Copy from I18NBundle

* Revert "Copy from I18NBundle"

This reverts commit ac660fcd9f.

* If get and format refer to parent, then just set the existing bundle as parent

* Test with Ground Zero objectives

* Update MBundle.java

* That didn't work

* Slip the method into reasonable places like objectives and chat

* Check for Icons as well

* More testing with objective text

* Apply to hints

* Optimized formatIcons

No longer scans through every character

* TIME UPDATE THE BUNDLES YIPPEEEEEEEEEEE

* residual

* Apply to message blocks

* IntelliJ lied

* Suggestions

* Format before sending
 2025-02-09 00:05:43 -05:00
MEEPofFaith cb99313b26 oop 2025-02-08 20:49:35 -08:00
MEEPofFaith 74596a222c Merge branch 'master' into mod-dependencies 2025-02-08 20:48:39 -08:00
MEEPofFaithandGitHub e9ecb2a576 Hovering over blocks with a selection displays the selection (#10323) 
* Selection display

Should this go in building or block?

* Apparently serpulo liquid icons are not square???

* simplify

* simplify further

* Add disabling w/ setting

Probably needs a better name

* Better name

* h
 2025-02-08 21:21:09 -05:00
MEEPofFaithGitHubAnuken
 		07e573ac42 minRangeChange + draw min range (#7504) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-08 20:37:02 -05:00
MEEPofFaithGitHubAnuken
 		ed42bcb4f6 ShieldDamageMultiplier for bullets (#6331) 
* ShieldDamageMultiplier + Dynamic damage multipliers

* Add to stats

* That's not right

* merge typo

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-06 16:57:17 -05:00
MEEPofFaithGitHubAnuken
 		4a0bf40431 reloadWhileCharging (#6889) 
* reloadWhileCharging

* stat?

should include or nah?

* hshchqqqjwvejqwoofpvoeqviwfojpieqwvwcqekpoivmopijr

* Update core/src/mindustry/world/blocks/defense/turrets/Turret.java

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-06 15:44:19 -05:00
MEEPofFaithandGitHub 52b1ef52d0 Display sector description when viewing the tech tree (#5312) 2025-02-06 15:24:37 -05:00
MEEPofFaithGitHubAnuken
 		527e2ee09c Fix loop sound persisting after the payload carrier is removed. (#8034) 
* Properly remove units and blocks in the case that the carrier dies

* added = false

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-06 13:23:11 -05:00
MEEPofFaithGitHubAndrew AntsiferovAnuken
 		e5285356b5 Particle effect fade time (#5948) 
* Particle effect fade time

* Period

.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.

Co-authored-by: Andrew Antsiferov <summet.dev@gmail.com>

---------

Co-authored-by: Andrew Antsiferov <summet.dev@gmail.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2025-02-05 19:47:15 -05:00
MEEPofFaithandGitHub 5e19014b3e #9835 But acually works. (#10462) 
* Easier access to adding custom buttons to vanilla menu categories.

* Initialize in constructor

Don't need to wait for `build` to be able to modify

* seqn't

* Fix null crash on startup

* Check if submenu is empty

Problem that came up in my test. Might be due to my test being done with js.

* Retain original functionality
 2025-02-04 19:15:12 -05:00
MEEPofFaithandGitHub 22d62067a0 Multiple blocked items for drills + Blocked items for beam drills (#8527) 
* Multiple blocked items for drills

Works similarly to output item with GenericCrafters

* blocked items for beam drills
 2025-02-04 15:52:04 -05:00
MEEPofFaithandGitHub 939506ffae Fix multi-item boosters displaying multiple times (#10297) 2025-02-04 14:38:01 -05:00
MEEPofFaithandGitHub 3dd53fd66e Add flyingLayer to units (#10312) 2025-02-04 14:26:26 -05:00
MEEPofFaithandGitHub c5cd3e32f8 Easier access to adding custom buttons to existing vanilla menu categories. (#9835) 
* Easier access to adding custom buttons to vanilla menu categories.

* Initialize in constructor

Don't need to wait for `build` to be able to modify

* seqn't
 2025-02-04 14:20:26 -05:00
MEEPofFaithandGitHub 17b470bacb Percentage modifier stat for status effects (#10306) 
* Percentage modifier stat for status effects

* Merge true by default

Make percentage symbol inherit the color as well

* Multipliers instead of percentages
 2025-02-04 13:58:24 -05:00
MEEPofFaithandGitHub bed8361a03 Display mod version (#10358) 2024-12-05 09:55:55 -05:00
MEEPofFaithandGitHub fdcdd117dd Fix damage multipliers not applying to Lustre (#10308) 2024-11-02 11:14:52 -04:00
MEEPofFaithandGitHub afc1ff58c5 Option for conveyors to not push units around (#10166) 
* Option to not push units around

* Apply to playload conveyors as well
 2024-09-04 21:27:22 -04:00
MEEPofFaith cf9c01966c Merge branch 'master' into mod-dependencies 2024-08-19 02:09:41 -07:00
MEEPofFaithandGitHub c193206ccb Modded payload factory sprites (#8595) 
* Search for modded payload factory blocks

* Generate payload mass driver outlines in mods

* Revert weird change

* Revert "Revert weird change"

This reverts commit 0afd64077a.
 2024-07-07 11:42:45 -04:00
MEEPofFaithandGitHub 4a456645d3 ConsumeItemList (#9947) 
* ConsumeItemList

* Add to ContentParser

* Add efficiency multipliers

* Untested adding to ObjectIntMap and ObjectFloatMap

* Use a single map
 2024-07-07 11:38:21 -04:00
MEEPofFaithandGitHub 5c23abf2d8 Add destination tile to block rotatedOutput (#9949) 
* Add destination to rotatedOutput

* Apply to GenericCrafter for output directions.

* Forgot to remove some logs
 2024-06-16 00:42:40 -04:00
MEEPofFaith 189a794e58 Don't separate if no soft dependencies 2024-04-22 14:32:03 -07:00
MEEPofFaith 6862e18cef Fix UI 2024-04-22 14:29:47 -07:00
MEEPofFaith 3019eb24dc Slightly cleaner code 2024-04-22 14:23:19 -07:00
MEEPofFaith d21cab42a7 Mention soft dependencies on install but not startup 2024-04-22 14:13:55 -07:00
MEEPofFaith 9e234444f1 Less clunky 
Don't display the reload exit message before checking dependencies.
 2024-04-22 09:52:01 -07:00
MEEPofFaith 15491afe49 Check all at once 2024-04-22 09:42:13 -07:00
MEEPofFaith b167bcfbef Check for dependencies when importing a mod 2024-04-22 09:17:28 -07:00
MEEPofFaith bfa329db11 Incorrectly shows dialog when mods with missing dependencies are disabled 2024-04-22 09:11:08 -07:00
MEEPofFaith e6b7d3f82e Fun fact: This bundle entry is unused 2024-04-18 21:56:11 -07:00
MEEPofFaith a51c4e6909 Don't check disabled mods 2024-04-18 13:44:52 -07:00
MEEPofFaith eff7d75712 Display status after downloads are complete. 2024-04-18 11:40:14 -07:00
MEEPofFaith 6e3bc2b4c3 Show display name instead of name 2024-04-16 18:09:05 -07:00
MEEPofFaith 274184e234 Less table 2024-04-16 18:04:00 -07:00
MEEPofFaith ad1a3d694e There is now an escape 
Forgot to add the ok button
 2024-04-16 18:00:47 -07:00
MEEPofFaith 250fb79fa3 "Auto-Import" instead of "Download"? 2024-04-16 17:57:05 -07:00
MEEPofFaith e155bf7101 Cleaner feedback dialog 2024-04-16 17:55:55 -07:00
MEEPofFaith 8f8bd67d4b Exit after importing 2024-04-16 17:22:41 -07:00
MEEPofFaith 5ac8abec0f Display feedback to user 2024-04-16 17:09:23 -07:00
MEEPofFaith dd0719c6f1 modName -> internalName 
https://github.com/Anuken/MindustryMods/pull/31/commits/4746a2fd1ea6928fe30df308c1c2a3505f02354c
 2024-04-16 16:48:44 -07:00
MEEPofFaith 331fd2e803 Unmet dependencies dialog + auto import 2024-04-16 11:36:59 -07:00
MEEPofFaith a58ff06111 Remove added liquid consumes 2024-04-11 09:25:10 +08:00
MEEPofFaithandGitHub fd303524e9 #9706 done smarter (#9723) 
* Convert from explicit check to interface

* Apply the interface to other turret-like blocks
 2024-04-09 11:16:49 -04:00
MEEPofFaithandGitHub 17913f8949 Run applyColor before drawing unit parts (#9547) 
* Run applyColor before drawing unit parts

* Run applyColor before drawing weapon parts
 2024-04-09 10:52:41 -04:00
MEEPofFaithandGitHub 58d6b3e2d6 Make ChildComp work with turrets (#9706) 2024-04-06 09:52:39 -04:00
MEEPofFaithandGitHub 2fb5bc56c6 Better Ability Stats (#9654) 
* Fix armor plate multiplier + change Math.round to Strings.autoFixed

* Missing ability name bundles

* Center ability name

* SuppressionFieldAbility stats

* Is two per row is acceptable?

I can revert this commit if not.

* LiquidExplodeAbility stat display

* MoveLightningAbility stat display

* Better SpawnDeathAbility display

* Fix multiplier coloring inconsistencies

Some had [lightgray] before %/x, some had it after

* Consistent content name display

Match with bullet status effects

* Consistent stat formatting

Convert from some being "stat: #" and some being "# stat" to all being "# stat"

* Re-order stats

* Optimize Imports

* Add ability descriptions

* Apparently I forgot LiquidRegenAbility

* Mention healing allies if displayHeal = true
 2024-03-30 00:11:39 -04:00
MEEPofFaithandGitHub 1cd3b49539 Remove unused bundle 2024-03-29 17:48:15 -07:00
MEEPofFaithandGitHub d8c1ea17e1 Make payload blocks run onDestroyed() of the block payload it carries when destroyed. (#8253) 
* Payloads go boom.

* When a payload unit dies too

* Keep the functionality, but limit it to a rule
 2024-03-29 15:17:19 -04:00
MEEPofFaith c881681634 Add consumers for other liquid fields 
Temperature, heat capacity, viscosity, and explosiveness
 2024-03-26 00:22:27 -07:00
MEEPofFaith faf78b6e77 Display item consumption rate 2024-03-25 11:00:24 -07:00
MEEPofFaith a3a7598e6d Un-lonely the liquid display 2024-03-25 10:48:21 -07:00
MEEPofFaithandGitHub 4cacb79ccd Auto-add produce to liquids (#9666) 2024-03-25 13:31:03 -04:00
MEEPofFaith 92485bd4e6 Revert "Shift the item display over a column instead" 
This reverts commit e40dab9733.
 2024-03-19 18:45:59 -07:00
MEEPofFaith e40dab9733 Shift the item display over a column instead 2024-03-19 18:37:03 -07:00
MEEPofFaith c3823b8477 Cleaner liquid display + Display item rate 2024-03-19 12:22:32 -07:00
MEEPofFaith 66893e5c85 Text Style 2024-03-16 15:25:13 -07:00
MEEPofFaith 11dcbe19f4 Better LiquidDisplay 2024-03-16 15:18:58 -07:00
MEEPofFaith a1b3f54516 Add liquid consumption rates 2024-03-16 15:04:27 -07:00
MEEPofFaith e1476abbfd Remove explosive danger notice 
Surprise!!!!
 2024-03-16 14:28:44 -07:00
MEEPofFaith 3021ac5d60 Merge branch 'master' into power-gen-stats 2024-03-16 14:26:32 -07:00
MEEPofFaith 24b845e8b1 Notice of explosiveness 
I feel like my changes are getting a *bit* intrusive.
 2024-03-15 09:25:10 -07:00
MEEPofFaith e96e312693 Merge branch 'master' into power-gen-stats 2024-03-15 08:36:13 -07:00
MEEPofFaithandGitHub 60c6e03d32 Weather with World Logic (#9621) 
* Weather sense

Honestly, doesn't seem game changing enough to warrant privileged restriction.

* Weather set

* Rename "snow" to "snowing"

Fix conflict with the snow floor block, though I don't know if this'll have negative repercussions on saves.

* Don't last forever

* Cleanup and bundle

* add space
 2024-03-14 14:25:03 -04:00
MEEPofFaith afddb274f6 Don't display locked or hidden items 2024-03-10 13:06:56 -07:00
MEEPofFaith 8e0d3fee67 Allow for simultaneously having both item and liquid efficiency multipliers 2024-03-10 13:01:52 -07:00
MEEPofFaith 3e68285940 Better display for efficiency multiplier consumes 2024-03-10 12:59:00 -07:00
MEEPofFaithandGitHub aa896362dc Shader getShaderFi check for mod files (#9599) 
* Shader getShaderFi check for mod files

* Just use tree.get()

It defaults to files.internal() if nothing is found. Actually, I think this also has the added benefit of allowing mods to override vanilla shaders by having a frag with an identical name.
 2024-03-01 12:50:28 -05:00
MEEPofFaithandGitHub 037f752b73 Improve ArmorPlateAbility draw (#9581) 
* Improve ArmorPlateAbility draw

* Revert to tinting

Just make a white shine sprite. Or none-white if you want some interesting visuals with the colors.

* Fix not applying z when drawShine = false
 2024-02-23 17:11:00 -05:00
MEEPofFaithandGitHub 4e24b31c0d Allow gasses to be coolants (#9545) 2024-02-17 11:23:25 -05:00
MEEPofFaithandGitHub 8f231febb8 Layer options in DrawTurret (#9541) 2024-02-12 23:32:30 -05:00
MEEPofFaithandGitHub 9093c92b07 Add RandomSound support to ContentParser (#9518) 2024-02-04 18:58:40 -05:00
MEEPofFaithandGitHub 75ae76135f targetUnderBlocks for units (#8160) 
* targetUnderBlocks for units

You know, why don't units use the same targeting code as turrets?

* prioritize non-under blocks
 2024-02-03 12:17:07 -05:00
MEEPofFaithandGitHub e1a5484074 Allow mods to add to logic effect map (#9507) 
* Allow mods to add to logic effect map

* Switch to being only a single add.
 2024-02-01 19:04:51 -05:00
MEEPofFaithandGitHub cc0ac1523b SoundEffect's sound should be delayed by its startDelay (#9502) 
* SoundEffect's sound should be delayed by its startDelay

* h
 2024-01-30 10:45:38 -05:00
MEEPofFaithandGitHub 1b14a09f1c Shield health should also be factored in pierce factor when maxDamageFraction is 0 (#9486) 2024-01-27 21:24:48 -05:00
MEEPofFaithandGitHub 2d6e1cdf65 PointLaserBulletType support for Weapons (#9331) 
* PointLaserBulletType support for Weapons

I hate adding more fields to Weapon, but oh well. It's the price to pay when the behavior of what should be spread across multiple classes is compacted into a single class.

* Fix several problems
 2023-12-01 20:50:32 -05:00
MEEPofFaithandGitHub 9bd494504e angleOffset is added twice in Weapon shoot (#9332) 2023-11-30 07:18:40 -05:00
MEEPofFaithandGitHub 2522b16738 SoundEffect - An Effect that produces sound when created. (#9178) 
* SoundEffect

* Add to ClassMap

* Loading via prov does not work

* MEEP, that's not how you random
 2023-10-19 13:55:04 -04:00
MEEPofFaithandGitHub 1d484d34e7 Point bullets hitting buildings doesn't call hit (#9106) 
* Point bullet hitting buildings doesn't call hit

* Use px/py
 2023-09-28 14:26:45 -04:00
MEEPofFaithandGitHub fa0ce204da Unnecessary Drawer Icon Adding (#9078) 
* DrawBlock icons shouldn't have icons by default

It doesn't make sense for drawers like DrawLiquidTile to return icons. Overriding in every such class doesn't make as much sense as simply changing the superclass.

* Ensure that finalIcons is never empty
 2023-09-20 21:20:22 -04:00
MEEPofFaithandGitHub 3d0541084b Weird creation things (#8860) 2023-07-29 13:29:21 -04:00
MEEPofFaithandGitHub 0d8c07d007 Bullet despawn unit shenanigans (#8859) 
* Proper despawn unit direction

* Despawn unit chance

* Merge if statements
 2023-07-28 23:55:20 -04:00
MEEPofFaithandGitHub e5ded1f2dd Allow fluid type configuration for ConsumeCoolant (#8841) 
* Allow fluid type configuration for ConsumeCoolant

* Methods
 2023-07-25 21:47:46 -04:00
MEEPofFaithandGitHub b4e03b46f6 Destroy bullet team (#8792) 
* Option for destroy bullet to be on the block's team

* Random direction

* h
 2023-07-23 16:27:11 -04:00
MEEPofFaithandGitHub 26c0c7467b Lock rotation of blocks with rotate = false to 0 (#8531) 
* Lock rotation of blocks that don't rotate

* Fix input visuals

* Default to false

Quick, stop forcing changes to mods before sk yells at me.

* lock GenericCrafter rotation if rotate = false

* Convert from a setter a to block method

* Simplify

* Revert "lock GenericCrafter rotation if rotate = false"

This reverts commit 26ac41baf5.

* Remove `lockRotation` boolean.

Pointless. If you want something to rotate, just do `rotate = true; drawArrow = false;`
 2023-06-16 15:57:54 -04:00
MEEPofFaithandGitHub 2ff7ccfc19 Laser pierce fixes. (#8526) 
* Flip pierce check order

Allow pierce cap + laser to function together

* Apply to continuous bullets

+ Make visually accurately show length.

* laser parameter for findPierceLength

consistency with collideLine
 2023-06-15 19:33:01 -04:00
MEEPofFaithandGitHub 40c5510205 Better handling of missiles splitting to other missiles (#8603) 
- Pass a shooter separate to owner into `BulletType#create`. `killShooter` kills the owner while the shooter is passed into the missile ai
- `killShooter` no longer kills already dead units
- `MissileAI` no longer aims at shooter's aim pos if the shooter is dead
 2023-06-15 13:57:27 -04:00