30 files changed, 422 insertions(+), 11 deletions(-)
diff --git config_191217_2348/Items/Consumables/consumable_powerups.txt config_200113_1512/Items/Consumables/consumable_powerups.txt
index 3a5e5cc..908bd90 100644
--- config_191217_2348/Items/Consumables/consumable_powerups.txt
+++ config_200113_1512/Items/Consumables/consumable_powerups.txt
@@ -106,10 +106,15 @@
- amount: '50'
icon: ItemLootSteam_10
id: energy10
slot: Energy
tier: '10'
+- amount: '2'
+ icon: ItemLootHealth_10
+ id: health_small_pacifist
+ slot: Health
+ tier: '11'
- amount: '4'
icon: ItemLootSteam_10
id: energy_small_meowza2
slot: Energy
tier: '11'
diff --git config_191217_2348/Items/Secondary Weapons/cloud.txt config_200113_1512/Items/Secondary Weapons/cloud.txt
index b1c3019..aceb0de 100644
--- config_191217_2348/Items/Secondary Weapons/cloud.txt
+++ config_200113_1512/Items/Secondary Weapons/cloud.txt
@@ -2213,10 +2213,11 @@
sfx:
sound: 'null'
icon: ItemLootBlast_Bite_9
id: bite_9
slot: SecondaryAttack
+ soulbound: 'true'
tag: bite
tier: '9'
- actions:
- buff:
cooldown: '1'
@@ -2313,13 +2314,16 @@
offset:
- '0'
- '4.25'
sfx:
sound: 'null'
+ extraTags:
+ - rare
icon: ItemLootBlast_Bite_10
id: bite_10
slot: SecondaryAttack
+ soulbound: 'true'
tag: bite
tier: '10'
- actions:
- buff:
cooldown: '1'
@@ -2417,11 +2421,13 @@
- '0'
- '4.25'
sfx:
sound: 'null'
extraTags:
- - rare
+ - ultra
+ - legendary
icon: ItemLootBlast_Bite10_legendary
id: bite_100
slot: SecondaryAttack
+ soulbound: 'true'
tag: bite
tier: '100'
diff --git config_191217_2348/Quests/quests_daily.txt config_200113_1512/Quests/quests_daily.txt
index dd09ae3..44aa141 100644
--- config_191217_2348/Quests/quests_daily.txt
+++ config_200113_1512/Quests/quests_daily.txt
@@ -702,14 +702,16 @@
- id: dragonbaby
- id: vampire
- id: tunaleader
- id: lightcycle
- id: birdcatcher
+ - id: highmountaingrunt
- id: highmountaingruntleader
- id: highmountainhunter
- id: ninjaleader
- id: ninja
+ - id: bunny
- id: barrager
- id: hammerplanet
- id: hammerplanet2
- id: hyperdrive
unitsPerInstance: '16'
diff --git config_191217_2348/Texts/en-US/buffs.txt config_200113_1512/Texts/en-US/buffs.txt
index cf2f6ae..1990dc3 100644
--- config_191217_2348/Texts/en-US/buffs.txt
+++ config_200113_1512/Texts/en-US/buffs.txt
@@ -1,5 +1,9 @@
+combatsim_bossBuff_gunDamage100:
+ title: +100% Gun Damage
+combatsim_bossBuff_gunDamage50:
+ title: +50% Gun Damage
combatsim_damageReceived100:
title: +100% Damage Taken
combatsim_damageReceived1600:
title: +1600% Damage Taken
combatsim_damageReceived200:
diff --git config_191217_2348/Texts/en-US/item.txt config_200113_1512/Texts/en-US/item.txt
index fea0d3e..ca32ed4 100644
--- config_191217_2348/Texts/en-US/item.txt
+++ config_200113_1512/Texts/en-US/item.txt
@@ -862,14 +862,14 @@ dye_verydarkviolet_body:
name: Very dark violet body paint
dye_verydarkviolet_body_unlimited:
description: "Bucket of very dark violet body paint. \n\n[UNLIMITED USES. Place in storage so you don't lose it when your plane explodes.]"
name: Very dark violet body paint
dye_verydarkviolet_detail:
- nadescriptionme: "Tub of very dark violet detail paint. \n\n[CONSUMABLE, MULTIPLE USES. Place in storage so you don't lose it when your plane explodes.]"
+ description: "Tub of very dark violet detail paint. \n\n[CONSUMABLE, MULTIPLE USES. Place in storage so you don't lose it when your plane explodes.]"
name: Very dark violet detail paint
dye_verydarkviolet_detail_unlimited:
- nadescriptionme: "Tub of very dark violet detail paint. \n\n[UNLIMITED USES. Place in storage so you don't lose it when your plane explodes.]"
+ description: "Tub of very dark violet detail paint. \n\n[UNLIMITED USES. Place in storage so you don't lose it when your plane explodes.]"
name: Very dark violet detail paint
dye_verydarkyellow_body:
description: "Bucket of very dark yellow body paint. \n\n[CONSUMABLE, MULTIPLE USES. Place in storage so you don't lose it when your plane explodes.]"
name: Very dark yellow body paint
dye_verydarkyellow_body_unlimited:
diff --git config_191217_2348/Texts/es/buffs.txt config_200113_1512/Texts/es/buffs.txt
index 6fe584d..6259875 100644
--- config_191217_2348/Texts/es/buffs.txt
+++ config_200113_1512/Texts/es/buffs.txt
@@ -1,5 +1,9 @@
+combatsim_bossBuff_gunDamage100:
+ title: + 100% de daño de arma
+combatsim_bossBuff_gunDamage50:
+ title: + 50% de daño del arma
combatsim_damageReceived100:
title: + 100% el daño recibido
combatsim_damageReceived1600:
title: + 1600% el daño recibido
combatsim_damageReceived200:
diff --git config_191217_2348/Texts/es/item.txt config_200113_1512/Texts/es/item.txt
index f589717..06784a4 100644
--- config_191217_2348/Texts/es/item.txt
+++ config_200113_1512/Texts/es/item.txt
@@ -862,14 +862,20 @@ dye_verydarkviolet_body:
name: Pintura para cubiertas violeta muy oscuro
dye_verydarkviolet_body_unlimited:
description: "Cubo de pintura para cubiertas violeta muy oscuro.\n \n [USOS ILIMITADOS. Almacénala para no perderla cuando el avión explote.]"
name: Pintura para cubiertas violeta muy oscuro
dye_verydarkviolet_detail:
- nadescriptionme: "Cubeta de pintura para detalles violeta muy oscuro.\n \n [CONSUMIBLE, VARIOS USOS. Almacénala para no perderla cuando el avión explote.]"
+ description: 'Tina de pintura detalle violeta muy oscuro.
+
+
+ [, USOS MÚLTIPLES consumible. Lugar en el almacenamiento por lo que no se pierde cuando su avión explota.]'
name: Pintura para detalles violeta muy oscuro
dye_verydarkviolet_detail_unlimited:
- nadescriptionme: "Cubeta de pintura para detalles violeta muy oscuro.\n \n [USOS ILIMITADOS. Almacénala para no perderla cuando el avión explote.]"
+ description: 'Tina de pintura detalle violeta muy oscuro.
+
+
+ [USOS ilimitado. Lugar en el almacenamiento por lo que no se pierde cuando su avión explota.]'
name: Pintura para detalles violeta muy oscuro
dye_verydarkyellow_body:
description: "Cubo de pintura para cubiertas amarillo muy oscuro.\n \n [CONSUMIBLE, VARIOS USOS. Almacénala para no perderla cuando el avión explote.]"
name: Pintura para cubiertas amarillo muy oscuro
dye_verydarkyellow_body_unlimited:
diff --git config_191217_2348/Texts/fr/buffs.txt config_200113_1512/Texts/fr/buffs.txt
index 8026185..9f1060d 100644
--- config_191217_2348/Texts/fr/buffs.txt
+++ config_200113_1512/Texts/fr/buffs.txt
@@ -1,5 +1,9 @@
+combatsim_bossBuff_gunDamage100:
+ title: + 100% de daño de arma
+combatsim_bossBuff_gunDamage50:
+ title: + 50% de daño del arma
combatsim_damageReceived100:
title: + 100% Damage Taken
combatsim_damageReceived1600:
title: + 1600% Damage Taken
combatsim_damageReceived200:
diff --git config_191217_2348/Texts/fr/item.txt config_200113_1512/Texts/fr/item.txt
index 3319d41..00f589d 100644
--- config_191217_2348/Texts/fr/item.txt
+++ config_200113_1512/Texts/fr/item.txt
@@ -862,14 +862,20 @@ dye_verydarkviolet_body:
name: Peinture violet-noir (aplats)
dye_verydarkviolet_body_unlimited:
description: "Pot de peinture violet-noir (aplats). \n \n [USAGE ILLIMITÉ. À stocker afin d'éviter toute perte en cas d'explosion de l'appareil.]"
name: Peinture violet-noir (aplats)
dye_verydarkviolet_detail:
- nadescriptionme: "Bidon de peinture violet-noir (détails). \n \n [CONSOMMABLE, USAGE MULTIPLE. À stocker afin d'éviter toute perte en cas d'explosion de l'appareil.]"
+ description: 'Tina de pintura detalle violeta muy oscuro.
+
+
+ [, USOS MÚLTIPLES consumible. Lugar en el almacenamiento por lo que no se pierde cuando su avión explota.]'
name: Peinture violet-noir (détails)
dye_verydarkviolet_detail_unlimited:
- nadescriptionme: "Bidon de peinture violet-noir (détails). \n \n [USAGE ILLIMITÉ. À stocker afin d'éviter toute perte en cas d'explosion de l'appareil.]"
+ description: 'Tina de pintura detalle violeta muy oscuro.
+
+
+ [USOS ilimitado. Lugar en el almacenamiento por lo que no se pierde cuando su avión explota.]'
name: Peinture violet-noir (détails)
dye_verydarkyellow_body:
description: "Pot de peinture jaune très foncé (aplats). \n \n [CONSOMMABLE, USAGE MULTIPLE. À stocker afin d'éviter toute perte en cas d'explosion de l'appareil.]"
name: Peinture jaune très foncé (aplats)
dye_verydarkyellow_body_unlimited:
diff --git config_191217_2348/Texts/zh-CN/buffs.txt config_200113_1512/Texts/zh-CN/buffs.txt
index 78bac21..6d559c6 100644
--- config_191217_2348/Texts/zh-CN/buffs.txt
+++ config_200113_1512/Texts/zh-CN/buffs.txt
@@ -1,5 +1,9 @@
+combatsim_bossBuff_gunDamage100:
+ title: + 100％枪损伤
+combatsim_bossBuff_gunDamage50:
+ title: + 50％枪损伤
combatsim_damageReceived100:
title: + 100％伤害转化
combatsim_damageReceived1600:
title: + 1600％伤害转化
combatsim_damageReceived200:
diff --git config_191217_2348/Texts/zh-CN/item.txt config_200113_1512/Texts/zh-CN/item.txt
index 874a9df..a89be0c 100644
--- config_191217_2348/Texts/zh-CN/item.txt
+++ config_200113_1512/Texts/zh-CN/item.txt
@@ -862,14 +862,20 @@ dye_verydarkviolet_body:
name: 黑紫色机体涂装
dye_verydarkviolet_body_unlimited:
description: "一桶黑紫色机体涂装。 \n \n [无限使用。放入仓库中以免在飞机爆炸时丢失。]"
name: 黑紫色机体涂装
dye_verydarkviolet_detail:
- nadescriptionme: "一罐黑紫色油彩。 \n \n [消耗品，多次使用。放入仓库中以免在飞机爆炸时丢失。]"
+ description: '很暗紫色细节漆的浴池。
+
+
+ [消耗的，多种用途。在存储位置，这样你就不会失去它时，你的飞机爆炸。]'
name: 黑紫色油彩
dye_verydarkviolet_detail_unlimited:
- nadescriptionme: "一罐黑紫色油彩。 \n \n [无限使用。放入仓库中以免在飞机爆炸时丢失。]"
+ description: '很暗紫色细节漆的浴池。
+
+
+ [UNLIMITED用途。在存储位置，这样你就不会失去它时，你的飞机爆炸。]'
name: 黑紫色油彩
dye_verydarkyellow_body:
description: "一桶土黄色机体涂装。 \n \n [消耗品，多次使用。放入仓库中以免在飞机爆炸时丢失。]"
name: 土黄色机体涂装
dye_verydarkyellow_body_unlimited:
diff --git config_191217_2348/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_31HGH_angel2/DQ_CS_31HGH_angel2master.txt config_200113_1512/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_31HGH_angel2/DQ_CS_31HGH_angel2master.txt
index be6764b..fcef54b 100644
--- config_191217_2348/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_31HGH_angel2/DQ_CS_31HGH_angel2master.txt
+++ config_200113_1512/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_31HGH_angel2/DQ_CS_31HGH_angel2master.txt
@@ -1,8 +1,8 @@
art: '!EnemyInvisible'
artScale: '1'
-colliderRadius: '0.8'
+colliderRadius: '0'
colliderX: '0'
colliderY: '0'
energyRegenRate: '0'
explosionPrefab: planeExplosionEmpty
healthRegenRate: '0'
diff --git config_191217_2348/Units/66D - Space Dungeon/xxx_spaceturret.txt config_200113_1512/Units/66D - Space Dungeon/xxx_spaceturret.txt
index 8d994fb..15441f7 100644
--- config_191217_2348/Units/66D - Space Dungeon/xxx_spaceturret.txt
+++ config_200113_1512/Units/66D - Space Dungeon/xxx_spaceturret.txt
@@ -32,11 +32,11 @@ gunTypes:
name: spaceturretgun
rof: '3'
speed: '4'
spread: '0'
healthRegenRate: '0'
-isVisibleInRadar: 'false'
+isVisibleInRadar: 'true'
maxEnergyPoints: '1'
maxHitPoints: '20'
maxSpeed: '10'
maxTurnRate: '270'
minSpeed: '0'
diff --git config_200113_1512/Units/74D - Combat Dungeon/Chests/BOS1_pacifist_healthdropper.txt config_200113_1512/Units/74D - Combat Dungeon/Chests/BOS1_pacifist_healthdropper.txt
new file mode 100644
index 0000000..94e20c9
--- /dev/null
+++ config_200113_1512/Units/74D - Combat Dungeon/Chests/BOS1_pacifist_healthdropper.txt
@@ -0,0 +1,22 @@
+art: '!EnemyInvisible'
+artScale: '1'
+colliderRadius: '0'
+colliderX: '0'
+colliderY: '0'
+damageThreshold: '0'
+energyRegenRate: '0'
+explosionPrefab: ExplosionSmall
+hashOverride: '7817'
+healthRegenRate: '0'
+isVisibleInRadar: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '1'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+showName: never
+showStats: never
+spawnInvulnerabilitySeconds: '10000'
+templateName: pacifist_healthdropper
+tier: '10'
+xpMultiplier: '0'
diff --git config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest1.txt config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest1.txt
new file mode 100644
index 0000000..a2becd3
--- /dev/null
+++ config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest1.txt
@@ -0,0 +1,20 @@
+art: CollectableTreasureCachePrefab
+artScale: '1'
+colliderRadius: '0.8'
+colliderX: '0'
+colliderY: '0'
+damageThreshold: '0'
+energyRegenRate: '0'
+explosionPrefab: ExplosionBig2
+healthRegenRate: '0'
+isCountable: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '1'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+spawnInvulnerabilitySeconds: '0'
+templateName: pacifistchest1
+tier: '10'
+xpMultiplier: '0'
+xpRadius: '15'
diff --git config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest10.txt config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest10.txt
new file mode 100644
index 0000000..fc58209
--- /dev/null
+++ config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest10.txt
@@ -0,0 +1,20 @@
+art: CollectableTreasureCachePrefab
+artScale: '1'
+colliderRadius: '0.8'
+colliderX: '0'
+colliderY: '0'
+damageThreshold: '0'
+energyRegenRate: '0'
+explosionPrefab: ExplosionBig2
+healthRegenRate: '0'
+isCountable: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '1'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+spawnInvulnerabilitySeconds: '0'
+templateName: pacifistchest10
+tier: '10'
+xpMultiplier: '0'
+xpRadius: '15'
diff --git config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest2.txt config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest2.txt
new file mode 100644
index 0000000..dc0ad54
--- /dev/null
+++ config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest2.txt
@@ -0,0 +1,20 @@
+art: CollectableTreasureCachePrefab
+artScale: '1'
+colliderRadius: '0.8'
+colliderX: '0'
+colliderY: '0'
+damageThreshold: '0'
+energyRegenRate: '0'
+explosionPrefab: ExplosionBig2
+healthRegenRate: '0'
+isCountable: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '1'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+spawnInvulnerabilitySeconds: '0'
+templateName: pacifistchest2
+tier: '10'
+xpMultiplier: '0'
+xpRadius: '15'
diff --git config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest3.txt config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest3.txt
new file mode 100644
index 0000000..a1e2c50
--- /dev/null
+++ config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest3.txt
@@ -0,0 +1,20 @@
+art: CollectableTreasureCachePrefab
+artScale: '1'
+colliderRadius: '0.8'
+colliderX: '0'
+colliderY: '0'
+damageThreshold: '0'
+energyRegenRate: '0'
+explosionPrefab: ExplosionBig2
+healthRegenRate: '0'
+isCountable: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '1'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+spawnInvulnerabilitySeconds: '0'
+templateName: pacifistchest3
+tier: '10'
+xpMultiplier: '0'
+xpRadius: '15'
diff --git config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest4.txt config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest4.txt
new file mode 100644
index 0000000..eb0995a
--- /dev/null
+++ config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest4.txt
@@ -0,0 +1,20 @@
+art: CollectableTreasureCachePrefab
+artScale: '1'
+colliderRadius: '0.8'
+colliderX: '0'
+colliderY: '0'
+damageThreshold: '0'
+energyRegenRate: '0'
+explosionPrefab: ExplosionBig2
+healthRegenRate: '0'
+isCountable: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '1'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+spawnInvulnerabilitySeconds: '0'
+templateName: pacifistchest4
+tier: '10'
+xpMultiplier: '0'
+xpRadius: '15'
diff --git config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest5.txt config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest5.txt
new file mode 100644
index 0000000..aa84b0d
--- /dev/null
+++ config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest5.txt
@@ -0,0 +1,20 @@
+art: CollectableTreasureCachePrefab
+artScale: '1'
+colliderRadius: '0.8'
+colliderX: '0'
+colliderY: '0'
+damageThreshold: '0'
+energyRegenRate: '0'
+explosionPrefab: ExplosionBig2
+healthRegenRate: '0'
+isCountable: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '1'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+spawnInvulnerabilitySeconds: '0'
+templateName: pacifistchest5
+tier: '10'
+xpMultiplier: '0'
+xpRadius: '15'
diff --git config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest6.txt config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest6.txt
new file mode 100644
index 0000000..5ca5454
--- /dev/null
+++ config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest6.txt
@@ -0,0 +1,20 @@
+art: CollectableTreasureCachePrefab
+artScale: '1'
+colliderRadius: '0.8'
+colliderX: '0'
+colliderY: '0'
+damageThreshold: '0'
+energyRegenRate: '0'
+explosionPrefab: ExplosionBig2
+healthRegenRate: '0'
+isCountable: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '1'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+spawnInvulnerabilitySeconds: '0'
+templateName: pacifistchest6
+tier: '10'
+xpMultiplier: '0'
+xpRadius: '15'
diff --git config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest7.txt config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest7.txt
new file mode 100644
index 0000000..cddc4e8
--- /dev/null
+++ config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest7.txt
@@ -0,0 +1,20 @@
+art: CollectableTreasureCachePrefab
+artScale: '1'
+colliderRadius: '0.8'
+colliderX: '0'
+colliderY: '0'
+damageThreshold: '0'
+energyRegenRate: '0'
+explosionPrefab: ExplosionBig2
+healthRegenRate: '0'
+isCountable: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '1'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+spawnInvulnerabilitySeconds: '0'
+templateName: pacifistchest7
+tier: '10'
+xpMultiplier: '0'
+xpRadius: '15'
diff --git config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest8.txt config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest8.txt
new file mode 100644
index 0000000..e8044c5
--- /dev/null
+++ config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest8.txt
@@ -0,0 +1,20 @@
+art: CollectableTreasureCachePrefab
+artScale: '1'
+colliderRadius: '0.8'
+colliderX: '0'
+colliderY: '0'
+damageThreshold: '0'
+energyRegenRate: '0'
+explosionPrefab: ExplosionBig2
+healthRegenRate: '0'
+isCountable: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '1'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+spawnInvulnerabilitySeconds: '0'
+templateName: pacifistchest8
+tier: '10'
+xpMultiplier: '0'
+xpRadius: '15'
diff --git config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest9.txt config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest9.txt
new file mode 100644
index 0000000..abee196
--- /dev/null
+++ config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchest9.txt
@@ -0,0 +1,20 @@
+art: CollectableTreasureCachePrefab
+artScale: '1'
+colliderRadius: '0.8'
+colliderX: '0'
+colliderY: '0'
+damageThreshold: '0'
+energyRegenRate: '0'
+explosionPrefab: ExplosionBig2
+healthRegenRate: '0'
+isCountable: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '1'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+spawnInvulnerabilitySeconds: '0'
+templateName: pacifistchest9
+tier: '10'
+xpMultiplier: '0'
+xpRadius: '15'
diff --git config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchesthealth.txt config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchesthealth.txt
new file mode 100644
index 0000000..9c92f9b
--- /dev/null
+++ config_200113_1512/Units/74D - Combat Dungeon/Chests/unit_pacifistchesthealth.txt
@@ -0,0 +1,18 @@
+art: CollectableTreasureCachePrefab
+artScale: '1'
+colliderRadius: '0.8'
+colliderX: '0'
+colliderY: '0'
+energyRegenRate: '0'
+explosionPrefab: ExplosionBig2
+healthRegenRate: '0'
+isCountable: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '1'
+maxSpeed: '0'
+maxTurnRate: '0'
+minSpeed: '0'
+spawnInvulnerabilitySeconds: '0'
+templateName: pacifistchesthealth
+tier: '10'
+xpMultiplier: '0'
diff --git config_191217_2348/buffTags.txt config_200113_1512/buffTags.txt
index 626daee..0b5d3ff 100644
--- config_191217_2348/buffTags.txt
+++ config_200113_1512/buffTags.txt
@@ -92,5 +92,10 @@
- combatsim_damageReceived400
- combatsim_damageReceived800
- combatsim_damageReceived1600
id: combatsim_damageReceived
stacks: '1'
+- buffs:
+ - combatsim_bossBuff_gunDamage50
+ - combatsim_bossBuff_gunDamage100
+ id: combatsim_bossBuffs
+ stacks: '1'
diff --git config_191217_2348/buffs.txt config_200113_1512/buffs.txt
index abf5666..447534b 100644
--- config_191217_2348/buffs.txt
+++ config_200113_1512/buffs.txt
@@ -1126,10 +1126,14 @@
- format: dialogue
id: dungeonmod_pacifist
portrait: radar
effects:
- statMod:
+ amount: '2'
+ math: multiply
+ name: maxHitPoints
+ - statMod:
amount: '80'
math: multiply
name: xpMod
- statMod:
amount: '0'
@@ -1184,5 +1188,41 @@
expireOnServerLeave: 'true'
hudColorBackground: 2C1447FF
hudColorBar: ff7900ff
id: damage_nerf_sky
stackOverflowRule: Ignore
+- dialogue:
+ onStart:
+ - speechOptions:
+ - format: dialogue
+ id: combatsim_gunDamage50
+ portrait: radar
+ effects:
+ - statMod:
+ amount: '1.5'
+ math: multiply
+ name: gunDamageMod
+ expireOnServerLeave: 'true'
+ hudColorBackground: 55ff55ff
+ hudColorBar: 428142ff
+ hudVisible: 'true'
+ id: combatsim_bossBuff_gunDamage50
+ stackOverflowRule: ReplaceOldest
+ stacks: '0'
+- dialogue:
+ onStart:
+ - speechOptions:
+ - format: dialogue
+ id: combatsim_gunDamage100
+ portrait: radar
+ effects:
+ - statMod:
+ amount: '2.0'
+ math: multiply
+ name: gunDamageMod
+ expireOnServerLeave: 'true'
+ hudColorBackground: 55ff55ff
+ hudColorBar: 428142ff
+ hudVisible: 'true'
+ id: combatsim_bossBuff_gunDamage100
+ stackOverflowRule: ReplaceOldest
+ stacks: '0'
diff --git config_191217_2348/combatSimulations.txt config_200113_1512/combatSimulations.txt
index 4ee1fa0..439ec60 100644
--- config_191217_2348/combatSimulations.txt
+++ config_200113_1512/combatSimulations.txt
@@ -3,10 +3,16 @@ locations:
modes:
- test
- daily_solo
- daily_guild
- daily_alt
+ - solo_basic
+ - solo_high_tier
+ - solo_boss_rush
+ - guild_basic
+ - guild_high_tier
+ - guild_boss_rush
- solo_survival
- guild_survival
- solo_survival_pacifist
- guild_survival_pacifist
- id: nexus
@@ -1125,5 +1131,65 @@ modes:
schedule:
minute: '*/5'
variants:
- guild_survival_pacifist
version: '1'
+- hash: '10'
+ id: solo_basic
+ periodFormat: yyyy-MM-dd HH:mm
+ playGracePeriod: '01:00:00.00'
+ postPeriodRewardClaimTimeout: 02.00:00:00.00
+ schedule:
+ minute: '*/5'
+ variants:
+ - solo_basic
+ version: '1'
+- hash: '11'
+ id: solo_high_tier
+ periodFormat: yyyy-MM-dd HH:mm
+ playGracePeriod: '01:00:00.00'
+ postPeriodRewardClaimTimeout: 02.00:00:00.00
+ schedule:
+ minute: '*/5'
+ variants:
+ - solo_high_tier
+ version: '1'
+- hash: '12'
+ id: solo_boss_rush
+ periodFormat: yyyy-MM-dd HH:mm
+ playGracePeriod: '01:00:00.00'
+ postPeriodRewardClaimTimeout: 02.00:00:00.00
+ schedule:
+ minute: '*/5'
+ variants:
+ - solo_boss_rush
+ version: '1'
+- hash: '13'
+ id: guild_basic
+ periodFormat: yyyy-MM-dd HH:mm
+ playGracePeriod: '01:00:00.00'
+ postPeriodRewardClaimTimeout: 02.00:00:00.00
+ schedule:
+ minute: '*/5'
+ variants:
+ - guild_basic
+ version: '1'
+- hash: '14'
+ id: guild_high_tier
+ periodFormat: yyyy-MM-dd HH:mm
+ playGracePeriod: '01:00:00.00'
+ postPeriodRewardClaimTimeout: 02.00:00:00.00
+ schedule:
+ minute: '*/5'
+ variants:
+ - guild_high_tier
+ version: '1'
+- hash: '15'
+ id: guild_boss_rush
+ periodFormat: yyyy-MM-dd HH:mm
+ playGracePeriod: '01:00:00.00'
+ postPeriodRewardClaimTimeout: 02.00:00:00.00
+ schedule:
+ minute: '*/5'
+ variants:
+ - guild_boss_rush
+ version: '1'
diff --git config_191217_2348/global.txt config_200113_1512/global.txt
index 36c0810..ad9598f 100644
--- config_191217_2348/global.txt
+++ config_200113_1512/global.txt
@@ -117,10 +117,11 @@ gracefulKickWarningTimeout: '10'
gracefulKickWarnings: '5'
gracefulReconnectTimeout: '10'
greenTeamAllyMaxCount: '1'
greenTeamAllyMaxDistance: '1'
groundHeight: '3.5'
+gunFireMaxDistanceSq: '256'
gunSignalMinDamage: '0.1'
gunSignalMinInterval: '0.0'
gunSignalTime: '0.0'
healthUIThreshold: '10'
ignoreFireAfterTeleportTime: '2'
diff --git config_191217_2348/index.txt config_200113_1512/index.txt
index 97468c5..f8ebeb3 100644
--- config_191217_2348/index.txt
+++ config_200113_1512/index.txt
@@ -1751,10 +1751,11 @@
- Units/00 - Quest Enemies/tut_05/unit_tut_05_centipede02
- Units/00 - Quest Enemies/tut_05/unit_tut_05_centipede03
- Units/00 - Quest Enemies/tut_05/unit_tut_05_lasereye
- Units/00 - Quest Enemies/tut_05/unit_tut_05_trainA01
- Units/00 - Quest Enemies/tut_05/unit_tut_05_trainA02
+- Units/74D - Combat Dungeon/Chests/BOS1_pacifist_healthdropper
- Units/74D - Combat Dungeon/Chests/unit_chest1
- Units/74D - Combat Dungeon/Chests/unit_chest10
- Units/74D - Combat Dungeon/Chests/unit_chest10spawner
- Units/74D - Combat Dungeon/Chests/unit_chest1item
- Units/74D - Combat Dungeon/Chests/unit_chest1spawner
@@ -1773,10 +1774,21 @@
- Units/74D - Combat Dungeon/Chests/unit_chest7spawner
- Units/74D - Combat Dungeon/Chests/unit_chest8
- Units/74D - Combat Dungeon/Chests/unit_chest8spawner
- Units/74D - Combat Dungeon/Chests/unit_chest9
- Units/74D - Combat Dungeon/Chests/unit_chest9spawner
+- Units/74D - Combat Dungeon/Chests/unit_pacifistchest1
+- Units/74D - Combat Dungeon/Chests/unit_pacifistchest10
+- Units/74D - Combat Dungeon/Chests/unit_pacifistchest2
+- Units/74D - Combat Dungeon/Chests/unit_pacifistchest3
+- Units/74D - Combat Dungeon/Chests/unit_pacifistchest4
+- Units/74D - Combat Dungeon/Chests/unit_pacifistchest5
+- Units/74D - Combat Dungeon/Chests/unit_pacifistchest6
+- Units/74D - Combat Dungeon/Chests/unit_pacifistchest7
+- Units/74D - Combat Dungeon/Chests/unit_pacifistchest8
+- Units/74D - Combat Dungeon/Chests/unit_pacifistchest9
+- Units/74D - Combat Dungeon/Chests/unit_pacifistchesthealth
- Units/74D - Combat Dungeon/Chests/xxx_groupchest1
- Units/74D - Combat Dungeon/Chests/xxx_groupchest10
- Units/74D - Combat Dungeon/Chests/xxx_groupchest2
- Units/74D - Combat Dungeon/Chests/xxx_groupchest3
- Units/74D - Combat Dungeon/Chests/xxx_groupchest4