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

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

Conversation

sofronaspe
Copy link
Contributor

Description

I've rebased the dev-economics branch onto master again and have begun incorporating some of the recent design changes into the Resource logic. There's still a lot of work to do but it is functional in its current state. Hopefully bringing this up to date will encourage more development of these features.

Type of change

  • Other (Rebase)

Versioning

  • Version is updated
  • Changed files hash is updated

sofronaspe and others added 30 commits September 26, 2024 00:20
* added names of zones

added names for rebels, invasion and animals.

* deleted suggested names

- deleted siege and subjugation from zones.generator.js const subtype = rw

* fixed invationCells spelling

Fixed invationCells to invasionCells.
Is invasion with s.

* update versioning and index.html
* feat: render states - use global fn

* feat: render states - separate pole detection from layer render

* feat: render provinces

* chore: unify drawFillWithGap

* refactor: drawIce

* refactor: drawBorders

* refactor: drawHeightmap

* refactor: drawTemperature

* refactor: drawBiomes

* refactor: drawPrec

* refactor: drawPrecipitation

* refactor: drawPopulation

* refactor: drawCells

* refactor: geColor

* refactor: drawMarkers

* refactor: drawScaleBar

* refactor: drawScaleBar

* refactor: drawMilitary

* refactor: pump version to 1.104.00

* refactor: pump version to 1.104.00

* refactor: drawCoastline and createDefaultRuler

* refactor: drawCoastline

* refactor: Features module start

* refactor: features - define distance fields

* feat: drawFeatures

* feat: drawIce don't hide

* feat: detect coastline - fix issue with border feature

* feat: separate labels rendering from generation process

* feat: auto-update and restore layers

* refactor - change layers

* refactor - sort layers

* fix: regenerate burgs to re-render layers

* fix: getColor is not defined

* fix: burgs overview - don't auto-show labels on hover

* fix: redraw population on change

* refactor: improve tooltip logic for burg labels and icons

* chore: pump version to 1.104.0

* fefactor: edit coastline and lake

* fix: minot fixes

* fix: submap

---------

Co-authored-by: Azgaar <[email protected]>
* feat: add assistan widget

* feat: remove gtm

* feat: assistant - minify js, add option UI

* feat: assistant - ability to toggle assistant

* chore: update version to 1.102.00

* chore: resolve version conflict

* chore: cleanup

* chore: cleanup

* feat: ai widget - improve style

---------

Co-authored-by: Azgaar <[email protected]>
Azgaar and others added 25 commits January 10, 2025 21:21
* removed priority queue in favor of simple array extension as it will be easier to migrate to esm

* patch: bump version

* spacing

* moved references to globalThis

* demonstrate module interop

* added version to priority-queue and moved to utils to follow dom loading pattern

* removed PriorityQueue in favor of FlatQueue

* update index.html

* never mind that force push I don't know how to amend commits right

* missing capitalization

* priority set to 0 on 541

---------

Co-authored-by: RyanGuild <[email protected]>
* style.js sorted items alphabetically

* style.js added strokeDash to "cells"
* Temperature parameters can be customized

* fix typo

* update to 1.105.22

* Update index.html
* Add Claude AI support (Azgaar#1165)

* feat: ai generator - add support for claude

* feat: ai generator - add claude support

* refactor: clean up API calls

---------

Co-authored-by: Azgaar <[email protected]>

* feat: ai - claude support

---------

Co-authored-by: aesli <[email protected]>
Co-authored-by: Azgaar <[email protected]>
* refactor: submap - start

* refactor: submap - continue

* Merge branch 'master' of https://github.com/Azgaar/Fantasy-Map-Generator into submap-refactoring

* refactor: submap - relocate burgs

* refactor: submap - restore routes

* refactor: submap - restore lake names

* refactor: submap - UI update

* refactor: submap - restore river and biome data

* refactor: submap - simplify options

* refactor: submap - restore rivers

* refactor: submap - recalculateMapSize

* refactor: submap - add middle points

* refactor: submap - don't add middle points, unified findPath fn

* chore: update version

* feat: submap - relocate out of map regiments

* feat: submap - fix route gen

* feat: submap - allow custom number of cells

* feat: submap - add checkbox submapRescaleBurgStyles

* feat: submap - update version hash

* chore: supporters update

---------

Co-authored-by: Azgaar <[email protected]>
Copy link

netlify bot commented Jan 11, 2025

Deploy Preview for afmg ready!

Name Link
🔨 Latest commit 9ce260a
🔍 Latest deploy log https://app.netlify.com/sites/afmg/deploys/6782c53d72baa5000800d07b
😎 Deploy Preview https://deploy-preview-1181--afmg.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@Azgaar Azgaar self-requested a review January 12, 2025 13:53
@Azgaar
Copy link
Owner

Azgaar commented Jan 12, 2025

Hello. Should it be to the original economics branch and not to master? It's not ready for prod, so cannot go to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants