diff --git a/index.php b/index.php index 6e39b46..afec993 100644 --- a/index.php +++ b/index.php @@ -711,7 +711,7 @@ var party_skill_rules_score = Math.round(party_skill_rules * 6.666666666666666666); - var party_final_score = party_skill_strategies_score + party_skill_rules_score + party_skill_attention_score + party_skill_knowledge_score + party_health_score; + var party_final_score = parseInt(party_skill_strategies_score) + parseInt(party_skill_rules_score) + parseInt(party_skill_attention_score) + parseInt(party_skill_knowledge_score) + parseInt(party_health_score); //Monster Setup //Monster amount @@ -719,7 +719,7 @@ // A modifier, that applies the ratio of Enemies to players - var global_amount_modifier = encounter_amount / party_amount * 100; + var global_amount_modifier = encounter_amount / party_amount; // What HP Type is used? 1=average 2=rolled 3=max var encounter_hp_type = $("input[name='mob_hp_type']:checked").val(); @@ -738,23 +738,26 @@ //Evaluate by adding the two scores. //I Debated multiplying the points but that would just be the max HP value. //In the end, it's always hard to give a fair result. - var encounter_hp_type_rolls_added = encounter_hp_type_rolls_amount + encounter_hp_type_rolls_dice; - encounter_hp_type_rolls_added_score = 20 / (encounter_hp_type_rolls_added / party_amount); + var encounter_hp_type_rolls_added = parseInt(encounter_hp_type_rolls_amount) + parseInt(encounter_hp_type_rolls_dice); + var encounter_hp_by_party = encounter_hp_type_rolls_added / party_amount + encounter_hp_type_rolls_added_score = 20 / encounter_hp_by_party; } else if (encounter_hp_type == 1) { //IF Using Averages var encounter_hp_type_averages = $("#mob_hp_avg").val(); - encounter_hp_type_averages_score = 20 / (encounter_hp_type_averages / party_amount); + var encounter_hp_by_party = encounter_hp_type_averages / party_amount + encounter_hp_type_averages_score = 20 / encounter_hp_by_party; } else if (encounter_hp_type == 3) { //IF Using Averages var encounter_hp_type_max = $("#mob_hp_max").val(); - encounter_hp_type_max_score = 20 / (encounter_hp_type_max / party_amount); + var encounter_hp_by_party = encounter_hp_type_max / party_amount + encounter_hp_type_max_score = 20 / encounter_hp_by_party; } - var encounter_hp_score = encounter_hp_type_rolls_added_score + encounter_hp_type_averages_score + encounter_hp_type_max_score; + var encounter_hp_score = parseInt(encounter_hp_type_rolls_added_score) + parseInt(encounter_hp_type_averages_score) + parseInt(encounter_hp_type_max_score); // CR Calculation var encounter_cr = $("#mob_CR").val();