diff --git a/Cyberpunk 2k20/Cyberpunk 2k20.html b/Cyberpunk 2k20/Cyberpunk 2k20.html index 260637faa5..c20aad2abf 100644 --- a/Cyberpunk 2k20/Cyberpunk 2k20.html +++ b/Cyberpunk 2k20/Cyberpunk 2k20.html @@ -10,7 +10,7 @@ SNS: -
Use Saturday Night Skuffle combat system (Cybergeneration combat system).
+
Use Saturday Night Scuffle combat system (Cybergeneration combat system).
FNFF:
Use Friday Night Fire Fight combat system (Cyberpunk 2020 combat system).
@@ -90,7 +90,7 @@
- +
@@ -268,7 +268,7 @@
- +
@@ -446,7 +446,7 @@
- +
@@ -696,28 +696,28 @@
- +

NPC Character Sheet

- + - +
- + - +
- + - +
@@ -761,7 +761,7 @@
- @@ -815,9 +815,9 @@
@@ -825,7 +825,7 @@
- +
Attr.
@@ -863,7 +863,7 @@
Concept:
-
Sexe:
+
Sex:
Male: @@ -902,16 +902,16 @@
- + - +
- + - +
@@ -921,10 +921,10 @@
- + - +
@@ -984,7 +984,7 @@
- @@ -1043,12 +1043,12 @@
- - +
 Weapons -  Gears -  Cybers +  Gear +  Cyber  Vehicles  Deck @@ -1443,20 +1443,20 @@
  @@ -1688,9 +1688,9 @@ - + - + Ammo type: @@ -1764,9 +1764,9 @@ - + - + Ammo type: @@ -2010,7 +2010,7 @@
- +
@@ -2163,7 +2163,7 @@
- Value Must : + Value Most :
@@ -2300,16 +2300,16 @@

Journal

-

+

- +

Relations

-

Familly

+

Family

@@ -2364,9 +2364,9 @@ - - - + + +
@@ -2375,7 +2375,7 @@ - + @@ -2452,7 +2452,7 @@ - +
@@ -2532,11 +2532,11 @@
@@ -2545,7 +2545,7 @@ - + @@ -2553,7 +2553,7 @@
Description : - +
@@ -2577,7 +2577,7 @@
Location :
Can do for you :
Ability :
-
Connexion :
+
Connection :

@@ -2613,7 +2613,7 @@

- The average service price depend from NPC ability and NPC connexion. + The average service price depend from NPC ability and NPC connection.

Ability : @@ -2626,15 +2626,15 @@
- Connexion : + Connection :
@@ -2665,7 +2665,7 @@
Type house :
- Appartment + Apartment ( 200€$ per room / per month )
@@ -2689,7 +2689,7 @@
- Adress : + Address :
Rent ? @@ -2722,10 +2722,10 @@

Notes

-

+

