Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upadte 2d20 roll and damage roll #380

Closed
wants to merge 15 commits into from
24 changes: 21 additions & 3 deletions i18n/en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -491,10 +491,16 @@ FALLOUT.TOOLTIPS.WeaponQuality.unreliable: When you make an attack with an Unrel
FALLOUT.TOOLTIPS.WeaponQuality.unstable_radiation: This was never designed to be used as a handheld weapon. When attacking with a weapon, each complication you inflicts 2DC Radiation damage from radioactive feedback. A weapon may not have both Reliable and Unstable Radiation.
FALLOUT.UI.Add: Add
FALLOUT.UI.Addictions: Addictions
FALLOUT.UI.Additional_amo: Additional damage dice from firerate
FALLOUT.UI.Additional_mele_dmg: Additional damage dice for party AP
FALLOUT.UI.Additional_mele_dmg_overseer: Additional damage dice for overseer AP
FALLOUT.UI.APPAREL_MODS: Apparel Mods
FALLOUT.UI.AreYouSure: Are You Sure?
FALLOUT.UI.BaseDamage: Base Damage
FALLOUT.UI.Are_You_Sure: Are You Sure?
FALLOUT.UI.ASSISTANCE: Assistance
FALLOUT.UI.Base_damage: Base Damage
FALLOUT.UI.Bonus_dmg: Additionad damage dice
FALLOUT.UI.BOOKS_AND_MAGZS: Books and Magazines
FALLOUT.UI.Buy_from_Overseer: Buy from Overseer
FALLOUT.UI.Cancel: Cancel
FALLOUT.UI.CAPS: Caps
FALLOUT.UI.CarryWeight: Carry Weight
Expand All @@ -508,23 +514,35 @@ FALLOUT.UI.Cost: Cost
FALLOUT.UI.Damage: Damage
FALLOUT.UI.DISEASES: Diseases
FALLOUT.UI.favorite: Favorite
FALLOUT.UI.FREED20: Free additional dice
FALLOUT.UI.INVENTORY: Inventory
FALLOUT.UI.MISCELLANY: Miscellany
FALLOUT.UI.Name: Name
FALLOUT.UI.Not_Enough: Not Enough
FALLOUT.UI.OTHER: Other
FALLOUT.UI.Perks: Perks
FALLOUT.UI.Qty: Qty
FALLOUT.UI.Quantity: Quantity
FALLOUT.UI.Rarity: Rarity
FALLOUT.UI.REGULAR: Regular
FALLOUT.UI.PAYAP1: Pay 1AP
FALLOUT.UI.PAYAP3: Pay 3AP
FALLOUT.UI.PAYAP6: Pay 6AP
FALLOUT.UI.ROBOT_MODULES: Robot Modules
FALLOUT.UI.SaveChanges: Save Changes
FALLOUT.UI.Roll: Roll
FALLOUT.UI.Save_SChanges: Save Changes
FALLOUT.UI.Special_Abilities: Special Abilities
FALLOUT.UI.SPECIAL_ABILITY: Special Ability
FALLOUT.UI.SPENT: Spent
FALLOUT.UI.Spend_AP: Spend AP
FALLOUT.UI.Spend_Overseer_AP: Spend Overseer AP
FALLOUT.UI.stashed: Stashed
FALLOUT.UI.Type: Type
FALLOUT.UI.UNSORTED: Unsorted
FALLOUT.UI.Weapon_damage_dice: Damage dice from weapon
FALLOUT.UI.WEAPON_MODS: Weapon Mods
FALLOUT.UI.Weight: Weight
FALLOUT.UI.With: With
FALLOUT.UI.Yes: Yes
FALLOUT.WEAPONS.damageEffect.arc: Arc
FALLOUT.WEAPONS.damageEffect.breaking: Breaking
Expand Down
52 changes: 50 additions & 2 deletions scss/global/_window.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
.window-app {
font-family: $font-primary;
}

}
.window-app .flexrow.fallout-dialog {
overflow-y: visible;
overflow-x: visible;
}
.font-primary {
font-family: $font-primary;
}
Expand Down Expand Up @@ -137,6 +141,17 @@
&.dice-selected {
opacity: 0.45;
}

}
.flavor-text {
margin: 0 0 0 0;
font-family: "Lobster", cursive, cursive;
padding: 8px;
font-size: 15px;
background-image: url(../assets/chat/yellow-placq.webp);
background-size: 100% 100%;
background-repeat: no-repeat;
display: flex;
}
}
}
Expand All @@ -145,7 +160,14 @@
.resource {
margin: 0 2px 5px;
padding: 0 5px 0 0;
background-color: $f-blue;
background-color: #729eb2;
display: grid;
grid-template-rows: auto auto;
grid-template-columns: repeat(2,auto);
justify-content: space-evenly;
align-content: center;
align-items: center;
justify-items: center;
&.tile {
background-color: $f-tile;
}
Expand All @@ -167,6 +189,7 @@
input[type="number"] {
text-align: center;
background-color: beige;
width: 30px;
}
}
ul {
Expand Down Expand Up @@ -342,6 +365,30 @@
cursor: pointer;
}
}
select.fire-rate-select {
background: beige;
}
.pulsing-text {
animation: pulse 1s infinite alternate;
color: red;
padding: 5px;
font-family: "Lobster", cursive;
text-align: center;
}

@keyframes pulse {
from {
opacity: 1;
}
to {
opacity: 0.5;
}
}
.flexrow.resource.pulsing {
grid-column: 1 / -1;
place-self: center;
}


.encumbrance {
background-color: rgb(79, 105, 144);
Expand All @@ -357,4 +404,5 @@
bottom: 0;

width: 100%;

}
5 changes: 5 additions & 0 deletions system/src/handlebars.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -246,5 +246,10 @@ export default function registerHandlebarsHelpers() {
const html = options.fn(this);
return html.replace(rgx, "$& selected");
});
Handlebars.registerHelper("for", function(n, block) {
let additionalAmmo = "";
for (let i = 0; i <= n; ++i) additionalAmmo += block.fn(i);
return additionalAmmo;
});

}
Loading