Merge pull request #2 from CleverRaven/master

Daily update: #2
Maleclypse · Oct 9, 2019 · 37cd9bf · 37cd9bf
2 parents bf4f36f + cb7b4b0
commit 37cd9bf
Show file tree

Hide file tree

Showing 93 changed files with 4,730 additions and 583 deletions.
diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json
@@ -5860,8 +5860,7 @@
       [ "smokebomb", 50 ],
       [ "dynamite", 50 ],
       [ "mininuke", 5 ],
-      [ "c4", 50 ],
-      [ "tool_black_powder_bomb", 10 ]
+      [ "c4", 50 ]
     ]
   },
   {

diff --git a/data/json/items/ammo/50.json b/data/json/items/ammo/50.json
@@ -25,7 +25,7 @@
     "stack_size": 10,
     "ammo_type": "50",
     "casing": "50_casing",
-    "range": 40,
+    "range": 110,
     "damage": 131,
     "pierce": 28,
     "dispersion": 30,

diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -1874,19 +1874,6 @@
     "volume": 0,
     "price": 200
   },
-  {
-    "type": "GENERIC",
-    "id": "bluebell_flower",
-    "name": "bluebell",
-    "description": "A bluebell stalk with some petals.",
-    "weight": "40 g",
-    "to_hit": -3,
-    "color": "blue",
-    "symbol": ",",
-    "material": [ "veggy" ],
-    "volume": "250 ml",
-    "price": 0
-  },
   {
     "type": "GENERIC",
     "id": "bluebell_bud",

diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json
@@ -14,7 +14,7 @@
     "bashing": 12,
     "material": "steel",
     "ammo": "50",
-    "range": 45,
+    "range": 100,
     "ranged_damage": -5,
     "dispersion": 90,
     "durability": 8,
@@ -39,7 +39,7 @@
     "material": "steel",
     "ammo": "50",
     "skill": "rifle",
-    "range": 45,
+    "range": 110,
     "dispersion": 200,
     "durability": 8,
     "reload": 400,
@@ -99,7 +99,7 @@
     "bashing": 13,
     "material": "steel",
     "ammo": "50",
-    "range": 45,
+    "range": 115,
     "ranged_damage": -5,
     "dispersion": 80,
     "durability": 7,

diff --git a/data/json/items/migration.json b/data/json/items/migration.json
@@ -708,5 +708,10 @@
     "id": "magbandolier",
     "type": "MIGRATION",
     "replace": "chestrig"
+  },
+  {
+    "id": "tool_black_powder_bomb",
+    "type": "MIGRATION",
+    "replace": "can_bomb"
   }
 ]
diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json
@@ -598,5 +598,72 @@
       "explosion": { "power": 120 }
     },
     "flags": [ "TRADER_AVOID" ]
+  },
+  {
+    "id": "tool_black_powder_bomb",
+    "type": "TOOL",
+    "category": "weapons",
+    "name": "black gunpowder bomb",
+    "description": "This is a tin can filled to the brim with black gunpowder and with a bit of fuse sticking out of it.",
+    "//": "40g of tin can and 250ml/412g of gunpowder",
+    "weight": "452 g",
+    "volume": "250 ml",
+    "price": 2500,
+    "to_hit": -2,
+    "material": [ "steel", "plastic" ],
+    "symbol": "*",
+    "color": "red",
+    "explode_in_fire": true,
+    "explosion": { "power": 88, "shrapnel": { "casing_mass": 3, "fragment_mass": 0.12 } },
+    "use_action": {
+      "target": "tool_black_powder_bomb_act",
+      "msg": "You light the fuse on the black gunpowder bomb.  Throw it before it blows in your face!",
+      "target_charges": 3,
+      "active": true,
+      "need_fire": 1,
+      "menu_text": "Light fuse",
+      "type": "transform"
+    },
+    "flags": [ "RADIO_MODABLE", "RADIO_INVOKE_PROC", "BOMB" ]
+  },
+  {
+    "id": "tool_black_powder_bomb_act",
+    "type": "TOOL",
+    "category": "weapons",
+    "name": "active black gunpowder bomb",
+    "description": "This is a tin can filled to the brim with black gunpowder and with a lit fuse stuck inside of it.",
+    "weight": "452 g",
+    "volume": "500 ml",
+    "price": 0,
+    "to_hit": -2,
+    "material": [ "steel", "plastic" ],
+    "symbol": "*",
+    "color": "light_red",
+    "initial_charges": 3,
+    "max_charges": 3,
+    "turns_per_charge": 1,
+    "explode_in_fire": true,
+    "explosion": { "power": 88, "shrapnel": { "casing_mass": 3, "fragment_mass": 0.12 } },
+    "use_action": {
+      "type": "explosion",
+      "sound_volume": 0,
+      "sound_msg": "Kshhh.",
+      "no_deactivate_msg": "You've already lit the fuse - throw it!",
+      "explosion": { "power": 88, "shrapnel": { "casing_mass": 3, "fragment_mass": 0.12 } }
+    },
+    "flags": [ "BOMB", "TRADER_AVOID" ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "bluebell_flower",
+    "name": "bluebell",
+    "description": "A bluebell stalk with some petals.",
+    "weight": "40 g",
+    "to_hit": -3,
+    "color": "blue",
+    "symbol": ",",
+    "material": [ "veggy" ],
+    "volume": "250 ml",
+    "price": 0
   }
 ]
