Skip to content

Commit a23ec55

Browse files
author
wave
authored
Merge branch 'Kenan2000:master' into master
2 parents 8261a54 + be0a6a5 commit a23ec55

File tree

17 files changed

+164
-171
lines changed

17 files changed

+164
-171
lines changed

‎Kenan-Modpack/Arcana/spells/spells_magic_signs.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,6 @@
655655
"range_increment": -0.2,
656656
"min_range": 5,
657657
"max_range": 10,
658-
"range_increment": 0.5,
659658
"min_aoe": 1,
660659
"max_aoe": 5,
661660
"aoe_increment": 0.4,

‎Kenan-Modpack/BL9-100%_monster_resilience_version/Items/melee_tools.json

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"material": [ "BL9", "steel" ],
1717
"symbol": ";",
1818
"color": "light_gray",
19-
"techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "tec_brawl_feint_melee", "tec_swordsmanship_grab", "tec_swordsmanship_mordhau" ],
19+
"techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "tec_brawl_feint_melee", "tec_swordsmanship_ringen", "tec_swordsmanship_lethal" ],
2020
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
2121
},
2222
{
@@ -104,7 +104,7 @@
104104
"material": [ "BL9", "steel" ],
105105
"symbol": ";",
106106
"color": "light_gray",
107-
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_grab", "tec_swordsmanship_zornhau" ],
107+
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_ringen", "tec_swordsmanship_mastercut" ],
108108
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
109109
},
110110
{
@@ -196,7 +196,7 @@
196196
"material": [ "BL9", "steel" ],
197197
"symbol": ";",
198198
"color": "light_gray",
199-
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_grab", "tec_swordsmanship_zornhau" ],
199+
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_ringen", "tec_swordsmanship_mastercut" ],
200200
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
201201
},
202202
{
@@ -396,7 +396,7 @@
396396
"material": [ "BL9", "steel" ],
397397
"symbol": ";",
398398
"color": "light_gray",
399-
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_grab", "tec_swordsmanship_zornhau" ],
399+
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_ringen", "tec_swordsmanship_mastercut" ],
400400
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
401401
},
402402
{
@@ -596,7 +596,7 @@
596596
"material": [ "BL9", "steel" ],
597597
"symbol": ";",
598598
"color": "light_gray",
599-
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_grab", "tec_swordsmanship_zornhau" ],
599+
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_ringen", "tec_swordsmanship_mastercut" ],
600600
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
601601
},
602602
{
@@ -796,7 +796,7 @@
796796
"material": [ "BL9", "steel" ],
797797
"symbol": ";",
798798
"color": "light_gray",
799-
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_grab", "tec_swordsmanship_zornhau" ],
799+
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_ringen", "tec_swordsmanship_mastercut" ],
800800
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
801801
},
802802
{
@@ -1074,9 +1074,9 @@
10741074
"SWEEP",
10751075
"BRUTAL",
10761076
"tec_brawl_feint_melee",
1077-
"tec_swordsmanship_grab",
1078-
"tec_swordsmanship_mordhau",
1079-
"tec_swordsmanship_zornhau"
1077+
"tec_swordsmanship_ringen",
1078+
"tec_swordsmanship_lethal",
1079+
"tec_swordsmanship_mastercut"
10801080
],
10811081
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
10821082
},
@@ -1165,9 +1165,9 @@
11651165
"SWEEP",
11661166
"BRUTAL",
11671167
"tec_brawl_feint_melee",
1168-
"tec_swordsmanship_grab",
1169-
"tec_swordsmanship_mordhau",
1170-
"tec_swordsmanship_zornhau"
1168+
"tec_swordsmanship_ringen",
1169+
"tec_swordsmanship_lethal",
1170+
"tec_swordsmanship_mastercut"
11711171
],
11721172
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
11731173
},
@@ -1373,9 +1373,9 @@
13731373
"SWEEP",
13741374
"BRUTAL",
13751375
"tec_brawl_feint_melee",
1376-
"tec_swordsmanship_grab",
1377-
"tec_swordsmanship_mordhau",
1378-
"tec_swordsmanship_zornhau"
1376+
"tec_swordsmanship_ringen",
1377+
"tec_swordsmanship_lethal",
1378+
"tec_swordsmanship_mastercut"
13791379
],
13801380
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
13811381
},
@@ -1581,9 +1581,9 @@
15811581
"SWEEP",
15821582
"BRUTAL",
15831583
"tec_brawl_feint_melee",
1584-
"tec_swordsmanship_grab",
1585-
"tec_swordsmanship_mordhau",
1586-
"tec_swordsmanship_zornhau"
1584+
"tec_swordsmanship_ringen",
1585+
"tec_swordsmanship_lethal",
1586+
"tec_swordsmanship_mastercut"
15871587
],
15881588
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
15891589
},
@@ -1789,9 +1789,9 @@
17891789
"SWEEP",
17901790
"BRUTAL",
17911791
"tec_brawl_feint_melee",
1792-
"tec_swordsmanship_grab",
1793-
"tec_swordsmanship_mordhau",
1794-
"tec_swordsmanship_zornhau"
1792+
"tec_swordsmanship_ringen",
1793+
"tec_swordsmanship_lethal",
1794+
"tec_swordsmanship_mastercut"
17951795
],
17961796
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
17971797
},
@@ -2087,9 +2087,9 @@
20872087
"SWEEP",
20882088
"BRUTAL",
20892089
"tec_brawl_feint_melee",
2090-
"tec_swordsmanship_grab",
2091-
"tec_swordsmanship_mordhau",
2092-
"tec_swordsmanship_zornhau"
2090+
"tec_swordsmanship_ringen",
2091+
"tec_swordsmanship_lethal",
2092+
"tec_swordsmanship_mastercut"
20932093
],
20942094
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
20952095
},
@@ -2150,9 +2150,9 @@
21502150
"SWEEP",
21512151
"BRUTAL",
21522152
"tec_brawl_feint_melee",
2153-
"tec_swordsmanship_grab",
2154-
"tec_swordsmanship_mordhau",
2155-
"tec_swordsmanship_zornhau"
2153+
"tec_swordsmanship_ringen",
2154+
"tec_swordsmanship_lethal",
2155+
"tec_swordsmanship_mastercut"
21562156
],
21572157
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
21582158
},
@@ -2358,9 +2358,9 @@
23582358
"SWEEP",
23592359
"BRUTAL",
23602360
"tec_brawl_feint_melee",
2361-
"tec_swordsmanship_grab",
2362-
"tec_swordsmanship_mordhau",
2363-
"tec_swordsmanship_zornhau"
2361+
"tec_swordsmanship_ringen",
2362+
"tec_swordsmanship_lethal",
2363+
"tec_swordsmanship_mastercut"
23642364
],
23652365
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
23662366
},
@@ -2566,9 +2566,9 @@
25662566
"SWEEP",
25672567
"BRUTAL",
25682568
"tec_brawl_feint_melee",
2569-
"tec_swordsmanship_grab",
2570-
"tec_swordsmanship_mordhau",
2571-
"tec_swordsmanship_zornhau"
2569+
"tec_swordsmanship_ringen",
2570+
"tec_swordsmanship_lethal",
2571+
"tec_swordsmanship_mastercut"
25722572
],
25732573
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
25742574
},
@@ -2774,9 +2774,9 @@
27742774
"SWEEP",
27752775
"BRUTAL",
27762776
"tec_brawl_feint_melee",
2777-
"tec_swordsmanship_grab",
2778-
"tec_swordsmanship_mordhau",
2779-
"tec_swordsmanship_zornhau"
2777+
"tec_swordsmanship_ringen",
2778+
"tec_swordsmanship_lethal",
2779+
"tec_swordsmanship_mastercut"
27802780
],
27812781
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
27822782
},

