Remove python2 compatability fixes #810
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kerizane
approved these changes
Sep 24, 2020
xirsoi
approved these changes
Sep 24, 2020
|
...i noticed the "r" adds on the docstrings. ill clean those up (why were they even added??) then merge it. thanks for looking. EDIT: apparently the pyupgrade author is saying that python 3.9 will treat docstrings differently and raw strings are needed. its not breaking anything, so i guess ill just leave them. |
bitcraft
added a commit
that referenced
this pull request
Mar 1, 2021
* Update README.md * Fully support quantity menu closing * fix regression #735 * Update requirements.txt * Update requirements.txt * remove obsolete screen.py * add instance_id * blacken formula.py * update/blacken middleware.py * blacken monster.py * revert some changes from monster.py * update requirements.txt * docstring and linting * Save number of steps * Upgrade save with new key in game_variables * Add TODO record number of steps * Fix the building of the translations on install. * Translated attacks and monsters to Spanish. * Translated NPC dialogs to Spanish except leet. * intial changes to abstract the map loader (#736) * intial changes to abstract the map loader * add lib folder * add lib folder files * linting/docstrings tools.py * better handling of mixer loading after failure * linting monster.py * fixed initial syntax warning * Translate 37707 to $pan1sh. * Small fixes in Spanish. * Fix teleport from 37707 to the player's bedroom. * fix technique animations, status, new download script and animations * change unicode (c) to plain ascii in bresenham.py * Update README.md * Create README.md * cleanup obsolete tests * edit scripts readme * update manifest * update scripts readme * made maple_back.png transparent * Adds back and front combat sprite support to NPCs. (#750) * player back and front implmentation from db * Remove print statement * Added front and back combat sprite support for NPCs. * added combat front and back defs to all npcs * update assignment if statements * Update npc.py * Update README.md * Fix various small things and continue story (#752) * Nearly finish city park story and duplicate original map * UNFINISHED COMMIT: need to get merged in normally, this would be complete. * Add variable to help rewrite beginning * Add more NPCs Mom, nurses, and a knight * Add more story Continue rewrite of beginning. Currently the story lasts about 10 minutes total. Time to change that :) Also, trying to fix the fluidity of the story. It's very stilted at the moment. * add first edit of goth sprite * Continue the story * I'm not the brightest -__- Thanks @kerizane for the help! * Feature/#200 combat calls (#632) * add pairagrin to the game no art files yet * merging upstream * small changes mostly for testing * cleanup accidental change * final adjustments to ensure the value is read in correctly * modify sounds and music to use the db and slugs, modify the db loader to allow a list of records in a single file * fixes some silly bugs * fix sound implementation * fixes bug with the fadeout state screwing up music and moves technique sfx to the slug system * adds combat_call sound when opponent monster appears * Numeric variable checks and operations (#635) * Allow checking if a variable is greater or lesser than another variable * Allow basic mathematical operations to be preformed on variables * Allow variables to be used as operands, on both sides of the equation * Also except key and value errors * Various other fixes * Update README.md * Don't allow collision tiles with explicit exits to push the player into other solids (#624) * Don't allow collision tiles with explicit exits to push the player into other solids * Additionally fix map bound check that allowed the player to step out of the world * Use double quotes where appropriate * #156 rename player and rename monster actions (#637) * add pairagrin to the game no art files yet * merging upstream * small changes mostly for testing * cleanup accidental change * final adjustments to ensure the value is read in correctly * first go at renaming actions * fixes several small bugs * solves most issues with rename_monster and tweaks new npc scripts slightly * Choice menus have an optional escape_key_exists parameter (#642) * Choice menus have an optional escape_key_exists parameter * Minor fixes * Flavor text dialogs for the tuxemart (#643) * Flavor text dialogs for the tuxmeart * New shop events checked with player_facing_tile, normalized existing shop events * Update windows installation instructions (#640) * Updated windows instructions * welp wrong line order * Tested Python 3 instalation on Windows, works fine =) * Update README.md * Taba town map cleanup (#646) * Player is now hidden behind tuxmart and tuxcenter signs * player_at and player_facing conditions changed to player_facing_tile conditions * Fix some small issues * Darn it john * Bring everyone together * Continue story and fixes to make everything smoother * Darn it john back at it again with the white vans :D * rename maps so that I can merge from master * please work. merging sucks * Add more story * Finish the Taba town story! It works too! :D * Remove npcs * Update taba_town.tmx per @xirsoi requirement * Update maple_house.tmx per @xirsoi requirement * Update player_house_downstairs.tmx per @xirsoi * Update base.po Because swearing is bad * Fix where john leaves * Update citypark.tmx City park breaks right now. Will get to eventually * Some more story edits * Move everyone inside * Lock everything down Once you enter you can NEVER leave * Add major part to the story Time to find out about Omnichannel :D * Continue working on Allie Sprite * Fix loop when asking professor's wife Otherwise you will always meet Allie whenever you walk in the wife's house * Continue the story Yay! You can finally leave Taba Town! Co-authored-by: ZhongQian TiaoGong <sassafrass@fasizzle.com> Co-authored-by: Adam Chevalier <chevalierAdam2@gmail.com> Co-authored-by: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com> Co-authored-by: Leif Theden <leif.theden@gmail.com> Co-authored-by: Yair Morgenstern <yairm210@hotmail.com> * Add Allie sprites (#756) * Add Allie sprites * Update allie whoops * Use Unicode arrows and musical note. (#754) * Update Spanish translation. (#753) * Add config option to recompile translations. (#758) * Bring back support for multi point collision lines (#762) * Bring back support for multi point collision lines * Convert zero-width collision to collision-line * check for polyline objects based on points and cloased attributes (#764) * Update README.md * replace blank locale msgstr with <<MISSING>> * replace blank locale msgstr with <<MISSING>> * added controls as setting in config; default config adjusted to match (#747) * added controls as setting in config; default config adjusted to match * refactored custom controls into a get_custom_pygame_keyboard_controls() method * removed comments to clean up code and added comments for clarity * Update README.md * Fixes cursor issue with shop and monster menus. (#766) * possible fix to issue #728 * modified reload_items * fixes previous bug with monster menu * redone without importing * Added todo * Fixing opponent battle tuxemon (#768) * Prevent first monster from loading before release during trainer battle * Prevent trainer monster hud from appearing before relase * rename 'get_state_name' to 'get_state_by_name' * remove references of map preloading * deprecate map preloading * remove unused imports original used for type introspection * remove unused reference to game world * minor docstring cleanup * minor docstring cleanup * Makes final capdev icon grey out after defeat (#773) * Prevent first monster from loading before release during trainer battle * Prevent trainer monster hud from appearing before relase * allows final TXMN capdev icon grey out after defeat * fixed comments * move tuxepedia code to scripts folder * Update README.md * add Norwegian Bokmål translation stub * #779: Stop status_faint from being lost between battles (#780) * Confirmation box when saving (#781) * Fixes duplicated ui elements. (#778) * fix duplicated ui elements * removed animation of arrow in update party hud * removed reloading of arrow sprite in update party hud * remove semicolons * remove semicolons * added todo * working on CaptureDeviceSprite subclass * first version of CaptureDeviceSprite * added comments * imporvements * makes opponent capdevs grey out from left to right * removed semi colon * merged for loops * Added new potion sprites, replaced revive item with unique icon, and changed CREDITS.md file (#784) * Ensured some class variables were initialized (#793) * added sprites for disciple (#791) * Key bindings in config now override defaults (#767) (#785) * possible fix issue #767 * adjusted config.py for issue #767 * removed superfluous print statement * removed superfluous comment * move concept folder * update travis and build scripts * travis build fixes * fix build script file perms * travis: python3 and apt-get update * travis: fix build script perms * travis: add req'd param for win32 build * travis: skip xenial build b/c pygame dep missing * travis: skip bionic build b/c pygame dep missing * travis: make script path explicit, split bionic exe/deb jobs * travis: skip focal exe build * travis: add pillow deb * travis: change exe to win32 * travis: remove setuptools step * travis: update debian build * remove python2 from setup.py * travis: attempt to force python3 builds * travis: attempt to force python3 builds * rename tests * update tests readme * travis: update deb install scripts * travis: update deb build scripts for tests, name * travis: update deb build location * travis: update build folder * travis: enable win32 build * travis: update win32 build * add travis status to readme * load all database entries by default * lazy load translations * travis: split focal deb/win32 jobs * travis: windows build uses full python * update readme * travis: enable prebuild for opk/android builds * travis: add flatpak stubs * travis: try to force win64 builds * travis: change wine to wine64 * travis: fix build script name * travis: add github release * travis: diagnose win32 build * travis: move tarball builds to scripts * travis: refactor sdist builds * travis: stub out android builds * travis: rename android build file * travis: remove unused opk build stuff * travis: do not run pip install by default * travis: move sdist to install phase * travis: s/py/sh * travis: add resources to debian builds * travis: add resources to debian builds * travis: fix win32 build script perms * travis: quiet win32 python download * travis: fiddle with wine64/32 * travis: update wine64/32 params * travis: enable xenial * travis: enable bionic * travis: add wine32 * Create flatpak manifest (#534) * add apppata and desktop file * add flatpak manifest * enable sound and opengl support * add cbor because missed when saving * don't copy the complete folder, because no git stuff is needed * travis: magic to get the wine deps installed * travis: only create release when tagged * travis: tweak wine32 build * lazy-load translations hack * travis: refactor scripts * travis: remove venv options * travis: change build types for windows * travis: add android build again * travis: fix bash conditionals * travis: split windows scripts * travis: remove bionic and xenial builds * travis: modify windows script for 32-bit default * travis: quiet wget * travis: tweak windows bash script * travis: skip vs tools on wine build * travis: fix reference to renamed build file * travis: don't use a quiet build b/c travis assumes it has hung * travis: use wheels on wine builds * travis: cleanup android build scripts * travis: give extra time to build windows * travis: revert cx_freeze version * travis: revert cx_freeze version * travis: split wine builds; make pyinstaller the default * travis: move pyinstaller files * minor formatting * no longer crash when loading duplicate db items * move flatpak data to buildconfig * travis: test with p4a * travis: disable windows builds * travis: fix yaml syntax regression * travis: remove redundant param * travis: disable windows build * travis: android baby steps * A few new graphics! (#807) * added sprites for disciple * pairagrin added * reworked capture device graphics based on design by leo * pairagrim graphics + json added * travis: asking for newer ubuntu image * travis: various tweaks * Proofed en_US base.po, including alternative lines and other suggestions. * Amended proofed en_US base.po. * add instance_id to Monster class (#809) * bump android pygame version * use: pyupgrade --py3-plus (#810) * Update README.md * add ubuntu 18.04 venv info * allow resources to be found on system folders * Update README.md update instructions for fedora * Spyder in the Cathedral campaign - all Maps redone, NPCs, plot up to Wayfarer Inn (#797) * Spyder World Map Giving Spyder maps the Spyder prefix, managing with the spyder.world file. Leaving original maps where they're used by other campaigns. * Revert "Spyder World Map" This reverts commit 50ed43e. * Spyder Maps Separating and labelling all current maps for the Spyder in the Cathedral campaign. * Spyder campaign map cleanup continues * More updates * Forgot to save Paper Town before committing * Paper Town additions * Forgot to save Map Helper * Latest update * Big map update * Changes * Missed Map Helper * More Spyder updates * . * Fixing player_house_bedroom * Adding original player_house_bedroom back in * Corrected a typo in the base.po * Removing the "complete" maps which I only used for testing * Update citypark.json Updating the citypark encounters to be more level-appropriate and having evolved tuxemon be rarer. * Fixing Route 1 bug, adding some ledges Route 1 had an incorrect map instruction for one of the teleport tiles. I also took the opportunity to add some ledges, as I found instructions on how they work. * Updates thanks to xirsoi Thank you for all the checking - this should address all issues raised. Have also added ledges to Route 3, so there should be ledges all the way up to Wayfarer Inn (where the story gets to so far). Co-authored-by: xirsoi <chevalierAdam2@gmail.com> * add the taba town greeter (#812) * add the taba town greeter * remove npc_ prefix from the taba_greeter slug * travis: disable android build * Winefix (#815) * refact LIBDIR to support mods in the exe path for windows * various fixes for windows * fix regression with setup * do not load db items when db item is instanced * allow localization files to be empty * remove references to the database when files are imported * fix bad path to filename * travis: update deprecated option skip_cleanup * travis: use cx_freeze to build windows * travis: update deprecated option api_key * don't choke of error context cannot be created * fix defaults for add_item quantity * pin pygame to 1.9.6 until fully tested * Optimize Images (#817) * optimize sprites * Optimized Most Images Co-authored-by: --global <--global> * further optimize png images * fix file permissions; add fix script * move build files from source folder into buildconfig * add event engine test * remove obsolete headless client * remote obsolete action wait_for_input * Weblate fix (#819) * Translated using Weblate (German) Currently translated at 58.9% (351 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/de/ * Translated using Weblate (French) Currently translated at 59.4% (354 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/fr/ * Translated using Weblate (English) Currently translated at 100.0% (595 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/en/ * Translated using Weblate (Czech) Currently translated at 58.9% (351 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/cs/ * Translated using Weblate (German) Currently translated at 58.9% (351 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/de/ * Translated using Weblate (Esperanto) Currently translated at 58.9% (351 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/eo/ * Translated using Weblate (Spanish) Currently translated at 100.0% (595 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/es/ * Translated using Weblate (Spanish (Mexico)) Currently translated at 58.9% (351 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/es_MX/ * Translated using Weblate (Italian) Currently translated at 78.1% (465 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/it/ * Translated using Weblate (Norwegian Bokmål) Currently translated at 12.2% (73 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/nb_NO/ * Translated using Weblate (French) Currently translated at 59.6% (355 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/fr/ * Translated using Weblate (French) Currently translated at 59.6% (355 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/fr/ * Translated using Weblate (French) Currently translated at 60.5% (360 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/fr/ * Translated using Weblate (French) Currently translated at 60.5% (360 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/fr/ * Translated using Weblate (French) Currently translated at 60.8% (362 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/fr/ * Translated using Weblate (French) Currently translated at 60.8% (362 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/fr/ * Translated using Weblate (French) Currently translated at 60.8% (362 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/fr/ * Translated using Weblate (French) Currently translated at 62.0% (369 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/fr/ * Translated using Weblate (English) Currently translated at 100.0% (595 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/en/ * Translated using Weblate (Czech) Currently translated at 58.6% (349 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/cs/ * Translated using Weblate (German) Currently translated at 58.6% (349 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/de/ * Translated using Weblate (Esperanto) Currently translated at 58.8% (350 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/eo/ * Translated using Weblate (Spanish) Currently translated at 99.8% (594 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/es/ * Translated using Weblate (Spanish (Mexico)) Currently translated at 58.6% (349 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/es_MX/ * Translated using Weblate (French) Currently translated at 61.6% (367 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/fr/ * Translated using Weblate (Italian) Currently translated at 77.9% (464 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/it/ * Translated using Weblate (Norwegian Bokmål) Currently translated at 17.6% (105 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/nb_NO/ * Translated using Weblate (French) Currently translated at 66.8% (398 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/fr/ * Translated using Weblate (English) Currently translated at 100.0% (595 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/en/ * Translated using Weblate (Spanish) Currently translated at 100.0% (595 of 595 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/es/ Co-authored-by: J. Lavoie <j.lavoie@net-c.ca> Co-authored-by: Allan Nordhøy <epost@anotheragency.no> Co-authored-by: Anonymous <noreply@weblate.org> Co-authored-by: Cavalcadeur <martin@memora.tolokoban.org> Co-authored-by: Carlos Ramos Carreño <carlosramosca@hotmail.com> * Translated using Weblate (Spanish) Currently translated at 81.4% (626 of 769 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/es/ * Translated using Weblate (Esperanto) Currently translated at 44.8% (345 of 769 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/eo/ * Translated using Weblate (Italian) Currently translated at 60.7% (467 of 769 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/it/ * Translated using Weblate (English) Currently translated at 100.0% (769 of 769 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/en/ * Translated using Weblate (Spanish) Currently translated at 91.6% (705 of 769 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/es/ * Translated using Weblate (Italian) Currently translated at 61.5% (473 of 769 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/it/ * upgrade pytmx dep * remove future imports since 2.7 is no longer supported * remove six * Weblate tuxemon tuxemon (#823) * Translated using Weblate (Spanish) Currently translated at 81.4% (626 of 769 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/es/ * Translated using Weblate (Esperanto) Currently translated at 44.8% (345 of 769 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/eo/ * Translated using Weblate (Italian) Currently translated at 60.7% (467 of 769 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/it/ * Translated using Weblate (English) Currently translated at 100.0% (769 of 769 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/en/ * Translated using Weblate (Spanish) Currently translated at 91.6% (705 of 769 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/es/ * Translated using Weblate (Italian) Currently translated at 61.5% (473 of 769 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/it/ Co-authored-by: Carlos Ramos Carreño <carlosramosca@hotmail.com> Co-authored-by: Michael Moroni <michaelmoroni@disroot.org> * Sang fix (#822) * Expanding Spyder in the Cathedral Campaign Adds encounters to Wayfarer Inn and Route 5. Also adds some building interiors that haven't existed before. First attempt at trading - yet to test. * Campaign update Adds trainers up to Dragon's Cave * Update * Completed campaign This update has all the Spyder in the Cathedral campaign material that I have prepared. It tells a complete story, although there's a few dungeons that have been effectively skipped. See SPYDER README for more details. * Update SPYDER README.md Missed out one detail * Fixing a few bugs * Updated maps from play through Changes to maps and dialogue from another playthrough * Update after full playthrough I've played through the whole game and this is all the things I've caught. * Update base.po Resolving conflict * Update base.po Final fix - missed $ in ${{name}} Co-authored-by: Sanglorian <sanglorian@gmail.com> * optimize images * Update main storyline (#824) * Add Allie sprites * Update allie whoops * I just talked about how I don't do mini commits -___- Sorry guys * Add Bob and xerogrund1 to Taba Town map The first NPCs! * Time to rewrite everything Finally :D * Revamp professor's encounter This will now be the first of two or three. Still need to do stuff elsewhere (events and such), but it's coming together. Also, I fully expect a rewrite of this portion as it seems to not flow as well as it should (at least to me). Might be better with events in the map. * Pretty up the encounter along route 20 * Finish the first encounter with the professor It's done! Granted, it's not a lot, but it flows well now. * Create second announcement Holy Text Block Batman! Yes, it's a lot, but I feel it's too important to split. * Tying up a loose end It was bugging me, so I changed it * Better clarify what The Trial is * Rearrange so it's easier to read * Make it so that you can't leave Taba Town yet * Get everything set up for the announcement * There's something really wrong with this... * Spelling fix Co-authored-by: ZhongQian TiaoGong <sassafrass@fasizzle.com> Co-authored-by: Leif Theden <leif.theden@gmail.com> * Currency placeholder (#826) * Adds currency placeholder, as discussed in Discord. In the future, we should replace the dollar with a custom currency symbol. With this change, this can be done in a centralized way. It also opens the door to translate the currency symbol in different languages or to have different currencies for different campaigns and reusing the dialogs between them. * Update the currency symbol in the Spanish translation. * Update CONTRIBUTING.md * Fix the regression (#827) * Add Allie sprites * Update allie whoops * I just talked about how I don't do mini commits -___- Sorry guys * Add Bob and xerogrund1 to Taba Town map The first NPCs! * Time to rewrite everything Finally :D * Revamp professor's encounter This will now be the first of two or three. Still need to do stuff elsewhere (events and such), but it's coming together. Also, I fully expect a rewrite of this portion as it seems to not flow as well as it should (at least to me). Might be better with events in the map. * Pretty up the encounter along route 20 * Finish the first encounter with the professor It's done! Granted, it's not a lot, but it flows well now. * Create second announcement Holy Text Block Batman! Yes, it's a lot, but I feel it's too important to split. * Tying up a loose end It was bugging me, so I changed it * Better clarify what The Trial is * Rearrange so it's easier to read * Make it so that you can't leave Taba Town yet * Get everything set up for the announcement * There's something really wrong with this... * Spelling fix * bring back allie sprite * Redo player house It was messed up from a previous merge and a regression occurred. fixed now. * Rework Allie sprite * Fix Taba Town * Get Allie right. Finally. Co-authored-by: ZhongQian TiaoGong <sassafrass@fasizzle.com> Co-authored-by: Leif Theden <leif.theden@gmail.com> * Update Bigfin (#828) * Translated using Weblate (Spanish) (#829) Currently translated at 57.8% (705 of 1218 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/es/ Co-authored-by: Carlos Ramos Carreño <carlosramosca@hotmail.com> * Translations update from Weblate (#830) * Translated using Weblate (Spanish) Currently translated at 58.8% (717 of 1218 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/es/ * Translated using Weblate (Spanish) Currently translated at 59.7% (728 of 1218 strings) Translation: Tuxemon/Tuxemon Translate-URL: https://hosted.weblate.org/projects/tuxemon/tuxemon/es/ Co-authored-by: Carlos Ramos Carreño <carlosramosca@hotmail.com> * Feature/breeding (#813) * first pass at breeding * 90% implemented breeding scripts * fix off-by-one errors in some scripts * fix reference to decode_inventory * hopefully completes the breeding feature * omg i did it * fix bad script call * fix remove_monster action * fix some small bugs and remove some debug stuff * Remove Google+ link Since this site is discontinued. * android build progress * Add Visual Studio Code launch config * cache mo files in the tuxemon user data folder, add debugging loggers * remove debug prints * remove lxml, add pypy compat, add another mods file search path * buildconfig for pypy linux * Update CONTRIBUTING.md * fix windows builds * add python39.dll to cx_freeze windows build * Update build_wine_cx_freeze.sh * windows builds tweaking * add pygame recipe * version bump Co-authored-by: Keri Volans <keri.volans@gmail.com> Co-authored-by: vch9 <valentinchb@gmail.com> Co-authored-by: vnmabus <vnmabus@gmail.com> Co-authored-by: Flydx1234 <wenboi1234@gmail.com> Co-authored-by: David <32471913+Flydx1234@users.noreply.github.com> Co-authored-by: ZhongQian TiaoGong <Qiangong2@users.noreply.github.com> Co-authored-by: ZhongQian TiaoGong <sassafrass@fasizzle.com> Co-authored-by: Adam Chevalier <chevalierAdam2@gmail.com> Co-authored-by: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com> Co-authored-by: Yair Morgenstern <yairm210@hotmail.com> Co-authored-by: Austin Tian <47795058+austintian03@users.noreply.github.com> Co-authored-by: ryanhanli <43120124+ryanhanli@users.noreply.github.com> Co-authored-by: Sean Radigan <srradigan@gmail.com> Co-authored-by: tamashihoshi <mustafa.bastug@student.hs-rm.de> Co-authored-by: Murmele <Murmele@users.noreply.github.com> Co-authored-by: freshreplicant <whelnwein@mailbox.org> Co-authored-by: leif Theden <leiftheden@DESKTOP-BFA0LOK-12.home> Co-authored-by: Sanglorian <sanglorian@gmail.com> Co-authored-by: MasterOChaos <73611161+MasterOChaos@users.noreply.github.com> Co-authored-by: J. Lavoie <j.lavoie@net-c.ca> Co-authored-by: Allan Nordhøy <epost@anotheragency.no> Co-authored-by: Anonymous <noreply@weblate.org> Co-authored-by: Cavalcadeur <martin@memora.tolokoban.org> Co-authored-by: Carlos Ramos Carreño <carlosramosca@hotmail.com> Co-authored-by: Michael Moroni <michaelmoroni@disroot.org> Co-authored-by: Kelvin Shadewing <kelvin@shadewing.net> Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: vXtreniusX <49267339+vXtreniusX@users.noreply.github.com> Co-authored-by: James Monger <jameskmonger@hotmail.co.uk>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(object)from class defsI used a tool called "pyupgrade" (https://github.com/asottile/pyupgrade) and it seemed to work well. annoyingly, it "upgraded" some print statements in small ways, but seems to be working fine still.
@kerizane @xirsoi do you mind taking a look here? i think this is all really safe, I played through and didn't see any issues.