Skip to content

Wiki and Trait Description Overhaul #1555

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.

Sign up for GitHub

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

Open
g4nd41ph wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Wiki and Trait Description Overhaul #1555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a825cb9
Revamp Trait Description Generation System for Easier Maintenance
g4nd41ph Feb 3, 2026
dbaa372
Major wiki and trait description overhaul:
g4nd41ph Feb 9, 2026
8f22c74
Relatively minor compared to last update. This update includes:
g4nd41ph Feb 11, 2026
97e0eb2
Many Small Updates to Wiki and Descriptions
g4nd41ph Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/achieve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { global, set_alevel, set_ulevel } from './vars.js';
import { clearElement, popover, flib, calc_mastery, masteryType, calcPillar, svgIcons, svgViewBox, format_emblem, getBaseIcon, sLevel, vBind, calcQueueMax, calcRQueueMax, messageQueue, eventActive, easterEgg, getHalloween, trickOrTreat, harmonyEffect } from './functions.js';
import { clearElement, popover, flib, calc_mastery, masteryType, calcPillar, svgIcons, svgViewBox, format_emblem, getBaseIcon, sLevel, vBind, calcQueueMax, calcRQueueMax, messageQueue, eventActive, easterEgg, getHalloween, trickOrTreat, harmonyEffect, convertDivisor } from './functions.js';
import { races, genus_def } from './races.js';
import { actions } from './actions.js';
import { universe_affixes, universe_types, piracy } from './space.js';
Expand Down Expand Up @@ -1530,7 +1530,7 @@ export const perkList = {
},
{
desc(){
return loc("achieve_perks_technophobe4",[10]);
return loc("achieve_perks_technophobe4",[-convertDivisor(-10)]);
},
active(){
return global.stats.achieve['technophobe'] && global.stats.achieve.technophobe.l >= 5 ? true : false;
Expand Down
250 changes: 78 additions & 172 deletions src/functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { global, save, message_logs, message_filters, webWorker, keyMultiplier, intervals, resizeGame, atrack, p_on, quantum_level, tmp_vars } from './vars.js';
import { loc } from './locale.js';
import { races, traits, genus_def, traitSkin, fathomCheck } from './races.js';
import { races, traits, genus_def, traitSkin, fathomCheck} from './races.js';
import { actions, actionDesc } from './actions.js';
import { jobScale } from './jobs.js';
import { universe_affixes } from './space.js';
Expand Down Expand Up @@ -3139,112 +3139,59 @@ export function getShrineBonus(type) {
return shrine_bonus;
}

const valAdjust = {
promiscuous: false,
revive: false,
fast_growth: false,
spores: false,
terrifying: false,
fibroblast: true,
hivemind: true,
imitation: true,
elusive: true,
chameleon: true,
blood_thirst: true,
selenophobia: true,
hooved: true,
anthropophagite: true,
unfathomable: false,
darkness: false,
living_tool: false,
living_materials: true,
blurry: true,
playful: true,
ghostly: true,
environmentalist: true,
catnip: true,
anise: true
};

function getTraitVals(trait, rank, species){
//Get values from the trait
let vals = traits[trait].hasOwnProperty('vars') ? traits[trait].vars(rank) : [];
if (valAdjust.hasOwnProperty(trait)){
if (trait === 'fibroblast'){
vals = [vals[0] * 5];
}
else if (trait === 'hivemind' && global.race['high_pop']){
vals = [vals[0] * traits.high_pop.vars()[0]];
}
else if (trait === 'imitation'){
vals.push(races[global.race['srace'] || 'protoplasm'].name);
}
else if (trait === 'elusive'){
vals = [Math.round(((1/30)/(1/(30+vals[0]))-1)*100)];
}
else if (trait === 'chameleon'){
vals = [vals[0], Math.round(((1/30)/(1/(30+vals[1]))-1)*100)];
}
else if (trait === 'blood_thirst'){
vals = [Math.ceil(Math.log2(vals[0]))];
}
else if (trait === 'selenophobia'){
vals = [14 - vals[0], vals[0]];
}
else if (trait === 'hooved'){
vals.unshift(hoovedRename(false, species));
}
else if (trait === 'anthropophagite'){
vals = [vals[0] * 10000];
}
else if (trait === 'living_materials'){
vals = [global.resource.Lumber.name, global.resource.Plywood.name, global.resource.Furs.name, loc('resource_Amber_name')];
}
else if (trait === 'environmentalist'){
let coal = -(actions.city.coal_power.powered(true));
let oil = -(actions.city.oil_power.powered(true));
vals = [coal + vals[0], oil + vals[0] - 1, oil + vals[0] + 1, coal, oil, vals[1]];
}
else if (trait === 'blurry'){
if (global.race['warlord']){
vals = [+((100/(100-vals[0])-1)*100).toFixed(1)];
}
}
else if (trait === 'playful'){
if (global.race['warlord']){
vals = [vals[0] * 100, global.resource.Furs.name];
}
}
else if (trait === 'ghostly'){
if (global.race['warlord']){
vals = [vals[0], +((vals[1] - 1) * 100).toFixed(0), global.resource.Soul_Gem.name];
}
}
else if (trait === 'catnip' || trait === 'anise'){
vals = rank <= 2 ? [] : (rank === 3 ? [vals[0]] : [vals[0],vals[1]]);
}
else if (!valAdjust[trait]){
vals = [];
}
}
else if (trait === 'elemental'){
switch (traits.elemental.vars(rank)[0]){
case 'electric':
vals = [loc(`element_electric`), traits.elemental.vars(rank)[1], traits.elemental.vars(rank)[5]];
break;
case 'acid':
vals = [loc(`element_acid`), traits.elemental.vars(rank)[2], traits.elemental.vars(rank)[5]];
break;
case 'fire':
vals = [loc(`element_fire`), traits.elemental.vars(rank)[3], traits.elemental.vars(rank)[5]];
break;
case 'frost':
vals = [loc(`element_frost`), traits.elemental.vars(rank)[4], traits.elemental.vars(rank)[5], loc('city_biolab')];
break;
}
if (traits[trait] == traits.hooved) vals[1] = species;

//Use the desc_function system to modify trait values for descriptions, if this trait has a description function
if (traits[trait].hasOwnProperty('desc_function')) {
vals = traits[trait].desc_function(vals);
}

return vals;
}

function getExtraData(trait, rank, species) {
//Get trait data in case it's needed to format the extra data
let vals = traits[trait].hasOwnProperty('vars') ? traits[trait].vars(rank) : [];
if (traits[trait] == traits.hooved) vals[1] = species;
return traits[trait].desc_extra(vals);
}


export function warningText(input) {
return `<span class="has-text-warning">${loc(input)}</span>`
}

export function warningTextNoLoc(input) {
return `<span class="has-text-warning">${input}</span>`
}

export function linkText(input, link) {
return `<span class="has-text-warning"><a href="${link}" target="_blank">${loc(input)}</a></span>`
}

export function linkTextNoColor(input, link) {
return `<a href="${link}" style="color: inherit;" target="_blank">${loc(input)}</a>`
}

export function rName(r){
let res = global.hasOwnProperty('resource') && global.resource.hasOwnProperty(r) ? global.resource[r].name : loc(`resource_${r}_name`);
return `<span class="has-text-warning">${res}</span>`;
}

export function rNameNoColor(r){
let res = global.hasOwnProperty('resource') && global.resource.hasOwnProperty(r) ? global.resource[r].name : loc(`resource_${r}_name`);
return `<span style="color: inherit;">${res}</span>`;
}


export function convertDivisor (input) {
//The input value is a percentage used to multiply a divisor, use X/(1+X) to indicate a percentage change in descriptions.
return +(100 * input / (100 + input)).toFixed(2);
}

export function hoovedRename(style, species=global.race.species){
let type = species === global.race.species ? global.race.maintype || races[species].type : races[species].type;
if (species === 'sludge'){
Expand Down Expand Up @@ -3306,75 +3253,14 @@ export function hoovedRename(style, species=global.race.species){
}
}

const traitExtra = {
infiltrator: [
loc(`wiki_trait_effect_infiltrator_ex1`),
loc(`wiki_trait_effect_infiltrator_ex2`,[
[
`<span class="has-text-warning">${loc('tech_steel')}</span>`, `<span class="has-text-warning">${loc('tech_electricity')}</span>`, `<span class="has-text-warning">${loc('tech_electronics')}</span>`, `<span class="has-text-warning">${loc('tech_fission')}</span>`,
`<span class="has-text-warning">${loc('tech_rocketry')}</span>`, `<span class="has-text-warning">${loc('tech_artificial_intelligence')}</span>`, `<span class="has-text-warning">${loc('tech_quantum_computing')}</span>`,
`<span class="has-text-warning">${loc('tech_virtual_reality')}</span>`, `<span class="has-text-warning">${loc('tech_shields')}</span>`, `<span class="has-text-warning">${loc('tech_ai_core')}</span>`, `<span class="has-text-warning">${loc('tech_graphene_processing')}</span>`,
`<span class="has-text-warning">${loc('tech_nanoweave')}</span>`, `<span class="has-text-warning">${loc('tech_orichalcum_analysis')}</span>`, `<span class="has-text-warning">${loc('tech_infernium_fuel')}</span>`
].join(', ')
])
],
heavy: [
loc(`wiki_trait_effect_heavy_ex1`,[rName('Stone'),rName('Cement'),rName('Wrought_Iron')])
],
sniper: [
loc(`wiki_trait_effect_sniper_ex1`),
],
hooved: [
function(opts){return loc(`wiki_trait_effect_hooved_ex1`,[hoovedRename(false, opts.species)])},
loc(`wiki_trait_effect_hooved_ex2`,[
`<span class="has-text-warning">${global.resource.hasOwnProperty('Lumber') ? global.resource.Lumber.name : loc('resource_Lumber_name')}</span>`,
`<span class="has-text-warning">${global.resource.hasOwnProperty('Copper') ? global.resource.Copper.name : loc('resource_Copper_name')}</span>`,
`<span class="has-text-warning">${global.resource.hasOwnProperty('Iron') ? global.resource.Iron.name : loc('resource_Iron_name')}</span>`,
`<span class="has-text-warning">${global.resource.hasOwnProperty('Steel') ? global.resource.Steel.name : loc('resource_Steel_name')}</span>`,
`<span class="has-text-warning">${global.resource.hasOwnProperty('Adamantite') ? global.resource.Adamantite.name : loc('resource_Adamantite_name')}</span>`,
`<span class="has-text-warning">${global.resource.hasOwnProperty('Orichalcum') ? global.resource.Orichalcum.name : loc('resource_Orichalcum_name')}</span>`,
12,75,150,500,5000
]),
loc(`wiki_trait_effect_hooved_ex3`),
function(opts){return loc(`wiki_trait_effect_hooved_ex4`,[`<span class="has-text-warning">${5}</span>`,hoovedRename(false, opts.species)])},
loc(`wiki_trait_effect_hooved_ex5`,[
`<span class="has-text-warning">${global.resource.hasOwnProperty('Lumber') ? global.resource.Lumber.name : loc('resource_Lumber_name')}</span>`,
`<span class="has-text-warning">${global.resource.hasOwnProperty('Copper') ? global.resource.Copper.name : loc('resource_Copper_name')}</span>`
]),
],
instinct: [
loc(`wiki_trait_effect_instinct_ex1`,[6.67,loc('galaxy_chthonian'),10])
],
logical: [
loc(`wiki_trait_effect_logical_ex1`,[
global.tech.hasOwnProperty('science') ? global.tech.science : 0,
global.tech.hasOwnProperty('high_tech') ? global.tech.high_tech : 0
]),
],
high_pop: [
loc(`wiki_trait_effect_high_pop_ex1`)
],
flier: [
loc(`wiki_trait_effect_flier_ex1`)
],
unfathomable: [
loc(`wiki_trait_effect_unfathomable_ex1`),
loc(`wiki_trait_effect_unfathomable_ex2`)
]
};

function rName(r){
let res = global.hasOwnProperty('resource') && global.resource.hasOwnProperty(r) ? global.resource[r].name : loc(`resource_${r}_name`);
return `<span class="has-text-warning">${res}</span>`;
}

const altTraitDesc = {
befuddle: 'warlord',
blurry: 'warlord',
ghostly: 'warlord',
playful: 'warlord',
};


export function getTraitDesc(info, trait, opts){
let fanatic = opts['fanatic'] || false;
let tpage = opts['tpage'] || false; // Trait page (on wiki)
Expand All @@ -3388,7 +3274,7 @@ export function getTraitDesc(info, trait, opts){
let traitDesc = traitSkin('desc', trait, species);

if (tpage && ['genus','major'].includes(traits[trait].type)){
rank = `<span><span role="button" @click="down()">&laquo;</span><span class="has-text-warning">${loc(`wiki_trait_rank`)} {{ rank }}</span><span role="button" @click="up()">&raquo;</span></span>`;
rank = `<span style="width: 105px; display: inline-block; text-align:center;"><span style="float: left;" role="button" @click="down()">&laquo;</span><span class="has-text-warning">${loc(`wiki_trait_rank`)} {{ rank }}</span><span style="float: right;" role="button" @click="up()">&raquo;</span></span>`;
}
if (tpage || rpage){
info.append(`<div class="type"><h2 class="has-text-warning">${traitName}</h2>${rank}</div>`);
Expand Down Expand Up @@ -3435,13 +3321,20 @@ export function getTraitDesc(info, trait, opts){
info.append(`<div class="has-text-${color} effect">${trait_desc}</div>`);
}
}
if (traitExtra[trait] && (tpage || rpage)){
traitExtra[trait].forEach(function(te){
if (typeof te !== 'string'){
te = te(opts);
}
info.append(`<div class="effect">${te}</div>`);
});
if (traits[trait].hasOwnProperty('desc_extra') && (tpage || rpage)) {
if (tpage && ['genus','major'].includes(traits[trait].type)) {
info.append(`<div class="effect" v-html="getTraitExtra(rank)"></div>`);
}
else {
let extraData = getExtraData(trait, trank, species);

extraData.forEach(function(te){
if (typeof te !== 'string'){
te = te(opts);
}
info.append(`<div class="effect">${te}</div>`);
});
}
}

if (tpage && ['genus','major'].includes(traits[trait].type)){
Expand All @@ -3464,6 +3357,19 @@ export function getTraitDesc(info, trait, opts){
let key = altTraitDesc[trait] && global.race.hasOwnProperty(altTraitDesc[trait]) ? altTraitDesc[trait] : 'effect';
return loc(`wiki_trait_${key}_${trait}`, getTraitVals(trait, rk, species));
},
getTraitExtra(rk) {
let accumulator = '';
let extraData = getExtraData(trait, rk, species);

extraData.forEach(function(te){
if (typeof te !== 'string'){
te = te(opts);
}
accumulator += `<div class="effect">${te}</div>`;
});

return accumulator;
},
up(){
switch (data.rank){
case 0.1:
Expand Down Expand Up @@ -3517,4 +3423,4 @@ export function getTraitDesc(info, trait, opts){
},
});
}
}
}
4 changes: 2 additions & 2 deletions src/jobs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ export function loadServants(){
});

popover('servants', function(){
return loc('civics_servants_desc');
return loc('civics_servants_desc', [loc('wiki_mechanics_job_type_basic')]);
},
{
elm: `#servants .serveHeader`
Expand Down Expand Up @@ -1026,7 +1026,7 @@ export function loadFoundry(servants){

if (servants){
popover('servantFoundry', function(){
return loc('civics_skilled_servants_desc');
return loc('civics_skilled_servants_desc', loc('wiki_mechanics_job_type_basic'));
},
{
elm: `#skilledServants .foundry`,
Expand Down
5 changes: 4 additions & 1 deletion src/portal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1906,12 +1906,15 @@ const fortressModules = {
powered(){ return powerCostMod(5); },
support(){ return 1; },
effect(){
//Make sure to handle interaction with Hivemind correctly
let guard_posts_on = Math.max(global.portal?.guard_post?.on, 1);
let rating = Math.round(armyRating(jobScale(guard_posts_on), 'hellArmy', 0) / guard_posts_on);
let holy = global.race['holy'] ? 1 + (traits.holy.vars()[1] / 100) : 1;
let unicornFathom = fathomCheck('unicorn');
if (unicornFathom > 0){
holy *= 1 + (traits.holy.vars(1)[1] / 100 * unicornFathom);
}
let rating = Math.round(holy * armyRating(jobScale(1),'hellArmy',0));
rating *= holy;
return `<div>${loc('portal_guard_post_effect1',[rating])}</div><div class="has-text-caution">${loc('portal_guard_post_effect2',[jobScale(1),$(this)[0].powered()])}</div>`;
},
action(args){
Expand Down
Loading