diff --git a/data/json/items/tools.json b/data/json/items/tools.json
@@ -6064,60 +6064,6 @@
     },
     "flags": [ "BOMB", "TRADER_AVOID" ]
   },
-  {
-    "id": "tool_black_powder_bomb",
-    "type": "TOOL",
-    "category": "weapons",
-    "name": "black gunpowder bomb",
-    "description": "This is a tin can filled to the brim with black gunpowder and with a bit of fuse sticking out of it.",
-    "//": "40g of tin can and 250ml/412g of gunpowder",
-    "weight": "452 g",
-    "volume": "250 ml",
-    "price": 2500,
-    "to_hit": -2,
-    "material": [ "steel", "plastic" ],
-    "symbol": "*",
-    "color": "red",
-    "explode_in_fire": true,
-    "explosion": { "power": 88, "shrapnel": { "casing_mass": 3, "fragment_mass": 0.12 } },
-    "use_action": {
-      "target": "tool_black_powder_bomb_act",
-      "msg": "You light the fuse on the black gunpowder bomb.  Throw it before it blows in your face!",
-      "target_charges": 3,
-      "active": true,
-      "need_fire": 1,
-      "menu_text": "Light fuse",
-      "type": "transform"
-    },
-    "flags": [ "RADIO_MODABLE", "RADIO_INVOKE_PROC", "BOMB" ]
-  },
-  {
-    "id": "tool_black_powder_bomb_act",
-    "type": "TOOL",
-    "category": "weapons",
-    "name": "active black gunpowder bomb",
-    "description": "This is a tin can filled to the brim with black gunpowder and with a lit fuse stuck inside of it.",
-    "weight": "452 g",
-    "volume": "500 ml",
-    "price": 0,
-    "to_hit": -2,
-    "material": [ "steel", "plastic" ],
-    "symbol": "*",
-    "color": "light_red",
-    "initial_charges": 3,
-    "max_charges": 3,
-    "turns_per_charge": 1,
-    "explode_in_fire": true,
-    "explosion": { "power": 88, "shrapnel": { "casing_mass": 3, "fragment_mass": 0.12 } },
-    "use_action": {
-      "type": "explosion",
-      "sound_volume": 0,
-      "sound_msg": "Kshhh.",
-      "no_deactivate_msg": "You've already lit the fuse - throw it!",
-      "explosion": { "power": 88, "shrapnel": { "casing_mass": 3, "fragment_mass": 0.12 } }
-    },
-    "flags": [ "BOMB", "TRADER_AVOID" ]
-  },
   {
     "id": "tool_black_powder_charge",
     "type": "TOOL",

diff --git a/data/json/items/vehicle/solar.json b/data/json/items/vehicle/solar.json
@@ -11,6 +11,7 @@
     "material": [ "glass" ],
     "volume": "3 L",
     "bashing": 1,
+    "flags": [ "NO_REPAIR" ],
     "category": "veh_parts",
     "price": 90000
   },

diff --git a/data/json/legacy_artifact_active.json b/data/json/legacy_artifact_active.json
@@ -507,6 +507,22 @@
     "min_duration": 180000,
     "max_duration": 180000
   },
+  {
+    "type": "SPELL",
+    "id": "AEA_ENTRANCE",
+    "name": "Artifact Entrance",
+    "description": "Entrances surrounding monsters",
+    "effect": "charm_monster",
+    "message": "",
+    "min_damage": 0,
+    "max_damage": 600,
+    "min_duration": 500,
+    "max_duration": 5000,
+    "min_aoe": 8,
+    "max_aoe": 8,
+    "valid_targets": [ "self", "hostile" ],
+    "flags": [ "RANDOM_DAMAGE", "RANDOM_DURATION" ]
+  },
   {
     "type": "SPELL",
     "id": "AEA_SCREAM",
@@ -523,5 +539,34 @@
     "max_damage": 40,
     "valid_targets": [ "self" ],
     "extra_effects": [ { "id": "AEA_SCREAM_morale" } ]
+  },
+  {
+    "type": "SPELL",
+    "id": "AEA_PULSE_bash_terrain",
+    "name": "Bash Terrain",
+    "description": "Damages the terrain",
+    "valid_targets": [ "self", "ally", "hostile", "ground" ],
+    "effect": "bash",
+    "min_damage": 40,
+    "max_damage": 40,
+    "min_aoe": 2,
+    "max_aoe": 2
+  },
+  {
+    "type": "SPELL",
+    "id": "AEA_PULSE",
+    "name": "Artifact Pulse",
+    "description": "Damages the terrain",
+    "message": "",
+    "sound_description": "The earth shakes!",
+    "sound_id": "misc",
+    "sound_variant": "earthquake",
+    "sound_ambient": true,
+    "sound_type": "combat",
+    "valid_targets": [ "self" ],
+    "min_damage": 30,
+    "max_damage": 30,
+    "effect": "noise",
+    "extra_effects": [ { "id": "AEA_PULSE_bash_terrain" }, { "id": "AEA_PULSE_bash_terrain" }, { "id": "AEA_PULSE_bash_terrain" } ]
   }
 ]