Skip to content

Commit

Permalink
initial push
Browse files Browse the repository at this point in the history
mlangsdorf suggestion on saving ally_rule

remove redunancy

comma

mlangsdorf suggested scope fix

rules.

This makes it work, but text is backwards

fixes so lines up with text in dialogue
CHANGES THE DEFAULT FOLLOW DISTANCE TO 2

Rock as a spare part

Switch build configurations away from trusty

For clang-4 we use the Trusty source on Xenial.

For clang-5 that trick doesn't work, so we retain the Trusty host.

Fix coverage CXXFLAGS code

This was setting CXXFLAGS and LDFLAGS, when it should have been
appending to them.  Without this, Travis builds will fail because they
can't disable warnings on old compilers.

Improve .travis.yml comments

Try trimming down build somewhat

Add clang-7, clang-8 Travis builds

Disable clang-6 and -7 builds on PRs

Don't install unnecessary 32-bit libraries

These two Travis builds were installing 32-bit libraries, for which
there should be no need.

add fire barrels

Update data/json/recipes/recipe_others.json

update per review

Co-Authored-By: Alexey Mostovoy <[email protected]>

Update data/json/recipes/recipe_others.json

update per review

Co-Authored-By: Alexey Mostovoy <[email protected]>

Update furniture.json

update per review

Update furniture.json

Add description to furniture.json

Update data/json/furniture.json

Co-Authored-By: matskuman5 <[email protected]>

Update data/json/items/tool/deployable.json

Co-Authored-By: matskuman5 <[email protected]>

Update data/json/furniture.json

Co-Authored-By: matskuman5 <[email protected]>

Update data/json/items/tool/deployable.json

Co-Authored-By: matskuman5 <[email protected]>

avatar::memorial

moved memorial out of player into the new avatar class

added NPC text

