From cc2c66ec5f716b8d9bc87204e7cb2a3b5ac94151 Mon Sep 17 00:00:00 2001 From: GuardianDll Date: Fri, 6 May 2022 20:39:13 +0200 Subject: [PATCH 1/6] #56307 --- data/mods/Magiclysm/monstergroups.json | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/data/mods/Magiclysm/monstergroups.json b/data/mods/Magiclysm/monstergroups.json index 24f3062bdd5df..c09923b56a9cf 100644 --- a/data/mods/Magiclysm/monstergroups.json +++ b/data/mods/Magiclysm/monstergroups.json @@ -31,8 +31,8 @@ { "monster": "mon_winter_wolf", "weight": 4, "cost_multiplier": 5, "pack_size": [ 1, 3 ], "starts": 750 }, { "monster": "mon_irongolem", "weight": 2, "cost_multiplier": 8 }, { "monster": "mon_demon_spiderling", "weight": 15, "cost_multiplier": 5, "pack_size": [ 3, 7 ] }, - { "monster": "mon_owlbear_zombie", "weight": 7, "cost_multiplier": 10 }, - { "monster": "mon_owlbear_zombie_brute", "weight": 1, "cost_multiplier": 15 }, + { "monster": "mon_owlbear_zombie", "weight": 7, "cost_multiplier": 10, "starts": "15 days" }, + { "monster": "mon_owlbear_zombie_brute", "weight": 1, "cost_multiplier": 15, "starts": "30 days" }, { "monster": "mon_troll_zombie", "weight": 3, "cost_multiplier": 13 }, { "monster": "mon_yulecat_zombie", "weight": 3, "cost_multiplier": 12 }, { "monster": "mon_yulecat_zombie_brute", "weight": 1, "cost_multiplier": 25 } @@ -62,9 +62,21 @@ { "monster": "mon_owlbear", "weight": 100, "cost_multiplier": 10, "pack_size": [ 2, 4 ] }, { "monster": "mon_shrieker", "weight": 10 }, { "monster": "mon_lemure", "weight": 5, "cost_multiplier": 2, "pack_size": [ 1, 4 ] }, - { "monster": "mon_owlbear_zombie", "weight": 40, "cost_multiplier": 10, "pack_size": [ 2, 4 ] }, - { "monster": "mon_owlbear_zombie_brute", "weight": 5, "cost_multiplier": 20, "pack_size": [ 1, 2 ] }, - { "monster": "mon_yulecat_zombie_brute", "weight": 5, "cost_multiplier": 30 } + { + "monster": "mon_owlbear_zombie", + "weight": 40, + "cost_multiplier": 10, + "pack_size": [ 2, 4 ], + "starts": "15 days" + }, + { + "monster": "mon_owlbear_zombie_brute", + "weight": 5, + "cost_multiplier": 20, + "pack_size": [ 1, 2 ], + "starts": "30 days" + }, + { "monster": "mon_yulecat_zombie_brute", "weight": 5, "cost_multiplier": 30, "starts": "30 days" } ] }, { From 73c8c963f9e3d2a93f6d91c82deb5c398842030f Mon Sep 17 00:00:00 2001 From: GuardianDll Date: Fri, 6 May 2022 21:07:06 +0200 Subject: [PATCH 2/6] #53921 --- data/mods/Magiclysm/vehicles/summoned_vehicles.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/vehicles/summoned_vehicles.json b/data/mods/Magiclysm/vehicles/summoned_vehicles.json index 08c1bdc523526..67b5e9ee1628e 100644 --- a/data/mods/Magiclysm/vehicles/summoned_vehicles.json +++ b/data/mods/Magiclysm/vehicles/summoned_vehicles.json @@ -67,7 +67,7 @@ "removal": { "skills": [ [ "mechanics", 20 ], [ "spellcraft", 1 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] }, "repair": { "skills": [ [ "mechanics", 20 ], [ "spellcraft", 1 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } }, - "flags": [ "INITIAL_PART", "ENGINE", "STABLE", "E_STARTS_INSTANTLY", "STEERABLE", "WHEEL", "OBSTACLE", "CARGO", "MAGIC_FOLLOW" ], + "flags": [ "INITIAL_PART", "ENGINE", "STABLE", "E_STARTS_INSTANTLY", "STEERABLE", "WHEEL", "OBSTACLE", "CARGO", "MAGIC_FOLLOW", "FLOATS" ], "damage_reduction": { "all": 12 } }, { From 91aec260c4ed9010fe8a023fdf1013fd282c8cd4 Mon Sep 17 00:00:00 2001 From: GuardianDll Date: Fri, 6 May 2022 21:20:49 +0200 Subject: [PATCH 3/6] #54479 --- data/mods/Magiclysm/items/melee.json | 2 +- data/mods/Magiclysm/techniques.json | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 data/mods/Magiclysm/techniques.json diff --git a/data/mods/Magiclysm/items/melee.json b/data/mods/Magiclysm/items/melee.json index 463aa24eef40b..612c055b09f64 100644 --- a/data/mods/Magiclysm/items/melee.json +++ b/data/mods/Magiclysm/items/melee.json @@ -35,7 +35,7 @@ "description": "Gram, the sword of Sigurd. It is rumored to be the sword that slayed the legendary dragon, Fafnir. Once said to have cleaved Regin's anvil in half, the edge is impeccable.", "weight": "1132 g", "material": [ "orichalcum_metal", "steel", "leather" ], - "techniques": [ "WBLOCK_2", "PRECISE", "VORPAL" ], + "techniques": [ "WBLOCK_2", "PRECISE", "DIVIDE" ], "volume": "2500 ml", "cutting": 45, "price": 200000 diff --git a/data/mods/Magiclysm/techniques.json b/data/mods/Magiclysm/techniques.json new file mode 100644 index 0000000000000..35a968413640b --- /dev/null +++ b/data/mods/Magiclysm/techniques.json @@ -0,0 +1,18 @@ +[ + { + "type": "technique", + "id": "DIVIDE", + "name": "The Great Divide", + "//": "VORPAL in fact, but with another weight (-250 -> 99)", + "melee_allowed": true, + "mult_bonuses": [ { "stat": "damage", "type": "cut", "scale": 2 } ], + "crit_tec": true, + "weighting": 2, + "messages": [ + "Snicker-snack! You slice through %s like hot knife slices through butter.", + "Snicker-snack! slices through %s like hot knife slices through butter." + ], + "description": "Cut damage multiply by 2, crit only", + "attack_vectors": [ "WEAPON" ] + } +] From cd900642d01028c9e55dc6580c22fa1638ed0f1e Mon Sep 17 00:00:00 2001 From: GuardianDll Date: Fri, 6 May 2022 21:31:17 +0200 Subject: [PATCH 4/6] decreasing the probability for divide --- data/mods/Magiclysm/techniques.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/techniques.json b/data/mods/Magiclysm/techniques.json index 35a968413640b..993839768c39f 100644 --- a/data/mods/Magiclysm/techniques.json +++ b/data/mods/Magiclysm/techniques.json @@ -7,7 +7,7 @@ "melee_allowed": true, "mult_bonuses": [ { "stat": "damage", "type": "cut", "scale": 2 } ], "crit_tec": true, - "weighting": 2, + "weighting": 0, "messages": [ "Snicker-snack! You slice through %s like hot knife slices through butter.", "Snicker-snack! slices through %s like hot knife slices through butter." From 362c4dac49cdee68796564259ca5de0e0ef27ed3 Mon Sep 17 00:00:00 2001 From: GuardianDll Date: Fri, 6 May 2022 21:40:37 +0200 Subject: [PATCH 5/6] lint --- data/mods/Magiclysm/vehicles/summoned_vehicles.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/vehicles/summoned_vehicles.json b/data/mods/Magiclysm/vehicles/summoned_vehicles.json index 67b5e9ee1628e..1a812eaf4dc77 100644 --- a/data/mods/Magiclysm/vehicles/summoned_vehicles.json +++ b/data/mods/Magiclysm/vehicles/summoned_vehicles.json @@ -67,7 +67,18 @@ "removal": { "skills": [ [ "mechanics", 20 ], [ "spellcraft", 1 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] }, "repair": { "skills": [ [ "mechanics", 20 ], [ "spellcraft", 1 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] } }, - "flags": [ "INITIAL_PART", "ENGINE", "STABLE", "E_STARTS_INSTANTLY", "STEERABLE", "WHEEL", "OBSTACLE", "CARGO", "MAGIC_FOLLOW", "FLOATS" ], + "flags": [ + "INITIAL_PART", + "ENGINE", + "STABLE", + "E_STARTS_INSTANTLY", + "STEERABLE", + "WHEEL", + "OBSTACLE", + "CARGO", + "MAGIC_FOLLOW", + "FLOATS" + ], "damage_reduction": { "all": 12 } }, { From 0df699f77e1dbc05258a2eb11b2399db75da3e20 Mon Sep 17 00:00:00 2001 From: Curtis Merrill Date: Fri, 10 Jun 2022 14:34:15 -0400 Subject: [PATCH 6/6] Apply suggestions from code review --- data/mods/Magiclysm/techniques.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Magiclysm/techniques.json b/data/mods/Magiclysm/techniques.json index 993839768c39f..afe9463d6cfaa 100644 --- a/data/mods/Magiclysm/techniques.json +++ b/data/mods/Magiclysm/techniques.json @@ -9,8 +9,8 @@ "crit_tec": true, "weighting": 0, "messages": [ - "Snicker-snack! You slice through %s like hot knife slices through butter.", - "Snicker-snack! slices through %s like hot knife slices through butter." + "Snicker-snack! You slice through %s like a hot knife slices through butter.", + "Snicker-snack! slices through %s like a hot knife slices through butter." ], "description": "Cut damage multiply by 2, crit only", "attack_vectors": [ "WEAPON" ]