Skip to content

Commit

Permalink
Merge pull request #102 from 1242509682/master
Browse files Browse the repository at this point in the history 
修复 优化了配置文件的排版次序，加入了“挖矿套是否开启连锁挖矿”配置项
  • Loading branch information
@Controllerdestiny
Controllerdestiny authored May 6, 2024
2 parents ac52e46 + 054be60 commit 71bb384
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 57 deletions.
5 changes: 4 additions & 1 deletion Challenger/Challenger/Challenger.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,10 @@ public void MiningArmor(Player player, Config config)
{
TShock.Players[player.whoAmI].SetBuff(effect, 180, false);
}
VeinMinerOpen = true;
if (config.MiningArmor_1)
{
VeinMinerOpen = true;
}
}
else
{
Expand Down
76 changes: 38 additions & 38 deletions Challenger/Challenger/Config.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,30 @@ public class Config
{
public static readonly string FilePath = Path.Combine(TShock.SavePath, "ChallengerConfig.json");

[JsonProperty("是否启用挑战模式")]
[JsonProperty("是否启用挑战模式", Order = -5)]
public bool enableChallenge = true;
[JsonProperty("是否启用BOSS魔改")]
[JsonProperty("是否启用BOSS魔改", Order = -5)]
public bool enableBossAI = false;
[JsonProperty("启用话痨模式", Order = -5)]
public bool EnableConsumptionMode = false;
[JsonProperty("启用广播话痨模式", Order = -5)]
public bool EnableBroadcastConsumptionMode = false;

[JsonProperty("是否启用怪物吸血")]
[JsonProperty("是否启用怪物吸血", Order = -4)]
public bool enableMonsterSucksBlood = true;
[JsonProperty("怪物吸血比率")]
[JsonProperty("怪物吸血比率", Order = -4)]
public float BloodAbsorptionRatio = 0.25f;
[JsonProperty("怪物回血上限：小怪>1.5倍则会消失")]
public float BloodAbsorptionRatio_Max { get; set; } = 1.5f;
[JsonProperty("怪物吸血比率对于Boss")]
[JsonProperty("怪物吸血比率对于Boss", Order = -4)]
public float BloodAbsorptionRatioForBoss = 0.5f;
[JsonProperty("怪物回血上限：小怪>1.5倍则会消失", Order = -4)]
public float BloodAbsorptionRatio_Max { get; set; } = 1.5f;

[JsonProperty("启用话痨模式")]
public bool EnableConsumptionMode = false;
[JsonProperty("启用广播话痨模式")]
public bool EnableBroadcastConsumptionMode = false;

[JsonProperty("所有怪物血量倍数(仅开启魔改BOSS时生效)")]
[JsonProperty("所有怪物血量倍数(仅开启魔改BOSS时生效)", Order = -3)]
public float lifeXnum = 1.00f;

[JsonProperty("冲刺饰品类的闪避冷却时间/默认12秒", Order = -2)]
public int CthulhuShieldTime = 12;

[JsonProperty("蜜蜂背包是否扔毒蜂罐")]
public bool HivePack = true;
[JsonProperty("蜜蜂背包首次弹幕ID")]
Expand All @@ -56,9 +58,6 @@ public class Config
[JsonProperty("化石套的弹幕击退")]
public float FossilArmorEffect_2 = 8f;

[JsonProperty("钓鱼套包含哪些永久BUFF")]
public int[] AnglerArmorEffectList { get; set; } = new int[] { 106, 123, 121, 122 };

[JsonProperty("丛林套是否环绕伤害孢子")]
public bool JungleArmorEffect = true;
[JsonProperty("丛林套弹幕射程/速率")]
Expand Down Expand Up @@ -97,7 +96,6 @@ public class Config
[JsonProperty("猩红套的弹幕击退")]
public float CrimsonArmorEffect_3 = 0f;


[JsonProperty("流星套是否下落星")]
public bool MeteorArmorEffect = true;
[JsonProperty("流星套的弹幕ID")]
Expand All @@ -107,13 +105,6 @@ public class Config
[JsonProperty("流星套的弹幕速度")]
public float MeteorArmorEffect_4 = 16f;

[JsonProperty("蜜蜂套是否撒蜂糖罐")]
public bool BeeArmorEffect = true;
[JsonProperty("蜜蜂套给什么永久BUFF")]
public int[] BeeArmorEffectList { get; set; } = new int[] { 48 };
[JsonProperty("蜜蜂套的BUFF时长")]
public int BeeArmorEffectTime = 150;

[JsonProperty("死灵套是否产生额外弹幕")]
public bool NecroArmor = true;
[JsonProperty("死灵套受到攻击时的弹幕ID")]
Expand Down Expand Up @@ -238,30 +229,39 @@ public class Config
[JsonProperty("甲虫套带骑士盾时给圣锤加多少伤害/默认90%")]
public float BeetleArmorEffect_2 = 0.9f;

[JsonProperty("冲刺饰品类的闪避冷却时间/默认12秒")]
public int CthulhuShieldTime = 12;

[JsonProperty("皇家凝胶是否下物品雨")]
[JsonProperty("皇家凝胶是否下物品雨", Order = 1)]
public bool RoyalGel = true;
[JsonProperty("皇家凝胶物品雨表")]
[JsonProperty("皇家凝胶物品雨表", Order = 1)]
public int[] RoyalGelList { get; set; } = new int[] { 23 };

[JsonProperty("挥发凝胶击中敌怪掉落物品表")]
public int[] VolatileGelatin { get; set; } = new int[] { 23, 409, 502, 3111 };
[JsonProperty("挥发凝胶击中敌怪掉落物品表", Order = 2)]
public int[] VolatileGelatin { get; set; } = new int[] { 23, 409, 502, 3111 };

[JsonProperty("狱岩套给什么永久BUFF")]
[JsonProperty("蜜蜂套是否撒蜂糖罐", Order = 3)]
public bool BeeArmorEffect = true;
[JsonProperty("蜜蜂套给什么永久BUFF", Order = 3)]
public int[] BeeArmorEffectList { get; set; } = new int[] { 48 };
[JsonProperty("蜜蜂套的BUFF时长", Order = 3)]
public int BeeArmorEffectTime = 150;

[JsonProperty("狱岩套给什么永久BUFF", Order = 4)]
public int[] MoltenArmor { get; set; } = new int[] { 1, 116 };

[JsonProperty("挖矿套给什么永久BUFF")]
public int[] MiningArmor { get; set; } = new int[] { 104, 192 };
[JsonProperty("挖矿套连锁图格ID表")]
[JsonProperty("钓鱼套包含哪些永久BUFF", Order = 5)]
public int[] AnglerArmorEffectList { get; set; } = new int[] { 106, 123, 121, 122 };

[JsonProperty("挖矿套是否开启连锁挖矿", Order = 6)]
public bool MiningArmor_1 = true;
[JsonProperty("挖矿套给什么永久BUFF", Order = 6)]
public int[] MiningArmor { get; set; } = new int[] { 104, 192 };
[JsonProperty("挖矿套连锁图格ID表", Order = 6)]
public int[] Tile { get; set; } = new int[] { 6, 7, 8, 9, 166, 167, 168, 169, 22, 221, 222, 223, 224, 232, 37, 404, 408, 48, 481, 482, 483, 56, 571, 58, 63, 64, 65, 66, 67, 68, 107, 108, 111, 123, 178, 204, 211, 229, 230 };

[JsonProperty("蠕虫围巾免疫buff是否开启")]
[JsonProperty("蠕虫围巾免疫buff是否开启", Order = 7)]
public bool EnableWormScarf = false;
[JsonProperty("蠕虫围巾遍历前几个buff")]
[JsonProperty("蠕虫围巾遍历前几个buff", Order = 7)]
public int WormScarfImmuneList_2 = 22;
[JsonProperty("蠕虫围巾免疫DeBuff列表/遇到会清空所有BUFF")]
[JsonProperty("蠕虫围巾免疫DeBuff列表/遇到会清空所有BUFF", Order = 7)]
public int[] WormScarfImmuneList { get; set; } = new int[] { 39, 69, 44, 46 };


Expand Down
39 changes: 21 additions & 18 deletions Challenger/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,10 @@
```
更新日志
1.0.7
添加了暗影套、猩红套、黑曜石套、挥发凝胶的配置项
优化了配置文件的排版次序
加入了“挖矿套是否开启连锁挖矿”配置项
添加了挖矿套的连锁挖矿能力，可配置其buff与连锁图格ID
添加了暗影套、猩红套、黑曜石套、挥发凝胶的配置项
1.0.6
给怪物吸血加入了个上限值（避免养蛊bug）
Expand Down Expand Up @@ -101,12 +103,14 @@
{
"是否启用挑战模式": true,
"是否启用BOSS魔改": false,
"启用话痨模式": false,
"启用广播话痨模式": false,
"是否启用怪物吸血": true,
"怪物吸血比率": 0.25,
"怪物吸血比率对于Boss": 0.5,
"启用话痨模式": false,
"启用广播话痨模式": false,
"怪物回血上限：小怪>1.5倍则会消失": 1.5,
"所有怪物血量倍数(仅开启魔改BOSS时生效)": 1.0,
"冲刺饰品类的闪避冷却时间/默认12秒": 12,
"蜜蜂背包是否扔毒蜂罐": true,
"蜜蜂背包首次弹幕ID": 346,
"蜜蜂背包首次弹幕伤害": 0,
Expand Down Expand Up @@ -140,8 +144,6 @@
"流星套的弹幕ID": 725,
"流星套的弹幕射程": 1000,
"流星套的弹幕速度": 16.0,
"蜜蜂套是否撒蜂糖罐": true,
"蜜蜂套的BUFF时长": 150,
"死灵套是否产生额外弹幕": true,
"死灵套受到攻击时的弹幕ID": 532,
"死灵套受到攻击时的弹幕伤害": 20,
Expand Down Expand Up @@ -197,20 +199,7 @@
"甲虫套受到伤害给其他玩家的回血转换比例/默认30%": 0.3,
"甲虫套减多少回复量/默认为0": 10,
"甲虫套带骑士盾时给圣锤加多少伤害/默认90%": 0.9,
"冲刺饰品类的闪避冷却时间/默认12秒": 12,
"皇家凝胶是否下物品雨": true,
"蠕虫围巾免疫buff是否开启": false,
"蠕虫围巾遍历前几个buff": 22,
"怪物回血上限：小怪>1.5倍则会消失": 1.5,
"钓鱼套包含哪些永久BUFF": [
106,
123,
121,
122
],
"蜜蜂套给什么永久BUFF": [
48
],
"皇家凝胶物品雨表": [
23
],
Expand All @@ -220,10 +209,22 @@
502,
3111
],
"蜜蜂套是否撒蜂糖罐": true,
"蜜蜂套的BUFF时长": 150,
"蜜蜂套给什么永久BUFF": [
48
],
"狱岩套给什么永久BUFF": [
1,
116
],
"钓鱼套包含哪些永久BUFF": [
106,
123,
121,
122
],
"挖矿套是否开启连锁挖矿": true,
"挖矿套给什么永久BUFF": [
104,
192
Expand Down Expand Up @@ -269,6 +270,8 @@
229,
230
],
"蠕虫围巾免疫buff是否开启": false,
"蠕虫围巾遍历前几个buff": 22,
"蠕虫围巾免疫DeBuff列表/遇到会清空所有BUFF": [
39,
69,
Expand Down

0 comments on commit 71bb384

Please sign in to comment.