[Shadowrun5thA] fix weapon import for melee weapons with charges

This commit is contained in:
Stexinator
2021-08-25 13:15:15 +02:00
parent 3399758f24
commit 06c75ade88
+45 -41
View File
@@ -11476,28 +11476,30 @@ on("change:chummercheckbox", function(){
var newrowid=generateRowID();
//find ammo to get stats
ammo = ammunition.find(clip => clip.guid === chummerfile.characters.character.weapons.weapon[i-1].clips.clip[j].id);
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoname"+i]=ammo.name;
if(ammo.weaponbonusdamage_english != null && ammo.weaponbonusap != null && ammo.weaponbonusacc != null) {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=ammo.weaponbonusdamage_english.substring(0,2);
attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=ammo.weaponbonusdamage_english.substring(2);
if(ammo.name_english === "Ammo: Stick-n-Shock") {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
if(ammo != null) {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoname"+i]=ammo.name;
if(ammo.weaponbonusdamage_english != null && ammo.weaponbonusap != null && ammo.weaponbonusacc != null) {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=ammo.weaponbonusdamage_english.substring(0,2);
attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=ammo.weaponbonusdamage_english.substring(2);
if(ammo.name_english === "Ammo: Stick-n-Shock") {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
}
else {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
}
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=ammo.weaponbonusacc;
}
else {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=0;
attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=0;
if(ammo.name_english === "Ammo: Stick-n-Shock") {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
}
else {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=0;
}
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=0;
}
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=ammo.weaponbonusacc;
}
else {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=0;
attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=0;
if(ammo.name_english === "Ammo: Stick-n-Shock") {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
}
else {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=0;
}
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=0;
}
}
}else{
@@ -11510,28 +11512,30 @@ on("change:chummercheckbox", function(){
continue;
}
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoname"+i]=ammo.name;
if(ammo.weaponbonusdamage_english != null && ammo.weaponbonusap != null && ammo.weaponbonusacc != null) {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=ammo.weaponbonusdamage_english.substring(0,2);
attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=ammo.weaponbonusdamage_english.substring(2);
if(ammo.name_english === "Ammo: Stick-n-Shock") {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
}
else {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
}
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=ammo.weaponbonusacc;
}
else {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=0;
attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=0;
if(ammo.name_english === "Ammo: Stick-n-Shock") {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
}
else {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=0;
}
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=0;
if(ammo != null) {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoname"+i]=ammo.name;
if(ammo.weaponbonusdamage_english != null && ammo.weaponbonusap != null && ammo.weaponbonusacc != null) {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=ammo.weaponbonusdamage_english.substring(0,2);
attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=ammo.weaponbonusdamage_english.substring(2);
if(ammo.name_english === "Ammo: Stick-n-Shock") {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
}
else {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
}
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=ammo.weaponbonusacc;
}
else {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=0;
attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=0;
if(ammo.name_english === "Ammo: Stick-n-Shock") {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
}
else {
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=0;
}
attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=0;
}
}
}
}