mirror of
https://github.com/Nighthawk42/roll20-character-sheets.git
synced 2026-08-31 04:02:29 +00:00
Merge pull request #8901 from Stexinator/Shadowrun5thA_import_max_of_rc_and_ac
[Shadowrun5thA] import max of rc and ac when importing weapons
This commit is contained in:
@@ -10933,18 +10933,18 @@ on("change:chummercheckbox", function(){
|
||||
if(chummerfile.characters.character.weapons.weapon[i-1].category!="Gear"){
|
||||
if(chummerfile.characters.character.weapons.weapon[i-1].type=="Ranged"){
|
||||
attributes["weaponismelee"+i]=0;
|
||||
attributes["weaponrc"+i]=chummerfile.characters.character.weapons.weapon[i-1].rc-Math.ceil(chummerfile.characters.character.attributes[1].attribute[3].total/3)- 1;
|
||||
attributes["weapondv"+i]=chummerfile.characters.character.weapons.weapon[i-1].rawdamage.match(/\d*/);
|
||||
attributes["weapondmgtype"+i]=chummerfile.characters.character.weapons.weapon[i-1].rawdamage.match(/\D+/);
|
||||
attributes["weaponrc"+i]=chummerfile.characters.character.weapons.weapon[i-1].rc.match(/\d/g).pop()-Math.ceil(chummerfile.characters.character.attributes[1].attribute[3].total/3)- 1;
|
||||
attributes["weapondv"+i]=chummerfile.characters.character.weapons.weapon[i-1].rawdamage.match(/\d/)[0];
|
||||
attributes["weapondmgtype"+i]=chummerfile.characters.character.weapons.weapon[i-1].rawdamage.match(/\D+/)[0];
|
||||
}else{
|
||||
attributes["weaponismelee"+i]="on";
|
||||
attributes["weaponreach"+i]=chummerfile.characters.character.weapons.weapon[i-1].reach;
|
||||
attributes["weapondv"+i]=chummerfile.characters.character.weapons.weapon[i-1].damage_english.match(/\d*/);
|
||||
attributes["weapondmgtype"+i]=chummerfile.characters.character.weapons.weapon[i-1].damage_english.match(/\D+/);
|
||||
attributes["weapondv"+i]=chummerfile.characters.character.weapons.weapon[i-1].damage_english.match(/\d/)[0];
|
||||
attributes["weapondmgtype"+i]=chummerfile.characters.character.weapons.weapon[i-1].damage_english.match(/\D+/)[0];
|
||||
}
|
||||
|
||||
attributes["weaponname"+i]=chummerfile.characters.character.weapons.weapon[i-1].name;
|
||||
attributes["weaponaccuracy"+i]=chummerfile.characters.character.weapons.weapon[i-1].accuracy;
|
||||
attributes["weaponaccuracy"+i]=chummerfile.characters.character.weapons.weapon[i-1].accuracy.match(/\d/g).pop();
|
||||
if(isNaN(chummerfile.characters.character.weapons.weapon[i-1].ap)){
|
||||
attributes["weaponap"+i]=0;
|
||||
}else{
|
||||
@@ -11033,17 +11033,17 @@ on("change:chummercheckbox", function(){
|
||||
if(chummerfile.characters.character.weapons.weapon.category!="Gear"){
|
||||
if(chummerfile.characters.character.weapons.weapon.type=="Ranged"){
|
||||
attributes["weaponismelee1"]=0;
|
||||
attributes["weaponrc1"]=chummerfile.characters.character.weapons.weapon.rc-Math.ceil(chummerfile.characters.character.attributes[1].attribute[3].total/3)- 1;
|
||||
attributes["weapondv1"]=chummerfile.characters.character.weapons.weapon.rawdamage.match(/\d*/);
|
||||
attributes["weapondmgtype1"]=chummerfile.characters.character.weapons.weapon.rawdamage.match(/\D+/);
|
||||
attributes["weaponrc1"]=chummerfile.characters.character.weapons.weapon.rc.match(/\d/g).pop()-Math.ceil(chummerfile.characters.character.attributes[1].attribute[3].total/3)- 1;
|
||||
attributes["weapondv1"]=chummerfile.characters.character.weapons.weapon.rawdamage.match(/\d*/)[0];
|
||||
attributes["weapondmgtype1"]=chummerfile.characters.character.weapons.weapon.rawdamage.match(/\D+/)[0];
|
||||
}else{
|
||||
attributes["weaponismelee1"]="on";
|
||||
attributes["weaponreach1"]=chummerfile.characters.character.weapons.weapon.reach;
|
||||
attributes["weapondv1"]=chummerfile.characters.character.weapons.weapon.damage_english.match(/\d*/);
|
||||
attributes["weapondmgtype1"]=chummerfile.characters.character.weapons.weapon.damage_english.match(/\D+/);
|
||||
attributes["weapondv1"]=chummerfile.characters.character.weapons.weapon.damage_english.match(/\d*/)[0];
|
||||
attributes["weapondmgtype1"]=chummerfile.characters.character.weapons.weapon.damage_english.match(/\D+/)[0];
|
||||
}
|
||||
attributes["weaponname1"]=chummerfile.characters.character.weapons.weapon.name;
|
||||
attributes["weaponaccuracy1"]=chummerfile.characters.character.weapons.weapon.accuracy;
|
||||
attributes["weaponaccuracy1"]=chummerfile.characters.character.weapons.weapon.accuracy.match(/\d/g).pop();
|
||||
if(Number(chummerfile.characters.character.weapons.weapon.ap)!="NaN"){
|
||||
attributes["weaponap1"]=chummerfile.characters.character.weapons.weapon.ap;
|
||||
}else{
|
||||
@@ -11267,9 +11267,9 @@ on("change:chummercheckbox", function(){
|
||||
if(!(chummerfile.characters.character.vehicles.vehicle[i].mods.mod[j].weapons.weapon.length>1)){
|
||||
if(chummerfile.characters.character.vehicles.vehicle[i].mods.mod[j].weapons.weapon.category!="Gear"){
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponname"]=chummerfile.characters.character.vehicles.vehicle[i].mods.mod[j].weapons.weapon.name;
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponaccuracy"]=chummerfile.characters.character.vehicles.vehicle[i].mods.mod[j].weapons.weapon.accuracy;
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponaccuracy"]=chummerfile.characters.character.vehicles.vehicle[i].mods.mod[j].weapons.weapon.accuracy.match(/\d/g).pop();
|
||||
if(chummerfile.characters.character.vehicles.vehicle[i].mods.mod[j].weapons.weapon.type=="Ranged")
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponrc"]=chummerfile.characters.character.vehicles.vehicle[i].mods.mod[j].weapons.weapon.rc-Math.ceil(chummerfile.characters.character.attributes[1].attribute[3].total/3)- 1;
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponrc"]=chummerfile.characters.character.vehicles.vehicle[i].mods.mod[j].weapons.weapon.rc.match(/\d/g).pop()-Math.ceil(chummerfile.characters.character.attributes[1].attribute[3].total/3)- 1;
|
||||
if(Number(chummerfile.characters.character.vehicles.vehicle[i].mods.mod[j].weapons.weapon.ap)!="NaN"){
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponap"]=chummerfile.characters.character.vehicles.vehicle[i].mods.mod[j].weapons.weapon.ap;
|
||||
}else{
|
||||
@@ -11297,9 +11297,9 @@ on("change:chummercheckbox", function(){
|
||||
if(!(chummerfile.characters.character.vehicles.vehicle[i].mods.mod.weapons.weapon.length>1)){
|
||||
if(chummerfile.characters.character.vehicles.vehicle[i].mods.mod.weapons.weapon.category!="Gear"){
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponname"]=chummerfile.characters.character.vehicles.vehicle[i].mods.mod.weapons.weapon.name;
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponaccuracy"]=chummerfile.characters.character.vehicles.vehicle[i].mods.mod.weapons.weapon.accuracy;
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponaccuracy"]=chummerfile.characters.character.vehicles.vehicle[i].mods.mod.weapons.weapon.accuracy.match(/\d/g).pop();
|
||||
if(chummerfile.characters.character.vehicles.vehicle[i].mods.mod.weapons.weapon.type=="Ranged")
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponrc"]=chummerfile.characters.character.vehicles.vehicle[i].mods.mod.weapons.weapon.rc-Math.ceil(chummerfile.characters.character.attributes[1].attribute[3].total/3)- 1;
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponrc"]=chummerfile.characters.character.vehicles.vehicle[i].mods.mod.weapons.weapon.rc.match(/\d/g).pop()-Math.ceil(chummerfile.characters.character.attributes[1].attribute[3].total/3)- 1;
|
||||
if(Number(chummerfile.characters.character.vehicles.vehicle[i].mods.mod.weapons.weapon.ap)!="NaN"){
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponap"]=chummerfile.characters.character.vehicles.vehicle[i].mods.mod.weapons.weapon.ap;
|
||||
}else{
|
||||
@@ -11344,9 +11344,9 @@ on("change:chummercheckbox", function(){
|
||||
if(!(chummerfile.characters.character.vehicles.vehicle.mods.mod[j].weapons.weapon.length>1)){
|
||||
if(chummerfile.characters.character.vehicles.vehicle.mods.mod[j].weapons.weapon.category!="Gear"){
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponname"]=chummerfile.characters.character.vehicles.vehicle.mods.mod[j].weapons.weapon.name;
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponaccuracy"]=chummerfile.characters.character.vehicles.vehicle.mods.mod[j].weapons.weapon.accuracy;
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponaccuracy"]=chummerfile.characters.character.vehicles.vehicle.mods.mod[j].weapons.weapon.accuracy.match(/\d/g).pop();
|
||||
if(chummerfile.characters.character.vehicles.vehicle.mods.mod[j].weapons.weapon.type=="Ranged")
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponrc"]=chummerfile.characters.character.vehicles.vehicle.mods.mod[j].weapons.weapon.rc-Math.ceil(chummerfile.characters.character.attributes[1].attribute[3].total/3)- 1;
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponrc"]=chummerfile.characters.character.vehicles.vehicle.mods.mod[j].weapons.weapon.rc.match(/\d/g).pop()-Math.ceil(chummerfile.characters.character.attributes[1].attribute[3].total/3)- 1;
|
||||
if(Number(chummerfile.characters.character.vehicles.vehicle.mods.mod[j].weapons.weapon.ap)!="NaN"){
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponap"]=chummerfile.characters.character.vehicles.vehicle.mods.mod[j].weapons.weapon.ap;
|
||||
}else{
|
||||
@@ -11374,9 +11374,9 @@ on("change:chummercheckbox", function(){
|
||||
if(!(chummerfile.characters.character.vehicles.vehicle.mods.mod.weapons.weapon.length>1)){
|
||||
if(chummerfile.characters.character.vehicles.vehicle.mods.mod.weapons.weapon.category!="Gear"){
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponname"]=chummerfile.characters.character.vehicles.vehicle.mods.mod.weapons.weapon.name;
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponaccuracy"]=chummerfile.characters.character.vehicles.vehicle.mods.mod.weapons.weapon.accuracy;
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponaccuracy"]=chummerfile.characters.character.vehicles.vehicle.mods.mod.weapons.weapon.accuracy.match(/\d/g).pop();
|
||||
if(chummerfile.characters.character.vehicles.vehicle.mods.mod.weapons.weapon.type=="Ranged")
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponrc"]=chummerfile.characters.character.vehicles.vehicle.mods.mod.weapons.weapon.rc-Math.ceil(chummerfile.characters.character.attributes[1].attribute[3].total/3)- 1;
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponrc"]=chummerfile.characters.character.vehicles.vehicle.mods.mod.weapons.weapon.rc.match(/\d/g).pop()-Math.ceil(chummerfile.characters.character.attributes[1].attribute[3].total/3)- 1;
|
||||
if(Number(chummerfile.characters.character.vehicles.vehicle.mods.mod.weapons.weapon.ap)!="NaN"){
|
||||
attributes["repeating_vehicles_"+newrowid+"_vehicleweaponap"]=chummerfile.characters.character.vehicles.vehicle.mods.mod.weapons.weapon.ap;
|
||||
}else{
|
||||
@@ -11703,11 +11703,11 @@ on("change:chummercheckbox", function(){
|
||||
try{
|
||||
setAttrs(attributes);
|
||||
}catch(err){
|
||||
setAttrs({
|
||||
chummertext:"Error setting Attributes: " + err,
|
||||
chummercheckbox:"0",
|
||||
warningcheckbox:"0"
|
||||
});
|
||||
setAttrs({
|
||||
chummertext:"Error setting Attributes: " + err,
|
||||
chummercheckbox:"0",
|
||||
warningcheckbox:"0"
|
||||
});
|
||||
}
|
||||
}else{
|
||||
setAttrs({
|
||||
|
||||
Reference in New Issue
Block a user