forked from Attnam/ivan
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #41 from Attnam/master
udpating
- Loading branch information
Showing
49 changed files
with
3,140 additions
and
670 deletions.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| FIX-CRITICAL | ||
|
|
||
| FIX-IMPORTANT | ||
| - validate the existance of all generated savegame files, it is stored in the .sav file, would crash if missing so better just promptly look for them... | ||
| - disappearing pet angel wont drop all equipped items (the ones we give'm and would not normally disappear...), namely torso armor at least | ||
|
|
||
| FIX-MINOR | ||
| - by remembering the previously selected entry list, sometimes the wrong savegame is being loaded, not the "apparently" selected one... | ||
| - skeleton dog shouldn't pee..., but could say "tries to pee but nothing happens" :) | ||
| - pet with poly ring and polycontrol ring, polymorphing into ghost then into bunny, when back to human will not re-equip | ||
| - deny showitemsunder if lantern is on the wall? (amulet of phasing) | ||
| - when felist is open, still showing tiny dungeon animated behind... | ||
| - the last entry in the savegame list, even after imported, may still show as being in the previous version and after importing a new player name may be used and so a new savegame created, quite a mess... (quite confuse this one, may be a unique bug that only happens when importing some specific random rare old saves...) | ||
|
|
||
| IMPROVEMENTS | ||
| - mine::WillExplode() if stepper is trying to pickup, check if levitating and 25+ dexterity (or only dexterity but harder like x2) to let it be disarmed and safely picked up | ||
| - craft dismantle w/o forge should require dagger and hammer if has any meltable | ||
| - craft test material should allow broken things too | ||
| - craft if sat on a chair should lower craft time too | ||
| - craft tools should take damage too, mainly if the worked materials are harder | ||
| - felist: default remember_selected | ||
| - simple pile equal items on "show items under", ex.: if more than 1, simply draw a tiny + sign with 2 drawn white lines | ||
| - show items under, begin with the last one, unless if showing them all in lines | ||
| - mini map unfold slowly once per frame one dungeon line of squares animation | ||
| - remove flag CanBeDestroyed from items that can be crafted? or deny their crafting? or keep as on fumble creates lump? | ||
| - show material Str only if in possession of the materials book | ||
| - inventory 'i' will be selectable if in possession of the materials book and chosing will show at most 2 lines as filter to the book | ||
| - pickup accept many using the same pickup key ',' at least see the other keys cfgs too | ||
|
|
||
| NEW STUFF | ||
| - draw the current equipped amulet on the player | ||
| - sfx "It smells oddly intelligent here." the good smoke as opposed to "a sinister stench surrounds you" the bad smoke | ||
|
|
||
| ================================================================================================================== | ||
| DONE: | ||
| - add a lsquare token during detect material to highlight the square, the guessed luminance fails at daylight 13:02h | ||
| - quick swap weapons hotkey, to also reequip after mining interrupted | ||
| - hum?? walk over friendly: chat and wait one turn to let it move | ||
| - ?make pet always follow very closely to avoid getting lost from the player? or that is part of the troubles/difficulty? :) | ||
| - make pet look at last 3 squares player walked before waiting | ||
| - sfx for .*hit.* it is matching white :P | ||
| - list item zoom xBRZ, draw the background behind it to make the blending work properly all times! | ||
| - craft fluid extraction should not require a specific previous location to resume | ||
| - dupPlayerBugFix: check also for duplicity of TrapIDMap as crashing on save | ||
| - optionally auto inscribe some map notes like altars, anvil, chair etc | ||
| - the materials book could be filtered by typing (felist already can filter anything) |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,332 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <configurationDescriptor version="100"> | ||
| <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT"> | ||
| <df root="audio" name="0"> | ||
| </df> | ||
| <df root="fantasyname" name="1"> | ||
| </df> | ||
| <df root="Main/Include" name="2"> | ||
| </df> | ||
| <df root="FeLib/Include" name="3"> | ||
| <in>felist.h</in> | ||
| <in>feloops.h</in> | ||
| <in>femath.h</in> | ||
| <in>festring.h</in> | ||
| <in>fetime.h</in> | ||
| <in>graphics.h</in> | ||
| <in>hscore.h</in> | ||
| </df> | ||
| <df root="FeLib/Source" name="4"> | ||
| <in>bitmap.cpp</in> | ||
| <in>config.cpp</in> | ||
| <in>dbgmsg.cpp</in> | ||
| <in>error.cpp</in> | ||
| <in>febot.cpp</in> | ||
| <in>feio.cpp</in> | ||
| <in>felist.cpp</in> | ||
| <in>femath.cpp</in> | ||
| <in>festring.cpp</in> | ||
| <in>fetime.cpp</in> | ||
| <in>graphics.cpp</in> | ||
| <in>hscore.cpp</in> | ||
| <in>rawbit.cpp</in> | ||
| <in>save.cpp</in> | ||
| <in>specialkeys.cpp</in> | ||
| <in>whandler.cpp</in> | ||
| </df> | ||
| <df root="Main/Source" name="5"> | ||
| <in>action.cpp</in> | ||
| <in>actions.cpp</in> | ||
| <in>actset.cpp</in> | ||
| <in>area.cpp</in> | ||
| <in>areaset.cpp</in> | ||
| <in>bodypart.cpp</in> | ||
| <in>bugworkaround.cpp</in> | ||
| <in>char.cpp</in> | ||
| <in>charset.cpp</in> | ||
| <in>charsset.cpp</in> | ||
| <in>cmdcraft.cpp</in> | ||
| <in>cmdswapweap.cpp</in> | ||
| <in>command.cpp</in> | ||
| <in>cont.cpp</in> | ||
| <in>coreset.cpp</in> | ||
| <in>database.cpp</in> | ||
| <in>dataset.cpp</in> | ||
| <in>definesvalidator.cpp</in> | ||
| <in>devcons.cpp</in> | ||
| <in>dungeon.cpp</in> | ||
| <in>entity.cpp</in> | ||
| <in>fluid.cpp</in> | ||
| <in>game.cpp</in> | ||
| <in>gear.cpp</in> | ||
| <in>god.cpp</in> | ||
| <in>gods.cpp</in> | ||
| <in>godset.cpp</in> | ||
| <in>hiteffect.cpp</in> | ||
| <in>iconf.cpp</in> | ||
| <in>id.cpp</in> | ||
| <in>igraph.cpp</in> | ||
| <in>item.cpp</in> | ||
| <in>itemset.cpp</in> | ||
| <in>level.cpp</in> | ||
| <in>levelset.cpp</in> | ||
| <in>main.cpp</in> | ||
| <in>materia.cpp</in> | ||
| <in>materias.cpp</in> | ||
| <in>materset.cpp</in> | ||
| <in>message.cpp</in> | ||
| <in>object.cpp</in> | ||
| <in>room.cpp</in> | ||
| <in>rooms.cpp</in> | ||
| <in>roomset.cpp</in> | ||
| <in>script.cpp</in> | ||
| <in>slot.cpp</in> | ||
| <in>slotset.cpp</in> | ||
| <in>stack.cpp</in> | ||
| <in>trap.cpp</in> | ||
| <in>traps.cpp</in> | ||
| <in>trapset.cpp</in> | ||
| <in>wmapset.cpp</in> | ||
| <in>worldmap.cpp</in> | ||
| <in>wskill.cpp</in> | ||
| <in>wsquare.cpp</in> | ||
| <in>wterra.cpp</in> | ||
| <in>wterras.cpp</in> | ||
| </df> | ||
| <df root="xbrzscale" name="6"> | ||
| </df> | ||
| <logicalFolder name="ExternalFiles" | ||
| displayName="Important Files" | ||
| projectFiles="false" | ||
| kind="IMPORTANT_FILES_FOLDER"> | ||
| <itemPath>CMakeLists.txt</itemPath> | ||
| <itemPath>Makefile</itemPath> | ||
| <itemPath>nbproject/private/launcher.properties</itemPath> | ||
| </logicalFolder> | ||
| </logicalFolder> | ||
| <sourceFolderFilter>^(nbproject)$</sourceFolderFilter> | ||
| <sourceRootList> | ||
| <Elem>audio</Elem> | ||
| <Elem>fantasyname</Elem> | ||
| <Elem>FeLib/Source</Elem> | ||
| <Elem>xbrzscale</Elem> | ||
| <Elem>Main/Source</Elem> | ||
| <Elem>Main/Include</Elem> | ||
| <Elem>FeLib/Include</Elem> | ||
| </sourceRootList> | ||
| <projectmakefile>Makefile</projectmakefile> | ||
| <confs> | ||
| <conf name="Default" type="0"> | ||
| <toolsSet> | ||
| <compilerSet>default</compilerSet> | ||
| <dependencyChecking>false</dependencyChecking> | ||
| <rebuildPropChanged>false</rebuildPropChanged> | ||
| </toolsSet> | ||
| <codeAssistance> | ||
| </codeAssistance> | ||
| <makefileType> | ||
| <makeTool> | ||
| <buildCommandWorkingDir>.</buildCommandWorkingDir> | ||
| <buildCommand>${MAKE} -f Makefile</buildCommand> | ||
| <cleanCommand>${MAKE} -f Makefile clean</cleanCommand> | ||
| <executablePath></executablePath> | ||
| </makeTool> | ||
| <preBuild> | ||
| <preBuildCommandWorkingDir>.</preBuildCommandWorkingDir> | ||
| <preBuildCommand>${CMAKE} -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=${IDE_CC} -DCMAKE_CXX_COMPILER=${IDE_CXX} -DCMAKE_C_FLAGS_DEBUG="-g3 -gdwarf-2" -DCMAKE_CXX_FLAGS_DEBUG="-g3 -gdwarf-2" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON .</preBuildCommand> | ||
| </preBuild> | ||
| </makefileType> | ||
| </conf> | ||
| <conf name="myCfg" type="0"> | ||
| <toolsSet> | ||
| <compilerSet>default</compilerSet> | ||
| <dependencyChecking>false</dependencyChecking> | ||
| <rebuildPropChanged>false</rebuildPropChanged> | ||
| </toolsSet> | ||
| <codeAssistance> | ||
| </codeAssistance> | ||
| <makefileType> | ||
| <makeTool> | ||
| <buildCommandWorkingDir>.</buildCommandWorkingDir> | ||
| <buildCommand>${MAKE} -f Makefile</buildCommand> | ||
| <cleanCommand>${MAKE} -f Makefile clean</cleanCommand> | ||
| <executablePath></executablePath> | ||
| <ccTool> | ||
| <preprocessorList> | ||
| <Elem>DBGMSG</Elem> | ||
| <Elem>FELIST_WAITKEYUP</Elem> | ||
| <Elem>FIX_LARGECREATURE_TELEPORT_GLITCH</Elem> | ||
| <Elem>UNIX</Elem> | ||
| <Elem>USE_SDL</Elem> | ||
| <Elem>WIZARD</Elem> | ||
| </preprocessorList> | ||
| </ccTool> | ||
| </makeTool> | ||
| <preBuild> | ||
| <preBuildCommandWorkingDir>.</preBuildCommandWorkingDir> | ||
| <preBuildCommand>${CMAKE} -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=${IDE_CC} -DCMAKE_CXX_COMPILER=${IDE_CXX} -DCMAKE_C_FLAGS_DEBUG="-g3 -gdwarf-2" -DCMAKE_CXX_FLAGS_DEBUG="-g3 -gdwarf-2" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON .</preBuildCommand> | ||
| </preBuild> | ||
| </makefileType> | ||
| <item path="FeLib/Include/felist.h" ex="false" tool="3" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Include/feloops.h" ex="false" tool="3" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Include/femath.h" ex="false" tool="3" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Include/festring.h" ex="false" tool="3" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Include/fetime.h" ex="false" tool="3" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Include/graphics.h" ex="false" tool="3" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Include/hscore.h" ex="false" tool="3" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Source/bitmap.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Source/config.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Source/dbgmsg.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Source/error.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Source/febot.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Source/feio.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Source/felist.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Source/femath.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Source/festring.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Source/fetime.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Source/graphics.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Source/hscore.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Source/rawbit.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Source/save.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Source/specialkeys.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="FeLib/Source/whandler.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/action.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/actions.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/actset.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/area.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/areaset.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/bodypart.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/bugworkaround.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/char.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/charset.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/charsset.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/cmdcraft.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/cmdswapweap.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/command.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/cont.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/coreset.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/database.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/dataset.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/definesvalidator.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/devcons.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/dungeon.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/entity.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/fluid.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/game.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/gear.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/god.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/gods.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/godset.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/hiteffect.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/iconf.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/id.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/igraph.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/item.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/itemset.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/level.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/levelset.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/main.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/materia.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/materias.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/materset.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/message.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/object.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/room.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/rooms.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/roomset.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/script.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/slot.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/slotset.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/stack.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/trap.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/traps.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/trapset.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/wmapset.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/worldmap.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/wskill.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/wsquare.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/wterra.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| <item path="Main/Source/wterras.cpp" ex="false" tool="1" flavor2="0"> | ||
| </item> | ||
| </conf> | ||
| </confs> | ||
| </configurationDescriptor> |
Oops, something went wrong.