Merge branch 'master' into Can't-activate-item

CleverRaven · Oct 5, 2024 · 30a378d · 30a378d
2 parents 23b7274 + 96ab1ce
commit 30a378d
Show file tree

Hide file tree

Showing 68 changed files with 5,120 additions and 2,405 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json
@@ -536,13 +536,6 @@
     "subtype": "distribution",
     "entries": [ { "item": "shot_he", "prob": 10 } ]
   },
-  {
-    "type": "item_group",
-    "id": "ammo_shotgun_obscure",
-    "//": "Imported or otherwise very obscure shotgun ammo.",
-    "subtype": "distribution",
-    "entries": [  ]
-  },
   {
     "type": "item_group",
     "id": "ammo_shotgun_reloaded",

diff --git a/data/json/items/ammo/8x40mm.json b/data/json/items/ammo/8x40mm.json
@@ -1,14 +1,4 @@
 [
-  {
-    "id": "8mm_bootleg",
-    "copy-from": "8mm_caseless",
-    "type": "AMMO",
-    "name": { "str_sp": "bootleg 8x40mm FMJ" },
-    "description": "A bootleg duplicate of the Rivtech 8x40mm caseless round.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 } },
-    "extend": { "effects": [ "RECYCLED" ], "flags": [ "CASELESS_ROUNDS" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
   {
     "id": "8mm_caseless",
     "type": "AMMO",

diff --git a/data/json/items/gun/380.json b/data/json/items/gun/380.json
@@ -35,30 +35,6 @@
     "min_cycle_recoil": 270,
     "pocket_data": [ { "magazine_well": "44 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "kp3atmag" ] } ]
   },
-  {
-    "id": "fn1910",
-    "copy-from": "pistol_backup",
-    "looks_like": "glock_17",
-    "type": "GUN",
-    "name": { "str": "FN 1910 .380 pistol" },
-    "description": "Made infamous in Sarajevo in 1914, the FN1910 was a popular pocket pistol, albeit in .32 ACP.  Collectors value the .380 model for its notoriety and more modern terminal performance.  If such a humble firearm could start a world war, could it perhaps protect you from the undead?",
-    "weight": "590 g",
-    "volume": "136 ml",
-    "longest_side": "80 mm",
-    "price": "750 USD",
-    "price_postapoc": "12 USD 50 cent",
-    "to_hit": -3,
-    "material": [ "steel" ],
-    "color": "dark_gray",
-    "ammo": [ "380" ],
-    "dispersion": 480,
-    "durability": 7,
-    "min_cycle_recoil": 270,
-    "flags": [ "ALLOWS_BODY_BLOCK" ],
-    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
-    "pocket_data": [ { "magazine_well": "60 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "fn1910mag" ] } ],
-    "melee_damage": { "bash": 1 }
-  },
   {
     "id": "rugerlcp",
     "copy-from": "pistol_backup",

diff --git a/data/json/items/ranged/ballista.json b/data/json/items/ranged/ballista.json
@@ -19,11 +19,15 @@
     "loudness": 20,
     "reload_noise_volume": 8,
     "reload": 8000,
-    "range": 80,
+    "//0": "Effective range significantly limited by arc of shot and complete lack of optics. 1 range = 12m gives us about 300m of range, which is a decent bit even for a skilled Roman artilleryman, firing at a formation or large structure.",
+    "range": 25,
     "ranged_damage": { "damage_type": "stab", "amount": 50 },
-    "dispersion": 250,
-    "sight_dispersion": 50,
-    "recoil": 200,
+    "//1": "Slightly worse than a composite bow, errors in hand-manufacturing build up as the overall product gets larger.",
+    "dispersion": 1000,
+    "//2": "Shooter's view is badly offset from the angle of launch. Even in a best case scenario (straight shooting, no drop), there is no dedicated sighting device.",
+    "sight_dispersion": 3000,
+    "//3": "Aiming is solely dependent on the user's grip, which must be removed to handle reloading. This weapon must be completely re-aimed with every use.",
+    "recoil": 5000,
     "durability": 4,
     "clip_size": 1,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "bolt_ballista": 1 } } ],
@@ -46,10 +50,12 @@
     "flags": [ "NONCONDUCTIVE" ],
     "ammo_type": "bolt_ballista",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 2, "armor_penetration": 20 },
-    "dispersion": 35,
+    "//1": "Slightly worse than a broadhead arrow, errors in hand-manufacturing build up as the overall product gets larger.",
+    "dispersion": 125,
     "loudness": 5,
     "critical_multiplier": 2,
-    "recovery_chance": 98,
+    "//2": "With the amount of kinetic energy these things have, reusing them is quite unlikely.",
+    "recovery_chance": 50,
     "melee_damage": { "stab": 12 }
   }
 ]
diff --git a/data/json/npcs/TALK_TEST.json b/data/json/npcs/TALK_TEST.json
@@ -1346,5 +1346,78 @@
     "id": [ "TALK_TEST_GUARD" ],
     "type": "talk_topic",
     "responses": [ { "text": "I have a custom response to a common topic", "topic": "TALK_TEST_FACTION_TRUST" } ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_TEST_SHOW_ALWAYS",
+    "dynamic_line": "This is a test conversation that shouldn't appear in the game.",
+    "responses": [
+      {
+        "condition": { "math": [ "0", ">", "1" ] },
+        "text": "You should see this response but not be able to select it (except in debug mode).",
+        "show_always": true,
+        "topic": "TALK_DONE"
+      },
+      { "text": "All done", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_TEST_SHOW_ALWAYS3",
+    "dynamic_line": "This is a test conversation that shouldn't appear in the game.",
+    "responses": [
+      {
+        "condition": { "math": [ "1", ">", "0" ] },
+        "text": "You should always see this response and be able to select it.",
+        "show_always": true,
+        "topic": "TALK_DONE"
+      },
+      { "text": "All done", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_TEST_SHOW_ALWAYS2",
+    "dynamic_line": "This is a test conversation that shouldn't appear in the game.",
+    "responses": [
+      {
+        "condition": { "math": [ "0", ">", "1" ] },
+        "text": "You should see this response but not be able to select it (except in debug mode) because",
+        "show_always": true,
+        "show_reason": "zero isn't greater than one.",
+        "topic": "TALK_DONE"
+      },
+      { "text": "All done", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_TEST_SHOW_CONDITION",
+    "dynamic_line": "This is a test conversation that shouldn't appear in the game.",
+    "responses": [
+      {
+        "condition": { "math": [ "0", ">", "1" ] },
+        "text": "You should see this response but not be able to select it (except in debug mode) because",
+        "topic": "TALK_DONE",
+        "show_condition": { "math": [ "1", ">", "0" ] },
+        "show_reason": "zero isn't greater than one."
+      },
+      { "text": "All done", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_TEST_SHOW_CONDITION2",
+    "dynamic_line": "This is a test conversation that shouldn't appear in the game.",
+    "responses": [
+      {
+        "condition": { "math": [ "0", ">", "1" ] },
+        "text": "You should not see this response.",
+        "topic": "TALK_DONE",
+        "show_condition": { "math": [ "0", ">", "1" ] },
+        "show_reason": "zero isn't greater than one."
+      },
+      { "text": "All done", "topic": "TALK_DONE" }
+    ]
   }
 ]