From 06cac987f3b72fe6f2967e7993653f5fc4797007 Mon Sep 17 00:00:00 2001 From: Xenomorph-III Date: Sat, 15 Feb 2020 18:20:47 +1300 Subject: [PATCH 01/11] Halved spike weight: will change recipe soon. --- data/json/items/resources/metal.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json index aa5ae47f287dc..05b7bb5b07c2c 100644 --- a/data/json/items/resources/metal.json +++ b/data/json/items/resources/metal.json @@ -40,7 +40,7 @@ "name": "spike", "description": "A large and slightly misshapen spike, could do some damage mounted on a vehicle.", "category": "spare_parts", - "weight": "550 g", + "weight": "225 g", "to_hit": -2, "color": "light_gray", "symbol": ";", From 9ab579a1004d7b4903ff2638442460488b397737 Mon Sep 17 00:00:00 2001 From: Xenomorph-III Date: Sat, 15 Feb 2020 18:26:46 +1300 Subject: [PATCH 02/11] Update spike recipe. Now uses 1 chunk of steel: a survvior cannot possibly hammer out a spike from 2 steel pieces with only a rock and no welding equipment. Where does the second steel chunk go, anyway? --- data/json/recipes/recipe_others.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 95e4643077fdb..8833775a4fd0a 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -1369,7 +1369,7 @@ "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "steel_chunk", 2 ], [ "scrap", 5 ] ] ] + "components": [ [ "steel_chunk", 1 ] ] }, { "type": "recipe", From 83e8e259c779f0f21d797c65fc5763ca5213ebc7 Mon Sep 17 00:00:00 2001 From: Xenomorph-III Date: Sat, 15 Feb 2020 18:34:57 +1300 Subject: [PATCH 03/11] Actually change Makeshift Knife volume. --- data/json/items/melee/swords_and_blades.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index d9439ae330a51..c790ce39a0c04 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -223,7 +223,7 @@ "name": { "str": "makeshift knife", "str_pl": "makeshift knives" }, "description": "A knife consisting of a long, somewhat sharpened, spike and a tightly wrapped rag as a handle. It makes a good melee weapon.", "weight": "550 g", - "volume": "500 ml", + "volume": "251 ml", "price": 0, "to_hit": -1, "bashing": 2, From 573d60b7e17ff9d6aa8af28cb40428b7dafb89cc Mon Sep 17 00:00:00 2001 From: Xenomorph-III Date: Sat, 15 Feb 2020 18:37:11 +1300 Subject: [PATCH 04/11] Revert dumb spike mistake. Weight is now back where it should be. --- data/json/items/resources/metal.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json index 05b7bb5b07c2c..aa5ae47f287dc 100644 --- a/data/json/items/resources/metal.json +++ b/data/json/items/resources/metal.json @@ -40,7 +40,7 @@ "name": "spike", "description": "A large and slightly misshapen spike, could do some damage mounted on a vehicle.", "category": "spare_parts", - "weight": "225 g", + "weight": "550 g", "to_hit": -2, "color": "light_gray", "symbol": ";", From 16fabe4a173a44959250ec6329b26c5c8c5f0d15 Mon Sep 17 00:00:00 2001 From: Xenomorph-III Date: Thu, 20 Feb 2020 15:03:40 +1300 Subject: [PATCH 05/11] Linting recipe file --- data/json/recipes/recipe_others.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 8833775a4fd0a..60edfcb3ff6ba 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -1,4 +1,5 @@ -[ + + { "type": "recipe", "result": "caltrops", From e8a280b48b9e05c3742775876ed9eb1d3d6359a9 Mon Sep 17 00:00:00 2001 From: Xenomorph-III Date: Thu, 20 Feb 2020 15:07:21 +1300 Subject: [PATCH 06/11] Linting resources/metal.json From 05519764a2d5443515816b94578f073d953c3ed1 Mon Sep 17 00:00:00 2001 From: Xenomorph-III Date: Thu, 20 Feb 2020 15:14:01 +1300 Subject: [PATCH 07/11] Linting - this time in the correct branch! This is in the spike-changes branch --- data/json/items/melee/swords_and_blades.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index c790ce39a0c04..121fffc5b5681 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -1,4 +1,4 @@ -[ + { "type": "GENERIC", "id": "sword_wood", From f2ad6f1725663daae1cc312d5506e28246b458a4 Mon Sep 17 00:00:00 2001 From: Xenomorph-III Date: Fri, 21 Feb 2020 14:28:06 +1300 Subject: [PATCH 08/11] Update data/json/items/melee/swords_and_blades.json Lost [. Put it back. Co-Authored-By: Alexey Mostovoy <1931904+AMurkin@users.noreply.github.com> --- data/json/items/melee/swords_and_blades.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 121fffc5b5681..c790ce39a0c04 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -1,4 +1,4 @@ - +[ { "type": "GENERIC", "id": "sword_wood", From cffb16e998f563bab845a18e39834ef42bef5380 Mon Sep 17 00:00:00 2001 From: Xenomorph-III Date: Fri, 21 Feb 2020 14:28:13 +1300 Subject: [PATCH 09/11] Update data/json/recipes/recipe_others.json Co-Authored-By: Alexey Mostovoy <1931904+AMurkin@users.noreply.github.com> --- data/json/recipes/recipe_others.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 60edfcb3ff6ba..cbfed09f8bfcb 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -1,5 +1,4 @@ - { "type": "recipe", "result": "caltrops", From 5ceb2f25cd77990e7bdc877b7bebee54ca55c10e Mon Sep 17 00:00:00 2001 From: Xenomorph-III Date: Fri, 21 Feb 2020 14:28:43 +1300 Subject: [PATCH 10/11] Update data/json/recipes/recipe_others.json Co-Authored-By: Alexey Mostovoy <1931904+AMurkin@users.noreply.github.com> --- data/json/recipes/recipe_others.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index cbfed09f8bfcb..8833775a4fd0a 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -1,4 +1,4 @@ - +[ { "type": "recipe", "result": "caltrops", From baea45ce668f89bfabe6c1612727d577701bdcde Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Sat, 22 Feb 2020 04:42:13 +0000 Subject: [PATCH 11/11] Update data/json/recipes/recipe_others.json --- data/json/recipes/recipe_others.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 8833775a4fd0a..41efe788769d5 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -1369,7 +1369,7 @@ "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ "steel_chunk", 1 ] ] + "components": [ [ [ "steel_chunk", 1 ] ] ] }, { "type": "recipe",