Merge pull request #3 from CleverRaven/master

Bring up to date
ralreegorganon · Sep 19, 2018 · 0f7aae7 · 0f7aae7
2 parents cbcdb3f + c7486da
commit 0f7aae7
Show file tree

Hide file tree

Showing 287 changed files with 21,707 additions and 6,580 deletions.
diff --git a/Makefile b/Makefile
@@ -852,6 +852,7 @@ endif
 ifdef LUA
 	mkdir -p $(DATA_PREFIX)/lua
 	install --mode=644 lua/autoexec.lua $(DATA_PREFIX)/lua
+	install --mode=644 lua/log.lua $(DATA_PREFIX)/lua
 	install --mode=644 lua/class_definitions.lua $(DATA_PREFIX)/lua
 endif
 	install --mode=644 data/changelog.txt data/cataicon.ico data/fontdata.json \
@@ -888,6 +889,7 @@ endif
 ifdef LUA
 	mkdir -p $(DATA_PREFIX)/lua
 	install --mode=644 lua/autoexec.lua $(DATA_PREFIX)/lua
+	install --mode=644 lua/log.lua $(DATA_PREFIX)/lua
 	install --mode=644 lua/class_definitions.lua $(DATA_PREFIX)/lua
 endif
 	install --mode=644 data/changelog.txt data/cataicon.ico data/fontdata.json \

diff --git a/build-scripts/validate_pr_in_jenkins b/build-scripts/validate_pr_in_jenkins
@@ -5,7 +5,7 @@ if [ -z "$ghprbPullId" ]; then exit 0; fi
 allowed_section_titles='Features|Content|Interface|Mods|Balance|Bugfixes|Performance|Infrastructure|Build|I18N'
 
 echo 'Validating Summary line from pull request.'
-echo "$ghprbPullLongDescription" | grep -P '(^|\\r\\n)\s*(```)?SUMMARY: ((None)|(('"${allowed_section_titles}"') \\?"(.*?)\\?"))(```)?\s*(\\r\\n|$)'
+echo "$ghprbPullLongDescription" | grep -P '(^|\\r\\n)\s*(`){0,3}SUMMARY: ((None)|(('"${allowed_section_titles}"') \\?"(.*?)\\?"))(`){0,3}\s*(\\r\\n|$)'
 if [ $? -eq 0 ]; then
     echo 'Summary looks good.'
     exit 0

diff --git a/data/core/tips.json b/data/core/tips.json
@@ -0,0 +1,177 @@
+[
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Fires can spread easily, especially with abundance of fuel." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Even without electricity ovens can be useful fire containers." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Light itself doesn't draw zombies, it's sight, noise or smell." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Moose may not be your friend." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Turnout gear protects from fire but not from overheating." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Peek around corners.  You may see your enemy before it sees you." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Cold food lasts longer.  Find a cool basement or make a root cellar." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "You died?  That's a part of the experience.  Try again with what you've learned." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Freezing food?  Put it by a fire or heat it up in a pan." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Underground cave or a basement is always cool, but never freezes." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Afraid of wild life?  Yell untill it goes away.  But beware of what comes instead." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Animals and zombies are not friends.  You can take advantage of that." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Door is not the only way in.  Or out if that matters." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Don't fight against the odds.  There's no shame in running to survive." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "You don't have to sit next to fire to use it." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Many items have special actions.  Try to find out what they do." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Dangerous place is not always equal to good loot.  Use your head." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Getting in is not a problem.  Think of way out and don't get cornered." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "There is often more then one way to achieve something.  Think outside of the box." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Survival order: shelter, water, food, then everything else." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Balance armor versus encumbrance.  Even dropping a backpack can help in melee." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Scared of melee?  Throw some things at enemies and use reach weapons like spears." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Makeshift weapons can break easily, but they are weapons, and can be made again." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Not much survives a car at 120mph.  Can you?" ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "You don't want an overgrown cockroach in your rotten food.  Get rid of it." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Medicine can help you survive in a pinch but avoid overdose and addictions." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Use your map wisely.  Prioritize looting places that will get yout what you need." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Wounds heal over time.  Bandaging and disinfecting can speed up the process." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Don't get grabbed by zombies.  Their bites can be infectious." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Feeling odd after waking up?  Try eating healthier and your health may improve." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Eat well or your health might suffer.  Fast food is only good in a pinch." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Nature can provide.  You can live off the land if you learn how." ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Raw food and water from unsafe sources can't be healthy?  Right?" ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Why walk all day to nearest town when you can adapt a vehicle?" ]
+  },
+  {
+    "type": "snippet",
+    "category": "tip",
+    "text": [ "Food from before cataclysm won't last forever.  Keep that in mind." ]
+  }
+]
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -1723,7 +1723,7 @@
         "components" : [
             [ [ "2x4", 14 ] ],
             [ [ "nail", 12 ] ],
-            [ [ "scrap", 6 ], [ "sheet_metal", 2 ] ],
+            [ [ "sheet_metal_small", 12 ] ],
             [ [ "water_faucet", 1 ] ]
         ],
         "pre_special" : "check_empty",
@@ -1735,17 +1735,14 @@
         "required_skills" : [ [ "fabrication", 2 ], [ "cooking", 2 ] ],
         "time" : 120,
         "qualities": [
-            [
-            { "id": "HAMMER", "level": 2 }
-            ],
-            [
-            { "id": "SAW_W", "level": 1 }
-            ]
+            [ { "id": "HAMMER", "level": 2 } ],
+            [ { "id": "SAW_M", "level": 2 } ],
+            [ { "id": "SAW_W", "level": 1 } ]
             ],
         "components" : [
             [ [ "2x4", 18 ] ],
             [ [ "nail", 14 ] ],
-            [ [ "scrap", 8 ], [ "sheet_metal", 3 ] ],
+            [ [ "sheet_metal", 1 ] ],
             [ [ "water_faucet", 1 ] ]
         ],
         "pre_special" : "check_empty",