Add files via upload

Kenshut · Oct 7, 2023 · 3500280 · 3500280
1 parent 32edd09
commit 3500280
Show file tree

Hide file tree

Showing 20 changed files with 571 additions and 222 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 "Cataclysm: S.T.A.L.K.E.R." Это преображение обычного "катаклизма: темные дни в переди" в мир с сталкерской тематикой
 
 <a>
-    <img src="https://raw.githubusercontent.com/Kenshut/CATACLYSM-S.T.A.L.K.E.R./main/liar.jpg" alt="Packaging Status" align="right">
+    <img src="https://raw.githubusercontent.com/Kenshut/CATACLYSM-S.T.A.L.K.E.R./main/stal.png" alt="Packaging Status" align="right">
 </a>
 
 # где можно узнать процесс разработки мода?

diff --git a/items/arts/art hz kuda.json b/items/arts/art hz kuda.json
@@ -96,15 +96,10 @@
     "id": "Магнетэк",
     "name": "Магнетэк",
     "density": 30,
-    "bash_resist": 10,
     "specific_heat_liquid": 0.82,
     "specific_heat_solid": 0.45,
     "latent_heat": 273,
-    "cut_resist": 10,
-    "bullet_resist": 10,
-    "acid_resist": 10,
-    "fire_resist": 10,
-    "elec_resist": 0,
+	"resist": { "bash": 10, "cut": 10, "acid": 10, "heat": 10, "bullet": 10 },
     "chip_resist": 40,
     "dmg_adj": [ "marked", "dented", "smashed", "shattered" ],
     "bash_dmg_verb": "dented",
@@ -130,15 +125,10 @@
     "id": "Металючька",
     "name": "Металючька",
     "density": 30,
-    "bash_resist": 10,
     "specific_heat_liquid": 0.82,
     "specific_heat_solid": 0.45,
     "latent_heat": 273,
-    "cut_resist": 10,
-    "bullet_resist": 10,
-    "acid_resist": 10,
-    "fire_resist": 10,
-    "elec_resist": 0,
+	"resist": { "bash": 10, "cut": 10, "acid": 10, "heat": 10, "bullet": 10 },
     "chip_resist": 40,
     "dmg_adj": [ "marked", "dented", "smashed", "shattered" ],
     "bash_dmg_verb": "dented",
@@ -164,15 +154,10 @@
     "id": "M_блокатор",
     "name": "блокатор",
     "density": 30,
-    "bash_resist": 10,
     "specific_heat_liquid": 0.82,
     "specific_heat_solid": 0.45,
     "latent_heat": 273,
-    "cut_resist": 10,
-    "bullet_resist": 10,
-    "acid_resist": 10,
-    "fire_resist": 10,
-    "elec_resist": 0,
+	"resist": { "bash": 10, "cut": 10, "acid": 10, "heat": 10, "bullet": 10 },
     "chip_resist": 40,
     "dmg_adj": [ "marked", "dented", "smashed", "shattered" ],
     "bash_dmg_verb": "dented",

diff --git a/items/bionics.json b/items/bionics.json
@@ -5,9 +5,12 @@
     "name": { "str": "Броня О-Сознания для рук" },
     "description": "Броня от О-сознания для рук, создана из артефактного материала (Металючька).",
     "occupied_bodyparts": [ [ "arm_l", 4 ], [ "arm_r", 4 ] ],
-    "bash_protec": [ [ "arm_l", 10 ], [ "arm_r", 10 ] ],
-    "cut_protec": [ [ "arm_l", 10 ], [ "arm_r", 10 ] ],
-    "bullet_protec": [ [ "arm_l", 10 ], [ "arm_r", 10 ] ],
+	"protec": [
+      [ "arm_l", { "bash": 10, "cut": 10, "bullet": 10 } ],
+      [ "arm_r", { "bash": 10, "cut": 10, "bullet": 10 } ],
+      [ "hand_l", { "bash": 10, "cut": 10, "bullet": 10 } ],
+      [ "hand_r", { "bash": 10, "cut": 10, "bullet": 10 } ]
+    ],
 	 "social_modifiers": { "intimidate": 10 },
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
   },
@@ -17,10 +20,10 @@
     "name": { "str": "Броня О-Сознания для глаз" },
     "description": "Броня от О-сознания для глаз, создана из артефактного материала (Металючька).",
     "occupied_bodyparts": [ [ "eyes", 2 ] ],
+	"protec": [
+      [ "eyes", { "bash": 6, "cut": 6, "bullet": 6 } ]
+    ],
     "env_protec": [ [ "eyes", 14 ] ],
-    "bash_protec": [ [ "eyes", 6 ] ],
-    "cut_protec": [ [ "eyes", 6 ] ],
-    "bullet_protec": [ [ "eyes", 6 ] ],
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
     "social_modifiers": { "intimidate": 12 }
   },
@@ -30,9 +33,9 @@
     "name": { "str": "Броня О-Сознания для головы" },
     "description": "Броня от О-сознания для головы, создана из артефактного материала (Металючька).",
     "occupied_bodyparts": [ [ "head", 7 ], [ "mouth", 2 ] ],
