diff --git a/WWN/Equipment.md b/WWN/Equipment.md new file mode 100644 index 0000000000..25ef2af502 --- /dev/null +++ b/WWN/Equipment.md @@ -0,0 +1,60 @@ + + +Library of equipment using ChatSetAttr API mod Need Pro Account to benefit from it. Can add to an ability, macro or on the listed notes in the sheet to use for adding equipment with a click of a button to the selected token's character sheet. + + +[Arrows-20](!setattr --sel --silent --repeating_stowedorstored_-CREATE_items_name|Arrows, 20 --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_resource_-CREATE_resource_name|Quiver of Arrows --repeating_resource_-CREATE_cur_resource|20|20) 2sp +[Backpack](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Backpack § --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1) 2sp +[Boots](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Boots --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1) 2sp +[Candle](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Candle * --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|0) 1cp +[Cart](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Cart, one horse --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|0) 50sp +[Cothes](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Clothes, common § --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1) 25sp +[Clothes, Fine](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Clothes, fine § --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1) 100sp +[Clothes, Noble](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Clothes, Noble § --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|2) 500sp +[Cooking utensils](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Cooking utensils --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1) 4sp +[Crowbar](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Crowbar --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1) 4sp +[Firewood, One Night's fire](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Firewood, one night's fire --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|4) 2 cp +[Flask, metal, one pint](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Flask, metal, one pint --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1) 3 sp +[Grappling hook](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Grappling hook --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1) 5 sp +[Hammer or small tool](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Hammer or small tool --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1) 2 sp +[Healer's Pouch](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Healer's pouch --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1)5 sp +[Hurlant bolts, 20](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Hurlant bolts, 20 --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_resource_-CREATE_resource_name|Hurlant bolts, 20 --repeating_resource_-CREATE_cur_resource|20)20 sp +[Iron spikes, 10](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Iron spikes, 10 --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1)1 sp +[Lantern](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Lantern --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1)10 sp +[Mirror](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Mirror * --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|0)10 sp +[Oil, one pint ](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Oil, one pint # --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1)1sp +[Paper, 10 sheets](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Paper, 10 sheets * --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|0) 1 sp +[Rations, one week](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Rations, one week --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|4 --repeating_resource_-CREATE_resource_name|Rations, one week --repeating_resource_-CREATE_cur_resource|7) 5 sp +[Rope, 50'](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Rope, 50' --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|2) 2 sp +[Sack](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Sack --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1) 1 sp +[Shovel, pick, or similar too](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Shovel, pick, or similar too --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|2) 4 sp +[Tinder box](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Sack --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1) 1 sp +[Torch](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Torch # --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_resource_-CREATE_resource_name|Torch, turns --repeating_resource_-CREATE_cur_resource|6)2 cp +[Waterskin, one gallon](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Waterskin, one gallon --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_resource_-CREATE_resource_name|Water --repeating_resource_-CREATE_cur_resource|1|1) 1 sp +[Writing kit](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Writing kit --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1) 3 sp +[Axe, Hand](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Axe, Hand --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_weapons_-CREATE_weapon_name|Axe, Hand --repeating_weapons_-CREATE_weapon_damage|1d6 --repeating_weapons_-CREATE_weapon_shock|1/ AC15 --repeating_weapons_-CREATE_weapon_range|10/30 --repeating_weapons_-CREATE_weapon_traits|T) 10 sp +[Axe, War](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Axe, War --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|2 --repeating_weapons_-CREATE_weapon_name|Axe, War --repeating_weapons_-CREATE_weapon_damage|1d10 --repeating_weapons_-CREATE_weapon_shock|3/AC 15 --repeating_weapons_-CREATE_weapon_range|none --repeating_weapons_-CREATE_weapon_traits|2H) 50 sp +[Blackjack](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Blackjack --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_weapons_-CREATE_weapon_name|Blackjack --repeating_weapons_-CREATE_weapon_damage|1d4 --repeating_weapons_-CREATE_weapon_shock|none --repeating_weapons_-CREATE_weapon_range|none --repeating_weapons_-CREATE_weapon_traits|S, LL) 1 sp +[Bow, Large](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Bow, Large --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|2 --repeating_weapons_-CREATE_weapon_name|Bow, Large --repeating_weapons_-CREATE_weapon_damage|1d8 --repeating_weapons_-CREATE_weapon_shock|none --repeating_weapons_-CREATE_weapon_range|100/600 --repeating_weapons_-CREATE_weapon_traits|2H, R, PM) 20 sp +[Bow, Small](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Bow, Small --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_weapons_-CREATE_weapon_name|Bow, Small --repeating_weapons_-CREATE_weapon_damage|1d6 --repeating_weapons_-CREATE_weapon_shock|none --repeating_weapons_-CREATE_weapon_range|50/300 --repeating_weapons_-CREATE_weapon_traits|2H, R, PM) 20 sp +[Claw Blades](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Claw Blades --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_weapons_-CREATE_weapon_name|Claw Blades --repeating_weapons_-CREATE_weapon_damage|1d6 --repeating_weapons_-CREATE_weapon_shock|2/AC13 --repeating_weapons_-CREATE_weapon_range|none --repeating_weapons_-CREATE_weapon_traits|S) 10 sp +[Club](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Club --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_weapons_-CREATE_weapon_name|Club --repeating_weapons_-CREATE_weapon_damage|1d4 --repeating_weapons_-CREATE_weapon_shock|None --repeating_weapons_-CREATE_weapon_range|10/30 --repeating_weapons_-CREATE_weapon_traits|T, LL) none +[Club, Great](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Club, Great --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|2 --repeating_weapons_-CREATE_weapon_name|Club, Great --repeating_weapons_-CREATE_weapon_damage|1d10 --repeating_weapons_-CREATE_weapon_shock|2/ AC 15 --repeating_weapons_-CREATE_weapon_range|none --repeating_weapons_-CREATE_weapon_traits|2H) 1 sp +[Crossbow](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Crossbow --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_weapons_-CREATE_weapon_name|Crossbow --repeating_weapons_-CREATE_weapon_damage|1d10 --repeating_weapons_-CREATE_weapon_shock|none --repeating_weapons_-CREATE_weapon_range|100/300 --repeating_weapons_-CREATE_weapon_traits|2H, SR, PM) 10 sp +[Dagger](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Dagger --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_weapons_-CREATE_weapon_name|Dagger --repeating_weapons_-CREATE_weapon_damage|1d4 --repeating_weapons_-CREATE_weapon_shock|1/ AC 15 --repeating_weapons_-CREATE_weapon_range|30/60 --repeating_weapons_-CREATE_weapon_traits|S, T, PM) 3 sp +[Halberd](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Halberd --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|2 --repeating_weapons_-CREATE_weapon_name|Halberd --repeating_weapons_-CREATE_weapon_damage|1d10 --repeating_weapons_-CREATE_weapon_shock|2/ AC 15 --repeating_weapons_-CREATE_weapon_range|none --repeating_weapons_-CREATE_weapon_traits|2H, L) 50 sp +[Hammer, Great](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Hammer, Great --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|2 --repeating_weapons_-CREATE_weapon_name|Hammer, Great --repeating_weapons_-CREATE_weapon_damage|1d10 --repeating_weapons_-CREATE_weapon_shock|2 / AC 18 --repeating_weapons_-CREATE_weapon_range|none --repeating_weapons_-CREATE_weapon_traits|2H) 50 sp +[Hammer, War](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Hammer, War --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_weapons_-CREATE_weapon_name|Hammer, War --repeating_weapons_-CREATE_weapon_damage|1d8 --repeating_weapons_-CREATE_weapon_shock|1 / AC 18 --repeating_weapons_-CREATE_weapon_range|none --repeating_weapons_-CREATE_weapon_traits|) 30 sp +[Hurlant, Great](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Hurlant, Great --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|15 --repeating_weapons_-CREATE_weapon_name|Hurlant, Great --repeating_weapons_-CREATE_weapon_damage|3d10 --repeating_weapons_-CREATE_weapon_shock|none --repeating_weapons_-CREATE_weapon_range|600/2400 --repeating_weapons_-CREATE_weapon_traits|FX, SS, AP) 10,000 sp +[Hurlant, Hand](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Hurlant, Hand --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_weapons_-CREATE_weapon_name|Hurlant, Hand --repeating_weapons_-CREATE_weapon_damage|1d12 --repeating_weapons_-CREATE_weapon_shock|none --repeating_weapons_-CREATE_weapon_range|30/60 --repeating_weapons_-CREATE_weapon_traits|SS, AP) 1,000 sp +[Hurlant, Long](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Hurlant, Long --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|2 --repeating_weapons_-CREATE_weapon_name|Hurlant, Long --repeating_weapons_-CREATE_weapon_damage|2d8 --repeating_weapons_-CREATE_weapon_shock|none --repeating_weapons_-CREATE_weapon_range|200/600 --repeating_weapons_-CREATE_weapon_traits|2H, SS, AP, PM) 4,000 sp +[Mace](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Mace --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_weapons_-CREATE_weapon_name|Mace --repeating_weapons_-CREATE_weapon_damage|1d6 --repeating_weapons_-CREATE_weapon_shock|1 / AC 18 --repeating_weapons_-CREATE_weapon_range|none --repeating_weapons_-CREATE_weapon_traits|LL) 15 sp +[Pike](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Pike --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|2 --repeating_weapons_-CREATE_weapon_name|Pike --repeating_weapons_-CREATE_weapon_damage|1d8 --repeating_weapons_-CREATE_weapon_shock|1 /AC 18 --repeating_weapons_-CREATE_weapon_range|none --repeating_weapons_-CREATE_weapon_traits|2H, L) 10 sp +[Spear, Heavy](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Spear, Heavy --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|2 --repeating_weapons_-CREATE_weapon_name|Spear, Heavy --repeating_weapons_-CREATE_weapon_damage|1d10 --repeating_weapons_-CREATE_weapon_shock|2/ AC 15 --repeating_weapons_-CREATE_weapon_range|none --repeating_weapons_-CREATE_weapon_traits|2H) 10 sp +[Spear, Light](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Spear, Light --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_weapons_-CREATE_weapon_name|Spear, Light --repeating_weapons_-CREATE_weapon_damage|1d6 --repeating_weapons_-CREATE_weapon_shock|2 / AC 13 --repeating_weapons_-CREATE_weapon_range|30/60 --repeating_weapons_-CREATE_weapon_traits|T) 5 sp +[Throwing Blade](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Throwing Blade --repeating_stowedorstored_-CREATE_items_quantity|5 --repeating_stowedorstored_-CREATE_items_encumbrance|0.2 --repeating_resource_-CREATE_resource_name|Throwing Blade --repeating_resource_-CREATE_cur_resource|5|5 --repeating_weapons_-CREATE_weapon_name|Throwing Blade --repeating_weapons_-CREATE_weapon_damage|1d4 --repeating_weapons_-CREATE_weapon_shock|none --repeating_weapons_-CREATE_weapon_range|30/60 --repeating_weapons_-CREATE_weapon_traits|S, T, N) 3 sp +[Staff](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Staff --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_weapons_-CREATE_weapon_name|Staff --repeating_weapons_-CREATE_weapon_damage|1d6 --repeating_weapons_-CREATE_weapon_shock|1/AC 13 --repeating_weapons_-CREATE_weapon_range|none --repeating_weapons_-CREATE_weapon_traits|2H, LL) 1 sp +[Stiletto](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Stiletto --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_weapons_-CREATE_weapon_name|Stiletto --repeating_weapons_-CREATE_weapon_damage|1d4 --repeating_weapons_-CREATE_weapon_shock|1 / AC 18 --repeating_weapons_-CREATE_weapon_range|none --repeating_weapons_-CREATE_weapon_traits|S, PM) 10 sp +[Sword, Great](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Sword, Great --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|2 --repeating_weapons_-CREATE_weapon_name|Sword, Great --repeating_weapons_-CREATE_weapon_damage|1d12 --repeating_weapons_-CREATE_weapon_shock|2/ AC 15 --repeating_weapons_-CREATE_weapon_range|none --repeating_weapons_-CREATE_weapon_traits|2H) 250 sp +[Sword, Long](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Sword, Long --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_weapons_-CREATE_weapon_name|Sword, Long --repeating_weapons_-CREATE_weapon_damage|1d8 --repeating_weapons_-CREATE_weapon_shock|2 /AC 15 --repeating_weapons_-CREATE_weapon_range|none --repeating_weapons_-CREATE_weapon_traits|) 100 sp +[Sword, Short](!setattr --silent --sel --repeating_stowedorstored_-CREATE_items_name|Sword, Short --repeating_stowedorstored_-CREATE_items_quantity|1 --repeating_stowedorstored_-CREATE_items_encumbrance|1 --repeating_weapons_-CREATE_weapon_name|Sword, Short --repeating_weapons_-CREATE_weapon_damage|1d6 --repeating_weapons_-CREATE_weapon_shock|2 /AC 15 --repeating_weapons_-CREATE_weapon_range|none --repeating_weapons_-CREATE_weapon_traits|) 10 sp diff --git a/WWN/README.md b/WWN/README.md index 04d522077a..d905feb57b 100644 --- a/WWN/README.md +++ b/WWN/README.md @@ -1,3 +1,3 @@ # WWN Worlds Without number Roll20 Character Sheet -Version .2 +Version .3 diff --git a/WWN/preview.png b/WWN/preview.png index 4345aa2456..7d23262f6a 100644 Binary files a/WWN/preview.png and b/WWN/preview.png differ diff --git a/WWN/sheet.json b/WWN/sheet.json index 866c168f0f..0fcde1bed0 100644 --- a/WWN/sheet.json +++ b/WWN/sheet.json @@ -5,5 +5,18 @@ "roll20userid": "1638978", "preview": "preview.png", "instructions": "**Worlds without number character sheet** Page opens with sections closed for concise look. Selecting each section opens it up for input. ", + "useroptions": [ + { + "attribute": "tab", + "displayname": "Default to which tab?", + "type": "select", + "options": [ + "PC|1", + "NPC|2" + ], + "default": "1", + "description": "Determine what sheet is displayed either a PC or an NPC when creating a new sheet." + } + ], "legacy": false } \ No newline at end of file diff --git a/WWN/wwn.html b/WWN/wwn.html index dabc72f5fd..37516a63c5 100644 --- a/WWN/wwn.html +++ b/WWN/wwn.html @@ -1,7 +1,7 @@