Exodii plasma gun

data/json/ammo_effects.json

@@ -271,6 +271,12 @@
     "//": "Creates a cloud of superheated plasma",
     "aoe": { "field_type": "fd_plasma", "intensity_min": 1, "intensity_max": 3, "radius": 1, "chance": 10 }
   },
+  {
+    "id": "PLASMA_FAN",
+    "type": "ammo_effect",
+    "always_cast_spell": true,
+    "spell_data": { "id": "spell_plasma_fan" }
+  },
   {
     "id": "EXPLOSIVE",
     "type": "ammo_effect",

data/json/itemgroups/Weapons_Mods_Ammo/guns.json

@@ -330,12 +330,7 @@
     "type": "item_group",
     "id": "guns_energy",
     "//": "Assorted factory crafted energy weapons.",
-    "items": [
-      { "item": "laser_rifle", "prob": 30 },
-      { "item": "emp_gun", "prob": 10 },
-      { "item": "v29", "prob": 70 },
-      { "item": "plasma_gun", "prob": 10, "charges": [ 0, 25 ] }
-    ]
+    "items": [ { "item": "laser_rifle", "prob": 30 }, { "item": "emp_gun", "prob": 10 }, { "item": "v29", "prob": 70 } ]
   },
   {
     "type": "item_group",

data/json/itemgroups/main.json

@@ -19,7 +19,6 @@
       { "item": "laser_rifle", "prob": 10 },
       { "item": "optical_cloak", "prob": 10 },
       { "item": "holo_cloak", "prob": 10 },
-      { "item": "plasma_rifle", "prob": 10 },
       { "item": "portal", "prob": 10 },
       { "item": "rm13_armor", "prob": 10 },
       { "item": "high_density_capacitor", "prob": 10 },

data/json/items/ammo/exodii.json

@@ -209,6 +209,20 @@
     "damage": { "damage_type": "bullet", "amount": 220, "armor_penetration": 35 },
     "effects": [ "COOKOFF", "EXPLOSIVE_m433" ]
   },
+  {
+    "id": "caotel_cell",
+    "type": "AMMO",
+    "copy-from": "3006",
+    "count": 12,
+    "name": { "str": "Caotel cell" },
+    "description": "This is a small metallic cube of inscrutable construction.  A single groove etched into one side of the object presumably allows it to be mounted into other things, and a small red arrow has been helpfully painted besides it.",
+    "price_postapoc": "12 USD",
+    "ammo_type": "caotel_cell",
+    "range": 0,
+    "material": [ "qt_steel" ],
+    "effects": [ "NEVER_MISFIRES" ],
+    "casing": "caotel_cell_spent"
+  },
   {
     "id": "33naval_ball",
     "type": "AMMO",

data/json/items/ammo_types.json

@@ -822,6 +822,12 @@
     "name": "3.3 naval cartridge",
     "default": "33naval_ball"
   },
+  {
+    "type": "ammunition_type",
+    "id": "caotel_cell",
+    "name": "Caotel cell",
+    "default": "caotel_cell"
+  },
   {
     "type": "ammunition_type",
     "id": "glowstick_juice",

data/json/items/generic/casing.json

@@ -90,6 +90,13 @@
     "weight": "80 g",
     "volume": "100 ml"
   },
+  {
+    "id": "caotel_cell_spent",
+    "type": "GENERIC",
+    "copy-from": "caotel_cell",
+    "name": { "str": "spent Caotel cell" },
+    "description": "This is a small metallic cube of inscrutable construction.  You think it might feel slightly lighter when compared to the fresh ones."
+  },
   {
     "id": "270win_casing",
     "copy-from": "casing",

data/json/items/gun/exodii.json

@@ -226,6 +226,98 @@
       }
     ]
   },
