From b37727a580137826fbbdfd976c72ee0c7814d0a2 Mon Sep 17 00:00:00 2001
From: Scaby79 <Scaby79@gmx.de>
Date: Tue, 13 Jun 2017 21:23:09 +0200
Subject: [PATCH] update aborea.html

added some suggestions by sheet users
---
 Aborea/aborea.html | 99 ++++++++++------------------------------------
 1 file changed, 21 insertions(+), 78 deletions(-)

diff --git a/Aborea/aborea.html b/Aborea/aborea.html
index d98c976681..ad48b31833 100644
--- a/Aborea/aborea.html
+++ b/Aborea/aborea.html
@@ -269,7 +269,7 @@
                             <option value="@{intbon}">IN</option>
                             <option value="@{chabon}">CH</option>
                         </select></td>
-                    <td style= "width:15%"><button type='roll' value='/em [[1t[Athletik]]]: [[1d10!+@{athletik}@{athletik_attrbon}+?{Situationsbedingter Modifikator|0}+@{Behinderung}]]' name='roll_Athletik_Probe' /></td>
+                    <td style= "width:15%"><button type='roll' value='/em übt sich in Athletik: [[1d10!+@{athletik}@{athletik_attrbon}+?{Situationsbedingter Modifikator|0}+@{Behinderung}]]' name='roll_Athletik_Probe' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_einflussnahme_checkbox"></td>
@@ -283,7 +283,7 @@
                             <option value="@{intbon}">IN</option>
                             <option value="@{chabon}" selected>CH</option>
                         </select></td>
-                    <td><button type='roll' value='/em [[1t[Einflussnahme]]]: [[1d10!+@{einflussnahme}@{einflussnahme_attrbon}+?{Situationsbedingter Modifikator|0}+@{Behinderung}]]' name='roll_Einflussnahme_Probe' /></td>
+                    <td><button type='roll' value='/em übt sich in Einflussnahme: [[1d10!+@{einflussnahme}@{einflussnahme_attrbon}+?{Situationsbedingter Modifikator|0}+@{Behinderung}]]' name='roll_Einflussnahme_Probe' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_list_checkbox"></td>
@@ -297,7 +297,7 @@
                             <option value="@{intbon}">IN</option>
                             <option value="@{chabon}">CH</option>
                         </select></td>
-                    <td><button type='roll' value='/em [[1t[List]]]: [[1d10!+@{list}@{list_attrbon}+?{Situationsbedingter Modifikator|0}+@{Behinderung}]]' name='roll_List_Probe' /></td>
+                    <td><button type='roll' value='/em übt sich in List: [[1d10!+@{list}@{list_attrbon}+?{Situationsbedingter Modifikator|0}+@{Behinderung}]]' name='roll_List_Probe' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_natur_checkbox"></td>
@@ -311,7 +311,7 @@
                             <option value="@{intbon}">IN</option>
                             <option value="@{chabon}">CH</option>
                         </select></td>
-                    <td><button type='roll' value='/em [[1t[Natur]]]: [[1d10!+@{natur}@{natur_attrbon}+?{Situationsbedingter Modifikator|0}+@{Behinderung}]]' name='roll_Natur_Probe' /></td>
+                    <td><button type='roll' value='/em übt sich in Natur: [[1d10!+@{natur}@{natur_attrbon}+?{Situationsbedingter Modifikator|0}+@{Behinderung}]]' name='roll_Natur_Probe' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_reiten_checkbox"></td>
@@ -325,7 +325,7 @@
                             <option value="@{intbon}">IN</option>
                             <option value="@{chabon}">CH</option>
                         </select></td>
-                    <td><button type='roll' value='/em [[1t[Reiten]]]: [[1d10!+@{reiten}@{reiten_attrbon}+?{Situationsbedingter Modifikator|0}+@{Behinderung}]]' name='roll_Reiten_Probe' /></td>
+                    <td><button type='roll' value='/em übt sich in Reiten: [[1d10!+@{reiten}@{reiten_attrbon}+?{Situationsbedingter Modifikator|0}+@{Behinderung}]]' name='roll_Reiten_Probe' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_schwimmen_checkbox"></td>
@@ -339,7 +339,7 @@
                             <option value="@{intbon}">IN</option>
                             <option value="@{chabon}">CH</option>
                         </select></td>
