Merge branch 'master' into feat/polaris-patriot-warbond

helldivers-2 · May 23, 2024 · dade905 · dade905
2 parents 4eebeed + f7cf35a
commit dade905
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 0 deletions.
diff --git a/items/armor/armor.json b/items/armor/armor.json
@@ -2048,5 +2048,45 @@
 		"speed": 100,
 		"stamina_regen": 100,
 		"passive": 0
+	},
+	"824775809": {
+		"name": "CE-64 Grenadier",
+		"description": "The set's classic advertising campaign 'Have you tried a grenade?' has remained unchanged for over 70 years",
+		"type": 2,
+		"slot": 2,
+		"armor_rating": 150,
+		"speed": 450,
+		"stamina_regen": 50,
+		"passive": 6
+	},
+	"3233367200": {
+		"name": "CE-64 Grenadier",
+		"description": "The set's classic advertising campaign 'Have you tried a grenade?' has remained unchanged for over 70 years",
+		"type": 1,
+		"slot": 0,
+		"armor_rating": 100,
+		"speed": 100,
+		"stamina_regen": 100,
+		"passive": 0
+	},
+	"2538783678": {
+		"name": "CW-9 White Wolf",
+		"description": "The pattern used for this armor is the result of the Winter Camouflage Improvement Effort, which considered 136 entrants before determining the color white would best blend in with snow.",
+		"type": 1,
+		"slot": 0,
+		"armor_rating": 100,
+		"speed": 100,
+		"stamina_regen": 100,
+		"passive": 0
+	},
+	"1335058381": {
+		"name": "CW-9 White Wolf",
+		"description": "The pattern used for this armor is the result of the Winter Camouflage Improvement Effort, which considered 136 entrants before determining the color white would best blend in with snow.",
+		"type": 2,
+		"slot": 2,
+		"armor_rating": 150,
+		"speed": 500,
+		"stamina_regen": 100,
+		"passive": 1
 	}
 }
diff --git a/items/item_names.json b/items/item_names.json
@@ -1214,5 +1214,52 @@
 	"4282790522": {
 		"name": "Dissident's Nightmare",
 		"mix_id": "4282790522"
+	"1942567317": {
+		"name": "CB-9 Exploding Crossbow",
+		"mix_id": "1942567317"
+	},
+	"2038008847": {
+		"name": "CE-07 Demolition Specialist",
+		"mix_id": "2038008847"
+	},
+	"2640366401": {
+		"name": "BR-14 Adjudicator Rifle",
+		"mix_id": "2640366401"
+	},
+	"2797735596": {
+		"name": "GP-31 Grenade Pistol",
+		"mix_id": "2797735596"
+	},
+	"339272294": {
+		"name": "R-36 Eruptor Rifle",
+		"mix_id": "339272294"
+	},
+	"3869545997": {
+		"name": "G-123 Thermite Grenade",
+		"mix_id": "3869545997"
+	},
+	"3504405746": {
+		"name": "Expert Extraction Pilot",
+		"mix_id": "3504405746"
+	},
+	"897894480": {
+		"name": "1 Medal",
+		"mix_id": "897894480"
+	},
+	"824775809": {
+		"name": "CE-64 Grenadier",
+		"mix_id": "824775809"
+	},
+	"3233367200": {
+		"name": "CE-64 Grenadier",
+		"mix_id": "3233367200"
+	},
+	"2538783678": {
+		"name": "CW-9 White Wolf",
+		"mix_id": "2538783678"
+	},
+	"1335058381": {
+		"name": "CW-9 White Wolf",
+		"mix_id": "1335058381"
 	}
 }