+  {
+    "id": "exodii_plasma_projectile",
+    "type": "GUN",
+    "name": { "str_sp": "Caotel Sr2.2 (Projectile)" },
+    "looks_like": "plasma_gun",
+    "description": "Nothing but ruins and ash-choked skies remained in the world where this exotic weapon was manufactured, and the Exodii, ever pragmatic, choose not to explore beyond what was necessary to perform a second, emergency escape.  A single discharge from the Caotel easily melts through conventional armor and flash-incinerates anything behind it, but its state of disrepair limits the number of shots it can fire in quick succession.",
+    "symbol": "(",
+    "color": "cyan",
+    "weight": "8500 g",
+    "volume": "4 L",
+    "longest_side": "100 cm",
+    "price": "100 USD",
+    "price_postapoc": "100 USD",
+    "range": 20,
+    "//": "Ballistic for the projectile itself, biological to represent flashboiling the flesh of living targets",
+    "ranged_damage": [ { "damage_type": "bullet", "amount": 120, "armor_penetration": 60 }, { "damage_type": "biological", "amount": 60 } ],
+    "ammo_effects": [ "PLASMA", "EXPLOSIVE_SMALL" ],
+    "flags": [ "NEVER_JAMS", "NON_FOULING", "OVERHEATS" ],
+    "ammo": [ "caotel_cell" ],
+    "dispersion": 200,
+    "overheat_threshold": 59,
+    "cooling_value": 1,
+    "heat_per_shot": 20,
+    "recoil": 30,
+    "skill": "rifle",
+    "durability": 4,
+    "loudness": 5,
+    "reload": 300,
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "holster": true,
+        "magazine_well": "120 ml",
+        "max_contains_volume": "20 L",
+        "max_contains_weight": "20 kg",
+        "item_restriction": [ "caotel_plasma_ring" ]
+      }
+    ],
+    "use_action": {
+      "menu_text": "Switch Firing Mode",
+      "type": "transform",
+      "target": "exodii_plasma_fan",
+      "msg": "A cacophony of symbols flash across the weapon's display, but it seems to stabilize nonetheless.",
+      "ammo_scale": 0
+    },
+    "valid_mod_locations": [ [ "sling", 1 ], [ "condenser", 1 ] ],
+    "faults": [ "fault_overheat_explosion", "fault_overheat_venting", "fault_overheat_safety" ]
+  },
+  {
+    "id": "exodii_plasma_fan",
+    "type": "GUN",
+    "name": { "str_sp": "Caotel Sr3.3 (FAN)" },
+    "copy-from": "exodii_plasma_projectile",
+    "looks_like": "plasma_gun",
+    "description": "Nothing but ruins and ash-choked skies remained in the world where this exotic weapon was manufactured, and the Exodii, ever  pragmatic choose not to explore beyond what was necessary to perform a second, emergency escape.  Even a second of exposure to the Caotel's plasma fan is enough to flash-incinerate anything, but its state of disrepair limits the amount of time its destructive power can be sustained.",
+    "skill": "launcher",
+    "range": 12,
+    "ranged_damage": [ { "damage_type": "heat", "amount": 50, "armor_penetration": 60 } ],
+    "ammo_effects": [ "PLASMA", "PLASMA_FAN" ],
+    "use_action": {
+      "menu_text": "Switch Firing Mode",
+      "type": "transform",
+      "target": "exodii_plasma_projectile",
+      "msg": "A cacophony of symbols flash across the weapon's display, but it seems to stabilize nonetheless.",
+      "ammo_scale": 0
+    },
+    "heat_per_shot": 15
+  },
+  {
+    "id": "spell_plasma_fan",
+    "type": "SPELL",
+    "name": { "str": "Plasma fan", "//~": "NO_I18N" },
+    "description": { "str": "Your weapon releases a searing fan of plasma.", "//~": "NO_I18N" },
+    "effect": "attack",
+    "shape": "cone",
+    "field_id": "fd_plasma",
+    "min_field_intensity": 1,
+    "max_field_intensity": 3,
+    "valid_targets": [ "hostile", "ally", "ground" ],
+    "flags": [ "LOUD", "NO_EXPLOSION_SFX", "RANDOM_DAMAGE", "IGNITE_FLAMMABLE", "IGNORE_WALLS", "SPLIT_DAMAGE" ],
+    "min_damage": 20,
+    "max_damage": 30,
+    "min_bash_scaling": 6,
+    "max_bash_scaling": 6,
+    "min_aoe": 15,
+    "max_aoe": 15,
+    "min_range": 10,
+    "max_range": 10,
+    "difficulty": 1,
+    "sound_description": "fzzzt",
+    "damage_type": "heat"
+  },
   {
     "id": "ree_33",
     "copy-from": "rifle_semi",

data/json/items/gunmod/mechanism.json

@@ -170,6 +170,27 @@
     "min_skills": [ [ "mechanics", 4 ], [ "rifle", 5 ] ],
     "flags": [ "INSTALL_DIFFICULT", "CONSUMABLE" ]
   },
