Merge

assets/database/db.json

@@ -14931,8 +14931,12 @@
 {"id":263013,"name":"Band of the Petrified Pumpkin","icon":"inv_misc_bag_28_halloween","type":11,"phase":1,"quality":4,"unique":true,"scalingOptions":{"-1":{"randPropPoints":953,"stats":{"0":501,"2":752,"6":354,"7":301},"ilvl":463},"0":{"randPropPoints":1214,"stats":{"0":639,"2":957,"6":450,"7":383},"ilvl":489}}},
 {"id":263014,"name":"The Horseman's Horrific Hood","icon":"inv_helmet_21","type":1,"armorType":4,"gemSockets":[1,4],"socketBonus":[180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"phase":1,"quality":4,"scalingOptions":{"-1":{"randPropPoints":1710,"stats":{"0":865,"2":1025,"5":366,"6":483,"17":4002},"ilvl":463},"0":{"randPropPoints":2179,"stats":{"0":1115,"2":1306,"5":479,"6":628,"17":4380},"ilvl":489}}},
 {"id":263018,"name":"The Horseman's Sinister Slicer","icon":"inv_sword_07","type":13,"weaponType":9,"handType":2,"weaponSpeed":2.6,"phase":1,"quality":4,"scalingOptions":{"-1":{"randPropPoints":733,"weaponDamageMin":4434,"weaponDamageMax":8236,"stats":{"1":257,"2":723,"5":257,"8":257},"ilvl":463},"0":{"randPropPoints":934,"weaponDamageMin":5650,"weaponDamageMax":10494,"stats":{"1":311,"2":876,"5":311,"8":311},"ilvl":489}}},
-{"id":268554,"name":"Miniature Winter Veil Tree","icon":"inv_knife_1h_common_b_01green","type":13,"weaponType":2,"handType":2,"weaponSpeed":1.8,"phase":1,"quality":4,"scalingOptions":{"-1":{"randPropPoints":733,"weaponDamageMin":3070,"weaponDamageMax":5702,"stats":{"1":384,"2":578,"5":257,"7":257},"ilvl":463},"0":{"randPropPoints":934,"weaponDamageMin":3911,"weaponDamageMax":7265,"stats":{"1":491,"2":737,"5":327,"7":327},"ilvl":489}}},
-{"id":268556,"name":"Miniature Winter Veil Tree","icon":"inv_knife_1h_common_b_01green","type":13,"weaponType":2,"handType":2,"weaponSpeed":1.8,"phase":3,"quality":4,"scalingOptions":{"-1":{"randPropPoints":733,"weaponDamageMin":3070,"weaponDamageMax":5702,"stats":{"1":384,"2":578,"5":257,"7":257},"ilvl":463},"0":{"randPropPoints":1054,"weaponDamageMin":4415,"weaponDamageMax":8200,"stats":{"1":554,"2":831,"5":369,"7":369},"ilvl":502}}}
+{"id":268556,"name":"Miniature Winter Veil Tree","icon":"inv_knife_1h_common_b_01green","type":13,"weaponType":2,"handType":2,"weaponSpeed":1.8,"phase":3,"quality":4,"scalingOptions":{"-1":{"randPropPoints":733,"weaponDamageMin":3070,"weaponDamageMax":5702,"stats":{"1":384,"2":578,"5":257,"7":257},"ilvl":463},"0":{"randPropPoints":1054,"weaponDamageMin":4415,"weaponDamageMax":8200,"stats":{"1":554,"2":831,"5":369,"7":369},"ilvl":502}}},
+{"id":270884,"name":"Winking Eye of Love","icon":"inv_jewelry_necklace_27","type":2,"phase":3,"quality":4,"scalingOptions":{"-1":{"randPropPoints":953,"stats":{"2":752,"3":501,"4":326,"6":339},"ilvl":463},"0":{"randPropPoints":1370,"stats":{"2":1080,"3":721,"4":468,"6":487},"ilvl":502}}},
+{"id":270886,"name":"Choker of the Pure Heart","icon":"inv_jewelry_necklace_45","type":2,"phase":3,"quality":4,"scalingOptions":{"-1":{"randPropPoints":953,"stats":{"0":501,"2":752,"5":344,"6":318},"ilvl":463},"0":{"randPropPoints":1370,"stats":{"0":721,"2":1080,"5":495,"6":457},"ilvl":502}}},
+{"id":270890,"name":"Heartbreak Charm","icon":"inv_jewelry_necklace_23","type":2,"phase":3,"quality":4,"scalingOptions":{"-1":{"randPropPoints":953,"stats":{"2":752,"3":501,"6":326,"7":339},"ilvl":463},"0":{"randPropPoints":1370,"stats":{"2":1080,"3":721,"6":468,"7":487},"ilvl":502}}},
+{"id":270892,"name":"Sweet Perfume Broach","icon":"inv_jewelry_necklace_30","type":2,"phase":3,"quality":4,"scalingOptions":{"-1":{"randPropPoints":953,"stats":{"1":501,"2":752,"6":301,"7":354},"ilvl":463},"0":{"randPropPoints":1370,"stats":{"1":721,"2":1080,"6":433,"7":508},"ilvl":502}}},
+{"id":270894,"name":"Shard of Pirouetting Happiness","icon":"inv_jewelry_necklace_02","type":2,"phase":3,"quality":4,"scalingOptions":{"-1":{"randPropPoints":953,"stats":{"0":501,"2":752,"5":254,"9":381},"ilvl":463},"0":{"randPropPoints":1370,"stats":{"0":721,"2":1080,"5":365,"9":548},"ilvl":502}}}
 ],
 "randomSuffixes":[
 {"id":-488,"name":"of the Earthfall","stats":[0,0,0,0,0,0,3159,3159,0,0,0,0,0,0,0,0,0,0,0,0,0,0]},

assets/locales/en/translation.json

@@ -284,7 +284,7 @@
 			"copy_to_reforge_lite": "Copy to Reforge Lite"
 		},
 		"reforge_success": {
-			"title": "The following items were reforged:",
+			"title": "The following items were changed:",
 			"removed_reforge": "Removed reforge",
 			"no_changes": "No reforge changes were made!",
 			"copy_to_reforge_lite": "Copy to Reforge Lite"
@@ -1070,6 +1070,13 @@
 					"label": "Trigger ICD",
 					"tooltip": "Triggers the specified internal cooldown."
 				},
