fix: replace more "rare" to "common"

linonetwo · Oct 19, 2024 · 3abfd41 · 3abfd41
1 parent a377d30
commit 3abfd41
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/...-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/itemgroups/Weapons_Mods_Ammo/guns.json b/...-Structured-Modpack/Cataclysm-DDA-Touhou-Expansion/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -34,9 +34,9 @@
     "copy-from": "guns_smg_rare",
     "extend": { 
       "items": [ 
-        { "item": "aresfmg_folded", "prob": 47 }, 
-        { "item": "idw", "prob": 47 }, 
-        { "item": "pp19v", "prob": 47 } 
+        { "item": "aresfmg_folded", "prob": 4 }, 
+        { "item": "idw", "prob": 4 }, 
+        { "item": "pp19v", "prob": 4 } 
       ] 
     },
     "//3": "Total weight 755 / 16 = 47.19 ~ 47"

diff --git a/Kenan-Structured-Modpack/secronom/Modification_Files/Maps/Flesh/city_buildings.json b/Kenan-Structured-Modpack/secronom/Modification_Files/Maps/Flesh/city_buildings.json
@@ -630,15 +630,15 @@
         "M": "f_secro_fleshknot_emitter"
       },
       "place_loot": [
-        { "group": "guns_smg_rare", "x": 6, "y": 2, "chance": 20, "magazine": 100 },
-        { "group": "guns_rifle_rare", "x": 7, "y": 2, "chance": 30, "magazine": 100 },
+        { "group": "guns_shotgun_common", "x": 6, "y": 2, "chance": 20, "magazine": 100 },
+        { "group": "guns_rifle_common", "x": 7, "y": 2, "chance": 30, "magazine": 100 },
         { "group": "guns_pistol_common", "x": 9, "y": 2, "chance": 90, "magazine": 100 },
         { "group": "mags_common", "x": 10, "y": 2, "chance": 100, "repeat": [ 1, 3 ] },
         { "group": "guns_rifle_common", "x": 11, "y": 2, "chance": 80, "magazine": 100 },
         { "group": "guns_shotgun_common", "x": 12, "y": 2, "chance": 80, "magazine": 100 },
-        { "group": "guns_smg_common", "x": 14, "y": 2, "chance": 70, "magazine": 100 },
+        { "group": "guns_rifle_common", "x": 14, "y": 2, "chance": 70, "magazine": 100 },
         { "group": "guns_pistol_common", "x": 15, "y": 2, "chance": 40, "magazine": 100 },
-        { "group": "guns_shotgun_rare", "x": 17, "y": 2, "chance": 30, "magazine": 100 },
+        { "group": "guns_shotgun_common", "x": 17, "y": 2, "chance": 30, "magazine": 100 },
         { "group": "ammo_shotgun_reloaded", "x": 6, "y": 5, "chance": 90, "repeat": [ 1, 2 ] },
         { "group": "ammo_rifle_reloaded", "x": 7, "y": 5, "chance": 90, "repeat": [ 1, 2 ] },
         { "group": "ammo_shotgun_common", "x": 8, "y": 5, "chance": 40, "repeat": [ 1, 2 ] },
@@ -653,7 +653,7 @@
         { "group": "ammo_shotgun_common", "x": 17, "y": 5, "chance": 90, "repeat": [ 1, 2 ] },
         { "group": "book_gunref", "x": 14, "y": [ 10, 11 ], "chance": 60 },
         { "group": "gunmod_common", "x": 4, "y": 11, "chance": 100 },
-        { "group": "guns_obscure", "x": 6, "y": 11, "chance": 100, "ammo": 100, "magazine": 100 },
+        { "group": "guns_collectible", "x": 6, "y": 11, "chance": 100, "ammo": 100, "magazine": 100 },
         { "group": "museum_guns", "x": 6, "y": 11, "chance": 70, "ammo": 70, "magazine": 90 },
         { "group": "tools_common", "x": 20, "y": 12, "chance": 100 },
         { "group": "gunmod_rare", "x": 18, "y": 13, "chance": 30 },

diff --git a/Kenan-Structured-Modpack/secronom/Modification_Files/Maps/Flesh/flesh_buildings.json b/Kenan-Structured-Modpack/secronom/Modification_Files/Maps/Flesh/flesh_buildings.json
@@ -1991,15 +1991,15 @@
         { "group": "guns_pistol_common", "x": 13, "y": 11, "chance": 15, "magazine": 100 },
         { "group": "guns_shotgun_common", "x": 16, "y": 9, "chance": 50, "magazine": 100 },
         { "group": "guns_shotgun_common", "x": 16, "y": 10, "chance": 100, "magazine": 100 },
-        { "group": "guns_shotgun_rare_static", "x": 16, "y": 11, "chance": 25, "magazine": 100 },
+        { "group": "guns_shotgun_common", "x": 16, "y": 11, "chance": 25, "magazine": 100 },
         { "group": "guns_rifle_common", "x": 20, "y": 7, "chance": 25, "magazine": 100 },
-        { "group": "guns_rifle_rare", "x": 20, "y": 8, "chance": 25, "magazine": 100 },
+        { "group": "guns_rifle_common", "x": 20, "y": 8, "chance": 25, "magazine": 100 },
         { "group": "guns_rifle_common", "x": 20, "y": 9, "chance": 90, "repeat": [ 1, 3 ], "magazine": 100 },
         { "group": "guns_rifle_common", "x": 20, "y": 10, "chance": 90, "repeat": [ 1, 3 ], "magazine": 100 },
         { "group": "guns_rifle_common", "x": 20, "y": 11, "chance": 90, "repeat": [ 1, 3 ], "magazine": 100 },
         { "group": "guns_rifle_common", "x": 20, "y": 12, "chance": 90, "repeat": [ 1, 3 ], "magazine": 100 },
-        { "group": "guns_smg_common", "x": 17, "y": 13, "chance": 85, "repeat": [ 1, 3 ], "magazine": 100 },
-        { "group": "guns_smg_rare", "x": 18, "y": 13, "chance": 15, "magazine": 100 },
+        { "group": "guns_rifle_common", "x": 17, "y": 13, "chance": 85, "repeat": [ 1, 3 ], "magazine": 100 },
+        { "group": "guns_shotgun_common", "x": 18, "y": 13, "chance": 15, "magazine": 100 },
         { "group": "ammo_common", "x": 3, "y": [ 7, 10 ], "chance": 100, "repeat": [ 1, 8 ] },
         { "group": "ammo_pistol_common", "x": 3, "y": 7, "chance": 100, "repeat": [ 1, 8 ] },
         { "group": "ammo_shotgun_common", "x": 3, "y": 8, "chance": 95, "repeat": [ 1, 8 ] },
@@ -2017,7 +2017,7 @@
           "magazine": 100
         },
         { "group": "guns_pistol_common", "x": 8, "y": 16, "chance": 20, "ammo": 75, "magazine": 100 },
