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

Economics v2 [New Branch Needed] #1181

Closed
wants to merge 66 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
cb486fa
reinstate economics logic
sofronaspe Sep 26, 2024
877e269
added names to the random names of zones (#1128)
Avengium Sep 11, 2024
9f3e707
hotfix: 1.103.7
Sep 12, 2024
1e0b4d6
fix: #1129
Sep 12, 2024
6990117
Refactor layers rendering (#1120)
Azgaar Sep 20, 2024
e671739
style: reduce submap dialog width - v1.104.1
Sep 20, 2024
a385db1
feat: use StaleWhileRevalidate for scripts poloicy; v1.104.2
Sep 20, 2024
19ee111
fix: routes (v1.104.3)
Sep 20, 2024
0a38834
fix: service worker fn
Sep 20, 2024
bc08cd8
fix: #1136
Sep 20, 2024
373d6fa
fix: slow load
Sep 20, 2024
49bfd20
fix: heightmap edit in Erase mode
Sep 20, 2024
7b526cc
fix: layers - show emblems on render
Sep 21, 2024
4c2f878
fix: heightmap edit in Risk mode
Sep 21, 2024
28a69b9
fix: remove route if it has <2 points
Sep 21, 2024
f5bb89c
fix: loose format requirements for old files to show correct message
Sep 21, 2024
e9cfa64
fix: don't hide armies layer
Sep 21, 2024
306eb94
fix: draw military fn reference
Sep 21, 2024
be4f206
fix: split regiment v1.104.14
Sep 22, 2024
7f8fab9
fix: features - define first cell
Sep 22, 2024
1ffcea2
AI Assistant widget (#1115)
Azgaar Sep 22, 2024
342ee80
feat: battles - move Regiments back to init position after the battle
Sep 22, 2024
10a7e45
fix: disable double-click on heightmap edit
Sep 22, 2024
bfb1c51
chore: supporters update
Sep 23, 2024
3810313
chore: set libs version
Sep 23, 2024
c8885c0
fix: typo
Sep 25, 2024
167e880
fix: redraw features on load
Sep 25, 2024
e99394c
fix: issue with feature vertex being out of bound
Sep 25, 2024
8ed24c2
refactor: burg types
Sep 27, 2024
6af79e1
fix: gap path to not omit the M path sign
Sep 29, 2024
9da6f22
feat: allow to crean data in case of load error
Oct 1, 2024
c7f38f7
fix: remove unwanted states styling
Oct 3, 2024
e1d70da
fix: allow to load smaller namesbase without issues on regeneration
Oct 8, 2024
d05237e
fix #1152
Oct 11, 2024
3f50a31
fix: #1152, don't keep removed locked cultures on regenerate
Oct 13, 2024
15eef02
fix: #1152, don't keep removed locked cultures on regenerate
Oct 13, 2024
6c39a67
fix: features rendering - close the ring
Oct 13, 2024
bb6bd72
fix: lock all burgs
Oct 16, 2024
53a6892
Draw state labels improvement (#1155)
Azgaar Oct 19, 2024
ed92b5e
fix: CRLF issue
Oct 19, 2024
bf1a407
fix: zones editor - legend to be toggable
Oct 19, 2024
1e00161
chore: parse DEBUG setting as an object
Oct 22, 2024
012f19a
chore: update 1.105.19 hash
Oct 22, 2024
ef2eb0a
feat: zones editor - don't close other editors on open
Oct 22, 2024
8f583e9
Removed priority queue in favor of FlatQueue (#1157)
RyanGuild Oct 26, 2024
b2e5c04
fix: add p to priority queue
Oct 26, 2024
7a75c57
Stroke dash to cells (#1159)
Avengium Oct 26, 2024
f123f7b
Temperature parameters can be customized (#1162)
dyxang Nov 7, 2024
6263998
AI Claude support (#1167)
Azgaar Nov 14, 2024
281abf4
chore: supporters update
Nov 15, 2024
31c1303
fix: #1170
Nov 24, 2024
56df31d
fix: #1172
Nov 27, 2024
a6f0b8b
chore: update supporters
Nov 28, 2024
27e43eb
Update FUNDING.yml
Azgaar Nov 28, 2024
8a4b83f
[Draft] Submap refactoring (#1153)
Azgaar Dec 12, 2024
1cbcdbe
fix: #1174
Dec 13, 2024
0c15957
fix: submap - generate in current canvas size
Dec 13, 2024
73c71d5
fix: don't mask routes
Dec 13, 2024
2d7a816
fix: sumap - clip routes by bbox
Dec 14, 2024
1898a1c
style: increase dialog buttons size
Dec 16, 2024
c6377a5
feat: like temp likeness, 1.106.6
Dec 17, 2024
308ead9
fix: 1.106.7 - rivers starting width calc
Dec 17, 2024
b421191
reinstate economics logic
sofronaspe Sep 26, 2024
063c440
adjust to align with master
sofronaspe Jan 11, 2025
efbca32
Rebase, add functionality to Resources editor.
sofronaspe Jan 11, 2025
9ce260a
Fix icon size in burg editor.
sofronaspe Jan 11, 2025
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
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# These are supported funding model platforms

github: Azgaar
patreon: Azgaar
103 changes: 74 additions & 29 deletions index.css
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,6 @@ a {
fill: none;
}

#biomes {
stroke-width: 0.7;
}

#landmass {
mask: url(#land);
fill-rule: evenodd;
Expand Down Expand Up @@ -190,20 +186,12 @@ t,
font-size: 0.8em;
}

#statesBody {
stroke-width: 3;
}

#statesHalo {
fill: none;
stroke-linecap: round;
stroke-linejoin: round;
}

#provincesBody {
stroke-width: 0.2;
}

#statesBody,
#provincesBody,
#relig,
Expand Down Expand Up @@ -685,6 +673,7 @@ input[type="color"]::-webkit-color-swatch-wrapper {
border: none;
padding: 0.45em 0.75em;
margin: 0.4em 0;
white-space: nowrap;
font-family: var(--monospace);
animation: glowing 2s infinite;
}
Expand Down Expand Up @@ -733,7 +722,7 @@ input[type="color"]::-webkit-color-swatch-wrapper {

#toolsContent > .grid {
display: grid;
grid-template-columns: repeat(4, 1fr);
grid-template-columns: repeat(3, 1fr);
margin: 0.2em 0;
}

Expand Down Expand Up @@ -780,7 +769,7 @@ fieldset {
text-overflow: ellipsis;
}

.tabcontent .buttonoff {
.tabcontent li.buttonoff {
background-color: var(--bg-disabled);
color: #444444aa;
}
Expand Down Expand Up @@ -1522,20 +1511,6 @@ div.states > .burgCulture {
width: 6em;
}

div.states .burgPopulation {
width: 4.8em;
}

div.states .burgType {
width: 3em;
}

div.states .burgType > span {
padding: 0 1px;
color: #6e5e66;
transition: 0.2s;
}

div.states span.inactive {
color: #c6c2c2;
}
Expand Down Expand Up @@ -1563,6 +1538,45 @@ div.states > .riverType {
pointer-events: none;
}

div.states > .resourceIcon {
margin: 0;
cursor: pointer;
vertical-align: middle;
}

div.states > .resourceIcon > * {
pointer-events: none;
}

div.states > .resourceCategory,
div.states > .resourceModel {
cursor: pointer;
width: 7em;
overflow: hidden;
vertical-align: middle;
white-space: nowrap;
}

div.states > .resourceBonus {
color: #666;
width: 5em;
cursor: pointer;
}

div.states > div.resourceBonus > span {
pointer-events: none;
margin: 0 0.15em;
}

div.states > div.resourceBonus > span.icon-anchor {
font-size: 0.85em;
margin: 0 0.25em;
}

div.states > div.resourceBonus > span.icon-male {
margin: 0 0.1em;
}

#diplomacyBodySection > div {
cursor: pointer;
}
Expand Down Expand Up @@ -1604,6 +1618,13 @@ div.states > .riverType {
width: 6em;
}

#burgBody .resIcon{
width: 1.5em;
height: 1.5em;
vertical-align: middle;
margin-right: 0.2em;
}

#burgBody > div > div,
#riverBody > div,
#routeBody > div,
Expand Down Expand Up @@ -1631,6 +1652,7 @@ div.states > .riverType {
#stateNameEditor div.label,
#provinceNameEditor div.label,
#regimentBody div.label,
#resourceIconEditor div.label,
#markerEditor div.label {
display: inline-block;
width: 5.5em;
Expand Down Expand Up @@ -2257,6 +2279,10 @@ svg.button {
user-select: none;
}

#goods > g > use {
pointer-events: none;
}

.dontAsk {
margin: 0.9em 0 0 0.6em;
display: inline-flex;
Expand Down Expand Up @@ -2400,6 +2426,25 @@ svg.button {
}
}

#chat-widget-container {
user-select: none;
}

#chat-widget-minimized {
animation: fadeIn 1s ease-in;
transform: scale(0.65);
opacity: var(--bg-opacity);
}

@keyframes fadeIn {
from {
opacity: 0;
}
to {
opacity: var(--bg-opacity);
}
}

@media print {
div,
canvas {
Expand All @@ -2425,4 +2470,4 @@ svg.button {
body {
background: #25252a;
}
}
}
Loading