Merge pull request #4 from CleverRaven/master

BackToRootsJune13
I-am-Erk · Jun 13, 2019 · 5c7c8d9 · 5c7c8d9
2 parents 1b67813 + ad1332f
commit 5c7c8d9
Show file tree

Hide file tree

Showing 156 changed files with 9,129 additions and 2,967 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -213,7 +213,13 @@ IF(MSVC)
 	endif()
 ELSE()
 	SET(CATA_WARNINGS
-		"-Werror -Wall -Wextra -Woverloaded-virtual -Wpedantic -Wmissing-declarations")
+		"-Werror -Wall -Wextra \
+		-Wmissing-declarations \
+		-Wold-style-cast \
+		-Woverloaded-virtual \
+		-Wpedantic")
+	# Compact the whitespace in the warning string
+	string(REGEX REPLACE "[\t ]+" " " CATA_WARNINGS "${CATA_WARNINGS}")
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS} -std=c++14")
 	SET(CMAKE_CXX_FLAGS_DEBUG "-Og -g")
 ENDIF()

diff --git a/Makefile b/Makefile
@@ -83,7 +83,12 @@
 # PROFILE is for use with gprof or a similar program -- don't bother generally.
 # RELEASE_FLAGS is flags for release builds.
 RELEASE_FLAGS =
-WARNINGS = -Werror -Wall -Wextra -Woverloaded-virtual -Wpedantic -Wmissing-declarations
+WARNINGS = \
+  -Werror -Wall -Wextra \
+  -Wmissing-declarations \
+  -Wold-style-cast \
+  -Woverloaded-virtual \
+  -Wpedantic
 # Uncomment below to disable warnings
 #WARNINGS = -w
 DEBUGSYMS = -g

diff --git a/data/json/bionics.json b/data/json/bionics.json
@@ -37,7 +37,7 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ],
     "act_cost": 1,
     "react_cost": 1,
-    "time": 100
+    "time": 600
   },
   {
     "id": "bio_ankles",
@@ -216,7 +216,7 @@
     ],
     "act_cost": 1,
     "react_cost": 1,
