Merge pull request #30 from CleverRaven/master

catch a mouse

CataclysmWin.cbp

@@ -65,7 +65,7 @@
 					<Add option="-Os" />
 					<Add option="-O2" />
 					<Add option="-DTILES=1" />
-					<Add option="-DSOUND=1" />
+					<Add option="-DSDL_SOUND=1" />
 					<Add option="-DRELEASE=1" />
 					<Add directory="WinDepend/include" />
 					<Add directory="WinDepend/include/SDL2" />
@@ -113,7 +113,7 @@
 					<Add option="-O2" />
 					<Add option="-DLOCALIZE=1" />
 					<Add option="-DTILES=1" />
-					<Add option="-DSOUND=1" />
+					<Add option="-DSDL_SOUND=1" />
 					<Add option="-DRELEASE=1" />
 					<Add directory="WinDepend/include" />
 					<Add directory="WinDepend/include/SDL2" />
@@ -191,7 +191,7 @@
 					<Add option="-pg" />
 					<Add option="-g" />
 					<Add option="-DTILES=1" />
-					<Add option="-DSOUND=1" />
+					<Add option="-DSDL_SOUND=1" />
 					<Add directory="WinDepend/include" />
 					<Add directory="WinDepend/include/SDL2" />
 				</Compiler>
@@ -241,7 +241,7 @@
 					<Add option="-g" />
 					<Add option="-DLOCALIZE=1" />
 					<Add option="-DTILES=1" />
-					<Add option="-DSOUND=1" />
+					<Add option="-DSDL_SOUND=1" />
 					<Add directory="WinDepend/include" />
 					<Add directory="WinDepend/include/SDL2" />
 				</Compiler>

Makefile

@@ -648,9 +648,7 @@ ifeq ($(TILES), 1)
       endif
     endif
   else # not osx
-    CXXFLAGS += $(shell $(PKG_CONFIG) sdl2 --cflags)
-    CXXFLAGS += $(shell $(PKG_CONFIG) SDL2_image --cflags)
-    CXXFLAGS += $(shell $(PKG_CONFIG) SDL2_ttf --cflags)
+    CXXFLAGS += $(shell $(PKG_CONFIG) --cflags sdl2 SDL2_image SDL2_ttf)
 
     ifeq ($(STATIC), 1)
       LDFLAGS += $(shell $(PKG_CONFIG) sdl2 --static --libs)
@@ -672,8 +670,7 @@ ifeq ($(TILES), 1)
       # These differ depending on what SDL2 is configured to use.
       ifneq (,$(findstring mingw32,$(CROSS)))
         # We use pkg-config to find out which libs are needed with MXE
-        LDFLAGS += $(shell $(PKG_CONFIG) SDL2_image --libs)
-        LDFLAGS += $(shell $(PKG_CONFIG) SDL2_ttf --libs)
+        LDFLAGS += $(shell $(PKG_CONFIG) --libs SDL2_image SDL2_ttf)
       else
         ifeq ($(MSYS2),1)
           LDFLAGS += -Wl,--start-group -lharfbuzz -lfreetype -Wl,--end-group -lgraphite2 -lpng -lz -ltiff -lbz2 -lglib-2.0 -llzma -lws2_32 -lintl -liconv -lwebp -ljpeg -luuid

data/core/game_balance.json

@@ -9,7 +9,7 @@
   {
     "type": "EXTERNAL_OPTION",
     "name": "GUN_DISPERSION_DIVIDER",
-    "info": "Value that divides total weapon dispersion. 15 means that weapons became 15 times more accurate than default.",
+    "info": "Value that divides total weapon dispersion.  15 means that weapons became 15 times more accurate than default.",
     "stype": "float",
     "value": 18
   },
@@ -23,7 +23,7 @@
   {
     "type": "EXTERNAL_OPTION",
     "name": "PLAYER_BASE_STAMINA_REGEN_RATE",
-    "info": "Sets base stamina regeneration per turn of the player. May be used as an offset in stamina draining effects.",
+    "info": "Sets base stamina regeneration per turn of the player.  May be used as an offset in stamina draining effects.",
     "stype": "float",
     "value": 20
   },
@@ -37,35 +37,35 @@
   {
     "type": "EXTERNAL_OPTION",
     "name": "PLAYER_HUNGER_RATE",
-    "info": "Set base hunger rate per 5 minutes. Default: 1.0",
+    "info": "Set base hunger rate per 5 minutes.  Default: 1.0",
     "stype": "float",
     "value": 1.0
   },
   {
     "type": "EXTERNAL_OPTION",
     "name": "PLAYER_THIRST_RATE",
-    "info": "Set base thirst rate per 5 minutes. Default: 1.0",
+    "info": "Set base thirst rate per 5 minutes.  Default: 1.0",
     "stype": "float",
     "value": 1.0
   },
   {
     "type": "EXTERNAL_OPTION",
     "name": "PLAYER_FATIGUE_RATE",
-    "info": "Set base fatigue rate per 5 minutes. Default: 1.0",
+    "info": "Set base fatigue rate per 5 minutes.  Default: 1.0",
     "stype": "float",
     "value": 1.0
   },
   {
     "type": "EXTERNAL_OPTION",
     "name": "PLAYER_HEALING_RATE",
-    "info": "Set base player healing rate per turn. Default: 0.0001",
+    "info": "Set base player healing rate per turn.  Default: 0.0001",
     "stype": "float",
     "value": 0.0001
   },
   {
     "type": "EXTERNAL_OPTION",
     "name": "NPC_HEALING_RATE",
-    "info": "Set base NPC healing rate per turn. Default: 0.0001",
+    "info": "Set base NPC healing rate per turn.  Default: 0.0001",
     "stype": "float",
     "value": 0.0001
   },