-                    <td><button type='roll' value='/em [[1t[Schwimmen]]]: [[1d10!+@{schwimmen}@{schwimmen_attrbon}+?{Situationsbedingter Modifikator|0}+@{Behinderung}]]' name='roll_Schwimmen_Probe' /></td>
+                    <td><button type='roll' value='/em übt sich in Schwimmen: [[1d10!+@{schwimmen}@{schwimmen_attrbon}+?{Situationsbedingter Modifikator|0}+@{Behinderung}]]' name='roll_Schwimmen_Probe' /></td>
                 </tr>
                 <tr>
                     <td><input type="checkbox" name="attr_wahrnehmung_checkbox"></td>
@@ -353,7 +353,7 @@
                             <option value="@{intbon}" selected>IN</option>
                             <option value="@{chabon}">CH</option>
                         </select></td>
-                    <td><button type='roll' value='/em [[1t[Wahrnehmung]]]: [[1d10!+@{wahrnehmung}@{wahrnehmung_attrbon}+?{Situationsbedingter Modifikator|0}+@{Behinderung}]]' name='roll_Wahrnehmung_Probe' /></td>
+                    <td><button type='roll' value='/em übt sich in Wahrnehmung: [[1d10!+@{wahrnehmung}@{wahrnehmung_attrbon}+?{Situationsbedingter Modifikator|0}+@{Behinderung}]]' name='roll_Wahrnehmung_Probe' /></td>
                 </tr>
                 
                 </table>
@@ -533,7 +533,7 @@
                             <option value="@{intbon}" selected>IN</option>
                             <option value="@{chabon}">CH</option>
                         </select></td>
-                    <td><button type='roll' value='/em [[1t[Zaubern]]]: [[1d@{dicesystem}]]+[[(@{gezielte_sprüche}@{gezielte_sprüche_attrbon})*(@{dicesystem}/10)+?{Situationsbedingter Modifikator|0}+floor(floor(@{Behinderung})*floor(@{dicesystem})/10)]]' name='roll_GezielteSprueche_Probe' /></td>
+                    <td><button type='roll' value='/em zaubert gezielt: [[1d@{dicesystem}]]+[[(@{gezielte_sprüche}@{gezielte_sprüche_attrbon})*(@{dicesystem}/10)+?{Situationsbedingter Modifikator|0}+floor(floor(@{Behinderung})*floor(@{dicesystem})/10)]]' name='roll_GezielteSprueche_Probe' /></td>
                 </tr>
                 <tr>
                     <td colspan="3"><strong></strong></td>
@@ -556,7 +556,7 @@
                             <option value="@{intbon}">IN</option>
                             <option value="@{chabon}">CH</option>
                         </select></td>
-                        <td><button type='roll' value='/em [[1t[Zaubern]]]: [[1d10!+@{skill}@{skill_attrbon}+?{Situationsbedingter Modifikator|0}]]' name='roll_skill' /></td>
+                        <td><button type='roll' value='/em zaubert: [[1d10!+@{skill}@{skill_attrbon}+?{Situationsbedingter Modifikator|0}]]' name='roll_skill' /></td>
                     </tr>
                 </table>
             </fieldset>
@@ -688,8 +688,18 @@
                         </select></td>
                         <td><button type='roll' value='/em spricht @{skillname}: [[1d10!+@{skill}@{skill_attrbon}+?{Situationsbedingter Modifikator|0}]]' name='roll_skill' /></td>
                     </tr>
-                </table>
             </fieldset>
+            </table>
+                <table style="width:120%">
+                <tr>
+                    <td colspan="3"><strong> </strong></td>
+                </tr>
+                <hr>
+                <tr>
+                    <td colspan="3"><strong>Aufgesparte Ausbildungspunkte:</strong></td>
+                </tr>
+                    <td class="skill-label"><input style="width:100%" type="text" name="attr_unused_ap" /></td>
+            </table>
         </div>
 
     </div>
@@ -730,7 +740,7 @@
                 <td style="width:5%"><input style="width:100%;text-align:center;" type="number" min="0" max="@{unarmed_kb}" value="0" name="attr_unarmed_ob"/></td>
                 <td style="width:5%"><input style="width:100%;text-align:center;" type="text" value="floor(@{unarmed_kb}-@{unarmed_ob})" name="attr_unarmed_db" disabled="true"/></td>
                 <td style="width:8%"><input style="width:100%;text-align:center;" type="text" value="-2" name="attr_unarmed_dam" disabled="true"/></td>
