From 5f5987cef22635e6df5ed2fb1c6619555c0c29a4 Mon Sep 17 00:00:00 2001 From: joshuaptfan Date: Tue, 1 Dec 2020 20:20:37 -0800 Subject: [PATCH 1/5] Spellcheck English Steam achievements --- fastlane/metadata/steam/english/achievements.vdf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fastlane/metadata/steam/english/achievements.vdf b/fastlane/metadata/steam/english/achievements.vdf index 5ab7f51bfa..4dca5c99be 100644 --- a/fastlane/metadata/steam/english/achievements.vdf +++ b/fastlane/metadata/steam/english/achievements.vdf @@ -56,21 +56,21 @@ "NEW_ACHIEVEMENT_21_3_NAME" "Swarm" "NEW_ACHIEVEMENT_21_3_DESC" "Have 100 units active at once." "NEW_ACHIEVEMENT_21_4_NAME" "Flock" - "NEW_ACHIEVEMENT_21_4_DESC" "Have 10 Phantom Poly drones active at once." + "NEW_ACHIEVEMENT_21_4_DESC" "Have 10 Poly drones active at once." "NEW_ACHIEVEMENT_21_5_NAME" "Roboticist" "NEW_ACHIEVEMENT_21_5_DESC" "Build every type of unit." "NEW_ACHIEVEMENT_21_6_NAME" "Legions" "NEW_ACHIEVEMENT_21_6_DESC" "Build 1000 units total." "NEW_ACHIEVEMENT_21_9_NAME" "You Should've Listened" "NEW_ACHIEVEMENT_21_9_DESC" "Die in the drop point exclusion zone." - "NEW_ACHIEVEMENT_21_10_NAME" "There are naval units for that." + "NEW_ACHIEVEMENT_21_10_NAME" "There Are Naval Units For That" "NEW_ACHIEVEMENT_21_10_DESC" "Drown." "NEW_ACHIEVEMENT_21_11_NAME" "Collector" "NEW_ACHIEVEMENT_21_11_DESC" "Fill the core to maximum capacity with every type of material." "NEW_ACHIEVEMENT_21_12_NAME" "Crowd" "NEW_ACHIEVEMENT_21_12_DESC" "Host a server with 10 players on it." "NEW_ACHIEVEMENT_21_13_NAME" "Invulnerable" - "NEW_ACHIEVEMENT_21_13_DESC" "Build the Meltdown and, Spectre and Foreshadow.." + "NEW_ACHIEVEMENT_21_13_DESC" "Build the Meltdown, Spectre, and Foreshadow." "NEW_ACHIEVEMENT_21_14_NAME" "Liftoff" "NEW_ACHIEVEMENT_21_14_DESC" "Use the Launch Pad." "NEW_ACHIEVEMENT_21_16_NAME" "Heresy" @@ -90,7 +90,7 @@ "NEW_ACHIEVEMENT_21_23_NAME" "Ignition" "NEW_ACHIEVEMENT_21_23_DESC" "Power up an Impact Reactor." "NEW_ACHIEVEMENT_21_24_NAME" "Acceleration" - "NEW_ACHIEVEMENT_21_24_DESC" "Activate the Interplanteary Accelerator." + "NEW_ACHIEVEMENT_21_24_DESC" "Activate the Interplanetary Accelerator." "NEW_ACHIEVEMENT_21_25_NAME" "The Spiral" "NEW_ACHIEVEMENT_21_25_DESC" "Round and round it goes..." "NEW_ACHIEVEMENT_21_26_NAME" "Escalation" From a8e34381ef2d01b76b63a11eb7db3f21a723ac33 Mon Sep 17 00:00:00 2001 From: joshuaptfan Date: Tue, 1 Dec 2020 20:37:00 -0800 Subject: [PATCH 2/5] Spellcheck Steam store description --- fastlane/metadata/steam/english/achievements.vdf | 2 +- fastlane/metadata/steam/english/description.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fastlane/metadata/steam/english/achievements.vdf b/fastlane/metadata/steam/english/achievements.vdf index 4dca5c99be..df04afc94d 100644 --- a/fastlane/metadata/steam/english/achievements.vdf +++ b/fastlane/metadata/steam/english/achievements.vdf @@ -70,7 +70,7 @@ "NEW_ACHIEVEMENT_21_12_NAME" "Crowd" "NEW_ACHIEVEMENT_21_12_DESC" "Host a server with 10 players on it." "NEW_ACHIEVEMENT_21_13_NAME" "Invulnerable" - "NEW_ACHIEVEMENT_21_13_DESC" "Build the Meltdown, Spectre, and Foreshadow." + "NEW_ACHIEVEMENT_21_13_DESC" "Build the Meltdown, Spectre and Foreshadow." "NEW_ACHIEVEMENT_21_14_NAME" "Liftoff" "NEW_ACHIEVEMENT_21_14_DESC" "Use the Launch Pad." "NEW_ACHIEVEMENT_21_16_NAME" "Heresy" diff --git a/fastlane/metadata/steam/english/description.txt b/fastlane/metadata/steam/english/description.txt index 08947fbfc6..9f5ea15047 100644 --- a/fastlane/metadata/steam/english/description.txt +++ b/fastlane/metadata/steam/english/description.txt @@ -43,10 +43,10 @@ [list] [*] 16 built in maps for custom games, in addition to campaign -[*] Play Co-op, PvP or sandbox +[*] Play co-op, PvP or sandbox [*] Join a public dedicated server, or invite friends to your own private session [*] Customizable game rules: Change block costs, enemy stats, starting items, wave timing and more -[*] Mix&match gamemodes: Combine PvP and PvE gamemodes together +[*] Mix & match gamemodes: Combine PvP and PvE gamemodes together [/list] [h2]Custom Map Editor[/h2] From 1028ade80d8a743f472bf888fa69fafd242d8b09 Mon Sep 17 00:00:00 2001 From: joshuaptfan Date: Tue, 1 Dec 2020 21:07:44 -0800 Subject: [PATCH 3/5] Fix Poly unit description --- core/assets/bundles/bundle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index c3bd4d937d..3918354878 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1473,7 +1473,7 @@ unit.zenith.description = Fires salvos of missiles at all nearby enemies. unit.antumbra.description = Fires a barrage of bullets at all nearby enemies. unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies. unit.mono.description = Automatically mines copper and lead, depositing it into the core. -unit.poly.description = Automatically rebuilds damaged structures and assists other units in construction. +unit.poly.description = Automatically rebuilds destroyed structures and assists other units in construction. unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units. unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units. unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units. From 380c9ab11302743a2a03184464e3062f2ffcc10e Mon Sep 17 00:00:00 2001 From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com> Date: Tue, 1 Dec 2020 22:17:32 -0800 Subject: [PATCH 4/5] Why is this protected in the first place? --- core/src/mindustry/entities/bullet/LaserBoltBulletType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/bullet/LaserBoltBulletType.java b/core/src/mindustry/entities/bullet/LaserBoltBulletType.java index bd1332443f..bebb2814e8 100644 --- a/core/src/mindustry/entities/bullet/LaserBoltBulletType.java +++ b/core/src/mindustry/entities/bullet/LaserBoltBulletType.java @@ -6,7 +6,7 @@ import mindustry.gen.*; import mindustry.content.*; public class LaserBoltBulletType extends BasicBulletType{ - protected float height = 7f, width = 2f; + public float width = 2f, height = 7f; public LaserBoltBulletType(float speed, float damage){ super(speed, damage); From b64df565a4239900f5d625bd3449e0d7a1fe5ab5 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Wed, 2 Dec 2020 14:09:19 +0100 Subject: [PATCH 5/5] Update MassDriver.java --- core/src/mindustry/world/blocks/distribution/MassDriver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java index c1824c7414..4e6def777a 100644 --- a/core/src/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java @@ -242,7 +242,7 @@ public class MassDriver extends Block{ @Override public boolean acceptItem(Building source, Item item){ - //mass drivers that ouput only cannot accept items + //mass drivers that output only cannot accept items return items.total() < itemCapacity && linkValid(); }