diff --git a/android/res/drawable/background.png b/android/res/drawable/background.png
index 7f5d9ff728..b02bc10b64 100644
Binary files a/android/res/drawable/background.png and b/android/res/drawable/background.png differ
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 482ac993cf..102e06c23a 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -4,11 +4,11 @@
Mindustry
- 1 Dollar
- - 2 Dollars
- - 3 Dollars
- 5 Dollars
- 10 Dollars
- 15 Dollars
+ - 25 Dollars
+ - 50 Dollars
diff --git a/android/src/io/anuke/mindustry/DonationsActivity.java b/android/src/io/anuke/mindustry/DonationsActivity.java
index 5c4845da1e..87b3929662 100644
--- a/android/src/io/anuke/mindustry/DonationsActivity.java
+++ b/android/src/io/anuke/mindustry/DonationsActivity.java
@@ -1,11 +1,11 @@
package io.anuke.mindustry;
-import android.content.Intent;
-import android.os.Bundle;
import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
import org.sufficientlysecure.donations.DonationsFragment;
@@ -14,11 +14,11 @@ public class DonationsActivity extends FragmentActivity {
/**
* Google
*/
- private static final String GOOGLE_PUBKEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg8bTVFK5zIg4FGYkHKKQ/j/iGZQlXU0qkAv2BA6epOX1ihbMz78iD4SmViJlECHN8bKMHxouRNd9pkmQKxwEBHg5/xDC/PHmSCXFx/gcY/xa4etA1CSfXjcsS9i94n+j0gGYUg69rNkp+p/09nO9sgfRTAQppTxtgKaXwpfKe1A8oqmDUfOnPzsEAG6ogQL6Svo6ynYLVKIvRPPhXkq+fp6sJ5YVT5Hr356yCXlM++G56Pk8Z+tPzNjjvGSSs/MsYtgFaqhPCsnKhb55xHkc8GJ9haq8k3PSqwMSeJHnGiDq5lzdmsjdmGkWdQq2jIhKlhMZMm5VQWn0T59+xjjIIwIDAQAB";
+ private static final String GOOGLE_PUBKEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzG93KhpfBPKTo2jF0yxbWkkmMKwsPNM4SsMj1aDq7vv6n3R+mqJVfprOJxFfJh7JchXTflLIgiaKXFAiU70gJbMTniEWnEaFSxAeF09a7U0RjOwN+7rFwjCG91c2CpYxPanBTQP4zasc1ODPVzq4q6/4ByjhenN71V4WmR08NFIAodcfFPrOkDPil7i8y7cgcd1Ky53U0TS+LLYJttAK3XdTK4s7VE3I5IKoeNa4uwCmIM59R67q2k3cXjLk/nP6MP+y++EzHN/PTiR1sVg4dMP8K31RPw/1QNLPQwJz6Wc872oWwb7xo5gkoXbDc5WPPydsi8F3SyKNaYwzN6CDFQIDAQAB";
private static final String[] GOOGLE_CATALOG = new String[]{
- "ntpsync.donation.1", "ntpsync.donation.2",
- "ntpsync.donation.5", "ntpsync.donation.5",
- "ntpsync.donation.8", "ntpsync.donation.13" };
+ "mindustry.donation.1", "mindustry.donation.5",
+ "mindustry.donation.10", "mindustry.donation.15",
+ "mindustry.donation.25", "mindustry.donation.50" };
/**
* Called when the activity is first created.
@@ -58,6 +58,7 @@ public class DonationsActivity extends FragmentActivity {
Fragment fragment = fragmentManager.findFragmentByTag("donationsFragment");
if (fragment != null) {
fragment.onActivityResult(requestCode, resultCode, data);
+ //TODO donation event, set settings
}
}
diff --git a/core/assets-raw/sprites/ui/icon-donate.png b/core/assets-raw/sprites/ui/icon-donate.png
new file mode 100644
index 0000000000..ea5c95a660
Binary files /dev/null and b/core/assets-raw/sprites/ui/icon-donate.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 31d18dbc14..7f61e0a159 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -27,49 +27,49 @@ blocks/blackrock1
index: -1
blocks/blackrockshadow1
rotate: false
- xy: 722, 405
+ xy: 722, 381
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/blackstone1
rotate: false
- xy: 722, 395
+ xy: 734, 406
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/blackstone2
rotate: false
- xy: 722, 385
+ xy: 734, 396
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/blackstone3
rotate: false
- xy: 734, 418
+ xy: 724, 371
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/blackstoneblock1
rotate: false
- xy: 498, 110
+ xy: 724, 361
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/blackstoneblock2
rotate: false
- xy: 508, 110
+ xy: 724, 351
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/blackstoneblock3
rotate: false
- xy: 406, 99
+ xy: 498, 110
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -83,7 +83,7 @@ blocks/blackstoneedge
index: -1
blocks/block
rotate: false
- xy: 165, 76
+ xy: 704, 265
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -111,119 +111,119 @@ blocks/chainturret
index: -1
blocks/chainturret-icon
rotate: false
- xy: 569, 215
+ xy: 529, 177
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/coal1
rotate: false
- xy: 224, 83
+ xy: 702, 245
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coal2
rotate: false
- xy: 234, 83
+ xy: 734, 386
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coal3
rotate: false
- xy: 244, 83
+ xy: 734, 376
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coaldrill
rotate: false
- xy: 254, 83
+ xy: 734, 366
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coalgenerator
rotate: false
- xy: 264, 83
+ xy: 734, 356
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coalgenerator-top
rotate: false
- xy: 274, 83
+ xy: 734, 346
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/coalpurifier
rotate: false
- xy: 284, 83
+ xy: 406, 99
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/combustiongenerator
rotate: false
- xy: 294, 83
+ xy: 416, 99
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/compositewall
rotate: false
- xy: 304, 83
+ xy: 165, 76
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conduit
rotate: false
- xy: 314, 83
+ xy: 175, 79
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conduitbottom
rotate: false
- xy: 324, 83
+ xy: 185, 79
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conduitliquid
rotate: false
- xy: 334, 83
+ xy: 195, 79
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conduittop
rotate: false
- xy: 344, 83
+ xy: 205, 79
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conveyor
rotate: false
- xy: 354, 83
+ xy: 215, 79
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conveyormove
rotate: false
- xy: 364, 83
+ xy: 225, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/conveyortunnel
rotate: false
- xy: 374, 83
+ xy: 235, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -237,42 +237,42 @@ blocks/core
index: -1
blocks/cross
rotate: false
- xy: 384, 83
+ xy: 245, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/crucible
rotate: false
- xy: 394, 83
+ xy: 255, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/deepwater
rotate: false
- xy: 404, 89
+ xy: 265, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/dirt1
rotate: false
- xy: 414, 89
+ xy: 275, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/dirt2
rotate: false
- xy: 404, 79
+ xy: 285, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/dirt3
rotate: false
- xy: 414, 79
+ xy: 295, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -286,7 +286,7 @@ blocks/dirtedge
index: -1
blocks/door
rotate: false
- xy: 115, 4
+ xy: 305, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -300,7 +300,7 @@ blocks/door-large
index: -1
blocks/door-large-icon
rotate: false
- xy: 163, 30
+ xy: 315, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -314,21 +314,21 @@ blocks/door-large-open
index: -1
blocks/door-open
rotate: false
- xy: 163, 20
+ xy: 325, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/doubleturret
rotate: false
- xy: 529, 177
+ xy: 514, 124
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/duriumwall
rotate: false
- xy: 167, 10
+ xy: 335, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -342,259 +342,259 @@ blocks/duriumwall-large
index: -1
blocks/duriumwall-large-icon
rotate: false
- xy: 724, 375
+ xy: 345, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/flameturret
rotate: false
- xy: 514, 124
+ xy: 188, 89
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/fluxpump
rotate: false
- xy: 724, 355
+ xy: 365, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grass1
rotate: false
- xy: 724, 345
+ xy: 375, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grass2
rotate: false
- xy: 428, 103
+ xy: 385, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grass3
rotate: false
- xy: 438, 103
+ xy: 395, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grassblock1
rotate: false
- xy: 448, 103
+ xy: 115, 4
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grassblock2
rotate: false
- xy: 458, 103
+ xy: 163, 30
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/grassedge
rotate: false
- xy: 157, 54
+ xy: 157, 40
size: 12, 12
orig: 12, 12
offset: 0, 0
index: -1
blocks/ice1
rotate: false
- xy: 468, 103
+ xy: 163, 20
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/ice2
rotate: false
- xy: 518, 114
+ xy: 167, 10
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/ice3
rotate: false
- xy: 175, 76
+ xy: 428, 103
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/iceedge
rotate: false
- xy: 157, 40
+ xy: 524, 217
size: 12, 12
orig: 12, 12
offset: 0, 0
index: -1
blocks/icerock1
rotate: false
- xy: 185, 79
+ xy: 438, 103
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/icerock2
rotate: false
- xy: 195, 79
+ xy: 448, 103
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/icerockshadow1
rotate: false
- xy: 205, 79
+ xy: 458, 103
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rockshadow1
rotate: false
- xy: 205, 79
+ xy: 458, 103
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/icerockshadow2
rotate: false
- xy: 728, 335
+ xy: 468, 103
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rockshadow2
rotate: false
- xy: 728, 335
+ xy: 468, 103
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/iron1
rotate: false
- xy: 488, 95
+ xy: 285, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/iron2
rotate: false
- xy: 498, 90
+ xy: 295, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/iron3
rotate: false
- xy: 508, 90
+ xy: 305, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/irondrill
rotate: false
- xy: 518, 94
+ xy: 315, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/ironwall
rotate: false
- xy: 518, 84
+ xy: 325, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/junction
rotate: false
- xy: 592, 238
+ xy: 335, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/laserturret
rotate: false
- xy: 344, 93
+ xy: 380, 93
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/lava
rotate: false
- xy: 602, 238
+ xy: 345, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/lavaedge
rotate: false
- xy: 524, 217
+ xy: 538, 217
size: 12, 12
orig: 12, 12
offset: 0, 0
index: -1
blocks/lavasmelter
rotate: false
- xy: 612, 238
+ xy: 355, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/liquiditemjunction
rotate: false
- xy: 622, 238
+ xy: 365, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/liquidjunction
rotate: false
- xy: 632, 238
+ xy: 375, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/liquidrouter
rotate: false
- xy: 642, 238
+ xy: 385, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/machineturret
rotate: false
- xy: 356, 93
+ xy: 392, 93
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/megarepairturret
rotate: false
- xy: 368, 93
+ xy: 131, 8
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/mortarturret
rotate: false
- xy: 380, 93
+ xy: 143, 8
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/mossblock
rotate: false
- xy: 601, 228
+ xy: 478, 103
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/mossstone
rotate: false
- xy: 601, 228
+ xy: 478, 103
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -615,7 +615,7 @@ blocks/nuclearreactor-center
index: -1
blocks/nuclearreactor-icon
rotate: false
- xy: 621, 228
+ xy: 498, 100
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -636,322 +636,322 @@ blocks/nuclearreactor-small
index: -1
blocks/oil
rotate: false
- xy: 631, 228
+ xy: 508, 100
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/oiledge
rotate: false
- xy: 519, 203
+ xy: 519, 189
size: 12, 12
orig: 12, 12
offset: 0, 0
index: -1
blocks/oilrefinery
rotate: false
- xy: 641, 228
+ xy: 518, 104
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/omnidrill
rotate: false
- xy: 593, 218
+ xy: 488, 95
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/plasmaturret
rotate: false
- xy: 392, 93
+ xy: 155, 8
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/powerbooster
rotate: false
- xy: 603, 218
+ xy: 498, 90
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/poweredconveyor
rotate: false
- xy: 613, 218
+ xy: 508, 90
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/poweredconveyormove
rotate: false
- xy: 623, 218
+ xy: 518, 94
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/powerlaser
rotate: false
- xy: 633, 218
+ xy: 518, 84
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/powerlasercorner
rotate: false
- xy: 643, 218
+ xy: 592, 238
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/powerlaserrouter
rotate: false
- xy: 714, 269
+ xy: 602, 238
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pulseconduit
rotate: false
- xy: 714, 259
+ xy: 612, 238
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pulseconduitbottom
rotate: false
- xy: 714, 249
+ xy: 622, 238
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pulseconduittop
rotate: false
- xy: 724, 271
+ xy: 632, 238
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pump
rotate: false
- xy: 724, 261
+ xy: 642, 238
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/repairturret
rotate: false
- xy: 131, 8
+ xy: 709, 279
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/rock1
rotate: false
- xy: 712, 239
+ xy: 601, 228
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rock2
rotate: false
- xy: 744, 418
+ xy: 611, 228
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/router
rotate: false
- xy: 754, 420
+ xy: 621, 228
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rtgenerator
rotate: false
- xy: 688, 237
+ xy: 631, 228
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rtgenerator-top
rotate: false
- xy: 185, 69
+ xy: 641, 228
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sand1
rotate: false
- xy: 195, 69
+ xy: 595, 218
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sand2
rotate: false
- xy: 205, 69
+ xy: 605, 218
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sand3
rotate: false
- xy: 734, 408
+ xy: 615, 218
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sandblock1
rotate: false
- xy: 744, 408
+ xy: 625, 218
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sandblock2
rotate: false
- xy: 754, 410
+ xy: 635, 218
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sandblock3
rotate: false
- xy: 732, 398
+ xy: 645, 218
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sandedge
rotate: false
- xy: 519, 189
+ xy: 533, 203
size: 12, 12
orig: 12, 12
offset: 0, 0
index: -1
blocks/shadow
rotate: false
- xy: 143, 8
+ xy: 721, 281
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/shieldgenerator
rotate: false
- xy: 742, 398
+ xy: 655, 218
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/shotgunturret
rotate: false
- xy: 155, 8
+ xy: 541, 177
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/shrub
rotate: false
- xy: 734, 368
+ xy: 681, 234
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/shrubshadow
rotate: false
- xy: 734, 358
+ xy: 691, 235
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/smelter
rotate: false
- xy: 734, 348
+ xy: 701, 235
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sniperturret
rotate: false
- xy: 541, 177
+ xy: 722, 415
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/snow1
rotate: false
- xy: 744, 378
+ xy: 665, 224
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/snow2
rotate: false
- xy: 744, 368
+ xy: 675, 224
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/snow3
rotate: false
- xy: 744, 358
+ xy: 665, 214
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/snowblock1
rotate: false
- xy: 744, 348
+ xy: 675, 214
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/snowblock2
rotate: false
- xy: 738, 338
+ xy: 685, 224
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/snowblock3
rotate: false
- xy: 738, 328
+ xy: 685, 214
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/snowedge
rotate: false
- xy: 533, 203
+ xy: 533, 189
size: 12, 12
orig: 12, 12
offset: 0, 0
index: -1
blocks/sorter
rotate: false
- xy: 738, 318
+ xy: 695, 225
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelconveyor
rotate: false
- xy: 748, 338
+ xy: 695, 215
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelconveyormove
rotate: false
- xy: 748, 328
+ xy: 705, 225
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelwall
rotate: false
- xy: 748, 318
+ xy: 705, 215
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -965,98 +965,98 @@ blocks/steelwall-large
index: -1
blocks/steelwall-large-icon
rotate: false
- xy: 593, 208
+ xy: 711, 235
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stone1
rotate: false
- xy: 603, 208
+ xy: 712, 245
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stone2
rotate: false
- xy: 613, 208
+ xy: 715, 225
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stone3
rotate: false
- xy: 623, 208
+ xy: 715, 215
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock1
rotate: false
- xy: 633, 208
+ xy: 721, 235
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock2
rotate: false
- xy: 643, 208
+ xy: 725, 225
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock3
rotate: false
- xy: 651, 228
+ xy: 725, 215
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stonedrill
rotate: false
- xy: 653, 218
+ xy: 175, 69
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneedge
rotate: false
- xy: 533, 189
+ xy: 555, 213
size: 12, 12
orig: 12, 12
offset: 0, 0
index: -1
blocks/stoneformer
rotate: false
- xy: 653, 208
+ xy: 185, 69
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stonewall
rotate: false
- xy: 661, 234
+ xy: 195, 69
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/teleporter
rotate: false
- xy: 671, 234
+ xy: 205, 69
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/teleporter-top
rotate: false
- xy: 663, 224
+ xy: 215, 69
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/thermalgenerator
rotate: false
- xy: 663, 214
+ xy: 171, 59
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1070,56 +1070,56 @@ blocks/titancannon
index: -1
blocks/titancannon-icon
rotate: false
- xy: 709, 279
+ xy: 722, 403
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/titanium1
rotate: false
- xy: 673, 224
+ xy: 171, 49
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titanium2
rotate: false
- xy: 673, 214
+ xy: 181, 59
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titanium3
rotate: false
- xy: 663, 204
+ xy: 181, 49
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumdrill
rotate: false
- xy: 673, 204
+ xy: 191, 59
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumpurifier
rotate: false
- xy: 738, 308
+ xy: 191, 49
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumshieldwall
rotate: false
- xy: 748, 308
+ xy: 201, 59
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumwall
rotate: false
- xy: 547, 197
+ xy: 201, 49
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1133,70 +1133,70 @@ blocks/titaniumwall-large
index: -1
blocks/titaniumwall-large-icon
rotate: false
- xy: 557, 203
+ xy: 211, 59
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/turret
rotate: false
- xy: 721, 281
+ xy: 722, 391
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
blocks/uranium1
rotate: false
- xy: 741, 298
+ xy: 235, 63
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/uranium2
rotate: false
- xy: 751, 298
+ xy: 245, 63
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/uranium3
rotate: false
- xy: 733, 288
+ xy: 255, 63
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/uraniumdrill
rotate: false
- xy: 743, 288
+ xy: 265, 63
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/water
rotate: false
- xy: 753, 288
+ xy: 275, 63
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/wateredge
rotate: false
- xy: 555, 213
+ xy: 569, 213
size: 12, 12
orig: 12, 12
offset: 0, 0
index: -1
blocks/waveturret
rotate: false
- xy: 722, 415
+ xy: 734, 416
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
bullet
rotate: false
- xy: 702, 241
+ xy: 704, 255
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1280,14 +1280,14 @@ enemies/targetenemy-t1
index: -1
enemies/enemy-t2
rotate: false
- xy: 688, 261
+ xy: 688, 245
size: 12, 12
orig: 12, 12
offset: 0, 0
index: -1
enemies/enemy-t3
rotate: false
- xy: 688, 247
+ xy: 157, 54
size: 12, 12
orig: 12, 12
offset: 0, 0
@@ -1378,63 +1378,63 @@ enemies/healerenemy-t3
index: -1
enemies/mortarenemy-t1
rotate: false
- xy: 624, 264
+ xy: 624, 248
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
enemies/mortarenemy-t2
rotate: false
- xy: 624, 248
+ xy: 640, 264
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
enemies/mortarenemy-t3
rotate: false
- xy: 640, 264
+ xy: 640, 248
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
enemies/rapidenemy-t1
rotate: false
- xy: 640, 248
+ xy: 693, 275
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
enemies/rapidenemy-t2
rotate: false
- xy: 693, 275
+ xy: 656, 260
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
enemies/rapidenemy-t3
rotate: false
- xy: 656, 260
+ xy: 672, 260
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
enemies/tankenemy-t1
rotate: false
- xy: 672, 260
+ xy: 656, 244
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
enemies/tankenemy-t2
rotate: false
- xy: 656, 244
+ xy: 672, 244
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
enemies/tankenemy-t3
rotate: false
- xy: 672, 244
+ xy: 688, 259
size: 14, 14
orig: 14, 14
offset: 0, 0
@@ -1469,49 +1469,49 @@ enemyarrow
index: -1
icon-coal
rotate: false
- xy: 728, 325
+ xy: 518, 114
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-dirium
rotate: false
- xy: 728, 315
+ xy: 225, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-iron
rotate: false
- xy: 478, 103
+ xy: 235, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-steel
rotate: false
- xy: 488, 105
+ xy: 245, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-stone
rotate: false
- xy: 498, 100
+ xy: 255, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-titanium
rotate: false
- xy: 508, 100
+ xy: 265, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
icon-uranium
rotate: false
- xy: 518, 104
+ xy: 275, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1539,35 +1539,35 @@ laserfull
index: -1
mechs/mech-standard
rotate: false
- xy: 538, 217
+ xy: 519, 203
size: 12, 12
orig: 12, 12
offset: 0, 0
index: -1
shell
rotate: false
- xy: 732, 388
+ xy: 651, 228
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
shot
rotate: false
- xy: 742, 388
+ xy: 661, 234
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
shot-long
rotate: false
- xy: 734, 378
+ xy: 671, 234
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
titanshell
rotate: false
- xy: 557, 193
+ xy: 211, 49
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1659,7 +1659,7 @@ ui/check-over
index: -1
ui/clear
rotate: false
- xy: 581, 215
+ xy: 583, 215
size: 10, 10
orig: 10, 10
offset: 0, 0
@@ -1673,14 +1673,14 @@ ui/cursor
index: -1
ui/icon-arrow-left
rotate: false
- xy: 702, 263
+ xy: 200, 89
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
ui/icon-arrow-right
rotate: false
- xy: 702, 251
+ xy: 212, 89
size: 10, 10
orig: 10, 10
offset: 0, 0
@@ -1722,147 +1722,154 @@ ui/icon-close-over
index: -1
ui/icon-crafting
rotate: false
- xy: 188, 89
+ xy: 224, 93
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
ui/icon-cursor
rotate: false
- xy: 200, 89
+ xy: 236, 93
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
ui/icon-defense
rotate: false
- xy: 212, 89
+ xy: 248, 93
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
ui/icon-distribution
rotate: false
- xy: 224, 93
+ xy: 260, 93
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
-ui/icon-info
- rotate: false
- xy: 236, 93
- size: 10, 10
- orig: 10, 10
- offset: 0, 0
- index: -1
-ui/icon-load
+ui/icon-donate
rotate: false
xy: 629, 280
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
-ui/icon-menu
- rotate: false
- xy: 248, 93
- size: 10, 10
- orig: 10, 10
- offset: 0, 0
- index: -1
-ui/icon-pause
- rotate: false
- xy: 260, 93
- size: 10, 10
- orig: 10, 10
- offset: 0, 0
- index: -1
-ui/icon-play
+ui/icon-info
rotate: false
xy: 272, 93
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
-ui/icon-play-2
+ui/icon-load
rotate: false
xy: 645, 280
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
-ui/icon-power
+ui/icon-menu
rotate: false
xy: 284, 93
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
-ui/icon-production
+ui/icon-pause
rotate: false
xy: 296, 93
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
-ui/icon-quit
- rotate: false
- xy: 661, 276
- size: 14, 14
- orig: 14, 14
- offset: 0, 0
- index: -1
-ui/icon-rotate
- rotate: false
- xy: 677, 276
- size: 14, 14
- orig: 14, 14
- offset: 0, 0
- index: -1
-ui/icon-rotate-arrow
- rotate: false
- xy: 592, 264
- size: 14, 14
- orig: 14, 14
- offset: 0, 0
- index: -1
-ui/icon-save
- rotate: false
- xy: 592, 248
- size: 14, 14
- orig: 14, 14
- offset: 0, 0
- index: -1
-ui/icon-settings
+ui/icon-play
rotate: false
xy: 308, 93
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
-ui/icon-tools
+ui/icon-play-2
rotate: false
- xy: 608, 264
+ xy: 661, 276
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
-ui/icon-touch
+ui/icon-power
rotate: false
xy: 320, 93
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
-ui/icon-tutorial
+ui/icon-production
+ rotate: false
+ xy: 332, 93
+ size: 10, 10
+ orig: 10, 10
+ offset: 0, 0
+ index: -1
+ui/icon-quit
+ rotate: false
+ xy: 677, 276
+ size: 14, 14
+ orig: 14, 14
+ offset: 0, 0
+ index: -1
+ui/icon-rotate
+ rotate: false
+ xy: 592, 264
+ size: 14, 14
+ orig: 14, 14
+ offset: 0, 0
+ index: -1
+ui/icon-rotate-arrow
+ rotate: false
+ xy: 592, 248
+ size: 14, 14
+ orig: 14, 14
+ offset: 0, 0
+ index: -1
+ui/icon-save
+ rotate: false
+ xy: 608, 264
+ size: 14, 14
+ orig: 14, 14
+ offset: 0, 0
+ index: -1
+ui/icon-settings
+ rotate: false
+ xy: 344, 93
+ size: 10, 10
+ orig: 10, 10
+ offset: 0, 0
+ index: -1
+ui/icon-tools
rotate: false
xy: 608, 248
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
+ui/icon-touch
+ rotate: false
+ xy: 356, 93
+ size: 10, 10
+ orig: 10, 10
+ offset: 0, 0
+ index: -1
+ui/icon-tutorial
+ rotate: false
+ xy: 624, 264
+ size: 14, 14
+ orig: 14, 14
+ offset: 0, 0
+ index: -1
ui/icon-weapon
rotate: false
- xy: 332, 93
+ xy: 368, 93
size: 10, 10
orig: 10, 10
offset: 0, 0
@@ -1940,14 +1947,14 @@ ui/selection
index: -1
ui/separator
rotate: false
- xy: 179, 86
+ xy: 169, 86
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
ui/slider
rotate: false
- xy: 547, 207
+ xy: 652, 238
size: 1, 8
orig: 1, 8
offset: 0, 0
@@ -1975,7 +1982,7 @@ ui/slider-knob-over
index: -1
ui/slider-vertical
rotate: false
- xy: 169, 86
+ xy: 724, 348
size: 8, 1
orig: 8, 1
offset: 0, 0
@@ -2077,42 +2084,42 @@ ui/window-empty
index: -1
weapons/blaster
rotate: false
- xy: 416, 99
+ xy: 508, 110
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/flamer
rotate: false
- xy: 724, 365
+ xy: 355, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/mortar
rotate: false
- xy: 591, 228
+ xy: 395, 73
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/multigun
rotate: false
- xy: 611, 228
+ xy: 488, 105
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/railgun
rotate: false
- xy: 724, 251
+ xy: 591, 228
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/triblaster
rotate: false
- xy: 731, 298
+ xy: 225, 63
size: 8, 8
orig: 8, 8
offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 91b3d66ddf..90d1fa32f7 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
index fece74157b..1e27130802 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
@@ -42,35 +42,38 @@ public class MenuFragment implements Fragment{
add(new MenuButton("text-exit", ()-> Gdx.app.exit()));
}
get().pad(Unit.dp.inPixels(16));
- }};
+ }}.end();
visible(()->GameState.is(State.menu));
}}.end();
}else{
new table(){{
- defaults().size(120f).pad(5).units(Unit.dp);
- float isize = Unit.dp.inPixels(14f*4);
-
- new imagebutton("icon-play-2", isize, () -> ui.showLevels()).text("Play").padTop(4f);
-
- new imagebutton("icon-tutorial", isize, ()-> control.playMap(Map.tutorial)).text("Tutorial").padTop(4f);
-
- new imagebutton("icon-load", isize, () -> ui.showLoadGame()).text("Load").padTop(4f);
-
- new imagebutton("icon-tools", isize, () -> ui.showPrefs()).text("Settings").padTop(4f);
-
- visible(()->GameState.is(State.menu));
+ new table(){{
+ defaults().size(120f).pad(5).units(Unit.dp);
+ float isize = Unit.dp.inPixels(14f*4);
+
+ new imagebutton("icon-play-2", isize, () -> ui.showLevels()).text("Play").padTop(4f);
+
+ new imagebutton("icon-tutorial", isize, ()-> control.playMap(Map.tutorial)).text("Tutorial").padTop(4f);
+
+ new imagebutton("icon-load", isize, () -> ui.showLoadGame()).text("Load").padTop(4f);
+
+ new imagebutton("icon-tools", isize, () -> ui.showPrefs()).text("Settings").padTop(4f);
+
+ if(Mindustry.donationsCallable != null){
+ new imagebutton("icon-donate", isize, () -> {
+ Mindustry.donationsCallable.run();
+ }).text("Donate").padTop(4f);
+ }
+
+ visible(()->GameState.is(State.menu));
+ }}.end();
}}.end();
}
//settings icon
new table(){{
atop().aright();
- if(Mindustry.donationsCallable != null){
- new imagebutton("icon-tools", Unit.dp.inPixels(30f), ()->{
- Mindustry.donationsCallable.run();
- }).get().pad(Unit.dp.inPixels(14));
- }
new imagebutton("icon-info", Unit.dp.inPixels(30f), ()->{
ui.showAbout();
}).get().pad(Unit.dp.inPixels(14));