summaryrefslogtreecommitdiffstats
path: root/pokemod
Commit message (Collapse)AuthorAgeFilesLines
* [FIX] Pokemod can now has setPath which copies the directory structure to ↵Ben Boeckel2008-03-052-0/+19
| | | | | | | | the destination [ADD] SaveAs ability git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@92 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Hat now uses Qt rand functionsBen Boeckel2008-03-052-12/+8
| | | | | | | | | | | | | [FIX] .pro files cleaned up [FIX] source tarball improved [FIX] Install targets made [FIX] Pokemod path taken more flexible [FIX] PokeModr New and Open dialogs set up (not working) [ADD] pokemodr.desktop [ADD] pokegen.spec for RPM creation [ADD] pokegen.tex for the readme git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@90 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Cross compilation added (linux -> windows through mingw-cross)Ben Boeckel2008-02-281-8/+15
| | | | git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@89 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [ADD] Pokemod tree will reflect PokéMod heirarchy and load panelsBen Boeckel2008-02-257-25/+26
| | | | | | | | | | [FIX] PokemodUI panel now loads [FIX] Includes fixed [FIX] newAuthor had + instead of - (QList assertions) [FIX] Pokemod copying works now [FIX] Debug rather than release used git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@83 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] KTabWidget now used rather than QTabWidget (though this kills Qt ↵Ben Boeckel2008-02-2432-690/+925
| | | | | | | | | | | | | Designer interaction :\ ) [FIX] Minor fixes in PokeModr class [DEL] Ref.{h, cpp} [FIX] Ref enumerations now in Pokemod class [FIX] new/delete used for subclasses in pokemod now [FIX] Inclusion hell in pokemod (should compile faster) [FIX] Spelling typos git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@82 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Include cleanupBen Boeckel2008-02-244-9/+7
| | | | | | | | [FIX] Consolidate skins into Pokemod UI forms [FIX] Now using KMainWindow [FIX] Some code for the tree set up git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@79 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] MapWildList now checks value settingBen Boeckel2008-02-232-2/+17
| | | | | | | | [ADD] MapWildListUI.{h, cpp} [FIX] Minor bug in MapWarpUI [FIX] TileUI underHm ComboBox won't go out of range git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@78 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [ADD] MapWarpUI.{h, cpp} added to repoBen Boeckel2008-02-234-38/+45
| | | | | | | | | [ADD] MapWildListEncounter.{h, cpp} [ADD] Flag setting in UI forms a less work [FIX] Scope setting in MapWildList better [FIX] SpeciesUI form elements now disabled if not available git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@76 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Warp states can now leave states untouchedBen Boeckel2008-02-234-23/+31
| | | | | | | [FIX] Map/Warp dependencies in UI forms [ADD] MapWarpUI.{h, cpp} git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@75 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Frac bug with type of Over1Ben Boeckel2008-02-231-67/+65
| | | | | | | | [FIX] PokemodUI vtable errors [FIX] Manual .pro file clean up [FIX] Was attempting to emit a slot... git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@72 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Changelog/SVN desynchronization fixedBen Boeckel2008-02-239-32/+146
| | | | | | | | | | | | [FIX] skins UI file cleaned up [FIX] ImageCache no longer uses force argument [FIX] operator= now correctly copies subdata from rhs (instead of reassigning ID numbers) [FIX] Pokemod can now be copied [FIX] Pokemod skin calls cleaned up [ADD] PokemodUI.{h, cpp} [ADD] SkinsUI.{h, cpp} git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@70 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Frac now makes sure that the denominator is positiveBen Boeckel2008-02-225-42/+63
| | | | | | | | | | [FIX] Sprite-containing classes less repetative with determining paths [FIX] More include cleanup in pokemodr [FIX] Precision of Frac decimal equivalents now use a define [FIX] Species UI form is now more compact and complete [ADD] SpeciesUI.{h, cpp} (again; wasn't actually included last time and got lost) git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@68 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Prettyfied include sectionsBen Boeckel2008-02-2051-67/+212
| | | | | | | [FIX] KDevelop helping with .pro files even more [DEL] STANDARDS file git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@67 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [ADD] SpeciesUI.{h, cpp}Ben Boeckel2008-02-203-15/+15
| | | | | | | | | | | | [FIX] Missing semicolon in general/Hat.h [FIX] Shortened method names in Species [FIX] Cleaned up some includes in UI logic [FIX] NatureUI now gets the curStat right from varStat [FIX] NatureUI sets varStat in ctor rather than setGui [FIX] .pro files now controled by KDevelop [FIX] Minor UI form fixes git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@66 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [ADD] SpeciesEvolution.{h, cpp}Ben Boeckel2008-02-202-23/+14
| | | | | | | | [ADD] Appropriate includes for Species*UI.cpp files [FIX] SpeciesEvolution values now fixed up [FIX] Relative enum in more logical order git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@65 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Store item setting is now less touchyBen Boeckel2008-02-191-5/+2
| | | | | | | | [FIX] Some ui forms were missing things [FIX] UI logic with having ID data embedded instead of roundabout resolution [ADD] Fleshed out more for pokemodr TODO git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@64 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [ADD] MoveUI.{h, cpp}Ben Boeckel2008-02-191-0/+5
| | | | | | | | [FIX] Move::setDescription was not complete [FIX] Streamlined some UI classes with Fraction handling [DEL] FracMatrix is handled by Matrix<Frac> git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@63 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Fixed GPL headers in source files from rogue find/replaceBen Boeckel2008-02-195-5/+5
| | | | | | | [ADD] SpeciesAbilityUI.{h, cpp} [ADD] pokemodr TODO list git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@62 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] pokemod now passes pointers around instead of referencesBen Boeckel2008-02-1965-1351/+1360
| | | | git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@61 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Tile UI form fixesBen Boeckel2008-02-073-20/+26
| | | | | | | | | | [FIX] BadgeUI logic cleaned up [FIX] Tilemap editing Model and Delegate fleshed out [ADD] TileUI.{h, cpp} and TypeUI.{h, cpp} [FIX] Default path for Pokemod added [FIX] Tile HM and Force setting git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@58 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [ADD] Tilemap editing to the Map formBen Boeckel2008-02-064-1/+14
| | | | | | | | | | [ADD] MapUI.{h, cpp}, TilemapModel.{h, cpp}, TileDelegate.{h, cpp} [FIX] Editing area of the main window now has scroll bars [FIX] CoinListUI is now safer with its combobox creation for the values [FIX] Minor fixes in Tile and Map classes [FIX] Matrix cleaned up git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@57 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [ADD] CoinListObjectUI.{h, cpp}Ben Boeckel2008-02-021-1/+1
| | | | | | [FIX] object where parameter o should be in CoinListObject git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@56 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Only committed general last timeBen Boeckel2008-02-0165-2017/+2015
| | | | git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@55 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] CoinList UI now uses a KComboBox instead of a KIntNumInput for valueBen Boeckel2008-02-012-0/+12
| | | | | | | | | | | | [FIX] Badge UI now uses KPushButtons instead of a QGraphicsView [FIX] BadgeUI now works [FIX] PokeModr now sends a new error when an Exception got all the way through [DEL] GenericListItem replaced as QListWidgetItem works on its own [ADD] pokemodr now needs to like to kio [ADD] getFace/getBadge methods to Badge [ADD] 2 HMs (Heal and Escape) git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@53 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Changelog fixedBen Boeckel2008-01-318-9/+17
| | | | | | | | | | [FIX] Warnings in pokemod gone [FIX] BoundsException thrown from Item::setPrice() [FIX] CoinLIst now has correct className [FIX] Frac needed in header for ItemEffect [ADD] CoinList, EggGroup, and Item UI logic added git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@52 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [ADD] BadgeUI, AuthorUI, and AbilityUIBen Boeckel2008-01-301-0/+4
| | | | | | | | [FIX] Fix up UI forms [FIX] win32 builds now allow exceptions [FIX] Tidy up other UI logic files git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@50 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [ADD] win32 support (KDE) into .pro filesBen Boeckel2008-01-252-1/+1
| | | | | | | | [FIX] Ref.h extern variables [FIX] Nature include [FIX[ GUI fixes git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@48 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] pokemodr.ui now uses QScrollArea rather than QAbstractScrollAreaBen Boeckel2008-01-251-1/+1
| | | | | | | [FIX] Compare in Rules.cpp [FIX] PokeModrUI now saves the KConfgiGroup so preferences can be saved back git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@46 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Frac returns a double (not an unsigned typcast to double, making 0 all ↵Ben Boeckel2008-01-252-18/+18
| | | | | | | | | | the time) [FIX] maxDV now works on 0 and 1 rather than 16 and 32 [FIX] Stuff ignored (due to other options) can't throw Exceptions in Rules anymore [FIX] UI logic fixed git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@45 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] BugCatcher now asks if the user wants to open KBugReportBen Boeckel2008-01-242-2/+2
| | | | | | | | | [FIX] Exception members are now const [FIX] map was uninitialized in Dialog validation [FIX] (un)setting Breeding in Rules [FIX] GUI now works (though with QMainWindow and QTabWidget in Rules) git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@42 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] pokemodr.ui fileBen Boeckel2008-01-244-3/+21
| | | | | | | | [FIX] added better .pro rules [FIX] PokeModTreeItem works now [FIX] LICENSE file is purely the terms git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@41 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Grammer in ChangelogBen Boeckel2008-01-2335-428/+435
| | | | | | | | | | | [FIX] Made pokemod classes contain their names for later ease [ADD] PokéModr main window form [FIX] Ini and Exception includes fixed [FIX] BugCatcher bugs fixed [FIX] .pro files fixed [ADD] PokéModr main GUI almost complete git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@40 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Some linker errors in pokemod and generalBen Boeckel2008-01-227-15/+186
| | | | | | | | [FIX] More enum char*[] to QStringList [FIX] Widgets in PokéModr gui [ADD] Rules GUI logic git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@39 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] PokeMod namespace removedBen Boeckel2008-01-2165-3258/+3171
| | | | | | [ADD] MoveEffect editing form for PokéModr git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@38 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] const char*[] -> QStringList for easier laoding into KComboBoxBen Boeckel2008-01-2130-214/+109
| | | | | | | [DEL] pokemod/pokemod_inc.h no longer needed git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@37 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] pokemod compiles faster due to better placement of #includesBen Boeckel2008-01-2165-117/+188
| | | | | | [FIX] Header of pokemodr/PokeModr.h git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@36 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [ADD] More GUI classes (only MoveEffect left)Ben Boeckel2008-01-2145-635/+847
| | | | | | | | | [FIX] Polished up GUI classes [FIX] renamed methods get*ByID -> get*Index instead for more logical get*ByID [FIX] Renaming in pokemod to remove mention of Pokémon [FIX] minor .pro fixes (aesthetic mainly) git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@35 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [DEL] get*Num/get*Denom methods from PokemodBen Boeckel2008-01-1923-226/+11
| | | | | | | [ADD] GUI classes to pokemodr [FIX] AudioCache is trashed right now, but may be salvageable git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@34 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [DEL] Removed PokeGen namespaceBen Boeckel2008-01-1967-3292/+3189
| | | | | | | | [ADD] general/AudioCache.h completed [DEL] VERSION removed from subdir .pro files [DEL] audio/ git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@33 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Added 2008 to copyrightsBen Boeckel2008-01-1767-1504/+1374
| | | | | | | | | | | | [FIX] Made exceptions better [FIX] Added RBY Move Effects (as well as val1 and val2 code) [FIX] Added breaks where missed [FIX] Grammar mistakes (factored out to Exceptions) [FIX] Cleaned up Species types and egg groups handling [FIX] Cleaned up Store items handling [FIX] Cleaned up Tile details git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@31 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Rules/Pokemod dependency fiascoBen Boeckel2007-11-271-1/+4
| | | | | | [FIX] STANDARDS to GPLv3 git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@30 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [ADD] Known MoveEffectsBen Boeckel2007-11-276-191/+341
| | | | | | | | | [FIX] pokegen.pro error in rpm build target [FIX] EggSpecies not needed (generic species will be used instead) [FIX] StruggleMove not needed (generic will be used instead) [FIX] TypeChart moved back to Pokemod so that Rules are completely Pokemod-neutral git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@29 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] classes more usableBen Boeckel2007-11-2268-5858/+7069
| | | | | | | | [FIX] Matrix class [ADD] pokemod/Rules.{h, cpp} [FIX] coding style cleaned up git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@28 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* Redoing rev25Ben Boeckel2007-10-2672-2755/+1356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ADD] DISCLAIMER [FIX] PokemonEvolution styles [ADD] Relative enumeration [DEL] pokemod/Status.{h, cpp} [DEL] pokemod/StatusEffect.{h, cpp} [FIX] Status effects will be added as needed instead of customized [FIX] Completed ItemEffects [FIX] Factored out Natures to be global [DEL] pokemod/PokemonNature.{h, cpp} [DEL] ai/Net.{h, cpp} [DEL] ai/Layer/{h, cpp} [ADD] battle/Arena.{h, cpp} [ADD] battle/Team.{h, cpp} [ADD] battle/Human.{h, cpp} [ADD] battle/Bot.{h, cpp} [ADD] battle/GhostBot.{h, cpp} [ADD] battle/Pokemon.{h, cpp} [ADD] battle/Ghost.{h, cpp} [FIX] Fixed some scope errors in pokemod [ADD] audio/audio.pro [ADD] audio/Audio.{h, cpp} [ADD] audio/AudioLibrary.{h, cpp} [ADD] audio/AudioSystem.{h, cpp} [ADD] audio/Music.{h, cpp} [ADD] audio/SoundEffect.{h, cpp} [DEL] old audio system (was in C) [FIX] Optimized some routines in pokemod [FIX] Moved global classes (Ini, Frac, Matrix, FracMatrix, Point, Flag) to general git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@27 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* Reverted repo back to rev24 because committing of rev25 messed upBen Boeckel2007-10-2672-1356/+2755
| | | | git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@26 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [ADD] DISCLAIMERBen Boeckel2007-10-2672-2755/+1356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [FIX] PokemonEvolution styles [ADD] Relative enumeration [DEL] pokemod/Status.{h, cpp} [DEL] pokemod/StatusEffect.{h, cpp} [FIX] Status effects will be added as needed instead of customized [FIX] Completed ItemEffects [FIX] Factored out Natures to be global [DEL] pokemod/PokemonNature.{h, cpp} [DEL] ai/Net.{h, cpp} [DEL] ai/Layer/{h, cpp} [ADD] battle/Arena.{h, cpp} [ADD] battle/Team.{h, cpp} [ADD] battle/Human.{h, cpp} [ADD] battle/Bot.{h, cpp} [ADD] battle/GhostBot.{h, cpp} [ADD] battle/Pokemon.{h, cpp} [ADD] battle/Ghost.{h, cpp} [FIX] Fixed some scope errors in pokemod [ADD] audio/audio.pro [ADD] audio/Audio.{h, cpp} [ADD] audio/AudioLibrary.{h, cpp} [ADD] audio/AudioSystem.{h, cpp} [ADD] audio/Music.{h, cpp} [ADD] audio/SoundEffect.{h, cpp} [DEL] old audio system (was in C) [FIX] Optimized some routines in pokemod [FIX] Moved global classes (Ini, Frac, Matrix, FracMatrix, Point, Flag) to general git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@25 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* [FIX] Neural Network methods completeBen Boeckel2007-09-2198-20767/+15174
| | | | | | | | | | | | | | | | | | | | | [FIX] Wrapped Node up into the layer [FIX] Wrapped NatureEffect into Nature [FIX] Getting around to fixing up the design of the PokéMod stuff [FIX] Creating new subclasses now returns pointer to new subclass [FIX] Simplified interfaces [FIX] Minor style issues [FIX] Renamed CoinItem to CoinListObject [FIX] Renamed MapTrainerTeam to MapTrainerPokemon [FIX] Renamed MapWildPokemon to MapWildListPokemon [FIX] Moved global enums to relevant classes [FIX] Removed general logging features [DEL] pokemod/Debug.{h, cpp} [DEL] pokemod/Path.{h, cpp} [FIX] Using QFile rather than custom Path class for checking for files [FIX] Set* methods now return a bool to let the caller know if anything actually changed (if it can fail, otherwise it is void) [ADD] Compliation without errors is required for pokemod from now on before commits git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@24 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* Moved to GPLv3 and Qt4, Changed String -> QString, other minor fixesBen Boeckel2007-07-2192-3690/+3439
| | | | git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@23 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* Fixed Logging, minor fixes, got rid of NatureEffect, and started migration ↵Ben Boeckel2007-07-0384-3809/+1348
| | | | | | from wxGTK to Qt git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@22 6ecfd1a5-f3ed-3746-8530-beee90d26b22
* Minor various fixes, Dialog validation started, GUI fixes, String methods addedBen Boeckel2007-06-2817-397/+999
| | | | git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@21 6ecfd1a5-f3ed-3746-8530-beee90d26b22