Skip to content

Commit 6a66bf3

Browse files
committed
Update to v155.3
1 parent 2633f55 commit 6a66bf3

File tree

20 files changed

+48
-48
lines changed

20 files changed

+48
-48
lines changed

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ entVersion = v149.0.0
1919
mindustryBE = false
2020
# Mindustry *release* version, e.g. `v145` or `v146`.
2121
# Leave empty if `mindustryBE = true`.
22-
mindustryVersion = v151.1
22+
mindustryVersion = v155.3
2323
# Mindustry *bleeding-edge* version, corresponds to commit hashes of Anuken/MindustryJitpack, e.g. `345ea0d54de0aee6953a664468556f4fea1a7c4f`.
2424
# Leave empty if `mindustryBE = false`.
2525
mindustryBEVersion =
2626
# Arc version, should either follow `mindustryVersion` for release or whatever hash bleeding-edge Mindustry uses.
27-
arcVersion = v151.1
27+
arcVersion = v155.3
2828
# My black holes library. Just use the latest release.
29-
blackholesVersion = 16
29+
blackholesVersion = 18
3030

3131
##### Android SDK configuration for building Android artifacts.
3232
# Android platform SDK version.

mod.hjson

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"displayName": "Meepscellaneous Concepts",
33
"subtitle": "The machinations of a madman.",
44
"description": "A collection of random ideas that come to my head.\n\n[red]REQUIRES `MEEPofFaith/black-hole-renderer` TO RUN.[]",
5-
"version": 30.3,
6-
"minGameVersion": 151.1,
5+
"version": 30.4,
6+
"minGameVersion": 155.3,
77
"author": "MEEP of Faith (And a bunch of contributors. Load the game with Meepscillaneous Concepts enabled to view them!)",
88
"java": true,
99
"main": "progressed.ProgMats",

src/progressed/content/PMSounds.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static void overrideSounds(){
4242
content.blocks().each(b -> b instanceof PowerGenerator, (PowerGenerator b) -> b.explodeSound = funiBoom);
4343
content.units().each(u -> u.deathSound = Sounds.wind3);
4444

45-
Sounds.press.load(soundFile("press-boom"));
45+
Sounds.uiButton.load(soundFile("press-boom"));
4646
}
4747

