From 200a19fd4a3fee96a637dbde0e5a1faf6925cbc9 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sat, 1 Jun 2019 00:57:06 -0400 Subject: [PATCH 01/37] Update ammo.json --- data/json/items/ammo.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index b0d16e9c5898b..132e073396347 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -1327,5 +1327,25 @@ "count": 50, "ammo_type": "tinder", "effects": [ "NEVER_MISFIRES" ] + }, + { + "type": "AMMO", + "id": "rpg_dice", + "price": 10, + "name": "rpg dice", + "symbol": "=", + "color": "light_gray", + "looks_like": "marble", + "description": "Some dice used to play various role playing games, coming in several shapes and sizes", + "material": "plastic", + "volume": 1, + "weight": 1, + "ammo_type": "pebble", + "damage": 1, + "range": 20, + "dispersion": 15, + "loudness": 0, + "count": 7, + "effects": [ "NEVER_MISFIRES" ] } ] From 89775d3187e517796b6295c58ae9ddf588ab3784 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sat, 1 Jun 2019 00:57:09 -0400 Subject: [PATCH 02/37] Update professions.json --- data/json/professions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/professions.json b/data/json/professions.json index 068ea3c7a0381..e8a7535885c85 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -3582,7 +3582,7 @@ "skills": [ { "level": 2, "name": "speech" }, { "level": 1, "name": "survival" } ], "items": { "both": { - "items": [ "jeans", "tshirt", "socks", "sneakers", "mbag", "pizza_cheese", "cola", "dnd_handbook", "wristwatch" ], + "items": [ "jeans", "tshirt", "socks", "sneakers", "mbag", "pizza_cheese", "cola", "dnd_handbook", "wristwatch", "rpg_dice" ], "entries": [ { "group": "charged_cell_phone" } ] }, "male": [ "briefs" ], From 22b056b194b05adb13b3dab7d09159ee68884adf Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sat, 1 Jun 2019 01:12:12 -0400 Subject: [PATCH 03/37] Update ammo.json --- data/json/items/ammo.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index 132e073396347..8de6be97b57b0 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -1333,6 +1333,7 @@ "id": "rpg_dice", "price": 10, "name": "rpg dice", + "name_plural": "rpg dice", "symbol": "=", "color": "light_gray", "looks_like": "marble", From f6e41ba456bebb59217e26a04d463d5d3da7d6cf Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sat, 1 Jun 2019 12:56:06 -0400 Subject: [PATCH 04/37] Update SUS_specific_use_storage_items.json --- data/json/itemgroups/SUS_specific_use_storage_items.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/itemgroups/SUS_specific_use_storage_items.json b/data/json/itemgroups/SUS_specific_use_storage_items.json index 5c932cac68f27..da5e90e3e8490 100644 --- a/data/json/itemgroups/SUS_specific_use_storage_items.json +++ b/data/json/itemgroups/SUS_specific_use_storage_items.json @@ -102,6 +102,7 @@ { "item": "corkscrew", "prob": 60 }, { "item": "bottle_opener", "prob": 75 }, { "item": "candle", "prob": 75 }, + {"item": "rpg_dice", "prob": 10}, { "distribution": [ { "item": "matches" }, { "item": "lighter" } ], "prob": 90 } ] }, From 1fa951f67460db4c0d2320f7a8c3143c30812e70 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sat, 1 Jun 2019 13:15:43 -0400 Subject: [PATCH 05/37] Update SUS_specific_use_storage_items.json --- data/json/itemgroups/SUS_specific_use_storage_items.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/SUS_specific_use_storage_items.json b/data/json/itemgroups/SUS_specific_use_storage_items.json index da5e90e3e8490..78b418c3231ad 100644 --- a/data/json/itemgroups/SUS_specific_use_storage_items.json +++ b/data/json/itemgroups/SUS_specific_use_storage_items.json @@ -102,7 +102,7 @@ { "item": "corkscrew", "prob": 60 }, { "item": "bottle_opener", "prob": 75 }, { "item": "candle", "prob": 75 }, - {"item": "rpg_dice", "prob": 10}, + {"item": "RPG_dice", "prob": 10}, { "distribution": [ { "item": "matches" }, { "item": "lighter" } ], "prob": 90 } ] }, From 6de8c386bdb0f7288511aef3ad6c646407ab765b Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sat, 1 Jun 2019 13:15:46 -0400 Subject: [PATCH 06/37] Update ammo.json --- data/json/items/ammo.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index 8de6be97b57b0..b74db1a56bc28 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -1330,14 +1330,14 @@ }, { "type": "AMMO", - "id": "rpg_dice", + "id": "RPG_dice", "price": 10, - "name": "rpg dice", - "name_plural": "rpg dice", + "name": "RPG dice", + "name_plural": "RPG dice", "symbol": "=", "color": "light_gray", "looks_like": "marble", - "description": "Some dice used to play various role playing games, coming in several shapes and sizes", + "description": "Some dice used to play various role playing-games, coming in several shapes and sizes", "material": "plastic", "volume": 1, "weight": 1, From d248b2889fc6bfa7bfbed39f6fba701cbdd48ed8 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sat, 1 Jun 2019 14:59:38 -0400 Subject: [PATCH 07/37] Update ammo.json --- data/json/items/ammo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index b74db1a56bc28..b21ec60be129f 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -1337,7 +1337,7 @@ "symbol": "=", "color": "light_gray", "looks_like": "marble", - "description": "Some dice used to play various role playing-games, coming in several shapes and sizes", + "description": "Some dice used to play various role-playing games.", "material": "plastic", "volume": 1, "weight": 1, From c0bce1a19a66e298e71b52bc1cc4c1d7b6adc6a4 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sat, 1 Jun 2019 15:09:50 -0400 Subject: [PATCH 08/37] Update SUS_specific_use_storage_items.json --- data/json/itemgroups/SUS_specific_use_storage_items.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/SUS_specific_use_storage_items.json b/data/json/itemgroups/SUS_specific_use_storage_items.json index 78b418c3231ad..c40e790dda0fd 100644 --- a/data/json/itemgroups/SUS_specific_use_storage_items.json +++ b/data/json/itemgroups/SUS_specific_use_storage_items.json @@ -102,7 +102,7 @@ { "item": "corkscrew", "prob": 60 }, { "item": "bottle_opener", "prob": 75 }, { "item": "candle", "prob": 75 }, - {"item": "RPG_dice", "prob": 10}, + { "item": "RPG_dice", "prob": 10 }, { "distribution": [ { "item": "matches" }, { "item": "lighter" } ], "prob": 90 } ] }, From 90bb809cfca19b619fd85177b9f75272f4b76059 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sat, 1 Jun 2019 22:53:14 -0400 Subject: [PATCH 09/37] Update professions.json --- data/json/professions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/professions.json b/data/json/professions.json index e8a7535885c85..f2099d83fdf70 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -3582,7 +3582,7 @@ "skills": [ { "level": 2, "name": "speech" }, { "level": 1, "name": "survival" } ], "items": { "both": { - "items": [ "jeans", "tshirt", "socks", "sneakers", "mbag", "pizza_cheese", "cola", "dnd_handbook", "wristwatch", "rpg_dice" ], + "items": [ "jeans", "tshirt", "socks", "sneakers", "mbag", "pizza_cheese", "cola", "dnd_handbook", "wristwatch", "RPG_dice" ], "entries": [ { "group": "charged_cell_phone" } ] }, "male": [ "briefs" ], From e8b07541b7b947d114d593673785bf865bfc269c Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sat, 1 Jun 2019 22:58:29 -0400 Subject: [PATCH 10/37] Update ammo.json --- data/json/items/ammo.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index b21ec60be129f..a9d6ad15e45ce 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -1330,14 +1330,14 @@ }, { "type": "AMMO", - "id": "RPG_dice", + "id": "RPG_die", "price": 10, - "name": "RPG dice", - "name_plural": "RPG dice", + "name": "RPG die", + "name_plural": "RPG die", "symbol": "=", "color": "light_gray", "looks_like": "marble", - "description": "Some dice used to play various role-playing games.", + "description": "A die used to play various role-playing games.", "material": "plastic", "volume": 1, "weight": 1, From a8ad9a906b150b8010f0ef47411fbd2687ca3aa1 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sat, 1 Jun 2019 22:58:32 -0400 Subject: [PATCH 11/37] Update SUS_specific_use_storage_items.json --- data/json/itemgroups/SUS_specific_use_storage_items.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/SUS_specific_use_storage_items.json b/data/json/itemgroups/SUS_specific_use_storage_items.json index c40e790dda0fd..0b045a2227e27 100644 --- a/data/json/itemgroups/SUS_specific_use_storage_items.json +++ b/data/json/itemgroups/SUS_specific_use_storage_items.json @@ -102,7 +102,7 @@ { "item": "corkscrew", "prob": 60 }, { "item": "bottle_opener", "prob": 75 }, { "item": "candle", "prob": 75 }, - { "item": "RPG_dice", "prob": 10 }, + { "item": "RPG_die", "prob": 10 }, { "distribution": [ { "item": "matches" }, { "item": "lighter" } ], "prob": 90 } ] }, From 3dd089f6b9eceaf32d2550f695a98c006ad31fb0 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sat, 1 Jun 2019 22:58:36 -0400 Subject: [PATCH 12/37] Update professions.json --- data/json/professions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/professions.json b/data/json/professions.json index f2099d83fdf70..af1b0c7cf7dd9 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -3582,7 +3582,7 @@ "skills": [ { "level": 2, "name": "speech" }, { "level": 1, "name": "survival" } ], "items": { "both": { - "items": [ "jeans", "tshirt", "socks", "sneakers", "mbag", "pizza_cheese", "cola", "dnd_handbook", "wristwatch", "RPG_dice" ], + "items": [ "jeans", "tshirt", "socks", "sneakers", "mbag", "pizza_cheese", "cola", "dnd_handbook", "wristwatch", "RPG_die" ], "entries": [ { "group": "charged_cell_phone" } ] }, "male": [ "briefs" ], From 8e689b63eaf6dc0235a2d66f3e6821b290e8a256 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sun, 2 Jun 2019 13:32:31 -0400 Subject: [PATCH 13/37] Update basement_game.json --- data/json/mapgen/basement/basement_game.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/mapgen/basement/basement_game.json b/data/json/mapgen/basement/basement_game.json index 8da0abb51f3ff..b0d8828b7ca37 100644 --- a/data/json/mapgen/basement/basement_game.json +++ b/data/json/mapgen/basement/basement_game.json @@ -239,7 +239,8 @@ "place_loot": [ { "item": "dnd_handbook", "x": 18, "y": 8, "chance": 100 }, { "item": "novel_fantasy", "x": [ 17, 19 ], "y": [ 8, 10 ], "chance": 60, "repeat": [ 0, 4 ] }, - { "item": "character_sheet", "x": [ 17, 19 ], "y": [ 9, 10 ], "chance": 80, "repeat": [ 1, 5 ] } + { "item": "character_sheet", "x": [ 17, 19 ], "y": [ 9, 10 ], "chance": 80, "repeat": [ 1, 5 ] }, + { "item": "RPG_die", "x": [ 17, 19 ], "y": [ 8, 10 ], "chance": 90, "repeat": [ 1, 4 ] } ], "mapping": { "F": { "items": [ { "item": "fridgesnacks", "chance": 80, "repeat": [ 1, 3 ] } ] }, From 41ae7cc838aac26d7524c2a1d0c1c8e100f0b208 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sun, 2 Jun 2019 16:34:19 -0400 Subject: [PATCH 14/37] Update mall_item_groups.json --- data/json/itemgroups/mall_item_groups.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/itemgroups/mall_item_groups.json b/data/json/itemgroups/mall_item_groups.json index 90ce066f31814..7c2df449f7bae 100644 --- a/data/json/itemgroups/mall_item_groups.json +++ b/data/json/itemgroups/mall_item_groups.json @@ -118,7 +118,8 @@ [ "jedi_cloak", 5 ], [ "clown_suit", 5 ], [ "clownshoes", 5 ], - [ "radio_car_box", 10 ] + [ "radio_car_box", 10 ], + [ "RPG_die", 5 ] ] }, { From c0f1b0add03681ccb0f498ca543effde4c2edd06 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sun, 2 Jun 2019 20:44:25 -0400 Subject: [PATCH 15/37] Update misc.json --- data/json/itemgroups/misc.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json index 2596356e9dd51..1c35796a7292a 100644 --- a/data/json/itemgroups/misc.json +++ b/data/json/itemgroups/misc.json @@ -83,6 +83,7 @@ { "item": "family_photo", "prob": 5 }, { "item": "coin_quarter", "prob": 5 }, { "item": "mobile_memory_card_used", "count": [ 1, 4 ], "prob": 15 }, + { "item": "RPG_die", "prob": 5 }, { "item": "mobile_memory_card_encrypted", "count": [ 1, 2 ], "prob": 15 } ] }, From f74008882690f1f325a1ccf692b557d19aad1c55 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sun, 2 Jun 2019 21:30:42 -0400 Subject: [PATCH 16/37] Update item_groups.json --- data/json/item_groups.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/item_groups.json b/data/json/item_groups.json index 36087a856abc6..809bda3f56086 100644 --- a/data/json/item_groups.json +++ b/data/json/item_groups.json @@ -61,6 +61,7 @@ [ "slingshot", 10 ], [ "frisbee", 10 ], [ "dnd_handbook", 1 ], + [ "RPG_die", 1 ], [ "milkshake_fastfood", 3 ] ] }, From 620a6eef02d2b8039f502fce9c75c47210ae39a7 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sun, 2 Jun 2019 22:25:15 -0400 Subject: [PATCH 17/37] Update monster_drops.json --- data/json/monster_drops.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/monster_drops.json b/data/json/monster_drops.json index add0145b60163..b20e38acc6ce6 100644 --- a/data/json/monster_drops.json +++ b/data/json/monster_drops.json @@ -98,6 +98,7 @@ ], "prob": 5 }, + { "distribution": [ { "item": "RPG_die", "prob": 70 }, { "item": "dnd_handbook", "prob": 30 } ], "prob": 1 }, { "distribution": [ { "item": "cig", "prob": 65, "charges-min": 0, "charges-max": 20 }, From a86f51ab91671cec8361500666003725ff30b15f Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sun, 2 Jun 2019 23:59:00 -0400 Subject: [PATCH 18/37] Update ammo.json --- data/json/items/ammo.json | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index a9d6ad15e45ce..258ebd1a345ca 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -1333,7 +1333,7 @@ "id": "RPG_die", "price": 10, "name": "RPG die", - "name_plural": "RPG die", + "name_plural": "RPG dice", "symbol": "=", "color": "light_gray", "looks_like": "marble", @@ -1348,5 +1348,26 @@ "loudness": 0, "count": 7, "effects": [ "NEVER_MISFIRES" ] + }, + { + "type": "AMMO", + "id": "metal_RPG_die", + "price": 50, + "name": "metal RPG die", + "name_plural": "metal RPG dice", + "symbol": "=", + "color": "light_gray", + "looks_like": "marble", + "description": "A metal die used to play various role-playing games", + "material": "plastic", + "volume": 1, + "weight": 1, + "ammo_type": "pebble", + "damage": 5, + "range": 15, + "dispersion": 10, + "loudness": 0, + "count": 7, + "effects": [ "NEVER_MISFIRES" ] } ] From 8cddb7448c46ce094db830ae17d8f895f511fa40 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Mon, 3 Jun 2019 00:16:37 -0400 Subject: [PATCH 19/37] Update ammo.json --- data/json/items/ammo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index 258ebd1a345ca..6b0d6060ede94 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -1363,7 +1363,7 @@ "volume": 1, "weight": 1, "ammo_type": "pebble", - "damage": 5, + "damage": 3, "range": 15, "dispersion": 10, "loudness": 0, From 37e11707318b3e3608ede0203bdfbf518631c6ba Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Mon, 3 Jun 2019 01:26:58 -0400 Subject: [PATCH 20/37] Update item_groups.json --- data/json/item_groups.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/item_groups.json b/data/json/item_groups.json index 809bda3f56086..313072dd440e4 100644 --- a/data/json/item_groups.json +++ b/data/json/item_groups.json @@ -62,6 +62,7 @@ [ "frisbee", 10 ], [ "dnd_handbook", 1 ], [ "RPG_die", 1 ], + [ "metal_RPG_die", 1 ], [ "milkshake_fastfood", 3 ] ] }, From 2dad012d687bfa65e95c19c5b480a9f4842682a4 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Mon, 3 Jun 2019 01:27:01 -0400 Subject: [PATCH 21/37] Update mall_item_groups.json --- data/json/itemgroups/mall_item_groups.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/itemgroups/mall_item_groups.json b/data/json/itemgroups/mall_item_groups.json index 7c2df449f7bae..4c26c86aec0b4 100644 --- a/data/json/itemgroups/mall_item_groups.json +++ b/data/json/itemgroups/mall_item_groups.json @@ -119,7 +119,8 @@ [ "clown_suit", 5 ], [ "clownshoes", 5 ], [ "radio_car_box", 10 ], - [ "RPG_die", 5 ] + [ "RPG_die", 5 ], + [ "metal_RPG_die", 1 ] ] }, { From c615ae3ffbeef54e500fcb96da4a54d7ee5089e3 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Mon, 3 Jun 2019 01:27:04 -0400 Subject: [PATCH 22/37] Update misc.json --- data/json/itemgroups/misc.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json index 1c35796a7292a..a2789c0edb330 100644 --- a/data/json/itemgroups/misc.json +++ b/data/json/itemgroups/misc.json @@ -84,6 +84,7 @@ { "item": "coin_quarter", "prob": 5 }, { "item": "mobile_memory_card_used", "count": [ 1, 4 ], "prob": 15 }, { "item": "RPG_die", "prob": 5 }, + { "item": "metal_RPG_die", "prob": 1 }, { "item": "mobile_memory_card_encrypted", "count": [ 1, 2 ], "prob": 15 } ] }, From 3dbba16603938477a08b0f548a122a568ef0dcc4 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Mon, 3 Jun 2019 01:27:07 -0400 Subject: [PATCH 23/37] Update SUS_specific_use_storage_items.json --- data/json/itemgroups/SUS_specific_use_storage_items.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/itemgroups/SUS_specific_use_storage_items.json b/data/json/itemgroups/SUS_specific_use_storage_items.json index 0b045a2227e27..1ce899ca86c60 100644 --- a/data/json/itemgroups/SUS_specific_use_storage_items.json +++ b/data/json/itemgroups/SUS_specific_use_storage_items.json @@ -103,6 +103,7 @@ { "item": "bottle_opener", "prob": 75 }, { "item": "candle", "prob": 75 }, { "item": "RPG_die", "prob": 10 }, + { "item": "metal_RPG_die", "prob": 1 }, { "distribution": [ { "item": "matches" }, { "item": "lighter" } ], "prob": 90 } ] }, From 5c942e2517f89c0bfa34470392f15faef52ac5c9 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Mon, 3 Jun 2019 01:27:11 -0400 Subject: [PATCH 24/37] Update basement_game.json --- data/json/mapgen/basement/basement_game.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/mapgen/basement/basement_game.json b/data/json/mapgen/basement/basement_game.json index b0d8828b7ca37..6aa07dc267e19 100644 --- a/data/json/mapgen/basement/basement_game.json +++ b/data/json/mapgen/basement/basement_game.json @@ -240,6 +240,7 @@ { "item": "dnd_handbook", "x": 18, "y": 8, "chance": 100 }, { "item": "novel_fantasy", "x": [ 17, 19 ], "y": [ 8, 10 ], "chance": 60, "repeat": [ 0, 4 ] }, { "item": "character_sheet", "x": [ 17, 19 ], "y": [ 9, 10 ], "chance": 80, "repeat": [ 1, 5 ] }, + { "item": "metal_RPG_die", "x": 18, "y": 8, "chance": 10 }, { "item": "RPG_die", "x": [ 17, 19 ], "y": [ 8, 10 ], "chance": 90, "repeat": [ 1, 4 ] } ], "mapping": { From 4e270c2a7ef7183f536affff4e2f22f4a02d5c2c Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Mon, 3 Jun 2019 01:27:13 -0400 Subject: [PATCH 25/37] Update monster_drops.json --- data/json/monster_drops.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/json/monster_drops.json b/data/json/monster_drops.json index b20e38acc6ce6..cac0a378b6866 100644 --- a/data/json/monster_drops.json +++ b/data/json/monster_drops.json @@ -98,7 +98,10 @@ ], "prob": 5 }, - { "distribution": [ { "item": "RPG_die", "prob": 70 }, { "item": "dnd_handbook", "prob": 30 } ], "prob": 1 }, + { + "distribution": [ { "item": "RPG_die", "prob": 70 }, { "item": "dnd_handbook", "prob": 30 }, { "item": "meatl_RPG_die", "prob": 10 } ], + "prob": 1 + }, { "distribution": [ { "item": "cig", "prob": 65, "charges-min": 0, "charges-max": 20 }, From 5c2ea2a3ed0443e6bf785c3a459624534385c971 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Mon, 3 Jun 2019 09:14:07 -0400 Subject: [PATCH 26/37] Update monster_drops.json --- data/json/monster_drops.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monster_drops.json b/data/json/monster_drops.json index cac0a378b6866..0644159630e8d 100644 --- a/data/json/monster_drops.json +++ b/data/json/monster_drops.json @@ -99,7 +99,7 @@ "prob": 5 }, { - "distribution": [ { "item": "RPG_die", "prob": 70 }, { "item": "dnd_handbook", "prob": 30 }, { "item": "meatl_RPG_die", "prob": 10 } ], + "distribution": [ { "item": "RPG_die", "prob": 70 }, { "item": "dnd_handbook", "prob": 30 }, { "item": "metal_RPG_die", "prob": 10 } ], "prob": 1 }, { From 1b4eea87fea34fb9bc7d6c071eaeaee2ca1b234c Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Mon, 3 Jun 2019 13:30:36 -0400 Subject: [PATCH 27/37] Update monster_drops.json --- data/json/monster_drops.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/json/monster_drops.json b/data/json/monster_drops.json index 0644159630e8d..0cc28b82f429a 100644 --- a/data/json/monster_drops.json +++ b/data/json/monster_drops.json @@ -99,7 +99,11 @@ "prob": 5 }, { - "distribution": [ { "item": "RPG_die", "prob": 70 }, { "item": "dnd_handbook", "prob": 30 }, { "item": "metal_RPG_die", "prob": 10 } ], + "distribution": [ + { "item": "RPG_die", "prob": 70 }, + { "item": "dnd_handbook", "prob": 30 }, + { "item": "metal_RPG_die", "prob": 10 } + ], "prob": 1 }, { From e5453a4aca19702d20fc7c9a933fc7db0c36fe43 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Mon, 3 Jun 2019 13:47:51 -0400 Subject: [PATCH 28/37] Update monster_drops.json --- data/json/monster_drops.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/data/json/monster_drops.json b/data/json/monster_drops.json index 0cc28b82f429a..0644159630e8d 100644 --- a/data/json/monster_drops.json +++ b/data/json/monster_drops.json @@ -99,11 +99,7 @@ "prob": 5 }, { - "distribution": [ - { "item": "RPG_die", "prob": 70 }, - { "item": "dnd_handbook", "prob": 30 }, - { "item": "metal_RPG_die", "prob": 10 } - ], + "distribution": [ { "item": "RPG_die", "prob": 70 }, { "item": "dnd_handbook", "prob": 30 }, { "item": "metal_RPG_die", "prob": 10 } ], "prob": 1 }, { From d9d94f48fe1e8f36c7524a110ffcd029656244c3 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Wed, 5 Jun 2019 14:56:15 -0400 Subject: [PATCH 29/37] Update materials.json --- data/json/materials.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/data/json/materials.json b/data/json/materials.json index c67b3d63d6712..3960945123abb 100644 --- a/data/json/materials.json +++ b/data/json/materials.json @@ -1387,5 +1387,23 @@ "dmg_adj": [ "lightly damaged", "damaged", "very damaged", "thoroughly damaged" ], "bash_dmg_verb": "damaged", "cut_dmg_verb": "damaged" + }, + { + "type": "material", + "ident": "aluminum", + "name": "Aluminum", + "density": 10, + "specific_heat_liquid": 1.18, + "specific_heat_solid": 0.91, + "latent_heat": 398, + "bash_resist": 0, + "cut_resist": 4, + "acid_resist": 4, + "fire_resist": 2, + "elec_resist": 0, + "chip_resist": 10, + "repaired_with": "material_aluminium_ingot", + "bash_dmg_verb": "dented", + "cut_dmg_verb": "scratched" } ] From a5c7da4b581d8d655c2b35d04dbd14d176e318a1 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Wed, 5 Jun 2019 14:56:19 -0400 Subject: [PATCH 30/37] Update ammo.json --- data/json/items/ammo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index 6b0d6060ede94..a4835ba851a2c 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -1359,7 +1359,7 @@ "color": "light_gray", "looks_like": "marble", "description": "A metal die used to play various role-playing games", - "material": "plastic", + "material": "zinc", "volume": 1, "weight": 1, "ammo_type": "pebble", From 3d86d76298a193fd66684062004cb07516305f56 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Wed, 5 Jun 2019 15:49:24 -0400 Subject: [PATCH 31/37] Update materials.json --- data/json/materials.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/materials.json b/data/json/materials.json index 3960945123abb..b9c0cd46235f8 100644 --- a/data/json/materials.json +++ b/data/json/materials.json @@ -1390,8 +1390,8 @@ }, { "type": "material", - "ident": "aluminum", - "name": "Aluminum", + "ident": "zinc", + "name": "Zinc", "density": 10, "specific_heat_liquid": 1.18, "specific_heat_solid": 0.91, From cb48100426ed4814d334676b766301145513e4b2 Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Wed, 5 Jun 2019 15:55:21 -0400 Subject: [PATCH 32/37] Update materials.json --- data/json/materials.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/materials.json b/data/json/materials.json index b9c0cd46235f8..d3a27db7808d5 100644 --- a/data/json/materials.json +++ b/data/json/materials.json @@ -1402,7 +1402,6 @@ "fire_resist": 2, "elec_resist": 0, "chip_resist": 10, - "repaired_with": "material_aluminium_ingot", "bash_dmg_verb": "dented", "cut_dmg_verb": "scratched" } From a8a876b8775d61c81e52e466767eb8e631340802 Mon Sep 17 00:00:00 2001 From: anothersimulacrum <42699974+anothersimulacrum@users.noreply.github.com> Date: Thu, 6 Jun 2019 14:56:19 +0000 Subject: [PATCH 33/37] Add die use action --- data/json/item_actions.json | 5 +++++ data/json/items/ammo.json | 6 ++++-- src/item.cpp | 5 +++++ src/item_factory.cpp | 1 + src/iuse.cpp | 17 +++++++++++++++++ src/iuse.h | 1 + 6 files changed, 33 insertions(+), 2 deletions(-) diff --git a/data/json/item_actions.json b/data/json/item_actions.json index 143375a22a173..5f54c2c42de55 100644 --- a/data/json/item_actions.json +++ b/data/json/item_actions.json @@ -634,6 +634,11 @@ "id": "MP3_ON", "name": "Turn off music" }, + { + "type": "item_action", + "id": "RPGDIE", + "name": "Roll die" + }, { "type": "item_action", "id": "GASMASK", diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index a4835ba851a2c..e2222f70d7458 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -1347,7 +1347,8 @@ "dispersion": 15, "loudness": 0, "count": 7, - "effects": [ "NEVER_MISFIRES" ] + "effects": [ "NEVER_MISFIRES" ], + "use_action": "RPGDIE" }, { "type": "AMMO", @@ -1368,6 +1369,7 @@ "dispersion": 10, "loudness": 0, "count": 7, - "effects": [ "NEVER_MISFIRES" ] + "effects": [ "NEVER_MISFIRES" ], + "use_action": "RPGDIE" } ] diff --git a/src/item.cpp b/src/item.cpp index 2ca6be8d8e241..15e0edf4ffc6a 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -2691,6 +2691,11 @@ std::string item::info( std::vector &info, const iteminfo_query *parts } } } + if( this->get_var( "die_num_sides", 0 ) != 0 ) { + info.emplace_back( "DESCRIPTION", + string_format( _( "* This item can be used as a die, and has %s sides." ), + static_cast( this->get_var( "die_num_sides", 0 ) ) ) ); + } // list recipes you could use it in itype_id tid; diff --git a/src/item_factory.cpp b/src/item_factory.cpp index f0aaf85a65269..ad1fc44451fdd 100644 --- a/src/item_factory.cpp +++ b/src/item_factory.cpp @@ -604,6 +604,7 @@ void Item_factory::init() add_iuse( "CHAINSAW_OFF", &iuse::chainsaw_off ); add_iuse( "CHAINSAW_ON", &iuse::chainsaw_on ); add_iuse( "CHEW", &iuse::chew ); + add_iuse( "RPGDIE", &iuse::rpgdie ); add_iuse( "BIRDFOOD", &iuse::feedbird ); add_iuse( "BURROW", &iuse::burrow ); add_iuse( "CHOP_TREE", &iuse::chop_tree ); diff --git a/src/iuse.cpp b/src/iuse.cpp index f4875aa876279..09c70bd88f146 100644 --- a/src/iuse.cpp +++ b/src/iuse.cpp @@ -4051,6 +4051,23 @@ int iuse::mp3_on( player *p, item *it, bool t, const tripoint &pos ) return it->type->charges_to_use(); } +int iuse::rpgdie( player *you, item *die, bool, const tripoint & ) +{ + const std::array sides_options = { 4, 6, 8, 10, 12, 20 }; + int num_sides = die->get_var( "die_num_sides", 0 ); + if( num_sides == 0 ) { + const int sides = sides_options[ rng( 0, 5 ) ]; + num_sides = sides; + die->set_var( "die_num_sides", sides ); + } + const int roll = rng( 1, num_sides ); + you->add_msg_if_player( _( "You roll a %d on your %d sided %s" ), roll, num_sides, die->tname() ); + if( roll == num_sides ) { + add_msg( m_good, _( "Critical!" ) ); + } + return roll; +} + int iuse::dive_tank( player *p, item *it, bool t, const tripoint & ) { if( t ) { // Normal use diff --git a/src/iuse.h b/src/iuse.h index 3565a888d6915..b8891500c58e3 100644 --- a/src/iuse.h +++ b/src/iuse.h @@ -133,6 +133,7 @@ class iuse int shocktonfa_on( player *, item *, bool, const tripoint & ); int mp3( player *, item *, bool, const tripoint & ); int mp3_on( player *, item *, bool, const tripoint & ); + int rpgdie( player *, item *, bool, const tripoint & ); int dive_tank( player *, item *, bool, const tripoint & ); int gasmask( player *, item *, bool, const tripoint & ); int portable_game( player *, item *, bool, const tripoint & ); From 395c15e4353fba455759036af4c3ca6b9b91157e Mon Sep 17 00:00:00 2001 From: anothersimulacrum <42699974+anothersimulacrum@users.noreply.github.com> Date: Fri, 7 Jun 2019 10:51:17 +0000 Subject: [PATCH 34/37] Adjust use action a bit --- src/item.cpp | 2 +- src/iuse.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/item.cpp b/src/item.cpp index 15e0edf4ffc6a..a0a65d0b25908 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -2693,7 +2693,7 @@ std::string item::info( std::vector &info, const iteminfo_query *parts } if( this->get_var( "die_num_sides", 0 ) != 0 ) { info.emplace_back( "DESCRIPTION", - string_format( _( "* This item can be used as a die, and has %s sides." ), + string_format( _( "* This item can be used as a die, and has %s sides." ), static_cast( this->get_var( "die_num_sides", 0 ) ) ) ); } diff --git a/src/iuse.cpp b/src/iuse.cpp index 09c70bd88f146..c40c64d063837 100644 --- a/src/iuse.cpp +++ b/src/iuse.cpp @@ -4053,10 +4053,10 @@ int iuse::mp3_on( player *p, item *it, bool t, const tripoint &pos ) int iuse::rpgdie( player *you, item *die, bool, const tripoint & ) { - const std::array sides_options = { 4, 6, 8, 10, 12, 20 }; + const std::vector sides_options = { 4, 6, 8, 10, 12, 20, 50 }; int num_sides = die->get_var( "die_num_sides", 0 ); if( num_sides == 0 ) { - const int sides = sides_options[ rng( 0, 5 ) ]; + const int sides = sides_options[ rng( 0, sides_options.size() - 1 ) ]; num_sides = sides; die->set_var( "die_num_sides", sides ); } From c686951dc6626d2423cbda427bec5a795e91dab6 Mon Sep 17 00:00:00 2001 From: krekeler0 <51249291+krekeler0@users.noreply.github.com> Date: Fri, 7 Jun 2019 18:01:52 -0400 Subject: [PATCH 35/37] Update src/item.cpp Co-Authored-By: anothersimulacrum --- src/item.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/item.cpp b/src/item.cpp index a0a65d0b25908..650f6e2cb9622 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -2693,7 +2693,7 @@ std::string item::info( std::vector &info, const iteminfo_query *parts } if( this->get_var( "die_num_sides", 0 ) != 0 ) { info.emplace_back( "DESCRIPTION", - string_format( _( "* This item can be used as a die, and has %s sides." ), + string_format( _( "* This item can be used as a die, and has %d sides." ), static_cast( this->get_var( "die_num_sides", 0 ) ) ) ); } From 4d844157eb83db7030e693818b0785c656e2f96e Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sun, 9 Jun 2019 16:52:33 -0400 Subject: [PATCH 36/37] Update materials.json --- data/json/materials.json | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/data/json/materials.json b/data/json/materials.json index d3a27db7808d5..c67b3d63d6712 100644 --- a/data/json/materials.json +++ b/data/json/materials.json @@ -1387,22 +1387,5 @@ "dmg_adj": [ "lightly damaged", "damaged", "very damaged", "thoroughly damaged" ], "bash_dmg_verb": "damaged", "cut_dmg_verb": "damaged" - }, - { - "type": "material", - "ident": "zinc", - "name": "Zinc", - "density": 10, - "specific_heat_liquid": 1.18, - "specific_heat_solid": 0.91, - "latent_heat": 398, - "bash_resist": 0, - "cut_resist": 4, - "acid_resist": 4, - "fire_resist": 2, - "elec_resist": 0, - "chip_resist": 10, - "bash_dmg_verb": "dented", - "cut_dmg_verb": "scratched" } ] From eccbd84454b1e0275019898a0a8b9ea3f97070ee Mon Sep 17 00:00:00 2001 From: krekeler0 Date: Sun, 9 Jun 2019 23:52:32 -0400 Subject: [PATCH 37/37] Update materials.json --- data/json/materials.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/data/json/materials.json b/data/json/materials.json index c67b3d63d6712..2663ef3a02f6b 100644 --- a/data/json/materials.json +++ b/data/json/materials.json @@ -1387,5 +1387,23 @@ "dmg_adj": [ "lightly damaged", "damaged", "very damaged", "thoroughly damaged" ], "bash_dmg_verb": "damaged", "cut_dmg_verb": "damaged" + }, + { + "type": "material", + "ident": "zinc", + "name": "Zinc", + "density": 10, + "specific_heat_liquid": 1.18, + "specific_heat_solid": 0.91, + "latent_heat": 260, + "bash_resist": 4, + "cut_resist": 3, + "acid_resist": 4, + "fire_resist": 1, + "elec_resist": 0, + "chip_resist": 10, + "dmg_adj": [ "dented", "bent", "smashed", "shattered" ], + "bash_dmg_verb": "dented", + "cut_dmg_verb": "scratched" } ]