Merge pull request #477 from gmmatt/dev

v 12.3.0 PR

Changelog.md

@@ -1,5 +1,19 @@
 # TORG Eternity Changelog
 
+## v. 12.3.0
+
+- Active Defense will now automatically be disposed, when the combat round is over or the combat ends. [#438](https://github.com/gmmatt/torgeternity/issues/438)
+- Character informations can now be shown by a right-click-context-menu on an actor. [#229](https://github.com/gmmatt/torgeternity/issues/229)
+- Option for not automatically untarged token after attack [#459](https://github.com/gmmatt/torgeternity/issues/459)
+- refactoring the handlebarHelpers [#455](https://github.com/gmmatt/torgeternity/issues/455)
+- The buff macro now handles more than 1 selected token (especially good for gms!) [#468](https://github.com/gmmatt/torgeternity/issues/468)
+- New token frames! These will be used in modules and our archetypes here.
+- Ammo will not be deleted after it's value reached 0, but will not be used unless there are bullits in the clip! [#428](https://github.com/gmmatt/torgeternity/issues/428)
+- Old PNG and JPEG files were deleted to reduce the amount of data the system is using (they were replaced by .webp images way before) [#457](https://github.com/gmmatt/torgeternity/issues/457)
+- The prerequisites of a perk is now a textarea and not longer a textfield (this makes it possible to increase size and having a better overview) [#254](https://github.com/gmmatt/torgeternity/issues/254)
+- Races are now as items and can be dragged onto the character. This influences the attribute maximums and adds race-related perks. [#52](https://github.com/gmmatt/torgeternity/issues/52)
+- Option for using Pan-Pacifica tabletents after year 1 [#467](https://github.com/gmmatt/torgeternity/issues/467)
+
 ## v. 12.2.8
 
 - Fixing a bug on active defense.

css/journal.css

@@ -575,9 +575,11 @@ div.subtitleleft img {
   float: right;
   shape-margin: 0.5rem !important;
   shape-image-threshold: 0.1;
-  max-width: 50% !important;
-  max-height: 50% !important;
+  height: auto;
+  width: 50% !important;
+  border:none;
   margin-left: 0.5rem !important;
+  shape-outside: url();
 }
 
 /*...................................................................*/

css/torgeternity.css

@@ -1271,6 +1271,11 @@ Base english tent cards images
   background-size: 100% 100%;
 }
 
+#navigation .cosm-card.panPacificaY1 {
+  background: url(../images/cosm-cards/panPpacifica_Year1.webp);
+  background-size: 100% 100%;
+}
+
 #navigation .cosm-card.orrorsh {
   background: url(../images/cosm-cards/orrorsh.webp);
   background-size: 100% 100%;
@@ -1409,6 +1414,11 @@ german tent cards images
   background-size: 100% 100%;
 }
 
+#navigation .de.cosm-card.panPacificaY1 {
+  background: url(../images/deutsch/cosm-tabletents/Pan-Pacifica-Jahrr1.webp);
+  background-size: 100% 100%;
+}
+
 #navigation .de.cosm-card.orrorsh {
   background: url(../images/deutsch/cosm-tabletents/Orrorsh.webp);
   background-size: 100% 100%;
@@ -1711,6 +1721,10 @@ nav#controls,
   border-left: 8px solid rgba(255, 255, 0, 0.836);
 }
 
+#combat ol li.combatant.turnDone {
+  background-color: darkgreen;
+}
+
 #combat ol a.has-played {
   color: rgba(238, 238, 238, 0.739);
   text-shadow: 0px 0px 6px black;
@@ -2665,6 +2679,32 @@ form.actor-sheet header input[name="name"] {
   width: 100%;
 }
 
+.window-content .actor-sheet .sheet-header .raceSpan {
+  display:grid;
+  grid-template-columns: repeat(2, 1fr);
+  grid-template-rows: repeat(2, 1fr);
+}
+
+.window-content .actor-sheet .sheet-header .raceSpan .raceSpanHeader {
+  color: black;
+  font-family: "Alaska";
+  font-size: 13px;
+  line-height: 14px;  
+  grid-column: 1/3;
+}
+
+.window-content .actor-sheet .sheet-header .raceSpan .raceSpanRace {
+  font: normal 13px Signica;
+  text-align: center;
+  grid-column: auto;
+}
+
+.window-content .actor-sheet .sheet-header .raceSpan .deleteRaceButton {
+  display: grid;
+  align-items: center;
+  justify-items: center;
+}
+
 .window-content .actor-sheet .sheet-header.threat {
   flex: none;
 }
@@ -3332,7 +3372,8 @@ form.actor-sheet.threat .tab[data-tab].active ol.item-list li .item-detail .item
   max-height: inherit;
 }
 
-form.actor-sheet.threat .tab[data-tab].active ol.item-list li .item-detail .item-dropdown-extras {
+form.actor-sheet.threat .tab[data-tab].active ol.item-list li .item-detail .item-dropdown-extras,
+.item-sheet ol.race.perks-list > .item.block  > .item-detail > .item-dropdown-description .item-dropdown-extras {
   font-style: italic;
   border: 1px solid grey;
   text-align: center;
@@ -3476,6 +3517,82 @@ form.actor-sheet.threat .tab[data-tab].active .editor {
   column-gap: 0.5em;
 }
 
+.item .window-content form.item-sheet .raceDescriptionHeadline {
+  text-align: center;
+  color: black;
+  border:none;
+  font-weight: bold;
+}
+
+.item .window-content form.item-sheet .raceAttributes {
+  display: grid;
+  grid-template-columns: repeat(5, 1fr);
+  grid-template-rows: repeat(3, 1fr);
+  justify-content: center;
+  justify-items: center;
+  align-items: center;
+  margin-bottom: 1rem;
+}
+
+.item .window-content form.item-sheet .raceAttributes > h1 {
+  grid-row: 1/2;
+  grid-column: 1/6;
+  color: black;
+  border:none;
+  font-weight: bold;
+}
+
+.item .window-content form.item-sheet .raceAttributes > label {
+  grid-row: 2/3;
+  color:black;
+}
+
+.item .window-content form.item-sheet .raceAttributes > input {
+  grid-row: 3/4;
+  border: none;
+  text-align: center;
+  width: 40px;
+  height: 40px;
+  border-radius: 15px;
+  background: url(../images/roundBack.webp);
+  background-size: cover;
+  color: black;
+}
+
+.item .window-content form.item-sheet .raceAttributes + hr {
+  background-image: url(../images/separator.webp);
+  /* background-position-y: -8px; */
+  background-repeat: no-repeat;
+  background-size: auto;
+  min-height: 20px;
+  height: 3rem;
+  width: auto;
+  border: none;
+  transform: scaleY(0.5);
+  margin: -15px 10px -15px 0px;
+}
+
+.item .window-content form.item-sheet .raceSpecs {
+  color: black;
+  display: flex;
+  flex-direction: row;
+  margin: 15px;
+  justify-content: center;
+  align-items: center;
+  column-gap: 15px;  
+}
+
+.item .window-content form.item-sheet .raceSpecs > label {
+  font-family: Palatino;
+  font-size: 2em;
+  font-weight: bold;
+}
+
+.item .window-content form.item-sheet .raceHardcode {
+  min-height:200px;
+  margin-top: 10px;
+}
+
 .item .window-content form.item-sheet .asside {
   grid-row: 1/4;
   grid-column: 1/2;
@@ -3500,7 +3617,8 @@ form.actor-sheet.threat .tab[data-tab].active .editor {
   margin: 7px 0;
 }
 
-.item .window-content form.item-sheet .asside input[type="number"] {
+.item .window-content form.item-sheet .asside input[type="number"]
+ {
   border: none;
   text-align: center;
   width: 40px;
@@ -3536,6 +3654,16 @@ form.actor-sheet.threat .tab[data-tab].active .editor {
   border-image: url('../images/frameWithoutFilling.svg') 30 / 2rem;
 }
 
+.window-content .dialog-content .charInfoOutput {
+  background-color: rgba(255, 247, 247, 0.25);
+  padding-top: 20px;
+  padding-left: 10px
+}
+
+.window-content .dialog-content .charInfoOutput > h3 {
+  border: none;  
+}
+
 .item .window-content form.item-sheet nav.tabs {
   display: flex;
   flex-direction: row;
@@ -3607,6 +3735,10 @@ form.actor-sheet.threat .tab[data-tab].active .editor {
   padding: 5px 5px;
 }
 
+.item .window-content form.item-sheet .item-description-textarea[name="prerequisites"] > div {
+  min-height: 150px;  
+}
+
 .item .window-content form.item-sheet .effects .item-list {
   padding: 0px;
 }
@@ -3994,6 +4126,69 @@ form.actor-sheet.threat .tab[data-tab].active .editor {
   padding: 0 0 0 0;
 }
 
+.item-sheet ol.race.perks-list {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  padding:unset;
+}
+
+.item-sheet ol.race.perks-list li {
+  color: black;
+  list-style: none;
+  margin: 5px;
+  display: flex;
+  justify-content: space-between;
+  border-top: 1px solid black;
+  flex-direction: column;
+  border: solid 4px;
+  -o-border-image: url(../images/separator.webp);
+  border-image: url(../images/separator.webp);
+  border-image-slice: 50;
+  box-shadow: 2px 2px 15px #9e9686;
+  transition: all 0.3s cubic-bezier(0.6, -0.07, 0.56, 1.52) 0.2s;
+  overflow: auto;
+  padding: 0px 0px 5px 0px;
+  font-size:20px;
+}
+
+.item-sheet ol.race.perks-list > .item.block  > .item-row.flexrow {
+  display: grid;
+  grid-template-columns: 1fr 3fr 1fr;
+  justify-content: space-evenly;
+  align-items: center;
+  column-gap:1rem;
+}
+
+.item-sheet ol.race.perks-list > .item.block  > .item-row.flexrow > img{
+  max-width: 60px;
+  max-height: 60px;
+  border:none;
+}
+
+.item-sheet ol.race.perks-list > .item.block  > .item-row.flexrow > .item-controls {
+  justify-self: end;
+}
+
+.item-sheet ol.race.perks-list .item.block .item-detail {
+  display:none;
+  max-height:300px;
+}
+
+.item-sheet ol.race.perks-list .item.block .item-detail > * {
+  overflow: auto;
+  position: relative;
+  z-index: 1000;  
+}
+
+.item-sheet ol.race.perks-list > .item.block  > .item-detail > .item-dropdown-description {
+  font-size:14px;
+}
+
+.item-sheet ol.race.perks-list > .item.block  > .item-detail > .item-dropdown-description .item-dropdown-extras{
+
+}
+
 .enhancement-check {
   flex: 10%;
   color: black;