+  {
+    "id": "condenser_pristine",
+    "type": "GUNMOD",
+    "name": { "str": "pristine condenser" },
+    "description": "A condenser unit for the Caotel Sr2.2, seemingly in perfect condition.",
+    "weight": "380 g",
+    "volume": "250 ml",
+    "integral_volume": "0 ml",
+    "price": "840 USD",
+    "price_postapoc": "10 USD",
+    "install_time": "20 m",
+    "material": [ "steel" ],
+    "symbol": ":",
+    "color": "light_gray",
+    "location": "condenser",
+    "mod_targets": [ "launcher", "rifle" ],
+    "flags": [ "IRREMOVABLE" ],
+    "heat_per_shot_modifier": -5,
+    "cooling_value_multiplier": 3,
+    "min_skills": [ [ "weapon", 4 ], [ "electronics", 5 ] ]
+  },
   {
     "id": "m240semi",
     "type": "GUNMOD",

data/json/items/magazine/exodii.json

@@ -106,5 +106,23 @@
     "ammo_type": [ "33naval" ],
     "reload_time": 400,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "33naval": 53 } } ]
+  },
+  {
+    "id": "caotel_plasma_ring",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "Caotel plasma condenser" },
+    "description": "A strange annular device analogous to a magazine, automatically ejected whenever the last of its mounted power cells are depleted.  In fact, you are not sure whether its meant to be reusable or not.",
+    "weight": "1020 g",
+    "flags": [ "MAG_BULKY", "MAG_EJECT" ],
+    "volume": "1450 ml",
+    "longest_side": "120 mm",
+    "price_postapoc": "40 USD",
+    "material": [ "qt_steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "caotel_cell" ],
+    "reload_time": 1800,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "caotel_cell": 12 } } ]
   }
 ]

data/json/mapgen/void_spider.json

@@ -28,7 +28,11 @@
             "prob": 10
           },
           {
-            "collection": [ { "item": "holo_cloak" }, { "item": "standard_template_construct" }, { "item": "plasma_gun" } ],
+            "collection": [
+              { "item": "holo_cloak" },
+              { "item": "standard_template_construct" },
+              { "item": "exodii_plasma_projectile", "contents-item": [ "condenser_pristine" ] }
+            ],
             "prob": 10
           },
           {

data/json/npcs/exodii/exodii_merchant_itemlist.json

@@ -199,6 +199,17 @@
       { "item": "273x110slugheavy", "container-item": "box_small", "prob": 30, "count": [ 1, 2 ], "sealed": true }
     ]
   },
+  {
+    "type": "item_group",
+    "id": "EXODII_Shop_Guns_caotel",
+    "subtype": "collection",
+    "//": "Ideally this will be moved into possible reward for finding useful stuff within exodii dungeons.",
+    "items": [
+      { "item": "exodii_plasma_projectile", "prob": 100, "count": 1 },
+      { "item": "caotel_plasma_ring", "prob": 100, "count": 1 },
+      { "item": "caotel_cell", "container-item": "box_small", "prob": 100, "count": 2, "sealed": true }
+    ]
+  },
   {
     "type": "item_group",
     "id": "EXODII_Shop_OldArmour",

data/json/npcs/exodii/exodii_weaponmaster.json

@@ -33,8 +33,10 @@
       { "group": "EXODII_Shop_OldArmour", "rigid": true },
       { "group": "EXODII_Shop_Guns_Tier1", "rigid": true, "trust": 1 },
       { "group": "EXODII_Shop_Guns_Tier2", "rigid": true, "trust": 10 },
-      { "group": "EXODII_Shop_Guns_Tier3", "rigid": true, "trust": 20, "strict": true }
+      { "group": "EXODII_Shop_Guns_Tier3", "rigid": true, "trust": 20, "strict": true },
+      { "group": "EXODII_Shop_Guns_caotel", "rigid": true, "trust": 20, "strict": true }
     ],
+    "shopkeeper_price_rules": [ { "group": "EXODII_Shop_Guns_caotel", "markup": 10 }, { "item": "caotel_cell_spent", "fixed_adj": 80 } ],
     "shopkeeper_consumption_rates": "basic_shop_rates",
     "weapon_override": "brogyeki_weapon_override",
     "worn_override": "EMPTY_GROUP",