Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2023-01-11 09:23:29 -05:00
parent 5a2c987ea6 6eeb49bb37
commit 5e084be6f5
39 changed files with 57 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle.properties
+1
View File
@@ -1217,6 +1217,7 @@ rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Unit Health Multiplier
rules.unitdamagemultiplier = Unit Damage Multiplier
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
core/assets/bundles/bundle_be.properties
+1
View File
@@ -1193,6 +1193,7 @@ rules.unitbuildspeedmultiplier = Множнік хуткасці вытворч
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Множнік здароўя баёў. адз.
rules.unitdamagemultiplier = Множнік страт баёў. адз.
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
core/assets/bundles/bundle_bg.properties
+1
View File
@@ -1203,6 +1203,7 @@ rules.unitbuildspeedmultiplier = Множител на Скоростта на
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Множител на Точките Живот на Единици
rules.unitdamagemultiplier = Множител на Щетите на Единици
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Ядрата Увеличават Максималния Брой Единици
rules.unitcap = Максимален Брой Единици
core/assets/bundles/bundle_ca.properties
+1
View File
@@ -1207,6 +1207,7 @@ rules.unitbuildspeedmultiplier = Multiplicador de la velocitat de producció d
rules.unitcostmultiplier = Multiplicador del cost de les unitats
rules.unithealthmultiplier = Multiplicador de la salut de les unitats
rules.unitdamagemultiplier = Multiplicador del dany de les unitats
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Multiplicador de l’energia solar
rules.unitcapvariable = Els nuclis contribueixen al límit d’unitats
rules.unitcap = Capacitat base d’unitats
core/assets/bundles/bundle_cs.properties
+1
View File
@@ -1205,6 +1205,7 @@ rules.unitbuildspeedmultiplier = Násobek rychlosti výroby jednotek
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Násobek zdraví jednotek
rules.unitdamagemultiplier = Násobek poškození jednotkami
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Jádra Zvýšujou Maximum Počtu Jednotek
rules.unitcap = Základní Maximum Počtu Jednotek
core/assets/bundles/bundle_da.properties
+1
View File
@@ -1193,6 +1193,7 @@ rules.unitbuildspeedmultiplier = Enheds-produktionshastigheds-forstærker
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Enheds-helbreds-forstærker
rules.unitdamagemultiplier = Enheds-skade-forstærker
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
core/assets/bundles/bundle_de.properties
+1
View File
@@ -1216,6 +1216,7 @@ rules.unitbuildspeedmultiplier = Einheiten-Baugeschwindigkeit Multiplikator
rules.unitcostmultiplier = Einheit-Baukosten Multiplikator
rules.unithealthmultiplier = Einheit-Lebenspunkte-Multiplikator
rules.unitdamagemultiplier = Einheit-Schaden-Multiplikator
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solarstrom-Multiplikator
rules.unitcapvariable = Kerne zählen zum Einheiten-Limit dazu
rules.unitcap = Einheiten-Limit
core/assets/bundles/bundle_es.properties
+1
View File
@@ -1213,6 +1213,7 @@ rules.unitbuildspeedmultiplier = Multiplicador de velocidad de producci�n de u
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Multiplicador de vida de unidades
rules.unitdamagemultiplier = Multiplicador de da�o de unidades
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Multiplicador de energ�a solar
rules.unitcapvariable = Las categor�as del n�cleo alteran el l�mite m�ximo de unidades
rules.unitcap = L�mite base de unidades
core/assets/bundles/bundle_et.properties
+1
View File
@@ -1193,6 +1193,7 @@ rules.unitbuildspeedmultiplier = Väeüksuste tootmiskiiruse kordaja
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Väeüksuste elude kordaja
rules.unitdamagemultiplier = Väeüksuste hävitusvõime kordaja
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
core/assets/bundles/bundle_eu.properties
+1
View File
@@ -1195,6 +1195,7 @@ rules.unitbuildspeedmultiplier = Unitateen sorrerarako abiadura-biderkatzailea
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Unitateen osasun-biderkatzailea
rules.unitdamagemultiplier = Unitateen kalte-biderkatzailea
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
core/assets/bundles/bundle_fi.properties
+1
View File
@@ -1192,6 +1192,7 @@ rules.unitbuildspeedmultiplier = Yksikköjen tuotantonopeuskerroin
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Yksikköjen elämäpistekerroin
rules.unitdamagemultiplier = Yksikköjen vahinkokerroin
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Aurinkovoimakerroin
rules.unitcapvariable = Ytimet vaikuttavat yksikkörajaan
rules.unitcap = Perusyksikköraja
core/assets/bundles/bundle_fil.properties
+1
View File
@@ -1192,6 +1192,7 @@ rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Unit Health Multiplier
rules.unitdamagemultiplier = Unit Damage Multiplier
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
core/assets/bundles/bundle_fr.properties
+1
View File
@@ -1217,6 +1217,7 @@ rules.unitbuildspeedmultiplier = Multiplicateur de Vitesse de Construction des U
rules.unitcostmultiplier = Multiplicateur du coût de fabrication des Unités
rules.unithealthmultiplier = Multiplicateur de Santé des Unités
rules.unitdamagemultiplier = Multiplicateur de Dégât des Unités
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Multiplicateur de l'Efficacité des Panneaux Solaires
rules.unitcapvariable = Les Noyaux contribuent à la limite d'Unités actives
rules.unitcap = Limite d'Unités actives de Base
core/assets/bundles/bundle_hu.properties
+1
View File
@@ -1202,6 +1202,7 @@ rules.unitbuildspeedmultiplier = Egység gyártási sebesség szorzó
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Egység életpont szorzó
rules.unitdamagemultiplier = Egység sebzés szorzó
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
core/assets/bundles/bundle_id_ID.properties
+1
View File
@@ -1213,6 +1213,7 @@ rules.unitbuildspeedmultiplier = Penggandaan Kecepatan Munculnya Unit
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Penggandaan Darah Unit
rules.unitdamagemultiplier = Penggandaan Kekuatan Unit
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Penggandaan Tenaga Surya
rules.unitcapvariable = Inti Memengaruhi Batas Unit
rules.unitcap = Batas Unit Dasar
core/assets/bundles/bundle_it.properties
+1
View File
@@ -1199,6 +1199,7 @@ rules.unitbuildspeedmultiplier = Moltiplicatore Velocità Costruzione Unità
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Moltiplicatore Vita Unità
rules.unitdamagemultiplier = Moltiplicatore Danno Unità
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Moltiplicatore energia solare
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
core/assets/bundles/bundle_ja.properties
+1
View File
@@ -1210,6 +1210,7 @@ rules.unitbuildspeedmultiplier = ユニットの製造速度倍率
rules.unitcostmultiplier = ユニットのコスト倍率
rules.unithealthmultiplier = ユニットの体力倍率
rules.unitdamagemultiplier = ユニットのダメージ倍率
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = コア数によってユニット上限を変動
rules.unitcap = 基礎ユニット上限数
core/assets/bundles/bundle_ko.properties
+1
View File
@@ -1205,6 +1205,7 @@ rules.unitbuildspeedmultiplier = 기체 생산속도 배수
rules.unitcostmultiplier = 기체 비용 배수
rules.unithealthmultiplier = 기체 체력 배수
rules.unitdamagemultiplier = 기체 피해량 배수
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = 태양광 전력 배수
rules.unitcapvariable = 코어 기체수 제한 추가
rules.unitcap = 기본 기체 제한
core/assets/bundles/bundle_lt.properties
+1
View File
@@ -1193,6 +1193,7 @@ rules.unitbuildspeedmultiplier = Vienetų Gamybos Greičio Daugiklis
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Vienetų Gyvybių Daugiklis
rules.unitdamagemultiplier = Vienetų Žalos Daugiklis
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
core/assets/bundles/bundle_nl.properties
+1
View File
@@ -1205,6 +1205,7 @@ rules.unitbuildspeedmultiplier = Eenheid Spawnsnelheid Vermenigvuldiger
rules.unitcostmultiplier = Eenheidskosten Vermenigvuldiger
rules.unithealthmultiplier = Eenheid Levenspunten Vermenigvuldiger
rules.unitdamagemultiplier = Eenheid Schade Vermenigvuldiger
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Zonne-Energie Vermenigvuldiger
rules.unitcapvariable = Cores Dragen Bij Aan Eenheidslimiet
rules.unitcap = Bais Eenheidlimiet
core/assets/bundles/bundle_nl_BE.properties
+1
View File
@@ -1193,6 +1193,7 @@ rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Unit Health Multiplier
rules.unitdamagemultiplier = Unit Damage Multiplier
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
core/assets/bundles/bundle_pl.properties
+1
View File
@@ -1203,6 +1203,7 @@ rules.unitbuildspeedmultiplier = Mnożnik Prędkości Tworzenia Jednostek
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Mnożnik Życia Jednostek
rules.unitdamagemultiplier = Mnożnik Obrażeń jednostek
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Rdzenie mają wpływ na limit jednostek
rules.unitcap = Podstawowy limit jednostek
core/assets/bundles/bundle_pt_BR.properties
+1
View File
@@ -1214,6 +1214,7 @@ rules.unitbuildspeedmultiplier = Multiplicador de velocidade de criação de uni
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Multiplicador de vida de unidade
rules.unitdamagemultiplier = Multiplicador de dano de Unidade
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Multiplicador de Energia Solar
rules.unitcapvariable = Núcleos contribuem para a capacidade da unidade
rules.unitcap = Capacidade base da Unidade
core/assets/bundles/bundle_pt_PT.properties
+1
View File
@@ -1193,6 +1193,7 @@ rules.unitbuildspeedmultiplier = Multiplicador de velocidade de criação de uni
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Multiplicador de vida de unidade
rules.unitdamagemultiplier = Multiplicador de dano de Unidade
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
core/assets/bundles/bundle_ro.properties
+1
View File
@@ -1205,6 +1205,7 @@ rules.unitbuildspeedmultiplier = Multiplicatorul Vitezei de Producere a Unităț
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Multiplicatorul Vieții Unităților
rules.unitdamagemultiplier = Multiplicatorul Deteriorării Unităților
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Nucleele Contribuie la Limita Unităților
rules.unitcap = Limita de Bază a Unităților
core/assets/bundles/bundle_ru.properties
+1
View File
@@ -1205,6 +1205,7 @@ rules.unitbuildspeedmultiplier = Множитель скорости произ
rules.unitcostmultiplier = Множитель стоимости боев. ед.
rules.unithealthmultiplier = Множитель прочности боев. ед.
rules.unitdamagemultiplier = Множитель урона боев. ед.
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Множитель солнечной энергии
rules.unitcapvariable = Ядра увеличивают лимит единиц
rules.unitcap = Начальный лимит единиц
core/assets/bundles/bundle_sr.properties
+1
View File
@@ -1207,6 +1207,7 @@ rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Unit Health Multiplier
rules.unitdamagemultiplier = Unit Damage Multiplier
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Jezgara Povećavaju Maksimalni Broj Jedinica
rules.unitcap = Maksimalni Broj Jedinica (ne računajući jezgra)
core/assets/bundles/bundle_sv.properties
+1
View File
@@ -1193,6 +1193,7 @@ rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Unit Health Multiplier
rules.unitdamagemultiplier = Unit Damage Multiplier
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
core/assets/bundles/bundle_th.properties
+1
View File
@@ -1206,6 +1206,7 @@ rules.unitbuildspeedmultiplier = พหุคูณความเร็วใ
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = พหุคูณพลังชีวิตของยูนิต
rules.unitdamagemultiplier = พหุคูณพลังโจมตีของยูนิต
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = พหูคุณพลังงานแสงอาทิตย์
rules.unitcapvariable = เพิ่มจำนวนยูนิตสูงสุดต่อแกนกลาง
rules.unitcap = ขีดกำจัดยูนิตสูงสุดพื้นฐาน
core/assets/bundles/bundle_tk.properties
+1
View File
@@ -1193,6 +1193,7 @@ rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Unit Health Multiplier
rules.unitdamagemultiplier = Unit Damage Multiplier
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Cores Contribute To Unit Cap
rules.unitcap = Base Unit Cap
core/assets/bundles/bundle_tr.properties
+1
View File
@@ -1204,6 +1204,7 @@ rules.unitbuildspeedmultiplier = Birim Üretim Hız Çarpanı
rules.unitcostmultiplier = Birim Fiyat Çarpanı
rules.unithealthmultiplier = Birim Can Çarpanı
rules.unitdamagemultiplier = Birim Hasar Çapanı
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Güneş Paneli Üretim Çarpanı
rules.unitcapvariable = Merkezler Birim Sınırını Etkiler
rules.unitcap = Sabit Birim Sınırı
core/assets/bundles/bundle_uk_UA.properties
+1
View File
@@ -1214,6 +1214,7 @@ rules.unitbuildspeedmultiplier = Множник швидкості виробн
rules.unitcostmultiplier = Множник вартості одиниць
rules.unithealthmultiplier = Множник здоров’я бойових одиниць
rules.unitdamagemultiplier = Множник шкоди бойових одиниць
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Множник сонячної енергії
rules.unitcapvariable = Ядра збільшують обмеження на кількість одиниць
rules.unitcap = Початкове обмеження одиниць
core/assets/bundles/bundle_vi.properties
+1
View File
@@ -1205,6 +1205,7 @@ rules.unitbuildspeedmultiplier = Hệ số tốc độ sản xuất lính
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = Hệ số máu của quân lính
rules.unitdamagemultiplier = Hệ số sát thương của quân lính
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = Solar Power Multiplier
rules.unitcapvariable = Căn cứ tăng giới hạn quân lính
rules.unitcap = Giới hạn quân lính
core/assets/bundles/bundle_zh_CN.properties
+1
View File
@@ -1216,6 +1216,7 @@ rules.unitbuildspeedmultiplier = 单位生产速度倍率
rules.unitcostmultiplier = 单位生产花费倍率
rules.unithealthmultiplier = 单位生命倍率
rules.unitdamagemultiplier = 单位伤害倍率
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = 太阳能发电倍率
rules.unitcapvariable = 核心可增加单位上限
rules.unitcap = 基础单位上限
core/assets/bundles/bundle_zh_TW.properties
+1
View File
@@ -1212,6 +1212,7 @@ rules.unitbuildspeedmultiplier = 單位建設速度加成
rules.unitcostmultiplier = Unit Cost Multiplier
rules.unithealthmultiplier = 單位血量加成
rules.unitdamagemultiplier = 單位傷害加成
rules.unitcrashdamagemultiplier = Unit Crash Damage Multiplier
rules.solarmultiplier = 太陽能電加成
rules.unitcapvariable = 核心限制單位上限
rules.unitcap = 基礎單位上限
core/src/mindustry/entities/comp/BuildingComp.java
+7 -2
View File
@@ -1597,7 +1597,12 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
public boolean collision(Bullet other){
boolean wasDead = health <= 0;
damage(other.team, other.damage() * other.type().buildingDamageMultiplier);
float damage = other.damage() * other.type().buildingDamageMultiplier;
if(!other.type.pierceArmor){
damage = Damage.applyArmor(damage, block.armor);
}
damage(other.team, damage);
Events.fire(bulletDamageEvent.set(self(), other));
if(health <= 0 && !wasDead){
@@ -1853,7 +1858,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
if(Mathf.zero(dm)){
damage = health + 1;
}else{
damage = Damage.applyArmor(damage, block.armor) / dm;
damage /= dm;
}
//TODO handle this better on the client.
core/src/mindustry/entities/comp/UnitComp.java
+3 -3
View File
@@ -589,7 +589,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
float power = item().charge * Mathf.pow(stack().amount, 1.11f) * 160f;
if(!spawnedByCore){
Damage.dynamicExplosion(x, y, flammability, explosiveness, power, (bounds() + type.legLength/1.7f) / 2f, state.rules.damageExplosions && state.rules.unitCrashDamage, item().flammability > 1, team, type.deathExplosionEffect);
Damage.dynamicExplosion(x, y, flammability, explosiveness, power, (bounds() + type.legLength/1.7f) / 2f, state.rules.damageExplosions && state.rules.unitCrashDamage(team) > 0, item().flammability > 1, team, type.deathExplosionEffect);
}else{
type.deathExplosionEffect.at(x, y, bounds() / 2f / 8f);
}
@@ -617,8 +617,8 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
}
//if this unit crash landed (was flying), damage stuff in a radius
if(type.flying && !spawnedByCore && type.createWreck && state.rules.unitCrashDamage){
Damage.damage(team, x, y, Mathf.pow(hitSize, 0.94f) * 1.25f, Mathf.pow(hitSize, 0.75f) * type.crashDamageMultiplier * 5f * state.rules.unitDamage(team), true, false, true);
if(type.flying && !spawnedByCore && type.createWreck && state.rules.unitCrashDamage(team) > 0){
Damage.damage(team, x, y, Mathf.pow(hitSize, 0.94f) * 1.25f, Mathf.pow(hitSize, 0.75f) * type.crashDamageMultiplier * 5f * state.rules.unitCrashDamage(team), true, false, true);
}
if(!headless && type.createScorch){
core/src/mindustry/game/Rules.java
+10 -4
View File
@@ -51,8 +51,6 @@ public class Rules{
public boolean damageExplosions = true;
/** Whether fire (and neoplasm spread) is enabled. */
public boolean fire = true;
/** Whether unit crash damage is enabled. */
public boolean unitCrashDamage = true;
/** Whether units use and require ammo. */
public boolean unitAmmo = false;
/** EXPERIMENTAL! If true, blocks will update in units and share power. */
@@ -67,8 +65,10 @@ public class Rules{
public float unitBuildSpeedMultiplier = 1f;
/** Multiplier of resources that units take to build. */
public float unitCostMultiplier = 1f;
/** How much damage any other units deal. */
/** How much damage units deal. */
public float unitDamageMultiplier = 1f;
/** How much damage unit crash damage deals. (Compounds with unitDamageMultiplier) */
public float unitCrashDamageMultiplier = 1f;
/** If true, ghost blocks will appear upon destruction, letting builder blocks/units rebuild them. */
public boolean ghostBlocks = true;
/** Whether to allow units to build with logic. */
@@ -224,6 +224,10 @@ public class Rules{
return unitDamageMultiplier * teams.get(team).unitDamageMultiplier;
}
public float unitCrashDamage(Team team){
return unitDamage(team) * unitCrashDamageMultiplier * teams.get(team).unitCrashDamageMultiplier;
}
public float blockHealth(Team team){
return blockHealthMultiplier * teams.get(team).blockHealthMultiplier;
}
@@ -266,8 +270,10 @@ public class Rules{
/** How fast unit factories build units. */
public float unitBuildSpeedMultiplier = 1f;
/** How much damage any other units deal. */
/** How much damage units deal. */
public float unitDamageMultiplier = 1f;
/** How much damage unit crash damage deals. (Compounds with unitDamageMultiplier) */
public float unitCrashDamageMultiplier = 1f;
/** Multiplier of resources that units take to build. */
public float unitCostMultiplier = 1f;
/** How much health blocks start with. */
core/src/mindustry/ui/dialogs/CustomRulesDialog.java
+2
View File
@@ -196,6 +196,7 @@ public class CustomRulesDialog extends BaseDialog{
check("@rules.unitcapvariable", b -> rules.unitCapVariable = b, () -> rules.unitCapVariable);
numberi("@rules.unitcap", f -> rules.unitCap = f, () -> rules.unitCap, -999, 999);
number("@rules.unitdamagemultiplier", f -> rules.unitDamageMultiplier = f, () -> rules.unitDamageMultiplier);
number("@rules.unitcrashdamagemultiplier", f -> rules.unitCrashDamageMultiplier = f, () -> rules.unitCrashDamageMultiplier);
number("@rules.unitbuildspeedmultiplier", f -> rules.unitBuildSpeedMultiplier = f, () -> rules.unitBuildSpeedMultiplier, 0f, 50f);
number("@rules.unitcostmultiplier", f -> rules.unitCostMultiplier = f, () -> rules.unitCostMultiplier);
@@ -298,6 +299,7 @@ public class CustomRulesDialog extends BaseDialog{
number("@rules.buildspeedmultiplier", f -> teams.buildSpeedMultiplier = f, () -> teams.buildSpeedMultiplier, 0.001f, 50f);
number("@rules.unitdamagemultiplier", f -> teams.unitDamageMultiplier = f, () -> teams.unitDamageMultiplier);
number("@rules.unitcrashdamagemultiplier", f -> teams.unitCrashDamageMultiplier = f, () -> teams.unitCrashDamageMultiplier);
number("@rules.unitbuildspeedmultiplier", f -> teams.unitBuildSpeedMultiplier = f, () -> teams.unitBuildSpeedMultiplier, 0.001f, 50f);
number("@rules.unitcostmultiplier", f -> teams.unitCostMultiplier = f, () -> teams.unitCostMultiplier);