From 641476e51b6d7358fcfda2825833fd57d23cb720 Mon Sep 17 00:00:00 2001
From: GuardianDll <antisim009@gmail.com>
Date: Tue, 26 Nov 2024 09:18:37 +0100
Subject: [PATCH 01/10] new exodii rifle

---
 data/json/items/ammo/exodii.json              | 26 ++++++++++
 data/json/items/ammo_types.json               |  6 +++
 data/json/items/generic/casing.json           | 10 ++++
 data/json/items/gun/exodii.json               | 37 ++++++++++++++
 data/json/items/gunmod/underbarrel.json       | 22 ++++++++
 data/json/items/magazine/exodii.json          | 50 +++++++++++++++++++
 .../npcs/exodii/exodii_merchant_itemlist.json | 12 ++++-
 src/item.cpp                                  | 23 +++++++--
 src/item_factory.cpp                          |  1 +
 src/itype.h                                   |  3 ++
 10 files changed, 186 insertions(+), 4 deletions(-)

diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json
index 7174607c1c005..e86c991792fd7 100644
--- a/data/json/items/ammo/exodii.json
+++ b/data/json/items/ammo/exodii.json
@@ -208,5 +208,31 @@
     "description": "A long 27.3 Diyua cartridge loaded with a propelling charge, attached to a large high explosive shaped charge grenade several times larger in diameter.  It was designed to be muzzle loaded into 27.3x44 Diyua guns.  Though the grenade's penetration and fragmentation were ultimately deemed insufficient, this was of no matter to the Exodii who saw value in the explosive potential the grenade added to the Brogyeki '23.",
     "damage": { "damage_type": "bullet", "amount": 220, "armor_penetration": 35 },
     "effects": [ "COOKOFF", "EXPLOSIVE_m433" ]
+  },
+  {
+    "id": "33naval_ball",
+    "type": "AMMO",
+    "name": { "str_sp": "3.3 naval, FMJ" },
+    "description": "Initially made for some marine battles, this hefty projectile is a go-to round for late-stage exodii fights.",
+    "//": "secrectly just 23x152mm; 236 x 33 mm of size",
+    "weight": "450 g",
+    "volume": "201 ml",
+    "longest_side": "236 mm",
+    "price": "22 USD",
+    "price_postapoc": "25 USD",
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "material": [ "steel", "brass", "lead", "powder" ],
+    "symbol": "=",
+    "color": "dark_gray",
+    "count": 1,
+    "stack_size": 1,
+    "ammo_type": "33naval",
+    "casing": "33_naval_casing",
+    "range": 150,
+    "//2": "it has 90 kj of muzzle energy, but i just scaled .50 bmg stats.  TODO",
+    "damage": { "damage_type": "bullet", "amount": 589, "armor_penetration": 126 },
+    "dispersion": 150,
+    "recoil": 88917,
+    "effects": [ "COOKOFF" ]
   }
 ]
diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
index bd7e3c9d98835..3fa1618c73213 100644
--- a/data/json/items/ammo_types.json
+++ b/data/json/items/ammo_types.json
@@ -822,6 +822,12 @@
     "name": "27.3x44 Diyua Grenade",
     "default": "273x44RG"
   },
+  {
+    "type": "ammunition_type",
+    "id": "33naval",
+    "name": "3.3 naval cartridge",
+    "default": "33naval_ball"
+  },
   {
     "type": "ammunition_type",
     "id": "glowstick_juice",
diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json
index bb5680bf8a823..a01e26ef4f6bb 100644
--- a/data/json/items/generic/casing.json
+++ b/data/json/items/generic/casing.json
@@ -80,6 +80,16 @@
     "weight": "7 g",
     "volume": "10ml"
   },
+  {
+    "id": "33_naval_casing",
+    "copy-from": "casing",
+    "looks_like": "223_casing",
+    "type": "GENERIC",
+    "name": { "str": "3.3 naval casing" },
+    "description": "An empty casing from a 3.3 naval round.  If not burns and soot, it could be used as a cup.",
+    "weight": "80 g",
+    "volume": "100 ml"
+  },
   {
     "id": "270win_casing",
     "copy-from": "casing",
diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json
index f3334a1c07e8d..d1982c25d66ec 100644
--- a/data/json/items/gun/exodii.json
+++ b/data/json/items/gun/exodii.json
@@ -225,5 +225,42 @@
         "description": "The most popular gun to use the 12.3ln cartridge was, of course, the PA md. 71.  Its predecessor, the md. 68, was viewed by many as a sort of failure: although it was reliable and powerful, it was too heavy to be used as a good infantry weapon, and not really heavy enough to be a good support gun.  Enough were made, though, that during the zombie apocalypse, it gained a great deal of resurgent popularity as a light emplacement gun that used readily available ammunition.  It perfectly served the purposes of the Exodii, who had far less concern about its unwieldiness.  This one has been modified for use in vehicle turrets on Earth."
       }
     ]
+  },
+  {
+    "id": "ree_33",
+    "copy-from": "rifle_semi",
+    "looks_like": "m2browning",
+    "type": "GUN",
+    "name": { "str": "exodii naval rifle" },
+    "description": "Originally designed for naval defense of some small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a centner of its weight and is in need to penetrate a small bunker.  Unless you have a body, compatible with Exodii Standard Combat Bodyframe, you can use it only with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, user need to use a scope mounted on the side of a gun.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "ree_33",
+        "name": {
+          "str_sp": "Ree 3.3 exodii rifle",
+          "ctxt": "`Ree` in this case is butchered `Roe`, to carry some sort of nautical vibe"
+        },
+        "description": "Originally designed for naval defense of some small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a centner of its weight and is in need to penetrate a small bunker.  Unless you have a body, compatible with Exodii Standard Combat Bodyframe, you can use it only with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, user need to use a scope mounted on the side of a gun."
+      }
+    ],
+    "min_strength": 90,
+    "weight": "77000 g",
+    "volume": "151425 ml",
+    "longest_side": "3365 mm",
+    "barrel_length": "2890 mm",
+    "price_postapoc": "200 USD",
+    "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" },
+    "material": [ "steel" ],
+    "ammo": [ "33naval" ],
+    "range": 100,
+    "dispersion": 130,
+    "durability": 8,
+    "min_cycle_recoil": 80000,
+    "default_mods": [ "ree_33_tripod", "rifle_scope" ],
+    "flags": [ "NEVER_JAMS" ],
+    "//": "desired to be single shot or with attachable mag, but because MAGAZINE and MAGAZINE_WELL are mortal enemies, 4 round magazine is used instead.",
+    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ree_33_4_mag", "ree_33_53_mag" ] } ],
+    "melee_damage": { "bash": 7 }
   }
 ]
diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json
index 0da178c056d2e..c0c99db6d00a5 100644
--- a/data/json/items/gunmod/underbarrel.json
+++ b/data/json/items/gunmod/underbarrel.json
@@ -592,5 +592,27 @@
     "location": "underbarrel",
     "mod_targets": [ "smg", "pistol" ],
     "min_skills": [ [ "weapon", 3 ], [ "gun", 1 ] ]
+  },
+  {
+    "id": "ree_33_tripod",
+    "type": "GUNMOD",
+    "name": { "str": "heavy-duty tripod" },
+    "description": "Massive tripod, used by exodii naval rifle so it can be used by lightweight units, providing firearm support.  Allow to use naval rifle while prone.",
+    "weight": "6000 g",
+    "volume": "5800 ml",
+    "longest_side": "66 cm",
+    "price_postapoc": "5 USD",
+    "install_time": "5 m",
+    "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "neutral" },
+    "min_str_required_mod_if_prone": -83,
+    "material": [ "steel" ],
+    "symbol": ":",
+    "color": "brown",
+    "location": "underbarrel",
+    "mod_targets": [ "ree_33" ],
+    "handling_modifier": 18,
+    "min_skills": [ [ "weapon", 2 ] ],
+    "flags": [ "BIPOD", "SLOW_WIELD" ],
+    "melee_damage": { "bash": 12 }
   }
 ]
diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json
index bec1763fb489e..c5698fe247370 100644
--- a/data/json/items/magazine/exodii.json
+++ b/data/json/items/magazine/exodii.json
@@ -56,5 +56,55 @@
     "reload_time": 110,
     "flags": [ "MAG_BULKY" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "273x44": 5 } } ]
+  },
+  {
+    "id": "ree_33_4_mag",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "3.3 naval 4-round magazine" },
+    "description": "Bulky 4-round magazine for Exodii naval rifle.  Grant some amount of portability, if centner piece of metal can be named portable.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "ree_33_4_mag",
+        "name": { "str": "3.3 naval 4-round magazine" },
+        "description": "Bulky 4-round magazine for Exodii Ree 3.3 rifle.  Grant some amount of portability, if centner piece of metal can be named portable."
+      }
+    ],
+    "weight": "340 g",
+    "volume": "1200 ml",
+    "longest_side": "245 mm",
+    "price_postapoc": "2 USD 50 cent",
+    "material": [ "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "33naval" ],
+    "reload_time": 500,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "33naval": 4 } } ]
+  },
+  {
+    "id": "ree_33_53_mag",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "3.3 naval 53-round box magazine" },
+    "description": "Giant metal box with belt, that allow it to be used as high-capacity magazine for Exodii naval rifle.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "ree_33_53_mag",
+        "name": { "str": "3.3 naval 53-round box magazine" },
+        "description": "Giant metal box with belt, that allow it to be used as high-capacity magazine for Exodii Ree 3.3 rifle."
+      }
+    ],
+    "weight": "4600 g",
+    "volume": "14000 ml",
+    "longest_side": "245 mm",
+    "price_postapoc": "2 USD 50 cent",
+    "material": [ "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "33naval" ],
+    "reload_time": 400,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "33naval": 53 } } ]
   }
 ]
