mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-15 12:24:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into bloom

Browse Source
This commit is contained in:
Anuken 2019-06-24 19:45:13 -04:00
commit b7a0ebad17
10 changed files with 4302 additions and 4296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/sprites/block_colors.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 712 B

After

Width:  |  Height:  |  Size: 712 B

768
core/assets/sprites/sprites.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

BIN
core/assets/sprites/sprites2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 254 KiB

After

Width:  |  Height:  |  Size: 254 KiB

7824
core/assets/sprites/sprites_fallback.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites_fallback2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 143 KiB

After

Width:  |  Height:  |  Size: 140 KiB

BIN
core/assets/sprites/sprites_fallback3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 242 KiB

After

Width:  |  Height:  |  Size: 234 KiB

BIN
core/assets/sprites/sprites_fallback4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 346 KiB

After

Width:  |  Height:  |  Size: 316 KiB

BIN
core/assets/sprites/sprites_fallback5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 272 KiB

After

Width:  |  Height:  |  Size: 282 KiB

6
core/src/io/anuke/mindustry/content/Bullets.java
View File

@ -280,6 +280,7 @@ public class Bullets implements ContentList{
standardCopper = new BasicBulletType(2.5f, 9, "bullet"){{ standardCopper = new BasicBulletType(2.5f, 9, "bullet"){{
bulletWidth = 7f; bulletWidth = 7f;
bulletHeight = 9f; bulletHeight = 9f;
lifetime = 60f;
shootEffect = Fx.shootSmall; shootEffect = Fx.shootSmall;
smokeEffect = Fx.shootSmallSmoke; smokeEffect = Fx.shootSmallSmoke;
ammoMultiplier = 1; ammoMultiplier = 1;
@ -290,6 +291,7 @@ public class Bullets implements ContentList{
bulletHeight = 12f; bulletHeight = 12f;
reloadMultiplier = 0.6f; reloadMultiplier = 0.6f;
ammoMultiplier = 2; ammoMultiplier = 2;
lifetime = 60f;
}}; }};
standardThorium = new BasicBulletType(4f, 29, "bullet"){{ standardThorium = new BasicBulletType(4f, 29, "bullet"){{
@ -298,6 +300,7 @@ public class Bullets implements ContentList{
shootEffect = Fx.shootBig; shootEffect = Fx.shootBig;
smokeEffect = Fx.shootBigSmoke; smokeEffect = Fx.shootBigSmoke;
ammoMultiplier = 2; ammoMultiplier = 2;
lifetime = 60f;
}}; }};
standardHoming = new BasicBulletType(3f, 9, "bullet"){{ standardHoming = new BasicBulletType(3f, 9, "bullet"){{
@ -306,6 +309,7 @@ public class Bullets implements ContentList{
homingPower = 5f; homingPower = 5f;
reloadMultiplier = 1.4f; reloadMultiplier = 1.4f;
ammoMultiplier = 3; ammoMultiplier = 3;
lifetime = 60f;
}}; }};
standardIncendiary = new BasicBulletType(3.2f, 11, "bullet"){{ standardIncendiary = new BasicBulletType(3.2f, 11, "bullet"){{
@ -317,6 +321,7 @@ public class Bullets implements ContentList{
incendAmount = 1; incendAmount = 1;
incendChance = 0.3f; incendChance = 0.3f;
inaccuracy = 3f; inaccuracy = 3f;
lifetime = 60f;
}}; }};
standardGlaive = new BasicBulletType(4f, 7.5f, "bullet"){{ standardGlaive = new BasicBulletType(4f, 7.5f, "bullet"){{
@ -327,6 +332,7 @@ public class Bullets implements ContentList{
incendSpread = 3f; incendSpread = 3f;
incendAmount = 1; incendAmount = 1;
incendChance = 0.3f; incendChance = 0.3f;
lifetime = 60f;
}}; }};
standardMechSmall = new BasicBulletType(4f, 9, "bullet"){{ standardMechSmall = new BasicBulletType(4f, 9, "bullet"){{