Fix missing declarations (CleverRaven#30739)

* Fix missing declarations
Mark functions with no prior declarations as static, and remove the
unused ones.
* Move debug_is_safe_string definition
Put it inside !WIN32 since it's only used there.

fixed typo in NR-031 description

typo!

acorn_roasted: remove duplicate entry for itype acorn_roasted

There are two acorn_roasted entries in this file. The one removed is
defined prior to the itype it copies from (acorns). The remaining entry
is immediately following the definition of acorns, and can be loaded
without being deferred.

Change to variable name and logic requested by mlangsdorf

Avoid undefined shift

Avoid uninitialized value in jmapgen_int

NOLINT undefined shifts in legacy hash code

Enable clang-analyzer-core.UndefinedBinaryOperatorResult

Have fixed all warnings for this check.

Remove legacy hash code

This was only present in the tests, contained undefined behaviour, and
was obsolete.

Add a --user-dir option to the tests

This gives control over where the tests write files, which allows
parallel test runs to be performed without stepping on each other's
toes.

Use separate user_dir for modded tests

Now the tests can run in parallel, have one of them write to a different
location to avoid failures due to filesystem race conditions.

Changed weight and volume values to be more realistic.

Fixed silly JSON error.

Linted JSON.

Added empty newline at the end of the file to satisfy the JSON linting gods.

Move hydroponics mod folders out of a subfolder

Replaced battery spawn with full pocket batteries

Moved Brawling martial art autolearn code to json

Logic that determines if a martial arts style is learned each turn is controlled by json instead of hardcoded.

Astyle typo fixes

Update MARTIALART_JSON.md

Saving some future person a bunch of time

Add clean water to makeshift steam engine recipe

Allows the player to use clean water to make makeshift steam engines.

Fix copy-from for overmap specials

Restore minimap enemy blink/fade functionality (CleverRaven#30745)

* start conditional panel update infrastructure

* Revert "Remove unnecessary `draw_panels()` calls"

This reverts commit 2db3b84.

* Revert "Only draw panels on first entry into game::get_player_input()"

This reverts commit d629d93.

* commit include file change

* preserve panel spacing (so minimap draws in right location)

* comments are fun.

* adjust draw_panels invocations to force redraw when appropriate

* cleanup of things that shouldn't have been reverted

Fixes cell phone and talking doll weirdness (CleverRaven#30742)

* Added charged phone group.

* Removed initial_charges from cell phone

* Began the work

Added a proper item template to everyone who needs a charged cell phone starting out. This is gonna suck...

* First pass on professions.json

* Fixed professions.json

* Fixed the mods too!

* Removed initial_charges from creepy_doll and talking_doll

* Update data/json/professions.json

Co-Authored-By: ZhilkinSerg <[email protected]>

* Update data/json/professions.json

Co-Authored-By: ZhilkinSerg <[email protected]>

* Modified home_mechanic to have a charged phone

They didn't really need it, but I did it for consistency.

Game report: add precise version and name for systems. (CleverRaven#30729)

* Add precise versions for Windows systems.

* Add Android system version retrieval.

* Simplify formatting for Windows version.

* Add Linux system version.

* make operating_system_version() return '<unknown>' if the version can't be determined.

- Invert condition on Linux version function;

* Simplify Android version retrieval.

* Extract shell execution function.

- will be reused by Linux, Mac and BSD.

* Add MacOS system version.

* Sort methods alphabetically.

* Add BSD version retrieval.

* Fix structure init. Fix error in macos function.

* Fix typo in output...

Robot salvage system (CleverRaven#30456)

* nervous sytem modules
* motor system
* structural system
* tank tread
* ai core
* more AI cores
* Uncraft Robots
* gun fix
* uncraft nursebot
* uncraft turret
* inactive turrets recipe
* manhack recipe
* uncraft hazmatbot
* Add schematics for bots
* schematics item group
* item_groups fro schematics
* recipe for every bot
* uncraft modules
* add self_monitoring_module to nurse and cleaner bots
* Damage overflow from a robot is transfered to its corpse
* sane crafting time
* flavor on robot death
* can't repair broken robot items
* electronics is used skill, mechanics is required

mall miscellanious files

pallet, overmap_terrain, item_groups, multitile_city_buildings entries

2nd story, roof enhancements

Adds 2nd story and more work on the roof

move item_group

per feedback

Add AT4 (CleverRaven#30734)

* Added AT4 to guns_launcher_rocket itemgroup
* Add AT4

disp_name and skin_name

stomach and guts

Fix some typos in uninstall bionic (CleverRaven#30763)

* fix uninstall typos
  • Loading branch information
Mooses2k committed May 23, 2019
1 parent 6f672ef commit f6a9d9b
Show file tree
Hide file tree
Showing 186 changed files with 8,116 additions and 2,733 deletions.
2 changes: 1 addition & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Checks: 'clang-diagnostic-*,-clang-analyzer-security.FloatLoopCounter,-clang-analyzer-core.UndefinedBinaryOperatorResult'
Checks: 'clang-diagnostic-*,-clang-analyzer-security.FloatLoopCounter'
WarningsAsErrors: '*'
HeaderFilterRegex: '.*'
FormatStyle: none
Expand Down
44 changes: 31 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ branches:
- master
- development

# To see what toolchains are available, consult the following:
# https://github.com/travis-ci/apt-source-safelist/blob/master/ubuntu.json
# https://launchpad.net/%7Eubuntu-toolchain-r/+archive/ubuntu/test/+index

jobs:
include:
# Initial test stage, if this fails everything else is cancelled.
Expand Down Expand Up @@ -65,12 +69,11 @@ jobs:

# CMake Clang 6.0 Tiles with CMAKE
- env: CLANG=clang++-6.0 TILES=1 SOUND=1 CXXFLAGS=-Wno-error=unused-command-line-argument CMAKE=1 RELEASE=1
dist: trusty
compiler: clang
addons: &clang60
apt:
packages: ["clang-6.0", "g++-multilib", "libc6-dbg", "libc6-dbg:i386", "g++-6", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
sources: [*apt_sources, llvm-toolchain-trusty-6.0]
packages: ["clang-6.0", "g++-multilib", "libc6-dbg", "g++-6", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
sources: [*apt_sources, llvm-toolchain-xenial-6.0]

# macOS Tiles
- env: CLANG=clang++ NATIVE=osx OSX_MIN=10.13 TILES=1 SOUND=1
Expand All @@ -82,15 +85,15 @@ jobs:
# (analysis only; no build or tests)
- env: CLANG=clang++-8 TILES=1 SOUND=1 CXXFLAGS=-Wno-unused-command-line-argument CMAKE=1 CATA_CLANG_TIDY=clang-tidy-8
compiler: clang
addons: &clang80
addons: &clang8
apt:
packages: ["clang-8", "clang-tidy-8", "libc6-dbg", "libc6-dbg:i386", "g++-6", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
packages: ["clang-8", "clang-tidy-8", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
sources: [*apt_sources, llvm-toolchain-xenial-8]


# Finally check the compiler variants
- stage: compilers
env: COMPILER=g++ 5.3
# GCC 5.3
env: COMPILER=g++
if: type != pull_request
compiler: gcc
addons: &gcc53
Expand All @@ -111,7 +114,6 @@ jobs:
- env: COMPILER=g++-7 CXXFLAGS='-Wno-implicit-fallthrough' CODE_COVERAGE=true
if: type != pull_request
compiler: gcc
dist: trusty
addons: &gcc7
apt:
packages: ["g++-7", "g++-7-multilib", "libc6-dbg", "libc6-dbg:i386", "lcov"]
Expand All @@ -124,7 +126,7 @@ jobs:
if: type != pull_request
addons: &gcc8
apt:
packages: ["g++-8", "g++-8-multilib", "libc6-dbg", "libc6-dbg:i386"]
packages: ["g++-8", "g++-8-multilib", "libc6-dbg"]
sources: *apt_sources

# Clang 3.8
Expand Down Expand Up @@ -152,9 +154,11 @@ jobs:
addons: &clang40
apt:
packages: ["clang-4.0", "g++-multilib", "libc6-dbg", "libc6-dbg:i386", "g++-6"]
# Luckily the Trusty install Just Works on Xenial
sources: [*apt_sources, llvm-toolchain-trusty-4.0]

# Clang 5.0
# Clang 5.0 (still on Trusty, because I could find no readily available
# source on Xenial at time of writing)
- env: CLANG=clang++-5.0 CXXFLAGS=-Wno-error=unused-command-line-argument
if: type != pull_request
dist: trusty
Expand All @@ -165,13 +169,27 @@ jobs:
sources: [*apt_sources, llvm-toolchain-trusty-5.0]

# Clang 6.0
- env: CLANG=clang++-6.0 CXXFLAGS=-Wno-error=unused-command-line-argument SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items"
dist: trusty
- env: CLANG=clang++-6.0
if: type != pull_request
compiler: clang
addons: &clang60
apt:
packages: ["clang-6.0", "g++-multilib", "libc6-dbg", "libc6-dbg:i386", "g++-6"]
sources: [*apt_sources, llvm-toolchain-trusty-6.0]
sources: [*apt_sources, llvm-toolchain-xenial-6.0]

# Clang 7
- env: CLANG=clang++-7
if: type != pull_request
compiler: clang
addons: &clang7
apt:
packages: ["clang-7", "libc6-dbg", "libc6-dbg:i386"]
sources: [*apt_sources, llvm-toolchain-xenial-7]

# Clang 8
- env: CLANG=clang++-8 SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items"
compiler: clang
addons: *clang8

before_script:
- if [ -n "${CLANG}" ]; then COMPILER="$CLANG"; fi
Expand Down
7 changes: 6 additions & 1 deletion COMPILING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
* [Cross-compile to Windows from Linux](#cross-compile-to-windows-from-linux)
* [Cross-compile to Mac OS X from Linux](#cross-compile-to-mac-os-x-from-linux)
* [Cross-compile to Android from Linux](#cross-compile-to-android-from-linux)
* [Troubleshooting](#debian-troubleshooting)
* [Mac OS X](#mac-os-x)
* [Simple build using Homebrew](#simple-build-using-homebrew)
* [Advanced info for Developers](#advanced-info-for-developers)
* [Troubleshooting](#troubleshooting)
* [Troubleshooting](#mac-troubleshooting)
* [Windows](#windows)
* [Visual Studio Guide](#visual-studio-guide)
* [MinGW Guide](#mingw-guide)
Expand Down Expand Up @@ -353,6 +354,10 @@ To build a signed release APK (ie. one that can be installed on a device), [buil

The app stores data files on the device in `/sdcard/Android/data/com.cleverraven/cataclysmdda/files`. The data is backwards compatible with the desktop version.

## Linux Troubleshooting

If you get an error stating `make: build-scripts/validate_pr_in_jenkins: Command not found` clone a separate copy of the upstream source to a new git repository as your git setup has become corrupted by the Blob.

# Mac OS X

To build Cataclysm on Mac you'll need [Command Line Tools for Xcode](https://developer.apple.com/downloads/) and the [Homebrew](http://brew.sh) package manager. With Homebrew, you can easily install or build Cataclysm using the [Cataclysm](https://formulae.brew.sh/formula/cataclysm) forumla.
Expand Down
2 changes: 1 addition & 1 deletion build-scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ else
run_tests ./tests/cata_test &
if [ -n "$MODS" ]
then
run_tests ./tests/cata_test $MODS &
run_tests ./tests/cata_test --user-dir=modded $MODS &
wait -n
fi
wait -n
Expand Down
6 changes: 3 additions & 3 deletions build-scripts/requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ if just_json; then
fi

if [ -n "${CODE_COVERAGE}" ]; then
travis_retry pip install --user pyyaml cpp-coveralls;
export CXXFLAGS=--coverage;
export LDFLAGS=--coverage;
travis_retry pip install --user pyyaml cpp-coveralls
export CXXFLAGS="$CXXFLAGS --coverage"
export LDFLAGS="$LDFLAGS --coverage"
fi

if [ -n "$CATA_CLANG_TIDY" ]; then
Expand Down
50 changes: 50 additions & 0 deletions data/json/furniture.json
Original file line number Diff line number Diff line change
Expand Up @@ -3779,6 +3779,56 @@
]
}
},
{
"type": "furniture",
"id": "f_55gal_firebarrel",
"name": "fire barrel (200L)",
"description": "A large metal barrel used to contain a fire. It has multiple holes punched in its walls for air supply. Fires set in a fire barrel will not spread to surrounding flammable objects.",
"symbol": "#",
"color": "red",
"looks_like": "55gal_drum",
"move_cost_mod": 2,
"coverage": 35,
"required_str": 8,
"flags": [ "PLACE_ITEM", "TRANSPARENT", "FIRE_CONTAINER", "EASY_DECONSTRUCT" ],
"deployed_item": "55gal_firebarrel",
"examine_action": "fireplace",
"max_volume": 4000,
"bash": {
"str_min": 8,
"str_max": 30,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [
{ "item": "scrap", "count": [ 8, 20 ] },
{ "item": "sheet_metal_small", "count": [ 3, 10 ] },
{ "item": "sheet_metal", "count": [ 0, 1 ] }
]
}
},
{
"type": "furniture",
"id": "f_30gal_firebarrel",
"name": "fire barrel (100L)",
"description": "A large metal barrel used to contain a fire. It has multiple holes punched in its walls for air supply. Fires set in a fire barrel will not spread to surrounding flammable objects.",
"symbol": "#",
"color": "red",
"looks_like": "30gal_drum",
"move_cost_mod": 2,
"coverage": 35,
"required_str": 8,
"flags": [ "PLACE_ITEM", "TRANSPARENT", "FIRE_CONTAINER", "EASY_DECONSTRUCT" ],
"deployed_item": "30gal_firebarrel",
"examine_action": "fireplace",
"max_volume": 4000,
"bash": {
"str_min": 8,
"str_max": 30,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [ { "item": "scrap", "count": [ 5, 15 ] }, { "item": "sheet_metal_small", "count": [ 1, 9 ] } ]
}
},
{
"id": "f_firering",
"type": "furniture",
Expand Down
24 changes: 24 additions & 0 deletions data/json/item_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -3901,6 +3901,7 @@
"type": "item_group",
"id": "vault",
"items": [
{ "group": "schematics", "prob": 5 },
[ "purifier", 12 ],
[ "plut_cell", 10 ],
[ "standard_template_construct", 5 ],
Expand Down Expand Up @@ -8913,6 +8914,7 @@
"id": "recycle_paper",
"type": "item_group",
"items": [
{ "group": "schematics", "prob": 2 },
[ "mag_dude", 25 ],
[ "mag_beauty", 25 ],
[ "mag_glam", 25 ],
Expand Down Expand Up @@ -9714,5 +9716,27 @@
"type": "item_group",
"id": "meth_ingredients",
"items": [ [ "dayquil", 2 ], [ "aspirin", 40 ], [ "adderall", 5 ], [ "energy_drink", 2 ], [ "caffeine", 20 ] ]
},
{
"id": "schematics",
"type": "item_group",
"items": [
[ "schematics_nursebot", 10 ],
[ "schematics_copbot", 50 ],
[ "schematics_eyebot", 50 ],
[ "schematics_secubot", 50 ],
[ "schematics_skitterbot", 50 ],
[ "schematics_chickenbot", 5 ],
[ "schematics_hazmatbot", 50 ],
[ "schematics_riotbot", 50 ],
[ "schematics_sciencebot", 10 ],
[ "schematics_tankbot", 5 ],
[ "schematics_tripod", 5 ],
[ "schematics_molebot", 20 ],
[ "schematics_dispatch", 25 ],
[ "schematics_dispatch_military", 20 ],
[ "schematics_antimateriel", 20 ],
[ "schematics_searchlight", 50 ]
]
}
]
22 changes: 22 additions & 0 deletions data/json/itemgroups/clothing.json
Original file line number Diff line number Diff line change
Expand Up @@ -397,5 +397,27 @@
{ "item": "socks" },
{ "item": "boots" }
]
},
{
"id": "underwear",
"type": "item_group",
"items": [
[ "bra", 70 ],
[ "sports_bra", 50 ],
[ "bikini_top", 10 ],
[ "panties", 70 ],
[ "bikini_bottom", 10 ],
[ "panties", 70 ],
[ "boy_shorts", 50 ],
[ "boxer_shorts", 70 ],
[ "briefs", 50 ],
[ "undershirt", 50 ],
[ "long_undertop", 20 ],
[ "under_armor", 20 ],
[ "tank_top", 50 ],
[ "boxer_shorts", 70 ],
[ "long_underpants", 20 ],
[ "under_armor_shorts", 20 ]
]
}
]
1 change: 1 addition & 0 deletions data/json/itemgroups/guns.json
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@
[ "m202_flash", 100 ],
[ "m235tpa", 150 ],
[ "m3_carlgustav", 50 ],
[ "AT4", 50 ],
[ "84x246mm_he", 100 ],
[ "84x246mm_hedp", 80 ],
[ "84x246mm_smoke", 100 ]
Expand Down
Loading

0 comments on commit f6a9d9b

Please sign in to comment.