Skip to content

Commit 3064b70

Browse files
committed
Add ":" separator to specify custom damage type
Fixes kakaroto#138
1 parent 5df9b71 commit 3064b70

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

src/dndbeyond_character.js

+9-3
Original file line numberDiff line numberDiff line change
@@ -12250,7 +12250,7 @@ return this.__repr__();
1225012250
if (Object.prototype.hasOwnProperty.call(ρσ_kwargs_obj, "force_display")){
1225112251
force_display = ρσ_kwargs_obj.force_display;
1225212252
}
12253-
var prop_list, properties, item_name, item_type, description, item_full_name, to_hit, damages, damage_types, value, damage, damage_type, versatile_damage, versatile_choice, additional_damages, dmg, dmg_type, dmg_info, j, i, custom_damages, custom_damage, sneak_attack, bloodhunter_level, rite_die, cleric_level, bard_level, critical_limit, brutal, barbarian_level, rage_damage, roll_properties;
12253+
var prop_list, properties, item_name, item_type, description, item_full_name, to_hit, damages, damage_types, value, damage, damage_type, versatile_damage, versatile_choice, additional_damages, dmg, dmg_type, dmg_info, j, i, custom_damages, parts, custom_damage, sneak_attack, bloodhunter_level, rite_die, cleric_level, bard_level, critical_limit, brutal, barbarian_level, rage_damage, roll_properties;
1225412254
prop_list = $(".ct-item-pane .ct-property-list .ct-property-list__property,.ct-item-pane .ddbc-property-list .ddbc-property-list__property");
1225512255
properties = propertyListToDict(prop_list);
1225612256
properties["Properties"] = properties["Properties"] || "";
@@ -12322,8 +12322,14 @@ return this.__repr__();
1232212322
var ρσ_Iter2 = ρσ_Iterable(custom_damages.split(","));
1232312323
for (var ρσ_Index2 = 0; ρσ_Index2 < ρσ_Iter2.length; ρσ_Index2++) {
1232412324
custom_damage = ρσ_Iter2[ρσ_Index2];
12325-
damages.append(custom_damage.trim());
12326-
damage_types.append("Custom");
12325+
if (ρσ_in(":", custom_damage)) {
12326+
parts = custom_damage.split(":", 2);
12327+
damages.append(parts[1].trim());
12328+
damage_types.append(parts[0].trim());
12329+
} else {
12330+
damages.append(custom_damage.trim());
12331+
damage_types.append("Custom");
12332+
}
1232712333
}
1232812334
}
1232912335
if (ρσ_in("Rogue", character._classes) && character.getSetting("rogue-sneak-attack", false) && ((properties["Attack Type"] === "Ranged" || typeof properties["Attack Type"] === "object" && ρσ_equals(properties["Attack Type"], "Ranged")) || properties["Properties"].includes("Finesse"))) {

src/dndbeyond_character.pyj

+7-2
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,13 @@ def rollItem(force_display=False):
173173
custom_damages = character.getSetting("custom-damage-dice", "")
174174
if len(custom_damages) > 0:
175175
for custom_damage in custom_damages.split(","):
176-
damages.append(custom_damage.trim())
177-
damage_types.append("Custom")
176+
if ":" in custom_damage:
177+
parts = custom_damage.split(":", 2)
178+
damages.append(parts[1].trim())
179+
damage_types.append(parts[0].trim())
180+
else:
181+
damages.append(custom_damage.trim())
182+
damage_types.append("Custom")
178183
if "Rogue" in character._classes and \
179184
character.getSetting("rogue-sneak-attack", False) and \
180185
(properties["Attack Type"] == "Ranged" or \

0 commit comments

Comments
 (0)