-    "time": 4,
+    "time": 24,
     "flags": [ "BIONIC_TOGGLED" ]
   },
   {
@@ -418,7 +418,7 @@
     "occupied_bodyparts": [ [ "EYES", 1 ] ],
     "act_cost": 1,
     "react_cost": 1,
-    "time": 25,
+    "time": 150,
     "flags": [ "BIONIC_TOGGLED" ]
   },
   {
@@ -428,7 +428,7 @@
     "description": "A small LED display just beneath your dermal layer can be illuminated on command to show patterns of your choice at dim or bright luminosity.  It doesn't provide enough light to comfortably read or craft, but it can suffice if you have nothing else.",
     "act_cost": 1,
     "react_cost": 1,
-    "time": 50,
+    "time": 300,
     "flags": [ "BIONIC_TOGGLED" ]
   },
   {
@@ -462,7 +462,7 @@
     "occupied_bodyparts": [ [ "FOOT_L", 3 ], [ "FOOT_R", 3 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
     "act_cost": 5,
-    "react_cost": 5,
+    "react_cost": 1,
     "time": 1
   },
   {
@@ -525,7 +525,7 @@
     "occupied_bodyparts": [ [ "EYES", 1 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
     "act_cost": 5,
-    "react_cost": 5,
+    "react_cost": 1,
     "time": 1
   },
   {
@@ -571,7 +571,7 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY", "BIONIC_NPC_USABLE" ],
     "act_cost": 10,
     "react_cost": 1,
-    "time": 600
+    "time": 3600
   },
   {
     "id": "bio_lighter",
@@ -615,7 +615,7 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ],
     "act_cost": 10,
     "react_cost": 1,
-    "time": 100
+    "time": 600
   },
   {
     "id": "bio_metabolics",
@@ -661,7 +661,7 @@
     "flags": [ "BIONIC_TOGGLED" ],
     "act_cost": 1,
     "react_cost": 1,
-    "time": 10
+    "time": 60
   },
   {
     "id": "bio_noise",
@@ -707,7 +707,7 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
     "act_cost": 1,
     "react_cost": 1,
-    "time": 2
+    "time": 12
   },
   {
     "id": "bio_plutdump",
@@ -841,7 +841,7 @@
     "occupied_bodyparts": [ [ "HEAD", 2 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
     "react_cost": 1,
-    "time": 4
+    "time": 24
   },
   {
     "id": "bio_resonator",
@@ -860,7 +860,7 @@
     "flags": [ "BIONIC_TOGGLED" ],
     "act_cost": 1,
     "react_cost": 1,
-    "time": 10
+    "time": 60
   },
   {
     "id": "bio_scent_vision",
@@ -871,7 +871,7 @@
     "flags": [ "BIONIC_TOGGLED" ],
     "act_cost": 1,
     "react_cost": 1,
-    "time": 1
+    "time": 6
   },
   {
     "id": "bio_shakes",

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -1123,7 +1123,14 @@
       "per_mod": [ -1 ],
       "stamina_min": [ -2 ]
     },
-    "scaling_mods": { "speed_mod": [ 30 ], "str_mod": [ 5 ], "dex_mod": [ 4 ], "int_mod": [ -7 ], "per_mod": [ 2 ], "stamina_min": [ 4 ] }
+    "scaling_mods": {
+      "speed_mod": [ 20 ],
+      "str_mod": [ 1.5 ],
+      "dex_mod": [ 1.5 ],
+      "int_mod": [ -2 ],
+      "per_mod": [ 0.5 ],
+      "stamina_min": [ 4 ]
+    }
   },
   {
     "type": "effect_type",
@@ -1164,11 +1171,11 @@
       "stamina_min": [ -4 ]
     },
     "scaling_mods": {
-      "speed_mod": [ 30 ],
-      "str_mod": [ 4 ],
-      "dex_mod": [ 4 ],
-      "int_mod": [ 3 ],
-      "per_mod": [ 5 ],
+      "speed_mod": [ 15 ],
+      "str_mod": [ 1.5 ],
+      "dex_mod": [ 1 ],
+      "int_mod": [ 0.5 ],
+      "per_mod": [ 1 ],
       "fatigue_min": [ 1 ],
       "stamina_min": [ 8 ]
     }
@@ -1180,8 +1187,7 @@
     "desc": [ "You had a puff or two.", "You smoked too much." ],
     "max_intensity": 2,
     "int_dur_factor": 600,
-    "base_mods": { "int_mod": [ 1 ], "per_mod": [ 1 ] },
-    "scaling_mods": { "str_mod": [ -1 ], "dex_mod": [ -1 ], "int_mod": [ -1 ], "per_mod": [ -1 ], "vomit_chance": [ 500 ] }
+    "scaling_mods": { "vomit_chance": [ 500 ] }
   },
   {
     "type": "effect_type",
@@ -1200,7 +1206,7 @@
     "id": "weed_high",
     "apply_message": "You feel lightheaded.",
     "miss_messages": [ [ "That critter's jumping around like a jitterbug!  It needs to mellow out.", 1 ] ],
-    "base_mods": { "str_mod": [ -1 ], "dex_mod": [ -1 ], "per_mod": [ -1 ] }
+    "base_mods": { "per_mod": [ -1 ] }
   },
   {
     "type": "effect_type",
@@ -1225,15 +1231,8 @@
     "apply_message": "You feel lightheaded.",
     "int_dur_factor": 1000,
     "miss_messages": [ [ "You feel woozy.", 1 ] ],
-    "base_mods": { "str_mod": [ 1 ], "vomit_chance": [ -43 ], "sleep_chance": [ -1003 ], "sleep_min": [ 2500 ], "sleep_max": [ 3500 ] },
-    "scaling_mods": {
-      "str_mod": [ -0.67 ],
-      "per_mod": [ -1 ],
-      "dex_mod": [ -1 ],
-      "int_mod": [ -1.42 ],
-      "vomit_chance": [ 21 ],
-      "sleep_chance": [ 501 ]
-    }
+    "base_mods": { "vomit_chance": [ -43 ], "sleep_chance": [ -1003 ], "sleep_min": [ 2500 ], "sleep_max": [ 3500 ] },
+    "scaling_mods": { "per_mod": [ -0.5 ], "dex_mod": [ -0.5 ], "int_mod": [ -0.75 ], "vomit_chance": [ 21 ], "sleep_chance": [ 501 ] }
   },
   {
     "type": "effect_type",
@@ -1623,7 +1622,7 @@
     "desc": [ "You're very jittery and pumped up, probably from some stimulants." ],
     "max_intensity": 1000,
     "int_dur_factor": 1,
-    "scaling_mods": { "speed_mod": [ 0.33 ], "dex_mod": [ 0.1 ], "int_mod": [ 0.16 ], "per_mod": [ 0.14 ] }
+    "scaling_mods": { "speed_mod": [ 0.08 ], "per_mod": [ 0.04 ] }
   },
   {
     "type": "effect_type",
@@ -1632,20 +1631,9 @@
     "desc": [ "You are under the influence of depressants, and in a bit of a daze." ],
     "max_intensity": 1000,
     "int_dur_factor": 1,
-    "scaling_mods": { "speed_mod": [ -0.25 ], "dex_mod": [ -0.1 ], "int_mod": [ -0.16 ], "per_mod": [ -0.14 ] },
+    "scaling_mods": { "speed_mod": [ -0.1 ], "dex_mod": [ -0.05 ] },
     "miss_messages": [ [ "You feel woozy.", 1 ] ]
   },
-  {
-    "type": "effect_type",
-    "id": "stim_overdose",
-    "name": [ "Stimulant Overdose" ],
-    "desc": [ "You can't sit still as you feel your heart pounding out of your chest.  You probably overdosed on those stims." ],
-    "max_intensity": 1000,
-    "int_dur_factor": 1,
-    "base_mods": { "dex_mod": [ -1.88 ], "int_mod": [ -1.1 ], "per_mod": [ -1.25 ] },
-    "scaling_mods": { "speed_mod": [ -0.25 ], "dex_mod": [ -0.125 ], "int_mod": [ -0.0833 ], "per_mod": [ -0.071 ] },
-    "miss_messages": [ [ "You shake with the excess stimulation.", 1 ] ]
-  },
   {
     "type": "effect_type",
     "id": "weak_antibiotic_visible",