-                <td style="width:8%"><input style="width:100%;text-align:center;" type="text" value="0" name="attr_unarmed_inibon" disabled="true"/></td>
+                <td style="width:8%"><input style="width:100%;text-align:center;" type="text" value="1" name="attr_unarmed_inibon" disabled="true"/></td>
                 <td style="width:6%"><button style="width:100%;text-align:center;" type='roll' value='/em hat eine Initiative von: [[@{dexbon}+@{unarmed_inibon}&{tracker}]] und für diese Runde einen DB von [[(@{unarmed_db}*@{dicesystem}/10)]]' name='roll_Initiative_unbewaffnet' /></td>
                 <td style="width:6%"><button style="width:100%;text-align:center;" type='roll' value='/em greift @{target|Opfer|token_name} mit bloßen Händen an: [[1d@{dicesystem}]]+[[(@{unarmed_ob}*@{dicesystem}/10)-(5+@{target|Opfer|bar3})*((-1/90)*@{dicesystem}+(100/90))+?{Situationsbedingter Modifikator|0}+floor(floor(@{Behinderung})*floor(@{dicesystem})/10)+(@{unarmed_dam}*((-1/90)*@{dicesystem}+(100/90)))]] und für den Rest dieser Runde einen DB von [[(@{unarmed_db}*@{dicesystem}/10)]]' name='roll_Angriff_unbewaffnet' /></td>
             </tr>
@@ -2085,25 +2095,15 @@
 </div>
 
 <script type="text/worker">
-
-
 /* ---- BEGIN: TheAaronSheet.js ---- */
 // Github:   https://github.com/shdwjk/TheAaronSheet/blob/mast...
 // By:       The Aaron, Arcane Scriptomancer
 // Contact:  https://github.com/shdwjk/TheAaronSheet/blob/mast...