4848
protected static String soundPath(String soundName){

src/progressed/content/PMUnitTypes.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public static void load(){
9393
rotate = false;
9494
reload = 120f;
9595
shootCone = 5f;
96-
shootSound = Sounds.missileSmall;
96+
shootSound = Sounds.shootMissileSmall;
9797
layerOffset = -0.005f;
9898

9999
bullet = new BulletType(0, 0){{
@@ -179,7 +179,7 @@ public static void load(){
179179
rotate = true;
180180
rotateSpeed = 35f;
181181
reload = 35f;
182-
shootSound = Sounds.laser;
182+
shootSound = Sounds.shootLancer;
183183

184184
bullet = new LaserBulletType(){{
185185
damage = 45f;

src/progressed/content/blocks/PMBlocks.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public static void load(){
162162
range = 255f;
163163
scaledHealth = 140f;
164164
shootCone = 35f;
165-
shootSound = Sounds.shootBig;
165+
shootSound = Sounds.shootSpectre;
166166
targetAir = targetGround = true;
167167
recoil = 3f;
168168
recoilTime = 90f;
@@ -200,7 +200,7 @@ public static void load(){
200200
maxSpeed = 27f;
201201
scaledHealth = 150;
202202
shootCone = 35f;
203-
shootSound = Sounds.shootBig;
203+
shootSound = Sounds.shootSpectre;
204204
targetAir = targetGround = true;
205205
recoil = 3f;
206206
recoilTime = 90f;
@@ -247,7 +247,7 @@ public static void load(){
247247
maxSpeed = 24f;
248248
scaledHealth = 160f;
249249
shootCone = 35f;
250-
shootSound = Sounds.shootBig;
250+
shootSound = Sounds.shootSpectre;
251251
targetAir = targetGround = true;
252252
recoil = 3f;
253253
recoilTime = 90f;
@@ -569,7 +569,7 @@ public void setBars(){
569569
rotateSpeed = 2.5f;
570570
recoil = 5f;
571571
cooldownTime = 300f;
572-
shootSound = Sounds.cannon;
572+
shootSound = Sounds.shootOmura;
573573

574574
coolant = consumeCoolant(0.2f);
575575
}
@@ -603,7 +603,7 @@ public void setStats(){
603603
reload = 120f;
604604
inaccuracy = 10f;
605605
velocityRnd = 0.2f;
606-
shootSound = Sounds.shootSnap;
606+
shootSound = Sounds.shootScatter;
607607
maxAmmo = 30;
608608
ammoPerShot = 10;
609609

@@ -636,7 +636,7 @@ public void setStats(){
636636
spread = 15;
637637
}};
638638

639-
shootSound = Sounds.shootSnap;
639+
shootSound = Sounds.shootScatter;
640640

641641
coolant = consumeCoolant(0.2f);
642642
}
@@ -684,7 +684,7 @@ public void setStats(){
684684

685685
shootSound = Sounds.none;
686686
loopSoundVolume = 1f;
687-
loopSound = Sounds.laserbeam;
687+
loopSound = Sounds.beamPlasmaSmall;
688688

689689
rotateSpeed = 6f;
690690
rotateSpeedAccel = 0.2f;
@@ -780,7 +780,7 @@ public void setStats(){
780780
recoilTime = 240f;
781781
cooldownTime = 300f;
782782
shootY = -11f / 4f;
783-
shootSound = Sounds.dullExplosion;
783+
shootSound = Sounds.explosionDull;
784784
shootType = PMBullets.blackHole;
785785

786786
consumePower(35f);
@@ -856,7 +856,7 @@ public void setStats(){
856856
shootWarmupSpeed = 0.05f;
857857
minWarmup = 0.9f;
858858
heatColor = Pal.surge;
859-
shootSound = Sounds.malignShoot;
859+
shootSound = Sounds.shootMalign;
860860
rotateSpeed = 2f;
861861
recoil = 8f;
862862
recoilTime = 300f;
@@ -953,7 +953,7 @@ public void setStats(){
953953
range = 800f;
954954
recoil = 0.5f;
955955
rotateSpeed = 0.9f;
956-
shootSound = Sounds.missileLaunch;
956+
shootSound = Sounds.shootMissileLarge;
957957
shootEffect = Fx.none;
958958
smokeEffect = Fx.shootSmokeMissile;
959959

@@ -984,7 +984,7 @@ public void setStats(){
984984
range = 85f * 8f;
985985
minRange = 25f * 8f;
986986
shootY = 0f;
987-
shootSound = Sounds.missileLaunch;
987+
shootSound = Sounds.shootMissileLarge;
988988
cooldownTime = 3.5f * 60f;
989989
shake = 5f;
990990
unitSort = UnitSorts.strongest;
@@ -1017,7 +1017,7 @@ public void setStats(){
10171017
range = 240f * 8f;
10181018
minRange = 50f * 8f;
10191019
shootY = 0f;
1020-
shootSound = Sounds.missileLaunch;
1020+
shootSound = Sounds.shootMissileLarge;
10211021
cooldownTime = 6f * 60f;
10221022
shake = 10f;
10231023
unitSort = UnitSorts.strongest;
@@ -1166,7 +1166,7 @@ public void setStats(){
11661166
hasPower = true;
11671167
hasLiquids = false;
11681168
craftEffect = CrafterFx.superSmeltsmoke;
1169-
ambientSound = Sounds.smelter;
1169+
ambientSound = Sounds.loopSmelter;
11701170
ambientSoundVolume = 1f; //Big flame louder sound. LIKE REALLY LOUD.
11711171

11721172
drawer = new DrawMulti(
@@ -1206,7 +1206,7 @@ public void setStats(){
12061206
));
12071207

12081208
size = 5;
1209-
ambientSound = Sounds.machine;
1209+
ambientSound = Sounds.loopMachine;
12101210
recipes(
12111211
emptyCruiseMissile,
12121212
emptyBallisticMissile,
@@ -1227,7 +1227,7 @@ public void setStats(){
12271227

12281228
size = 5;
12291229
hideDetails = false;
1230-
ambientSound = Sounds.machine;
1230+
ambientSound = Sounds.loopMachine;
12311231
liquidCapacity = 80f;
12321232
recipes(
12331233
basicCruiseMissile, incendiaryCruiseMissile, splitterCruiseMissile,

src/progressed/content/blocks/PMErekirBlocks.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static void load(){
115115
shootWarmupSpeed = 0.03f;
116116
minWarmup = 1f;
117117
warmupMaintainTime = 30f;
118-
shootSound = Sounds.pulseBlast;
118+
shootSound = Sounds.explosionNavanax;
119119
rotateSpeed = 1.5f;
120120

121121
shootType = PMBullets.sentinelLaser;
@@ -152,7 +152,7 @@ public static void load(){
152152
recoilTime = 60f;
153153
shake = 2f;
154154
shootY = -1f;
155-
shootSound = Sounds.artillery;
155+
shootSound = Sounds.shootRipple;
156156
setWarmupTime(0.75f);
157157

158158
drawer = new DrawMulti(

src/progressed/content/blocks/PMModules.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Items.beryllium, new BasicBulletType(2f, 16){{
7171
}}
7272
);
7373

74-
shootSound = Sounds.shootAlt;
74+
shootSound = Sounds.shootBreach;
7575
targetUnderBlocks = false;
7676
reload = 40f;
7777
range = 18f * 8f;
@@ -140,7 +140,7 @@ Items.tungsten, new AntiMissileRailBulletType(){{
140140
reload = 1.25f * 60f;
141141
range = 13.5f * tilesize;
142142
shootEffect = ModuleFx.steamBurst;
143-
shootSound = Sounds.flame;
143+
shootSound = Sounds.shootFlamePlasma;
144144
shootCone = 60f;
145145

146146
shoot = new ShootSpread(12, 3f);
@@ -222,7 +222,7 @@ Items.tungsten, new AntiMissileRailBulletType(){{
222222
}};
223223

224224
reload = 2.5f * 60f;
225-
shootSound = Sounds.bolt;
225+
shootSound = Sounds.shootAlpha;
226226
linearWarmup = true;
227227
minWarmup = 1f;
228228
shootWarmupSpeed = 1.5f / 60f;
@@ -280,7 +280,7 @@ Items.tungsten, new AntiMissileRailBulletType(){{
280280
range = 27f * 8f;
281281
minRange = 7f * 8f;
282282
targetAir = false;
283-
shootSound = Sounds.missileSmall;
283+
shootSound = Sounds.shootMissileSmall;
284284
hideDetails = false;
285285

286286
shoot = new ShootBarrel(){{

src/progressed/content/bullets/PMBullets.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public static void load(){
151151
makeFire = true;
152152
trailColor = hitColor = Pal.lancerLaser;
153153
hitEffect = EnergyFx.sentinelBlast;
154-
hitSound = Sounds.shockBlast;
154+
hitSound = Sounds.explosionArtilleryShockBig;
155155
hitSoundVolume = 4f;
156156
}};
157157

@@ -163,7 +163,7 @@ public static void load(){
163163
frontColor = Color.white;
164164
mixColorTo = Color.white;
165165

166-
hitSound = Sounds.plasmaboom;
166+
hitSound = Sounds.explosionQuad;
167167

168168
hitShake = 4f;
169169

src/progressed/content/bullets/PayloadBullets.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public static void load(){
107107
deathExplosionEffect = MissileFx.missileExplosion;
108108
shootOnDeath = true;
109109
shake = 10f;
110-
shootSound = Sounds.missileLarge;
110+
shootSound = Sounds.shootMissileLarge;
111111
bullet = new ExplosionBulletType(150f, 8f * tilesize){{
112112
hitColor = Pal.accent;
113113
shootEffect = RocketUnitType.rocketShoot;
@@ -137,7 +137,7 @@ public static void load(){
137137
deathExplosionEffect = MissileFx.missileExplosion;
138138
shootOnDeath = true;
139139
shake = 5f;
140-
shootSound = Sounds.missileSmall;
140+
shootSound = Sounds.shootMissileSmall;
141141
bullet = new ExplosionBulletType(150f, 8f * tilesize){{
142142
hitColor = Pal.accent;
143143

@@ -373,7 +373,7 @@ public static void load(){
373373
lifetime = 3f * 60f;
374374
status = StatusEffects.none;
375375

376-
hitSound = Sounds.dullExplosion;
376+
hitSound = Sounds.explosionDull;
377377
hitShake = 30f;
378378
despawnEffect = Fx.none;
379379
absorbEffect = Pseudo3DFx.absorbedLarge;
@@ -446,9 +446,9 @@ public static void load(){
446446
trailLength = 18;
447447
missileAccelTime = 2f * 60f;
448448
lowAltitude = true;
449-
loopSound = Sounds.missileTrail;
449+
loopSound = Sounds.loopMissileTrail;
450450
loopSoundVolume = 0.6f;
451-
deathSound = Sounds.largeExplosion;
451+
deathSound = Sounds.explosionMissile;
452452

453453
fogRadius = 6f;
454454

src/progressed/entities/bullet/energy/SlashBlackHoleBulletType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class SlashBlackHoleBulletType extends BlackHoleBulletType{
1919
public float slashWidthFrom = tilesize, slashWidthTo;
2020
public Color slashColor;
2121
public Effect slashEffect = Fx.none;
22-
public Sound slashSound = Sounds.laserblast;
22+
public Sound slashSound = Sounds.explosionCore;
2323
public float slashSoundVolume = 2f;
2424

2525
public SlashBlackHoleBulletType(float speed, float damage){

0 commit comments

Comments
 (0)