From bc0a49d4cd317963cb38956de0fe5d33e718f15f Mon Sep 17 00:00:00 2001 From: Lee Date: Thu, 24 Oct 2024 15:57:45 +0100 Subject: [PATCH 01/14] Basic start on the new warbond --- items/boosters.json | 6 +- items/item_names.json | 54 ++++++++++++++++- items/weapons/primary.json | 22 +++++++ items/weapons/secondary.json | 10 ++++ warbonds.json | 5 ++ warbonds/truth_enforcers.json | 105 ++++++++++++++++++++++++++++++++++ 6 files changed, 200 insertions(+), 2 deletions(-) create mode 100644 warbonds/truth_enforcers.json diff --git a/items/boosters.json b/items/boosters.json index 31bd892..4e2e125 100644 --- a/items/boosters.json +++ b/items/boosters.json @@ -46,5 +46,9 @@ "3102833400": { "name": "Firebomb Hellpods", "description": "Lines all Hellpods with volatile incendiaries that detonate upon impact, igniting any units in vicinity of the drop site." + }, + "1001": { + "name": "Dead Sprint", + "description": "Consume health to sprint when out of stamina" } -} +} \ No newline at end of file diff --git a/items/item_names.json b/items/item_names.json index e7a5425..6fb2e7d 100644 --- a/items/item_names.json +++ b/items/item_names.json @@ -1454,5 +1454,57 @@ "3236079222": { "name": "Mustard Exosuit", "mix_id": "3236079222" + }, + "1001": { + "name": "SG-20 Halt", + "mix_id": "shotgun" + }, + "1002": { + "name": "SMG-32 Reprimand", + "mix_id": "smg" + }, + "1003": { + "name": "PLAS-15 Loyalist", + "mix_id": "pistol" + }, + "1004": { + "name": "Inconspicuous Black Shuttle", + "mix_id": "pattern" + }, + "1005": { + "name": "Inconspicuous Black Hellpod", + "mix_id": "pattern" + }, + "1006": { + "name": "Inconspicuous Black Exosuit", + "mix_id": "pattern" + }, + "1007": { + "name": "Dead Sprint", + "mix_id": "booster" + }, + "1008": { + "name": "Proof of Faultless Virtue", + "mix_id": "playercard" + }, + "1009": { + "name": "Pride of the Whistleblower", + "mix_id": "playercard" + }, + "1010": { + "name": "Proof of Faultless Virtue", + "mix_id": "cape" + }, + "1011": { + "name": "Pride of the Whistleblower", + "mix_id": "cape" + }, + "1012": { + "name": "At Ease", + "mix_id": "emote" + }, + "1013": { + "name": "Free of Thought", + "mix_id": "title" } -} +} \ No newline at end of file diff --git a/items/weapons/primary.json b/items/weapons/primary.json index 493253c..31ccc2f 100644 --- a/items/weapons/primary.json +++ b/items/weapons/primary.json @@ -442,5 +442,27 @@ "traits": [ 7 ] + }, + "1001": { + "name": "SG-20 Halt", + "description": "", + "type": 2, + "damage": 0, + "capacity": 0, + "recoil": 0, + "fire_rate": 0, + "fire_mode": [], + "traits": [] + }, + "1002": { + "name": "SMG-32 Reprimand", + "description": "", + "type": 3, + "damage": 0, + "capacity": 0, + "recoil": 0, + "fire_rate": 0, + "fire_mode": [], + "traits": [] } } \ No newline at end of file diff --git a/items/weapons/secondary.json b/items/weapons/secondary.json index 69d34ad..3fd9a0c 100644 --- a/items/weapons/secondary.json +++ b/items/weapons/secondary.json @@ -139,5 +139,15 @@ 5, 11 ] + }, + "1001": { + "name": "PLAS-15 Loyalist", + "description": "", + "damage": 0, + "capacity": 0, + "recoil": 0, + "fire_rate": 0, + "fire_mode": [], + "traits": [] } } \ No newline at end of file diff --git a/warbonds.json b/warbonds.json index 6ea5fb9..185b228 100644 --- a/warbonds.json +++ b/warbonds.json @@ -38,5 +38,10 @@ "name": "Chemical Agents", "id": "chemical_agents", "credits_to_unlock": 1000 + }, + "8": { + "name": "Truth Enforcers", + "id": "truth_enforcers", + "credits_to_unlock": 0 } } \ No newline at end of file diff --git a/warbonds/truth_enforcers.json b/warbonds/truth_enforcers.json new file mode 100644 index 0000000..a86b239 --- /dev/null +++ b/warbonds/truth_enforcers.json @@ -0,0 +1,105 @@ +{ + "1": { + "medals_to_unlock": 0, + "items": [ + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + } + ] + }, + "2": { + "medals_to_unlock": 0, + "items": [ + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + } + ] + }, + "3": { + "medals_to_unlock": 0, + "items": [ + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + }, + { + "item_id": 1001, + "medal_cost": 0 + } + ] + } +} \ No newline at end of file From bc6fae26b7fc05be02e347c5d6700a253e5b7de1 Mon Sep 17 00:00:00 2001 From: Lee Date: Tue, 29 Oct 2024 11:45:49 +0000 Subject: [PATCH 02/14] Update from todays patch --- items/armor/armor.json | 22 +++++++++++++++++++++- items/armor/passive.json | 4 ++++ items/weapons/primary.json | 30 ++++++++++++++++++------------ items/weapons/secondary.json | 17 +++++++++++------ 4 files changed, 54 insertions(+), 19 deletions(-) diff --git a/items/armor/armor.json b/items/armor/armor.json index 3bd92c5..3cbddce 100644 --- a/items/armor/armor.json +++ b/items/armor/armor.json @@ -2258,5 +2258,25 @@ "speed": 100, "stamina_regen": 100, "passive": 0 + }, + "1010": { + "name": "UF-84 Doubt Killer", + "description": "Developed by the Ministry of Science while investigating the phenomenon known as The Gloom, this armor is non-permeable and squeak resistant.", + "type": 1, + "slot": 2, + "armor_rating": 100, + "speed": 500, + "stamina_regen": 100, + "passive": 13 + }, + "1011": { + "name": "UF-84 Doubt Killer", + "description": "Developed by the Ministry of Science while investigating the phenomenon known as The Gloom, this armor is non-permeable and squeak resistant.", + "type": 1, + "slot": 0, + "armor_rating": 100, + "speed": 100, + "stamina_regen": 100, + "passive": 0 } -} +} \ No newline at end of file diff --git a/items/armor/passive.json b/items/armor/passive.json index bbebad0..aee5557 100644 --- a/items/armor/passive.json +++ b/items/armor/passive.json @@ -50,5 +50,9 @@ "12": { "name": "Advanced Filtration", "description": "Provides 80% resistance to gas damage and effects." + }, + "13": { + "name": "Unflinching", + "description": "Helps prevent Helldivers from flinching when hit." } } \ No newline at end of file diff --git a/items/weapons/primary.json b/items/weapons/primary.json index 31ccc2f..181606d 100644 --- a/items/weapons/primary.json +++ b/items/weapons/primary.json @@ -445,24 +445,30 @@ }, "1001": { "name": "SG-20 Halt", - "description": "", + "description": "A humane compliance weapon with two seperate magazines: one for armor-penetrating flechette rounds and one for stun rounds.", "type": 2, - "damage": 0, - "capacity": 0, - "recoil": 0, - "fire_rate": 0, + "damage": 385, + "capacity": 16, + "recoil": 120, + "fire_rate": 80, "fire_mode": [], - "traits": [] + "traits": [ + 1, + 2, + 5 + ] }, "1002": { "name": "SMG-32 Reprimand", - "description": "", + "description": "A heavy-duty submachine gun that fires large-caliber rounds, with a slower rate of fire to manage the high recoil. Ideal for use at close to medium range", "type": 3, - "damage": 0, - "capacity": 0, - "recoil": 0, - "fire_rate": 0, + "damage": 125, + "capacity": 25, + "recoil": 44, + "fire_rate": 490, "fire_mode": [], - "traits": [] + "traits": [ + 2 + ] } } \ No newline at end of file diff --git a/items/weapons/secondary.json b/items/weapons/secondary.json index 3fd9a0c..37027c2 100644 --- a/items/weapons/secondary.json +++ b/items/weapons/secondary.json @@ -142,12 +142,17 @@ }, "1001": { "name": "PLAS-15 Loyalist", - "description": "", - "damage": 0, - "capacity": 0, - "recoil": 0, - "fire_rate": 0, + "description": "A plasma pistol that charges each shot until the trigger is released. Plasma projectiles explode on impact.", + "damage": 125, + "capacity": 7, + "recoil": 8, + "fire_rate": 1000, "fire_mode": [], - "traits": [] + "traits": [ + 2, + 4, + 6, + 10 + ] } } \ No newline at end of file From 2eaed2f81696e39931276c3c49a6cbbf9624e709 Mon Sep 17 00:00:00 2001 From: Lee Date: Tue, 29 Oct 2024 19:39:40 +0000 Subject: [PATCH 03/14] Added leaked capes --- items/armor/armor.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/items/armor/armor.json b/items/armor/armor.json index 3cbddce..c346c5f 100644 --- a/items/armor/armor.json +++ b/items/armor/armor.json @@ -2278,5 +2278,35 @@ "speed": 100, "stamina_regen": 100, "passive": 0 + }, + "1012": { + "name": "Pride of the Whistleblower", + "description": "Granted to the Truth Enforcers' Informant of the Month, this tasteful cape conjures images of dissident blood on asphalt.", + "type": 1, + "slot": 1, + "armor_rating": 100, + "speed": 100, + "stamina_regen": 100, + "passive": 0 + }, + "1013": { + "name": "Cover of Darkness", + "description": "When children have trouble sleeping, tucking them in under this cape reminds them that they are never alone, for Liberty's unseen defenders are always watching over them.", + "type": 1, + "slot": 1, + "armor_rating": 100, + "speed": 100, + "stamina_regen": 100, + "passive": 0 + }, + "1014": { + "name": "Proof of Faultless Virtue", + "description": "", + "type": 1, + "slot": 1, + "armor_rating": 100, + "speed": 100, + "stamina_regen": 100, + "passive": 0 } } \ No newline at end of file From 81c786cc113db375409564d0c3d2cf9572879123 Mon Sep 17 00:00:00 2001 From: Lee Date: Thu, 31 Oct 2024 10:18:55 +0000 Subject: [PATCH 04/14] Warbond release, updated with most info --- items/item_names.json | 66 ++++++++++++++--------- items/weapons/primary.json | 4 +- items/weapons/secondary.json | 2 +- warbonds.json | 2 +- warbonds/truth_enforcers.json | 98 ++++++++++++++++------------------- 5 files changed, 90 insertions(+), 82 deletions(-) diff --git a/items/item_names.json b/items/item_names.json index 6fb2e7d..2e3e01a 100644 --- a/items/item_names.json +++ b/items/item_names.json @@ -1456,55 +1456,71 @@ "mix_id": "3236079222" }, "1001": { - "name": "SG-20 Halt", - "mix_id": "shotgun" - }, - "1002": { - "name": "SMG-32 Reprimand", - "mix_id": "smg" + "name": "Inconspicuous Black Exosuit", + "mix_id": "pattern" }, "1003": { - "name": "PLAS-15 Loyalist", - "mix_id": "pistol" + "name": "SG-20 Halt", + "mix_id": "shotgun" }, "1004": { - "name": "Inconspicuous Black Shuttle", - "mix_id": "pattern" + "name": "Dead Sprint", + "mix_id": "booster" }, "1005": { "name": "Inconspicuous Black Hellpod", "mix_id": "pattern" }, "1006": { - "name": "Inconspicuous Black Exosuit", - "mix_id": "pattern" + "name": "SMG-32 Reprimand", + "mix_id": "smg" }, "1007": { - "name": "Dead Sprint", - "mix_id": "booster" + "name": "Inconspicuous Black Shuttle", + "mix_id": "pattern" }, "1008": { - "name": "Proof of Faultless Virtue", - "mix_id": "playercard" - }, - "1009": { "name": "Pride of the Whistleblower", "mix_id": "playercard" }, "1010": { - "name": "Proof of Faultless Virtue", - "mix_id": "cape" + "name": "UF-50 Bloodhound", + "mix_id": "body" }, "1011": { - "name": "Pride of the Whistleblower", - "mix_id": "cape" + "name": "UF-50 Bloodhound", + "mix_id": "helmet" }, "1012": { - "name": "At Ease", - "mix_id": "emote" + "name": "Pride of the Whistleblower", + "mix_id": "cape" }, "1013": { - "name": "Free of Thought", + "name": "Proof of Faultless Virtue", + "mix_id": "playercard" + }, + "1014": { + "name": "Fee of Thought", "mix_id": "title" + }, + "1015": { + "name": "UF-16 Inspector", + "mix_id": "helmet" + }, + "1016": { + "name": "UF-16 Inspector", + "mix_id": "body" + }, + "1017": { + "name": "Proof of Faultless Virtue", + "mix_id": "cape" + }, + "1018": { + "name": "PLAS-15 Loyalist", + "mix_id": "pistol" + }, + "1019": { + "name": "At Ease", + "mix_id": "emote" } } \ No newline at end of file diff --git a/items/weapons/primary.json b/items/weapons/primary.json index 181606d..9a6a9a2 100644 --- a/items/weapons/primary.json +++ b/items/weapons/primary.json @@ -443,7 +443,7 @@ 7 ] }, - "1001": { + "1003": { "name": "SG-20 Halt", "description": "A humane compliance weapon with two seperate magazines: one for armor-penetrating flechette rounds and one for stun rounds.", "type": 2, @@ -458,7 +458,7 @@ 5 ] }, - "1002": { + "1006": { "name": "SMG-32 Reprimand", "description": "A heavy-duty submachine gun that fires large-caliber rounds, with a slower rate of fire to manage the high recoil. Ideal for use at close to medium range", "type": 3, diff --git a/items/weapons/secondary.json b/items/weapons/secondary.json index 37027c2..d054cd3 100644 --- a/items/weapons/secondary.json +++ b/items/weapons/secondary.json @@ -140,7 +140,7 @@ 11 ] }, - "1001": { + "1018": { "name": "PLAS-15 Loyalist", "description": "A plasma pistol that charges each shot until the trigger is released. Plasma projectiles explode on impact.", "damage": 125, diff --git a/warbonds.json b/warbonds.json index 185b228..872501a 100644 --- a/warbonds.json +++ b/warbonds.json @@ -42,6 +42,6 @@ "8": { "name": "Truth Enforcers", "id": "truth_enforcers", - "credits_to_unlock": 0 + "credits_to_unlock": 1000 } } \ No newline at end of file diff --git a/warbonds/truth_enforcers.json b/warbonds/truth_enforcers.json index a86b239..90be990 100644 --- a/warbonds/truth_enforcers.json +++ b/warbonds/truth_enforcers.json @@ -4,101 +4,93 @@ "items": [ { "item_id": 1001, - "medal_cost": 0 + "medal_cost": 50 }, { - "item_id": 1001, - "medal_cost": 0 - }, - { - "item_id": 1001, - "medal_cost": 0 - }, - { - "item_id": 1001, - "medal_cost": 0 - }, - { - "item_id": 1001, - "medal_cost": 0 + "item_id": 4219002488, + "medal_cost": 7 }, { - "item_id": 1001, - "medal_cost": 0 + "item_id": 1003, + "medal_cost": 20 }, { - "item_id": 1001, - "medal_cost": 0 + "item_id": 1004, + "medal_cost": 35 }, { - "item_id": 1001, - "medal_cost": 0 + "item_id": 1005, + "medal_cost": 10 } ] }, "2": { - "medals_to_unlock": 0, + "medals_to_unlock": 90, "items": [ { - "item_id": 1001, - "medal_cost": 0 + "item_id": 1006, + "medal_cost": 40 }, { - "item_id": 1001, - "medal_cost": 0 + "item_id": 1007, + "medal_cost": 50 }, { - "item_id": 1001, - "medal_cost": 0 + "item_id": 1008, + "medal_cost": 5 }, { - "item_id": 1001, - "medal_cost": 0 + "item_id": 4219002488, + "medal_cost": 12 }, { - "item_id": 1001, - "medal_cost": 0 + "item_id": 1010, + "medal_cost": 45 }, { - "item_id": 1001, - "medal_cost": 0 - }, - { - "item_id": 1001, - "medal_cost": 0 + "item_id": 1011, + "medal_cost": 35 }, { - "item_id": 1001, - "medal_cost": 0 + "item_id": 1012, + "medal_cost": 20 } ] }, "3": { - "medals_to_unlock": 0, + "medals_to_unlock": 250, "items": [ { - "item_id": 1001, - "medal_cost": 0 + "item_id": 1013, + "medal_cost": 15 }, { - "item_id": 1001, - "medal_cost": 0 + "item_id": 1014, + "medal_cost": 20 }, { - "item_id": 1001, - "medal_cost": 0 + "item_id": 1015, + "medal_cost": 45 }, { - "item_id": 1001, - "medal_cost": 0 + "item_id": 1016, + "medal_cost": 65 }, { - "item_id": 1001, - "medal_cost": 0 + "item_id": 1017, + "medal_cost": 30 }, { - "item_id": 1001, - "medal_cost": 0 + "item_id": 1018, + "medal_cost": 45 + }, + { + "item_id": 1019, + "medal_cost": 50 + }, + { + "item_id": 4219002488, + "medal_cost": 32 } ] } From 8971d057af5f39067869b76a85b07a519840a493 Mon Sep 17 00:00:00 2001 From: Lee Date: Thu, 31 Oct 2024 10:26:50 +0000 Subject: [PATCH 05/14] Forgot to do the armor and booster oops --- items/armor/armor.json | 58 +++++++++++++++++++++++++++++++++++------- items/boosters.json | 2 +- 2 files changed, 50 insertions(+), 10 deletions(-) diff --git a/items/armor/armor.json b/items/armor/armor.json index c346c5f..37ac0fb 100644 --- a/items/armor/armor.json +++ b/items/armor/armor.json @@ -2260,8 +2260,8 @@ "passive": 0 }, "1010": { - "name": "UF-84 Doubt Killer", - "description": "Developed by the Ministry of Science while investigating the phenomenon known as The Gloom, this armor is non-permeable and squeak resistant.", + "name": "UF-50 Bloodhound", + "description": "", "type": 1, "slot": 2, "armor_rating": 100, @@ -2270,8 +2270,8 @@ "passive": 13 }, "1011": { - "name": "UF-84 Doubt Killer", - "description": "Developed by the Ministry of Science while investigating the phenomenon known as The Gloom, this armor is non-permeable and squeak resistant.", + "name": "UF-50 Bloodhound", + "description": "", "type": 1, "slot": 0, "armor_rating": 100, @@ -2289,17 +2289,27 @@ "stamina_regen": 100, "passive": 0 }, - "1013": { - "name": "Cover of Darkness", - "description": "When children have trouble sleeping, tucking them in under this cape reminds them that they are never alone, for Liberty's unseen defenders are always watching over them.", + "1015": { + "name": "UF-16 Inspector", + "description": "", "type": 1, - "slot": 1, + "slot": 0, "armor_rating": 100, "speed": 100, "stamina_regen": 100, "passive": 0 }, - "1014": { + "1016": { + "name": "UF-16 Inspector", + "description": "", + "type": 1, + "slot": 2, + "armor_rating": 100, + "speed": 500, + "stamina_regen": 100, + "passive": 13 + }, + "1017": { "name": "Proof of Faultless Virtue", "description": "", "type": 1, @@ -2308,5 +2318,35 @@ "speed": 100, "stamina_regen": 100, "passive": 0 + }, + "2001": { + "name": "UF-84 Doubt Killer", + "description": "Developed by the Ministry of Science while investigating the phenomenon known as The Gloom, this armor is non-permeable and squeak resistant.", + "type": 1, + "slot": 2, + "armor_rating": 100, + "speed": 500, + "stamina_regen": 100, + "passive": 13 + }, + "2002": { + "name": "UF-84 Doubt Killer", + "description": "Developed by the Ministry of Science while investigating the phenomenon known as The Gloom, this armor is non-permeable and squeak resistant.", + "type": 1, + "slot": 0, + "armor_rating": 100, + "speed": 100, + "stamina_regen": 100, + "passive": 0 + }, + "2003": { + "name": "Cover of Darkness", + "description": "When children have trouble sleeping, tucking them in under this cape reminds them that they are never alone, for Liberty's unseen defenders are always watching over them.", + "type": 1, + "slot": 1, + "armor_rating": 100, + "speed": 100, + "stamina_regen": 100, + "passive": 0 } } \ No newline at end of file diff --git a/items/boosters.json b/items/boosters.json index 4e2e125..971a4a9 100644 --- a/items/boosters.json +++ b/items/boosters.json @@ -47,7 +47,7 @@ "name": "Firebomb Hellpods", "description": "Lines all Hellpods with volatile incendiaries that detonate upon impact, igniting any units in vicinity of the drop site." }, - "1001": { + "1004": { "name": "Dead Sprint", "description": "Consume health to sprint when out of stamina" } From 7575fead0d78b40375b6ca3444b78376e445b541 Mon Sep 17 00:00:00 2001 From: Lee Date: Thu, 31 Oct 2024 10:29:01 +0000 Subject: [PATCH 06/14] Update booster description --- items/boosters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items/boosters.json b/items/boosters.json index 971a4a9..0a00608 100644 --- a/items/boosters.json +++ b/items/boosters.json @@ -49,6 +49,6 @@ }, "1004": { "name": "Dead Sprint", - "description": "Consume health to sprint when out of stamina" + "description": "Allows Helldivers to keep sprinting even when they are out of stamina, draining their health instead." } } \ No newline at end of file From f8f3d7c6c1995faa59d9dd7cf2e1b50054f1edd2 Mon Sep 17 00:00:00 2001 From: Stonemercy Date: Thu, 31 Oct 2024 14:45:35 +0000 Subject: [PATCH 07/14] Apply suggestions from code review Co-authored-by: Chatter Chats <57570001+chatterchats@users.noreply.github.com> --- items/armor/armor.json | 28 ++++++++++++------------ items/item_names.json | 40 +++++++++++++++++------------------ items/weapons/primary.json | 4 ++-- items/weapons/secondary.json | 2 +- warbonds/truth_enforcers.json | 24 ++++++++++----------- 5 files changed, 49 insertions(+), 49 deletions(-) diff --git a/items/armor/armor.json b/items/armor/armor.json index 37ac0fb..d5490f8 100644 --- a/items/armor/armor.json +++ b/items/armor/armor.json @@ -2259,9 +2259,9 @@ "stamina_regen": 100, "passive": 0 }, - "1010": { + "3008695584": { "name": "UF-50 Bloodhound", - "description": "", + "description": "Users are advised not to scratch at the lacquer, as the Red 20,000 pigment that gives this armor its signature sheen may be correlated with rapid DNA unspooling.", "type": 1, "slot": 2, "armor_rating": 100, @@ -2269,9 +2269,9 @@ "stamina_regen": 100, "passive": 13 }, - "1011": { + "238751935": { "name": "UF-50 Bloodhound", - "description": "", + "description": "Users are advised not to scratch at the lacquer, as the Red 20,000 pigment that gives this armor its signature sheen may be correlated with rapid DNA unspooling.", "type": 1, "slot": 0, "armor_rating": 100, @@ -2279,7 +2279,7 @@ "stamina_regen": 100, "passive": 0 }, - "1012": { + "1126585234": { "name": "Pride of the Whistleblower", "description": "Granted to the Truth Enforcers' Informant of the Month, this tasteful cape conjures images of dissident blood on asphalt.", "type": 1, @@ -2289,9 +2289,9 @@ "stamina_regen": 100, "passive": 0 }, - "1015": { + "3530620108": { "name": "UF-16 Inspector", - "description": "", + "description": "Made famous by the \"Truth Enforcers: Enforcers of Truth\" mystery novels, this armor calls to mind those paragons of patriotism who protect us from treasonous lies.", "type": 1, "slot": 0, "armor_rating": 100, @@ -2299,9 +2299,9 @@ "stamina_regen": 100, "passive": 0 }, - "1016": { + "3059832618": { "name": "UF-16 Inspector", - "description": "", + "description": "Made famous by the \"Truth Enforcers: Enforcers of Truth\" mystery novels, this armor calls to mind those paragons of patriotism who protect us from treasonous lies.", "type": 1, "slot": 2, "armor_rating": 100, @@ -2309,9 +2309,9 @@ "stamina_regen": 100, "passive": 13 }, - "1017": { + "3965478926": { "name": "Proof of Faultless Virtue", - "description": "", + "description": "This cape signifies that its wearer thinks, feels, and acts correctly at all times, and thus bears the responsibility to educate and re-educate their fellow citizen.", "type": 1, "slot": 1, "armor_rating": 100, @@ -2319,7 +2319,7 @@ "stamina_regen": 100, "passive": 0 }, - "2001": { + "622973953": { "name": "UF-84 Doubt Killer", "description": "Developed by the Ministry of Science while investigating the phenomenon known as The Gloom, this armor is non-permeable and squeak resistant.", "type": 1, @@ -2329,7 +2329,7 @@ "stamina_regen": 100, "passive": 13 }, - "2002": { + "91360070": { "name": "UF-84 Doubt Killer", "description": "Developed by the Ministry of Science while investigating the phenomenon known as The Gloom, this armor is non-permeable and squeak resistant.", "type": 1, @@ -2339,7 +2339,7 @@ "stamina_regen": 100, "passive": 0 }, - "2003": { + "66704491": { "name": "Cover of Darkness", "description": "When children have trouble sleeping, tucking them in under this cape reminds them that they are never alone, for Liberty's unseen defenders are always watching over them.", "type": 1, diff --git a/items/item_names.json b/items/item_names.json index 2e3e01a..e11971a 100644 --- a/items/item_names.json +++ b/items/item_names.json @@ -1455,27 +1455,27 @@ "name": "Mustard Exosuit", "mix_id": "3236079222" }, - "1001": { + "3241211079": { "name": "Inconspicuous Black Exosuit", "mix_id": "pattern" }, - "1003": { + "122941246": { "name": "SG-20 Halt", - "mix_id": "shotgun" + "mix_id": "122941246" }, "1004": { "name": "Dead Sprint", "mix_id": "booster" }, - "1005": { + "2579792615": { "name": "Inconspicuous Black Hellpod", "mix_id": "pattern" }, - "1006": { + "725205791": { "name": "SMG-32 Reprimand", - "mix_id": "smg" + "mix_id": "725205791" }, - "1007": { + "2484094371": { "name": "Inconspicuous Black Shuttle", "mix_id": "pattern" }, @@ -1483,17 +1483,17 @@ "name": "Pride of the Whistleblower", "mix_id": "playercard" }, - "1010": { + "3008695584": { "name": "UF-50 Bloodhound", - "mix_id": "body" + "mix_id": "1927188023" }, - "1011": { + "238751935": { "name": "UF-50 Bloodhound", - "mix_id": "helmet" + "mix_id": "4286615047" }, - "1012": { + "1126585234": { "name": "Pride of the Whistleblower", - "mix_id": "cape" + "mix_id": "1126585234" }, "1013": { "name": "Proof of Faultless Virtue", @@ -1503,21 +1503,21 @@ "name": "Fee of Thought", "mix_id": "title" }, - "1015": { + "3530620108": { "name": "UF-16 Inspector", - "mix_id": "helmet" + "mix_id": "3285635529" }, - "1016": { + "3059832618": { "name": "UF-16 Inspector", - "mix_id": "body" + "mix_id": "4168334185" }, - "1017": { + "3965478926": { "name": "Proof of Faultless Virtue", "mix_id": "cape" }, - "1018": { + "1902682578": { "name": "PLAS-15 Loyalist", - "mix_id": "pistol" + "mix_id": "1902682578" }, "1019": { "name": "At Ease", diff --git a/items/weapons/primary.json b/items/weapons/primary.json index 9a6a9a2..00b6cdf 100644 --- a/items/weapons/primary.json +++ b/items/weapons/primary.json @@ -443,7 +443,7 @@ 7 ] }, - "1003": { + "122941246": { "name": "SG-20 Halt", "description": "A humane compliance weapon with two seperate magazines: one for armor-penetrating flechette rounds and one for stun rounds.", "type": 2, @@ -458,7 +458,7 @@ 5 ] }, - "1006": { + "725205791": { "name": "SMG-32 Reprimand", "description": "A heavy-duty submachine gun that fires large-caliber rounds, with a slower rate of fire to manage the high recoil. Ideal for use at close to medium range", "type": 3, diff --git a/items/weapons/secondary.json b/items/weapons/secondary.json index d054cd3..f5b60d0 100644 --- a/items/weapons/secondary.json +++ b/items/weapons/secondary.json @@ -140,7 +140,7 @@ 11 ] }, - "1018": { + "1902682578": { "name": "PLAS-15 Loyalist", "description": "A plasma pistol that charges each shot until the trigger is released. Plasma projectiles explode on impact.", "damage": 125, diff --git a/warbonds/truth_enforcers.json b/warbonds/truth_enforcers.json index 90be990..8b246f9 100644 --- a/warbonds/truth_enforcers.json +++ b/warbonds/truth_enforcers.json @@ -3,7 +3,7 @@ "medals_to_unlock": 0, "items": [ { - "item_id": 1001, + "item_id": 3241211079, "medal_cost": 50 }, { @@ -11,7 +11,7 @@ "medal_cost": 7 }, { - "item_id": 1003, + "item_id": 122941246, "medal_cost": 20 }, { @@ -19,7 +19,7 @@ "medal_cost": 35 }, { - "item_id": 1005, + "item_id": 2579792615, "medal_cost": 10 } ] @@ -28,11 +28,11 @@ "medals_to_unlock": 90, "items": [ { - "item_id": 1006, + "item_id": 725205791, "medal_cost": 40 }, { - "item_id": 1007, + "item_id": 2484094371, "medal_cost": 50 }, { @@ -44,15 +44,15 @@ "medal_cost": 12 }, { - "item_id": 1010, + "item_id": 3008695584, "medal_cost": 45 }, { - "item_id": 1011, + "item_id": 4286615047, "medal_cost": 35 }, { - "item_id": 1012, + "item_id": 1126585234, "medal_cost": 20 } ] @@ -69,19 +69,19 @@ "medal_cost": 20 }, { - "item_id": 1015, + "item_id": 3530620108, "medal_cost": 45 }, { - "item_id": 1016, + "item_id": 3059832618, "medal_cost": 65 }, { - "item_id": 1017, + "item_id": 3965478926, "medal_cost": 30 }, { - "item_id": 1018, + "item_id": 1902682578, "medal_cost": 45 }, { From efa1236785c56cf5cb5bafa6f468b0c4df8cdd4e Mon Sep 17 00:00:00 2001 From: Lee Date: Thu, 31 Oct 2024 14:52:31 +0000 Subject: [PATCH 08/14] Added superstore items to item_names --- items/item_names.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/items/item_names.json b/items/item_names.json index e11971a..91bddf4 100644 --- a/items/item_names.json +++ b/items/item_names.json @@ -1522,5 +1522,17 @@ "1019": { "name": "At Ease", "mix_id": "emote" + }, + "2001": { + "name": "UF-84 Doubt Killer", + "mix_id": "body" + }, + "2002": { + "name": "UF-84 Doubt Killer", + "mix_id": "head" + }, + "2003": { + "name": "Cover of Darkness", + "mix_id": "cape" } } \ No newline at end of file From dfdac67c57e71f5d8e145e441b052434a089bede Mon Sep 17 00:00:00 2001 From: Stonemercy Date: Thu, 31 Oct 2024 16:48:52 +0000 Subject: [PATCH 09/14] Apply suggestions from code review Co-authored-by: Chatter Chats <57570001+chatterchats@users.noreply.github.com> --- items/boosters.json | 2 +- items/item_names.json | 30 +++++++++++++++--------------- warbonds/truth_enforcers.json | 10 +++++----- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/items/boosters.json b/items/boosters.json index 0a00608..bb950fb 100644 --- a/items/boosters.json +++ b/items/boosters.json @@ -47,7 +47,7 @@ "name": "Firebomb Hellpods", "description": "Lines all Hellpods with volatile incendiaries that detonate upon impact, igniting any units in vicinity of the drop site." }, - "1004": { + "2239116615": { "name": "Dead Sprint", "description": "Allows Helldivers to keep sprinting even when they are out of stamina, draining their health instead." } diff --git a/items/item_names.json b/items/item_names.json index 91bddf4..f9cadc0 100644 --- a/items/item_names.json +++ b/items/item_names.json @@ -1463,9 +1463,9 @@ "name": "SG-20 Halt", "mix_id": "122941246" }, - "1004": { + "2239116615": { "name": "Dead Sprint", - "mix_id": "booster" + "mix_id": "2239116615" }, "2579792615": { "name": "Inconspicuous Black Hellpod", @@ -1479,9 +1479,9 @@ "name": "Inconspicuous Black Shuttle", "mix_id": "pattern" }, - "1008": { + "601062191": { "name": "Pride of the Whistleblower", - "mix_id": "playercard" + "mix_id": "601062191" }, "3008695584": { "name": "UF-50 Bloodhound", @@ -1495,11 +1495,11 @@ "name": "Pride of the Whistleblower", "mix_id": "1126585234" }, - "1013": { + "151318266": { "name": "Proof of Faultless Virtue", - "mix_id": "playercard" + "mix_id": "151318266" }, - "1014": { + "1301492156": { "name": "Fee of Thought", "mix_id": "title" }, @@ -1519,20 +1519,20 @@ "name": "PLAS-15 Loyalist", "mix_id": "1902682578" }, - "1019": { + "4693889": { "name": "At Ease", - "mix_id": "emote" + "mix_id": "4693889" }, - "2001": { + "622973953": { "name": "UF-84 Doubt Killer", - "mix_id": "body" + "mix_id": "940858144" }, - "2002": { + "238751935": { "name": "UF-84 Doubt Killer", - "mix_id": "head" + "mix_id": "4286615047" }, - "2003": { + "66704491": { "name": "Cover of Darkness", - "mix_id": "cape" + "mix_id": "66704491" } } \ No newline at end of file diff --git a/warbonds/truth_enforcers.json b/warbonds/truth_enforcers.json index 8b246f9..8dad5e4 100644 --- a/warbonds/truth_enforcers.json +++ b/warbonds/truth_enforcers.json @@ -15,7 +15,7 @@ "medal_cost": 20 }, { - "item_id": 1004, + "item_id": 2239116615, "medal_cost": 35 }, { @@ -36,7 +36,7 @@ "medal_cost": 50 }, { - "item_id": 1008, + "item_id": 601062191, "medal_cost": 5 }, { @@ -61,11 +61,11 @@ "medals_to_unlock": 250, "items": [ { - "item_id": 1013, + "item_id": 151318266, "medal_cost": 15 }, { - "item_id": 1014, + "item_id": 1301492156, "medal_cost": 20 }, { @@ -85,7 +85,7 @@ "medal_cost": 45 }, { - "item_id": 1019, + "item_id": 4693889, "medal_cost": 50 }, { From 782ea667bdf6daa9f6f2f03cccf29d5b70de6ab4 Mon Sep 17 00:00:00 2001 From: Lee Date: Thu, 31 Oct 2024 16:50:02 +0000 Subject: [PATCH 10/14] Update misc weapon ID's --- items/item_names.json | 12 ++++++------ items/weapons/grenades.json | 2 +- items/weapons/primary.json | 2 +- items/weapons/secondary.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/items/item_names.json b/items/item_names.json index f9cadc0..4e817e6 100644 --- a/items/item_names.json +++ b/items/item_names.json @@ -1,15 +1,15 @@ { - "1": { + "2852344585": { "name": "AR-23 Liberator", - "mix_id": "1" + "mix_id": "2852344585" }, - "2": { + "2811723672": { "name": "P-2 Peacemaker", - "mix_id": "2" + "mix_id": "2811723672" }, - "3": { + "3191303848": { "name": "G-12 High Explosive", - "mix_id": "3" + "mix_id": "3191303848" }, "16338515": { "name": "G-13 Incendiary Impact", diff --git a/items/weapons/grenades.json b/items/weapons/grenades.json index e658bfc..d2b408c 100644 --- a/items/weapons/grenades.json +++ b/items/weapons/grenades.json @@ -1,5 +1,5 @@ { - "3": { + "3191303848": { "name": "G-12 High Explosive", "description": "A high explosive grenade which damages lightly armored targets. Creates high damage over a small area when detonated.", "damage": 800, diff --git a/items/weapons/primary.json b/items/weapons/primary.json index 00b6cdf..cf0f920 100644 --- a/items/weapons/primary.json +++ b/items/weapons/primary.json @@ -1,5 +1,5 @@ { - "1": { + "2852344585": { "name": "AR-23 Liberator", "description": "The SEAF standard assault rifle, balancing power, fire rate, and weight for a reliable weapon against smaller targets.", "type": 1, diff --git a/items/weapons/secondary.json b/items/weapons/secondary.json index f5b60d0..c2cc720 100644 --- a/items/weapons/secondary.json +++ b/items/weapons/secondary.json @@ -1,5 +1,5 @@ { - "2": { + "2811723672": { "name": "P-2 Peacemaker", "description": "The SEAF standard pistol - offering a high fire rate, generous capacity, and fast reloading.", "damage": 75, From 46e952ab6083763a913e0a38dd4c7583dd609b2e Mon Sep 17 00:00:00 2001 From: Lee Date: Thu, 31 Oct 2024 16:52:38 +0000 Subject: [PATCH 11/14] incorrect ID put in --- items/item_names.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items/item_names.json b/items/item_names.json index 4e817e6..7004e05 100644 --- a/items/item_names.json +++ b/items/item_names.json @@ -1527,7 +1527,7 @@ "name": "UF-84 Doubt Killer", "mix_id": "940858144" }, - "238751935": { + "91360070": { "name": "UF-84 Doubt Killer", "mix_id": "4286615047" }, From 656fe2d5ad1d486e3194419abc3241ee80255db1 Mon Sep 17 00:00:00 2001 From: Chatter Chats <57570001+chatterchats@users.noreply.github.com> Date: Thu, 31 Oct 2024 09:53:03 -0700 Subject: [PATCH 12/14] Update items/weapons/primary.json --- items/weapons/primary.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/items/weapons/primary.json b/items/weapons/primary.json index cf0f920..73c5bcc 100644 --- a/items/weapons/primary.json +++ b/items/weapons/primary.json @@ -451,7 +451,9 @@ "capacity": 16, "recoil": 120, "fire_rate": 80, - "fire_mode": [], + "fire_mode": [ + 0 + ], "traits": [ 1, 2, From d353bfd8a3bacb970931c35de0bf093b35777eea Mon Sep 17 00:00:00 2001 From: Chatter Chats <57570001+chatterchats@users.noreply.github.com> Date: Thu, 31 Oct 2024 09:53:10 -0700 Subject: [PATCH 13/14] Update items/weapons/primary.json --- items/weapons/primary.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/items/weapons/primary.json b/items/weapons/primary.json index 73c5bcc..c81b018 100644 --- a/items/weapons/primary.json +++ b/items/weapons/primary.json @@ -468,7 +468,11 @@ "capacity": 25, "recoil": 44, "fire_rate": 490, - "fire_mode": [], + "fire_mode": [ + 0, + 1, + 2 + ], "traits": [ 2 ] From 44b7c43b378e0720b0895a22e38bd82b486eb25d Mon Sep 17 00:00:00 2001 From: Lee Date: Thu, 31 Oct 2024 16:57:46 +0000 Subject: [PATCH 14/14] Add new fire modes --- items/weapons/fire_modes.json | 4 +++- items/weapons/secondary.json | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/items/weapons/fire_modes.json b/items/weapons/fire_modes.json index be21a31..2605d27 100644 --- a/items/weapons/fire_modes.json +++ b/items/weapons/fire_modes.json @@ -4,5 +4,7 @@ "2": "Automatic", "3": "Pump Action", "4": "Double Action", - "5": "All Barrels" + "5": "All Barrels", + "6": "Charge With Safety On", + "7": "Charge With Safety Off" } \ No newline at end of file diff --git a/items/weapons/secondary.json b/items/weapons/secondary.json index c2cc720..0443b4a 100644 --- a/items/weapons/secondary.json +++ b/items/weapons/secondary.json @@ -147,7 +147,9 @@ "capacity": 7, "recoil": 8, "fire_rate": 1000, - "fire_mode": [], + "fire_mode": [ + 6 + ], "traits": [ 2, 4,