Commit c339d95
Major bug fixes (#47)
* Merge main tweaks into dev (#46)
* Added graphs & cleaned Con's code (#29)
* Pagination (#8)
* test commit
* tab is now 2 spaces in every file
* pagination
* added some more components
* routing using `<svelte:component>`
* Routing (#9)
* test commit
* tab is now 2 spaces in every file
* pagination
* added some more components
* routing using `<svelte:component>`
* Add Load Game page (save overview) (#10)
* change bulde identifier to allow building for prod
* sync
* switch border radius to rem and create variable
* use-select: none by default
* create center class
* save game overview
* added volume slider (#11)
* Create desktop and shortcuts (#12)
* change bulde identifier to allow building for prod
* sync
* switch border radius to rem and create variable
* use-select: none by default
* create center class
* save game overview
* remove max-width from #app
* create desktop
* create desktop shortcut
* open desktop when save is clicked
* show desktop in singleplayer game component
* align shortcuts vertically on desktop load
* setup base for prototype
* add percentage utility
* add percentage utility
* generate person education level
* code cleanup & desktop work (#13)
* added volume slider
* code cleanup & desktop work
* isolation
* window work (#14)
* added volume slider
* code cleanup & desktop work
* isolation
* window work
* Window resizing (#15)
* added volume slider
* code cleanup & desktop work
* isolation
* window work
* window resizing
* Notifications (#16)
* notifications
* notifications & app state safety
* Change window button appearance (#17)
* change window header height to 25, remove duplicate exports
* install ionicons
* change window button appearance
* reformat TestWindow
* implement person
* begin generation
* begin business generation
* fix percentage bug & fix exponentially high wants values
* small bug fixes
* Window scaling (#18)
* notifications
* notifications & app state safety
* window scaling
* maximize-minimize toggle
* Revert "Window scaling (#18)" (#19)
This reverts commit 426526c.
* fix calculations
* Window scaling (take 2) (#20)
* notifications
* notifications & app state safety
* window scaling
* maximize-minimize toggle
* Apps & toolbar (#21)
* notifications
* notifications & app state safety
* window scaling
* maximize-minimize toggle
* apps & taskbar
* generate business employees
* remove unused variables
* assign people to businesses
* fix error
* remove unnecesary balance checking
* fix errors
* begin time passing features
* implement monthly behaviour (broke)
* fix dumb
* fix memory errors
* fix errors
* fix mutex async issues
* refactor file structure
* change to rust mutex, pay employees at the end of each month
* remove uneeded async
* calculate random business balance when generated
* Rust gameflow (#22)
* setup base for prototype
* add percentage utility
* add percentage utility
* generate person education level
* implement person
* begin generation
* begin business generation
* fix percentage bug & fix exponentially high wants values
* small bug fixes
* fix calculations
* generate business employees
* remove unused variables
* assign people to businesses
* fix error
* remove unnecesary balance checking
* fix errors
* begin time passing features
* implement monthly behaviour (broke)
* fix dumb
* fix memory errors
* fix errors
* fix mutex async issues
* refactor file structure
* change to rust mutex, pay employees at the end of each month
* remove uneeded async
* calculate random business balance when generated
* Fix Window not unmaximising and remove parentelement property (#23)
* game create event
* default to desktop, create new game automatically
* make fullscreen off by default (for development)
* set fullscreen in tauri config (oopsie)
* Toolbar icons (#24)
* toolbar icons
* email & gov. spending
* error message
* refactor code a little
* deduct taxes from businesses & people each month
* change tax rate to percentage decimal
* fix budget allocation calculations
* percentage based output float
* fix oopsie
* calculate marketing reach & cost, deduct that cost from business balance
* prepare for next feature
* clean up business.rs
* seperate state manager
* calculate new business market monthly
* generate business owner
* pay business owner
* basic person debt payment
* add or deduct from government balance
* fix toolbar styling
* start documenting rust gameflow
* Basic app layouts (#25)
* basic email layout
* email rendering
* basic budget panel
* Fixing cons tabs (#26)
* Fixing 2-wide tabs
* More tabs
* .await added
* rename wants to demand
* implement dates system
* date event
* health & hospitalisation system
* rm comment
* fix bugs
* pregenerate the game
* fix bugs & implement food spending system
* forgot to replenish health after hospitalization
* fix function misplacement
* more bug fixing
* remove dumb code for exedice
* fix idx error
* debugger (beginning) (#27)
* use debugger
* Debugger (#28)
* debugger
* fixed dropdown
* debug population count
* fix debug display
* allow to debug multiple times
* change government balance to u128
* healthcare improvements & bug fixes
* add minuses to compactify
* begin homelessness implementation
* tune health system & fix bugs
* Implement barebones unemployment handling
NOTE: There was an LF CRLF warning in git - dunno what that means lol
* use util function & fix conflict of local
* start babies
* forgot most important part lol
* bug fixes 1
* added graph component (experimental)
Co-authored-by: VirusBLITZ <58221423+VirusBLITZ@users.noreply.github.com>
Co-authored-by: conaticus <enquiry.conaticus@gmail.com>
Co-authored-by: Sam <72096531+conaticus@users.noreply.github.com>
Co-authored-by: Kventis <93383833+ImKventis@users.noreply.github.com>
* Revert "Added graphs & cleaned Con's code (#29)"
This reverts commit 8cb7c5b.
* Prepare for Distribution (#43)
* Pagination (#8)
* test commit
* tab is now 2 spaces in every file
* pagination
* added some more components
* routing using `<svelte:component>`
* Routing (#9)
* test commit
* tab is now 2 spaces in every file
* pagination
* added some more components
* routing using `<svelte:component>`
* Add Load Game page (save overview) (#10)
* change bulde identifier to allow building for prod
* sync
* switch border radius to rem and create variable
* use-select: none by default
* create center class
* save game overview
* added volume slider (#11)
* Create desktop and shortcuts (#12)
* change bulde identifier to allow building for prod
* sync
* switch border radius to rem and create variable
* use-select: none by default
* create center class
* save game overview
* remove max-width from #app
* create desktop
* create desktop shortcut
* open desktop when save is clicked
* show desktop in singleplayer game component
* align shortcuts vertically on desktop load
* setup base for prototype
* add percentage utility
* add percentage utility
* generate person education level
* code cleanup & desktop work (#13)
* added volume slider
* code cleanup & desktop work
* isolation
* window work (#14)
* added volume slider
* code cleanup & desktop work
* isolation
* window work
* Window resizing (#15)
* added volume slider
* code cleanup & desktop work
* isolation
* window work
* window resizing
* Notifications (#16)
* notifications
* notifications & app state safety
* Change window button appearance (#17)
* change window header height to 25, remove duplicate exports
* install ionicons
* change window button appearance
* reformat TestWindow
* implement person
* begin generation
* begin business generation
* fix percentage bug & fix exponentially high wants values
* small bug fixes
* Window scaling (#18)
* notifications
* notifications & app state safety
* window scaling
* maximize-minimize toggle
* Revert "Window scaling (#18)" (#19)
This reverts commit 426526c.
* fix calculations
* Window scaling (take 2) (#20)
* notifications
* notifications & app state safety
* window scaling
* maximize-minimize toggle
* Apps & toolbar (#21)
* notifications
* notifications & app state safety
* window scaling
* maximize-minimize toggle
* apps & taskbar
* generate business employees
* remove unused variables
* assign people to businesses
* fix error
* remove unnecesary balance checking
* fix errors
* begin time passing features
* implement monthly behaviour (broke)
* fix dumb
* fix memory errors
* fix errors
* fix mutex async issues
* refactor file structure
* change to rust mutex, pay employees at the end of each month
* remove uneeded async
* calculate random business balance when generated
* Rust gameflow (#22)
* setup base for prototype
* add percentage utility
* add percentage utility
* generate person education level
* implement person
* begin generation
* begin business generation
* fix percentage bug & fix exponentially high wants values
* small bug fixes
* fix calculations
* generate business employees
* remove unused variables
* assign people to businesses
* fix error
* remove unnecesary balance checking
* fix errors
* begin time passing features
* implement monthly behaviour (broke)
* fix dumb
* fix memory errors
* fix errors
* fix mutex async issues
* refactor file structure
* change to rust mutex, pay employees at the end of each month
* remove uneeded async
* calculate random business balance when generated
* Fix Window not unmaximising and remove parentelement property (#23)
* game create event
* default to desktop, create new game automatically
* make fullscreen off by default (for development)
* set fullscreen in tauri config (oopsie)
* Toolbar icons (#24)
* toolbar icons
* email & gov. spending
* error message
* refactor code a little
* deduct taxes from businesses & people each month
* change tax rate to percentage decimal
* fix budget allocation calculations
* percentage based output float
* fix oopsie
* calculate marketing reach & cost, deduct that cost from business balance
* prepare for next feature
* clean up business.rs
* seperate state manager
* calculate new business market monthly
* generate business owner
* pay business owner
* basic person debt payment
* add or deduct from government balance
* fix toolbar styling
* start documenting rust gameflow
* Basic app layouts (#25)
* basic email layout
* email rendering
* basic budget panel
* Fixing cons tabs (#26)
* Fixing 2-wide tabs
* More tabs
* .await added
* rename wants to demand
* implement dates system
* date event
* health & hospitalisation system
* rm comment
* fix bugs
* pregenerate the game
* fix bugs & implement food spending system
* forgot to replenish health after hospitalization
* fix function misplacement
* more bug fixing
* remove dumb code for exedice
* fix idx error
* debugger (beginning) (#27)
* use debugger
* Debugger (#28)
* debugger
* fixed dropdown
* debug population count
* fix debug display
* allow to debug multiple times
* change government balance to u128
* healthcare improvements & bug fixes
* add minuses to compactify
* begin homelessness implementation
* tune health system & fix bugs
* Implement barebones unemployment handling
NOTE: There was an LF CRLF warning in git - dunno what that means lol
* use util function & fix conflict of local
* start babies
* forgot most important part lol
* bug fixes 1
* clippy cleanup
* fix dates bug
* health system improvements
* Little change (#30)
* added graph component (experimental)
* little change
* little cleanup of state manager
* dynamic population, cleanup, bug fixes & debts system improvements
* fix gov balance maxxing at 2.1billion
* quick bug fix
* update food spending when debt is paid off
* bug fixes & new utils & debugging
* calculate new hospital capacity cost when modified
* add welfare system
* welfare adjustments
* welfare improvements & bug fixes
* fix birth rate inaccuracies
* fix mass deaths at game start bug & make homelessness possible mid game
* calculate demand every month
* improve purchase days system & welfare
* big update - start dynamic employees, bug fixes, switch to uuid (broken)
* i fixed the fucking bug i fixed the fucking bug omg i fixed the fuckign bug
* eliminate potential idx conflicts
* fix business flow (incomplete)
* so many bugs to fix
* switch to hashmaps for performance
* new market optimisations
* Brand new UI (designed by LemonOrange) (#31)
* removed icons
* removed icons (fr this time)
* basic structure
* fix window drag area
* packed window events into one event
* constants
* styling
* fixed wallpaper
* window structure & styling
* uninstalled svelte-ionicons
* fix window resizing
* finally made the code structure better
* fix window minimizing
* improve resize bars
* fixed resize bars' pos & size
* fix app position
* opening apps
* change duration to secs
* fix early game crash
* Minor frontend changes (#32)
* frontend bugs fixed
* minimize app if not minimized
* alt+f4
* eliviate day pass error
* fix salary & tax bug
* it's always the divides that get me (fix major bug)
* Email styling (#33)
* opened app always focused
* styling #1
* email header
* improve email header
* line counter
* constrained the line numbers
* tiny changes
* non-critical window events
* fix email text overflow bug
* add game generated event
* Loading screen (#34)
* loading screen
* can minimize apps from apps' list
* loading screen fix
* rust receive frontend ready event
* Send frontend_ready event (#35)
* send frontend_ready event
* remove async
* business balancing & fix linux selection
* Frontend bugs (#36)
* right border disappears
* line counter doesn't extend all the way
* cursor doesn't change when dragging windows
* last checked date incorrect
* badge count doesn't reset
* window doesn't maximize when on top
* it fucking works
* thanks matt <3
* reset game event for frontend (unimplemented)
* separate business & person tax rates
* implement person & business tax rules
* add business funding rule
* Frontend functionality #1 (#37)
* correct cursor in email
* note
* loading screen
* create game on desktop mount
* rust app open and app close handlers
* match enum to array indexes
* add generation events
* Frontend functionality (2) (#38)
* invoked app_open and app_close
* renamed Budget Panel into Finance
* improve loading status events
* separate hospital capacities
* implement healthcare rules & structs
* handle food coverage in state
* handle rule events - don't look at this code is hideous
* finance data handling & opened event
* implement update app for finance app
* finish finance events app
* healthcare app opened event
* add healthcare events
* add welfare events
* add business events (complete events)
* document ipc events
* fix md docs oopsies
* one more oopsie
* comma
* fix runtime error / 0
* remove frontend ready event
* Frontend 3 (#39)
* removed ToolBarItem
* moved types
* cleanup
* added new apps
* loading screen update
* spend welfare & funding appropriately
* fix conflicts & game crash
* game actually runs at normal speed
* remove commented code
* implement basic retirement system
* safe error handling
* Frontend 4 (#40)
* fix window template
* loading screen changes (unfinished)
* loading screen (done)
* start menu
* added one more button
* notifications (1)
* notifications 2
* css units
* little cleanup
* make birth rate dynamic
* prevent babies becoming pregnant lmao
* clippy cleanup
* generate new businesses midgame
* Frontend 5 (#41)
* added latest notification display
* notification severity
* handle open_app error
* event data flow to frontend
* Frontend 6 (#42)
* start remaking the system
* refactoring
* test tab app
* added templates
* added username to the tab window
* rewritten email app
* rewritten finance
* rewritten healthcare
* fix
* rewritten welfare
* rewritten business
* added modals
* add back app event handling
* begin finance budgets tab
* fix resize invalidating data bug
* make finance budgets functional
* fix business market allocation bugs
* enable people to afford no food
* fix bugs & improve budgets panel styling
* fix budget panel bugs
* fix estimated income
* fix eail app
* fix healthcare capacity bug
* further fix healthcare calculations
* start finance overview & pins
* fix data mutability
* fix pinning & data update bugs
* add finance app rules
* implement overviews and rules for all apps
* complete all apps functionality
* minor ui and styling improvements
* fix minor styling & mutability bugs
* fix notifications, budgets error handling, bug fixes, styling fixes, UI improvements
* welcome email
* polishing & bug fixes
* maximize animation
* mistakes were made
* improve health simulation
* complete testing improvements
* start emails & bug fixing
* lil tweek
* fix emails live update
* correct notif button colors
* send out email for high unemployed counts
* form vaildiation & error handling
* change day duration to 5s
* complete dist version
---------
Co-authored-by: Exedice <95159805+Ex-ce-pt@users.noreply.github.com>
Co-authored-by: VirusBLITZ <58221423+VirusBLITZ@users.noreply.github.com>
Co-authored-by: Kventis <93383833+ImKventis@users.noreply.github.com>
* update readme
* update readme
* oopsie
* Delete Cargo.lock
* Update README.md
* style: rustfmt (#45)
Signed-off-by: AltF2 <contact@altf2.dev>
---------
Signed-off-by: AltF2 <contact@altf2.dev>
Co-authored-by: Exedice <95159805+Ex-ce-pt@users.noreply.github.com>
Co-authored-by: VirusBLITZ <58221423+VirusBLITZ@users.noreply.github.com>
Co-authored-by: Kventis <93383833+ImKventis@users.noreply.github.com>
Co-authored-by: AltF2 <62047267+AltF02@users.noreply.github.com>
* remove context menu
* fix notification bugs
* quick styling change
---------
Signed-off-by: AltF2 <contact@altf2.dev>
Co-authored-by: Exedice <95159805+Ex-ce-pt@users.noreply.github.com>
Co-authored-by: VirusBLITZ <58221423+VirusBLITZ@users.noreply.github.com>
Co-authored-by: Kventis <93383833+ImKventis@users.noreply.github.com>
Co-authored-by: AltF2 <62047267+AltF02@users.noreply.github.com>1 parent f4de9eb commit c339d95
File tree
5 files changed
+167
-159
lines changed- src-tauri
- src
- components/game/desktop
5 files changed
+167
-159
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
57 | | - | |
| 57 | + | |
58 | 58 | | |
59 | | - | |
| 59 | + | |
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
68 | 71 | | |
69 | 72 | | |
70 | 73 | | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
82 | 79 | | |
83 | 80 | | |
84 | 81 | | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
91 | 86 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
57 | 56 | | |
58 | 57 | | |
59 | 58 | | |
| |||
85 | 84 | | |
86 | 85 | | |
87 | 86 | | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
88 | 94 | | |
89 | 95 | | |
90 | 96 | | |
| |||
136 | 142 | | |
137 | 143 | | |
138 | 144 | | |
139 | | - | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
140 | 151 | | |
141 | 152 | | |
142 | 153 | | |
| 154 | + | |
| 155 | + | |
143 | 156 | | |
144 | 157 | | |
145 | 158 | | |
| |||
156 | 169 | | |
157 | 170 | | |
158 | 171 | | |
| 172 | + | |
159 | 173 | | |
160 | 174 | | |
161 | 175 | | |
162 | | - | |
163 | 176 | | |
164 | 177 | | |
165 | 178 | | |
| |||
329 | 342 | | |
330 | 343 | | |
331 | 344 | | |
332 | | - | |
333 | | - | |
334 | | - | |
335 | | - | |
336 | | - | |
337 | | - | |
338 | | - | |
339 | | - | |
340 | | - | |
341 | | - | |
342 | | - | |
343 | | - | |
344 | | - | |
345 | | - | |
346 | | - | |
347 | | - | |
348 | | - | |
349 | | - | |
350 | | - | |
351 | | - | |
352 | | - | |
353 | | - | |
354 | | - | |
355 | | - | |
356 | | - | |
357 | | - | |
358 | | - | |
359 | | - | |
360 | | - | |
361 | | - | |
362 | | - | |
363 | | - | |
364 | 345 | | |
365 | 346 | | |
366 | 347 | | |
| |||
384 | 365 | | |
385 | 366 | | |
386 | 367 | | |
| 368 | + | |
387 | 369 | | |
| 370 | + | |
388 | 371 | | |
389 | 372 | | |
390 | 373 | | |
391 | 374 | | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
392 | 407 | | |
393 | 408 | | |
394 | 409 | | |
| |||
402 | 417 | | |
403 | 418 | | |
404 | 419 | | |
| 420 | + | |
405 | 421 | | |
406 | 422 | | |
407 | 423 | | |
| |||
524 | 540 | | |
525 | 541 | | |
526 | 542 | | |
527 | | - | |
| 543 | + | |
528 | 544 | | |
529 | 545 | | |
530 | 546 | | |
531 | 547 | | |
532 | | - | |
| 548 | + | |
533 | 549 | | |
534 | 550 | | |
535 | 551 | | |
| |||
0 commit comments