diff --git a/data/json/npcs/exodii/exodii_merchant_itemlist.json b/data/json/npcs/exodii/exodii_merchant_itemlist.json
index e2a521cab3452..db75c99650111 100644
--- a/data/json/npcs/exodii/exodii_merchant_itemlist.json
+++ b/data/json/npcs/exodii/exodii_merchant_itemlist.json
@@ -176,7 +176,17 @@
     "subtype": "collection",
     "items": [
       { "item": "273x44thermobaric", "container-item": "box_small_wood", "prob": 10, "count": [ 1, 2 ], "sealed": true },
-      { "item": "273x110slugmedium", "container-item": "box_small", "prob": 30, "count": [ 2, 4 ], "sealed": true }
+      { "item": "273x110slugmedium", "container-item": "box_small", "prob": 30, "count": [ 2, 4 ], "sealed": true },
+      {
+        "collection": [
+          { "item": "ree_33", "prob": 100, "count": [ 1, 3 ] },
+          { "item": "ree_33_4_mag", "prob": 100, "count": [ 2, 4 ] },
+          { "item": "ree_33_53_mag", "prob": 20, "count": [ 1, 3 ] },
+          { "item": "33naval_ball", "container-item": "box_medium_wood", "prob": 100, "charges": 200, "sealed": true },
+          { "item": "33naval_ball", "container-item": "box_medium_wood", "prob": 50, "charges": 200, "sealed": true }
+        ],
+        "prob": 20
+      }
     ]
   },
   {
diff --git a/src/item.cpp b/src/item.cpp
index 25ece54236c8a..f73cc019b8d71 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -2502,7 +2502,16 @@ void item::basic_info( std::vector<iteminfo> &info, const iteminfo_query *parts,
         // Display any minimal stat or skill requirements for the item
         std::vector<std::string> req;
         if( get_min_str() > 0 ) {
-            req.push_back( string_format( "%s %d", _( "strength" ), get_min_str() ) );
+            int min_str = 0;
+            for( const item *mod : gunmods() ) {
+                min_str += mod->type->gunmod->min_str_required_mod_if_prone;
+            }
+            if( min_str != 0 && !get_player_character().is_prone() ) {
+                req.push_back( string_format( "%s %d (%d %s)", _( "strength" ), get_min_str(),
+                                              get_min_str() + min_str, _( "if prone" ) ) );
+            } else {
+                req.push_back( string_format( "%s %d", _( "strength" ), get_min_str() ) );
+            }
         }
         if( type->min_dex > 0 ) {
             req.push_back( string_format( "%s %d", _( "dexterity" ), type->min_dex ) );
@@ -15054,13 +15063,21 @@ bool item::is_upgrade() const
 int item::get_min_str() const
 {
     const Character &p = get_player_character();
+    static const skill_id skill_archery( "archery" );
     if( type->gun ) {
         int min_str = type->min_str;
-        min_str -= p.get_proficiency_bonus( "archery", proficiency_bonus_type::strength );
-
+        // we really need some better check for bows than it's skill
+        if( type->gun->skill_used == skill_archery ) {
+            min_str -= p.get_proficiency_bonus( "archery", proficiency_bonus_type::strength );
+        }
         for( const item *mod : gunmods() ) {
             min_str += mod->type->gunmod->min_str_required_mod;
         }
+        if( p.is_prone() ) {
+            for( const item *mod : gunmods() ) {
+                min_str += mod->type->gunmod->min_str_required_mod_if_prone;
+            }
+        }
         return min_str > 0 ? min_str : 0;
     } else {
         return type->min_str;
diff --git a/src/item_factory.cpp b/src/item_factory.cpp
index 98a7b7ef87362..dab3a3537ddff 100644
--- a/src/item_factory.cpp
+++ b/src/item_factory.cpp
@@ -3574,6 +3574,7 @@ void Item_factory::load( islot_gunmod &slot, const JsonObject &jo, const std::st
     assign( jo, "mode_modifier", slot.mode_modifier );
     assign( jo, "reload_modifier", slot.reload_modifier );
     assign( jo, "min_str_required_mod", slot.min_str_required_mod );
+    assign( jo, "min_str_required_mod_if_prone", slot.min_str_required_mod_if_prone );
     if( jo.has_array( "add_mod" ) ) {
         slot.add_mod.clear();
         for( JsonArray curr : jo.get_array( "add_mod" ) ) {
diff --git a/src/itype.h b/src/itype.h
index b29de877b3917..4066ca32bfb5f 100644
--- a/src/itype.h
+++ b/src/itype.h
@@ -929,6 +929,9 @@ struct islot_gunmod : common_ranged_data {
     /** Modifies base strength required */
     int min_str_required_mod = 0;
 
+    /** Modifies base strength required if user is prone */
+    int min_str_required_mod_if_prone = 0;
+
     /** Additional gunmod slots to add to the gun */
     std::map<gunmod_location, int> add_mod;
 

From 6e24cb994bef8a6450ee6efa24d0dfeb54918a56 Mon Sep 17 00:00:00 2001
From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
Date: Tue, 26 Nov 2024 10:19:35 +0100
Subject: [PATCH 02/10] TY Pryanik

Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
---
 data/json/items/ammo/exodii.json        | 4 ++--
 data/json/items/gunmod/underbarrel.json | 2 +-
 data/json/items/magazine/exodii.json    | 8 ++++----
 src/item.cpp                            | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json
index e86c991792fd7..b24b97da5d4fc 100644
--- a/data/json/items/ammo/exodii.json
+++ b/data/json/items/ammo/exodii.json
@@ -213,8 +213,8 @@
     "id": "33naval_ball",
     "type": "AMMO",
     "name": { "str_sp": "3.3 naval, FMJ" },
-    "description": "Initially made for some marine battles, this hefty projectile is a go-to round for late-stage exodii fights.",
-    "//": "secrectly just 23x152mm; 236 x 33 mm of size",
+    "description": "Initially made for some marine battles, this hefty projectile is a go-to round for late-stage Exodii fights.",
+    "//": "secretly just 23x152mm; 236 x 33 mm of size",
     "weight": "450 g",
     "volume": "201 ml",
     "longest_side": "236 mm",
diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json
index c0c99db6d00a5..29f0ea62417b4 100644
--- a/data/json/items/gunmod/underbarrel.json
+++ b/data/json/items/gunmod/underbarrel.json
@@ -597,7 +597,7 @@
     "id": "ree_33_tripod",
     "type": "GUNMOD",
     "name": { "str": "heavy-duty tripod" },
-    "description": "Massive tripod, used by exodii naval rifle so it can be used by lightweight units, providing firearm support.  Allow to use naval rifle while prone.",
+    "description": "Massive tripod, used by Exodii naval rifle so it can be used by lightweight units, providing firearm support.  Allows using naval rifle while prone.",
     "weight": "6000 g",
     "volume": "5800 ml",
     "longest_side": "66 cm",
diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json
index c5698fe247370..d5638986caaf7 100644
--- a/data/json/items/magazine/exodii.json
+++ b/data/json/items/magazine/exodii.json
@@ -62,13 +62,13 @@
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "3.3 naval 4-round magazine" },
-    "description": "Bulky 4-round magazine for Exodii naval rifle.  Grant some amount of portability, if centner piece of metal can be named portable.",
+    "description": "Bulky 4-round magazine for Exodii naval rifle.  Grants some amount of portability, if hundredweight piece of metal can be named portable.",
     "variant_type": "gun",
     "variants": [
       {
         "id": "ree_33_4_mag",
         "name": { "str": "3.3 naval 4-round magazine" },
-        "description": "Bulky 4-round magazine for Exodii Ree 3.3 rifle.  Grant some amount of portability, if centner piece of metal can be named portable."
+        "description": "Bulky 4-round magazine for Exodii Ree 3.3 rifle.  Grants some amount of portability, if hundredweight piece of metal can be named portable."
       }
     ],
     "weight": "340 g",
@@ -87,13 +87,13 @@
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "3.3 naval 53-round box magazine" },
-    "description": "Giant metal box with belt, that allow it to be used as high-capacity magazine for Exodii naval rifle.",
+    "description": "Giant metal box with belt, that allows it to be used as high-capacity magazine for Exodii naval rifle.",
     "variant_type": "gun",
     "variants": [
       {
         "id": "ree_33_53_mag",
         "name": { "str": "3.3 naval 53-round box magazine" },
-        "description": "Giant metal box with belt, that allow it to be used as high-capacity magazine for Exodii Ree 3.3 rifle."
+        "description": "Giant metal box with belt, that allows it to be used as high-capacity magazine for Exodii Ree 3.3 rifle."
       }
     ],
     "weight": "4600 g",
diff --git a/src/item.cpp b/src/item.cpp
index f73cc019b8d71..2fafa1c730173 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -15066,7 +15066,7 @@ int item::get_min_str() const
     static const skill_id skill_archery( "archery" );
     if( type->gun ) {
         int min_str = type->min_str;
-        // we really need some better check for bows than it's skill
+        // we really need some better check for bows than its skill
         if( type->gun->skill_used == skill_archery ) {
             min_str -= p.get_proficiency_bonus( "archery", proficiency_bonus_type::strength );
         }

From fb9b2fab5a11f4ea1f368af6978ebb1f648f5abd Mon Sep 17 00:00:00 2001
From: GuardianDll <antisim009@gmail.com>
Date: Tue, 26 Nov 2024 10:42:35 +0100
Subject: [PATCH 03/10] document the gun sources

---
 data/json/items/gun/exodii.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json
index d1982c25d66ec..302b5a0020ecd 100644
--- a/data/json/items/gun/exodii.json
+++ b/data/json/items/gun/exodii.json
@@ -233,6 +233,7 @@
     "type": "GUN",
     "name": { "str": "exodii naval rifle" },
     "description": "Originally designed for naval defense of some small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a centner of its weight and is in need to penetrate a small bunker.  Unless you have a body, compatible with Exodii Standard Combat Bodyframe, you can use it only with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, user need to use a scope mounted on the side of a gun.",
+    "//": "effectively a weird single-shot self-loading Oerlikon KBA (but longer, and of course not an autocannon) with a 23x152mm round",
     "variant_type": "gun",
     "variants": [
       {
@@ -259,7 +260,7 @@
     "min_cycle_recoil": 80000,
     "default_mods": [ "ree_33_tripod", "rifle_scope" ],
     "flags": [ "NEVER_JAMS" ],
-    "//": "desired to be single shot or with attachable mag, but because MAGAZINE and MAGAZINE_WELL are mortal enemies, 4 round magazine is used instead.",
+    "//2": "desired to be single shot or with attachable mag, but because MAGAZINE and MAGAZINE_WELL are mortal enemies, 4 round magazine is used instead.",
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ree_33_4_mag", "ree_33_53_mag" ] } ],
     "melee_damage": { "bash": 7 }
   }

From f7271b257870b0df20894dabce2e5667e64e833e Mon Sep 17 00:00:00 2001
From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
Date: Tue, 26 Nov 2024 11:23:02 +0100
Subject: [PATCH 04/10] TY DSeyka

Co-authored-by: DSeyka <66876732+DSeyka@users.noreply.github.com>
---
 data/json/items/ammo/exodii.json     | 2 +-
 data/json/items/generic/casing.json  | 2 +-
 data/json/items/gun/exodii.json      | 4 ++--
 data/json/items/magazine/exodii.json | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json
index b24b97da5d4fc..442e08c217103 100644
--- a/data/json/items/ammo/exodii.json
+++ b/data/json/items/ammo/exodii.json
@@ -213,7 +213,7 @@
     "id": "33naval_ball",
     "type": "AMMO",
     "name": { "str_sp": "3.3 naval, FMJ" },
-    "description": "Initially made for some marine battles, this hefty projectile is a go-to round for late-stage Exodii fights.",
+    "description": "Initially made for marine combat, this hefty projectile is a go-to round for late-stage Exodii fights.",
     "//": "secretly just 23x152mm; 236 x 33 mm of size",
     "weight": "450 g",
     "volume": "201 ml",
diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json
index a01e26ef4f6bb..0e471d0d18da8 100644
--- a/data/json/items/generic/casing.json
+++ b/data/json/items/generic/casing.json
@@ -86,7 +86,7 @@
     "looks_like": "223_casing",
     "type": "GENERIC",
     "name": { "str": "3.3 naval casing" },
-    "description": "An empty casing from a 3.3 naval round.  If not burns and soot, it could be used as a cup.",
+    "description": "An empty casing from a 3.3 naval round.  If it wasn't for burns and soot, it could be used as a cup.",
     "weight": "80 g",
     "volume": "100 ml"
   },
diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json
index 302b5a0020ecd..1c24af225ac99 100644
--- a/data/json/items/gun/exodii.json
+++ b/data/json/items/gun/exodii.json
@@ -232,7 +232,7 @@
     "looks_like": "m2browning",
     "type": "GUN",
     "name": { "str": "exodii naval rifle" },
-    "description": "Originally designed for naval defense of some small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a centner of its weight and is in need to penetrate a small bunker.  Unless you have a body, compatible with Exodii Standard Combat Bodyframe, you can use it only with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, user need to use a scope mounted on the side of a gun.",
+    "description": "Originally designed for naval defense of some small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a centner of its weight and is in need to penetrate a small bunker.  Unless your body is compatible with Exodii Standard Combat Bodyframe, you can only use it with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, user needs to use a scope mounted on the side of a gun.",
     "//": "effectively a weird single-shot self-loading Oerlikon KBA (but longer, and of course not an autocannon) with a 23x152mm round",
     "variant_type": "gun",
     "variants": [
@@ -242,7 +242,7 @@
           "str_sp": "Ree 3.3 exodii rifle",
           "ctxt": "`Ree` in this case is butchered `Roe`, to carry some sort of nautical vibe"
         },
-        "description": "Originally designed for naval defense of some small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a centner of its weight and is in need to penetrate a small bunker.  Unless you have a body, compatible with Exodii Standard Combat Bodyframe, you can use it only with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, user need to use a scope mounted on the side of a gun."
+    "description": "Originally designed for naval defense of some small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a centner of its weight and is in need to penetrate a small bunker.  Unless your body is compatible with Exodii Standard Combat Bodyframe, you can only use it with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, user needs to use a scope mounted on the side of a gun.",
       }
     ],
     "min_strength": 90,
diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json
index d5638986caaf7..3a807bb6eb629 100644
--- a/data/json/items/magazine/exodii.json
+++ b/data/json/items/magazine/exodii.json
@@ -62,13 +62,13 @@
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "3.3 naval 4-round magazine" },
-    "description": "Bulky 4-round magazine for Exodii naval rifle.  Grants some amount of portability, if hundredweight piece of metal can be named portable.",
+    "description": "Bulky 4-round magazine for Exodii naval rifle.  Grants some amount of portability, if a hundredweight piece of metal can be named portable.",
     "variant_type": "gun",
     "variants": [
       {
         "id": "ree_33_4_mag",
         "name": { "str": "3.3 naval 4-round magazine" },
-        "description": "Bulky 4-round magazine for Exodii Ree 3.3 rifle.  Grants some amount of portability, if hundredweight piece of metal can be named portable."
+        "description": "Bulky 4-round magazine for Exodii Ree 3.3 rifle.  Grants some amount of portability, if a hundredweight piece of metal can be named portable."
       }
     ],
     "weight": "340 g",
@@ -87,13 +87,13 @@
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "3.3 naval 53-round box magazine" },
-    "description": "Giant metal box with belt, that allows it to be used as high-capacity magazine for Exodii naval rifle.",
+    "description": "Giant metal box with a belt, which allows it to be used as high-capacity magazine for Exodii naval rifle.",
     "variant_type": "gun",
     "variants": [
       {
         "id": "ree_33_53_mag",
         "name": { "str": "3.3 naval 53-round box magazine" },
-        "description": "Giant metal box with belt, that allows it to be used as high-capacity magazine for Exodii Ree 3.3 rifle."
+        "description": "Giant metal box with a belt, which allows it to be used as high-capacity magazine for Exodii Ree 3.3 rifle."
       }
     ],
     "weight": "4600 g",

From f2091e10052665d8e72decb3ca852537acf5fb95 Mon Sep 17 00:00:00 2001
From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
Date: Tue, 26 Nov 2024 13:46:11 +0100
Subject: [PATCH 05/10] fixing grammar, using more layman terms

---
 data/json/items/gun/exodii.json      | 4 ++--
 data/json/items/magazine/exodii.json | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json
index 1c24af225ac99..e01a2321f2faa 100644
--- a/data/json/items/gun/exodii.json
+++ b/data/json/items/gun/exodii.json
@@ -232,7 +232,7 @@
     "looks_like": "m2browning",
     "type": "GUN",
     "name": { "str": "exodii naval rifle" },
-    "description": "Originally designed for naval defense of some small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a centner of its weight and is in need to penetrate a small bunker.  Unless your body is compatible with Exodii Standard Combat Bodyframe, you can only use it with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, user needs to use a scope mounted on the side of a gun.",
+    "description": "Originally designed for naval defense of a small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a hundred kilo of its weight and is in need to penetrate a small bunker.  Unless your body is compatible with Exodii Standard Combat Bodyframe, you can only use it with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, user needs to use a scope mounted on the side of a gun.",
     "//": "effectively a weird single-shot self-loading Oerlikon KBA (but longer, and of course not an autocannon) with a 23x152mm round",
     "variant_type": "gun",
     "variants": [
@@ -242,7 +242,7 @@
           "str_sp": "Ree 3.3 exodii rifle",
           "ctxt": "`Ree` in this case is butchered `Roe`, to carry some sort of nautical vibe"
         },
-    "description": "Originally designed for naval defense of some small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a centner of its weight and is in need to penetrate a small bunker.  Unless your body is compatible with Exodii Standard Combat Bodyframe, you can only use it with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, user needs to use a scope mounted on the side of a gun.",
+    "description": "Originally designed for naval defense of a small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a hundred kilo of its weight and is in need to penetrate a small bunker.  Unless your body is compatible with Exodii Standard Combat Bodyframe, you can only use it with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, user needs to use a scope mounted on the side of a gun.",
       }
     ],
     "min_strength": 90,
diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json
index 3a807bb6eb629..ef271de4ad124 100644
--- a/data/json/items/magazine/exodii.json
+++ b/data/json/items/magazine/exodii.json
@@ -62,13 +62,13 @@
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "3.3 naval 4-round magazine" },
-    "description": "Bulky 4-round magazine for Exodii naval rifle.  Grants some amount of portability, if a hundredweight piece of metal can be named portable.",
+    "description": "A bulky 4-round magazine for the Exodii naval rifle.  Grants some amount of portability, if a gun itself can be named portable.",
     "variant_type": "gun",
     "variants": [
       {
         "id": "ree_33_4_mag",
         "name": { "str": "3.3 naval 4-round magazine" },
-        "description": "Bulky 4-round magazine for Exodii Ree 3.3 rifle.  Grants some amount of portability, if a hundredweight piece of metal can be named portable."
+        "description": "A bulky 4-round magazine for the Exodii Ree 3.3 rifle.  Grants some amount of portability, if a gun itself can be named portable."
       }
     ],
     "weight": "340 g",
@@ -87,13 +87,13 @@
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "3.3 naval 53-round box magazine" },
-    "description": "Giant metal box with a belt, which allows it to be used as high-capacity magazine for Exodii naval rifle.",
+    "description": "Giant metal box with a belt, which allows it to be used as a high-capacity magazine for the Exodii naval rifle.",
     "variant_type": "gun",
     "variants": [
       {
         "id": "ree_33_53_mag",
         "name": { "str": "3.3 naval 53-round box magazine" },
-        "description": "Giant metal box with a belt, which allows it to be used as high-capacity magazine for Exodii Ree 3.3 rifle."
+        "description": "Giant metal box with a belt, which allows it to be used as a high-capacity magazine for the Exodii Ree 3.3 rifle."
       }
     ],
     "weight": "4600 g",

From 95335067dd9700b44b5771b0addba011f3ef906d Mon Sep 17 00:00:00 2001
From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
Date: Tue, 26 Nov 2024 13:47:52 +0100
Subject: [PATCH 06/10] json error

---
 data/json/items/gun/exodii.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json
index e01a2321f2faa..00568f7676933 100644
--- a/data/json/items/gun/exodii.json
+++ b/data/json/items/gun/exodii.json
@@ -242,7 +242,7 @@
           "str_sp": "Ree 3.3 exodii rifle",
           "ctxt": "`Ree` in this case is butchered `Roe`, to carry some sort of nautical vibe"
         },
-    "description": "Originally designed for naval defense of a small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a hundred kilo of its weight and is in need to penetrate a small bunker.  Unless your body is compatible with Exodii Standard Combat Bodyframe, you can only use it with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, user needs to use a scope mounted on the side of a gun.",
+        "description": "Originally designed for naval defense of a small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a hundred kilo of its weight and is in need to penetrate a small bunker.  Unless your body is compatible with Exodii Standard Combat Bodyframe, you can only use it with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, user needs to use a scope mounted on the side of a gun."
       }
     ],
     "min_strength": 90,

From 61acb8da8497c53c602a67d4686d21f4e9d1c626 Mon Sep 17 00:00:00 2001
From: GuardianDll <antisim009@gmail.com>
Date: Wed, 27 Nov 2024 16:38:47 +0100
Subject: [PATCH 07/10] fix you need five minutes to pick up a gun

---
 src/item.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/item.cpp b/src/item.cpp
index 2fafa1c730173..da7060a547ab4 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -6606,7 +6606,8 @@ int item::on_wield_cost( const Character &you ) const
         }
 
         int penalty = get_var( "volume", volume() / units::legacy_volume_factor ) * d;
-        mv += penalty;
+        // arbitrary no more than 7 second of penalty
+        mv += std::min( penalty, 700 );
     }
 
     // firearms with a folding stock or tool/melee without collapse/retract iuse

From 22a95aae664368648ef8bb4a57bd2fd782d13aea Mon Sep 17 00:00:00 2001
From: GuardianDll <antisim009@gmail.com>
Date: Wed, 27 Nov 2024 16:39:01 +0100
Subject: [PATCH 08/10] please clang

---
 src/item.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/item.cpp b/src/item.cpp
index da7060a547ab4..d8f835f865c46 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -205,6 +205,7 @@ static const quality_id qual_BOIL( "BOIL" );
 static const quality_id qual_JACK( "JACK" );
 static const quality_id qual_LIFT( "LIFT" );
 
+static const skill_id skill_archery( "archery" );
 static const skill_id skill_cooking( "cooking" );
 static const skill_id skill_melee( "melee" );
 static const skill_id skill_survival( "survival" );
@@ -15064,7 +15065,6 @@ bool item::is_upgrade() const
 int item::get_min_str() const
 {
     const Character &p = get_player_character();
-    static const skill_id skill_archery( "archery" );
     if( type->gun ) {
         int min_str = type->min_str;
         // we really need some better check for bows than its skill

From ea6ad2e6c66d30b84c867ae6cd7d64fc1e7a7f6b Mon Sep 17 00:00:00 2001
From: GuardianDll <antisim009@gmail.com>
Date: Wed, 27 Nov 2024 16:39:20 +0100
Subject: [PATCH 09/10] gg migration

---
 .../Generic_Guns/ammo/gg_ammo_migration.json   |  5 +++++
 .../ammo/gg_casings_migration.json             |  3 ++-
 data/mods/Generic_Guns/ammo/rifle.json         |  8 ++++++++
 .../firearms/gg_firearms_migration.json        |  5 +++++
 data/mods/Generic_Guns/firearms/rifle.json     | 17 +++++++++++++++++
 .../mods/Generic_Guns/gg_ammunition_types.json |  7 +++++++
 .../magazines/gg_magazines_migration.json      | 10 ++++++++++
 data/mods/Generic_Guns/magazines/rifle.json    | 18 ++++++++++++++++++
 8 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json
index 50b9681d2b778..604024f75e677 100644
--- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json
+++ b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json
@@ -637,5 +637,10 @@
     "id": [ "84x246mm_smoke" ],
     "type": "MIGRATION",
     "replace": "rocket_smoke"
+  },
+  {
+    "id": [ "33naval_ball" ],
+    "type": "MIGRATION",
+    "replace": "rifle_ball_cannon"
   }
 ]