-    "bash_protec": [ [ "head", 10 ] ],
-    "cut_protec": [ [ "head", 10 ] ],
-    "bullet_protec": [ [ "head", 10 ] ],
+	"protec": [
+      [ "eyes", { "bash": 10, "cut": 10, "bullet": 10 } ]
+    ],
 	"social_modifiers": { "intimidate": 10 },
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
   },
@@ -42,9 +45,10 @@
     "name": { "str": "Броня О-Сознания для ног" },
     "description": "Броня от О-сознания для ног, создана из артефактного материала (Металючька).",
     "occupied_bodyparts": [ [ "leg_l", 10 ], [ "leg_r", 10 ] ],
-    "bash_protec": [ [ "leg_l", 10 ], [ "leg_r", 10 ] ],
-    "cut_protec": [ [ "leg_l", 10 ], [ "leg_r", 10 ] ],
-    "bullet_protec": [ [ "leg_l", 10 ], [ "leg_r", 10 ] ],
+	"protec": [
+      [ "leg_l", { "bash": 10, "cut": 10, "bullet": 10 } ],
+      [ "leg_r", { "bash": 10, "cut": 10, "bullet": 10 } ]
+    ],
 	"social_modifiers": { "intimidate": 10 },
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
   },
@@ -54,9 +58,9 @@
     "name": { "str": "Броня О-Сознания для тела" },
     "description": "Броня от О-сознания для тела, создана из артефактного материала (Металючька).",
     "occupied_bodyparts": [ [ "torso", 15 ] ],
-    "bash_protec": [ [ "torso", 10 ] ],
-    "cut_protec": [ [ "torso", 10 ] ],
-    "bullet_protec": [ [ "torso", 10 ] ],
+	"protec": [
+      [ "torso", { "bash": 10, "cut": 10, "bullet": 10 } ]
+    ],
 	"social_modifiers": { "intimidate": 10 },
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
   },
@@ -87,41 +91,17 @@
       [ "foot_l", 1 ],
       [ "foot_r", 1 ]
     ],
-    "bash_protec": [
-      [ "torso", 3 ],
-      [ "head", 3 ],
-      [ "arm_l", 3 ],
-      [ "arm_r", 3 ],
-      [ "hand_l", 3 ],
-      [ "hand_r", 3 ],
-      [ "leg_l", 3 ],
-      [ "leg_r", 3 ],
-      [ "foot_l", 3 ],
-      [ "foot_r", 3 ]
-    ],
-    "cut_protec": [
-      [ "torso", 5 ],
-      [ "head", 5 ],
-      [ "arm_l", 5 ],
-      [ "arm_r", 5 ],
-      [ "hand_l", 5 ],
-      [ "hand_r", 5 ],
-      [ "leg_l", 5 ],
-      [ "leg_r", 5 ],
-      [ "foot_l", 5 ],
-      [ "foot_r", 5 ]
-    ],
-    "bullet_protec": [
-      [ "torso", 5 ],
-      [ "head", 5 ],
-      [ "arm_l", 5 ],
-      [ "arm_r", 5 ],
-      [ "hand_l", 5 ],
-      [ "hand_r", 5 ],
-      [ "leg_l", 5 ],
-      [ "leg_r", 5 ],
-      [ "foot_l", 5 ],
-      [ "foot_r", 5 ]
+	"protec": [
+      [ "torso", { "bash": 3, "cut": 3, "bullet": 3 } ],
+	  [ "head", { "bash": 3, "cut": 3, "bullet": 3 } ],
+	  [ "arm_l", { "bash": 3, "cut": 3, "bullet": 3 } ],
+	  [ "arm_r", { "bash": 3, "cut": 3, "bullet": 3 } ],
+	  [ "hand_l", { "bash": 3, "cut": 3, "bullet": 3 } ],
+	  [ "hand_r", { "bash": 3, "cut": 3, "bullet": 3 } ],
+	  [ "leg_l", { "bash": 3, "cut": 3, "bullet": 3 } ],
+	  [ "leg_r", { "bash": 3, "cut": 3, "bullet": 3 } ],
+	  [ "foot_l", { "bash": 3, "cut": 3, "bullet": 3 } ],
+	  [ "foot_r", { "bash": 3, "cut": 3, "bullet": 3 } ]
     ],
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
   },

diff --git a/items/fake.json b/items/fake.json
@@ -12,7 +12,7 @@
     "techniques": [ "WBLOCK_2" ],
     "volume": "750 ml",
     "longest_side": "30 cm",
-    "cutting": 50,
+    "melee_damage": { "bash": 4, "cut": 50 },
     "flags": [ "BIONIC_WEAPON", "UNBREAKABLE_MELEE", "TRADER_AVOID","PSEUDO"  ],
 	"weapon_category": [ "BIONIC_WEAPONRY", "BIONIC_SWORDS" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 30 ] ]

diff --git a/items/pets_tushkan_armor.json b/items/pets_tushkan_armor.json
@@ -12,8 +12,6 @@
     "material": [ "kevlar_layered" ],
     "weight": "50 g",
     "volume": "50 ml",
