Skip to content

Commit

Permalink
Verbesserungen nach Feedbackrunde
Browse files Browse the repository at this point in the history
Erster Verbesserungen nach der Feedbackrunde
  • Loading branch information
Gorthian committed Jul 29, 2024
1 parent 9903818 commit 5f076b9
Show file tree
Hide file tree
Showing 6 changed files with 136 additions and 16 deletions.
5 changes: 5 additions & 0 deletions NoReturn_2E/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ https://www.mannifest-games.com/

# Release Notes

**2024-07-29 v1.2**

* Verbesserungen
* Einige kleinere Layout-Optimierungen

**2024-02-17 v1.1 HF5**

* Bugfix
Expand Down
19 changes: 15 additions & 4 deletions NoReturn_2E/noreturn.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
CREATED by Gorthian
Version 1.1 HF4
Letzte Änderung 2024-01-23
Version 2.1
Letzte Änderung 2024-07-29
GitHub https://github.com/Gorthian/Roll20_NoReturn_CharacterSheet
Wiki https://github.com/Gorthian/Roll20_NoReturn_CharacterSheet/wiki
Expand Down Expand Up @@ -54,7 +54,9 @@ div.sheet-noreturn h2 {font-size : var(--font-h2-size);}
div.sheet-noreturn div.sheet-kopfzeile,
div.sheet-noreturn div.sheet-titel,
div.sheet-noreturn div.sheet-sonderattribut-zeile div.sheet-sonderattribut-titel,
div.sheet-noreturn div.sheet-sonderattribut-zeile-max-aktuell div.sheet-sonderattribut-titel {
div.sheet-noreturn div.sheet-sonderattribut-zeile div.sheet-sonderattribut-titel input[type='text'],
div.sheet-noreturn div.sheet-sonderattribut-zeile-max-aktuell div.sheet-sonderattribut-titel,
div.sheet-noreturn div.sheet-sonderattribut-zeile-max-aktuell div.sheet-sonderattribut-titel input[type='text'] {
font-family : var(--font-standard);
text-transform : uppercase;
}
Expand All @@ -66,10 +68,19 @@ div.sheet-noreturn div.sheet-kopfzeile {

div.sheet-noreturn div.sheet-titel,
div.sheet-noreturn div.sheet-sonderattribut-zeile div.sheet-sonderattribut-titel,
div.sheet-noreturn div.sheet-sonderattribut-zeile-max-aktuell div.sheet-sonderattribut-titel {
div.sheet-noreturn div.sheet-sonderattribut-zeile-max-aktuell div.sheet-sonderattribut-titel,
div.sheet-noreturn div.sheet-sonderattribut-zeile div.sheet-sonderattribut-titel input[type='text'],
div.sheet-noreturn div.sheet-sonderattribut-zeile-max-aktuell div.sheet-sonderattribut-titel input[type='text'] {
font-size : var(--font-big-size);
}

div.sheet-noreturn div.sheet-sonderattribut-zeile div.sheet-sonderattribut-titel input[type='text'],
div.sheet-noreturn div.sheet-sonderattribut-zeile-max-aktuell div.sheet-sonderattribut-titel input[type='text'] {
position : relative;
left : -0.25em;
top : -0.25em;
}

div.sheet-noreturn input {
font-family : var(--font-standard);
font-size : var(--font-standard-size);
Expand Down
84 changes: 79 additions & 5 deletions NoReturn_2E/noreturn.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

<!--
CREATED by Gorthian
Version 1.1 HF5
Letzte Änderung 2024-02-17
Version 2.1
Letzte Änderung 2024-07-29
GitHub https://github.com/Gorthian/Roll20_NoReturn_CharacterSheet
Wiki https://github.com/Gorthian/Roll20_NoReturn_CharacterSheet/wiki
Bugs & Issues https://github.com/Gorthian/Roll20_NoReturn_CharacterSheet/issues
Expand Down Expand Up @@ -489,6 +489,46 @@ <h1 data-i18n="attribute"></h1>
<input type="hidden" name="attr_schmerztoleranz-old" value="3"/>
</div>
</div>
<!-- MIXIN : src/html/bloecke/sonderattribute.pug : sonderattributszeile-->
<div class="sheet-sonderattribut-zeile">
<div class="sheet-sonderattribut-titel">
<input type="text" name="attr_sonderattribut_frei_1" placeholder="--"/>
</div>
<div>
<input type="number" name="attr_sonderattribut_frei_1_wert"/>
<input type="hidden" name="attr_sonderattribut_frei_1-old"/>
</div>
</div>
<!-- MIXIN : src/html/bloecke/sonderattribute.pug : sonderattributszeile-->
<div class="sheet-sonderattribut-zeile">
<div class="sheet-sonderattribut-titel">
<input type="text" name="attr_sonderattribut_frei_2" placeholder="--"/>
</div>
<div>
<input type="number" name="attr_sonderattribut_frei_2_wert"/>
<input type="hidden" name="attr_sonderattribut_frei_2-old"/>
</div>
</div>
<!-- MIXIN : src/html/bloecke/sonderattribute.pug : sonderattributszeile-->
<div class="sheet-sonderattribut-zeile">
<div class="sheet-sonderattribut-titel">
<input type="text" name="attr_sonderattribut_frei_3" placeholder="--"/>
</div>
<div>
<input type="number" name="attr_sonderattribut_frei_3_wert"/>
<input type="hidden" name="attr_sonderattribut_frei_3-old"/>
</div>
</div>
<!-- MIXIN : src/html/bloecke/sonderattribute.pug : sonderattributszeile-->
<div class="sheet-sonderattribut-zeile">
<div class="sheet-sonderattribut-titel">
<input type="text" name="attr_sonderattribut_frei_4" placeholder="--"/>
</div>
<div>
<input type="number" name="attr_sonderattribut_frei_4_wert"/>
<input type="hidden" name="attr_sonderattribut_frei_4-old"/>
</div>
</div>
</div>
<div>
<!-- MIXIN : src/html/bloecke/sonderattribute.pug : sonderattributskopfzeile_max_aktuell-->
Expand Down Expand Up @@ -530,19 +570,47 @@ <h1 data-i18n="attribute"></h1>
<input type="number" name="attr_blutpunkte_current" value="0"/>
</div>
</div>
<!-- MIXIN : src/html/bloecke/sonderattribute.pug : sonderattributszeile_max_aktuell_freitext-->
<div class="sheet-sonderattribut-zeile-max-aktuell">
<div class="sheet-sonderattribut-titel">
<input type="text" name="attr_sonderattribut_frei_5" placeholder="--"/>
</div>
<div>
<input type="number" name="attr_sonderattribut_frei_5_max" value="0"/>
<input type="hidden" name="attr_sonderattribut_frei_5-old" value="0"/>
</div>
<div>
<input type="number" name="attr_sonderattribut_frei_5_current" value="0"/>
</div>
</div>
<!-- MIXIN : src/html/bloecke/sonderattribute.pug : sonderattributszeile_max_aktuell_freitext-->
<div class="sheet-sonderattribut-zeile-max-aktuell">
<div class="sheet-sonderattribut-titel">
<input type="text" name="attr_sonderattribut_frei_6" placeholder="--"/>
</div>
<div>
<input type="number" name="attr_sonderattribut_frei_6_max" value="0"/>
<input type="hidden" name="attr_sonderattribut_frei_6-old" value="0"/>
</div>
<div>
<input type="number" name="attr_sonderattribut_frei_6_current" value="0"/>
</div>
</div>
</div>
</div>
<div>
<textarea class="sheet-textarea-klein" name="attr_notizen-attribute"></textarea>
</div>
<div class="sheet-sonderattribute">
<div>
<div>
<div>&nbsp;</div>
<div class="sheet-sonderattribut-zeile">
<div class="sheet-sonderattribut-titel"><span data-i18n="regeneration"></span></div>
<div></div>
<div class="sheet-sonderattribut-titel"> </div>
<div><span data-i18n="regeneration"></span></div>
</div>
</div>
<div>
<div>&nbsp;</div>
<!-- MIXIN : src/html/bloecke/sonderattribute.pug : sonderattributszeile-->
<div class="sheet-sonderattribut-zeile">
<div class="sheet-sonderattribut-titel"><span data-i18n="regeneration-geschwindigkeit"></span></div>
Expand All @@ -553,6 +621,12 @@ <h1 data-i18n="attribute"></h1>
</div>
</div>
<div>
<!-- MIXIN : src/html/bloecke/sonderattribute.pug : sonderattributskopfzeile_max_aktuell-->
<div class="sheet-sonderattribut-zeile-max-aktuell">
<div> </div>
<div class="sheet-kopfzeile"><span data-i18n="max"></span></div>
<div class="sheet-kopfzeile"><span data-i18n="verbleibend"></span></div>
</div>
<!-- MIXIN : src/html/bloecke/sonderattribute.pug : sonderattributszeile_max_aktuell-->
<div class="sheet-sonderattribut-zeile-max-aktuell">
<div class="sheet-sonderattribut-titel"><span data-i18n="regeneration-pool"></span></div>
Expand Down
4 changes: 2 additions & 2 deletions NoReturn_2E/noreturn.pug
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
CREATED by Gorthian
Version 1.1 HF5
Letzte Änderung 2024-02-17
Version 2.1
Letzte Änderung 2024-07-29
GitHub https://github.com/Gorthian/Roll20_NoReturn_CharacterSheet
Wiki https://github.com/Gorthian/Roll20_NoReturn_CharacterSheet/wiki
Bugs & Issues https://github.com/Gorthian/Roll20_NoReturn_CharacterSheet/issues
Expand Down
39 changes: 34 additions & 5 deletions NoReturn_2E/src/html/bloecke/sonderattribute.pug
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//-
CREATED by Gorthian
Letzte Änderung 2024-01-25
Letzte Änderung 2024-07-29
//
********************************
Expand Down Expand Up @@ -33,6 +33,15 @@ mixin sonderattributszeile(attribute,default_value)
input(type="number" name="attr_"+attribute value=default_value)
input(type="hidden" name="attr_"+attribute+"-old" value=default_value)

mixin sonderattributszeile_freitext(zaehler)
// MIXIN : src/html/bloecke/sonderattribute.pug : sonderattributszeile
div(class="sheet-sonderattribut-zeile")
div(class="sheet-sonderattribut-titel")
input(type="text" name="attr_sonderattribut_frei_"+zaehler placeholder="--")
div
input(type="number" name="attr_sonderattribut_frei_"+zaehler+"_wert")
input(type="hidden" name="attr_sonderattribut_frei_"+zaehler+"-old")

mixin sonderattributszeile_max_aktuell(attribute)
// MIXIN : src/html/bloecke/sonderattribute.pug : sonderattributszeile_max_aktuell
div(class="sheet-sonderattribut-zeile-max-aktuell")
Expand All @@ -44,6 +53,17 @@ mixin sonderattributszeile_max_aktuell(attribute)
div
input(type="number" name="attr_"+attribute+"_current" value=0)

mixin sonderattributszeile_max_aktuell_freitext(zaehler)
// MIXIN : src/html/bloecke/sonderattribute.pug : sonderattributszeile_max_aktuell_freitext
div(class="sheet-sonderattribut-zeile-max-aktuell")
div(class="sheet-sonderattribut-titel")
input(type="text" name="attr_sonderattribut_frei_"+zaehler placeholder="--")
div
input(type="number" name="attr_sonderattribut_frei_"+zaehler+"_max" value=0)
input(type="hidden" name="attr_sonderattribut_frei_"+zaehler+"-old" value=0)
div
input(type="number" name="attr_sonderattribut_frei_"+zaehler+"_current" value=0)


//- SEITENINHALT
div(class="sheet-sonderattribute")
Expand All @@ -56,24 +76,33 @@ div(class="sheet-sonderattribute")
div
input(type="number" name="attr_dmg_schwellwert" readonly="readonly")
div
+sonderattributskopfzeile("stufe")
+sonderattributskopfzeile("stufe")
+sonderattributszeile("schmerztoleranz",3)
+sonderattributszeile_freitext(1)
+sonderattributszeile_freitext(2)
+sonderattributszeile_freitext(3)
+sonderattributszeile_freitext(4)
div
+sonderattributskopfzeile_max_aktuell("stufe","verbleibend")
+sonderattributszeile_max_aktuell("adrenalin")
+sonderattributszeile_max_aktuell("meditation")
+sonderattributszeile_max_aktuell("blutpunkte")
+sonderattributszeile_max_aktuell_freitext(5)
+sonderattributszeile_max_aktuell_freitext(6)
div
textarea(name="attr_notizen-attribute" class="sheet-textarea-klein")
div(class="sheet-sonderattribute")
div
div
div &nbsp;
div(class="sheet-sonderattribut-zeile")
div(class="sheet-sonderattribut-titel")
span(data-i18n="regeneration")
div(class="sheet-sonderattribut-titel")
div
span(data-i18n="regeneration")
div
div &nbsp;
+sonderattributszeile("regeneration-geschwindigkeit")
div
+sonderattributskopfzeile_max_aktuell("max","verbleibend")
+sonderattributszeile_max_aktuell("regeneration-pool")
//
********************************
Expand Down
1 change: 1 addition & 0 deletions NoReturn_2E/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"konstitution_kurz": "KO",
"kunst": "Kunst",
"körperzonen": "Körperzonen",
"max": "MAX",
"materialkomponente_kurz": "MK",
"mechanik": "Mechanik",
"meditation": "Meditation",
Expand Down

0 comments on commit 5f076b9

Please sign in to comment.