diff --git a/Metal Adventures/MetalAdventures.html b/Metal Adventures/MetalAdventures.html
index 28efbbe754..d84cfec0d4 100644
--- a/Metal Adventures/MetalAdventures.html
+++ b/Metal Adventures/MetalAdventures.html
@@ -1,8 +1,8 @@
-
-
+
+
@@ -1023,133 +1023,133 @@ on('sheet:opened',function(){
on("change:Technique change:Acrobatie change:ArmesDePoing change:ArmesDEpaule change:ArmesEmbarquee change:Artisanat change:Pilotage1 change:Pilotage2 change:Technologie", function() {
- getAttrs(["Technique", "Acrobatie", "ArmesDePoing", "ArmesDEpaule", "ArmesEmbarquee", "Artisanat", "Pilotage1", "Pilotage2", "Technologie"], function(values) {
+ getAttrs(["Technique", "Acrobatie", "ArmesDePoing", "ArmesDEpaule", "ArmesEmbarquee", "Artisanat", "Pilotage1", "Pilotage2", "Technologie"], function(v) {
setAttrs({
- Acrobatie_max: +values.Technique + +values.Acrobatie,
- ArmesDePoing_max: +values.Technique + +values.ArmesDePoing,
- ArmesDEpaule_max: +values.Technique + +values.ArmesDEpaule,
- ArmesEmbarquee_max: +values.ArmesEmbarquee > 0 ? +values.Technique + +values.ArmesEmbarquee:0,
- Artisanat_max: +values.Technique + +values.Artisanat,
- Pilotage1_max: +values.Pilotage1>0?+values.Technique + +values.Pilotage1:0,
- Pilotage2_max: +values.Pilotage2>0?+values.Technique + +values.Pilotage2:0,
- Technologie_max: +values.Technique + +values.Technologie
+ Acrobatie_max: +v.Technique + +v.Acrobatie,
+ ArmesDePoing_max: +v.Technique + +v.ArmesDePoing,
+ ArmesDEpaule_max: +v.Technique + +v.ArmesDEpaule,
+ ArmesEmbarquee_max: +v.ArmesEmbarquee > 0 ? +v.Technique + +v.ArmesEmbarquee:0,
+ Artisanat_max: +v.Technique + +v.Artisanat,
+ Pilotage1_max: +v.Pilotage1>0?+v.Technique + +v.Pilotage1:0,
+ Pilotage2_max: +v.Pilotage2>0?+v.Technique + +v.Pilotage2:0,
+ Technologie_max: +v.Technique + +v.Technologie
});
});
});
on("change:Survie change:ArmesdeJet change:ArmesLourdes change:Athletisme change:Equitation change:Melee change:Environement1 change:Environement2 change:Environement3", function() {
- getAttrs(["Survie", "ArmesdeJet", "ArmesLourdes", "Athletisme", "Equitation", "Melee", "Environement1", "Environement2", "Environement3"], function(values) {
+ getAttrs(["Survie", "ArmesdeJet", "ArmesLourdes", "Athletisme", "Equitation", "Melee", "Environement1", "Environement2", "Environement3"], function(v) {
setAttrs({
- ArmesdeJet_max: +values.Survie + +values.ArmesdeJet,
- ArmesLourdes_max: +values.ArmesLourdes > 0 ? +values.Survie + +values.ArmesLourdes:0,
- Athletisme_max: +values.Survie + +values.Athletisme,
- Equitation_max: +values.Survie + +values.Equitation,
- Melee_max: +values.Survie + +values.Melee,
- Environement1_max: +values.Survie + +values.Environement1,
- Environement2_max: +values.Survie + +values.Environement2,
- Environement3_max: +values.Survie + +values.Environement3,
+ ArmesdeJet_max: +v.Survie + +v.ArmesdeJet,
+ ArmesLourdes_max: +v.ArmesLourdes > 0 ? +v.Survie + +v.ArmesLourdes:0,
+ Athletisme_max: +v.Survie + +v.Athletisme,
+ Equitation_max: +v.Survie + +v.Equitation,
+ Melee_max: +v.Survie + +v.Melee,
+ Environement1_max: +v.Survie + +v.Environement1,
+ Environement2_max: +v.Survie + +v.Environement2,
+ Environement3_max: +v.Survie + +v.Environement3,
});
});
});
on("change:Espionnage change:Deguisement change:Discretion change:Empathie change:Falsification change:Recherche change:Senseurs change:SysSecu change:Vigilance", function() {
- getAttrs(["Espionnage", "Deguisement", "Discretion", "Empathie", "Falsification", "Recherche", "Senseurs", "SysSecu", "Vigilance"], function(values) {
+ getAttrs(["Espionnage", "Deguisement", "Discretion", "Empathie", "Falsification", "Recherche", "Senseurs", "SysSecu", "Vigilance"], function(v) {
setAttrs({
- Deguisement_max: +values.Espionnage + +values.Deguisement,
- Discretion_max: +values.Espionnage + +values.Discretion,
- Empathie_max: +values.Espionnage + +values.Empathie,
- Falsification_max: +values.Falsification > 0 ? +values.Espionnage + +values.Falsification:0,
- Recherche_max: +values.Espionnage + +values.Recherche,
- Senseurs_max: +values.Senseurs > 0 ? +values.Espionnage + +values.Senseurs:0,
- SysSecu_max: +values.SysSecu > 0 ? +values.Espionnage + +values.SysSecu:0,
- Vigilance_max: +values.Espionnage + +values.Vigilance,
+ Deguisement_max: +v.Espionnage + +v.Deguisement,
+ Discretion_max: +v.Espionnage + +v.Discretion,
+ Empathie_max: +v.Espionnage + +v.Empathie,
+ Falsification_max: +v.Falsification > 0 ? +v.Espionnage + +v.Falsification:0,
+ Recherche_max: +v.Espionnage + +v.Recherche,
+ Senseurs_max: +v.Senseurs > 0 ? +v.Espionnage + +v.Senseurs:0,
+ SysSecu_max: +v.SysSecu > 0 ? +v.Espionnage + +v.SysSecu:0,
+ Vigilance_max: +v.Espionnage + +v.Vigilance,
});
});
});
on("change:Science change:Analyse change:Art change:Connaissance1 change:Connaissance2 change:Connaissance3 change:Esoterisme change:Histoire change:Ingenierie change:Medecine change:Navigation change:SciencesSolaires change:SciencesStellaires", function() {
- getAttrs(["Science", "Analyse", "Art", "Connaissance1", "Connaissance2", "Connaissance3", "Esoterisme", "Histoire", "Ingenierie", "Medecine", "Navigation", "SciencesSolaires", "SciencesStellaires"], function(values) {
+ getAttrs(["Science", "Analyse", "Art", "Connaissance1", "Connaissance2", "Connaissance3", "Esoterisme", "Histoire", "Ingenierie", "Medecine", "Navigation", "SciencesSolaires", "SciencesStellaires"], function(v) {
setAttrs({
- Analyse_max: +values.Science + +values.Analyse,
- Art_max: +values.Science + +values.Art,
- Connaissance1_max: +values.Science + +values.Connaissance1,
- Connaissance2_max: +values.Science + +values.Connaissance2,
- Connaissance3_max: +values.Science + +values.Connaissance3,
- Esoterisme_max: +values.Esoterisme > 0 ? +values.Science + +values.Esoterisme:0,
- Histoire_max: +values.Science + +values.Histoire,
- Ingenierie_max: +values.Ingenierie > 0 ? +values.Science + +values.Ingenierie:0,
- Medecine_max: +values.Medecine > 0 ? +values.Science + +values.Medecine:0,
- Navigation_max: +values.Science + +values.Navigation,
- SciencesSolaires_max: +values.SciencesSolaires > 0 ? +values.Science + +values.SciencesSolaires:0,
- SciencesStellaires_max: +values.SciencesStellaires > 0 ? +values.Science + +values.SciencesStellaires:0,
+ Analyse_max: +v.Science + +v.Analyse,
+ Art_max: +v.Science + +v.Art,
+ Connaissance1_max: +v.Science + +v.Connaissance1,
+ Connaissance2_max: +v.Science + +v.Connaissance2,
+ Connaissance3_max: +v.Science + +v.Connaissance3,
+ Esoterisme_max: +v.Esoterisme > 0 ? +v.Science + +v.Esoterisme:0,
+ Histoire_max: +v.Science + +v.Histoire,
+ Ingenierie_max: +v.Ingenierie > 0 ? +v.Science + +v.Ingenierie:0,
+ Medecine_max: +v.Medecine > 0 ? +v.Science + +v.Medecine:0,
+ Navigation_max: +v.Science + +v.Navigation,
+ SciencesSolaires_max: +v.SciencesSolaires > 0 ? +v.Science + +v.SciencesSolaires:0,
+ SciencesStellaires_max: +v.SciencesStellaires > 0 ? +v.Science + +v.SciencesStellaires:0,
});
});
});
on("change:Negociation change:Baration change:Bureaucratie change:Comedie change:Commerce change:Danse change:Eloquence change:Etiquette change:Jeux change:Seduction", function() {
- getAttrs(["Negociation", "Baration", "Bureaucratie", "Comedie", "Commerce", "Danse", "Eloquence", "Etiquette", "Jeux", "Seduction"], function(values) {
+ getAttrs(["Negociation", "Baration", "Bureaucratie", "Comedie", "Commerce", "Danse", "Eloquence", "Etiquette", "Jeux", "Seduction"], function(v) {
setAttrs({
- Baration_max: +values.Negociation + +values.Baration,
- Bureaucratie_max: +values.Negociation + +values.Bureaucratie,
- Comedie_max: +values.Negociation + +values.Comedie,
- Commerce_max: +values.Negociation + +values.Commerce,
- Danse_max: +values.Negociation + +values.Danse,
- Eloquence_max: +values.Negociation + +values.Eloquence,
- Etiquette_max: +values.Negociation + +values.Etiquette,
- Jeux_max: +values.Negociation + +values.Jeux,
- Seduction_max: +values.Negociation + +values.Seduction,
+ Baration_max: +v.Negociation + +v.Baration,
+ Bureaucratie_max: +v.Negociation + +v.Bureaucratie,
+ Comedie_max: +v.Negociation + +v.Comedie,
+ Commerce_max: +v.Negociation + +v.Commerce,
+ Danse_max: +v.Negociation + +v.Danse,
+ Eloquence_max: +v.Negociation + +v.Eloquence,
+ Etiquette_max: +v.Negociation + +v.Etiquette,
+ Jeux_max: +v.Negociation + +v.Jeux,
+ Seduction_max: +v.Negociation + +v.Seduction,
});
});
});
on("change:Trempe change:Commandement change:Demolition change:Determination change:Dressage change:Illegalites change:Intimidation change:Premierssoins change:Tactique change:Jeux change:Seduction", function() {
- getAttrs(["Trempe", "Commandement", "Demolition", "Determination", "Dressage", "Illegalites", "Intimidation", "Premierssoins", "Tactique", "Jeux", "Seduction"], function(values) {
+ getAttrs(["Trempe", "Commandement", "Demolition", "Determination", "Dressage", "Illegalites", "Intimidation", "Premierssoins", "Tactique", "Jeux", "Seduction"], function(v) {
setAttrs({
- Commandement_max: +values.Trempe + +values.Commandement,
- Demolition_max: +values.Demolition > 0 ? +values.Trempe + +values.Demolition:0,
- Determination_max: +values.Trempe + +values.Determination,
- Dressage_max: +values.Trempe + +values.Dressage,
- Illegalites_max: +values.Trempe + +values.Illegalites,
- Intimidation_max: +values.Trempe + +values.Intimidation,
- Premierssoins_max: +values.Trempe + +values.Premierssoins,
- Tactique_max: +values.Trempe + +values.Tactique,
+ Commandement_max: +v.Trempe + +v.Commandement,
+ Demolition_max: +v.Demolition > 0 ? +v.Trempe + +v.Demolition:0,
+ Determination_max: +v.Trempe + +v.Determination,
+ Dressage_max: +v.Trempe + +v.Dressage,
+ Illegalites_max: +v.Trempe + +v.Illegalites,
+ Intimidation_max: +v.Trempe + +v.Intimidation,
+ Premierssoins_max: +v.Trempe + +v.Premierssoins,
+ Tactique_max: +v.Trempe + +v.Tactique,
});
});
});
on("change:Trempe change:Survie", function() {
- getAttrs(["Trempe", "Survie"], function(values) {
+ getAttrs(["Trempe", "Survie"], function(v) {
setAttrs({
- Indemne_max: +values.Trempe + +values.Survie,
- BlesseLeger_max: +values.Trempe + +values.Survie,
- BlesseGrave_max: +values.Trempe + +values.Survie,
- Mort_max: +values.Trempe + +values.Survie,
+ Indemne_max: +v.Trempe + +v.Survie,
+ BlesseLeger_max: +v.Trempe + +v.Survie,
+ BlesseGrave_max: +v.Trempe + +v.Survie,
+ Mort_max: +v.Trempe + +v.Survie,
});
});
});
on("change:Espionnage change:Science", function() {
- getAttrs(["Espionnage", "Science", "EnergieX"], function(values) {
+ getAttrs(["Espionnage", "Science", "EnergieX"], function(v) {
setAttrs({
- EnergieX: Math.min( +values.EnergieX, +values.Espionnage + +values.Science),
- EnergieX_max: +values.Espionnage + +values.Science
+ EnergieX: Math.min( +v.EnergieX, +v.Espionnage + +v.Science),
+ EnergieX_max: +v.Espionnage + +v.Science
});
});
});
on("change:Gloire", function() {
- getAttrs(["Gloire", "GloireBonus"], function(values) {
+ getAttrs(["Gloire", "GloireBonus"], function(v) {
setAttrs({
- GloireBonus: Math.floor(+values.Gloire/2)
+ GloireBonus: Math.floor(+v.Gloire/2)
});
});
});
on("change:Experience_max", function() {
- getAttrs(["Experience", "Experience_max", "Experience_precedente"], function(values) {
+ getAttrs(["Experience", "Experience_max", "Experience_precedente"], function(v) {
setAttrs({
- Experience: +values.Experience + +values.Experience_max - +values.Experience_precedente,
- Experience_precedente: values.Experience_max,
+ Experience: +v.Experience + +v.Experience_max - +v.Experience_precedente,
+ Experience_precedente: v.Experience_max,
});
});
});
@@ -1158,68 +1158,109 @@ on("change:Experience_max", function() {
-on("change:pnjTechniquePointBase change:pnjTechniquePoint", function() {
- getAttrs(["pnjTechniquePointBase", "pnjTechniquePoint"], function(values) {
- setAttrs({
- pnjTechniquePoint_max: +values.pnjTechniquePointBase + +values.pnjTechniquePoint
- });
+on("change:pnjTechniquePointBase change:repeating_pnjTechnique", function() {
+ getSectionIDs("repeating_pnjTechnique", function(ids) {
+ _.each(ids, function(n) {
+ var section = "repeating_pnjTechnique_" + n + "_";
+ var name = section + "pnjTechniquePoint";
+ getAttrs(["pnjTechniquePointBase", name], function(v) {
+ var value = +v.pnjTechniquePointBase + +v[name];
+ var o = {};
+ o[section + "pnjTechniquePoint_max"] = value;
+ setAttrs(o);
+ });
+ });
});
});
-on("change:pnjSurviePointBase change:pnjSurviePoint", function() {
- getAttrs(["pnjSurviePointBase", "pnjSurviePoint"], function(values) {
- setAttrs({
- pnjSurviePoint_max: +values.pnjSurviePointBase + +values.pnjSurviePoint
- });
+on("change:pnjSurviePointBase change:repeating_pnjSurvie", function() {
+ getSectionIDs("repeating_pnjSurvie", function(ids) {
+ _.each(ids, function(n) {
+ var section = "repeating_pnjSurvie_" + n + "_";
+ var name = section + "pnjSurviePoint";
+ getAttrs(["pnjSurviePointBase", name], function(v) {
+ var value = +v.pnjSurviePointBase + +v[name];
+ var o = {};
+ o[section + "pnjSurviePoint_max"] = value;
+ setAttrs(o);
+ });
+ });
});
});
-on("change:pnjEspionnagePointBase change:pnjEspionnagePoint", function() {
- getAttrs(["pnjEspionnagePointBase", "pnjEspionnagePoint"], function(values) {
- setAttrs({
- pnjEspionnagePoint_max: +values.pnjEspionnagePointBase + +values.pnjEspionnagePoint
- });
+on("change:pnjEspionnagePointBase change:repeating_pnjEspionnage", function() {
+ getSectionIDs("repeating_pnjEspionnage", function(ids) {
+ _.each(ids, function(n) {
+ var section = "repeating_pnjEspionnage_" + n + "_";
+ var name = section + "pnjEspionnagePoint";
+ getAttrs(["pnjEspionnagePointBase", name], function(v) {
+ var value = +v.pnjEspionnagePointBase + +v[name];
+ var o = {};
+ o[section + "pnjEspionnagePoint_max"] = value;
+ setAttrs(o);
+ });
+ });
});
});
-on("change:pnjSciencesPointBase change:pnjSciencesPoint", function() {
- getAttrs(["pnjSciencesPointBase", "pnjSciencesPoint"], function(values) {
- setAttrs({
- pnjSciencesPoint_max: +values.pnjSciencesPointBase + +values.pnjSciencesPoint
- });
+on("change:pnjSciencesPointBase change:repeating_pnjSciences", function() {
+ getSectionIDs("repeating_pnjSciences", function(ids) {
+ _.each(ids, function(n) {
+ var section = "repeating_pnjSciences_" + n + "_";
+ var name = section + "pnjSciencesPoint";
+ getAttrs(["pnjSciencesPointBase", name], function(v) {
+ var value = +v.pnjSciencesPointBase + +v[name];
+ var o = {};
+ o[section + "pnjSciencesPoint_max"] = value;
+ setAttrs(o);
+ });
+ });
});
});
-on("change:pnjNegociationPointBase change:pnjNegociationPoint", function() {
- getAttrs(["pnjNegociationPointBase", "pnjNegociationPoint"], function(values) {
- setAttrs({
- pnjNegociationPoint_max: +values.pnjNegociationPointBase + +values.pnjNegociationPoint
- });
+on("change:pnjNegociationPointBase change:repeating_pnjNegociation", function() {
+ getSectionIDs("repeating_pnjNegociation", function(ids) {
+ _.each(ids, function(n) {
+ var section = "repeating_pnjNegociation_" + n + "_";
+ var name = section + "pnjNegociationPoint";
+ getAttrs(["pnjNegociationPointBase", name], function(v) {
+ var value = +v.pnjNegociationPointBase + +v[name];
+ var o = {};
+ o[section + "pnjNegociationPoint_max"] = value;
+ setAttrs(o);
+ });
+ });
});
});
-on("change:pnjTrempePointBase change:pnjTrempePoint", function() {
- getAttrs(["pnjTrempePointBase", "pnjTrempePoint"], function(values) {
- setAttrs({
- pnjTrempePoint_max: +values.pnjTrempePointBase + +values.pnjTrempePoint
- });
+on("change:pnjTrempePointBase change:repeating_pnjTrempe", function() {
+ getSectionIDs("repeating_pnjTrempe", function(ids) {
+ _.each(ids, function(n) {
+ var section = "repeating_pnjTrempe_" + n + "_";
+ var name = section + "pnjTrempePoint";
+ getAttrs(["pnjTrempePointBase", name], function(v) {
+ var value = +v.pnjTrempePointBase + +v[name];
+ var o = {};
+ o[section + "pnjTrempePoint_max"] = value;
+ setAttrs(o);
+ });
+ });
});
});
on("change:pnjTrempePointBase change:pnjSurviePointBase change:repeating_pnjSante", function() {
- getSectionIDs("repeating_pnjSante", function(idarray) {
- _.each(idarray, function(pid) {
- var section = "repeating_pnjSante_" + pid;
- getAttrs(["pnjTrempePointBase", "pnjSurviePointBase"], function(values) {
- var value = +values.pnjTrempePointBase + +values.pnjSurviePointBase;
+ getSectionIDs("repeating_pnjSante", function(ids) {
+ _.each(ids, function(n) {
+ var section = "repeating_pnjSante_" + n;
+ getAttrs(["pnjTrempePointBase", "pnjSurviePointBase"], function(v) {
+ var value = +v.pnjTrempePointBase + +v.pnjSurviePointBase;
- var obj = {};
- obj[section+"_pnjIndemne_max"] = value;
- obj[section+"_pnjBlesseLeger_max"] = value;
- obj[section+"_pnjBlesseGrave_max"] = value;
- obj[section+"_pnjMort_max"] = value;
-
- setAttrs(obj);
+ var o = {};
+ o[section + "_pnjIndemne_max"] = value;
+ o[section + "_pnjBlesseLeger_max"] = value;
+ o[section + "_pnjBlesseGrave_max"] = value;
+ o[section + "_pnjMort_max"] = value;
+ setAttrs(o);
});
});
});