‎Kenan-Modpack/BL9-100%_monster_resilience_version/Locations/Biomes.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4621,7 +4621,7 @@
46214621
"AUUUUUUUUUAAAAAUUUAAAAAA",
46224622
"AfUUUUUUUUAtUUUUUUUUUUUA",
46234623
"AUUftcUUbUAfUccf<bfbUffA",
4624-
"AAAAAAAAAAAAAAAAAAAAAAAAA"
4624+
"AAAAAAAAAAAAAAAAAAAAAAAA"
46254625
],
46264626
"palettes": [ "BL9_biomes_palette" ],
46274627
"furniture": { "c": "f_displaycase", "f": "f_statue", "b": "f_glass_cabinet" },

‎Kenan-Modpack/BL9-100%_monster_resilience_version/Locations/Island_part3.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1301,7 +1301,7 @@
13011301
"`o............``````````",
13021302
"`............o``````````",
13031303
"`o............``````````",
1304-
"%t............mnm..nmn..%",
1304+
"%t............mnm..nmn.%",
13051305
"%................e..e.m%",
13061306
"%a....................n%",
13071307
"%t.............e.booo.e%",

‎Kenan-Modpack/BL9-140%_monster_resilience_version/Items/melee_tools.json

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"material": [ "BL9", "steel" ],
1717
"symbol": ";",
1818
"color": "light_gray",
19-
"techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "tec_brawl_feint_melee", "tec_swordsmanship_grab", "tec_swordsmanship_mordhau" ],
19+
"techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "tec_brawl_feint_melee", "tec_swordsmanship_ringen", "tec_swordsmanship_lethal" ],
2020
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
2121
},
2222
{
@@ -104,7 +104,7 @@
104104
"material": [ "BL9", "steel" ],
105105
"symbol": ";",
106106
"color": "light_gray",
107-
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_grab", "tec_swordsmanship_zornhau" ],
107+
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_ringen", "tec_swordsmanship_mastercut" ],
108108
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
109109
},
110110
{
@@ -196,7 +196,7 @@
196196
"material": [ "BL9", "steel" ],
197197
"symbol": ";",
198198
"color": "light_gray",
199-
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_grab", "tec_swordsmanship_zornhau" ],
199+
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_ringen", "tec_swordsmanship_mastercut" ],
200200
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
201201
},
202202
{
@@ -396,7 +396,7 @@
396396
"material": [ "BL9", "steel" ],
397397
"symbol": ";",
398398
"color": "light_gray",
399-
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_grab", "tec_swordsmanship_zornhau" ],
399+
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_ringen", "tec_swordsmanship_mastercut" ],
400400
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
401401
},
402402
{
@@ -596,7 +596,7 @@
596596
"material": [ "BL9", "steel" ],
597597
"symbol": ";",
598598
"color": "light_gray",
599-
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_grab", "tec_swordsmanship_zornhau" ],
599+
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_ringen", "tec_swordsmanship_mastercut" ],
600600
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
601601
},
602602
{
@@ -796,7 +796,7 @@
796796
"material": [ "BL9", "steel" ],
797797
"symbol": ";",
798798
"color": "light_gray",
799-
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_grab", "tec_swordsmanship_zornhau" ],
799+
"techniques": [ "WBLOCK_2", "SWEEP", "BRUTAL", "tec_brawl_feint_melee", "tec_swordsmanship_ringen", "tec_swordsmanship_mastercut" ],
800800
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
801801
},
802802
{
@@ -1074,9 +1074,9 @@
10741074
"SWEEP",
10751075
"BRUTAL",
10761076
"tec_brawl_feint_melee",
1077-
"tec_swordsmanship_grab",
1078-
"tec_swordsmanship_mordhau",
1079-
"tec_swordsmanship_zornhau"
1077+
"tec_swordsmanship_ringen",
1078+
"tec_swordsmanship_lethal",
1079+
"tec_swordsmanship_mastercut"
10801080
],
10811081
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
10821082
},
@@ -1165,9 +1165,9 @@
11651165
"SWEEP",
11661166
"BRUTAL",
11671167
"tec_brawl_feint_melee",
1168-
"tec_swordsmanship_grab",
1169-
"tec_swordsmanship_mordhau",
1170-
"tec_swordsmanship_zornhau"
1168+
"tec_swordsmanship_ringen",
1169+
"tec_swordsmanship_lethal",
1170+
"tec_swordsmanship_mastercut"
11711171
],
11721172
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
11731173
},
@@ -1373,9 +1373,9 @@
13731373
"SWEEP",
13741374
"BRUTAL",
13751375
"tec_brawl_feint_melee",
1376-
"tec_swordsmanship_grab",
1377-
"tec_swordsmanship_mordhau",
1378-
"tec_swordsmanship_zornhau"
1376+
"tec_swordsmanship_ringen",
1377+
"tec_swordsmanship_lethal",
1378+
"tec_swordsmanship_mastercut"
13791379
],
13801380
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
13811381
},
@@ -1581,9 +1581,9 @@
15811581
"SWEEP",
15821582
"BRUTAL",
15831583
"tec_brawl_feint_melee",
1584-
"tec_swordsmanship_grab",
1585-
"tec_swordsmanship_mordhau",
1586-
"tec_swordsmanship_zornhau"
1584+
"tec_swordsmanship_ringen",
1585+
"tec_swordsmanship_lethal",
1586+
"tec_swordsmanship_mastercut"
15871587
],
15881588
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
15891589
},
@@ -1789,9 +1789,9 @@
17891789
"SWEEP",
17901790
"BRUTAL",
17911791
"tec_brawl_feint_melee",
1792-
"tec_swordsmanship_grab",
1793-
"tec_swordsmanship_mordhau",
1794-
"tec_swordsmanship_zornhau"
1792+
"tec_swordsmanship_ringen",
1793+
"tec_swordsmanship_lethal",
1794+
"tec_swordsmanship_mastercut"
17951795
],
17961796
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
17971797
},
@@ -2087,9 +2087,9 @@
20872087
"SWEEP",
20882088
"BRUTAL",
20892089
"tec_brawl_feint_melee",
2090-
"tec_swordsmanship_grab",
2091-
"tec_swordsmanship_mordhau",
2092-
"tec_swordsmanship_zornhau"
2090+
"tec_swordsmanship_ringen",
2091+
"tec_swordsmanship_lethal",
2092+
"tec_swordsmanship_mastercut"
20932093
],
20942094
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
20952095
},
@@ -2150,9 +2150,9 @@
21502150
"SWEEP",
21512151
"BRUTAL",
21522152
"tec_brawl_feint_melee",
2153-
"tec_swordsmanship_grab",
2154-
"tec_swordsmanship_mordhau",
2155-
"tec_swordsmanship_zornhau"
2153+
"tec_swordsmanship_ringen",
2154+
"tec_swordsmanship_lethal",
2155+
"tec_swordsmanship_mastercut"
21562156
],
21572157
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
21582158
},
@@ -2358,9 +2358,9 @@
23582358
"SWEEP",
23592359
"BRUTAL",
23602360
"tec_brawl_feint_melee",
2361-
"tec_swordsmanship_grab",
2362-
"tec_swordsmanship_mordhau",
2363-
"tec_swordsmanship_zornhau"
2361+
"tec_swordsmanship_ringen",
2362+
"tec_swordsmanship_lethal",
2363+
"tec_swordsmanship_mastercut"
23642364
],
23652365
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
23662366
},
@@ -2566,9 +2566,9 @@
25662566
"SWEEP",
25672567
"BRUTAL",
25682568
"tec_brawl_feint_melee",
2569-
"tec_swordsmanship_grab",
2570-
"tec_swordsmanship_mordhau",
2571-
"tec_swordsmanship_zornhau"
2569+
"tec_swordsmanship_ringen",
2570+
"tec_swordsmanship_lethal",
2571+
"tec_swordsmanship_mastercut"
25722572
],
25732573
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
25742574
},
@@ -2774,9 +2774,9 @@
27742774
"SWEEP",
27752775
"BRUTAL",
27762776
"tec_brawl_feint_melee",
2777-
"tec_swordsmanship_grab",
2778-
"tec_swordsmanship_mordhau",
2779-
"tec_swordsmanship_zornhau"
2777+
"tec_swordsmanship_ringen",
2778+
"tec_swordsmanship_lethal",
2779+
"tec_swordsmanship_mastercut"
27802780
],
27812781
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SWORD" ]
27822782
},

0 commit comments

Comments
 (0)