-
Notifications
You must be signed in to change notification settings - Fork 44
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
(See the other PRs first!) This is the merge of all my other PRs + some fixes and adjustments. #587
base: master
Are you sure you want to change the base?
Conversation
Added command line options to generate and validate the definesvalidator.h
…ent framework; WIP-craft: fixing crash in case a key (or anything that has a missing BROKEN .dat config) breaks when crafted;
…ent framework; WIP-craft: fixing crash in case a key (or anything that has a missing BROKEN .dat config) breaks when crafted;
…ent framework; WIP-craft: fixing crash in case a key (or anything that has a missing BROKEN .dat config) breaks when crafted;
…ent framework; craft: fixed crash in case a key (or anything that has a missing BROKEN .dat config) breaks when crafted;
better commandline --help and info.
…ume (needs more coding tho...);
… 1cm3 receives full light strength. 2nd - player w/o any light source receives the same light. 3rd - the dungeon map square where it was cut receives that same light;
… feature to lower light emitation from small crystals;
…lculateAll() is called after volume change);
…st needs more tests...;
…t stuck, so it now checks further around sumowrestler to provide the fix.
Merge branch 'SomeFixes1234' of https://github.com/AquariusPower/ivan into SomeFixes1234
also fixed load game about recipedata;
@AquariusPower Does this branch contain all your changes, then? I'd like to try playing with all of them at once. :) |
yup, this contains them all! I think this is the easiest way to test them too :> |
I am checking this conflict |
Many nice changes here.
Really great work! |
From the beginning I always felt strange a game with so many visual effects having arrows for stairs. But as I remember, the arrows are still there and it could be an option!
Actually, there is one full background for each menu entry (it means each can be completely different), I actually thought a simple way to demonstrate it was to just remove parts of default background so I hadn't to draw anything new.
As I remember, each menu entry has a specific sound, and I just reused the existing sounds, yes there could have a config option to mute them easily.
cool!
as I remember, favours can only be asked if the player is aligned with that god's alignment OR if the player is on that god's sacred ground!
If I am not wrong, I typed them like titles (of movies for example) that only more important words are capitalized. Actually they should be written in other font to pass some kind of ancient/magic feeling. But it could be simplified, like may be set it all to lower or upper case.
Agreed, the formulas should be reviewed!
I didn't know that, agreed!
If I am not wrong, we just cannot kick, but there is really no reason to prevent using the arms! (1st vote cast :))
thx! |
Ah, I see. That could be interesting with different background images, but an option to turn it off would be nice.
I will ask on the forums, but I'm also in favour of changing it (2nd vote cast). :) |
actually, the easiest way to make it default right now to have just one image, is to copy the full one over the ones that have parts missing, the feature will remain active but will just not be visible. Long ago, I always imagined the butterflies could actually fly, or at least blink or move their wings, but that would be independent of changing the focus on a menu item, it would require a refresh there also every 0.5s at least I guess. |
BTW, majority of votes on forum is in favour of allowing attacks while overburdened. |
Hi! I am having some trouble here... My guess is that you would like to prepare a release before christmas right? |
Hi @AquariusPower! Sorry for the late reply. I am very sorry to hear your refrigerator broke down, and even sorrier to learn your computer broke. Good on you for getting in touch, I hope you are going ok and are able to get all the machines you need to get back on track. Probably that refrigerator is top priority. |
Plus some phrasing.
Oops, sorry @AquariusPower I pushed some of my changes, but I thought I was pushing into my own fork of your branch, not directly into your branch. Strange that git let me... |
the spell I cast on OP "Who have access to edit this PR, feel free to make any adjustments, even if minor." apparently worked xD |
# Conflicts: # Graphics/OLTerra.png # Main/Include/char.h # Main/Include/craft.h # Main/Include/game.h # Main/Include/iconf.h # Main/Source/cmdcraft.cpp # Main/Source/command.cpp # Main/Source/devcons.cpp # Main/Source/dungeon.cpp # Main/Source/game.cpp # Main/Source/human.cpp # Main/Source/iconf.cpp # Main/Source/main.cpp # NEWS # Script/olterra.dat
fixing merge
fixing merge
removed redundant checks
This was split on several PRs, but there is still code here that are not on them, so, let this be the last PR considered.
I think this is overall ready, I made some basic tests during implementations, and let it for hours on auto-play mode (but it does not test everything/flow). What is mainly missing is more tests on normal gameplay.
Many new things:
tailoring bench 3x requirements of building a workbench;sewing thread should drop from webs instead of spider silk lump; as tools should have scissors and needles and pins crafted from meltables, all with graphics). Will work with any CAN_BE_TAILORED material.Bugfixes (some may only happen when using Wizard Auto Play mode):
And command line --help with some info and functionalities:
--defgen Generate defines validator source file. (NEW)
--defval Validate defines. (NEW)
--version Show current game version.
Who have access to edit this PR, feel free to make any adjustments, even if minor.
Obs.: developer console is still broken tho but wont cause trouble if you dont use it.developer console is working again! I think cuz of this: #589 :)