Merge pull request #8931 from Stexinator/Shadowrun5thA_importing_of_knowledgeskill_name_clash

[Shadowrun5thA] seems like sometimes there is no english name for kno…
This commit is contained in:
Nic Bradley
2021-05-20 09:34:10 -07:00
committed by GitHub
+6 -4
View File
@@ -11430,9 +11430,10 @@ on("change:chummercheckbox", function(){
}
if(chummerfile.characters.character.skills.skill[i].knowledge=="True"){
var newrowid=generateRowID();
attributes["repeating_knowledge_"+newrowid+"_knowledgename"]=chummerfile.characters.character.skills.skill[i].name_english;
if(chummerfile.characters.character.skills.skill[i].skillcategory_english!=null)
attributes["repeating_knowledge_"+newrowid+"_knowledgeattr"]="@{"+chummerfile.characters.character.skills.skill[i].skillcategory_english.toLowerCase();
attributes["repeating_knowledge_"+newrowid+"_knowledgename"]=chummerfile.characters.character.skills.skill[i].name;
if(chummerfile.characters.character.skills.skill[i].skillcategory_english!=null){
attributes["repeating_knowledge_"+newrowid+"_knowledgeattr"]="@{"+chummerfile.characters.character.skills.skill[i].skillcategory_english.toLowerCase();
}
if(chummerfile.characters.character.skills.skill[i].rating>0){
attributes["repeating_knowledge_"+newrowid+"_knowledgerating"]=chummerfile.characters.character.skills.skill[i].rating;
attributes["repeating_knowledge_"+newrowid+"_knowledgebonus"]=chummerfile.characters.character.skills.skill[i].total-chummerfile.characters.character.skills.skill[i].rating-chummerfile.characters.character.skills.skill[i].attributemod;
@@ -11440,8 +11441,9 @@ on("change:chummercheckbox", function(){
attributes["repeating_knowledge_"+newrowid+"_knowledgerating"]="-1";
attributes["repeating_knowledge_"+newrowid+"_knowledgebonus"]=chummerfile.characters.character.skills.skill[i].total-chummerfile.characters.character.skills.skill[i].rating-chummerfile.characters.character.skills.skill[i].attributemod+1;
}
if(chummerfile.characters.character.skills.skill[i].skillspecializations!=null)
if(chummerfile.characters.character.skills.skill[i].skillspecializations!=null) {
attributes["repeating_knowledge_"+newrowid+"_knowledgespec"]=chummerfile.characters.character.skills.skill[i].skillspecializations.skillspecialization.name;
}
else
attributes["repeating_knowledge_"+newrowid+"_knowledgespec"]="none";
}