diff --git a/data/mods/Generic_Guns/ammo/gg_casings_migration.json b/data/mods/Generic_Guns/ammo/gg_casings_migration.json
index b94f52c304bbe..e6afca5d7d80a 100644
--- a/data/mods/Generic_Guns/ammo/gg_casings_migration.json
+++ b/data/mods/Generic_Guns/ammo/gg_casings_migration.json
@@ -65,7 +65,8 @@
       "762R_casing",
       "300_casing",
       "30carbine_casing",
-      "123ln_casing"
+      "123ln_casing",
+      "33_naval_casing"
     ],
     "type": "MIGRATION",
     "replace": "rifle_casing"
diff --git a/data/mods/Generic_Guns/ammo/rifle.json b/data/mods/Generic_Guns/ammo/rifle.json
index e314b17ed42aa..539dd1e21b08b 100644
--- a/data/mods/Generic_Guns/ammo/rifle.json
+++ b/data/mods/Generic_Guns/ammo/rifle.json
@@ -97,5 +97,13 @@
     "name": { "str_sp": "railgun rifle ammo" },
     "description": "Projectile used for a railgun.  It's made of a ferromagnetic metal, probably cobalt.",
     "ammo_type": "ammo_railgun"
+  },
+  {
+    "id": "rifle_ball_cannon",
+    "copy-from": "33naval_ball",
+    "type": "AMMO",
+    "name": { "str_sp": "foreign cannon rifle ammo, ball" },
+    "description": "Foreign cannon rifle ammo brought by the Exodii, capable to destroy lightly armored vehicles, as well as highly armored mutants.",
+    "ammo_type": "ammo_rifle_cannon"
   }
 ]
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
index 20865d18af0f5..b193e455932e9 100644
--- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
+++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -396,6 +396,11 @@
     "type": "MIGRATION",
     "replace": "rifle_assault_foreign"
   },
+  {
+    "id": [ "ree_33" ],
+    "type": "MIGRATION",
+    "replace": "rifle_cannon_foreign"
+  },
   {
     "id": [ "combination_gun", "pipe_combination_gun" ],
     "type": "MIGRATION",
diff --git a/data/mods/Generic_Guns/firearms/rifle.json b/data/mods/Generic_Guns/firearms/rifle.json
index 80ef35b8a6516..86ce4a77e9129 100644
--- a/data/mods/Generic_Guns/firearms/rifle.json
+++ b/data/mods/Generic_Guns/firearms/rifle.json
@@ -105,6 +105,23 @@
       }
     ]
   },
+  {
+    "id": "rifle_cannon_foreign",
+    "copy-from": "ree_33",
+    "type": "GUN",
+    "name": "foreign cannon rifle",
+    "ammo": [ "ammo_rifle_cannon" ],
+    "description": "A powerful Exodii rifle, reserved for the later stage of cataclysm.  Should be considered an anti-tank rifle in modern world, but the round is bigger than any anti-tank round on Earth",
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "holster": true,
+        "max_contains_volume": "200 L",
+        "max_contains_weight": "200 kg",
+        "item_restriction": [ "rifle_mag_cannon", "rifle_mag_cannon_big" ]
+      }
+    ]
+  },
   {
     "id": "rifle_rail",
     "copy-from": "hk_g80",
diff --git a/data/mods/Generic_Guns/gg_ammunition_types.json b/data/mods/Generic_Guns/gg_ammunition_types.json
index 477bc890914a3..539ba3be6e0a8 100644
--- a/data/mods/Generic_Guns/gg_ammunition_types.json
+++ b/data/mods/Generic_Guns/gg_ammunition_types.json
@@ -41,6 +41,13 @@
     "name": "foreign rifle ammo",
     "default": "rifle_ball_foreign"
   },
+  {
+    "type": "ammunition_type",
+    "id": "ammo_rifle_cannon",
+    "//": "specifically for Ree 3.3",
+    "name": "foreign cannon ammo",
+    "default": "rifle_ball_cannon"
+  },
   {
     "type": "ammunition_type",
     "id": "ammo_railgun",
diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
index 4c666380d4527..2ef8476b762f4 100644
--- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
+++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
@@ -358,6 +358,16 @@
     "type": "MIGRATION",
     "replace": "rifle_sniper_mag_foreign"
   },