-
-
 var TAS = TAS || (function(){
     'use strict';
-
-
     var version = '0.2.0',
         lastUpdate = 1448523710,
-
-
     	queuedUpdates = {}, //< Used for delaying saves till the last momment.
-
-
 	log = function(){
         _.each(arguments,function(m){
             switch(typeof m){
@@ -2120,19 +2120,13 @@ var TAS = TAS || (function(){
             }
         });
 	},
-
-
     prepareUpdate = function( attribute, value ){
         queuedUpdates[attribute]=value;
     },
-
-
     applyQueuedUpdates = function() {
       setAttrs(queuedUpdates);
       queuedUpdates = {};
     },
-
-
 	namesFromArgs = function(args,base){
         return _.chain(args)
             .reduce(function(memo,attr){
@@ -2146,8 +2140,6 @@ var TAS = TAS || (function(){
             .uniq()
             .value();
 	},
-
-
 	addId = function(obj,value){
 		Object.defineProperty(obj,'id',{
 			value: value,
@@ -2155,15 +2147,11 @@ var TAS = TAS || (function(){
 			enumerable: false
 		});
 	},
-
-
 	addProp = function(obj,prop,value,fullname){
 		(function(){
             var pname=(_.contains(['S','F','I','D'],prop) ? '_'+prop : prop),
 			    full_pname = fullname || prop,
                 pvalue=value;
-
-
             _.each(['S','I','F'],function(p){
                 if( !_.has(obj,p)){
                     Object.defineProperty(obj, p, {
@@ -2187,10 +2175,6 @@ var TAS = TAS || (function(){
                     readonly: true
                 });
             }
-
-
-
-
             // Raw value
 			Object.defineProperty(obj, pname, {
                 enumerable: true,
@@ -2215,8 +2199,6 @@ var TAS = TAS || (function(){
 					return pvalue.toString();
 				}
 			});
-
-
             // int value
 			Object.defineProperty(obj.I, pname, {
                 enumerable: true,
@@ -2229,8 +2211,6 @@ var TAS = TAS || (function(){
 					return parseInt(pvalue,10) || 0;
 				}
 			});
-
-
             // float value
 			Object.defineProperty(obj.F, pname, {
                 enumerable: true,
@@ -2256,8 +2236,6 @@ var TAS = TAS || (function(){
                     }
                 });
             });
-
-
 		}());
 	},
 	
@@ -2317,8 +2295,6 @@ var TAS = TAS || (function(){
 					attrSet = {},
 					fieldIds = [],
 					fullFieldNames = [];
-
-
 				// call each operation per row.
 				// call each operation's final
 				getSectionIDs("repeating_"+sectionName,function(ids){
@@ -2334,8 +2310,6 @@ var TAS = TAS || (function(){
 								addProp(attrSet,aname,values[aname]);
 							}
 						});
-
-
 						rowSet = _.reduce(fieldIds,function(memo,id){
 							var r={};
 							addId(r,id);
@@ -2343,39 +2317,27 @@ var TAS = TAS || (function(){
 								var fn = 'repeating_'+sectionName+'_'+id+'_'+name;  
 								addProp(r,name,values[fn],fn);
 							});
-
-
 							memo[id]=r;
-
-
 							return memo;
 						},{});
-
-
                         _.each(operations,function(op){
                             var res;
                             switch(op.type){
                                 case 'tap':
                                     _.bind(op.final,op.context,rowSet,attrSet)();
                                     break;
-
-
                                 case 'each':
                                     _.each(rowSet,function(r){
                                         _.bind(op.func,op.context,r,attrSet,r.id,rowSet)();
                                     });
                                     _.bind(op.final,op.context,rowSet,attrSet)();
                                     break;
-
-
                                 case 'map':
                                     res = _.map(rowSet,function(r){
                                         return _.bind(op.func,op.context,r,attrSet,r.id,rowSet)();
                                     });
                                     _.bind(op.final,op.context,res,rowSet,attrSet)();
                                     break;
-
-
                                 case 'reduce':
                                     res = op.memo;
                                     _.each(rowSet,function(r){
@@ -2385,8 +2347,6 @@ var TAS = TAS || (function(){
                                     break;
                             }
                         });
-
-
                         // finalize attrs
                         applyQueuedUpdates();
 					});
@@ -2396,33 +2356,25 @@ var TAS = TAS || (function(){
 			return {
 				attrs: repAttrs,
 				attr: repAttrs,
-
 				column: repFields,
 				columns: repFields,
 				field: repFields,
 				fields: repFields,
-
 				reduce: repReduce,
 				inject: repReduce,
 				foldl: repReduce,
-
 				map: repMap,
 				collect: repMap,
-
 				each: repEach,
                 forEach: repEach,
-
                 tap: repTap,
                 'do': repTap,
-
-
 				execute: repExecute,
 				go: repExecute,
 				run: repExecute
 			};
 		}(section));
 	},
-
     repeatingSimpleSum = function(section, field, destination){
         repeating(section)
             .attr(destination)
@@ -2434,20 +2386,15 @@ var TAS = TAS || (function(){
             })
             .execute();
     };
-
     console.log('-=> TheAaronSheet v'+version+' <=-  ['+(new Date(lastUpdate*1000))+']');
-
     return {
         repeatingSimpleSum: repeatingSimpleSum,
 		repeating: repeating
     };
 }());
-
 /* ---- END: TheAaronSheet.js ---- */
-
     on('change:repeating_armor', function(){
         'use strict';
-
         TAS.repeating('armor')  // the name of the repeating group
             .fields('armor_checkbox','armor_bon','armor_man')  // fields to load for each row
             .attrs('armorgiven','behinderunggiven') // Attributes outside the group
@@ -2462,7 +2409,6 @@ var TAS = TAS || (function(){
                 m.armortotal       +=( (r.I.armor_checkbox||0)*r.F.armor_bon);
                 // this is infered from the other on('change:repeating_armor')
                 m.behinderungtotal +=( (r.I.armor_checkbox||0)*r.F.armor_man);
-
                 return m; // must return the memo for the next iteration!
             },{   // this is the starting state of the memo that is passed as m above
                 armortotal: 0,
@@ -2476,7 +2422,6 @@ var TAS = TAS || (function(){
             .execute(); // this causes all of the above to be executed.
     });
     
-
 /*on("change:con", function() {
    getAttrs(["con"], function(values) {
       var con = values.con;
@@ -2505,7 +2450,6 @@ var AthlValue = values.Athletik;
     } 
 });
 }); // End on change athletik
-
 /*on("change:con", function() {
 console.log( "Attribut Konstitution wurde geändert" );
 getAttrs(["Con"], function(values) {
@@ -2517,4 +2461,3 @@ setAttrs({ "conbon": ConValue });
 }); // End on change con
 */
 </script>
-