From 061357e1df9eb49d233247b9f2e93e60b409c5a4 Mon Sep 17 00:00:00 2001 From: Darkness#3729 <79508138+Darkness6030@users.noreply.github.com> Date: Mon, 29 Nov 2021 17:46:45 +0300 Subject: [PATCH 01/11] Reserved 5000 port for a new gamemode (#6385) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 👀 --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 1fa352ca86..6178f0da0f 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -25,7 +25,7 @@ }, { "name": "DarkDustry", - "address": ["darkdustry.ml", "darkdustry.ml:6000", "darkdustry.ml:7000", "darkdustry.ml:8000", "darkdustry.ml:9000"] + "address": ["darkdustry.ml", "darkdustry.ml:5000", "darkdustry.ml:6000", "darkdustry.ml:7000", "darkdustry.ml:8000", "darkdustry.ml:9000"] }, { "name": "Chaotic Neutral", From 582f05fa33fc33ad6e304e7e4623c95fb84af81b Mon Sep 17 00:00:00 2001 From: smol <75618732+SMOLKEYS@users.noreply.github.com> Date: Tue, 30 Nov 2021 01:23:16 +0800 Subject: [PATCH 02/11] Fix a single pixel in Fuse's sprite (#6387) * Create m * Delete m * Add files via upload --- .../sprites/blocks/turrets/fuse.png | Bin 2369 -> 1587 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/core/assets-raw/sprites/blocks/turrets/fuse.png b/core/assets-raw/sprites/blocks/turrets/fuse.png index 61ff3c7b2d8c66ba1009678759699db8b695d9c3..16c3d3991c236bff2884a1a89db476f8d129a27c 100644 GIT binary patch delta 1571 zcmX>ow3%muay{!WPZ!6KiaBrR?$4HS7dh^qP#|ouqpZ+dVMT}XRLwP~Lc1)cD){a) zVViz1Aw<6I!KDdmbETVCTez+YIVnFuzL%3_XF;yPlETu5it|j&XUV_cTbciC?bi8j z<=b~}Uj05jzbq|1Y}d9ZiBnrIvKL&9WZ_8@G?3WN#cegxb@=|p0kb3(3)J2W`Qy(%FWwZrPGLV|i zq;u$#*1@?A7E9K@ySukUc7c)a>$%_MRCfqZa8gQ~bxo{&(K#I!1{u!FTejJVgr+Go zEby4IthC=bFgc8=Av5azp8nYz@4fmVwORPX!iQcAPv7Leji|58=G-Y5z-78FEl6?M zw)0;%*?JlXI?R1p@Om=)>h148e$D#&Z2t0-U$cZP9x|JMlV98S?R=cP?Ef9L-(ML% zEm-|INOcAGgO>Tfe6$q**|4|F|J9>(FiEO=Rl~Fohf`%Z4exw7oT{v{g7X50eT=)3 zqg34vzkE(DCY`kHo~sti)KB@aGs81OEWvW?1g(YTKRVi2%+CgJ#<^{cdZEW~F5^^b z0?UKC()QGN1o zeb{~b-}%2k%L5)lFp|h{|pWxGbuwDGVQ@;7`J*qWJT$?-`v}#=Hy_?*A zc=$EB{pbi`igwVfaZyrS683ga?f;`cUoU=q`15sv626FQmy#Blq^k-=Fljtg-q`Yk z=S=HSPJ6a*fs+EVwjF!gcHhA-zDc`Lr$N}RNhm1(e@KMx!|A7ZJv}|9a?fvM@pSJ~ zZd7p)vJ2Y9(3Y6lGGEKwRbyd@p3ZK^`g^bSLO4Sibsze(w||`)w(Fs??$y8(FXz`! zsPC8PYFX5W;QsTwtMATk5#d~vrV%h{0+;=s)hBZe zGrTr%$$Olgqv4tHs)JFJbL)qRfOJ%$URFaB>xzr0%P5= z%K;jPyDT|(9?%fdJGH=+sp#p`mLR`bQ&=v4Y>+rtf1pZdVcE7UKg*Rsg*7s}_Hyb{b$ouhQSE!SO+E<;c`yPfJD)Et+*dkx2 zHub_M12=unXUX-4bRV{#-XUZnckG4Y!4jVcs z7xFpQqI-yc`^l;LoS9o#z8WT;{;*a;)3MfPMpJ0~qOH94PKWv$EZh6f_%@wduxI)Q z!S_N=Wh@?SPZFh1O`f#(kb9L!gR$hf48NOKGc{#6E!-IX&s?EW?`Ztz)_r!a>Cs*X zjt5%`g`~SCfYM{?56wr>H^hVYV=7IWf1pb}_s? zxmS0yve)fQ-*xr5N1sR^cl=T%&bT~%ffvWaFyA?SQ%Zk0Ob-)SuJ1Teq4n~_SAupI)=Hjw z=^f#*;9u_cxP!`hzZeZ?3Az10|3D~@l|fkEFfcH9y85}Sb4q9e04QV9ga7~l delta 2359 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 From feba9d677e86bb661a1f344160f4c6a3928ee6d9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 29 Nov 2021 20:13:59 -0500 Subject: [PATCH 03/11] Fixed #6389 --- core/src/mindustry/world/blocks/Attributes.java | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/Attributes.java b/core/src/mindustry/world/blocks/Attributes.java index 9f7a2966f0..e1e73a1ab9 100644 --- a/core/src/mindustry/world/blocks/Attributes.java +++ b/core/src/mindustry/world/blocks/Attributes.java @@ -25,6 +25,7 @@ public class Attributes implements JsonSerializable{ public void add(Attributes other){ check(); + other.check(); for(int i = 0; i < arr.length; i++){ arr[i] += other.arr[i]; } @@ -32,6 +33,7 @@ public class Attributes implements JsonSerializable{ public void add(Attributes other, float scl){ check(); + other.check(); for(int i = 0; i < arr.length; i++){ arr[i] += other.arr[i] * scl; } diff --git a/gradle.properties b/gradle.properties index 2385596a20..611d472faa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=e98a7f21 +archash=00d1f312 From 51fe07daef94015bac48d23331de076f70a1e3bc Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 29 Nov 2021 20:15:13 -0500 Subject: [PATCH 04/11] Backported EnumSet changes --- core/src/mindustry/ai/BlockIndexer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java index c3d6670ffb..b5a0ef202c 100644 --- a/core/src/mindustry/ai/BlockIndexer.java +++ b/core/src/mindustry/ai/BlockIndexer.java @@ -105,8 +105,8 @@ public class BlockIndexer{ var flags = tile.block().flags; var data = team.data(); - if(flags.size() > 0){ - for(BlockFlag flag : flags){ + if(flags.size > 0){ + for(BlockFlag flag : flags.array){ getFlagged(team)[flag.ordinal()].remove(tile); } } @@ -400,10 +400,10 @@ public class BlockIndexer{ //only process entity changes with centered tiles if(tile.isCenter() && tile.build != null){ var data = team.data(); - if(tile.block().flags.size() > 0 && tile.isCenter()){ + if(tile.block().flags.size > 0 && tile.isCenter()){ TileArray[] map = getFlagged(team); - for(BlockFlag flag : tile.block().flags){ + for(BlockFlag flag : tile.block().flags.array){ TileArray arr = map[flag.ordinal()]; From 3819e327e9e0d0098e66edd3a9244fa0e366eae2 Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 29 Nov 2021 18:15:15 -0800 Subject: [PATCH 05/11] Grammar (#6383) * Grammar * English is a terrible language --- core/src/mindustry/type/Liquid.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/type/Liquid.java b/core/src/mindustry/type/Liquid.java index e62805e60b..7e41551f84 100644 --- a/core/src/mindustry/type/Liquid.java +++ b/core/src/mindustry/type/Liquid.java @@ -13,7 +13,7 @@ public class Liquid extends UnlockableContent{ public @Nullable Color barColor; /** Color used to draw lights. Note that the alpha channel is used to dictate brightness. */ public Color lightColor = Color.clear.cpy(); - /** 0-1, 0 is completely inflammable, anything above that may catch fire when exposed to heat, 0.5+ is very flammable. */ + /** 0-1, 0 is completely not flammable, anything above that may catch fire when exposed to heat, 0.5+ is very flammable. */ public float flammability; /** temperature: 0.5 is 'room' temperature, 0 is very cold, 1 is molten hot */ public float temperature = 0.5f; From 8cb830ba419182908ddcf5b5b33d50bfcbcd2f08 Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 29 Nov 2021 20:05:35 -0800 Subject: [PATCH 06/11] Make `MoveLightningAbility` alternating a boolean (#6390) * Revert "BlueWolf does not want MoveLightningAbility to mirror (#6376)" This reverts commit e1685ef46c0376140a7a15f27547e58fc0a5f23e. * boolean `alternate` * Better Javadoc description --- .../entities/abilities/MoveLightningAbility.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/entities/abilities/MoveLightningAbility.java b/core/src/mindustry/entities/abilities/MoveLightningAbility.java index d91a0d6cc8..5b74b73570 100644 --- a/core/src/mindustry/entities/abilities/MoveLightningAbility.java +++ b/core/src/mindustry/entities/abilities/MoveLightningAbility.java @@ -14,7 +14,7 @@ import mindustry.gen.*; public class MoveLightningAbility extends Ability{ /** Lightning damage */ public float damage = 35f; - /** Chance of firing every tick. Set >= 1 to always fire lightning every tick at max speed. */ + /** Chance of firing every tick. Set >= 1 to always fire lightning every tick at max speed */ public float chance = 0.15f; /** Length of the lightning. <= 0 to disable */ public int length = 12; @@ -24,8 +24,10 @@ public class MoveLightningAbility extends Ability{ public Color color = Color.valueOf("a9d8ff"); /** Shifts where the lightning spawns along the Y axis */ public float offset = 0f; - /** Offset along the X axis. */ + /** Offset along the X axis */ public float width = 0f; + /** Whether the spawn side alternates */ + public boolean alternate = true; /** Jittering heat sprite like the shield on v5 Javelin */ public String heatRegion = "error"; /** Bullet type that is fired. Can be null */ @@ -36,6 +38,8 @@ public class MoveLightningAbility extends Ability{ public Effect shootEffect = Fx.sparkShoot; public boolean parentizeEffects; public Sound shootSound = Sounds.spark; + + protected float side = 1f; MoveLightningAbility(){} @@ -64,10 +68,10 @@ public class MoveLightningAbility extends Ability{ public void update(Unit unit){ float scl = Mathf.clamp((unit.vel().len() - minSpeed) / (maxSpeed - minSpeed)); if(Mathf.chance(Time.delta * chance * scl)){ - float x = unit.x + Angles.trnsx(unit.rotation, offset, width), y = unit.y + Angles.trnsy(unit.rotation, offset, width); + float x = unit.x + Angles.trnsx(unit.rotation, offset, width * side), y = unit.y + Angles.trnsy(unit.rotation, offset, width * side); shootEffect.at(x, y, unit.rotation, color, parentizeEffects ? unit : null); - shootSound.at(unit); + shootSound.at(x, y); if(length > 0){ Lightning.create(unit.team, color, damage, x + unit.vel.x, y + unit.vel.y, unit.rotation, length); @@ -76,6 +80,8 @@ public class MoveLightningAbility extends Ability{ if(bullet != null){ bullet.create(unit, unit.team, x, y, unit.rotation + bulletAngle + Mathf.range(bulletSpread)); } + + if(alternate) side *= -1f; } } From 5ea4688e8800050847aff26b24344f08a0bb0041 Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Thu, 2 Dec 2021 12:43:31 -0800 Subject: [PATCH 07/11] get by name (#6396) --- core/src/mindustry/core/ContentLoader.java | 26 +++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/core/ContentLoader.java b/core/src/mindustry/core/ContentLoader.java index 715c22a89b..7d738135cd 100644 --- a/core/src/mindustry/core/ContentLoader.java +++ b/core/src/mindustry/core/ContentLoader.java @@ -264,6 +264,10 @@ public class ContentLoader{ return getByID(ContentType.item, id); } + public Item item(String name){ + return getByName(ContentType.item, name); + } + public Seq liquids(){ return getBy(ContentType.liquid); } @@ -272,6 +276,10 @@ public class ContentLoader{ return getByID(ContentType.liquid, id); } + public Liquid liquid(String name){ + return getByName(ContentType.liquid, name); + } + public Seq bullets(){ return getBy(ContentType.bullet); } @@ -284,10 +292,18 @@ public class ContentLoader{ return getBy(ContentType.status); } + public StatusEffect statusEffect(String name){ + return getByName(ContentType.status, name); + } + public Seq sectors(){ return getBy(ContentType.sector); } + public SectorPreset sector(String name){ + return getByName(ContentType.sector, name); + } + public Seq units(){ return getBy(ContentType.unit); } @@ -296,7 +312,15 @@ public class ContentLoader{ return getByID(ContentType.unit, id); } + public UnitType unit(String name){ + return getByName(ContentType.unit, name); + } + public Seq planets(){ return getBy(ContentType.planet); } -} + + public Planet planet(String name){ + return getByName(ContentType.planet, name); + } +} \ No newline at end of file From adb03c465b224dd91edb5611c5b51ba64098ee5d Mon Sep 17 00:00:00 2001 From: alex <67626131+alexpvpmindustry@users.noreply.github.com> Date: Fri, 3 Dec 2021 08:24:44 +0800 Subject: [PATCH 08/11] add v7 servers for alex servers (#6393) * Update v6 servers for alex servers * Update servers_v7.json alex v7 server --- servers_v7.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 6178f0da0f..8f9812946d 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -74,5 +74,9 @@ { "name": "LostDustry", "address": ["lostdustry.northeurope.cloudapp.azure.com:6568", "lostdustry.northeurope.cloudapp.azure.com:6569", "lostdustry.northeurope.cloudapp.azure.com:6570"] - } + }, + { + "name": "ALEX", + "address": ["dogemindustry.ddns.net:25588"] + } ] From 5c3ecaabb5173efc83bac8e167dd45d169a99583 Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Sat, 4 Dec 2021 20:41:29 -0500 Subject: [PATCH 09/11] Fix incorrect return value (#6401) * Fix incorrect return value the javadoc is a lie * Update Administration.java --- core/src/mindustry/net/Administration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index 98f8b02429..68736ffd37 100644 --- a/core/src/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -302,11 +302,13 @@ public class Administration{ public boolean adminPlayer(String id, String usid){ PlayerInfo info = getCreateInfo(id); + var wasAdmin = info.admin; + info.adminUsid = usid; info.admin = true; save(); - return true; + return wasAdmin; } /** From a3385df88be5c82e64d9586bb05f241285f707ab Mon Sep 17 00:00:00 2001 From: Alexander397172YT <76264974+Alexander397172YT@users.noreply.github.com> Date: Sun, 5 Dec 2021 21:39:02 +0400 Subject: [PATCH 10/11] new createdustry IP (#6406) --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index d9295c19c9..12100bb87a 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -101,7 +101,7 @@ }, { "name": "CreateDustry", - "address": ["144.76.120.74:18645"] + "address": ["129.151.66.139:26032"] }, { "name": "NukeDustry", From 76af0228c13f49d7e5406de33678ecae34fd9b1d Mon Sep 17 00:00:00 2001 From: Rex <77251557+Rex-Hm@users.noreply.github.com> Date: Sun, 5 Dec 2021 18:00:37 -0300 Subject: [PATCH 11/11] Update servers_v6.json (#6407) * Update servers_v6.json * Update servers_v6.json --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index 12100bb87a..f549b49a9e 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -97,7 +97,7 @@ }, { "name": "Mindustry Español", - "address": ["panel.mindustry.me:2011", "yeeth.mindustry.me:6573", "panel.mindustry.me:2000", "panel.mindustry.me:2026"] + "address": ["yeeth.mindustry.me:6578", "yeeth.mindustry.me:6573", "yeeth.mindustry.me:6577", "yeeth.mindustry.me:6576"] }, { "name": "CreateDustry",