Merge pull request 'v13.0.15 - Les pièces d'Illysis' (#781) from VincentVk/foundryvtt-reve-de-dragon:v13 into v13
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				Release Creation / build (release) Successful in 1m45s
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	Release Creation / build (release) Successful in 1m45s
				
			Reviewed-on: #781
This commit is contained in:
		| @@ -1,4 +1,10 @@ | |||||||
| # 13.0 | # 13.0 | ||||||
|  | ## 13.0.15 - Les pièces d'Illysis | ||||||
|  |  | ||||||
|  | - On peut de nouveau acheter dans les commerces | ||||||
|  | - Corrections V13 | ||||||
|  |   - Les textes sur fond "parchemin" ne sont plus affichés en blanc | ||||||
|  |  | ||||||
| ## 13.0.14 - Le familier d'Illysis | ## 13.0.14 - Le familier d'Illysis | ||||||
|  |  | ||||||
| - Les réussites particulières en demi-surprise sont de simples réussites | - Les réussites particulières en demi-surprise sont de simples réussites | ||||||
|   | |||||||
| @@ -1378,6 +1378,9 @@ select, | |||||||
|   margin: 0.1rem 0; |   margin: 0.1rem 0; | ||||||
|   align-items: center; |   align-items: center; | ||||||
| } | } | ||||||
|  | .system-foundryvtt-reve-de-dragon .prosemirror menu { | ||||||
|  |   background-color: var(--color-background-chat-message); | ||||||
|  | } | ||||||
| .system-foundryvtt-reve-de-dragon .app.sheet .editor.prosemirror { | .system-foundryvtt-reve-de-dragon .app.sheet .editor.prosemirror { | ||||||
|   height: fit-content; |   height: fit-content; | ||||||
|   min-height: 5rem; |   min-height: 5rem; | ||||||
| @@ -1569,28 +1572,70 @@ select, | |||||||
| .system-foundryvtt-reve-de-dragon .type-compendium { | .system-foundryvtt-reve-de-dragon .type-compendium { | ||||||
|   font-size: 0.6rem; |   font-size: 0.6rem; | ||||||
| } | } | ||||||
| .system-foundryvtt-reve-de-dragon .sheet.journal-entry .journal-sidebar { | .system-foundryvtt-reve-de-dragon .window-app.sheet .window-content .sheet-body, | ||||||
|   color: var(--color-text-dark-primary); | .system-foundryvtt-reve-de-dragon .application .window-content, | ||||||
|  | .system-foundryvtt-reve-de-dragon .journal-entry .journal-sidebar { | ||||||
|  |   background: url(../assets/ui/bg_left.webp) no-repeat left top; | ||||||
|  |   color: var(--rdd-color-text-primary); | ||||||
| } | } | ||||||
| .system-foundryvtt-reve-de-dragon .sheet.journal-entry .journal-sidebar button { | .system-foundryvtt-reve-de-dragon .window-app.sheet .window-content .sheet-body label, | ||||||
|   color: var(--color-text-dark-primary); | .system-foundryvtt-reve-de-dragon .application .window-content label, | ||||||
|  | .system-foundryvtt-reve-de-dragon .journal-entry .journal-sidebar label, | ||||||
|  | .system-foundryvtt-reve-de-dragon .window-app.sheet .window-content .sheet-body .hint, | ||||||
|  | .system-foundryvtt-reve-de-dragon .application .window-content .hint, | ||||||
|  | .system-foundryvtt-reve-de-dragon .journal-entry .journal-sidebar .hint, | ||||||
|  | .system-foundryvtt-reve-de-dragon .window-app.sheet .window-content .sheet-body .permissions-list, | ||||||
|  | .system-foundryvtt-reve-de-dragon .application .window-content .permissions-list, | ||||||
|  | .system-foundryvtt-reve-de-dragon .journal-entry .journal-sidebar .permissions-list, | ||||||
|  | .system-foundryvtt-reve-de-dragon .window-app.sheet .window-content .sheet-body nav.tabs, | ||||||
|  | .system-foundryvtt-reve-de-dragon .application .window-content nav.tabs, | ||||||
|  | .system-foundryvtt-reve-de-dragon .journal-entry .journal-sidebar nav.tabs, | ||||||
|  | .system-foundryvtt-reve-de-dragon .window-app.sheet .window-content .sheet-body nav.tabs button, | ||||||
|  | .system-foundryvtt-reve-de-dragon .application .window-content nav.tabs button, | ||||||
|  | .system-foundryvtt-reve-de-dragon .journal-entry .journal-sidebar nav.tabs button, | ||||||
|  | .system-foundryvtt-reve-de-dragon .window-app.sheet .window-content .sheet-body nav.tabs button .count, | ||||||
|  | .system-foundryvtt-reve-de-dragon .application .window-content nav.tabs button .count, | ||||||
|  | .system-foundryvtt-reve-de-dragon .journal-entry .journal-sidebar nav.tabs button .count, | ||||||
|  | .system-foundryvtt-reve-de-dragon .window-app.sheet .window-content .sheet-body button, | ||||||
|  | .system-foundryvtt-reve-de-dragon .application .window-content button, | ||||||
|  | .system-foundryvtt-reve-de-dragon .journal-entry .journal-sidebar button { | ||||||
|  |   color: var(--rdd-color-text-primary); | ||||||
| } | } | ||||||
| .system-foundryvtt-reve-de-dragon .window-app.sheet .window-content .sheet-header { | .system-foundryvtt-reve-de-dragon .window-app.sheet .window-content .sheet-body a, | ||||||
|  | .system-foundryvtt-reve-de-dragon .application .window-content a, | ||||||
|  | .system-foundryvtt-reve-de-dragon .journal-entry .journal-sidebar a { | ||||||
|  |   color: var(--color-dark-3); | ||||||
|  | } | ||||||
|  | .system-foundryvtt-reve-de-dragon .window-app.sheet .window-content .sheet-body a.filter.active, | ||||||
|  | .system-foundryvtt-reve-de-dragon .application .window-content a.filter.active, | ||||||
|  | .system-foundryvtt-reve-de-dragon .journal-entry .journal-sidebar a.filter.active { | ||||||
|  |   color: var(--color-dark-1); | ||||||
|  | } | ||||||
|  | .system-foundryvtt-reve-de-dragon .window-app .window-content { | ||||||
|  |   background: url(../assets/ui/bg_left.webp) no-repeat left top; | ||||||
|  |   color: var(--rdd-color-text-primary); | ||||||
|  | } | ||||||
|  | .system-foundryvtt-reve-de-dragon .window-app .window-content .sheet-header { | ||||||
|   background: #011d33 url(../assets/ui/bg_header.webp) no-repeat left top; |   background: #011d33 url(../assets/ui/bg_header.webp) no-repeat left top; | ||||||
|   color: #ffffff; |  | ||||||
| } | } | ||||||
| .system-foundryvtt-reve-de-dragon .window-app.sheet .window-content .sheet-header :is( | .system-foundryvtt-reve-de-dragon .window-app .window-content .sheet-header label, | ||||||
|       input[type="text"], | .system-foundryvtt-reve-de-dragon .window-app .window-content .sheet-header .hint, | ||||||
|       input[type="number"], | .system-foundryvtt-reve-de-dragon .window-app .window-content .sheet-header .permissions-list, | ||||||
|       input[type="password"], | .system-foundryvtt-reve-de-dragon .window-app .window-content .sheet-header nav.tabs, | ||||||
|       input[type="datetime-local"], | .system-foundryvtt-reve-de-dragon .window-app .window-content .sheet-header nav.tabs button, | ||||||
|       input[type="date"], | .system-foundryvtt-reve-de-dragon .window-app .window-content .sheet-header nav.tabs button .count, | ||||||
|       input[type="time"]) { | .system-foundryvtt-reve-de-dragon .window-app .window-content .sheet-header div, | ||||||
|   color: rgba(255, 255, 255, 0.75); | .system-foundryvtt-reve-de-dragon .window-app .window-content .sheet-header button { | ||||||
|   background: rgba(255, 255, 255, 0.1); |   color: rgba(255, 255, 255, 0.9); | ||||||
|  | } | ||||||
|  | .system-foundryvtt-reve-de-dragon .window-app .window-content .sheet-header input { | ||||||
|  |   color: rgba(255, 255, 255, 0.9); | ||||||
|   border: 0 none; |   border: 0 none; | ||||||
|   margin-bottom: 0.2rem; |   margin-bottom: 0.2rem; | ||||||
| } | } | ||||||
|  | .system-foundryvtt-reve-de-dragon .window-app .window-content .sheet-header input[type="checkbox"] { | ||||||
|  |   color: rgba(255, 255, 255, 0.75); | ||||||
|  | } | ||||||
| .system-foundryvtt-reve-de-dragon input[type="number"] { | .system-foundryvtt-reve-de-dragon input[type="number"] { | ||||||
|   text-align: right; |   text-align: right; | ||||||
|   padding-right: 0.5rem; |   padding-right: 0.5rem; | ||||||
| @@ -1631,7 +1676,7 @@ select, | |||||||
|   width: calc(100% - 2px); |   width: calc(100% - 2px); | ||||||
|   height: var(--form-field-height); |   height: var(--form-field-height); | ||||||
|   margin: 0; |   margin: 0; | ||||||
|   color: var(--color-text-dark-primary); |   color: var(--rdd-color-text-primary); | ||||||
|   border-radius: 0.2rem; |   border-radius: 0.2rem; | ||||||
| } | } | ||||||
| .system-foundryvtt-reve-de-dragon form.app-personnage-aleatoire h2 { | .system-foundryvtt-reve-de-dragon form.app-personnage-aleatoire h2 { | ||||||
|   | |||||||
| @@ -656,9 +656,15 @@ | |||||||
|     margin: 0.1rem 0; |     margin: 0.1rem 0; | ||||||
|     align-items: center; |     align-items: center; | ||||||
|   } |   } | ||||||
|  |   .prosemirror { | ||||||
|  |     menu{ | ||||||
|  |       background-color: var(--color-background-chat-message); | ||||||
|  |     } | ||||||
|  |   } | ||||||
|   .app.sheet .editor.prosemirror { |   .app.sheet .editor.prosemirror { | ||||||
|     height: fit-content; |     height: fit-content; | ||||||
|     min-height: 5rem; |     min-height: 5rem; | ||||||
|  |  | ||||||
|   } |   } | ||||||
|   .app.sheet .editor.prosemirror .editor-container { |   .app.sheet .editor.prosemirror .editor-container { | ||||||
|     min-height: 5rem; |     min-height: 5rem; | ||||||
| @@ -865,32 +871,60 @@ | |||||||
|   .type-compendium { |   .type-compendium { | ||||||
|     font-size: 0.6rem; |     font-size: 0.6rem; | ||||||
|   } |   } | ||||||
|   .sheet.journal-entry .journal-sidebar { |   .window-app.sheet .window-content .sheet-body, | ||||||
|     color: var(--color-text-dark-primary); |   .application .window-content, | ||||||
|  |   .journal-entry .journal-sidebar { | ||||||
|  |     background: url(../assets/ui/bg_left.webp) no-repeat left top; | ||||||
|  |     color: var(--rdd-color-text-primary); | ||||||
|  |     label , | ||||||
|  |     .hint , | ||||||
|  |     .permissions-list , | ||||||
|  |     nav.tabs, | ||||||
|  |     nav.tabs button, | ||||||
|  |     nav.tabs button .count, | ||||||
|     button { |     button { | ||||||
|       color: var(--color-text-dark-primary); |       color: var(--rdd-color-text-primary); | ||||||
|  |     } | ||||||
|  |     a { | ||||||
|  |       color: var(--color-dark-3); | ||||||
|  |     } | ||||||
|  |     a.filter.active { | ||||||
|  |       color: var(--color-dark-1); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |    | ||||||
|   /* ======================================== */ |   /* ======================================== */ | ||||||
|   /* Sheet  */ |   /* Sheet  */ | ||||||
|   .window-app.sheet .window-content .sheet-header{ |   .window-app .window-content{ | ||||||
|     background: #011d33 url(../assets/ui/bg_header.webp) no-repeat left top; |     background: url(../assets/ui/bg_left.webp) no-repeat left top; | ||||||
|     color: rgba(255, 255, 255, 1); |     color: var(--rdd-color-text-primary); | ||||||
|   } |      | ||||||
|  |     .sheet-header { | ||||||
|  |       background: #011d33 url(../assets/ui/bg_header.webp) no-repeat left top; | ||||||
|  |  | ||||||
|  |       label , | ||||||
|  |       .hint , | ||||||
|  |       .permissions-list , | ||||||
|  |       nav.tabs, | ||||||
|  |       nav.tabs button, | ||||||
|  |       nav.tabs button .count, | ||||||
|  |       div, | ||||||
|  |       button { | ||||||
|  |         color: rgba(255, 255, 255, 0.9); | ||||||
|  |       } | ||||||
|  |       input { | ||||||
|  |         //color: rgba(255, 255, 255, 0); | ||||||
|  |         color: rgba(255, 255, 255, 0.9); | ||||||
|  |         border: 0 none; | ||||||
|  |         margin-bottom: 0.2rem; | ||||||
|  |       } | ||||||
|  |       input[type="checkbox"] { | ||||||
|  |         // background-color: hsla(268, 41%, 56%, 0.9); | ||||||
|  |         color: rgba(255, 255, 255, 0.75); | ||||||
|  |       } | ||||||
|  |     } | ||||||
|  |   }  | ||||||
|  |  | ||||||
|   .window-app.sheet .window-content .sheet-header :is( |  | ||||||
|       input[type="text"], |  | ||||||
|       input[type="number"], |  | ||||||
|       input[type="password"], |  | ||||||
|       input[type="datetime-local"], |  | ||||||
|       input[type="date"], |  | ||||||
|       input[type="time"]) { |  | ||||||
|     color: rgba(255, 255, 255, 0.75); |  | ||||||
|     background: rgba(255, 255, 255, 0.1); |  | ||||||
|     border: 0 none; |  | ||||||
|     margin-bottom: 0.2rem; |  | ||||||
|   } |  | ||||||
|  |  | ||||||
|   input[type="number"] { |   input[type="number"] { | ||||||
|     text-align: right; |     text-align: right; | ||||||
| @@ -934,7 +968,7 @@ | |||||||
|     width: calc(100% - 2px); |     width: calc(100% - 2px); | ||||||
|     height: var(--form-field-height); |     height: var(--form-field-height); | ||||||
|     margin: 0; |     margin: 0; | ||||||
|     color: var(--color-text-dark-primary); |     color: var(--rdd-color-text-primary); | ||||||
|     border-radius: 0.2rem; |     border-radius: 0.2rem; | ||||||
|   } |   } | ||||||
|   form.app-personnage-aleatoire { |   form.app-personnage-aleatoire { | ||||||
|   | |||||||
| @@ -12,12 +12,13 @@ const _SPACEHOLDER = { placeholder: true } | |||||||
|  |  | ||||||
| const _VENDRE = { | const _VENDRE = { | ||||||
|   code: 'item-vendre', label: 'Vendre ou donner', icon: it => 'fa-solid fa-comments-dollar', |   code: 'item-vendre', label: 'Vendre ou donner', icon: it => 'fa-solid fa-comments-dollar', | ||||||
|   filter: it => Misc.toInt(it.system.quantite) > 0, |   filter: it => Misc.toInt(it.system.quantite) > 0 || it.parent?.type == ACTOR_TYPES.commerce, | ||||||
|   action: (item, actor) => item.proposerVente() |   action: (item, actor) => item.proposerVente() | ||||||
| } | } | ||||||
| const _ACHETER = { | const _ACHETER = { | ||||||
|   code: 'item-acheter', label: 'Acheter', icon: it => 'fa-regular fa-coins', |   code: 'item-acheter', label: 'Acheter', icon: it => 'fa-regular fa-coins', | ||||||
|   filter: it => Misc.toInt(it.system.quantite) > 0 && it.parent?.type == ACTOR_TYPES.commerce, |   filter: it => it.parent?.type == ACTOR_TYPES.commerce, | ||||||
|  |   allowLimited: true, | ||||||
|   action: (item, actor) => actor.vente(item) |   action: (item, actor) => actor.vente(item) | ||||||
| } | } | ||||||
| const _MONTRER = { | const _MONTRER = { | ||||||
|   | |||||||
| @@ -138,7 +138,7 @@ export class StatusEffects extends FormApplication { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   static prepareActiveEffect(effectId) { |   static prepareActiveEffect(effectId) { | ||||||
|     let status = rddStatusEffects.find(it => it.statuses.has(effectId)) |     let status = rddStatusEffects.find(it => it.statuses? it.statuses.has(effectId) : it.id == effectId) | ||||||
|     if (status) { |     if (status) { | ||||||
|       status = foundry.utils.duplicate(status) |       status = foundry.utils.duplicate(status) | ||||||
|       status.statuses = new Set([effectId]) |       status.statuses = new Set([effectId]) | ||||||
|   | |||||||
| @@ -40,6 +40,7 @@ | |||||||
|     </div> |     </div> | ||||||
|     <hr> |     <hr> | ||||||
|     {{> "systems/foundryvtt-reve-de-dragon/templates/actor/commerce-inventaire.hbs"}} |     {{> "systems/foundryvtt-reve-de-dragon/templates/actor/commerce-inventaire.hbs"}} | ||||||
|  |     {{log @root.options}} | ||||||
|     {{#unless system.illimite}} |     {{#unless system.illimite}} | ||||||
|     {{#if @root.options.isObserver}} |     {{#if @root.options.isObserver}} | ||||||
|       <hr> |       <hr> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user