-        { "group": "guns_pistol_obscure", "x": 11, "y": 16, "chance": 20, "ammo": 100, "magazine": 100 },
+        { "group": "guns_pistol_common", "x": 11, "y": 16, "chance": 20, "ammo": 100, "magazine": 100 },
         { "group": "guns_pistol_common", "x": 14, "y": 16, "chance": 20, "ammo": 75, "magazine": 100 },
         {
           "group": "guns_pistol_common",
@@ -2100,9 +2100,9 @@
       "toilets": { ";": {  } },
       "place_loot": [
         { "group": "guns_pistol_common", "x": [ 8, 10 ], "y": 19, "chance": 100, "repeat": [ 1, 2 ], "magazine": 100 },
-        { "group": "guns_shotgun_rare_static", "x": [ 8, 10 ], "y": 19, "chance": 80, "magazine": 100 },
-        { "group": "guns_rifle_rare", "x": [ 13, 16 ], "y": 19, "chance": 100, "magazine": 100 },
-        { "group": "guns_smg_rare", "x": [ 13, 16 ], "y": 19, "chance": 80, "magazine": 100 },
+        { "group": "guns_shotgun_common", "x": [ 8, 10 ], "y": 19, "chance": 80, "magazine": 100 },
+        { "group": "guns_rifle_common", "x": [ 13, 16 ], "y": 19, "chance": 100, "magazine": 100 },
+        { "group": "guns_shotgun_common", "x": [ 13, 16 ], "y": 19, "chance": 80, "magazine": 100 },
         { "group": "ammo_rare", "x": [ 10, 13 ], "y": 17, "chance": 100, "repeat": [ 1, 4 ] },
         { "group": "ammo_pistol_common", "x": [ 7, 9 ], "y": [ 9, 10 ], "chance": 100, "repeat": [ 3, 8 ] },
         { "group": "ammo_rifle_common", "x": [ 7, 9 ], "y": 12, "chance": 100, "repeat": [ 1, 8 ] },
@@ -2196,7 +2196,7 @@
         { "group": "guns_shotgun_common", "x": 12, "y": 15, "chance": 100, "repeat": [ 1, 3 ] },
         { "group": "ammo_common", "x": [ 8, 12 ], "y": [ 17, 19 ], "chance": 90, "repeat": [ 1, 8 ] },
         { "group": "guns_pistol_common", "x": 10, "y": 14, "chance": 10, "magazine": 100 },
-        { "group": "guns_shotgun_rare_static", "x": 12, "y": 15, "chance": 10, "magazine": 100 },
+        { "group": "guns_shotgun_common", "x": 12, "y": 15, "chance": 10, "magazine": 100 },
         { "group": "default_zombie_death_drops", "x": 10, "y": 14, "chance": 100 },
         { "group": "default_zombie_death_drops", "x": 12, "y": 15, "chance": 100 },
         { "item": "can_food", "x": 8, "y": 18, "chance": 100, "repeat": [ 1, 3 ] },

diff --git a/Kenan-Structured-Modpack/secronom/Modification_Files/Maps/Flesh/flesh_city.json b/Kenan-Structured-Modpack/secronom/Modification_Files/Maps/Flesh/flesh_city.json
@@ -1987,15 +1987,15 @@
         { "group": "guns_pistol_common", "x": 13, "y": 11, "chance": 15, "magazine": 100 },
         { "group": "guns_shotgun_common", "x": 16, "y": 9, "chance": 50, "magazine": 100 },
         { "group": "guns_shotgun_common", "x": 16, "y": 10, "chance": 100, "magazine": 100 },
-        { "group": "guns_shotgun_rare_static", "x": 16, "y": 11, "chance": 25, "magazine": 100 },
+        { "group": "guns_shotgun_common", "x": 16, "y": 11, "chance": 25, "magazine": 100 },
         { "group": "guns_rifle_common", "x": 20, "y": 7, "chance": 25, "magazine": 100 },
-        { "group": "guns_rifle_rare", "x": 20, "y": 8, "chance": 25, "magazine": 100 },
+        { "group": "guns_rifle_common", "x": 20, "y": 8, "chance": 25, "magazine": 100 },
         { "group": "guns_rifle_common", "x": 20, "y": 9, "chance": 90, "repeat": [ 1, 3 ], "magazine": 100 },
         { "group": "guns_rifle_common", "x": 20, "y": 10, "chance": 90, "repeat": [ 1, 3 ], "magazine": 100 },
         { "group": "guns_rifle_common", "x": 20, "y": 11, "chance": 90, "repeat": [ 1, 3 ], "magazine": 100 },
         { "group": "guns_rifle_common", "x": 20, "y": 12, "chance": 90, "repeat": [ 1, 3 ], "magazine": 100 },
-        { "group": "guns_smg_common", "x": 17, "y": 13, "chance": 85, "repeat": [ 1, 3 ], "magazine": 100 },
-        { "group": "guns_smg_rare", "x": 18, "y": 13, "chance": 15, "magazine": 100 },
+        { "group": "guns_rifle_common", "x": 17, "y": 13, "chance": 85, "repeat": [ 1, 3 ], "magazine": 100 },
+        { "group": "guns_shotgun_common", "x": 18, "y": 13, "chance": 15, "magazine": 100 },
         { "group": "ammo_common", "x": 3, "y": [ 7, 10 ], "chance": 100, "repeat": [ 1, 8 ] },
         { "group": "ammo_pistol_common", "x": 3, "y": 7, "chance": 100, "repeat": [ 1, 8 ] },
         { "group": "ammo_shotgun_common", "x": 3, "y": 8, "chance": 95, "repeat": [ 1, 8 ] },
@@ -2013,7 +2013,7 @@
           "magazine": 100
         },
         { "group": "guns_pistol_common", "x": 8, "y": 16, "chance": 20, "ammo": 75, "magazine": 100 },
-        { "group": "guns_pistol_obscure", "x": 11, "y": 16, "chance": 20, "ammo": 100, "magazine": 100 },
+        { "group": "guns_pistol_common", "x": 11, "y": 16, "chance": 20, "ammo": 100, "magazine": 100 },
         { "group": "guns_pistol_common", "x": 14, "y": 16, "chance": 20, "ammo": 75, "magazine": 100 },
         {
           "group": "guns_pistol_common",
@@ -2096,9 +2096,9 @@
       "toilets": { ";": {  } },
       "place_loot": [
         { "group": "guns_pistol_common", "x": [ 8, 10 ], "y": 19, "chance": 100, "repeat": [ 1, 2 ], "magazine": 100 },
-        { "group": "guns_shotgun_rare_static", "x": [ 8, 10 ], "y": 19, "chance": 80, "magazine": 100 },
-        { "group": "guns_rifle_rare", "x": [ 13, 16 ], "y": 19, "chance": 100, "magazine": 100 },
-        { "group": "guns_smg_rare", "x": [ 13, 16 ], "y": 19, "chance": 80, "magazine": 100 },
+        { "group": "guns_shotgun_common", "x": [ 8, 10 ], "y": 19, "chance": 80, "magazine": 100 },
+        { "group": "guns_rifle_common", "x": [ 13, 16 ], "y": 19, "chance": 100, "magazine": 100 },
+        { "group": "guns_shotgun_common", "x": [ 13, 16 ], "y": 19, "chance": 80, "magazine": 100 },
         { "group": "ammo_rare", "x": [ 10, 13 ], "y": 17, "chance": 100, "repeat": [ 1, 4 ] },
         { "group": "ammo_pistol_common", "x": [ 7, 9 ], "y": [ 9, 10 ], "chance": 100, "repeat": [ 3, 8 ] },
         { "group": "ammo_rifle_common", "x": [ 7, 9 ], "y": 12, "chance": 100, "repeat": [ 1, 8 ] },
@@ -2192,7 +2192,7 @@
         { "group": "guns_shotgun_common", "x": 12, "y": 15, "chance": 100, "repeat": [ 1, 3 ] },
         { "group": "ammo_common", "x": [ 8, 12 ], "y": [ 17, 19 ], "chance": 90, "repeat": [ 1, 8 ] },
         { "group": "guns_pistol_common", "x": 10, "y": 14, "chance": 10, "magazine": 100 },
-        { "group": "guns_shotgun_rare_static", "x": 12, "y": 15, "chance": 10, "magazine": 100 },
+        { "group": "guns_shotgun_common", "x": 12, "y": 15, "chance": 10, "magazine": 100 },
         { "group": "default_zombie_death_drops", "x": 10, "y": 14, "chance": 100 },
         { "group": "default_zombie_death_drops", "x": 12, "y": 15, "chance": 100 },
         { "item": "can_food", "x": 8, "y": 18, "chance": 100, "repeat": [ 1, 3 ] },

diff --git a/Kenan-Structured-Modpack/secronom_lore_expansion/Modification Files/Maps/obsolete.txt b/Kenan-Structured-Modpack/secronom_lore_expansion/Modification Files/Maps/obsolete.txt
@@ -757,7 +757,7 @@
         { "chance": 60, "item": "lab_pants", "x": 10, "y": 6 },
         { "chance": 60, "item": "lab_torso", "x": 10, "y": 6 },
         { "chance": 60, "item": "lab_shoes", "x": 10, "y": 6 },
-        { "chance": 25, "item": "guns_rifle_rare", "x": 17, "y": 5 }
+        { "chance": 25, "item": "guns_rifle_common", "x": 17, "y": 5 }
       ],
       "place_item": [ { "item": "secro_id_fvvault", "x": 10, "y": 6 } ],
       "place_monster": [ { "monster": "mon_zombie_scientist", "x": 17, "y": 7 }, { "monster": "mon_zombie_scientist", "x": 14, "y": 8 } ],
@@ -980,7 +980,7 @@
       "fill_ter": "t_strconc_wall",
       "place_items": [
         { "chance": 100, "group": "tools_medical", "repeat": [ 7 ], "x": 27, "y": [ 13, 15 ] },
-        { "chance": 50, "item": "guns_rifle_rare", "repeat": [ 3 ], "x": 6, "y": [ 13, 15 ] }
+        { "chance": 50, "item": "guns_rifle_common", "repeat": [ 3 ], "x": 6, "y": [ 13, 15 ] }
       ],
       "rows": [
         "                        ",
@@ -1052,7 +1052,7 @@
       "fill_ter": "t_strconc_wall",
       "place_items": [
         { "chance": 100, "group": "tools_medical", "repeat": [ 7 ], "x": 27, "y": [ 13, 15 ] },
-        { "chance": 50, "item": "guns_rifle_rare", "repeat": [ 3 ], "x": 6, "y": [ 13, 15 ] }
+        { "chance": 50, "item": "guns_rifle_common", "repeat": [ 3 ], "x": 6, "y": [ 13, 15 ] }
       ],
       "rows": [
         "                        ",