-    "bashing": 5,
-    "to_hit": -1,
     "flags": [ "IS_PET_ARMOR", "NO_SALVAGE" ],
     "material_thickness": 2.0,
     "max_pet_vol": "600 L",

diff --git a/items/tool.json b/items/tool.json
@@ -11,12 +11,11 @@
     "price": 2000,
     "price_postapoc": 50,
     "to_hit": -2,
-    "cutting": 16,
+	"melee_damage": { "bash": 3},
     "material": [ "steel"],
     "symbol": ";",
     "color": "dark_gray",
-    "qualities": [ [ "ks_ARTCRAFT", 1 ]],
-    "flags": [ "STAB" ]
+    "qualities": [ [ "ks_ARTCRAFT", 1 ]]
   },
     {
     "id": "craft_art1",
@@ -31,12 +30,11 @@
     "price": 4000,
     "price_postapoc": 100,
     "to_hit": -2,
-    "cutting": 16,
+    "melee_damage": { "bash": 3},
     "material": [ "steel"],
     "symbol": ";",
     "color": "dark_gray",
-    "qualities": [ [ "ks_ARTCRAFT", 2 ]],
-    "flags": [ "STAB" ]
+    "qualities": [ [ "ks_ARTCRAFT", 2 ]]
   },
     {
     "id": "craft_arts",
@@ -51,11 +49,10 @@
     "price": 2000,
     "price_postapoc": 50,
     "to_hit": -2,
-    "cutting": 16,
+    "melee_damage": { "bash": 3},
     "material": [ "steel", "plastic" ],
     "symbol": ";",
     "color": "dark_gray",
-    "qualities": [ [ "ks_arts", 1 ]],
-    "flags": [ "STAB" ]
+    "qualities": [ [ "ks_arts", 1 ]]
   }
 ]
diff --git a/items/weapon/boltomet/boltomet.json b/items/weapon/boltomet/boltomet.json
@@ -12,7 +12,7 @@
     "price": 140000,
     "price_postapoc": 500,
     "to_hit": -2,
-    "bashing": 6,
+	"melee_damage": { "bash": 6 },
     "material": [ "Магнетэк", "Металючька","bone" ],
     "symbol": "(",
     "color": "yellow",

diff --git a/items/weapon/knife/knife.json b/items/weapon/knife/knife.json
@@ -10,9 +10,7 @@
     "longest_side": "30 cm",
     "price": 10000,
     "price_postapoc": 10000,
-    "bashing": 4,
-
-    "cutting": 40,
+	"melee_damage": { "bash": 4, "cut": 40 },
     "material": [ "bone", "wood" ],
     "symbol": "/",
     "color": "dark_gray",
@@ -26,7 +24,7 @@
     "techniques": [ "RAPID", "WBLOCK_1" ],
     "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 30 ] ],
     "thrown_damage": [ { "damage_type": "stab", "amount": 20 } ],
-    "flags": [ "STAB", "DURABLE_MELEE", "SHEATH_KNIFE", "NO_CVD" ]
+    "flags": [  "DURABLE_MELEE", "SHEATH_KNIFE", "NO_CVD" ]
   },
   {
     "id": "himera_knife1",
@@ -39,9 +37,7 @@
     "longest_side": "30 cm",
     "price": 10000,
     "price_postapoc": 10000,
-    "bashing": 4,
-
-    "cutting": 40,
+	"melee_damage": { "bash": 4, "cut": 50 },
     "material": [ "bone", "wood" ],
     "symbol": "/",
     "color": "dark_gray",
@@ -55,8 +51,7 @@
     "techniques": [ "RAPID", "WBLOCK_1" ],
     "qualities": [ [ "CUT", 2 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 30 ] ],
     "thrown_damage": [ { "damage_type": "stab", "amount": 20 } ],
-	"effects": [ { "id": "bleed", "duration": 700, "affect_hit_bp": true } ],
-    "flags": [ "STAB", "DURABLE_MELEE", "SHEATH_KNIFE", "NO_CVD" ]
+    "flags": [  "DURABLE_MELEE", "SHEATH_KNIFE", "NO_CVD" ]
   },
   {
     "id": "barsik_knife",
@@ -69,9 +64,7 @@
     "longest_side": "30 cm",
     "price": 60000,
     "price_postapoc": 60000,
-    "bashing": 4,
-    "cutting": 12,
-
+	"melee_damage": { "bash": 4, "cut": 12 },
     "material": [ "bone", "wood" ],
     "symbol": "/",
     "color": "dark_gray",
@@ -85,6 +78,6 @@
     "techniques": [ "RAPID", "WBLOCK_1" ],
     "qualities": [ [ "CUT", 2 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 15 ] ],
     "thrown_damage": [ { "damage_type": "stab", "amount": 9 } ],
-    "flags": [ "STAB", "DURABLE_MELEE", "SHEATH_KNIFE", "NO_CVD" ]
+    "flags": [  "DURABLE_MELEE", "SHEATH_KNIFE", "NO_CVD" ]
   }
 ]