From 8ffb057196aef6d8d82f6c6abf39b89805631c9b Mon Sep 17 00:00:00 2001 From: Cocopomel <79386233+Cocopomel@users.noreply.github.com> Date: Mon, 30 Aug 2021 05:40:13 +0900 Subject: [PATCH] =?UTF-8?q?=ED=83=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.3/Defs/Scenarios/Scenarios_test.xml | 14 +- 1.3/Defs/ThingDef/ThingDef_Security.xml | 186 ++++++++++++++++-- 1.3/Defs/ThingDef/ThingDef_Weapons.xml | 30 +-- ...iel the Automata Beta 1.3 - 2577447997.xml | 2 - Content/Textures/UI/Commands/HE.png | Bin 0 -> 7042 bytes 5 files changed, 193 insertions(+), 39 deletions(-) create mode 100644 Content/Textures/UI/Commands/HE.png diff --git a/1.3/Defs/Scenarios/Scenarios_test.xml b/1.3/Defs/Scenarios/Scenarios_test.xml index 0e55b5d..9c4ec07 100644 --- a/1.3/Defs/Scenarios/Scenarios_test.xml +++ b/1.3/Defs/Scenarios/Scenarios_test.xml @@ -101,7 +101,19 @@
  • StartingThing_Defined - PN_Shell_HighExplosive + PN_Shell_HE + 75 +
    • + +
  • + StartingThing_Defined + PN_Shell_HESH + 75 +
    • + +
  • + StartingThing_Defined + PN_Shell_CI 75
    • diff --git a/1.3/Defs/ThingDef/ThingDef_Security.xml b/1.3/Defs/ThingDef/ThingDef_Security.xml index fb1cf38..586b283 100644 --- a/1.3/Defs/ThingDef/ThingDef_Security.xml +++ b/1.3/Defs/ThingDef/ThingDef_Security.xml @@ -78,6 +78,7 @@ 15000 200 -20 + 1.00 PN_Artillery_Turret @@ -96,7 +97,7 @@
  • PNRP_AutoArtillery
    • Things/Building/PN_Artillery_Ui - 0.6 + 0.9 @@ -112,13 +113,19 @@ MoteOverhead +
  • Verb_Shoot false - 5.5 - 1 - 1 + 9.5 + 0 + 0 true true 11.9 @@ -144,13 +151,13 @@ - + @@ -218,14 +225,16 @@ + + - PN_Shell_HighExplosive - + PN_Shell_HE + ... Things/Item/PNShellHE - PN_Bullet_Shell_HighExplosive + PN_Bullet_Shell_HE 60 55 @@ -249,8 +258,8 @@ - PN_Bullet_Shell_HighExplosive - + PN_Bullet_Shell_HE + Things/Projectile/ShellHighExplosive Graphic_Single @@ -268,4 +277,159 @@ MortarRound_Ambient + + + + + PN_Shell_HESH + + ... + + Things/Item/PNShellHE + + PN_Bullet_Shell_HESH + + 60 + 55 + 1.25 + 1.0 + 1.5 + + +
  • + 3.9 + Bomb + 0.4 + 0.7 + 30~60 +
    • + + + 25 + 15 + +     + + + PN_Bullet_Shell_HESH + + + Things/Projectile/ShellHighExplosive + Graphic_Single + TransparentPostLight + + Projectile_Explosive + + PN_HESHbomb + 205 + 0.9 + true + Artillery_HitThickRoof + MortarBomb_Explode + MortarRound_PreImpact + MortarRound_Ambient + + + + + PN_HESHbomb + 120 + 5.0 + 1.30 + 1 + 1 + 1 + + + + + + PN_Shell_CI + + Cluster Incendiary + + Things/Item/PNShellHE + + PN_Bullet_Shell_CI + + 60 + 55 + 1.25 + 1.0 + 1.5 + + +
  • + 3.9 + Bomb + 0.4 + 0.7 + 30~60 +
    • +     + + 25 + 15 + +     + + + PN_Bullet_Shell_CI + + + Things/Projectile/ShellHighExplosive + Graphic_Single + TransparentPostLight + + TorgueAnty.Projectile_Torgue_Rocket + + PN_CIbomb + 205 + 0.9 + true + Artillery_HitThickRoof + MortarBomb_Explode + MortarRound_PreImpact + MortarRound_Ambient + PN_Bullet_Shell_CI_Sub + 18 + 8.1 + + + + + PN_CIbomb + 10 + 5.0 + 1.30 + 1 + 1 + 1 + + + + PN_Bullet_Shell_CI_Sub + + + Things/Projectile/ShellIncendiary + Graphic_Single + TransparentPostLight + + Projectile_Explosive + + Flame + 6.5 + 2.1 + 60 + 0.6 + Filth_Fuel + 0.25 + true + Artillery_HitThickRoof + MortarIncendiary_Explode + MortarRound_PreImpact + MortarRound_Ambient + true + + \ No newline at end of file diff --git a/1.3/Defs/ThingDef/ThingDef_Weapons.xml b/1.3/Defs/ThingDef/ThingDef_Weapons.xml index 8064ca3..51d6376 100644 --- a/1.3/Defs/ThingDef/ThingDef_Weapons.xml +++ b/1.3/Defs/ThingDef/ThingDef_Weapons.xml @@ -749,7 +749,7 @@ 14 ... - UI/Commands/SC + UI/Commands/HE 0 0 0 @@ -811,32 +811,12 @@ - + PN_Bomb_Cannon - DamageWorker_AddInjury - true - true - {0} has died in an explosion. - Shredded - Crack - true - Blunt - Sharp - 15 40 - 0.5 - 0.10 5 3 - 4 - false - 5 - BlastDry - (1, 0.5, 0.3) - (0.6, 0.5, 0.4) - Explosion_Bomb - Damage_Bomb @@ -1242,14 +1222,14 @@ Projectile_Explosive - PN_Bomb_RailGun + BombSuper 205 1.9 - + \ No newline at end of file diff --git a/Content/Languages/Korean/DefInjected/ThingDef/Paniel the Automata Beta 1.3 - 2577447997.xml b/Content/Languages/Korean/DefInjected/ThingDef/Paniel the Automata Beta 1.3 - 2577447997.xml index 8ce098c..831f322 100644 --- a/Content/Languages/Korean/DefInjected/ThingDef/Paniel the Automata Beta 1.3 - 2577447997.xml +++ b/Content/Languages/Korean/DefInjected/ThingDef/Paniel the Automata Beta 1.3 - 2577447997.xml @@ -64,8 +64,6 @@ 사격 불가: PnL 연료 필요 PnL 아틸러리 캐논 PnL 인더스트리에서 제작한 아틸러리 캐논입니다. 직사만 가능합니다.\n\n내장된 두뇌 코어가 조준 계산을 대신 해줘 빠른 속도로 발사할 수 있습니다. - PnL 고폭탄 - PnL 인더스트리에서 제작한 아틸러리 캐논 전용 고폭탄입니다. 고폭탄 PnL 야전삽 PnL 인더스트리에서 제작한 야전삽입니다. diff --git a/Content/Textures/UI/Commands/HE.png b/Content/Textures/UI/Commands/HE.png new file mode 100644 index 0000000000000000000000000000000000000000..16e643e707d0414fddf469b701c418e2448bcd0b GIT binary patch literal 7042 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 literal 0 HcmV?d00001