@@ -79,7 +79,7 @@
   {
     "type": "EXTERNAL_OPTION",
     "name": "NO_NPC_FOOD",
-    "info": "Disables tracking food, thirst and ( partially ) fatigue for NPCs. If true, NPCs won't need to eat or drink and will only get tired enough to sleep, not to get penalties.",
+    "info": "Disables tracking food, thirst and ( partially ) fatigue for NPCs.  If true, NPCs won't need to eat or drink and will only get tired enough to sleep, not to get penalties.",
     "stype": "bool",
     "value": false
   },
@@ -93,7 +93,7 @@
   {
     "type": "EXTERNAL_OPTION",
     "name": "CBM_SLOTS_ENABLED",
-    "info": "Enables CBM slots mechanics. If true CBM slots are enabled.",
+    "info": "Enables CBM slots mechanics.  If true CBM slots are enabled.",
     "stype": "bool",
     "value": false
   },

data/credits/ru.credits

@@ -16,7 +16,7 @@
 <color_yellow>BrettDong</color> - За переводы.
 <color_yellow>curstwist</color> - За крышевание зданий, NPC и чейнжлоги.
 <color_yellow>davidpwbrown</color> - За авто-перемещения и авто-езду.  Ну и за коневодство тоже.
-<color_yellow>jbytheway</color> - За работу над CI и умение остаивать свою точку зрения.
+<color_yellow>jbytheway</color> - За работу над CI и умение отстаивать свою точку зрения.
 <color_yellow>Hymore246</color> - За переработку боевых искусств.
 <color_yellow>Qrox</color> - За читабельную трассировку в Windows-билдах.
 <color_yellow>ZhilkinSerg</color> - За тестирование и слияние изменений.

data/json/achievements.json

@@ -635,21 +635,6 @@
       { "event_statistic": "num_broken_left_arm", "is": ">=", "target": 1, "visible": "when_requirement_completed" }
     ]
   },
-  {
-    "id": "achievement_lvl_7_barter",
-    "type": "achievement",
-    "name": "Free Trader",
-    "description": "Extraordinary gizmos for obscenely low prices!",
-    "requirements": [ { "event_statistic": "num_gains_barter_level_7", "is": ">=", "target": 1 } ]
-  },
-  {
-    "id": "achievement_lvl_10_barter",
-    "type": "achievement",
-    "name": "Cut-Me-Own-Throat Dibbler",
-    "description": "My Inuit friend, I'm selling you this ice for such a low price, that it's cutting me own throat.",
-    "requirements": [ { "event_statistic": "num_gains_barter_level_10", "is": ">=", "target": 1 } ],
-    "hidden_by": [ "achievement_lvl_7_barter" ]
-  },
   {
     "id": "achievement_lvl_7_speech",
     "type": "achievement",

data/json/artifact/altered_object_active.json

@@ -7,6 +7,7 @@
     "valid_targets": [ "ground" ],
     "effect": "summon",
     "effect_str": "mon_vortex",
+    "shape": "blast",
     "base_casting_time": 100,
     "message": "Space twists and deforms around you.",
     "min_damage": 1,
@@ -25,6 +26,7 @@
     "valid_targets": [ "ground" ],
     "effect": "summon",
     "effect_str": "mon_hound_tindalos",
+    "shape": "blast",
     "base_casting_time": 100,
     "message": "The world unravels into geometric shapes, and between the chaos you spot a horrid prowling beast.",
     "min_damage": 1,
@@ -41,8 +43,8 @@
     "name": "Artifact Force Pull",
     "description": "Pull objects.",
     "effect": "area_pull",
-    "effect_filter": [ "ally", "hostile", "item", "fd_fire", "fd_blood" ],
-    "valid_targets": [ "self", "ally", "hostile", "ground" ],
+    "shape": "blast",
+    "valid_targets": [ "self", "ally", "hostile", "ground", "item", "field" ],
     "message": "An unnatural implosion sends objects flying.",
     "min_range": 15,
     "max_range": 15,
@@ -59,6 +61,7 @@
     "valid_targets": [ "self" ],
     "effect": "spawn_item",
     "effect_str": "artifact_teleportitis_aura",
+    "shape": "blast",
     "base_casting_time": 100,
     "min_duration": 4000,
     "max_duration": 4000
@@ -71,7 +74,8 @@
     "message": "The world shifts blue, and reality accelerates around you.",
     "valid_targets": [ "self" ],
     "effect": "spawn_item",
-    "effect_str": "artifact_time_slow_aura",
+    "effect_str": "artifact_slow_aura",
+    "shape": "blast",
     "base_casting_time": 100,
     "min_duration": 900,
     "max_duration": 900
@@ -84,6 +88,7 @@
     "message": "Stale golden light floods the world, and reality stands still.",
     "valid_targets": [ "self" ],
     "effect": "mod_moves",
+    "shape": "blast",
     "min_damage": 500,
     "max_damage": 500,
     "base_casting_time": 100
@@ -95,8 +100,10 @@
     "description": "Grants you the Darkness effect",
     "message": "Persistent shadows invade your field of view.",
     "valid_targets": [ "self" ],
-    "effect": "target_attack",
+    "flags": [ "NO_PROJECTILE" ],
+    "effect": "attack",
     "effect_str": "darkness",
+    "shape": "blast",
     "min_duration": 2400,
     "max_duration": 2400
   },
@@ -109,7 +116,8 @@
     "min_damage": 0,
     "max_damage": 10,
     "valid_targets": [ "self" ],
-    "flags": [ "RANDOM_DAMAGE" ],
-    "effect": "target_attack"
+    "flags": [ "RANDOM_DAMAGE", "NO_PROJECTILE" ],
+    "shape": "blast",
+    "effect": "attack"
   }
 ]