mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-05 13:08:20 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #3487 / Fixed #3484

Browse Source
This commit is contained in:
Anuken 2020-11-20 09:13:36 -05:00
parent a0f1f52a8b
commit abdccbb1bd
8 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/deployment.yml vendored
View File

@ -28,6 +28,13 @@ jobs:
git commit -m "Update ${GITHUB_REF:1}"
git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/MindustryGame/docs
cd ../Mindustry
- name: Add Arc release
run: |
git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
cd ../Arc
git tag ${GITHUB_REF}
git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/Arc ${GITHUB_REF};
cd ../Mindustry
- name: Update F-Droid build string
run: |
git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds

2
android/build.gradle
View File

@ -35,7 +35,7 @@ dependencies{
natives "com.github.Anuken.Arc:natives-box2d-android:${getArcHash()}"
//android dependencies magically disappear during compilation, thanks gradle!
def sdkFile = new File(System.getenv("ANDROID_HOME"), "/platforms/android-29/android.jar")
def sdkFile = new File((String)System.getenv("ANDROID_HOME"), "/platforms/android-29/android.jar")
if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath)
}

2
core/src/mindustry/content/Blocks.java
View File

@ -2054,7 +2054,7 @@ public class Blocks implements ContentList{
}};
interplanetaryAccelerator = new Accelerator("interplanetary-accelerator"){{
requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.copper, 9000, Items.silicon, 9000, Items.thorium, 9000, Items.titanium, 9000, Items.surgeAlloy, 5000, Items.phaseFabric, 4000));
requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.copper, 16000, Items.silicon, 11000, Items.thorium, 13000, Items.titanium, 12000, Items.surgeAlloy, 6000, Items.phaseFabric, 5000));
researchCostMultiplier = 0.1f;
size = 7;
hasPower = true;

3
core/src/mindustry/content/TechTree.java
View File

@ -465,8 +465,7 @@ public class TechTree implements ContentList{
//TODO change positions?
node(impact0078, Seq.with(
new SectorComplete(tarFields),
new Research(Items.thorium),
new Research(overdriveProjector)
new Research(Items.thorium)
), () -> {
node(desolateRift, Seq.with(
new SectorComplete(impact0078),

2
core/src/mindustry/net/Administration.java
View File

@ -303,8 +303,6 @@ public class Administration{
public boolean adminPlayer(String id, String usid){
PlayerInfo info = getCreateInfo(id);
if(info.admin && info.adminUsid != null && info.adminUsid.equals(usid)) return false;
info.adminUsid = usid;
info.admin = true;
save();

2
core/src/mindustry/ui/Fonts.java
View File

@ -129,7 +129,7 @@ public class Fonts{
glyph.srcX = 0;
glyph.srcY = 0;
glyph.width = size;
glyph.height = size;
glyph.height = (int)((float)region.height / region.width * size);
glyph.u = region.u;
glyph.v = region.v2;
glyph.u2 = region.u2;

2
core/src/mindustry/ui/fragments/HudFragment.java
View File

@ -53,7 +53,7 @@ public class HudFragment extends Fragment{
int max = 10;
int winWave = state.isCampaign() && state.rules.winWave > 0 ? state.rules.winWave : Integer.MAX_VALUE;
outer:
for(int i = state.wave - 1; i <= Math.min(state.wave + max, winWave); i++){
for(int i = state.wave - 1; i <= Math.min(state.wave + max, winWave - 2); i++){
for(SpawnGroup group : state.rules.spawns){
if(group.effect == StatusEffects.boss && group.getSpawned(i) > 0){
int diff = (i + 2) - state.wave;

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=e327ec0bf805e7ad3cb4d95b242bf8424c487a64
archash=178412d54b62da44b56f7fde3b2fb9b81c5b0418