+				"damage_amplification": {
+					"label": "Damage Amplification",
+					"tooltip": "Multiplies Damage Done % by the specified percentage.",
+					"amount": {
+						"label": "Percentage"
+					}
+				},
 				"item_swap": {
 					"label": "Item Swap",
 					"tooltip": "Swaps items, using the swap set specified in Settings."
@@ -1685,7 +1692,8 @@
 					"include_reaction_time_tooltip": "If checked, will use the configured reaction time.",
 					"use_base_value": "Use base value",
 					"use_base_value_tooltip": "If checked, will compare the current DoT to the the base value (on encounter start) of the DoT.",
-					"variable_assignment_tooltip": "Value to assign to variable '{{variableName}}'"
+					"variable_assignment_tooltip": "Value to assign to variable '{{variableName}}'",
+					"amplification_type": "Amplification Type"
 				},
 				"eclipse_types": {
 					"lunar": "Lunar",
@@ -1715,6 +1723,20 @@
 					"cat": "Cat",
 					"hybrid": "Hybrid"
 				},
+				"amplification_types": {
+					"caster_buff": {
+						"label": "Caster Buff",
+						"tooltip": "Buff is on caster; snapshots DoTs and affect pets (not guardians)"
+					},
+					"environment_buff": {
+						"label": "Environment Buff",
+						"tooltip": "Buff is on the environment (ie. Jin'Rokh' pool); snapshots DoTs and affect pets (not guardians)"
+					},
+					"target_debuff": {
+						"label": "Target Debuff",
+						"tooltip": "Debuff is on target; doesn't snapshot DoTs and affects pets/guardians"
+					}
+				},
 				"unit_labels": {
 					"self": "Self",
 					"current_target": "Current Target",