+  {
+    "id": [ "ree_33_4_mag" ],
+    "type": "MIGRATION",
+    "replace": "rifle_mag_cannon"
+  },
+  {
+    "id": [ "ree_33_53_mag" ],
+    "type": "MIGRATION",
+    "replace": "rifle_mag_cannon_big"
+  },
   {
     "id": [ "hk_g80mag" ],
     "type": "MIGRATION",
diff --git a/data/mods/Generic_Guns/magazines/rifle.json b/data/mods/Generic_Guns/magazines/rifle.json
index 6f6ef9da34f2b..2eea7dae8c39b 100644
--- a/data/mods/Generic_Guns/magazines/rifle.json
+++ b/data/mods/Generic_Guns/magazines/rifle.json
@@ -57,6 +57,24 @@
     "ammo_type": [ "ammo_rifle_foreign" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "ammo_rifle_foreign": 10 } } ]
   },
+  {
+    "id": "rifle_mag_cannon",
+    "copy-from": "ree_33_4_mag",
+    "type": "MAGAZINE",
+    "name": { "str": "cannon rifle magazine" },
+    "description": "Small magazine for exodii cannon rifle.",
+    "ammo_type": [ "ammo_rifle_cannon" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "ammo_rifle_cannon": 4 } } ]
+  },
+  {
+    "id": "rifle_mag_cannon_big",
+    "copy-from": "ree_33_53_mag",
+    "type": "MAGAZINE",
+    "name": { "str": "cannon rifle box magazine" },
+    "description": "Bulky box magazine for exodii cannon rifle.",
+    "ammo_type": [ "ammo_rifle_cannon" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "ammo_rifle_cannon": 53 } } ]
+  },
   {
     "id": "rifle_rail_mag",
     "copy-from": "hk_g80mag",

From a98b565a101e0644f9b1a750a6ba75e897151c2b Mon Sep 17 00:00:00 2001
From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
Date: Thu, 28 Nov 2024 06:56:53 +0100
Subject: [PATCH 10/10] Apply suggestions from code review

Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
---
 data/json/items/gun/exodii.json            | 4 ++--
 data/json/items/magazine/exodii.json       | 4 ++--
 data/mods/Generic_Guns/firearms/rifle.json | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json
index 00568f7676933..a2fa89e27fb18 100644
--- a/data/json/items/gun/exodii.json
+++ b/data/json/items/gun/exodii.json
@@ -232,7 +232,7 @@
     "looks_like": "m2browning",
     "type": "GUN",
     "name": { "str": "exodii naval rifle" },
-    "description": "Originally designed for naval defense of a small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a hundred kilo of its weight and is in need to penetrate a small bunker.  Unless your body is compatible with Exodii Standard Combat Bodyframe, you can only use it with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, user needs to use a scope mounted on the side of a gun.",
+    "description": "Originally designed for naval defense of a small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a hundred kilo of its weight and is in need to penetrate a small bunker.  Unless your body is compatible with Exodii Standard Combat Bodyframe, you can only use it with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, the user needs to use a scope mounted on the side of a gun.",
     "//": "effectively a weird single-shot self-loading Oerlikon KBA (but longer, and of course not an autocannon) with a 23x152mm round",
     "variant_type": "gun",
     "variants": [
@@ -242,7 +242,7 @@
           "str_sp": "Ree 3.3 exodii rifle",
           "ctxt": "`Ree` in this case is butchered `Roe`, to carry some sort of nautical vibe"
         },
-        "description": "Originally designed for naval defense of a small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a hundred kilo of its weight and is in need to penetrate a small bunker.  Unless your body is compatible with Exodii Standard Combat Bodyframe, you can only use it with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, user needs to use a scope mounted on the side of a gun."
+        "description": "Originally designed for naval defense of a small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay.  Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a hundred kilo of its weight and is in need to penetrate a small bunker.  Unless your body is compatible with Exodii Standard Combat Bodyframe, you can only use it with a heavy-duty tripod, and only while prone.  Due to the size of a top-mounted magazine, the user needs to use a scope mounted on the side of a gun."
       }
     ],
     "min_strength": 90,
diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json
index ef271de4ad124..529569b0fb953 100644
--- a/data/json/items/magazine/exodii.json
+++ b/data/json/items/magazine/exodii.json
@@ -62,13 +62,13 @@
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "3.3 naval 4-round magazine" },
-    "description": "A bulky 4-round magazine for the Exodii naval rifle.  Grants some amount of portability, if a gun itself can be named portable.",
+    "description": "A bulky 4-round magazine for the Exodii naval rifle.  Grants some amount of portability, if the gun itself can be named portable.",
     "variant_type": "gun",
     "variants": [
       {
         "id": "ree_33_4_mag",
         "name": { "str": "3.3 naval 4-round magazine" },
-        "description": "A bulky 4-round magazine for the Exodii Ree 3.3 rifle.  Grants some amount of portability, if a gun itself can be named portable."
+        "description": "A bulky 4-round magazine for the Exodii Ree 3.3 rifle.  Grants some amount of portability, if the gun itself can be named portable."
       }
     ],
     "weight": "340 g",
diff --git a/data/mods/Generic_Guns/firearms/rifle.json b/data/mods/Generic_Guns/firearms/rifle.json
index 86ce4a77e9129..c59f0c221c961 100644
--- a/data/mods/Generic_Guns/firearms/rifle.json
+++ b/data/mods/Generic_Guns/firearms/rifle.json
@@ -111,7 +111,7 @@
     "type": "GUN",
     "name": "foreign cannon rifle",
     "ammo": [ "ammo_rifle_cannon" ],
-    "description": "A powerful Exodii rifle, reserved for the later stage of cataclysm.  Should be considered an anti-tank rifle in modern world, but the round is bigger than any anti-tank round on Earth",
+    "description": "A powerful Exodii rifle, reserved for the later stage of cataclysm.  It should be considered an anti-tank rifle in modern world, but the round is bigger than any anti-tank round on Earth.",
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",