- add action ActMenuClickVisible

- add action variable.setIfNull

- add ActPlayerSetDirection
- add addGold action

- add executeAction to menu + replace vars with values

- add getItemSlot to player (checks all inventories)
- add item price

- add ItemSetProperty action
- add menu.setIndex action

- add predicate functions (to use in conditional actions)

- add support for multiple level objects in the same position

- add support for walking above items

- fix crash in pathfilder

- fix resource.add always setting previous ignore
- refactor gamefiles (char, game menu, msgBox, panel)

- refactor gamefiles not to use toggle buttons

- refactor getString* to parse numbers as well

- refactor if condition actions to support predicates

- refactor if.fileExists into predicate
- refactor item code
- refactor menu code to support include/exclude filters

- refactor menu functions to be zero based index
- refactor parseMenu

- refactor replaceVars

- remove toggle action from button

- show not enough gold message

- update cain's identify items
- update gamefiles

- update gamefiles (items, finish town players menus)
- update unique description UI

- use queries in item prefixes / suffixes

- use str2int16 everywhere
- walk slower

CMakeLists.txt

@@ -92,6 +92,7 @@ set(SOURCE_FILES
     src/Variable.cpp
     src/Variable.h
     src/Variant.h
+    src/VarOrPredicate.h
     src/View2.cpp
     src/View2.h
     src/Actions/ActAction.h
@@ -139,9 +140,12 @@ set(SOURCE_FILES
     src/Game/ItemCollection.h
     src/Game/ItemLocation.h
     src/Game/ItemProperties.h
+    src/Game/ItemTypes.h
     src/Game/ItemXY.h
     src/Game/Level.cpp
     src/Game/Level.h
+    src/Game/LevelCell.cpp
+    src/Game/LevelCell.h
     src/Game/LevelHelper.cpp
     src/Game/LevelHelper.h
     src/Game/LevelMap.cpp
@@ -211,10 +215,13 @@ set(SOURCE_FILES
     src/Parser/ParseMovie.h
     src/Parser/ParsePalette.cpp
     src/Parser/ParsePalette.h
+    src/Parser/ParsePredicate.cpp
+    src/Parser/ParsePredicate.h
     src/Parser/Parser.cpp
     src/Parser/Parser.h
     src/Parser/ParseRectangle.cpp
     src/Parser/ParseRectangle.h
+    src/Parser/ParserProperties.h
     src/Parser/ParseScrollableText.cpp
     src/Parser/ParseScrollableText.h
     src/Parser/ParseSound.cpp
@@ -249,6 +256,9 @@ set(SOURCE_FILES
     src/Parser/Utils/ParseUtilsKey.h
     src/Parser/Utils/ParseUtilsVal.cpp
     src/Parser/Utils/ParseUtilsVal.h
+    src/Predicates/Predicate.h
+    src/Predicates/PredIO.h
+    src/Predicates/PredPlayer.h
     src/rapidjson/allocators.h
     src/rapidjson/document.h
     src/rapidjson/encodedstream.h

DGEngine.vcxproj

@@ -51,6 +51,7 @@
     <ClCompile Include="src\Game\ItemClass.cpp" />
     <ClCompile Include="src\Game\ItemCollection.cpp" />
     <ClCompile Include="src\Game\Level.cpp" />
+    <ClCompile Include="src\Game\LevelCell.cpp" />
     <ClCompile Include="src\Game\LevelHelper.cpp" />
     <ClCompile Include="src\Game\LevelMap.cpp" />
     <ClCompile Include="src\Game\Namer.cpp" />
@@ -101,6 +102,7 @@
     <ClCompile Include="src\Parser\ParseMountFile.cpp" />
     <ClCompile Include="src\Parser\ParseMovie.cpp" />
     <ClCompile Include="src\Parser\ParsePalette.cpp" />
+    <ClCompile Include="src\Parser\ParsePredicate.cpp" />
     <ClCompile Include="src\Parser\Parser.cpp" />
     <ClCompile Include="src\Parser\ParseRectangle.cpp" />
     <ClCompile Include="src\Parser\ParseScrollableText.cpp" />
@@ -176,8 +178,10 @@
     <ClInclude Include="src\Game\ItemCollection.h" />
     <ClInclude Include="src\Game\ItemLocation.h" />
     <ClInclude Include="src\Game\ItemProperties.h" />
+    <ClInclude Include="src\Game\ItemTypes.h" />
     <ClInclude Include="src\Game\ItemXY.h" />
     <ClInclude Include="src\Game\Level.h" />
+    <ClInclude Include="src\Game\LevelCell.h" />
     <ClInclude Include="src\Game\LevelHelper.h" />
     <ClInclude Include="src\Game\LevelMap.h" />
     <ClInclude Include="src\Game\LevelObject.h" />
@@ -228,8 +232,10 @@
     <ClInclude Include="src\Parser\ParseMountFile.h" />
     <ClInclude Include="src\Parser\ParseMovie.h" />
     <ClInclude Include="src\Parser\ParsePalette.h" />
+    <ClInclude Include="src\Parser\ParsePredicate.h" />
     <ClInclude Include="src\Parser\Parser.h" />
     <ClInclude Include="src\Parser\ParseRectangle.h" />
+    <ClInclude Include="src\Parser\ParserProperties.h" />
     <ClInclude Include="src\Parser\ParseScrollableText.h" />
     <ClInclude Include="src\Parser\ParseSound.h" />
     <ClInclude Include="src\Parser\ParseText.h" />
@@ -239,6 +245,9 @@
     <ClInclude Include="src\Parser\Utils\ParseUtilsIdx.h" />
     <ClInclude Include="src\Parser\Utils\ParseUtilsKey.h" />
     <ClInclude Include="src\Parser\Utils\ParseUtilsVal.h" />
+    <ClInclude Include="src\Predicates\Predicate.h" />
+    <ClInclude Include="src\Predicates\PredIO.h" />
+    <ClInclude Include="src\Predicates\PredPlayer.h" />
     <ClInclude Include="src\Queryable.h" />
     <ClInclude Include="src\Rectangle.h" />
     <ClInclude Include="src\ReverseIterable.h" />
@@ -274,6 +283,7 @@
     <ClInclude Include="src\Utils.h" />
     <ClInclude Include="src\Variable.h" />
     <ClInclude Include="src\Variant.h" />
+    <ClInclude Include="src\VarOrPredicate.h" />
     <ClInclude Include="src\View2.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">

android/jni/Android.mk

@@ -92,6 +92,7 @@ LOCAL_SRC_FILES += Utils.h
 LOCAL_SRC_FILES += Variable.cpp
 LOCAL_SRC_FILES += Variable.h
 LOCAL_SRC_FILES += Variant.h
+LOCAL_SRC_FILES += VarOrPredicate.h
 LOCAL_SRC_FILES += View2.cpp
 LOCAL_SRC_FILES += View2.h
 LOCAL_SRC_FILES += Actions/ActAction.h
@@ -139,9 +140,12 @@ LOCAL_SRC_FILES += Game/ItemCollection.cpp
 LOCAL_SRC_FILES += Game/ItemCollection.h
 LOCAL_SRC_FILES += Game/ItemLocation.h
 LOCAL_SRC_FILES += Game/ItemProperties.h
+LOCAL_SRC_FILES += Game/ItemTypes.h
 LOCAL_SRC_FILES += Game/ItemXY.h
 LOCAL_SRC_FILES += Game/Level.cpp
 LOCAL_SRC_FILES += Game/Level.h
+LOCAL_SRC_FILES += Game/LevelCell.cpp
+LOCAL_SRC_FILES += Game/LevelCell.h
 LOCAL_SRC_FILES += Game/LevelHelper.cpp
 LOCAL_SRC_FILES += Game/LevelHelper.h
 LOCAL_SRC_FILES += Game/LevelMap.cpp
@@ -211,10 +215,13 @@ LOCAL_SRC_FILES += Parser/ParseMovie.cpp
 LOCAL_SRC_FILES += Parser/ParseMovie.h
 LOCAL_SRC_FILES += Parser/ParsePalette.cpp
 LOCAL_SRC_FILES += Parser/ParsePalette.h
+LOCAL_SRC_FILES += Parser/ParsePredicate.cpp
+LOCAL_SRC_FILES += Parser/ParsePredicate.h
 LOCAL_SRC_FILES += Parser/Parser.cpp
 LOCAL_SRC_FILES += Parser/Parser.h
 LOCAL_SRC_FILES += Parser/ParseRectangle.cpp
 LOCAL_SRC_FILES += Parser/ParseRectangle.h
+LOCAL_SRC_FILES += Parser/ParserProperties.h
 LOCAL_SRC_FILES += Parser/ParseScrollableText.cpp
 LOCAL_SRC_FILES += Parser/ParseScrollableText.h
 LOCAL_SRC_FILES += Parser/ParseSound.cpp
@@ -249,6 +256,9 @@ LOCAL_SRC_FILES += Parser/Utils/ParseUtilsKey.cpp
 LOCAL_SRC_FILES += Parser/Utils/ParseUtilsKey.h
 LOCAL_SRC_FILES += Parser/Utils/ParseUtilsVal.cpp
 LOCAL_SRC_FILES += Parser/Utils/ParseUtilsVal.h
+LOCAL_SRC_FILES += Predicates/Predicate.h
+LOCAL_SRC_FILES += Predicates/PredIO.h
+LOCAL_SRC_FILES += Predicates/PredPlayer.h
 LOCAL_SRC_FILES += rapidjson/allocators.h
 LOCAL_SRC_FILES += rapidjson/document.h
 LOCAL_SRC_FILES += rapidjson/encodedstream.h

gamefiles/level/item/amulets.json

@@ -11,6 +11,7 @@
       "shortName": "Amulet",
       "type": "Amulet",
       "defaults": {
+        "price": 1200,
         "magic": true,
         "durability": "max",
         "durabilityMax": "max"

gamefiles/level/item/armors.json

@@ -12,6 +12,7 @@
       "shortName": "Rags",
       "type": "Armor",
       "defaults": {
+        "price": 5,
         "armor": 6,
         "durability": 6,
         "durabilityMax": 6
@@ -33,6 +34,7 @@
       "name": "Cape",
       "shortName": "Cape",
       "defaults": {
+        "price": 10,
         "armor": 5,
         "durability": 12,
         "durabilityMax": 12
@@ -49,6 +51,7 @@
       "name": "Cloak",
       "shortName": "Cloak",
       "defaults": {
+        "price": 40,
         "armor": 7,
         "durability": 18,
         "durabilityMax": 18
@@ -65,6 +68,7 @@
       "name": "Robe",
       "shortName": "Robe",
       "defaults": {
+        "price": 75,
         "armor": 7,
         "durability": 24,
         "durabilityMax": 24
@@ -81,6 +85,7 @@
       "name": "Quilted Armor",
       "shortName": "Armor",
       "defaults": {
+        "price": 200,
         "armor": 10,
         "durability": 30,
         "durabilityMax": 30
@@ -96,6 +101,7 @@
       "celIndexInventory": 146,
       "name": "Leather Armor",
       "defaults": {
+        "price": 300,
         "armor": 13,
         "durability": 35,
         "durabilityMax": 35
@@ -111,6 +117,7 @@
       "celIndexInventory": 138,
       "name": "Hard Leather Armor",
       "defaults": {
+        "price": 450,
         "armor": 14,
         "durability": 40,
         "durabilityMax": 40
@@ -126,6 +133,7 @@
       "celIndexInventory": 118,
       "name": "Studded Leather Armor",
       "defaults": {
+        "price": 700,
         "armor": 17,
         "durability": 45,
         "durabilityMax": 45,
@@ -143,6 +151,7 @@
       "name": "Ring Mail",
       "shortName": "Mail",
       "defaults": {
+        "price": 900,
         "armor": 20,
         "durability": 50,
         "durabilityMax": 50,
@@ -161,6 +170,7 @@
       "celIndexInventory": 122,
       "name": "Chain Mail",
       "defaults": {
+        "price": 1250,
         "armor": 22,
         "durability": 55,
         "durabilityMax": 55,
@@ -177,6 +187,7 @@
       "celIndexInventory": 125,
       "name": "Scale Mail",
       "defaults": {
+        "price": 2300,
         "armor": 22,
         "durability": 55,
         "durabilityMax": 55,
@@ -194,6 +205,7 @@
       "name": "Breast Plate",
       "shortName": "Plate",
       "defaults": {
+        "price": 2800,
         "armor": 24,
         "durability": 80,
         "durabilityMax": 80,
@@ -210,6 +222,7 @@
       "celIndexInventory": 147,
       "name": "Splint Mail",
       "defaults": {
+        "price": 3250,
         "armor": 35,
         "durability": 65,
         "durabilityMax": 65,
@@ -226,6 +239,7 @@
       "celIndexInventory": 114,
       "name": "Field Plate",
       "defaults": {
+        "price": 5800,
         "armor": 45,
         "durability": 80,
         "durabilityMax": 80,
@@ -242,6 +256,7 @@
       "celIndexInventory": {2},
       "name": "Gothic Plate",
       "defaults": {
+        "price": 8000,
         "armor": 60,
         "durability": 100,
         "durabilityMax": 100,
@@ -258,6 +273,7 @@
       "celIndexInventory": 162,
       "name": "Full Plate Mail",
       "defaults": {
+        "price": 6500,
         "armor": 75,
         "durability": 90,
         "durabilityMax": 90,
@@ -274,12 +290,18 @@
       "celIndexInventory": {3},
       "name": "Arkaine's Valor",
       "shortName": "Arkaine's Valor",
+      "description2": "unique",
+      "description3": null,
+      "description5": "arkanesValor",
       "defaults": {
+        "price": 42000,
         "armor": 25,
         "durability": 40,
         "durabilityMax": 40,
         "requiredStrength": 0,
         "toVitality": 10,
+        "damageFromEnemies": -3,
+        "identified": false,
         "unique": true
       }
     }

gamefiles/level/item/axes.json

@@ -12,6 +12,7 @@
       "shortName": "Axe",
       "type": "Axe",
       "defaults": {
+        "price": 150,
         "twoHanded": true,
         "damageMin": 2,
         "damageMax": 10,
@@ -32,6 +33,7 @@
       "celIndexInventory": 155,
       "name": "Axe",
       "defaults": {
+        "price": 450,
         "damageMin": 4,
         "damageMax": 12,
         "durability": 32,
@@ -49,6 +51,7 @@
       "celIndexInventory": 153,
       "name": "Large Axe",
       "defaults": {
+        "price": 750,
         "damageMin": 6,
         "damageMax": 16,
         "durability": 40,
@@ -66,6 +69,7 @@
       "celIndexInventory": 152,
       "name": "Broad Axe",
       "defaults": {
+        "price": 1000,
         "damageMin": 8,
         "damageMax": 20,
         "durability": 50,
@@ -83,6 +87,7 @@
       "celIndexInventory": 112,
       "name": "Battle Axe",
       "defaults": {
+        "price": 1500,
         "damageMin": 10,
         "damageMax": 25,
         "durability": 60,
@@ -100,6 +105,7 @@
       "celIndexInventory": 154,
       "name": "Great Axe",
       "defaults": {
+        "price": 2500,
         "damageMin": 12,
         "damageMax": 30,
         "durability": 75,

gamefiles/level/item/books.json

@@ -10,6 +10,7 @@
       "name": "Book",
       "type": "Book",
       "defaults": {
+        "price": 1000,
         "identified": true
       },
       "description1": "rightClickToRead",