- +
@@ -5223,9 +5223,9 @@ var TAS = TAS || (function(){ var currentHp = parseInt(v.FSN_hp); var maxHp = parseInt(v.FSN_hp_max); var s = parseInt(v.FSN_cyborg); - var refpenality = 0; - var intpenality = 0; - var coolpenality = 0; + var refpenalty = 0; + var intpenalty = 0; + var coolpenalty = 0; var ref = parseInt(v.ref); var int = parseInt(v.int); var cool = parseInt(v.cool); @@ -5243,26 +5243,26 @@ var TAS = TAS || (function(){ } if (currentHp < seuil1 + 1 ) { status = "Serious Wound"; - refpenality = 2; + refpenalty = 2; } if (currentHp < seuil2 + 1 ) { status = "Critical Wound"; - refpenality = Math.floor(ref/2); - intpenality = Math.floor(int/2); - coolpenality = Math.floor(cool/2); + refpenalty = Math.floor(ref/2); + intpenalty = Math.floor(int/2); + coolpenalty = Math.floor(cool/2); } if (currentHp < 1 ) { status = "Mortal Wound"; - refpenality = Math.floor((ref * 2)/3); - intpenality = Math.floor((int * 2)/3); - coolpenality = Math.floor((cool * 2)/3); + refpenalty = Math.floor((ref * 2)/3); + intpenalty = Math.floor((int * 2)/3); + coolpenalty = Math.floor((cool * 2)/3); } if (currentHp < -3 ) { status = "Dead !"; - refpenality = Math.floor((ref * 2)/3); - intpenality = Math.floor((int * 2)/3); - coolpenality = Math.floor((cool * 2)/3); + refpenalty = Math.floor((ref * 2)/3); + intpenalty = Math.floor((int * 2)/3); + coolpenalty = Math.floor((cool * 2)/3); } } else { if (currentHp < 1 ) { @@ -5273,9 +5273,9 @@ var TAS = TAS || (function(){ } setAttrs({ FSN_status : status, - refpenality : refpenality, - intpenality : intpenality, - coolpenality : coolpenality + refpenalty : refpenalty, + intpenalty : intpenalty, + coolpenalty : coolpenalty }); }); @@ -5294,10 +5294,10 @@ var TAS = TAS || (function(){ injury = parseInt(values.injury); var stun = 0; var status = 0; - var mortel = 0; - var refpenality = 0; - var intpenality = 0; - var coolpenality = 0; + var mortal = 0; + var refpenalty = 0; + var intpenalty = 0; + var coolpenalty = 0; var ref = parseInt(values.ref); var int = parseInt(values.int); var cool = parseInt(values.cool); @@ -5310,63 +5310,63 @@ var TAS = TAS || (function(){ } else if ( 9 > injury ) { status = 'Serious'; stun = -1 ; - refpenality = 2; + refpenalty = 2; text = 'Ref -2'; } else if ( 13 > injury ) { - status = 'Critique'; + status = 'Critical'; stun = -2 ; - refpenality = Math.floor(ref/2); - intpenality = Math.floor(int/2); - coolpenality = Math.floor(cool/2); + refpenalty = Math.floor(ref/2); + intpenalty = Math.floor(int/2); + coolpenalty = Math.floor(cool/2); text = 'Ref, Int, Cool /2 (round up)' } else if ( 17 > injury ) { - status = 'Mortel0'; + status = 'Mortal0'; stun = -3 ; - refpenality = Math.floor((ref * 2)/3); - intpenality = Math.floor((int * 2)/3); - coolpenality = Math.floor((cool * 2)/3); + refpenalty = Math.floor((ref * 2)/3); + intpenalty = Math.floor((int * 2)/3); + coolpenalty = Math.floor((cool * 2)/3); } else if ( 21 > injury ) { - status = 'Mortel1'; + status = 'Mortal1'; stun = -4 ; - mortel = 1; - refpenality = Math.floor((ref * 2)/3); - intpenality = Math.floor((int * 2)/3); - coolpenality = Math.floor((cool * 2)/3); + mortal = 1; + refpenalty = Math.floor((ref * 2)/3); + intpenalty = Math.floor((int * 2)/3); + coolpenalty = Math.floor((cool * 2)/3); } else if ( 25 > injury ) { - status = 'Mortel2'; + status = 'Mortal2'; stun = -5 ; - mortel = 2; - refpenality = Math.floor((ref * 2)/3); - intpenality = Math.floor((int * 2)/3); - coolpenality = Math.floor((cool * 2)/3); + mortal = 2; + refpenalty = Math.floor((ref * 2)/3); + intpenalty = Math.floor((int * 2)/3); + coolpenalty = Math.floor((cool * 2)/3); } else if ( 29 > injury ) { - status = 'Mortel3'; + status = 'Mortal3'; stun = -6 ; - mortel = 3; - refpenality = Math.floor((ref * 2)/3); - intpenality = Math.floor((int * 2)/3); - coolpenality = Math.floor((cool * 2)/3); + mortal = 3; + refpenalty = Math.floor((ref * 2)/3); + intpenalty = Math.floor((int * 2)/3); + coolpenalty = Math.floor((cool * 2)/3); } else if ( 33 > injury ) { - status = 'Mortel4'; + status = 'Mortal4'; stun = -7 ; - mortel = 4; - refpenality = Math.floor((ref * 2)/3); - intpenality = Math.floor((int * 2)/3); - coolpenality = Math.floor((cool * 2)/3); + mortal = 4; + refpenalty = Math.floor((ref * 2)/3); + intpenalty = Math.floor((int * 2)/3); + coolpenalty = Math.floor((cool * 2)/3); } else if ( 37 > injury ) { - status = 'Mortel5'; + status = 'Mortal5'; stun = -8 ; - mortel = 5; - refpenality = Math.floor((ref * 2)/3); - intpenality = Math.floor((int * 2)/3); - coolpenality = Math.floor((cool * 2)/3); + mortal = 5; + refpenalty = Math.floor((ref * 2)/3); + intpenalty = Math.floor((int * 2)/3); + coolpenalty = Math.floor((cool * 2)/3); } else if ( 41 > injury ) { - status = 'Mortel6'; + status = 'Mortal6'; stun = -9 ; - mortel = 6; - refpenality = Math.floor((ref * 2)/3); - intpenality = Math.floor((int * 2)/3); - coolpenality = Math.floor((cool * 2)/3); + mortal = 6; + refpenalty = Math.floor((ref * 2)/3); + intpenalty = Math.floor((int * 2)/3); + coolpenalty = Math.floor((cool * 2)/3); } else { status = 'Dead...'; } @@ -5374,18 +5374,18 @@ var TAS = TAS || (function(){ if (saveStunValue < 0 ){ saveStunValue = 0; } - var saveDeathValue = parseInt(values.body) + parseInt(values.saveD) - mortel; + var saveDeathValue = parseInt(values.body) + parseInt(values.saveD) - mortal; if (saveDeathValue < 0 ) { saveDeathValue = 0; } setAttrs({ status : status, - stunPenality : stun, + stunpenalty : stun, saveStun: saveStunValue, saveDeath: saveDeathValue, - refpenality : refpenality, - intpenality : intpenality, - coolpenality : coolpenality + refpenalty : refpenalty, + intpenalty : intpenalty, + coolpenalty : coolpenalty }); }); }); @@ -5398,8 +5398,8 @@ var TAS = TAS || (function(){ setAttrs({ attrPoints : total, luckMax : values.luck, - run : (parseInt(values.ma) * 5) + parseInt(values.runBonus), - leap : Math.ceil(parseInt(values.ma) / 4) + parseInt(values.leapBonus), + run : (parseInt(values.ma) * 3) + parseInt(values.runBonus), + leap : Math.ceil(parseInt(values.ma) * 3 / 4) + parseInt(values.leapBonus), }); }); }); @@ -5492,159 +5492,159 @@ var TAS = TAS || (function(){ ], function (values) { if ( values.class == 'Solo') { var skills = { - speciality : 'Sens du combat', - specialityAttr : "@{ref} - @{refpenality} - @{enc}", + specialty : 'Combat Sense', + specialtyAttr : "@{ref} - @{refpenalty} - @{enc}", sk1 : "Handgun", - sk1Attr : "@{ref} - @{refpenality} - @{enc}", + sk1Attr : "@{ref} - @{refpenalty} - @{enc}", sk2 : "Melee", - sk2Attr : "@{ref} - @{refpenality} - @{enc}", + sk2Attr : "@{ref} - @{refpenalty} - @{enc}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Martial Art", - sk4Attr : "@{ref} - @{refpenality} - @{enc}", + sk4Attr : "@{ref} - @{refpenalty} - @{enc}", sk5 : "Weapons Tech", sk5Attr : "@{tech}", sk6 : "Rifle", - sk6Attr : "@{ref} - @{refpenality} - @{enc}", + sk6Attr : "@{ref} - @{refpenalty} - @{enc}", sk7 : "Athletics", - sk7Attr : "@{ref} - @{refpenality} - @{enc}", + sk7Attr : "@{ref} - @{refpenalty} - @{enc}", sk8 : "Submachinegun", - sk8Attr : "@{ref} - @{refpenality} - @{enc}", + sk8Attr : "@{ref} - @{refpenalty} - @{enc}", sk9 : "Stealth", - sk9Attr : "@{ref} - @{refpenality} - @{enc}", + sk9Attr : "@{ref} - @{refpenalty} - @{enc}", }; } else if ( values.class == 'Cop') { var skills = { - speciality : 'Authority', - specialityAttr : "@{cool} - @{coolpenality}", + specialty : 'Authority', + specialtyAttr : "@{cool} - @{coolpenalty}", sk1 : "Handgun", - sk1Attr : "@{ref} - @{refpenality} - @{enc}", + sk1Attr : "@{ref} - @{refpenalty} - @{enc}", sk2 : "Melee", - sk2Attr : "@{ref} - @{refpenality} - @{enc}", + sk2Attr : "@{ref} - @{refpenalty} - @{enc}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Brawling", - sk4Attr : "@{ref} - @{refpenality} - @{enc}", + sk4Attr : "@{ref} - @{refpenalty} - @{enc}", sk5 : "Streetwise", - sk5Attr : "@{cool} - @{coolpenality}", + sk5Attr : "@{cool} - @{coolpenalty}", sk6 : "Interrogation", - sk6Attr : "@{cool} - @{coolpenality}", + sk6Attr : "@{cool} - @{coolpenalty}", sk7 : "Athletics", - sk7Attr : "@{ref} - @{refpenality} - @{enc}", + sk7Attr : "@{ref} - @{refpenalty} - @{enc}", sk8 : "Human Perception", sk8Attr : "@{emp}", sk9 : "Education", - sk9Attr : "@{int} - @{intpenality}", + sk9Attr : "@{int} - @{intpenalty}", }; } else if ( values.class == 'Corp') { var skills = { - speciality : 'Ressources', - specialityAttr : "@{int} - @{intpenality}", + specialty : 'Resources', + specialtyAttr : "@{int} - @{intpenalty}", sk1 : "Persuasion", sk1Attr : "@{emp}", sk2 : "Stock Market", - sk2Attr : "@{int} - @{intpenality}", + sk2Attr : "@{int} - @{intpenalty}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Wardrobe & Style", sk4Attr : "@{attr}", sk5 : "Social", sk5Attr : "@{emp}", - sk6 : "Personnal Grooming", + sk6 : "Personal Grooming", sk6Attr : "@{attr}", sk7 : "Library Search", - sk7Attr : "@{int} - @{intpenality}", + sk7Attr : "@{int} - @{intpenalty}", sk8 : "Human Perception", sk8Attr : "@{emp}", sk9 : "Education", - sk9Attr : "@{int} - @{intpenality}", + sk9Attr : "@{int} - @{intpenalty}", }; } else if ( values.class == 'Media') { var skills = { - speciality : 'Credibility', - specialityAttr : "@{int} - @{intpenality}", + specialty : 'Credibility', + specialtyAttr : "@{int} - @{intpenalty}", sk1 : "Persuasion", sk1Attr : "@{emp}", sk2 : "interview", sk2Attr : "@{emp}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Composition", - sk4Attr : "@{int} - @{intpenality}", + sk4Attr : "@{int} - @{intpenalty}", sk5 : "Social", sk5Attr : "@{emp}", sk6 : "Streetwise", - sk6Attr : "@{cool} - @{coolpenality}", + sk6Attr : "@{cool} - @{coolpenalty}", sk7 : "Human Perception", sk7Attr : "@{emp}", sk8 : "Photo & Film", sk8Attr : "@{tech}", sk9 : "Education", - sk9Attr : "@{int} - @{intpenality}", + sk9Attr : "@{int} - @{intpenalty}", }; } else if ( values.class == 'Fixer') { var skills = { - speciality : 'Streetdeal', - specialityAttr : "@{cool} - @{coolpenality}", + specialty : 'Streetdeal', + specialtyAttr : "@{cool} - @{coolpenalty}", sk1 : "Persuasion", sk1Attr : "@{emp}", sk2 : "Forgery", sk2Attr : "@{tech}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Handgun", - sk4Attr : "@{ref} - @{refpenality} - @{enc}", + sk4Attr : "@{ref} - @{refpenalty} - @{enc}", sk5 : "Melee", - sk5Attr : "@{ref} - @{refpenality} - @{enc}", + sk5Attr : "@{ref} - @{refpenalty} - @{enc}", sk6 : "Brawling", - sk6Attr : "@{ref} - @{refpenality} - @{enc}", + sk6Attr : "@{ref} - @{refpenalty} - @{enc}", sk7 : "Pick Lock", sk7Attr : "@{tech}", sk8 : "Pick Pocket", sk8Attr : "@{tech}", sk9 : "Intimidate", - sk9Attr : "@{cool} - @{coolpenality}", + sk9Attr : "@{cool} - @{coolpenalty}", }; } else if ( values.class == 'Rockerboy/girl') { var skills = { - speciality : 'Charismatic Leadership', - specialityAttr : "@{emp}", + specialty : 'Charismatic Leadership', + specialtyAttr : "@{emp}", sk1 : "Persuasion", sk1Attr : "@{emp}", sk2 : "Composition", - sk2Attr : "@{int} - @{intpenality}", + sk2Attr : "@{int} - @{intpenalty}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Seduction", sk4Attr : "@{attr}", sk5 : "Wardrobe & Style", sk5Attr : "@{attr}", sk6 : "Brawling", - sk6Attr : "@{ref} - @{refpenality} - @{enc}", + sk6Attr : "@{ref} - @{refpenalty} - @{enc}", sk7 : "Play Instrument", sk7Attr : "@{tech}", sk8 : "Streewise", - sk8Attr : "@{cool} - @{coolpenality}", + sk8Attr : "@{cool} - @{coolpenalty}", sk9 : "Perform", sk9Attr : "@{emp}", }; } else if ( values.class == 'Techie') { var skills = { - speciality : 'Jury Rig', - specialityAttr : "@{tech}", + specialty : 'Jury Rig', + specialtyAttr : "@{tech}", sk1 : "Basic Tech", sk1Attr : "@{tech}", sk2 : "Cybertech", sk2Attr : "@{tech}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Education", - sk4Attr : "@{int} - @{intpenality}", + sk4Attr : "@{int} - @{intpenalty}", sk5 : "Teaching", - sk5Attr : "@{int} - @{intpenality}", + sk5Attr : "@{int} - @{intpenalty}", sk6 : "Electronics", sk6Attr : "@{tech}", - sk7 : "Elect. Security", + sk7 : "Electronic Security", sk7Attr : "@{tech}", sk8 : "Weapon Tech", sk8Attr : "@{tech}", @@ -5653,175 +5653,175 @@ var TAS = TAS || (function(){ }; } else if ( values.class == 'Nomad') { var skills = { - speciality : 'Family', - specialityAttr : "@{int} - @{intpenality}", + specialty : 'Family', + specialtyAttr : "@{int} - @{intpenalty}", sk1 : "Basic Tech", sk1Attr : "@{tech}", sk2 : "Endurance", sk2Attr : "@{body}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Rifle", - sk4Attr : "@{ref} - @{refpenality} - @{enc}", + sk4Attr : "@{ref} - @{refpenalty} - @{enc}", sk5 : "Drive", - sk5Attr : "@{ref} - @{refpenality} - @{enc}", + sk5Attr : "@{ref} - @{refpenalty} - @{enc}", sk6 : "Wilderness Survival", - sk6Attr : "@{int} - @{intpenality}", + sk6Attr : "@{int} - @{intpenalty}", sk7 : "Brawling", - sk7Attr : "@{ref} - @{refpenality} - @{enc}", + sk7Attr : "@{ref} - @{refpenalty} - @{enc}", sk8 : "Athletics", - sk8Attr : "@{ref} - @{refpenality} - @{enc}", + sk8Attr : "@{ref} - @{refpenalty} - @{enc}", sk9 : "Melee", - sk9Attr : "@{ref} - @{refpenality} - @{enc}", + sk9Attr : "@{ref} - @{refpenalty} - @{enc}", }; } else if ( values.class == 'Netrunner') { var skills = { - speciality : 'Interface', - specialityAttr : "@{int} - @{intpenality}", + specialty : 'Interface', + specialtyAttr : "@{int} - @{intpenalty}", sk1 : "Basic Tech", sk1Attr : "@{tech}", sk2 : "Education", - sk2Attr : "@{int} - @{intpenality}", + sk2Attr : "@{int} - @{intpenalty}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "System Knowledge", - sk4Attr : "@{int} - @{intpenality}", + sk4Attr : "@{int} - @{intpenalty}", sk5 : "Cybertech", sk5Attr : "@{tech}", sk6 : "Cyberdeck Design", - sk6Attr : "@{int} - @{intpenality}", - sk7 : "programming", - sk7Attr : "@{int} - @{intpenality}", + sk6Attr : "@{int} - @{intpenalty}", + sk7 : "Programming", + sk7Attr : "@{int} - @{intpenalty}", sk8 : "Electronics", sk8Attr : "@{tech}", sk9 : "Composition", - sk9Attr : "@{int} - @{intpenality}", + sk9Attr : "@{int} - @{intpenalty}", }; } else if ( values.class == 'Medtech') { var skills = { - speciality : 'Medical Tech', - specialityAttr : "@{int} - @{intpenality}", + specialty : 'Medical Tech', + specialtyAttr : "@{int} - @{intpenalty}", sk1 : "Basic Tech", sk1Attr : "@{tech}", sk2 : "Education", - sk2Attr : "@{int} - @{intpenality}", + sk2Attr : "@{int} - @{intpenalty}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Pharmaceuticals", - sk4Attr : "@{int} - @{intpenality}", - sk5 : "Zoologie", - sk5Attr : "@{int} - @{intpenality}", + sk4Attr : "@{int} - @{intpenalty}", + sk5 : "Zoology", + sk5Attr : "@{int} - @{intpenalty}", sk6 : "Cryotank Operation", sk6Attr : "@{tech}", sk7 : "Human Perception", sk7Attr : "@{emp}", sk8 : "Diagnose", - sk8Attr : "@{int} - @{intpenality}", + sk8Attr : "@{int} - @{intpenalty}", sk9 : "Library Search", - sk9Attr : "@{int} - @{intpenality}", + sk9Attr : "@{int} - @{intpenalty}", }; } else if ( values.class == 'Covert Mission Spe') { var skills = { - speciality : 'Combat Sneak', - specialityAttr : "@{ref} - @{refpenality} - @{enc}", + specialty : 'Combat Sneak', + specialtyAttr : "@{ref} - @{refpenalty} - @{enc}", sk1 : "Handgun", - sk1Attr : "@{ref} - @{refpenality} - @{enc}", + sk1Attr : "@{ref} - @{refpenalty} - @{enc}", sk2 : "Athelics", - sk2Attr : "@{ref} - @{refpenality} - @{enc}", + sk2Attr : "@{ref} - @{refpenalty} - @{enc}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Stealth", - sk4Attr : "@{ref} - @{refpenality} - @{enc}", - sk5 : "Personnal Grooming", + sk4Attr : "@{ref} - @{refpenalty} - @{enc}", + sk5 : "Personal Grooming", sk5Attr : "@{attr}", sk6 : "Martial Art", - sk6Attr : "@{ref} - @{refpenality} - @{enc}", + sk6Attr : "@{ref} - @{refpenalty} - @{enc}", sk7 : "Human Perception", sk7Attr : "@{emp}", sk8 : "Melee", - sk8Attr : "@{ref} - @{refpenality} - @{enc}", + sk8Attr : "@{ref} - @{refpenalty} - @{enc}", sk9 : "Persuasion/Fast talk", sk9Attr : "@{emp}", }; } else if ( values.class == 'Panzerboy') { var skills = { - speciality : 'Vehicle zen', - specialityAttr : "@{ref} - @{refpenality} - @{enc}", + specialty : 'Vehicle Zen', + specialtyAttr : "@{ref} - @{refpenalty} - @{enc}", sk1 : "Handgun", - sk1Attr : "@{ref} - @{refpenality} - @{enc}", + sk1Attr : "@{ref} - @{refpenalty} - @{enc}", sk2 : "Brawling", - sk2Attr : "@{ref} - @{refpenality} - @{enc}", + sk2Attr : "@{ref} - @{refpenalty} - @{enc}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Driving", - sk4Attr : "@{ref} - @{refpenality} - @{enc}", + sk4Attr : "@{ref} - @{refpenalty} - @{enc}", sk5 : "Basic Tech", sk5Attr : "@{tech}", sk6 : "Motorcycle", - sk6Attr : "@{ref} - @{refpenality} - @{enc}", - sk7 : "Operate Hvy Machinery", - sk7Attr : "@{ref} - @{refpenality} - @{enc}", - sk8 : "Heavy weapons", - sk8Attr : "@{ref} - @{refpenality} - @{enc}", - sk9 : "Expert:Navigation", - sk9Attr : "@{int} - @{intpenality}", + sk6Attr : "@{ref} - @{refpenalty} - @{enc}", + sk7 : "Operate Heavy Machinery", + sk7Attr : "@{ref} - @{refpenalty} - @{enc}", + sk8 : "Heavy Weapons", + sk8Attr : "@{ref} - @{refpenalty} - @{enc}", + sk9 : "Expert: Navigation", + sk9Attr : "@{int} - @{intpenalty}", }; } else if ( values.class == 'Aerojock') { var skills = { - speciality : 'Aircraft Sense', - specialityAttr : "@{ref} - @{refpenality} - @{enc}", + specialty : 'Aircraft Sense', + specialtyAttr : "@{ref} - @{refpenalty} - @{enc}", sk1 : "Handgun", - sk1Attr : "@{ref} - @{refpenality} - @{enc}", + sk1Attr : "@{ref} - @{refpenalty} - @{enc}", sk2 : "Brawling", - sk2Attr : "@{ref} - @{refpenality} - @{enc}", + sk2Attr : "@{ref} - @{refpenalty} - @{enc}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Gyro", - sk4Attr : "@{ref} - @{refpenality} - @{enc}", + sk4Attr : "@{ref} - @{refpenalty} - @{enc}", sk5 : "Basic Tech", sk5Attr : "@{tech}", sk6 : "Fixed Wing", - sk6Attr : "@{ref} - @{refpenality} - @{enc}", + sk6Attr : "@{ref} - @{refpenalty} - @{enc}", sk7 : "Vectored", - sk7Attr : "@{ref} - @{refpenality} - @{enc}", + sk7Attr : "@{ref} - @{refpenalty} - @{enc}", sk8 : "Heavy weapons", - sk8Attr : "@{ref} - @{refpenality} - @{enc}", - sk9 : "Expert:Navigation", - sk9Attr : "@{int} - @{intpenality}", + sk8Attr : "@{ref} - @{refpenalty} - @{enc}", + sk9 : "Expert: Navigation", + sk9Attr : "@{int} - @{intpenalty}", }; } else if ( values.class == 'Prowler') { var skills = { - speciality : 'Sneak', - specialityAttr : "@{ref} - @{refpenality} - @{enc}", + specialty : 'Sneak', + specialtyAttr : "@{ref} - @{refpenalty} - @{enc}", sk1 : "Handgun", - sk1Attr : "@{ref} - @{refpenality} - @{enc}", + sk1Attr : "@{ref} - @{refpenalty} - @{enc}", sk2 : "Brawling", - sk2Attr : "@{ref} - @{refpenality} - @{enc}", + sk2Attr : "@{ref} - @{refpenalty} - @{enc}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Athletics", - sk4Attr : "@{ref} - @{refpenality} - @{enc}", + sk4Attr : "@{ref} - @{refpenalty} - @{enc}", sk5 : "Electronic Security", sk5Attr : "@{tech}", sk6 : "Stealth", - sk6Attr : "@{ref} - @{refpenality} - @{enc}", + sk6Attr : "@{ref} - @{refpenalty} - @{enc}", sk7 : "Disguise", sk7Attr : "@{tech}", sk8 : "Pick Lock", sk8Attr : "@{tech}", - sk9 : "Hide/evade", - sk9Attr : "@{int} - @{intpenality}", + sk9 : "Hide/Evade", + sk9Attr : "@{int} - @{intpenalty}", }; } else if ( values.class == 'Con Man') { var skills = { - speciality : 'Con', - specialityAttr : "@{cool} - @{coolpenality}", + specialty : 'Con', + specialtyAttr : "@{cool} - @{coolpenalty}", sk1 : "Streetwise", - sk1Attr : "@{cool} - @{coolpenality}", + sk1Attr : "@{cool} - @{coolpenalty}", sk2 : "Gamble", sk2Attr : "@{tech}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Seduction", sk4Attr : "@{emp}", sk5 : "Forgery", @@ -5830,116 +5830,116 @@ var TAS = TAS || (function(){ sk6Attr : "@{emp}", sk7 : "Disguise", sk7Attr : "@{tech}", - sk8 : "Persuasion/Fasttalk", + sk8 : "Persuasion/Fast Talk", sk8Attr : "@{emp}", - sk9 : "Hide/evade", - sk9Attr : "@{int} - @{intpenality}", + sk9 : "Hide/Evade", + sk9Attr : "@{int} - @{intpenalty}", }; } else if ( values.class == 'Dancer/Prostitute') { var skills = { - speciality : 'Vamp', - specialityAttr : "@{cool} - @{coolpenality}", + specialty : 'Vamp', + specialtyAttr : "@{cool} - @{coolpenalty}", sk1 : "Streetwise", - sk1Attr : "@{cool} - @{coolpenality}", + sk1Attr : "@{cool} - @{coolpenalty}", sk2 : "Wardrobe & Style", sk2Attr : "@{attr}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Seduction", sk4Attr : "@{emp}", - sk5 : "Personnal Grooming", + sk5 : "Personal Grooming", sk5Attr : "@{attr}", sk6 : "Human Perception", sk6Attr : "@{emp}", sk7 : "Perform", sk7Attr : "@{emp}", - sk8 : "Persuasion/Fasttalk", + sk8 : "Persuasion/Fast Talk", sk8Attr : "@{emp}", sk9 : "Endurance", sk9Attr : "@{body}", }; } else if ( values.class == 'Runner') { var skills = { - speciality : 'Vehicle zen', - specialityAttr : "@{ref} - @{refpenality} - @{enc}", + specialty : 'Vehicle Zen', + specialtyAttr : "@{ref} - @{refpenalty} - @{enc}", sk1 : "Handgun", - sk1Attr : "@{ref} - @{refpenality} - @{enc}", + sk1Attr : "@{ref} - @{refpenalty} - @{enc}", sk2 : "Brawling", - sk2Attr : "@{ref} - @{refpenality} - @{enc}", + sk2Attr : "@{ref} - @{refpenalty} - @{enc}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Driving", - sk4Attr : "@{ref} - @{refpenality} - @{enc}", + sk4Attr : "@{ref} - @{refpenalty} - @{enc}", sk5 : "Basic Tech", sk5Attr : "@{tech}", sk6 : "Motorcycle", - sk6Attr : "@{ref} - @{refpenality} - @{enc}", + sk6Attr : "@{ref} - @{refpenalty} - @{enc}", sk7 : "Hide/Evade", - sk7Attr : "@{int} - @{intpenality}", + sk7Attr : "@{int} - @{intpenalty}", sk8 : "Athletics", - sk8Attr : "@{ref} - @{refpenality} - @{enc}", + sk8Attr : "@{ref} - @{refpenalty} - @{enc}", sk9 : "Streetwise", - sk9Attr : "@{cool} - @{coolpenality}", + sk9Attr : "@{cool} - @{coolpenalty}", }; } else if ( values.class == 'Nomad Warrior') { var skills = { - speciality : 'Warpath', - specialityAttr : "@{ref} - @{refpenality} - @{enc}", + specialty : 'Warpath', + specialtyAttr : "@{ref} - @{refpenalty} - @{enc}", sk1 : "Handgun", - sk1Attr : "@{ref} - @{refpenality} - @{enc}", + sk1Attr : "@{ref} - @{refpenalty} - @{enc}", sk2 : "Brawling", - sk2Attr : "@{ref} - @{refpenality} - @{enc}", + sk2Attr : "@{ref} - @{refpenalty} - @{enc}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Melee", - sk4Attr : "@{ref} - @{refpenality} - @{enc}", + sk4Attr : "@{ref} - @{refpenalty} - @{enc}", sk5 : "Endurance", sk5Attr : "@{body}", sk6 : "Motorcycle", - sk6Attr : "@{ref} - @{refpenality} - @{enc}", + sk6Attr : "@{ref} - @{refpenalty} - @{enc}", sk7 : "Wilderness Survival", - sk7Attr : "@{int} - @{intpenality}", + sk7Attr : "@{int} - @{intpenalty}", sk8 : "Athletics", - sk8Attr : "@{ref} - @{refpenality} - @{enc}", + sk8Attr : "@{ref} - @{refpenalty} - @{enc}", sk9 : "Basic Tech", sk9Attr : "@{tech}", }; } else if ( values.class == 'Assassin') { var skills = { - speciality : 'Combat Sneak', - specialityAttr : "@{ref} - @{refpenality} - @{enc}", + specialty : 'Combat Sneak', + specialtyAttr : "@{ref} - @{refpenalty} - @{enc}", sk1 : "Handgun", - sk1Attr : "@{ref} - @{refpenality} - @{enc}", + sk1Attr : "@{ref} - @{refpenalty} - @{enc}", sk2 : "Athelics", - sk2Attr : "@{ref} - @{refpenality} - @{enc}", + sk2Attr : "@{ref} - @{refpenalty} - @{enc}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Stealth", - sk4Attr : "@{ref} - @{refpenality} - @{enc}", + sk4Attr : "@{ref} - @{refpenalty} - @{enc}", sk5 : "Hide/Evade", - sk5Attr : "@{int} - @{intpenality}", + sk5Attr : "@{int} - @{intpenalty}", sk6 : "Martial Art", - sk6Attr : "@{ref} - @{refpenality} - @{enc}", + sk6Attr : "@{ref} - @{refpenalty} - @{enc}", sk7 : "Rifle", - sk7Attr : "@{ref} - @{refpenality} - @{enc}", + sk7Attr : "@{ref} - @{refpenalty} - @{enc}", sk8 : "Melee", - sk8Attr : "@{ref} - @{refpenality} - @{enc}", + sk8Attr : "@{ref} - @{refpenalty} - @{enc}", sk9 : "Endurance", sk9Attr : "@{body}", }; } else if ( values.class == 'Model/Actress') { var skills = { - speciality : 'Pose', - specialityAttr : "@{attr}", + specialty : 'Pose', + specialtyAttr : "@{attr}", sk1 : "Education", - sk1Attr : "@{int} - @{intpenality}", + sk1Attr : "@{int} - @{intpenalty}", sk2 : "Wardrobe & Style", sk2Attr : "@{attr}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Seduction", sk4Attr : "@{emp}", - sk5 : "Personnal Grooming", + sk5 : "Personal Grooming", sk5Attr : "@{attr}", sk6 : "Human Perception", sk6Attr : "@{emp}", @@ -5952,54 +5952,54 @@ var TAS = TAS || (function(){ }; } else if ( values.class == 'Politician') { var skills = { - speciality : 'Charismatic Leadership', - specialityAttr : "@{emp}", + specialty : 'Charismatic Leadership', + specialtyAttr : "@{emp}", sk1 : "Persuasion", sk1Attr : "@{emp}", sk2 : "Composition", - sk2Attr : "@{int} - @{intpenality}", + sk2Attr : "@{int} - @{intpenalty}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Library Search", - sk4Attr : "@{int} - @{intpenality}", + sk4Attr : "@{int} - @{intpenalty}", sk5 : "Wardrobe & Style", sk5Attr : "@{attr}", sk6 : "History", - sk6Attr : "@{int} - @{intpenality}", + sk6Attr : "@{int} - @{intpenalty}", sk7 : "Education", - sk7Attr : "@{int} - @{intpenality}", + sk7Attr : "@{int} - @{intpenalty}", sk8 : "Oratory", - sk8Attr : "@{cool} - @{coolpenality}", + sk8Attr : "@{cool} - @{coolpenalty}", sk9 : "Social", sk9Attr : "@{emp}", }; } else if ( values.class == 'Private Investigator') { var skills = { - speciality : 'Research', - specialityAttr : "@{int}", + specialty : 'Research', + specialtyAttr : "@{int}", sk1 : "Persuasion", sk1Attr : "@{emp}", sk2 : "Human perception", sk2Attr : "@{emp}", sk3 : "Awareness/Notice", - sk3Attr : "@{int} - @{intpenality}", + sk3Attr : "@{int} - @{intpenalty}", sk4 : "Library Search", - sk4Attr : "@{int} - @{intpenality}", - sk5 : "Shadow/track", - sk5Attr : "@{int} - @{intpenality}", + sk4Attr : "@{int} - @{intpenalty}", + sk5 : "Shadow/Track", + sk5Attr : "@{int} - @{intpenalty}", sk6 : "Brawling", - sk6Attr : "@{ref} - @{refpenality} - @{enc}", + sk6Attr : "@{ref} - @{refpenalty} - @{enc}", sk7 : "Interview", sk7Attr : "@{emp}", sk8 : "Intimidation", - sk8Attr : "@{cool} - @{coolpenality}", + sk8Attr : "@{cool} - @{coolpenalty}", sk9 : "Streetwise", - sk9Attr : "@{cool} - @{coolpenality}", + sk9Attr : "@{cool} - @{coolpenalty}", }; } else { var skills = { - speciality : 'Undefined', - specialityAttr : "", + specialty : 'Undefined', + specialtyAttr : "", sk1 : "Undefined", sk1Attr : "", sk2 : "Undefined", @@ -6025,11 +6025,11 @@ var TAS = TAS || (function(){ }); - on("change:specialityVal change:sk1Val change:sk2Val change:sk3Val change:sk4Val change:sk5Val change:sk6Val change:sk7Val change:sk8Val change:sk9Val", function(){ + on("change:specialtyVal change:sk1Val change:sk2Val change:sk3Val change:sk4Val change:sk5Val change:sk6Val change:sk7Val change:sk8Val change:sk9Val", function(){ getAttrs([ - "specialityVal","sk1Val","sk2Val","sk3Val","sk4Val","sk5Val","sk6Val","sk7Val","sk8Val","sk9Val" + "specialtyVal","sk1Val","sk2Val","sk3Val","sk4Val","sk5Val","sk6Val","sk7Val","sk8Val","sk9Val" ], function (values) { - var total = parseInt(values.specialityVal) + parseInt(values.sk1Val) + parseInt(values.sk2Val) + parseInt(values.sk3Val) + parseInt(values.sk4Val) + parseInt(values.sk5Val) + parseInt(values.sk6Val) + parseInt(values.sk7Val) + parseInt(values.sk8Val) + parseInt(values.sk9Val); + var total = parseInt(values.specialtyVal) + parseInt(values.sk1Val) + parseInt(values.sk2Val) + parseInt(values.sk3Val) + parseInt(values.sk4Val) + parseInt(values.sk5Val) + parseInt(values.sk6Val) + parseInt(values.sk7Val) + parseInt(values.sk8Val) + parseInt(values.sk9Val); setAttrs({ totalPrimarySkillPoints : total }); @@ -6107,16 +6107,16 @@ var TAS = TAS || (function(){ getAttrs([ "repeating_prog_progType", "repeating_prog_progStr", - "speciality", - "specialityVal", - "specialityAttr", + "specialty", + "specialtyVal", + "specialtyAttr", ], function(v) { var spe = ''; var t = v.repeating_prog_progType; var str = v.repeating_prog_progStr; var roll = ''; - if (v.speciality == 'Interface'){ - spe = '+'+v.specialityVal+'+'+v.specialityAttr; + if (v.specialty == 'Interface'){ + spe = '+'+v.specialtyVal+'+'+v.specialtyAttr; } console.log(spe); @@ -6186,7 +6186,7 @@ var TAS = TAS || (function(){ ], function(v){ var price = 0; var room = parseInt(v.repeating_home_roomHome); - if (v.repeating_home_typeHome == "Appartment"){ + if (v.repeating_home_typeHome == "Apartment"){ price = 200 * room; } else if (v.repeating_home_typeHome =="House" ) { price = 150 * room;