diff --git a/.editorconfig b/.editorconfig
index 9d331827aa9bd..c8a3fc304415f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,6 +7,11 @@ root = true
[*]
end_of_line = lf
insert_final_newline = true
-# 4 space indentation
indent_style = space
indent_size = 4
+
+[*.json]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
diff --git a/.github/stale.yml b/.github/stale.yml
index 7bd86c3c7734d..54e28623fa365 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -54,7 +54,7 @@ closeComment: >
re-opened if you are going to actively work on it
# Limit the number of actions per hour, from 1-30. Default is 30
-limitPerRun: 1
+limitPerRun: 2
# Limit to only `issues` or `pulls`
# only: issues
diff --git a/.github/workflows/json.yml b/.github/workflows/json.yml
index 60354a2cf643b..2c5a02aebd7c0 100644
--- a/.github/workflows/json.yml
+++ b/.github/workflows/json.yml
@@ -1,16 +1,7 @@
name: JSON Validation
on:
- push:
- branches:
- - master
- paths:
- - "*.json"
- pull_request:
- branches:
- - master
- paths:
- - "*.json"
+ pull_request
jobs:
style-json:
@@ -24,3 +15,6 @@ jobs:
fetch-depth: 10
- name: JSON style check
run: make style-json
+ - name: Display Corrections
+ if: failure()
+ run: git diff
diff --git a/.github/workflows/pr-validator.yml b/.github/workflows/pr-validator.yml
index 1ab7313e5dc60..d1a0faa1f654a 100644
--- a/.github/workflows/pr-validator.yml
+++ b/.github/workflows/pr-validator.yml
@@ -11,4 +11,4 @@ jobs:
- name: "Validate SUMMARY"
uses: CleverRaven/pr-validator@master
with:
- description-regex: '\n\s*`{0,3}SUMMARY: +(None|((Features|Content|Interface|Mods|Balance|Bugfixes|Performance|Infrastructure|Build|I18N) +".*"))`{0,3}\s*\n'
+ description-regex: '(\n|^)\s*`{0,3}SUMMARY: +(None|((Features|Content|Interface|Mods|Balance|Bugfixes|Performance|Infrastructure|Build|I18N) +".*"))`{0,3}\s*(\n|$)'
diff --git a/COMPILING-FLATPAK.md b/COMPILING-FLATPAK.md
deleted file mode 100644
index 915fc61604183..0000000000000
--- a/COMPILING-FLATPAK.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Compiling Guide for Linux (Flatpak)
-
-## Prerequisites
-
-- Install `flatpak` and `flatpak-builder` from your distribution's package manager.
-- Install `freedesktop-platform` & `freedesktop-sdk` using `flatpak install flathub org.freedesktop.Platform//18.08 org.freedesktop.Sdk//18.08`
-
-## Build
-
-Clone the source code and run `flatpak-builder --repo=repo --ccache --force-clean build-dir org.Cataclysm.DDA.json` or `flatpak-builder --repo=repo --ccache --force-clean build-dir org.Cataclysm.DDA.Tiles.json` to build the ncurses or tiles version of the application.
-
-## Installation
-
-Run `flatpak --user install test-repo org.Cataclysm.DDA` (or) `flatpak --user install test-repo org.Cataclysm.DDA.Tiles` to install the game.
-Note: If you are installing the game for first time you will have to set up local repo. Run this `flatpak --user remote-add --no-gpg-verify test-repo repo`
-
-## Starting the game
-
-`flatpak run org.Cataclysm.DDA` (or) `flatpak run org.Cataclysm.DDA.Tiles`
-**or**
-Launch the Game from Applications -> Games -> Cataclysm: Dark Days Ahead (or) Cataclysm: Dark Days Ahead - Tiles.
-**Note**: For the ncurses version, terminal will just show a blank screen on launch. Just press any button to start the game.
-
-## Permissions
-
-- **Ncurses version**
- - Home Directory
-- **Tiles Version**
- - Home Directory
- - Wayland
- - Fallback-X11 - (incase Wayland doesn't work)
- - IPC - (Required for X11)
- - PulseAudio
- - DRI
diff --git a/ISSUES.md b/ISSUES.md
index 5f31413c7c1a9..ffea825f4a126 100644
--- a/ISSUES.md
+++ b/ISSUES.md
@@ -44,11 +44,11 @@ Remember to take part in the discussion of your suggestions.
### Questions
-You should direct your questions to the forum or ask on IRC. You should also read the included documentation and additional text files, e.g. `COMPILING.md` if you have problems building.
+You should direct your questions to the forum or ask on IRC. You should also read the included documentation and additional text files, e.g. [COMPILING.md](doc/COMPILING/COMPILING.md) if you have problems building.
## Bounties
-We keep the development and direction of the game community-driven so placing a bounty *does not* necessarily mean that change will be incorporated into the main game. But it may be incorporated as a mod (or not). As such feel free to post bounties on what you like, but remember we don't do "bounty-driven" development. Good way of thinking about bounties is as encouragement for contributors to work on a particular issue, and certainly not as "paying for features".
+Placing a bounty *does not* necessarily mean that change will be incorporated into the main game. Please coordinate in the issue you intend to place a bounty on to determine if it is a change the project will accept, and keep in mind that placing a bounty will not confer special status on the issue. A good way of thinking about bounties is as encouragement for contributors to work on a particular issue, and certainly not as "paying for features".
## Issue resolution
diff --git a/Makefile b/Makefile
index 55607bf03a2ee..7c8756af1a3a1 100644
--- a/Makefile
+++ b/Makefile
@@ -993,7 +993,7 @@ ifdef LANGUAGES
endif
$(BINDIST_CMD)
-export ODIR _OBJS LDFLAGS CXX W32FLAGS DEFINES CXXFLAGS
+export ODIR _OBJS LDFLAGS CXX W32FLAGS DEFINES CXXFLAGS TARGETSYSTEM
ctags: $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR)
ctags $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR)
diff --git a/README.md b/README.md
index 3e8da4cd44443..d48725c96f87a 100644
--- a/README.md
+++ b/README.md
@@ -16,12 +16,12 @@ The source can either be downloaded as [an archive](https://github.com/CleverRav
## Compile
-Please read [COMPILING.md](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/COMPILING.md) - it covers general information and more specific recipes for Linux, OS X, Windows and BSD. See [doc/COMPILER_SUPPORT.md](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/COMPILER_SUPPORT.md) for details on which compilers we support. And you can always dig for more information in [doc/](https://github.com/CleverRaven/Cataclysm-DDA/tree/master/doc).
+Please read [COMPILING.md](doc/COMPILING/COMPILING.md) - it covers general information and more specific recipes for Linux, OS X, Windows and BSD. See [COMPILER_SUPPORT.md](doc/COMPILING/COMPILER_SUPPORT.md) for details on which compilers we support. And you can always dig for more information in [doc/](https://github.com/CleverRaven/Cataclysm-DDA/tree/master/doc).
We also have the following build guides:
-* Building on Windows with `MSYS2` at [COMPILING-MSYS.md](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/COMPILING-MSYS.md)
-* Building on Windows with `vcpkg` at [COMPILING-VS-VCPKG.md](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/COMPILING-VS-VCPKG.md)
-* Building with `cmake` at [COMPILING-CMAKE.md](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/COMPILING-CMAKE.md) (*unofficial guide*)
+* Building on Windows with `MSYS2` at [COMPILING-MSYS.md](doc/COMPILING/COMPILING-MSYS.md)
+* Building on Windows with `vcpkg` at [COMPILING-VS-VCPKG.md](doc/COMPILING/COMPILING-VS-VCPKG.md)
+* Building with `cmake` at [COMPILING-CMAKE.md](doc/COMPILING/COMPILING-CMAKE.md) (*unofficial guide*)
## Contribute
diff --git a/android/.gitignore b/android/.gitignore
index 98acc7eb58843..d7a510e5a97e4 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -1,16 +1,19 @@
+!config/
*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
+.cxx
.DS_Store
-/build
-/captures
.externalNativeBuild
-!config/
-/app/jni/libintl-lite
-/app/jni/mpg-123
+.gradle
+/.idea/libraries
+/.idea/workspace.xml
/app/jni/SDL2
/app/jni/SDL2_image
/app/jni/SDL2_mixer
/app/jni/SDL2_ttf
+/app/jni/libintl-lite
+/app/jni/lua
+/app/jni/mpg-123
+/app/build
+/build
+/captures
+/local.properties
diff --git a/android/app/build.gradle b/android/app/build.gradle
index ea4c4d0654e9d..7270274b3775b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,5 +1,10 @@
import org.gradle.internal.os.OperatingSystem;
+tasks.withType(JavaCompile) {
+ options.encoding = 'UTF-8'
+ //options.compilerArgs << "-Xlint:deprecation"
+}
+
def buildAsLibrary = project.hasProperty('BUILD_AS_LIBRARY');
def buildAsApplication = !buildAsLibrary
if (buildAsApplication) {
@@ -48,9 +53,7 @@ switch(OperatingSystem.current()) {
}
android {
- compileSdkVersion 26
- buildToolsVersion "28.0.1"
-
+ compileSdkVersion 28
if(OperatingSystem.current().isLinux()) {
exec {
@@ -66,21 +69,33 @@ android {
}
defaultConfig {
- minSdkVersion 14
- targetSdkVersion 26
+ minSdkVersion 21
+ targetSdkVersion 28
versionCode Integer.valueOf(System.env.UPSTREAM_BUILD_NUMBER ?: 1 )
versionName new File('app/jni/src/version.h').text.split("\"")[1]
if (buildAsApplication) {
applicationId "com.cleverraven.cataclysmdda"
setProperty("archivesBaseName", "cataclysmdda-" + versionName)
}
- ndk {
- abiFilters "armeabi-v7a"
- //abiFilters "x86" // use this for testing on emulators
- }
+
+ splits {
+ // Configures multiple APKs based on ABI.
+ abi {
+ // Enables building multiple APKs per ABI.
+ enable true
+ // Resets the list of ABIs that Gradle should create APKs for to none.
+ reset()
+ // Specifies a list of ABIs that Gradle should create APKs for.
+ include "armeabi-v7a"
+ include "arm64-v8a"
+ // Specifies that we do not want to also generate a universal APK that includes all ABIs.
+ universalApk false
+ }
+ }
+
externalNativeBuild {
ndkBuild {
- arguments "APP_PLATFORM=android-16", "-j$njobs"
+ arguments "APP_PLATFORM=android-21", "-j$njobs"
}
}
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -112,11 +127,11 @@ android {
}
}
}
-
+
debug {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-
+
externalNativeBuild {
ndkBuild {
@@ -133,12 +148,12 @@ android {
path 'jni/Android.mk'
}
}
-
+
}
lintOptions {
abortOnError false
}
-
+
if (buildAsLibrary) {
libraryVariants.all { variant ->
variant.outputs.each { output ->
diff --git a/android/app/deps.zip b/android/app/deps.zip
index 6e3788771a8d7..19145dcd3181b 100644
Binary files a/android/app/deps.zip and b/android/app/deps.zip differ
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 18a5bf9bd2594..897f45890d1f3 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -8,9 +8,6 @@
android:versionName="1.0"
android:installLocation="auto">
-
-
-
@@ -24,7 +21,7 @@
-
+
{
@Override
protected void onPreExecute() {
installationAlert = new AlertDialog.Builder(SplashScreen.this)
- .setTitle("Installation Failed")
- .setCancelable(false)
- .setPositiveButton("OK", new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- SplashScreen.this.finish();
- return;
- }
- }).create();
+ .setTitle("Installation Failed")
+ .setCancelable(false)
+ .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ SplashScreen.this.finish();
+ return;
+ }
+ }).create();
AssetManager assetManager = getAssets();
try {
totalFiles = countTotalAssets(assetManager, "data") +
@@ -162,22 +162,22 @@ protected Boolean doInBackground(Void... params) {
AssetManager assetManager = getAssets();
String externalFilesDir = getExternalFilesDir(null).getPath();
- try {
- // Clear out the old data if it exists (but preserve custom folders + files)
- deleteRecursive(assetManager, externalFilesDir, new File(externalFilesDir + "/data"));
- deleteRecursive(assetManager, externalFilesDir, new File(externalFilesDir + "/gfx"));
- deleteRecursive(assetManager, externalFilesDir, new File(externalFilesDir + "/lang"));
-
- // Install the new data over the top
- copyAssetFolder(assetManager, "data", externalFilesDir + "/data");
- copyAssetFolder(assetManager, "gfx", externalFilesDir + "/gfx");
- copyAssetFolder(assetManager, "lang", externalFilesDir + "/lang");
+ try {
+ // Clear out the old data if it exists (but preserve custom folders + files)
+ deleteRecursive(assetManager, externalFilesDir, new File(externalFilesDir + "/data"));
+ deleteRecursive(assetManager, externalFilesDir, new File(externalFilesDir + "/gfx"));
+ deleteRecursive(assetManager, externalFilesDir, new File(externalFilesDir + "/lang"));
+
+ // Install the new data over the top
+ copyAssetFolder(assetManager, "data", externalFilesDir + "/data");
+ copyAssetFolder(assetManager, "gfx", externalFilesDir + "/gfx");
+ copyAssetFolder(assetManager, "lang", externalFilesDir + "/lang");
} catch(Exception e) {
- installationAlert.setMessage(e.getMessage());
- return false;
+ installationAlert.setMessage(e.getMessage());
+ return false;
}
- // Remember which version the installed data is
+ // Remember which version the installed data is
PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).edit().putString("installed", getVersionName()).commit();
publishProgress(++installedFiles);
@@ -212,14 +212,14 @@ void deleteRecursive(AssetManager assetManager, String externalFilesDir, File fi
// Returns true if an asset exists in the APK (either a directory or a file)
// eg. assetExists("data/sound") or assetExists("data/font", "unifont.ttf") would both return true
private boolean assetExists(AssetManager assetManager, String assetPath) {
- return assetExists(assetManager, assetPath, "");
+ return assetExists(assetManager, assetPath, "");
}
private boolean assetExists(AssetManager assetManager, String assetPath, String assetName) {
try {
String[] files = assetManager.list(assetPath);
if (assetName.isEmpty())
- return files.length > 0; // folder exists
+ return files.length > 0; // folder exists
for (String file : files) {
if (file.equalsIgnoreCase(assetName))
return true; // file exists
@@ -312,11 +312,11 @@ protected void onProgressUpdate(Integer... values) {
@Override
protected void onPostExecute(Boolean result) {
removeDialog(INSTALL_DIALOG_ID);
- if(result) {
+ if(result) {
settingsAlert.show();
- } else {
- installationAlert.show();
- }
+ } else {
+ installationAlert.show();
+ }
}
}
}
diff --git a/android/app/src/main/java/org/libsdl/app/SDLActivity.java b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
index dffe78c088764..5f6b7d4ace401 100644
--- a/android/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -63,7 +63,6 @@ public enum NativeState {
protected static ViewGroup mLayout;
protected static SDLClipboardHandler mClipboardHandler;
-
// This is what SDL runs in. It invokes SDL_main(), eventually
protected static Thread mSDLThread;
@@ -273,7 +272,6 @@ protected void onResume() {
SDLActivity.handleNativeState();
}
-
@Override
public void onWindowFocusChanged(boolean hasFocus) {
super.onWindowFocusChanged(hasFocus);
@@ -411,7 +409,6 @@ public static void handleNativeExit() {
mSingleton.finish();
}
-
// Messages from the SDLMain thread
static final int COMMAND_CHANGE_TITLE = 1;
static final int COMMAND_CHANGE_WINDOW_STYLE = 2;
@@ -470,11 +467,11 @@ public void handleMessage(Message msg) {
View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
View.SYSTEM_UI_FLAG_FULLSCREEN |
View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
- window.getDecorView().setSystemUiVisibility(flags);
+ window.getDecorView().setSystemUiVisibility(flags);
window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
} else {
int flags = View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
- window.getDecorView().setSystemUiVisibility(flags);
+ window.getDecorView().setSystemUiVisibility(flags);
window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
}
}
@@ -492,7 +489,7 @@ public void handleMessage(Message msg) {
InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
-
+
mScreenKeyboardShown = false;
}
break;
@@ -572,7 +569,7 @@ public static void setWindowStyle(boolean fullscreen) {
/**
* This method is called by SDL using JNI.
* This is a static method for JNI convenience, it calls a non-static method
- * so that is can be overridden
+ * so that is can be overridden
*/
public static void setOrientation(int w, int h, boolean resizable, String hint)
{
@@ -580,11 +577,11 @@ public static void setOrientation(int w, int h, boolean resizable, String hint)
mSingleton.setOrientationBis(w, h, resizable, hint);
}
}
-
+
/**
* This can be overridden
*/
- public void setOrientationBis(int w, int h, boolean resizable, String hint)
+ public void setOrientationBis(int w, int h, boolean resizable, String hint)
{
int orientation = -1;
@@ -621,11 +618,10 @@ public void setOrientationBis(int w, int h, boolean resizable, String hint)
}
}
-
/**
* This method is called by SDL using JNI.
*/
- public static boolean isScreenKeyboardShown()
+ public static boolean isScreenKeyboardShown()
{
if (mTextEdit == null) {
return false;
@@ -692,7 +688,7 @@ public static boolean getManifestEnvironmentVariables() {
}
}
/* environment variables set! */
- return true;
+ return true;
} catch (Exception e) {
Log.v("SDL", "exception " + e.toString());
}
@@ -749,12 +745,12 @@ public static boolean showTextInput(int x, int y, int w, int h) {
}
public static boolean isTextInputEvent(KeyEvent event) {
-
+
// Key pressed with Ctrl should be sent as SDL_KEYDOWN/SDL_KEYUP and not SDL_TEXTINPUT
if (Build.VERSION.SDK_INT >= 11) {
if (event.isCtrlPressed()) {
return false;
- }
+ }
}
return event.isPrintingKey() || event.getKeyCode() == KeyEvent.KEYCODE_SPACE;
@@ -1070,7 +1066,7 @@ public boolean onKey(DialogInterface d, int keyCode, KeyEvent event) {
public static boolean clipboardHasText() {
return mClipboardHandler.clipboardHasText();
}
-
+
/**
* This method is called by SDL using JNI.
*/
@@ -1109,7 +1105,6 @@ public void run() {
}
}
-
/**
SDLSurface. This is what we draw on, so we need to know when it's created
in order to do anything useful.
@@ -1242,7 +1237,6 @@ public void surfaceChanged(SurfaceHolder holder,
SDLActivity.onNativeResize(width, height, sdlFormat, mDisplay.getRefreshRate());
Log.v("SDL", "Window size: " + width + "x" + height);
-
boolean skip = false;
int requestedOrientation = SDLActivity.mAllowSDLOrientationChanges ? SDLActivity.mSingleton.getRequestedOrientation() : ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
@@ -1497,7 +1491,7 @@ public boolean onCheckIsTextEditor() {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
- /*
+ /*
* This handles the hardware keyboard input
*/
if (event.getAction() == KeyEvent.ACTION_DOWN) {
@@ -1585,7 +1579,6 @@ public boolean sendKeyEvent(KeyEvent event) {
}
}
-
return super.sendKeyEvent(event);
}
@@ -1626,7 +1619,7 @@ public boolean deleteSurroundingText(int beforeLength, int afterLength) {
while (beforeLength-- > 0) {
boolean ret_key = sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
&& sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
- ret = ret && ret_key;
+ ret = ret && ret_key;
}
return ret;
}
@@ -1643,9 +1636,8 @@ interface SDLClipboardHandler {
}
-
class SDLClipboardHandler_API11 implements
- SDLClipboardHandler,
+ SDLClipboardHandler,
android.content.ClipboardManager.OnPrimaryClipChangedListener {
protected android.content.ClipboardManager mClipMgr;
@@ -1676,7 +1668,7 @@ public void clipboardSetText(String string) {
mClipMgr.setText(string);
mClipMgr.addPrimaryClipChangedListener(this);
}
-
+
@Override
public void onPrimaryClipChanged() {
SDLActivity.onNativeClipboardChanged();
@@ -1686,9 +1678,9 @@ public void onPrimaryClipChanged() {
class SDLClipboardHandler_Old implements
SDLClipboardHandler {
-
+
protected android.text.ClipboardManager mClipMgrOld;
-
+
SDLClipboardHandler_Old() {
mClipMgrOld = (android.text.ClipboardManager) SDL.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
}
diff --git a/android/app/src/main/java/org/libsdl/app/SDLAudioManager.java b/android/app/src/main/java/org/libsdl/app/SDLAudioManager.java
index 26baf8220a9bc..5ea14bd463a90 100644
--- a/android/app/src/main/java/org/libsdl/app/SDLAudioManager.java
+++ b/android/app/src/main/java/org/libsdl/app/SDLAudioManager.java
@@ -88,7 +88,7 @@ public static void audioWriteByteBuffer(byte[] buffer) {
Log.e(TAG, "Attempted to make audio call with uninitialized audio!");
return;
}
-
+
for (int i = 0; i < buffer.length; ) {
int result = mAudioTrack.write(buffer, i, buffer.length - i);
if (result > 0) {
@@ -155,7 +155,6 @@ public static int captureReadByteBuffer(byte[] buffer, boolean blocking) {
return mAudioRecord.read(buffer, 0, buffer.length);
}
-
/** This method is called by SDL using JNI. */
public static void audioClose() {
if (mAudioTrack != null) {
diff --git a/android/app/src/main/java/org/libsdl/app/SDLControllerManager.java b/android/app/src/main/java/org/libsdl/app/SDLControllerManager.java
index 7b82c0e207a72..39046cb52a1c1 100644
--- a/android/app/src/main/java/org/libsdl/app/SDLControllerManager.java
+++ b/android/app/src/main/java/org/libsdl/app/SDLControllerManager.java
@@ -10,8 +10,7 @@
import android.view.*;
import android.util.Log;
-
-public class SDLControllerManager
+public class SDLControllerManager
{
public static native int nativeSetupJNI();
@@ -261,7 +260,6 @@ public String getJoystickDescriptor(InputDevice joystickDevice) {
}
}
-
class SDLJoystickHandler_API16 extends SDLJoystickHandler_API12 {
@Override
@@ -285,7 +283,7 @@ class SDLHaptic {
}
private ArrayList mHaptics;
-
+
public SDLHapticHandler() {
mHaptics = new ArrayList();
}
@@ -298,7 +296,7 @@ public void run(int device_id, int length) {
}
public void pollHapticDevices() {
-
+
final int deviceId_VIBRATOR_SERVICE = 999999;
boolean hasVibratorService = false;
@@ -342,7 +340,7 @@ public void pollHapticDevices() {
haptic = new SDLHaptic();
haptic.device_id = deviceId_VIBRATOR_SERVICE;
haptic.name = "VIBRATOR_SERVICE";
- haptic.vib = vib;
+ haptic.vib = vib;
mHaptics.add(haptic);
SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name);
}
@@ -384,7 +382,7 @@ protected SDLHaptic getHaptic(int device_id) {
}
}
return null;
- }
+ }
}
class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
diff --git a/android/build.gradle b/android/build.gradle
index 804e9f4c4819f..5600a93384c3a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.1.0'
+ classpath 'com.android.tools.build:gradle:3.5.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 5fc9c4b523231..6fbc4049a3cf4 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 28 01:10:32 MDT 2018
+#Tue Aug 27 13:00:00 UTC 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
diff --git a/data/json/bionics.json b/data/json/bionics.json
index 6103a74050fbe..252d043c7eeec 100644
--- a/data/json/bionics.json
+++ b/data/json/bionics.json
@@ -11,7 +11,7 @@
"id": "bio_ads",
"type": "bionic",
"name": "Active Defense System",
- "description": "A thin forcefield surrounds your body, continually draining power. Anything attempting to penetrate this field has a chance of being deflected at the cost of energy. Bullets will be stopped more often than melee weapons and those in turn more often than massive objects.",
+ "description": "A thin forcefield surrounds your body, continually draining power. Anything attempting to penetrate this field has a chance of being deflected at the cost of energy, reducing their ability to deal damage. Bullets will be deflected more than melee weapons and those in turn more than massive objects.",
"occupied_bodyparts": [ [ "TORSO", 10 ], [ "HEAD", 1 ], [ "ARM_L", 1 ], [ "ARM_R", 1 ], [ "LEG_L", 2 ], [ "LEG_R", 2 ] ],
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
"act_cost": 10,
@@ -137,7 +137,7 @@
"type": "bionic",
"name": "Cable Charger System",
"capacity": 10,
- "description": "You have a complex port surgically mounted above your hip. While active, it will recharge bionic power when connected to a battery via jumper cable.",
+ "description": "You have a complex port surgically mounted above your hip. While active, it will recharge bionic power when connected to a power source via jumper cable.",
"occupied_bodyparts": [ [ "TORSO", 10 ] ],
"flags": [ "BIONIC_POWER_SOURCE", "BIONIC_SHOCKPROOF", "BIONIC_TOGGLED" ]
},
@@ -1072,6 +1072,19 @@
"occupied_bodyparts": [ [ "ARM_R", 1 ], [ "HAND_R", 2 ] ],
"act_cost": 50
},
+ {
+ "id": "bio_fuel_cell_gasoline",
+ "type": "bionic",
+ "name": "Gasoline Fuel Cell CBM",
+ "description": "A small gasoline fuel cell fixed to your scapula. Despite its limited energy output compared to other fuel cells, this device still produces a significant amount of heat dissipated through a heat exhaust protruding from your back. A diffuse network of bio-plastic bladders has been meshed with your circulatory system and serves as a fuel tank.",
+ "occupied_bodyparts": [ [ "TORSO", 8 ] ],
+ "encumbrance": [ [ "TORSO", 5 ] ],
+ "fuel_options": [ "gasoline" ],
+ "fuel_capacity": 500,
+ "fuel_efficiency": 0.25,
+ "time": 1,
+ "flags": [ "BIONIC_TOGGLED", "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE" ]
+ },
{
"id": "bio_syringe",
"type": "bionic",
diff --git a/data/json/construction.json b/data/json/construction.json
index 75837611bb557..798d205646058 100644
--- a/data/json/construction.json
+++ b/data/json/construction.json
@@ -38,7 +38,7 @@
"description": "Spike Pit",
"category": "DIG",
"required_skills": [ [ "survival", 1 ] ],
- "time": "30 m",
+ "time": "5 m",
"components": [ [ [ "spear_wood", 4 ], [ "pointy_stick", 4 ] ] ],
"pre_terrain": "t_pit",
"post_terrain": "t_pit_spiked"
@@ -48,7 +48,7 @@
"description": "Glass Pit",
"category": "DIG",
"required_skills": [ [ "survival", 1 ] ],
- "time": "30 m",
+ "time": "5 m",
"components": [ [ [ "glass_shard", 168 ] ] ],
"pre_terrain": "t_pit",
"post_terrain": "t_pit_glass"
@@ -70,7 +70,7 @@
"description": "Build Improvised Shelter",
"category": "CONSTRUCT",
"required_skills": [ [ "survival", 2 ] ],
- "time": "120 m",
+ "time": "60 m",
"qualities": [ [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ] ],
"components": [ [ [ "stick", 12 ], [ "2x4", 6 ], [ "wood_panel", 1 ] ], [ [ "pine_bough", 24 ], [ "willowbark", 24 ] ] ],
"pre_terrain": "t_pit_shallow",
@@ -196,7 +196,7 @@
"//": "regular door",
"category": "REINFORCE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "20 m",
+ "time": "10 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
"components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
"pre_flags": "BARRICADABLE_DOOR",
@@ -208,7 +208,7 @@
"//": "peephole door",
"category": "REINFORCE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "20 m",
+ "time": "10 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
"components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
"pre_terrain": "t_door_c_peep",
@@ -220,7 +220,7 @@
"//": "boarded damaged door",
"category": "REINFORCE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "20 m",
+ "time": "10 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
"components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
"pre_flags": "BARRICADABLE_DOOR_DAMAGED",
@@ -232,7 +232,7 @@
"//": "boarded damaged peephole door",
"category": "REINFORCE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "20 m",
+ "time": "10 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
"components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
"pre_terrain": "t_door_b_peep",
@@ -244,7 +244,7 @@
"//": "the reinforced doors",
"category": "REINFORCE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "20 m",
+ "time": "10 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
"components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
"pre_flags": "BARRICADABLE_DOOR_REINFORCED",
@@ -256,7 +256,7 @@
"//": "damaged reinforced doors",
"category": "REINFORCE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "20 m",
+ "time": "10 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
"components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
"pre_flags": "BARRICADABLE_DOOR_REINFORCED_DAMAGED",
@@ -267,7 +267,7 @@
"description": "Reinforce Wood Door",
"category": "REINFORCE",
"required_skills": [ [ "fabrication", 3 ] ],
- "time": "90 m",
+ "time": "45 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
"components": [ [ [ "2x4", 6 ], [ "wood_panel", 1 ] ], [ [ "2x4", 6 ] ], [ [ "nail", 48 ] ], [ [ "hinge", 1 ] ] ],
"pre_flags": "BARRICADABLE_DOOR",
@@ -525,7 +525,7 @@
"//": "Armo up regular reinforced window",
"category": "REINFORCE",
"required_skills": [ [ "fabrication", 6 ] ],
- "time": "60 m",
+ "time": "30 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
"components": [ [ [ "spike", 4 ] ], [ [ "steel_plate", 1 ], [ "sheet_metal", 4 ] ] ],
"pre_terrain": "t_window_reinforced",
@@ -537,7 +537,7 @@
"//": "When underlying window has no glass",
"category": "REINFORCE",
"required_skills": [ [ "fabrication", 6 ] ],
- "time": "60 m",
+ "time": "30 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
"components": [ [ [ "spike", 4 ] ], [ [ "steel_plate", 1 ], [ "sheet_metal", 4 ] ] ],
"pre_terrain": "t_window_reinforced_noglass",
@@ -1894,7 +1894,7 @@
"description": "Paint Grass White",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "40 m",
+ "time": "4 m",
"tools": [ [ "paint_brush" ] ],
"components": [ [ [ "w_paint", 25 ] ] ],
"pre_terrain": "t_grass",
@@ -1905,7 +1905,7 @@
"description": "Paint Grass White",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "40 m",
+ "time": "4 m",
"tools": [ [ "paint_brush" ] ],
"components": [ [ [ "w_paint", 25 ] ] ],
"pre_terrain": "t_grass_dead",
@@ -1916,7 +1916,7 @@
"description": "Paint Grass White",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "40 m",
+ "time": "4 m",
"tools": [ [ "paint_brush" ] ],
"components": [ [ [ "w_paint", 25 ] ] ],
"pre_terrain": "t_grass_golf",
@@ -1927,7 +1927,7 @@
"description": "Paint Pavement Yellow",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "40 m",
+ "time": "4 m",
"tools": [ [ "paint_brush" ] ],
"components": [ [ [ "y_paint", 25 ] ] ],
"pre_terrain": "t_pavement",
@@ -1938,7 +1938,7 @@
"description": "Paint Pavement Yellow",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "40 m",
+ "time": "4 m",
"tools": [ [ "paint_brush" ] ],
"components": [ [ [ "y_paint", 25 ] ] ],
"pre_terrain": "t_pavement_bg_dp",
@@ -1949,7 +1949,7 @@
"description": "Take Paint Off Pavement",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "80 m",
+ "time": "10 m",
"tools": [ [ "chipper" ] ],
"pre_terrain": "t_pavement_y",
"post_terrain": "t_pavement"
@@ -1959,7 +1959,7 @@
"description": "Take Paint Off Pavement",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "80 m",
+ "time": "10 m",
"tools": [ [ "chipper" ] ],
"pre_terrain": "t_pavement_y_bg_dp",
"post_terrain": "t_pavement_bg_dp"
@@ -1990,7 +1990,7 @@
"description": "Remove Wax From Floor",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "80 m",
+ "time": "10 m",
"tools": [ [ "chipper" ] ],
"pre_terrain": "t_floor_waxed_y",
"post_terrain": "t_floor"
@@ -2000,7 +2000,7 @@
"description": "Paint Wall Red",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "40 m",
+ "time": "4 m",
"tools": [ [ "paint_brush" ] ],
"components": [ [ [ "r_paint", 25 ] ] ],
"pre_terrain": "t_wall",
@@ -2011,7 +2011,7 @@
"description": "Paint Wall Blue",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "40 m",
+ "time": "4 m",
"tools": [ [ "paint_brush" ] ],
"components": [ [ [ "b_paint", 25 ] ] ],
"pre_terrain": "t_wall",
@@ -2022,7 +2022,7 @@
"description": "Paint Wall White",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "40 m",
+ "time": "4 m",
"tools": [ [ "paint_brush" ] ],
"components": [ [ [ "w_paint", 25 ] ] ],
"pre_terrain": "t_wall",
@@ -2033,7 +2033,7 @@
"description": "Paint Wall Green",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "40 m",
+ "time": "4 m",
"tools": [ [ "paint_brush" ] ],
"components": [ [ [ "g_paint", 25 ] ] ],
"pre_terrain": "t_wall",
@@ -2044,7 +2044,7 @@
"description": "Paint Wall Purple",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "40 m",
+ "time": "4 m",
"tools": [ [ "paint_brush" ] ],
"components": [ [ [ "p_paint", 25 ] ] ],
"pre_terrain": "t_wall",
@@ -2055,7 +2055,7 @@
"description": "Paint Wall Yellow",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "40 m",
+ "time": "4 m",
"tools": [ [ "paint_brush" ] ],
"components": [ [ [ "y_paint", 25 ] ] ],
"pre_terrain": "t_wall",
@@ -2067,7 +2067,7 @@
"//": "For vertical walls",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "80 m",
+ "time": "10 m",
"tools": [ [ "chipper" ] ],
"pre_flags": "CHIP",
"post_terrain": "t_wall"
@@ -2077,7 +2077,7 @@
"description": "Remove Carpet",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "30 m",
+ "time": "10 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
"pre_flags": "RUG",
"post_terrain": "t_floor"
@@ -2131,7 +2131,7 @@
"description": "Wax Floor",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 1 ] ],
- "time": "30 m",
+ "time": "10 m",
"tools": [ [ [ "mop", -1 ], [ "paint_brush", -1 ] ], [ [ "surface_heat", 2, "LIST" ] ] ],
"components": [ [ [ "wax", 5 ] ] ],
"pre_terrain": "t_floor",
@@ -2142,7 +2142,7 @@
"description": "Remove Wax From Floor",
"category": "DECORATE",
"required_skills": [ [ "fabrication", 0 ] ],
- "time": "80 m",
+ "time": "10 m",
"tools": [ [ "chipper" ] ],
"pre_terrain": "t_floor_waxed",
"post_terrain": "t_floor"
@@ -2186,7 +2186,7 @@
"//": "Fix the broken back to normal",
"category": "REPAIR",
"required_skills": [ [ "fabrication", 4 ] ],
- "time": "120 m",
+ "time": "60 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
"components": [ [ [ "2x4", 6 ] ], [ [ "nail", 20 ] ], [ [ "wood_panel", 3 ] ] ],
"pre_terrain": "t_wood_stairs_up_broken",
@@ -2269,7 +2269,7 @@
"description": "Build Road Barricade",
"category": "OTHER",
"required_skills": [ [ "fabrication", 1 ] ],
- "time": "30 m",
+ "time": "20 m",
"qualities": [ [ { "id": "HAMMER", "level": 1 } ] ],
"components": [ [ [ "2x4", 6 ] ], [ [ "nail", 12 ] ] ],
"pre_special": "check_empty",
@@ -2281,7 +2281,7 @@
"//": "Set up pontoon bridge",
"category": "CONSTRUCT",
"required_skills": [ [ "fabrication", 5 ] ],
- "time": "80 m",
+ "time": "40 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ],
"components": [
[ [ "2x4", 8 ] ],
@@ -2297,7 +2297,7 @@
"//": "Set up River bridge",
"category": "CONSTRUCT",
"required_skills": [ [ "fabrication", 5 ] ],
- "time": "80 m",
+ "time": "40 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ],
"components": [
[ [ "2x4", 4 ] ],
@@ -2314,7 +2314,7 @@
"//": "Set up dock",
"category": "CONSTRUCT",
"required_skills": [ [ "fabrication", 4 ] ],
- "time": "80 m",
+ "time": "40 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ],
"components": [ [ [ "2x4", 6 ] ], [ [ "log", 1 ] ], [ [ "nail", 12 ] ] ],
"pre_terrain": "t_water_moving_sh",
@@ -2350,7 +2350,7 @@
"//": "Set up shallow bridge",
"category": "CONSTRUCT",
"required_skills": [ [ "fabrication", 4 ] ],
- "time": "80 m",
+ "time": "30 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ],
"components": [ [ [ "2x4", 6 ] ], [ [ "log", 1 ] ], [ [ "nail", 12 ] ] ],
"pre_terrain": "t_water_sh",
diff --git a/data/json/effects.json b/data/json/effects.json
index 08fffd206e200..954e44f5edfc0 100644
--- a/data/json/effects.json
+++ b/data/json/effects.json
@@ -1370,6 +1370,15 @@
"scaling_mods": { "speed_mod": [ -5 ] },
"show_in_info": true
},
+ {
+ "type": "effect_type",
+ "id": "grabbing",
+ "name": [ "Grabbing" ],
+ "desc": [ "Grabbing another creature and holding them in place." ],
+ "max_duration": "2 s",
+ "max_intensity": 15,
+ "show_in_info": true
+ },
{
"type": "effect_type",
"id": "lack_sleep",
diff --git a/data/json/emit.json b/data/json/emit.json
index dd6ddbba25bc4..0bd49001e1c14 100644
--- a/data/json/emit.json
+++ b/data/json/emit.json
@@ -5,7 +5,7 @@
"//": "Intermittent cigarette smoke (example: lit cigarette)",
"field": "fd_cigsmoke",
"intensity": 2,
- "chance": 20
+ "chance": 2
},
{
"id": "emit_joint_trail",
@@ -13,7 +13,7 @@
"//": "Intermittent joint smoke (example: lit cigarette)",
"field": "fd_weedsmoke",
"intensity": 3,
- "chance": 20
+ "chance": 2
},
{
"id": "emit_smoke_blast",
@@ -39,6 +39,14 @@
"intensity": 3,
"qty": 3
},
+ {
+ "id": "emit_smaller_smoke_plume",
+ "type": "emit",
+ "//": "Small plume of thick smoke (example: smallarms muzzle smoke)",
+ "field": "fd_smoke",
+ "qty": 1,
+ "chance": 30
+ },
{
"id": "emit_smoke_stream",
"type": "emit",
@@ -234,5 +242,19 @@
"type": "emit",
"field": "fd_fungal_haze",
"qty": 200
+ },
+ {
+ "id": "emit_swamp_gas_leak",
+ "type": "emit",
+ "field": "fd_swamp_gas",
+ "intensity": 1,
+ "chance": 15
+ },
+ {
+ "id": "emit_fog_plume",
+ "type": "emit",
+ "field": "fd_fog",
+ "intensity": 2,
+ "qty": 200
}
]
diff --git a/data/json/field_type.json b/data/json/field_type.json
index 707c6c242a9ce..f321b4d4963fe 100644
--- a/data/json/field_type.json
+++ b/data/json/field_type.json
@@ -654,6 +654,47 @@
"display_items": false,
"display_field": true
},
+ {
+ "id": "fd_swamp_gas",
+ "type": "field_type",
+ "intensity_levels": [
+ { "name": "swamp gas", "sym": ".", "dangerous": true, "translucency": 5 },
+ { "//": "repeat last entry" },
+ { "//": "repeat last entry" }
+ ],
+ "decay_amount_factor": 5,
+ "gas_absorption_factor": 15,
+ "percent_spread": 25,
+ "outdoor_age_speedup": "1 minutes",
+ "dirty_transparency_cache": true,
+ "has_fume": true,
+ "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ] },
+ "priority": 8,
+ "half_life": "15 minutes",
+ "phase": "gas",
+ "display_items": false,
+ "display_field": true
+ },
+ {
+ "id": "fd_fog",
+ "type": "field_type",
+ "intensity_levels": [
+ { "name": "mist", "sym": "~", "dangerous": false, "transparent": false, "translucency": 5 },
+ { "name": "fog", "translucency": 3 },
+ { "name": "dense fog", "translucency": 1 }
+ ],
+ "decay_amount_factor": 15,
+ "gas_absorption_factor": 5,
+ "percent_spread": 55,
+ "outdoor_age_speedup": "5 minutes",
+ "dirty_transparency_cache": true,
+ "has_fume": true,
+ "priority": 8,
+ "half_life": "50 minutes",
+ "phase": "gas",
+ "display_items": false,
+ "display_field": true
+ },
{
"id": "fd_fungal_haze",
"type": "field_type",
diff --git a/data/json/flags.json b/data/json/flags.json
index a2e7b76c6c387..6810a776a6b97 100644
--- a/data/json/flags.json
+++ b/data/json/flags.json
@@ -64,6 +64,10 @@
"description": "Blinds the wearer while worn, and provides nominal protection vs flashbang flashes.",
"info": "This gear prevents you from seeing anything."
},
+ {
+ "id": "EFFECT_NIGHT_VISION",
+ "type": "json_flag"
+ },
{
"id": "BLOCK_WHILE_WORN",
"type": "json_flag",
@@ -642,5 +646,41 @@
"type": "json_flag",
"context": [ "SPELL" ],
"description": "This spell requires focus to cast. The lower your focus, the higher failure rate to cast."
+ },
+ {
+ "id": "EFFECT_FEATHER_FALL",
+ "type": "json_flag"
+ },
+ {
+ "id": "EFFECT_BIO_IMMUNE",
+ "type": "json_flag"
+ },
+ {
+ "id": "EFFECT_BASH_IMMUNE",
+ "type": "json_flag"
+ },
+ {
+ "id": "EFFECT_CUT_IMMUNE",
+ "type": "json_flag"
+ },
+ {
+ "id": "EFFECT_ACID_IMMUNE",
+ "type": "json_flag"
+ },
+ {
+ "id": "EFFECT_STAB_IMMUNE",
+ "type": "json_flag"
+ },
+ {
+ "id": "EFFECT_HEAT_IMMUNE",
+ "type": "json_flag"
+ },
+ {
+ "id": "EFFECT_COLD_IMMUNE",
+ "type": "json_flag"
+ },
+ {
+ "id": "ELECTRIC_IMMUNE",
+ "type": "json_flag"
}
]
diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json
index 9306d40b5acb8..bffd0a434d8c7 100644
--- a/data/json/furniture_and_terrain/furniture-storage.json
+++ b/data/json/furniture_and_terrain/furniture-storage.json
@@ -433,7 +433,7 @@
{ "item": "nail", "charges": [ 32, 40 ] }
]
},
- "max_volume": "1500 L",
+ "max_volume": 6000,
"bash": {
"str_min": 6,
"str_max": 40,
diff --git a/data/json/furniture.json b/data/json/furniture_and_terrain/furniture.json
similarity index 99%
rename from data/json/furniture.json
rename to data/json/furniture_and_terrain/furniture.json
index 90fdfa52e2ea6..a30b520a948e7 100644
--- a/data/json/furniture.json
+++ b/data/json/furniture_and_terrain/furniture.json
@@ -410,7 +410,7 @@
"deconstruct": {
"items": [
{ "item": "2x4", "count": 4 },
- { "item": "rag", "count": 4 },
+ { "item": "felt_patch", "count": 4 },
{ "item": "wood_panel", "count": 1 },
{ "item": "nail", "charges": [ 6, 10 ] }
]
@@ -424,7 +424,7 @@
{ "item": "2x4", "count": [ 2, 6 ] },
{ "item": "nail", "charges": [ 4, 12 ] },
{ "item": "splinter", "count": 1 },
- { "item": "rag", "count": [ 0, 2 ] }
+ { "item": "felt_patch", "count": [ 0, 2 ] }
]
}
},
@@ -2334,7 +2334,9 @@
{ "item": "rock", "count": [ 10, 22 ] },
{ "item": "sharp_rock", "count": [ 3, 7 ] },
{ "item": "material_limestone", "charges": [ 2, 5 ], "prob": 30 },
- { "item": "material_rocksalt", "count": [ 0, 1 ], "prob": 10 }
+ { "item": "material_rocksalt", "count": [ 0, 1 ], "prob": 10 },
+ { "item": "material_rhodonite", "count": [ 0, 1 ], "prob": 1 },
+ { "item": "material_zincite", "count": [ 0, 5 ], "prob": 2 }
]
}
},
@@ -4881,5 +4883,35 @@
"move_cost_mod": 2,
"required_str": -1,
"flags": [ "NOITEM" ]
+ },
+ {
+ "type": "furniture",
+ "id": "f_swamp_gas",
+ "name": "swamp gas",
+ "description": "This is a pool of murkey water, it occassionaly bubbles, releasing a mildly toxic gas.",
+ "looks_like": "t_water_sh",
+ "symbol": "~",
+ "color": "blue",
+ "move_cost_mod": 1,
+ "coverage": 0,
+ "required_str": -1,
+ "flags": [ "TRANSPARENT", "EMITTER" ],
+ "emissions": [ "emit_swamp_gas_leak" ],
+ "//": "a very mild toxicant, inducing nausea.",
+ "bash": { "str_min": 30, "str_max": 60, "sound": "splash!", "sound_fail": "splash!", "furn_set": "f_swamp_gas" }
+ },
+ {
+ "type": "furniture",
+ "id": "f_fog",
+ "name": "fog",
+ "description": "This is a misty cloud of fog.",
+ "looks_like": "t_moss",
+ "symbol": "^",
+ "color": "light_gray",
+ "move_cost_mod": 2,
+ "coverage": 0,
+ "required_str": -1,
+ "flags": [ "TRANSPARENT", "EMITTER" ],
+ "emissions": [ "emit_fog_plume" ]
}
]
diff --git a/data/json/furniture_and_terrain/terrain-fences-gates.json b/data/json/furniture_and_terrain/terrain-fences-gates.json
index 019cd6bc23d79..6b6db529e89f9 100644
--- a/data/json/furniture_and_terrain/terrain-fences-gates.json
+++ b/data/json/furniture_and_terrain/terrain-fences-gates.json
@@ -549,6 +549,119 @@
]
}
},
+ {
+ "type": "terrain",
+ "id": "t_fence_metal",
+ "name": "metal fence",
+ "description": "A simple metal fence.",
+ "symbol": "LINE_OXOX",
+ "color": "light_gray",
+ "looks_like": "t_metal_railing",
+ "move_cost": 0,
+ "coverage": 60,
+ "examine_action": "chainfence",
+ "flags": [ "TRANSPARENT", "NOITEM", "THIN_OBSTACLE", "PERMEABLE", "CLIMBABLE", "AUTO_WALL_SYMBOL", "BURROWABLE" ],
+ "connects_to": "WOODFENCE",
+ "deconstruct": {
+ "ter_set": "t_floor",
+ "items": [
+ { "item": "pipe", "count": 8 },
+ { "item": "sheet_metal_small", "count": [ 16, 20 ] },
+ { "item": "sheet_metal", "count": 2 }
+ ]
+ },
+ "bash": {
+ "str_min": 10,
+ "str_max": 18,
+ "sound": "clang!",
+ "sound_fail": "smash!",
+ "ter_set": "t_floor",
+ "items": [
+ { "item": "scrap", "count": [ 8, 12 ] },
+ { "item": "pipe", "count": [ 4, 8 ] },
+ { "item": "sheet_metal_small", "count": [ 8, 20 ] },
+ { "item": "sheet_metal", "count": [ 0, 2 ] }
+ ]
+ }
+ },
+ {
+ "type": "terrain",
+ "id": "t_gate_metal_c",
+ "name": "closed metal gate",
+ "description": "A closed metal gate.",
+ "symbol": "+",
+ "color": "light_gray",
+ "looks_like": "t_fencegate_c",
+ "move_cost": 0,
+ "coverage": 60,
+ "flags": [ "TRANSPARENT", "DOOR", "BURROWABLE" ],
+ "connects_to": "WOODFENCE",
+ "open": "t_gate_metal_o",
+ "deconstruct": {
+ "ter_set": "t_floor",
+ "items": [
+ { "item": "pipe", "count": 8 },
+ { "item": "sheet_metal_small", "count": [ 16, 20 ] },
+ { "item": "sheet_metal", "count": 2 },
+ { "item": "hinge", "count": 2 }
+ ]
+ },
+ "bash": {
+ "str_min": 10,
+ "str_max": 20,
+ "str_min_blocked": 12,
+ "str_max_blocked": 30,
+ "sound": "crack.",
+ "sound_fail": "wham.",
+ "ter_set": "t_floor",
+ "items": [
+ { "item": "scrap", "count": [ 8, 12 ] },
+ { "item": "pipe", "count": [ 4, 8 ] },
+ { "item": "sheet_metal_small", "count": [ 8, 20 ] },
+ { "item": "sheet_metal", "count": [ 0, 2 ] },
+ { "item": "hinge", "count": [ 1, 2 ] }
+ ]
+ }
+ },
+ {
+ "type": "terrain",
+ "id": "t_gate_metal_o",
+ "name": "closed metal gate",
+ "description": "A closed metal gate.",
+ "symbol": ",",
+ "color": "light_gray",
+ "looks_like": "t_fencegate_o",
+ "move_cost": 1,
+ "coverage": 60,
+ "flags": [ "TRANSPARENT", "DOOR", "BURROWABLE", "FLAT", "ROAD" ],
+ "connects_to": "WOODFENCE",
+ "close": "t_gate_metal_c",
+ "deconstruct": {
+ "ter_set": "t_floor",
+ "items": [
+ { "item": "pipe", "count": 8 },
+ { "item": "sheet_metal_small", "count": [ 16, 20 ] },
+ { "item": "sheet_metal", "count": 2 },
+ { "item": "hinge", "count": 2 }
+ ]
+ },
+ "bash": {
+ "str_min": 10,
+ "str_max": 20,
+ "str_min_blocked": 12,
+ "str_max_blocked": 30,
+ "sound": "crack.",
+ "sound_fail": "wham.",
+ "ter_set": "t_floor",
+ "items": [
+ { "item": "scrap", "count": [ 8, 12 ] },
+ { "item": "pipe", "count": [ 4, 8 ] },
+ { "item": "sheet_metal_small", "count": [ 8, 20 ] },
+ { "item": "sheet_metal", "count": [ 0, 2 ] },
+ { "item": "hinge", "count": [ 1, 2 ] }
+ ]
+ }
+ },
{
"type": "terrain",
"id": "t_privacy_fence",
diff --git a/data/json/furniture_and_terrain/terrain-floors-outdoors.json b/data/json/furniture_and_terrain/terrain-floors-outdoors.json
index fe1e661f60726..0b779af7d1e67 100644
--- a/data/json/furniture_and_terrain/terrain-floors-outdoors.json
+++ b/data/json/furniture_and_terrain/terrain-floors-outdoors.json
@@ -21,6 +21,18 @@
"flags": [ "TRANSPARENT", "DIGGABLE", "FLAT" ],
"bash": { "sound": "thump", "ter_set": "t_null", "str_min": 50, "str_max": 100, "str_min_supported": 100, "bash_below": true }
},
+ {
+ "type": "terrain",
+ "id": "t_mud",
+ "name": "mud",
+ "description": "An area of wet, slick mud.",
+ "symbol": ".",
+ "color": "brown",
+ "looks_like": "t_dirt",
+ "move_cost": 3,
+ "flags": [ "TRANSPARENT", "DIGGABLE", "FLAT" ],
+ "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 50, "str_max": 100, "str_min_supported": 100, "bash_below": true }
+ },
{
"type": "terrain",
"id": "t_clay",
diff --git a/data/json/furniture_and_terrain/terrain-floors_indoor.json b/data/json/furniture_and_terrain/terrain-floors_indoor.json
index cdf6b83b6a70c..c4c7627bd1e84 100644
--- a/data/json/furniture_and_terrain/terrain-floors_indoor.json
+++ b/data/json/furniture_and_terrain/terrain-floors_indoor.json
@@ -668,5 +668,94 @@
{ "item": "lead", "count": [ 12, 18 ] }
]
}
+ },
+ {
+ "type": "terrain",
+ "id": "t_dirt_underground",
+ "//": "for caverns and other natural underground formations.",
+ "name": "dirt",
+ "description": "It's dirt. Looks like some fine soil for tillage. Could also be dug out for construction projects.",
+ "symbol": ".",
+ "color": "brown",
+ "move_cost": 2,
+ "looks_like": "t_dirt",
+ "roof": "t_rock_roof",
+ "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD", "PLOWABLE", "DIGGABLE" ],
+ "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 50, "str_max": 100, "str_min_supported": 100, "bash_below": true }
+ },
+ {
+ "type": "terrain",
+ "id": "t_sand_underground",
+ "name": "sand",
+ "//": "for caverns and other natural underground formations.",
+ "description": "A large area of fine sand that could be useful in a number of ways, if it was extracted properly.",
+ "symbol": ".",
+ "color": "yellow",
+ "looks_like": "t_sand",
+ "move_cost": 3,
+ "roof": "t_rock_roof",
+ "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT", "DIGGABLE" ],
+ "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 50, "str_max": 100, "str_min_supported": 100, "bash_below": true }
+ },
+ {
+ "type": "terrain",
+ "id": "t_mud_underground",
+ "//": "for caverns and other natural underground formations.",
+ "name": "mud",
+ "looks_like": "t_dirt",
+ "description": "An area of wet, slick mud.",
+ "symbol": ".",
+ "color": "brown",
+ "move_cost": 3,
+ "roof": "t_rock_roof",
+ "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT", "DIGGABLE" ],
+ "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 50, "str_max": 100, "str_min_supported": 100, "bash_below": true }
+ },
+ {
+ "type": "terrain",
+ "id": "t_moss_underground",
+ "name": "moss",
+ "//": "for caverns and other natural underground formations.",
+ "looks_like": "t_grass",
+ "roof": "t_rock_roof",
+ "description": "Moist spongy moss.",
+ "symbol": ".",
+ "color": "light_green",
+ "move_cost": 2,
+ "flags": [ "TRANSPARENT", "DIGGABLE", "FLAT", "SUPPORTS_ROOF", "INDOORS" ],
+ "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 40, "str_max": 100, "str_min_supported": 100, "bash_below": true }
+ },
+ {
+ "type": "terrain",
+ "id": "t_clay_underground",
+ "name": "clay",
+ "//": "for caverns and other natural underground formations.",
+ "description": "A field full of malleable clay, suitable for kiln firing if it was extracted properly.",
+ "symbol": ".",
+ "color": "light_red",
+ "move_cost": 2,
+ "roof": "t_rock_roof",
+ "flags": [ "TRANSPARENT", "DIGGABLE", "FLAT", "SUPPORTS_ROOF", "INDOORS" ],
+ "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 50, "str_max": 100, "str_min_supported": 100, "bash_below": true }
+ },
+ {
+ "type": "terrain",
+ "id": "t_claymound_underground",
+ "name": "mound of clay",
+ "description": "A mound of clay soil.",
+ "//": "for caverns and other natural underground formations.",
+ "symbol": "#",
+ "color": "brown",
+ "move_cost": 5,
+ "roof": "t_rock_roof",
+ "flags": [ "TRANSPARENT", "BURROWABLE", "SUPPORTS_ROOF", "INDOORS" ],
+ "bash": {
+ "str_min": 2,
+ "str_max": 4,
+ "sound": "splosh!",
+ "sound_fail": "splosh!",
+ "ter_set": "t_water_dp",
+ "items": [ { "item": "clay_lump", "count": [ 6, 12 ] } ]
+ }
}
]
diff --git a/data/json/furniture_and_terrain/terrain-liquids.json b/data/json/furniture_and_terrain/terrain-liquids.json
index 2a6530cd1b125..21ada254267b2 100644
--- a/data/json/furniture_and_terrain/terrain-liquids.json
+++ b/data/json/furniture_and_terrain/terrain-liquids.json
@@ -11,6 +11,21 @@
"connects_to": "WATER",
"examine_action": "water_source"
},
+ {
+ "type": "terrain",
+ "id": "t_water_sh_underground",
+ "name": "shallow water",
+ "description": "The water isn't too deep here. With a watertight container, you could gather fresh water from here. Not safe to drink as is.",
+ "//": "for caverns and other natural underground formations.",
+ "symbol": "~",
+ "looks_like": "t_water_sh",
+ "color": "light_blue",
+ "move_cost": 5,
+ "roof": "t_rock_roof",
+ "flags": [ "TRANSPARENT", "LIQUID", "SWIMMABLE", "FISHABLE", "INDOORS" ],
+ "connects_to": "WATER",
+ "examine_action": "water_source"
+ },
{
"type": "terrain",
"id": "t_water_dp",
@@ -23,6 +38,49 @@
"connects_to": "WATER",
"examine_action": "water_source"
},
+ {
+ "type": "terrain",
+ "id": "t_water_dp_underground",
+ "name": "deep water",
+ "//": "for caverns and other natural underground formations.",
+ "description": "You're having trouble seeing the bottom through the deep water here. With a watertight container, you could gather fresh water from here. Not safe to drink as is.",
+ "symbol": "~",
+ "looks_like": "t_water_dp",
+ "color": "blue",
+ "move_cost": 8,
+ "roof": "t_rock_roof",
+ "flags": [ "TRANSPARENT", "LIQUID", "SWIMMABLE", "DEEP_WATER", "FISHABLE", "INDOORS" ],
+ "connects_to": "WATER",
+ "examine_action": "water_source"
+ },
+ {
+ "type": "terrain",
+ "id": "t_water_murky",
+ "name": "murky shallow water",
+ "description": "The water isn't too deep here but is murky with organic matter. With a watertight container, you could gather fetid water from here. Not safe to drink as is.",
+ "symbol": "~",
+ "color": "light_blue",
+ "looks_like": "t_water_sh",
+ "move_cost": 5,
+ "flags": [ "TRANSPARENT", "LIQUID", "SWIMMABLE", "FISHABLE" ],
+ "connects_to": "WATER",
+ "examine_action": "water_source"
+ },
+ {
+ "type": "terrain",
+ "id": "t_water_sh_murky_underground",
+ "name": "murky shallow water",
+ "description": "The water isn't too deep here but it is murky with organic matter. With a watertight container, you could gather fetid water from here. Not safe to drink as is.",
+ "//": "for caverns and other natural underground formations.",
+ "symbol": "~",
+ "color": "light_blue",
+ "looks_like": "t_water_sh",
+ "move_cost": 5,
+ "roof": "t_rock_roof",
+ "flags": [ "TRANSPARENT", "LIQUID", "SWIMMABLE", "FISHABLE", "INDOORS" ],
+ "connects_to": "WATER",
+ "examine_action": "water_source"
+ },
{
"type": "terrain",
"id": "t_water_moving_sh",
@@ -36,6 +94,21 @@
"connects_to": "WATER",
"examine_action": "water_source"
},
+ {
+ "type": "terrain",
+ "id": "t_water_moving_sh_underground",
+ "name": "flowing shallow water",
+ "description": "The streaming water isn't too deep here. With a watertight container, you could gather fresh water from here. Not safe to drink as is, although probably safer than stagnant water.",
+ "//": "for caverns and other natural underground formations.",
+ "looks_like": "t_water_sh",
+ "symbol": "~",
+ "color": "light_blue",
+ "move_cost": 6,
+ "roof": "t_rock_roof",
+ "flags": [ "TRANSPARENT", "LIQUID", "SWIMMABLE", "FISHABLE", "CURRENT", "INDOORS" ],
+ "connects_to": "WATER",
+ "examine_action": "water_source"
+ },
{
"type": "terrain",
"id": "t_water_moving_dp",
@@ -49,6 +122,21 @@
"connects_to": "WATER",
"examine_action": "water_source"
},
+ {
+ "type": "terrain",
+ "id": "t_water_moving_dp_underground",
+ "name": "flowing deep water",
+ "description": "The streaming water looks deep here. With a watertight container, you could gather fresh water from here. Not safe to drink as is, although probably safer than stagnant water.",
+ "looks_like": "t_water_dp",
+ "//": "for caverns and other natural underground formations.",
+ "symbol": "~",
+ "color": "blue",
+ "move_cost": 10,
+ "roof": "t_rock_roof",
+ "flags": [ "TRANSPARENT", "LIQUID", "SWIMMABLE", "DEEP_WATER", "FISHABLE", "CURRENT", "INDOORS" ],
+ "connects_to": "WATER",
+ "examine_action": "water_source"
+ },
{
"type": "terrain",
"id": "t_swater_sh",
@@ -61,6 +149,21 @@
"connects_to": "WATER",
"examine_action": "water_source"
},
+ {
+ "type": "terrain",
+ "id": "t_swater_sh_underground",
+ "name": "shallow water",
+ "description": "The water isn't too deep here. With a watertight container, you could gather salt water from here.",
+ "//": "for caverns and other natural underground formations.",
+ "symbol": "~",
+ "color": "light_blue",
+ "looks_like": "t_swater_sh",
+ "move_cost": 5,
+ "roof": "t_rock_roof",
+ "flags": [ "TRANSPARENT", "LIQUID", "SWIMMABLE", "SALT_WATER", "FISHABLE", "INDOORS" ],
+ "connects_to": "WATER",
+ "examine_action": "water_source"
+ },
{
"type": "terrain",
"id": "t_swater_dp",
@@ -73,6 +176,21 @@
"connects_to": "WATER",
"examine_action": "water_source"
},
+ {
+ "type": "terrain",
+ "id": "t_swater_dp_underground",
+ "name": "deep water",
+ "//": "for caverns and other natural underground formations.",
+ "description": "You're having trouble seeing the bottom through the deep water here. With a watertight container, you could gather salt water from here.",
+ "symbol": "~",
+ "color": "blue",
+ "looks_like": "t_swater_dp",
+ "move_cost": 8,
+ "roof": "t_rock_roof",
+ "flags": [ "TRANSPARENT", "LIQUID", "SWIMMABLE", "SALT_WATER", "DEEP_WATER", "FISHABLE", "INDOORS" ],
+ "connects_to": "WATER",
+ "examine_action": "water_source"
+ },
{
"type": "terrain",
"id": "t_water_pool",
@@ -118,5 +236,44 @@
"trap": "tr_lava",
"flags": [ "TRANSPARENT", "LIQUID", "DESTROY_ITEM", "USABLE_FIRE" ],
"//": "lava-seared moose meat? yes, please"
+ },
+ {
+ "type": "terrain",
+ "id": "t_water_cube",
+ "//": "for eventual use with water z levels. Currently non-functional.",
+ "name": "submersed water",
+ "description": "You are submerged below the surface of the water, your feet can't touch the ground. With a watertight container, you could gather fresh water from here. Not safe to drink as is.",
+ "symbol": "~",
+ "color": "blue",
+ "move_cost": 8,
+ "flags": [ "TRANSPARENT", "LIQUID", "SWIMMABLE", "DEEP_WATER", "GOES_DOWN", "GOES_UP" ],
+ "connects_to": "WATER",
+ "examine_action": "water_source"
+ },
+ {
+ "type": "terrain",
+ "id": "t_lake_bed",
+ "//": "for eventual use with water z levels. Currently non-functional.",
+ "name": "lake bed",
+ "description": "You are standing at the bottom of a body of fresh water. With a watertight container, you could gather fresh water from here. Not safe to drink as is.",
+ "symbol": "~",
+ "color": "blue",
+ "move_cost": 8,
+ "flags": [ "TRANSPARENT", "LIQUID", "SWIMMABLE", "DEEP_WATER", "GOES_UP" ],
+ "connects_to": "WATER",
+ "examine_action": "water_source"
+ },
+ {
+ "type": "terrain",
+ "id": "t_ocean_bed",
+ "//": "for eventual use with water z levels. Currently non-functional.",
+ "name": "ocean bed",
+ "description": "You are standing at the bottom of a body of salt water. With a watertight container, you could gather salt water from here. Not safe to drink as is.",
+ "symbol": "~",
+ "color": "blue",
+ "move_cost": 8,
+ "flags": [ "TRANSPARENT", "LIQUID", "SWIMMABLE", "DEEP_WATER", "GOES_UP" ],
+ "connects_to": "WATER",
+ "examine_action": "water_source"
}
]
diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json
index 7727916d77fbb..7b8f805aacacf 100644
--- a/data/json/furniture_and_terrain/terrain-manufactured.json
+++ b/data/json/furniture_and_terrain/terrain-manufactured.json
@@ -156,6 +156,42 @@
"items": [ { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "scrap", "count": [ 4, 8 ] } ]
}
},
+ {
+ "type": "terrain",
+ "id": "t_ticket_vendor",
+ "name": "ticket vendor",
+ "description": "This machine has a little screen, and slots intended to take your money and provide you with a ticket.",
+ "symbol": "&",
+ "color": "blue",
+ "move_cost": 0,
+ "coverage": 55,
+ "flags": [ "TRANSPARENT", "NOITEM", "ALARMED", "REDUCE_SCENT", "PERMEABLE" ],
+ "bash": {
+ "str_min": 40,
+ "str_max": 210,
+ "sound_fail": "clang!",
+ "ter_set": "t_floor",
+ "items": [ { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "scrap", "count": [ 4, 8 ] } ]
+ }
+ },
+ {
+ "type": "terrain",
+ "id": "t_ticket_machine",
+ "name": "ticket machine",
+ "description": "This machine will provide you access to whatever is beyond it - for the price of a ticket, of course.",
+ "symbol": "&",
+ "color": "blue",
+ "move_cost": 0,
+ "coverage": 55,
+ "flags": [ "TRANSPARENT", "NOITEM", "ALARMED", "REDUCE_SCENT", "PERMEABLE" ],
+ "bash": {
+ "str_min": 40,
+ "str_max": 210,
+ "sound_fail": "clang!",
+ "ter_set": "t_floor",
+ "items": [ { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "scrap", "count": [ 4, 8 ] } ]
+ }
+ },
{
"type": "terrain",
"id": "t_generator_broken",
diff --git a/data/json/furniture_and_terrain/terrain-roofs.json b/data/json/furniture_and_terrain/terrain-roofs.json
index d4b55b3182881..85546279c78da 100644
--- a/data/json/furniture_and_terrain/terrain-roofs.json
+++ b/data/json/furniture_and_terrain/terrain-roofs.json
@@ -306,5 +306,24 @@
"ter_set": "t_open_air",
"bash_below": true
}
+ },
+ {
+ "type": "terrain",
+ "id": "t_rock_roof",
+ "name": "rock roof",
+ "description": "A secton of flat natural rock.",
+ "looks_like": "t_flat_roof",
+ "symbol": ".",
+ "color": "brown",
+ "move_cost": 2,
+ "flags": [ "TRANSPARENT", "FLAT" ],
+ "bash": {
+ "str_min": 100,
+ "str_max": 210,
+ "sound": "crash!",
+ "sound_fail": "whump!",
+ "ter_set": "t_open_air",
+ "bash_below": true
+ }
}
]
diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json
index 6ca945171c096..ff4b3f9235dd3 100644
--- a/data/json/furniture_and_terrain/terrain-walls.json
+++ b/data/json/furniture_and_terrain/terrain-walls.json
@@ -1134,7 +1134,9 @@
{ "item": "rock", "count": [ 3, 7 ] },
{ "item": "coal_lump", "charges": [ 250, 500 ], "prob": 10 },
{ "item": "material_limestone", "charges": [ 10, 25 ], "prob": 80 },
- { "item": "material_rocksalt", "count": [ 0, 1 ], "prob": 20 }
+ { "item": "material_rocksalt", "count": [ 0, 1 ], "prob": 20 },
+ { "item": "material_rhodonite", "count": [ 0, 1 ], "prob": 3 },
+ { "item": "material_zincite", "count": [ 0, 5 ], "prob": 5 }
]
}
},
diff --git a/data/json/itemgroups/ammo.json b/data/json/itemgroups/ammo.json
index 5ad2b1e48ff9e..2156da28544d9 100644
--- a/data/json/itemgroups/ammo.json
+++ b/data/json/itemgroups/ammo.json
@@ -27,7 +27,6 @@
"//": "Less common pistol ammo including that only used by police/paramilitary forces.",
"items": [
[ "10mm_fmj", 15 ],
- [ "45colt_jhp", 10 ],
[ "38_super", 20 ],
[ "38super_fmj", 20 ],
[ "44fmj", 15 ],
@@ -53,6 +52,7 @@
"//": "Imported or otherwise very obscure pistol ammo.",
"items": [
[ "454_Casull", 100 ],
+ [ "45colt_jhp", 50 ],
[ "500_Magnum", 100 ],
[ "762_25", 50 ],
[ "762_25hot", 50 ],
@@ -438,56 +438,56 @@
"type": "item_group",
"id": "ammo_light_batteries",
"items": [
- { "item": "light_battery_cell", "prob": 50, "charges-min": 0, "charges-max": 100 },
- { "item": "light_minus_battery_cell", "prob": 30, "charges-min": 0, "charges-max": 50 },
- { "item": "light_plus_battery_cell", "prob": 20, "charges-min": 0, "charges-max": 150 },
- { "item": "light_disposable_cell", "prob": 25, "charges-min": 0, "charges-max": 300 }
+ { "item": "light_battery_cell", "prob": 25, "charges-min": 0, "charges-max": 100 },
+ { "item": "light_minus_battery_cell", "prob": 12, "charges-min": 0, "charges-max": 50 },
+ { "item": "light_plus_battery_cell", "prob": 9, "charges-min": 0, "charges-max": 150 },
+ { "item": "light_disposable_cell", "prob": 50, "charges-min": 0, "charges-max": 300 }
]
},
{
"type": "item_group",
"id": "ammo_light_batteries_full",
"items": [
- { "item": "light_battery_cell", "prob": 50, "charges-min": 100, "charges-max": 100 },
- { "item": "light_minus_battery_cell", "prob": 30, "charges-min": 50, "charges-max": 50 },
- { "item": "light_plus_battery_cell", "prob": 20, "charges-min": 150, "charges-max": 150 },
- { "item": "light_disposable_cell", "prob": 25, "charges-min": 300, "charges-max": 300 }
+ { "item": "light_battery_cell", "prob": 25, "charges-min": 100, "charges-max": 100 },
+ { "item": "light_minus_battery_cell", "prob": 12, "charges-min": 50, "charges-max": 50 },
+ { "item": "light_plus_battery_cell", "prob": 9, "charges-min": 150, "charges-max": 150 },
+ { "item": "light_disposable_cell", "prob": 50, "charges-min": 300, "charges-max": 300 }
]
},
{
"type": "item_group",
"id": "ammo_medium_batteries",
"items": [
- { "item": "medium_battery_cell", "prob": 80, "charges-min": 0, "charges-max": 500 },
- { "item": "medium_plus_battery_cell", "prob": 20, "charges-min": 0, "charges-max": 600 },
- { "item": "medium_disposable_cell", "prob": 40, "charges-min": 0, "charges-max": 1200 }
+ { "item": "medium_battery_cell", "prob": 40, "charges-min": 0, "charges-max": 500 },
+ { "item": "medium_plus_battery_cell", "prob": 10, "charges-min": 0, "charges-max": 600 },
+ { "item": "medium_disposable_cell", "prob": 80, "charges-min": 0, "charges-max": 1200 }
]
},
{
"type": "item_group",
"id": "ammo_medium_batteries_full",
"items": [
- { "item": "medium_battery_cell", "prob": 80, "charges-min": 500, "charges-max": 500 },
- { "item": "medium_plus_battery_cell", "prob": 20, "charges-min": 600, "charges-max": 600 },
- { "item": "medium_disposable_cell", "prob": 40, "charges-min": 1200, "charges-max": 1200 }
+ { "item": "medium_battery_cell", "prob": 40, "charges-min": 500, "charges-max": 500 },
+ { "item": "medium_plus_battery_cell", "prob": 10, "charges-min": 600, "charges-max": 600 },
+ { "item": "medium_disposable_cell", "prob": 80, "charges-min": 1200, "charges-max": 1200 }
]
},
{
"type": "item_group",
"id": "ammo_heavy_batteries",
"items": [
- { "item": "heavy_battery_cell", "prob": 80, "charges-min": 0, "charges-max": 1000 },
- { "item": "heavy_plus_battery_cell", "prob": 20, "charges-min": 0, "charges-max": 1250 },
- { "item": "heavy_disposable_cell", "prob": 40, "charges-min": 0, "charges-max": 2500 }
+ { "item": "heavy_battery_cell", "prob": 40, "charges-min": 0, "charges-max": 1000 },
+ { "item": "heavy_plus_battery_cell", "prob": 10, "charges-min": 0, "charges-max": 1250 },
+ { "item": "heavy_disposable_cell", "prob": 80, "charges-min": 0, "charges-max": 2500 }
]
},
{
"type": "item_group",
"id": "ammo_heavy_batteries_full",
"items": [
- { "item": "heavy_battery_cell", "prob": 80, "charges-min": 1000, "charges-max": 1000 },
- { "item": "heavy_plus_battery_cell", "prob": 20, "charges-min": 1250, "charges-max": 1250 },
- { "item": "heavy_disposable_cell", "prob": 40, "charges-min": 2500, "charges-max": 2500 }
+ { "item": "heavy_battery_cell", "prob": 40, "charges-min": 1000, "charges-max": 1000 },
+ { "item": "heavy_plus_battery_cell", "prob": 10, "charges-min": 1250, "charges-max": 1250 },
+ { "item": "heavy_disposable_cell", "prob": 80, "charges-min": 2500, "charges-max": 2500 }
]
},
{
diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json
index 2589778bf6e89..8caefd2cd1371 100644
--- a/data/json/itemgroups/books.json
+++ b/data/json/itemgroups/books.json
@@ -306,6 +306,11 @@
[ "dnd_handbook", 2 ]
]
},
+ {
+ "id": "ranch_homebooks",
+ "type": "item_group",
+ "items": [ [ "reference_firstaid2", 2 ], { "group": "homebooks", "prob": 98 } ]
+ },
{
"type": "item_group",
"id": "manuals",
@@ -371,6 +376,10 @@
[ "manual_driving", 15 ],
[ "manual_survival", 20 ],
[ "dnd_handbook", 2 ],
+ [ "reference_cooking", 1 ],
+ [ "reference_fabrication1", 1 ],
+ [ "reference_firstaid1", 1 ],
+ [ "reference_firstaid2", 1 ],
[ "survnote", 3 ]
]
},
@@ -422,6 +431,10 @@
[ "textbook_weapeast", 3 ],
[ "textbook_armwest", 3 ],
[ "textbook_armeast", 3 ],
+ [ "reference_cooking", 2 ],
+ [ "reference_fabrication1", 6 ],
+ [ "reference_firstaid1", 2 ],
+ [ "reference_firstaid2", 1 ],
[ "survnote", 2 ]
]
},
@@ -493,6 +506,10 @@
[ "textbook_gaswarfare", 2 ],
[ "manual_electronics", 5 ],
[ "advanced_electronics", 6 ],
+ [ "reference_cooking", 2 ],
+ [ "reference_fabrication1", 2 ],
+ [ "reference_firstaid1", 2 ],
+ [ "reference_firstaid2", 2 ],
[ "dnd_handbook", 15 ],
[ "novel_romance", 30 ],
[ "novel_spy", 32 ],
@@ -655,7 +672,8 @@
[ "recipe_medicalmut", 50 ],
[ "recipe_serum", 10 ],
[ "recipe_labchem", 100 ],
- [ "recipe_augs", 100 ]
+ [ "recipe_augs", 100 ],
+ [ "reference_firstaid1", 15 ]
]
},
{
diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json
index 5ef287505e78c..e0d9065a7f966 100644
--- a/data/json/itemgroups/clothing.json
+++ b/data/json/itemgroups/clothing.json
@@ -271,7 +271,7 @@
[ "camelbak", 40 ],
[ "chestpouch", 40 ],
[ "backpack_tactical_large", 20 ],
- [ "chestrig", 160 ],
+ [ "tacvest", 160 ],
[ "molle_pack", 100 ],
[ "rucksack", 80 ]
]
diff --git a/data/json/itemgroups/collections_trades.json b/data/json/itemgroups/collections_trades.json
index 694a6b6e922cc..59867591f92ee 100644
--- a/data/json/itemgroups/collections_trades.json
+++ b/data/json/itemgroups/collections_trades.json
@@ -63,6 +63,7 @@
{ "group": "supplies_mechanics", "prob": 80 },
[ "goggles_welding", 50 ],
[ "welding_book", 10 ],
+ [ "welding_mask", 30 ],
[ "jerrycan", 10 ],
[ "jerrycan_big", 10 ],
[ "metal_tank", 8 ],
diff --git a/data/json/itemgroups/corpses.json b/data/json/itemgroups/corpses.json
index 3aab1f770f003..e5d34347e534e 100644
--- a/data/json/itemgroups/corpses.json
+++ b/data/json/itemgroups/corpses.json
@@ -1,4 +1,14 @@
[
+ {
+ "id": "remains_human_generic",
+ "type": "item_group",
+ "subtype": "collection",
+ "entries": [
+ { "item": "bone_human", "count": [ 5, 8 ], "prob": 100 },
+ { "item": "human_flesh", "count": [ 5, 8 ], "prob": 100 },
+ { "item": "hstomach", "prob": 50 }
+ ]
+ },
{
"id": "remains_pilot",
"type": "item_group",
@@ -70,5 +80,25 @@
{ "item": "human_flesh", "count": [ 5, 8 ], "prob": 100 },
{ "item": "hstomach", "prob": 100 }
]
+ },
+ {
+ "id": "corpses",
+ "type": "item_group",
+ "items": [
+ [ "corpse_generic_male", 80 ],
+ [ "corpse_generic_female", 80 ],
+ [ "corpse_generic_boy", 15 ],
+ [ "corpse_generic_girl", 15 ],
+ [ "corpse_bloody", 10 ],
+ [ "corpse_painful", 10 ],
+ [ "corpse_scorched", 10 ],
+ [ "corpse_stabbed", 10 ],
+ [ "corpse_gunned", 10 ],
+ [ "corpse_halved_upper", 10 ],
+ [ "corpse_half_beheaded", 10 ],
+ [ "corpse_child_calm", 10 ],
+ [ "corpse_child_gunned", 10 ],
+ [ "corpse_oldwoman_jewelry", 10 ]
+ ]
}
]
diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json
index 97cada03a65ca..2a57e76f7cc24 100644
--- a/data/json/itemgroups/guns.json
+++ b/data/json/itemgroups/guns.json
@@ -91,7 +91,8 @@
{ "item": "l_bak_223", "prob": 80, "charges-min": 0, "charges-max": 5 },
{ "item": "rm99_pistol", "prob": 150, "charges-min": 0, "charges-max": 5 },
{ "item": "tokarev", "prob": 100, "charges-min": 0, "charges-max": 8 },
- { "item": "walther_ppk", "prob": 100, "charges-min": 0, "charges-max": 8 }
+ { "item": "walther_ppk", "prob": 100, "charges-min": 0, "charges-max": 8 },
+ { "item": "colt_saa", "prob": 150, "charges-min": 0, "charges-max": 6 }
]
},
{
@@ -361,7 +362,7 @@
"items": [
[ "LAW_Packed", 200 ],
[ "m202_flash", 100 ],
- [ "m235tpa", 150 ],
+ [ "m74_clip", 150 ],
[ "m3_carlgustav", 50 ],
[ "AT4", 50 ],
[ "84x246mm_he", 100 ],
diff --git a/data/json/item_groups.json b/data/json/itemgroups/item_groups.json
similarity index 98%
rename from data/json/item_groups.json
rename to data/json/itemgroups/item_groups.json
index c1cf40e3eaa0e..8ae1ac9427435 100644
--- a/data/json/item_groups.json
+++ b/data/json/itemgroups/item_groups.json
@@ -77,7 +77,8 @@
[ "months_old_newspaper", 1 ],
[ "weeks_old_newspaper", 2 ],
[ "newest_newspaper", 3 ],
- { "group": "ammo_casings", "prob": 10 }
+ { "group": "ammo_casings", "prob": 10 },
+ { "group": "everyday_corpse", "prob": 10 }
]
},
{
@@ -117,7 +118,8 @@
[ "bottle_glass", 1 ],
[ "syringe", 1 ],
[ "cig_butt", 1 ],
- { "group": "ammo_casings", "prob": 20 }
+ { "group": "ammo_casings", "prob": 20 },
+ { "group": "everyday_corpse", "prob": 10 }
]
},
{
@@ -146,6 +148,7 @@
"id": "road",
"items": [
{ "group": "ammo_casings", "prob": 20 },
+ { "group": "everyday_corpse", "prob": 10 },
[ "jumper_cable", 5 ],
[ "muffler", 5 ],
[ "pipe", 20 ],
@@ -423,6 +426,7 @@
[ "aluminum_foil", 25 ],
[ "chips", 65 ],
[ "fried_seeds", 15 ],
+ [ "rolling_pin", 25 ],
[ "cereal", 50 ],
[ "cereal2", 60 ],
[ "cereal3", 45 ],
@@ -830,6 +834,7 @@
"id": "oven",
"items": [
[ "pan", 80 ],
+ [ "rolling_pin", 25 ],
[ "waffleiron", 25 ],
[ "teapot", 25 ],
[ "pot", 80 ],
@@ -2135,6 +2140,7 @@
"ammo": 75,
"magazine": 100,
"items": [
+ [ "daypack", 20 ],
[ "rope_30", 35 ],
[ "hatchet", 10 ],
[ "misc_repairkit", 5 ],
@@ -2301,6 +2307,8 @@
"magazine": 100,
"items": [
[ "aspirin", 85 ],
+ [ "daypack", 30 ],
+ [ "ski_jacket", 5 ],
[ "sports_drink", 20 ],
[ "bat", 60 ],
[ "bat_metal", 60 ],
@@ -2840,6 +2848,7 @@
"items": [
[ "coat_winter", 50 ],
[ "peacoat", 30 ],
+ [ "ski_jacket", 40 ],
[ "greatcoat", 15 ],
[ "gloves_light", 35 ],
[ "mittens", 30 ],
@@ -3027,6 +3036,7 @@
[ "pants_checkered", 5 ],
[ "shorts", 70 ],
[ "shorts_denim", 35 ],
+ [ "ski_jacket", 40 ],
[ "pants", 75 ],
[ "breeches", 10 ],
[ "leather_belt", 30 ],
@@ -3186,6 +3196,7 @@
"type": "item_group",
"id": "traveler",
"items": [
+ [ "daypack", 20 ],
[ "roadmap", 6 ],
[ "trailmap", 6 ],
[ "touristmap", 4 ],
@@ -3710,6 +3721,7 @@
[ "coffee_raw", 15 ],
[ "usb_drive", 5 ],
[ "software_useless", 10 ],
+ [ "software_electronics_reference", 2 ],
[ "umbrella", 5 ],
[ "teleumbrella", 2 ],
[ "gum", 10 ],
@@ -4752,6 +4764,8 @@
"type": "item_group",
"id": "shelter",
"items": [
+ [ "daypack", 10 ],
+ [ "ski_jacket", 40 ],
[ "water_clean", 90 ],
[ "water_mineral", 5 ],
[ "soup_veggy", 15 ],
@@ -4975,9 +4989,12 @@
[ "magnesium", 10 ],
[ "tin", 10 ],
[ "chem_hydrogen_peroxide", 10 ],
+ [ "chem_muriatic_acid", 5 ],
[ "chem_sulphur", 10 ],
[ "chem_aluminium_powder", 5 ],
[ "chem_zinc_powder", 10 ],
+ [ "chem_zinc", 5 ],
+ [ "chem_manganese_dioxide", 10 ],
[ "chem_saltpetre", 10 ],
[ "chem_carbide", 10 ],
[ "denat_alcohol", 10 ]
@@ -5022,6 +5039,9 @@
[ "chem_hydrogen_peroxide", 15 ],
[ "chem_carbide", 10 ],
[ "chem_zinc_powder", 10 ],
+ [ "chem_manganese_dioxide", 5 ],
+ [ "chem_potassium_chloride", 5 ],
+ [ "chem_muriatic_acid", 15 ],
[ "denat_alcohol", 10 ]
]
},
@@ -5080,8 +5100,13 @@
[ "chem_hexamine", 10 ],
[ "chem_saltpetre", 15 ],
[ "chem_nitric_acid", 15 ],
+ [ "chem_muriatic_acid", 20 ],
+ [ "chem_potassium_chloride", 5 ],
+ [ "chem_potassium_hydroxide", 10 ],
+ [ "chem_zinc", 10 ],
[ "chem_chromium_oxide", 10 ],
[ "chem_zinc_powder", 10 ],
+ [ "chem_manganese_dioxide", 5 ],
[ "denat_alcohol", 10 ]
]
},
@@ -5150,6 +5175,47 @@
[ "chem_nitric_acid", 5 ]
]
},
+ {
+ "type": "item_group",
+ "id": "mutagens",
+ "items": [
+ [ "mutagen", 8 ],
+ [ "mutagen_plant", 2 ],
+ [ "mutagen_insect", 2 ],
+ [ "mutagen_spider", 2 ],
+ [ "mutagen_fish", 2 ],
+ [ "mutagen_slime", 2 ],
+ [ "mutagen_rat", 2 ],
+ [ "mutagen_beast", 2 ],
+ [ "mutagen_cattle", 2 ],
+ [ "mutagen_cephalopod", 2 ],
+ [ "mutagen_bird", 2 ],
+ [ "mutagen_lizard", 2 ],
+ [ "mutagen_troglobite", 2 ],
+ [ "mutagen_ursine", 2 ],
+ [ "mutagen_feline", 2 ],
+ [ "mutagen_lupine", 2 ],
+ [ "iv_mutagen", 6 ],
+ [ "iv_mutagen_plant", 2 ],
+ [ "iv_mutagen_insect", 2 ],
+ [ "iv_mutagen_spider", 2 ],
+ [ "iv_mutagen_fish", 2 ],
+ [ "iv_mutagen_slime", 2 ],
+ [ "iv_mutagen_rat", 2 ],
+ [ "iv_mutagen_beast", 2 ],
+ [ "iv_mutagen_cattle", 2 ],
+ [ "iv_mutagen_cephalopod", 2 ],
+ [ "iv_mutagen_bird", 2 ],
+ [ "iv_mutagen_lizard", 2 ],
+ [ "iv_mutagen_troglobite", 2 ],
+ [ "iv_mutagen_ursine", 2 ],
+ [ "iv_mutagen_feline", 2 ],
+ [ "iv_mutagen_lupine", 2 ],
+ [ "purifier", 10 ],
+ [ "iv_purifier", 8 ],
+ [ "syringe", 8 ]
+ ]
+ },
{
"type": "item_group",
"id": "mut_iv",
@@ -5188,8 +5254,10 @@
[ "wrapped_rad_badge", 15 ],
[ "glasses_safety", 40 ],
[ "goggles_welding", 70 ],
+ [ "textbook_atomic_lab", 7 ],
[ "recipe_lab_elec", 15 ],
- [ "recipe_lab_cvd", 15 ],
+ [ "software_electronics_reference", 2 ],
+ [ "recipe_lab_cvd", 8 ],
[ "recipe_mininuke_launch", 5 ],
[ "teleporter", 10 ],
[ "antiparasitic", 5 ],
@@ -5571,6 +5639,7 @@
[ "bio_metabolics", 10 ],
[ "bio_ethanol", 10 ],
[ "bio_torsionratchet", 10 ],
+ [ "bio_fuel_cell_gasoline", 10 ],
[ "bio_tools", 10 ],
[ "bio_ups", 10 ],
[ "bio_flashlight", 10 ],
@@ -5665,6 +5734,7 @@
[ "bio_power_storage", 10 ],
[ "bio_tools", 10 ],
[ "bio_flashlight", 10 ],
+ [ "bio_fuel_cell_gasoline", 10 ],
[ "bio_tattoo_led", 10 ],
[ "bio_lighter", 10 ],
[ "bio_magnet", 10 ],
@@ -5685,10 +5755,8 @@
[ "bot_grenade_hack", 2 ],
[ "bot_flashbang_hack", 2 ],
[ "bot_gasbomb_hack", 2 ],
- [ "bot_turret", 2 ],
[ "bot_rifleturret", 2 ],
- [ "556", 2 ],
- [ "9mm", 2 ]
+ [ "bot_antimateriel", 2 ]
]
},
{
@@ -5728,7 +5796,7 @@
[ "8mm_inc", 6 ],
[ "8mm_caseless", 6 ],
[ "m202_flash", 15 ],
- [ "m235tpa", 15 ],
+ [ "m74_clip", 15 ],
[ "atgm_heat", 1 ],
[ "rm20", 3 ],
[ "20x66_flechette", 4 ],
@@ -5782,7 +5850,7 @@
[ "backpack", 38 ],
[ "UPS_off", 5 ],
[ "adv_UPS_off", 3 ],
- [ "chestrig", 10 ],
+ [ "tacvest", 10 ],
[ "molle_pack", 8 ],
[ "duffelbag", 15 ],
[ "dump_pouch", 20 ],
@@ -5859,7 +5927,7 @@
[ "modularvesthard", 1 ],
[ "winter_jacket_army", 30 ],
[ "vest", 15 ],
- [ "chestrig", 10 ],
+ [ "tacvest", 10 ],
[ "molle_pack", 8 ],
[ "under_armor", 20 ],
[ "power_armor_basic", 5 ],
@@ -6221,7 +6289,7 @@
[ "ammo_satchel", 4 ],
[ "UPS_off", 5 ],
[ "adv_UPS_off", 3 ],
- [ "chestrig", 10 ],
+ [ "tacvest", 10 ],
[ "molle_pack", 8 ],
[ "legrig", 10 ],
[ "rucksack", 20 ],
@@ -6685,6 +6753,7 @@
[ "ak74", 4 ],
[ "an94", 1 ],
[ "m4a1", 7 ],
+ [ "m16a4", 6 ],
[ "h&k416a5", 3 ],
[ "m1014", 1 ],
[ "steyr_aug", 6 ],
@@ -6853,11 +6922,6 @@
"id": "skitterbot",
"items": [ [ "tazer", 3 ], [ "scrap", 9 ] ]
},
- {
- "type": "item_group",
- "id": "secubot",
- "items": [ [ "9mm", 8 ], [ "steel_plate", 30 ] ]
- },
{
"type": "item_group",
"id": "copbot",
@@ -6994,7 +7058,7 @@
[ "radio", 20 ],
[ "UPS_off", 5 ],
[ "adv_UPS_off", 3 ],
- [ "chestrig", 10 ],
+ [ "tacvest", 10 ],
[ "molle_pack", 8 ],
[ "legrig", 10 ],
[ "rucksack", 20 ],
@@ -7154,6 +7218,7 @@
[ "m9", 6 ],
[ "usp_45", 6 ],
[ "m4a1", 7 ],
+ [ "m16a4", 5 ],
[ "h&k416a5", 7 ],
[ "m1014", 2 ],
[ "scar_l", 6 ],
@@ -7193,7 +7258,7 @@
[ "masterkey", 2 ],
[ "rm121aux", 1 ],
[ "shot_flechette", 5 ],
- [ "chestrig", 10 ],
+ [ "tacvest", 10 ],
[ "molle_pack", 8 ],
[ "legrig", 10 ],
[ "power_armor_basic", 5 ],
@@ -7213,7 +7278,7 @@
[ "atgm_launcher", 1 ],
[ "atgm_heat", 1 ],
[ "m202_flash", 2 ],
- [ "m235tpa", 3 ],
+ [ "m74_clip", 3 ],
[ "rm51_assault_rifle", 1 ],
[ "rm88_battle_rifle", 1 ],
[ "rm614_lmg", 1 ],
@@ -7348,6 +7413,10 @@
[ "pocket_firearms", 2 ],
[ "SICP", 3 ],
[ "textbook_robots", 1 ],
+ [ "reference_cooking", 1 ],
+ [ "reference_fabrication1", 1 ],
+ [ "reference_firstaid1", 1 ],
+ [ "reference_firstaid2", 1 ],
[ "recipe_elfa", 1 ],
[ "recipe_maiar", 1 ],
[ "recipe_caseless", 1 ],
@@ -7382,6 +7451,7 @@
[ "bio_soporific", 5 ],
[ "bio_surgical_razor", 5 ],
[ "bio_syringe", 8 ],
+ [ "software_electronics_reference", 10 ],
[ "software_useless", 10 ],
[ "canteen", 15 ],
[ "2lcanteen", 10 ],
@@ -7403,6 +7473,7 @@
[ "tin", 5 ],
[ "chem_nitric_acid", 1 ],
[ "chem_sulphuric_acid", 1 ],
+ [ "chem_muriatic_acid", 2 ],
[ "chem_hexamine", 2 ],
[ "denat_alcohol", 1 ],
[ "remotevehcontrol", 5 ]
@@ -7490,6 +7561,7 @@
"magazine": 100,
"ammo": 50,
"items": [
+ [ "daypack", 20 ],
[ "energy_drink", 55 ],
[ "energy_drink_atomic", 8 ],
[ "knuckle_brass", 30 ],
@@ -7882,7 +7954,7 @@
[ "smart_phone", 10 ],
[ "airhorn", 5 ],
[ "boltcutters", 5 ],
- [ "chestrig", 10 ],
+ [ "tacvest", 10 ],
[ "chainsaw_off", 1 ],
[ "backpack", 15 ],
[ "rope_30", 10 ],
@@ -7988,7 +8060,6 @@
[ "fsurvivor_suit", 4 ],
[ "h20survivor_suit", 2 ],
[ "touring_suit", 16 ],
- [ "armor_bone", 12 ],
[ "armor_larmor", 28 ],
[ "armor_blarmor", 14 ],
[ "armor_farmor", 8 ],
@@ -8078,11 +8149,9 @@
[ "gloves_tactical", 12 ],
[ "gauntlets_larmor", 14 ],
[ "gauntlets_chitin", 2 ],
- [ "gauntlets_bone", 12 ],
[ "armguard_larmor", 7 ],
[ "vambrace_larmor", 6 ],
[ "armguard_chitin", 1 ],
- [ "armguard_bone", 6 ],
[ "armguard_scrap", 12 ],
[ "gloves_fur", 4 ],
[ "gloves_leather", 22 ],
@@ -8108,7 +8177,6 @@
[ "knee_high_boots", 8 ],
[ "boots_combat", 12 ],
[ "boots_larmor", 14 ],
- [ "boots_bone", 22 ],
[ "boots_fur", 22 ],
[ "boots_plate", 2 ],
[ "boots_bunker", 8 ],
@@ -8133,7 +8201,6 @@
[ "helmet_lobster", 8 ],
[ "pot_helmet", 22 ],
[ "helmet_larmor", 14 ],
- [ "helmet_bone", 22 ],
[ "pickelhaube", 1 ],
[ "firehelmet", 2 ],
[ "helmet_barbute", 1 ],
@@ -8148,6 +8215,7 @@
"type": "item_group",
"id": "survivorzed_extra",
"items": [
+ [ "daypack", 4 ],
[ "mask_lsurvivor", 10 ],
[ "mask_survivor", 8 ],
[ "mask_hsurvivor", 6 ],
@@ -8181,7 +8249,7 @@
[ "goggles_ski", 14 ],
[ "goggles_nv", 2 ],
[ "goggles_ir", 1 ],
- [ "chestrig", 22 ],
+ [ "tacvest", 22 ],
[ "legrig", 22 ],
[ "tool_belt", 16 ],
[ "fanny", 12 ],
@@ -9001,6 +9069,7 @@
"//": "Bionics used by technicians.",
"items": [
[ "bio_torsionratchet", 20 ],
+ [ "bio_fuel_cell_gasoline", 10 ],
[ "bio_memory", 20 ],
[ "bio_sunglasses", 20 ],
[ "bio_heatsink", 20 ],
@@ -9195,6 +9264,7 @@
"ammo": 50,
"magazine": 100,
"items": [
+ [ "daypack", 75 ],
[ "rope_30", 10 ],
[ "hatchet", 50 ],
[ "iceaxe", 20 ],
@@ -9508,7 +9578,6 @@
[ "alarmclock", 25 ],
[ "circuit", 25 ],
{ "item": "cell_phone", "prob": 35, "charges-min": 0, "charges-max": 15 },
- { "item": "cell_phone_flashlight", "prob": 25, "charges-min": 0, "charges-max": 15 },
[ "e_scrap", 55 ],
[ "amplifier", 25 ],
[ "reading_light", 10 ]
@@ -9789,6 +9858,7 @@
"type": "item_group",
"items": [
[ "cup_plastic", 20 ],
+ [ "rolling_pin", 20 ],
[ "bowl_plastic", 20 ],
[ "canteen", 10 ],
[ "flask_hip", 15 ],
diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json
index 3c23ebd6677c3..9700e57ffd40a 100644
--- a/data/json/itemgroups/misc.json
+++ b/data/json/itemgroups/misc.json
@@ -118,7 +118,7 @@
{ "item": "pants_army" },
{ "item": "tshirt", "count": 3 },
{ "item": "under_armor" },
- { "item": "chestrig" },
+ { "item": "tacvest" },
{ "item": "coat_rain" },
{ "item": "hood_rain" },
{ "item": "long_underpants" },
diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json
index 34a1e88b9d863..4e60b01825af5 100644
--- a/data/json/itemgroups/supplies.json
+++ b/data/json/itemgroups/supplies.json
@@ -197,6 +197,7 @@
[ "solar_cell", 5 ],
[ "fertilizer_commercial", 30 ],
[ "chem_sulphuric_acid", 30 ],
+ [ "chem_muriatic_acid", 35 ],
[ "peephole", 25 ],
[ "chem_chromium_oxide", 5 ],
[ "chem_zinc_powder", 5 ],
@@ -229,6 +230,7 @@
[ "chem_saltpetre", 10 ],
[ "chem_nitric_acid", 10 ],
[ "chem_sulphuric_acid", 10 ],
+ [ "chem_muriatic_acid", 10 ],
[ "chem_acetic_acid", 10 ],
[ "chem_formaldehyde", 10 ],
[ "chem_acetone", 10 ],
@@ -236,6 +238,7 @@
[ "chem_ammonium_nitrate", 10 ],
[ "chem_chromium_oxide", 10 ],
[ "chem_zinc_powder", 10 ],
+ [ "chem_manganese_dioxide", 10 ],
[ "chem_hydrogen_peroxide_conc", 10 ],
[ "material_rocksalt", 2 ],
[ "ether", 10 ],
diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
index 80806cb9b1c5b..88c900ff246bc 100644
--- a/data/json/itemgroups/tools.json
+++ b/data/json/itemgroups/tools.json
@@ -383,6 +383,45 @@
[ "acetylene_machine", 1 ]
]
},
+ {
+ "type": "item_group",
+ "id": "tools_robotics",
+ "//": "tools and equipment you might find on robotics laboratories.",
+ "items": [
+ [ "recipe_lab_elec", 4 ],
+ [ "UPS_off", 6 ],
+ [ "file", 10 ],
+ [ "atomic_lamp", 1 ],
+ [ "control_laptop", 1 ],
+ [ "bot_manhack", 2 ],
+ [ "teleporter", 1 ],
+ [ "laptop", 4 ],
+ [ "plut_cell", 4 ],
+ [ "superglue", 30 ],
+ [ "pliers", 10 ],
+ [ "matches", 10 ],
+ [ "glasses_safety", 20 ],
+ [ "duct_tape", 8 ],
+ [ "misc_repairkit", 15 ],
+ [ "welder", 10 ],
+ [ "soldering_iron", 8 ],
+ [ "extinguisher", 10 ],
+ [ "magnifying_glass", 10 ],
+ [ "multitool", 20 ],
+ [ "screwdriver_set", 20 ],
+ [ "flashlight", 20 ],
+ [ "mobile_memory_card_science", 40 ],
+ [ "camera_pro", 2 ],
+ [ "element", 5 ],
+ [ "battery", 10 ],
+ [ "goggles_welding", 20 ],
+ [ "sm_extinguisher", 10 ],
+ [ "toolbox", 5 ],
+ [ "tool_belt", 10 ],
+ [ "hand_vice", 10 ],
+ [ "wrench", 10 ]
+ ]
+ },
{
"id": "hand_tools",
"type": "item_group",
diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
index 395f900bfd195..0ad101a1fb855 100644
--- a/data/json/items/ammo.json
+++ b/data/json/items/ammo.json
@@ -32,7 +32,7 @@
"material": [ "steel", "plastic", "lead" ],
"flags": [ "LEAK_DAM", "RADIOACTIVE" ],
"volume": "250 ml",
- "weight": 160
+ "weight": "160 g"
},
{
"type": "TOOL",
@@ -46,7 +46,7 @@
"material": [ "steel", "lead" ],
"flags": [ "LEAK_DAM", "RADIOACTIVE" ],
"volume": "500 ml",
- "weight": 4000
+ "weight": "4000 g"
},
{
"type": "AMMO",
@@ -59,7 +59,7 @@
"description": "A thin foil made of aluminum. Sometimes called 'tin foil' due to being made of tin in the past.",
"material": "aluminum",
"volume": 0,
- "weight": 4,
+ "weight": "4 g",
"ammo_type": "components",
"count": 200
},
@@ -88,7 +88,7 @@
"material": "cotton",
"flags": [ "NO_SALVAGE" ],
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "thread",
"count": 50,
"stack_size": 200
@@ -104,7 +104,7 @@
"description": "A tough sinew cut from a corpse, usable as thread.",
"material": "flesh",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "thread",
"count": 10,
"stack_size": 200
@@ -120,7 +120,7 @@
"description": "Tough thin fiber, taken from a plant. Can be used as thread.",
"material": "veggy",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "thread",
"count": 10,
"stack_size": 200
@@ -136,7 +136,7 @@
"description": "Wool yarn, could be used to knit wool clothing.",
"material": "wool",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "thread",
"count": 10,
"stack_size": 200
@@ -151,7 +151,7 @@
"color": "white",
"description": "A cleansing agent made into bars.",
"volume": "250 ml",
- "weight": 90,
+ "weight": "90 g",
"ammo_type": "soap",
"count": 10,
"stack_size": 10
@@ -167,7 +167,7 @@
"description": "A roll of incredibly strong tape. Its uses are innumerable.",
"material": "plastic",
"volume": "250 ml",
- "weight": 4,
+ "weight": "4 g",
"ammo_type": "tape",
"count": 200,
"flags": [ "UNRECOVERABLE" ]
@@ -182,7 +182,7 @@
"description": "These are thin paper strips intended for the rolling of cigarettes.",
"price": 150,
"material": "paper",
- "weight": 1,
+ "weight": "1 g",
"volume": "100ml",
"ammo_type": "components",
"stack_size": 200,
@@ -200,7 +200,7 @@
"description": "Plastic jacketed copper cable of the type used in small electronics.",
"material": [ "plastic", "copper" ],
"volume": "750 ml",
- "weight": 2,
+ "weight": "2 g",
"ammo_type": "components",
"count": 200
},
@@ -216,7 +216,7 @@
"material": [ "steel", "plastic" ],
"flags": [ "LEAK_DAM", "RADIOACTIVE" ],
"volume": "250 ml",
- "weight": 80,
+ "weight": "80 g",
"ammo_type": "plutonium",
"count": 5,
"effects": [ "COOKOFF", "NEVER_MISFIRES" ],
@@ -233,7 +233,7 @@
"description": "Highly radioactive slurry. It is probably best to get far away from this.",
"flags": [ "LEAK_ALWAYS", "RADIOACTIVE" ],
"volume": "250 ml",
- "weight": 26,
+ "weight": "25500 mg",
"ammo_type": "reactor_slurry",
"phase": "liquid",
"container": "metal_tank_little",
@@ -250,7 +250,7 @@
"description": "Highly radioactive slurry. It is probably best to get far away from this.",
"flags": [ "LEAK_ALWAYS", "RADIOACTIVE" ],
"volume": "250 ml",
- "weight": 25.5,
+ "weight": "25500 mg",
"ammo_type": "reactor_slurry",
"phase": "liquid",
"container": "metal_tank_little",
@@ -266,7 +266,7 @@
"description": "A handful of pebbles, useful as ammunition for slings or slingshots.",
"material": "stone",
"volume": "250 ml",
- "weight": 5,
+ "weight": "5 g",
"ammo_type": "pebble",
"damage": 2,
"range": 10,
@@ -285,7 +285,7 @@
"description": "A handful of round projectiles made of clay, useful for slings or slingshots.",
"material": "clay",
"volume": "250 ml",
- "weight": 3,
+ "weight": "3 g",
"ammo_type": "pebble",
"damage": 1,
"range": 20,
@@ -304,7 +304,7 @@
"description": "A handful of glass marbles, useful as ammunition for slings or slingshots.",
"material": "glass",
"volume": "250 ml",
- "weight": 3,
+ "weight": "3 g",
"ammo_type": "pebble",
"damage": 3,
"range": 18,
@@ -324,7 +324,7 @@
"description": "A box of ball bearings, useful as ammunition for slings or slingshots.",
"material": "steel",
"volume": "250 ml",
- "weight": 10,
+ "weight": "10 g",
"ammo_type": "pebble",
"damage": 6,
"pierce": 1,
@@ -344,7 +344,7 @@
"description": "A box of small steel balls. They deal virtually no damage.",
"material": "steel",
"volume": "200ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "BB",
"damage": 2,
"dispersion": 100,
@@ -364,7 +364,7 @@
"description": "Feathers from a bird. Useful for fletching arrows.",
"material": "cotton",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "components",
"stack_size": 100,
"count": 20
@@ -380,7 +380,7 @@
"description": "Fluffy down feathers from a bird. Useful for making cozy bedclothes.",
"material": "cotton",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "components",
"stack_size": 100,
"count": 20
@@ -395,7 +395,7 @@
"description": "A 60mm high-explosive anti-tank round. It could blow through up to two feet of concrete.",
"material": [ "steel", "powder" ],
"volume": "250 ml",
- "weight": 1803,
+ "weight": "1803 g",
"ammo_type": "66mm",
"damage": 2500,
"pierce": 400,
@@ -414,7 +414,7 @@
"description": "A 120mm high-explosive anti-tank round. It could ruin anyone's whole day.",
"material": [ "steel", "powder" ],
"volume": "250 ml",
- "weight": 1803,
+ "weight": "1803 g",
"ammo_type": "120mm",
"damage": 40,
"pierce": 10,
@@ -434,7 +434,7 @@
"description": "A canister of pressurized hydrogen so heavily compressed it has turned solid. With proper equipment, it could be heated to plasma.",
"material": [ "steel", "powder" ],
"volume": "2500 ml",
- "weight": 183,
+ "weight": "183 g",
"ammo_type": "plasma",
"damage": 35,
"pierce": 14,
@@ -459,7 +459,7 @@
"description": "An unfired, like-new .22 round casing, with the primer still intact.",
"material": [ "powder", "brass" ],
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "components",
"count": 200,
"effects": [ "COOKOFF" ]
@@ -477,7 +477,7 @@
"material": "powder",
"flags": [ "TINDER" ],
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "components",
"count": 454,
"effects": [ "COOKOFF" ]
@@ -542,7 +542,7 @@
"container": "bottle_plastic_small",
"material": "powder",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "components",
"count": 200,
"effects": [ "COOKOFF" ]
@@ -559,7 +559,7 @@
"container": "bottle_plastic_small",
"material": "powder",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "components",
"count": 200
},
@@ -574,7 +574,7 @@
"description": "Primer from a shotgun shell.",
"material": [ "steel", "powder" ],
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "components",
"count": 200,
"effects": [ "COOKOFF" ]
@@ -590,7 +590,7 @@
"description": "Primer from a small caliber pistol round.",
"material": [ "steel", "powder" ],
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "components",
"count": 200,
"effects": [ "COOKOFF" ]
@@ -606,7 +606,7 @@
"description": "Primer from a large caliber pistol round.",
"material": [ "steel", "powder" ],
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "components",
"count": 200,
"effects": [ "COOKOFF" ]
@@ -622,7 +622,7 @@
"description": "Primer from a small caliber rifle round.",
"material": [ "steel", "powder" ],
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "components",
"count": 200,
"effects": [ "COOKOFF" ]
@@ -638,7 +638,7 @@
"description": "Primer from a large caliber rifle round.",
"material": [ "steel", "powder" ],
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "components",
"count": 200,
"effects": [ "COOKOFF" ]
@@ -654,7 +654,7 @@
"description": "Rubber slugs from a shotgun beanbag round. You could use them to make new beanbag rounds.",
"material": "plastic",
"volume": "250 ml",
- "weight": 2,
+ "weight": "2 g",
"ammo_type": "components",
"count": 25
},
@@ -669,7 +669,7 @@
"description": "Copper scraps. Could be used to craft something, for example makeshift shotgun shells.",
"material": "copper",
"volume": "250 ml",
- "weight": 2,
+ "weight": "2 g",
"ammo_type": "components",
"count": 200
},
@@ -684,7 +684,7 @@
"description": "A roll of medical tape, similar to duct tape.",
"material": "plastic",
"volume": "250 ml",
- "weight": 3,
+ "weight": "3 g",
"ammo_type": "components",
"count": 35
},
@@ -698,7 +698,7 @@
"description": "93mm single-stage high-explosive ammunition for the RPG-7.",
"material": [ "steel", "powder" ],
"volume": "1750 ml",
- "weight": 2600,
+ "weight": "2600 g",
"ammo_type": "RPG-7",
"damage": 3000,
"pierce": 750,
@@ -717,7 +717,7 @@
"description": "64mm/105mm high-explosive tandem ammunition for the RPG-7.",
"material": [ "steel", "powder" ],
"volume": "2250 ml",
- "weight": 4500,
+ "weight": "4500 g",
"ammo_type": "RPG-7",
"damage": 3250,
"pierce": 1450,
@@ -736,7 +736,7 @@
"description": "105mm thermobaric ammunition for the RPG-7.",
"material": [ "plastic", "powder" ],
"volume": "2250 ml",
- "weight": 4500,
+ "weight": "4500 g",
"ammo_type": "RPG-7",
"damage": 150,
"pierce": 10,
@@ -755,7 +755,7 @@
"description": "40mm high-explosive fragmentation antipersonnel ammunition for the RPG-7.",
"material": [ "steel", "powder" ],
"volume": "1 L",
- "weight": 2000,
+ "weight": "2000 g",
"ammo_type": "RPG-7",
"damage": 80,
"pierce": 10,
@@ -764,27 +764,6 @@
"recoil": 350,
"effects": [ "COOKOFF", "TRAIL", "NEVER_MISFIRES", "FRAG" ]
},
- {
- "type": "AMMO",
- "id": "m235tpa",
- "price": 200000,
- "//": "$500 per. Cheap!",
- "name": "M235 66mm TPA rocket",
- "symbol": "=",
- "color": "dark_gray",
- "description": "66mm incendiary rockets used in the M202 FLASH rocket launcher. Their warheads are filled with a thickened pyrophoric agent, which burns at 2200 degrees Fahrenheit.",
- "material": [ "steel", "powder" ],
- "volume": "2 L",
- "weight": 1140,
- "ammo_type": "m235",
- "damage": 60,
- "pierce": 10,
- "range": 70,
- "dispersion": 150,
- "recoil": 150,
- "count": 4,
- "effects": [ "COOKOFF", "NAPALM_BIG", "TRAIL", "NEVER_MISFIRES" ]
- },
{
"type": "AMMO",
"id": "generic_no_ammo",
@@ -809,7 +788,7 @@
"material": "wood",
"phase": "solid",
"volume": "250 ml",
- "weight": 11,
+ "weight": "11 g",
"ammo_type": "charcoal",
"count": 50,
"stack_size": 10,
@@ -828,7 +807,7 @@
"material": "cac2powder",
"phase": "solid",
"volume": "250 ml",
- "weight": 11,
+ "weight": "11 g",
"ammo_type": "cac2powder",
"count": 25,
"stack_size": 10,
@@ -846,7 +825,7 @@
"material": "wood",
"phase": "solid",
"volume": "250 ml",
- "weight": 44,
+ "weight": "44 g",
"ammo_type": "charcoal",
"count": 250,
"stack_size": 10,
@@ -863,7 +842,7 @@
"description": "A heavily modified handheld nuclear device on a rocket. Intended to be fired from a specialized launcher, it has been rigged to explode on impact instead of on a timer. It can fly further than the explosion will reach, probably.",
"material": "plastic",
"volume": "97 L",
- "weight": 34500,
+ "weight": "34500 g",
"bashing": 8,
"ammo_type": "mininuke_mod",
"damage": 14,
@@ -881,7 +860,7 @@
"description": "A tiny glass vial filled with advanced fast-healing chemicals which can only be activated by a Rivtech jet injector device. A label on the side warns against using more than two doses per hour.",
"material": "glass",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "ampoule",
"count": 2,
"stack_size": 20
@@ -897,7 +876,7 @@
"description": "A pressurized multi-chamber glass vial filled with powerful chemical stimulants which can only be activated by a Rivtech stimulant delivery system.",
"material": "glass",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "stimpack_ammo",
"count": 5,
"stack_size": 10
@@ -913,7 +892,7 @@
"description": "A replacement filter cartridge for a rebreather.",
"material": "aluminum",
"volume": "250 ml",
- "weight": 12,
+ "weight": "12 g",
"ammo_type": "rebreather_filter",
"count": 30
},
@@ -927,7 +906,7 @@
"color": "light_gray",
"description": "Small replacement filter cartridge for air filtration masks.",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "gasfilter_s",
"count": 100
},
@@ -941,7 +920,7 @@
"color": "light_gray",
"description": "Medium replacement filter cartridge for air filtration masks.",
"volume": "250 ml",
- "weight": 2,
+ "weight": "2 g",
"ammo_type": "gasfilter_m",
"count": 100
},
@@ -955,7 +934,7 @@
"color": "light_gray",
"description": "Heavy replacement filter cartridge for air filtration masks.",
"volume": "250 ml",
- "weight": 3,
+ "weight": "3 g",
"ammo_type": "gasfilter_l",
"count": 100
},
@@ -971,7 +950,7 @@
"container": "bottle_plastic_small",
"phase": "liquid",
"volume": "250 ml",
- "weight": 2,
+ "weight": "2 g",
"ammo_type": "components",
"count": 50
},
@@ -981,7 +960,7 @@
"category": "spare_parts",
"name": "fish bait",
"description": "A bait used in traps to lure fish.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"symbol": "=",
"color": "light_red",
@@ -1002,7 +981,7 @@
"description": "A canister of oxygen.",
"material": "steel",
"volume": "2500 ml",
- "weight": 1183,
+ "weight": "1183 g",
"ammo_type": "oxygen",
"count": 10
},
@@ -1016,7 +995,7 @@
"description": "A hand-built rocket, consisting of a spike welded onto a pipe that was filled with improvised rocket fuel. Horribly inaccurate, as can be expected of this grade of weapon, but packs a fierce punch... if it hits.",
"material": [ "steel", "powder" ],
"volume": "1500 ml",
- "weight": 1510,
+ "weight": "1510 g",
"ammo_type": "homebrew_rocket",
"damage": 80,
"pierce": 80,
@@ -1035,7 +1014,7 @@
"description": "A hand-built rocket, consisting of a simple explosive warhead attached onto a pipe, filled with improvised rocket fuel. Not very powerful, but can be made from scratch.",
"material": [ "steel", "powder" ],
"volume": "1250 ml",
- "weight": 990,
+ "weight": "990 g",
"ammo_type": "homebrew_rocket",
"damage": 500,
"pierce": 125,
@@ -1054,7 +1033,7 @@
"description": "A hand-built rocket, consisting of a container of flammable gel attached onto a pipe, filled with improvised rocket fuel. Short-range incendiary - handle with care!",
"material": [ "steel", "powder" ],
"volume": "1500 ml",
- "weight": 1190,
+ "weight": "1190 g",
"ammo_type": "homebrew_rocket",
"damage": 50,
"pierce": 15,
@@ -1074,7 +1053,7 @@
"description": "The result of an interrupted charcoal making process. Useless, except as fuel in a charcoal kiln.",
"material": "wood",
"volume": "250 ml",
- "weight": 300,
+ "weight": "300 g",
"ammo_type": "unfinished_char"
},
{
@@ -1088,7 +1067,7 @@
"description": "The incomplete process of converting coal and lime into calcium carbide. Useless in this state/",
"material": "cac2powder",
"volume": "250 ml",
- "weight": 300,
+ "weight": "300 g",
"ammo_type": "unfinished_cac2"
},
{
@@ -1102,7 +1081,7 @@
"description": "Small metal rings, suitable for constructing chainmail.",
"material": "iron",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "components",
"count": 150
},
@@ -1118,7 +1097,7 @@
"container": "bottle_plastic",
"description": "Mixture of oxygen and nitrogen in proportions suitable for diving.",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"phase": "gas",
"ammo_type": "nitrox"
},
@@ -1129,7 +1108,7 @@
"name": "tinder",
"name_plural": "tinder",
"description": "Flammable material, finely divided for easy combustion.",
- "weight": 10,
+ "weight": "10 g",
"volume": "250 ml",
"price": 0,
"bashing": 1,
@@ -1153,7 +1132,7 @@
"description": "A die used to play various role-playing games.",
"material": "plastic",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "pebble",
"damage": 1,
"range": 20,
@@ -1175,7 +1154,7 @@
"description": "A metal die used to play various role-playing games",
"material": "zinc",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "pebble",
"damage": 3,
"range": 15,
@@ -1192,7 +1171,7 @@
"name": "bronze",
"name_plural": "bronze",
"description": "Decent-sized chunks of bronze, for fashioning some old-school items.",
- "weight": 218,
+ "weight": "218 g",
"volume": "250 ml",
"price": 1200,
"to_hit": -2,
diff --git a/data/json/items/ammo/10mm.json b/data/json/items/ammo/10mm.json
index e2b01b2cf98d8..721590fdbbeea 100644
--- a/data/json/items/ammo/10mm.json
+++ b/data/json/items/ammo/10mm.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": "10mm Auto FMJ",
"description": "A jacketed 10mm Auto round. The 10mm Auto cartridge is a rather powerful handgun round and the progenitor to the more popular .40 S&W.",
- "weight": 9,
+ "weight": "9 g",
"volume": "250 ml",
- "price": 2800,
+ "price": 400,
+ "price_postapoc": 2800,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "yellow",
diff --git a/data/json/items/ammo/12mm.json b/data/json/items/ammo/12mm.json
index 75de52d2669bc..0be1d7d872e84 100644
--- a/data/json/items/ammo/12mm.json
+++ b/data/json/items/ammo/12mm.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": "H&K 12mm",
"description": "The Heckler & Koch 12mm projectiles are used in H&K railguns. It's made of a ferromagnetic metal, probably cobalt.",
- "weight": 11,
+ "weight": "11 g",
"volume": "250 ml",
- "price": 50000,
+ "price": 6000,
+ "price_postapoc": 50000,
"material": [ "steel" ],
"symbol": "=",
"color": "blue",
diff --git a/data/json/items/ammo/20x66mm.json b/data/json/items/ammo/20x66mm.json
index 319b8a5985316..83a4c53ef46f8 100644
--- a/data/json/items/ammo/20x66mm.json
+++ b/data/json/items/ammo/20x66mm.json
@@ -5,7 +5,8 @@
"type": "AMMO",
"name": "20x66mm beanbag",
"description": "20x66mm caseless shotgun rounds, sublethal beanbag type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.",
- "price": 25000,
+ "price": 8000,
+ "price_postapoc": 25000,
"count": 10,
"proportional": { "damage": 0.1, "recoil": 0.4, "loudness": 0.6 },
"extend": { "effects": [ "LARGE_BEANBAG", "NOGIB" ] }
@@ -46,7 +47,8 @@
"type": "AMMO",
"name": "20x66mm explosive",
"description": "20x66mm caseless shotgun rounds, explosive projectile type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.",
- "price": 80000,
+ "price": 10000,
+ "price_postapoc": 80000,
"range": 20,
"damage": 16,
"pierce": 4,
@@ -59,7 +61,8 @@
"type": "AMMO",
"name": "20x66mm flare",
"description": "20x66mm caseless shotgun rounds, signal flare type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.",
- "price": 20000,
+ "price": 5000,
+ "price_postapoc": 20000,
"count": 10,
"range": 20,
"damage": 16,
@@ -74,7 +77,8 @@
"type": "AMMO",
"name": "20x66mm flechette",
"description": "20x66mm caseless shotgun rounds, flechette type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.",
- "price": 55000,
+ "price": 4000,
+ "price_postapoc": 55000,
"count": 10,
"relative": { "damage": -10, "pierce": 20 }
},
@@ -84,7 +88,8 @@
"type": "AMMO",
"name": "20x66mm frag",
"description": "20x66mm caseless shotgun rounds, explosive fragmentation type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.",
- "price": 90000,
+ "price": 7800,
+ "price_postapoc": 90000,
"count": 5,
"proportional": { "damage": 0.25, "pierce": 0.25 },
"extend": { "effects": [ "FRAG" ] }
@@ -95,7 +100,8 @@
"type": "AMMO",
"name": "20x66mm incendiary",
"description": "20x66mm caseless shotgun rounds, incendiary type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.",
- "price": 100000,
+ "price": 10500,
+ "price_postapoc": 100000,
"count": 10,
"extend": { "effects": [ "INCENDIARY" ] }
},
@@ -105,9 +111,10 @@
"name": "20x66mm buckshot",
"//": "2.5x the Generic Rate of $1/shot",
"description": "20x66mm caseless shotgun rounds, buckshot type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.",
- "weight": 56,
+ "weight": "56 g",
"volume": "250 ml",
- "price": 9000,
+ "price": 1500,
+ "price_postapoc": 9000,
"material": [ "steel", "powder" ],
"symbol": "=",
"color": "pink",
@@ -125,7 +132,8 @@
"type": "AMMO",
"name": "20x66mm slug",
"description": "20x66mm caseless shotgun rounds, solid projectile type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.",
- "price": 9000,
+ "price": 1500,
+ "price_postapoc": 9000,
"relative": { "range": 12, "pierce": 8 },
"proportional": { "damage": 0.65, "dispersion": 1.3 },
"delete": { "effects": [ "SHOT" ] }
diff --git a/data/json/items/ammo/22.json b/data/json/items/ammo/22.json
index e8a9d80629bda..32fae3cfab18d 100644
--- a/data/json/items/ammo/22.json
+++ b/data/json/items/ammo/22.json
@@ -5,7 +5,8 @@
"type": "AMMO",
"name": ".22 CB",
"description": "The .22 Conical Ball is a variety of .22 ammunition that propels its bullet using a primer instead of gunpowder. The end result is a subsonic round that is so weak as to be nearly useless given your predicament.",
- "price": 1800,
+ "price": 100,
+ "price_postapoc": 1800,
"count": 100,
"stack_size": 150,
"recoil": 39,
@@ -25,9 +26,10 @@
"type": "AMMO",
"name": ".22 LR",
"description": ".22 Long Rifle ammunition with 40gr unjacketed bullets. The .22LR round is extremely weak with very low stopping power, short range, and negligible recoil. It is most useful for rifle training, and hunting small animals.",
- "weight": 3,
+ "weight": "3 g",
"volume": "250 ml",
- "price": 2500,
+ "price": 150,
+ "price_postapoc": 2500,
"material": [ "brass", "lead", "powder" ],
"symbol": "=",
"color": "yellow",
diff --git a/data/json/items/ammo/223.json b/data/json/items/ammo/223.json
index 77d256b8af9db..998d5146b6055 100644
--- a/data/json/items/ammo/223.json
+++ b/data/json/items/ammo/223.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".223 Remington",
"description": ".223 Remington ammunition with 36gr JHP bullets. The .223 round has been very popular with civilian shooters for almost a century, finding use in a wide variety of weapons. It generates lower pressure than 5.56 NATO leading to slightly decreased accuracy and recoil.",
- "weight": 12,
+ "weight": "12 g",
"volume": "250 ml",
- "price": 6580,
+ "price": 280,
+ "price_postapoc": 6580,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "yellow",
@@ -27,7 +28,8 @@
"type": "AMMO",
"name": "5.56 NATO M855A1",
"description": "5.56x45mm ammunition with a 62gr FMJ bullet containing a steel penetrator. Its light weight, high accuracy, and manageable recoil lead to widespread use in the 20th century and it remains popular among militaries and civilians.",
- "price": 8225,
+ "price": 290,
+ "price_postapoc": 8225,
"relative": { "damage": -2, "pierce": 4, "dispersion": -10 },
"proportional": { "recoil": 1.1 },
"extend": { "effects": [ "NEVER_MISFIRES" ] }
diff --git a/data/json/items/ammo/270win.json b/data/json/items/ammo/270win.json
index d8bbe8a075041..f0c4b020e7d64 100644
--- a/data/json/items/ammo/270win.json
+++ b/data/json/items/ammo/270win.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".270 Winchester JSP",
"description": ".270 Winchester ammunition with 130gr soft point bullets. The .270 round was not initially successful, but over a few decades it became one of the most popular rifle cartridges for hunting and silhouette shooting. It is a powerful round capable of taking down large targets with ease.",
- "weight": 20,
+ "weight": "20 g",
"volume": "250 ml",
- "price": 1700,
+ "price": 170,
+ "price_postapoc": 1700,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "yellow",
diff --git a/data/json/items/ammo/300.json b/data/json/items/ammo/300.json
index 25b12948fafb0..02bb4e9331268 100644
--- a/data/json/items/ammo/300.json
+++ b/data/json/items/ammo/300.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".300 Winchester Magnum",
"description": ".300 Winchester Magnum rounds with 220gr JHP bullets. The 300WM round is an extremely powerful and accurate rifle round introduced in 1963. It has proven popular with hunters and snipers, although it is not as common as .308 or .30-06.",
- "weight": 28,
+ "weight": "28 g",
"volume": "250 ml",
- "price": 2500,
+ "price": 220,
+ "price_postapoc": 2500,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "yellow",
diff --git a/data/json/items/ammo/3006.json b/data/json/items/ammo/3006.json
index bdc90cb5d4ad5..0885789abb5e6 100644
--- a/data/json/items/ammo/3006.json
+++ b/data/json/items/ammo/3006.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".30-06 Springfield",
"description": ".30-06 Springfield rounds with 165gr soft point bullets. The .30-06 cartridge has excellent accuracy, range, and stopping power making it popular with hunters and snipers for well over a century.",
- "weight": 20,
+ "weight": "20 g",
"volume": "250 ml",
- "price": 1200,
+ "price": 160,
+ "price_postapoc": 1200,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "yellow",
diff --git a/data/json/items/ammo/300blk.json b/data/json/items/ammo/300blk.json
index 6ffd31c9068f9..8751dfc2fd085 100644
--- a/data/json/items/ammo/300blk.json
+++ b/data/json/items/ammo/300blk.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".300 AAC Blackout",
"description": "A .300 AAC Blackout round with a 125gr open tip match bullet. 300 BLK is an intermediate cartridge necked up from 5.56x45mm, designed to achieve similar ballistics to 7.62x39mm. It is compatible with standard AR-15 lower receivers and will feed from STANAG magazines.",
- "weight": 18,
+ "weight": "18 g",
"volume": "250 ml",
- "price": 3500,
+ "price": 290,
+ "price_postapoc": 3500,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "yellow",
@@ -27,7 +28,7 @@
"type": "AMMO",
"name": ".300 AAC Blackout",
"description": "A subsonic .300 AAC Blackout round with a 220gr open tip match bullet. 300 BLK is an intermediate cartridge necked up from 5.56x45mm, designed to achieve similar ballistics to 7.62x39mm. It is compatible with standard AR-15 lower receivers and will feed from STANAG magazines.",
- "weight": 21,
+ "weight": "21 g",
"range": 40,
"damage": 26,
"recoil": 1700
diff --git a/data/json/items/ammo/308.json b/data/json/items/ammo/308.json
index 6e533af4e1ac5..11bebadd1ec9c 100644
--- a/data/json/items/ammo/308.json
+++ b/data/json/items/ammo/308.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".308 Winchester",
"description": ".308 Winchester ammunition with 168gr hollow point bullets. The .308 round is one of the most popular hunting cartridges in the world due to its accuracy and power.",
- "weight": 18,
+ "weight": "18 g",
"volume": "250 ml",
- "price": 2200,
+ "price": 180,
+ "price_postapoc": 2200,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "yellow",
diff --git a/data/json/items/ammo/32.json b/data/json/items/ammo/32.json
index dfaf1be60a6cb..fe491863974f3 100644
--- a/data/json/items/ammo/32.json
+++ b/data/json/items/ammo/32.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".32 ACP",
"description": "The .32 ACP was a popular handgun cartridge in the 20th century. Not so powerful as the .38 or the 9x19mm though.",
- "weight": 5,
+ "weight": "5 g",
"volume": "250 ml",
- "price": 1800,
+ "price": 160,
+ "price_postapoc": 1800,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "yellow",
@@ -20,6 +21,15 @@
"recoil": 150,
"effects": [ "COOKOFF" ]
},
+ {
+ "id": "bp_32_acp",
+ "copy-from": "32_acp",
+ "type": "AMMO",
+ "name": ".32 ACP blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
{
"id": "reloaded_32_acp",
"copy-from": "32_acp",
diff --git a/data/json/items/ammo/357mag.json b/data/json/items/ammo/357mag.json
index be55b8d390574..a7d4223f4fdc1 100644
--- a/data/json/items/ammo/357mag.json
+++ b/data/json/items/ammo/357mag.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".357 magnum FMJ",
"description": "Jacketed .357 magnum ammunition. The .357 magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.",
- "weight": 8,
+ "weight": "8 g",
"volume": "250 ml",
- "price": 4000,
+ "price": 140,
+ "price_postapoc": 4000,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "light_gray",
diff --git a/data/json/items/ammo/357sig.json b/data/json/items/ammo/357sig.json
index 8bc672c2dcc91..493e663c5e909 100644
--- a/data/json/items/ammo/357sig.json
+++ b/data/json/items/ammo/357sig.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".357 SIG FMJ",
"description": "Jacketed .357 SIG ammunition. The .357 SIG round is a high velocity pistol cartridge, giving it a flatter trajectory than many handgun rounds.",
- "weight": 8,
+ "weight": "8 g",
"volume": "250 ml",
- "price": 4000,
+ "price": 370,
+ "price_postapoc": 4000,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "light_gray",
diff --git a/data/json/items/ammo/36paper.json b/data/json/items/ammo/36paper.json
index ede1918af7abe..6d913775b573b 100644
--- a/data/json/items/ammo/36paper.json
+++ b/data/json/items/ammo/36paper.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".36 paper cartridge",
"description": "A paper cartridge containing a premeasured amount of black powder and a .36 projectile. Used by the Colt M1861 Navy.",
- "weight": 6,
+ "weight": "6 g",
"volume": "250 ml",
- "price": 5000,
+ "price": 400,
+ "price_postapoc": 5000,
"material": [ "paper", "powder", "lead" ],
"symbol": "=",
"color": "white",
@@ -16,6 +17,6 @@
"damage": 19,
"dispersion": 80,
"recoil": 210,
- "effects": [ "COOKOFF", "MUZZLE_SMOKE" ]
+ "effects": [ "COOKOFF", "MUZZLE_SMOKE", "BLACKPOWDER" ]
}
]
diff --git a/data/json/items/ammo/38.json b/data/json/items/ammo/38.json
index c2ff69713b2e5..d57bd7e03bd2f 100644
--- a/data/json/items/ammo/38.json
+++ b/data/json/items/ammo/38.json
@@ -12,9 +12,10 @@
"type": "AMMO",
"name": ".38 Special",
"description": ".38 Special ammunition with 130gr FMJ bullets. The .38 Special round was extremely common among US police forces during the 20th century.",
- "weight": 8,
+ "weight": "8 g",
"volume": "250 ml",
- "price": 2200,
+ "price": 210,
+ "price_postapoc": 2200,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "yellow",
@@ -34,7 +35,8 @@
"type": "AMMO",
"name": ".38 Super",
"description": ".38 Super ammunition with 90gr JHP bullets. Designed in 1929, the .38 super cartridge was designed to penetrate body armor and vehicles.",
- "price": 2700,
+ "price": 240,
+ "price_postapoc": 2700,
"count": 20,
"relative": { "damage": 5, "pierce": 4, "dispersion": -10 },
"proportional": { "recoil": 1.5 }
@@ -66,14 +68,22 @@
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
},
+ {
+ "id": "bp_38_fmj",
+ "copy-from": "38_fmj",
+ "type": "AMMO",
+ "name": ".38 FMJ blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
{
"id": "bp_38_special",
"copy-from": "38_special",
"type": "AMMO",
- "name": "blackpowder .38 Special",
- "description": "This .38 Special cartridge is loaded with a 200gr cast lead hollowpoint and 23gr of blackpowder. While it's much slower than a regular .38, it has tremendous stopping power.",
- "proportional": { "price": 0.6, "damage": 1.15, "dispersion": 1.3 },
- "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
+ "name": ".38 Special blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
}
]
diff --git a/data/json/items/ammo/380.json b/data/json/items/ammo/380.json
index 7310db6f7acc3..89915fb3a3ce4 100644
--- a/data/json/items/ammo/380.json
+++ b/data/json/items/ammo/380.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".380 ACP FMJ",
"description": ".380 ACP ammunition with a brass jacketed 95gr bullet. Popular in pocket pistols for over a century, it is often considered the weakest caliber to consider carrying. One should be careful not to chamber it in 9x18mm Makarov or 9x19mm firearms.",
- "weight": 6,
+ "weight": "6 g",
"volume": "250 ml",
- "price": 2600,
+ "price": 140,
+ "price_postapoc": 2600,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "yellow",
@@ -35,11 +36,30 @@
"type": "AMMO",
"name": ".380 ACP +P",
"description": "Overpressure .380 ACP ammunition with a 90gr jacketed hollow point bullet. These defensive loadings are designed to maximize performance and tend to be more accurate than practice ammo. One should be careful not to chamber it in 9x18mm Makarov or 9x19mm firearms.",
- "price": 3800,
+ "price": 190,
+ "price_postapoc": 3800,
"count": 25,
"relative": { "damage": 4, "pierce": 2, "dispersion": -15 },
"proportional": { "recoil": 1.1 }
},
+ {
+ "id": "bp_380_FMJ",
+ "copy-from": "380_FMJ",
+ "type": "AMMO",
+ "name": ".380 ACP FMJ blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
+ {
+ "id": "bp_380_JHP",
+ "copy-from": "380_JHP",
+ "type": "AMMO",
+ "name": ".380 ACP JHP blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
{
"id": "reloaded_380_FMJ",
"copy-from": "380_FMJ",
diff --git a/data/json/items/ammo/38super.json b/data/json/items/ammo/38super.json
index 782cb194c3542..16a60cb58d1cf 100644
--- a/data/json/items/ammo/38super.json
+++ b/data/json/items/ammo/38super.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".38 Super FMJ",
"description": ".38 Super ammunition with 147gr FMJ bullets. The .38 Super round was developed from .38 ACP in the 1920s, designed to penetrate the body armor of the era.",
- "weight": 8,
+ "weight": "8 g",
"volume": "250 ml",
- "price": 2200,
+ "price": 210,
+ "price_postapoc": 2200,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "yellow",
diff --git a/data/json/items/ammo/40.json b/data/json/items/ammo/40.json
index ec30fd1ebd020..f83847caaf062 100644
--- a/data/json/items/ammo/40.json
+++ b/data/json/items/ammo/40.json
@@ -12,9 +12,10 @@
"type": "AMMO",
"name": ".40 S&W JHP",
"description": ".40 S&W ammunition with 135gr JHP bullets. The .40 S&W round is a descended from the 10mm Auto cartridge and maintains most of its predecessor's strengths while reducing recoil.",
- "weight": 9,
+ "weight": "9 g",
"volume": "250 ml",
- "price": 2800,
+ "price": 220,
+ "price_postapoc": 2800,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "yellow",
@@ -29,6 +30,24 @@
"recoil": 560,
"effects": [ "COOKOFF" ]
},
+ {
+ "id": "bp_40fmj",
+ "copy-from": "40fmj",
+ "type": "AMMO",
+ "name": ".40 S&W FMJ blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
+ {
+ "id": "bp_40sw",
+ "copy-from": "40sw",
+ "type": "AMMO",
+ "name": ".40 S&W JHP blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
{
"id": "reloaded_40fmj",
"copy-from": "40fmj",
diff --git a/data/json/items/ammo/40mm.json b/data/json/items/ammo/40mm.json
index 60c6acccfa55d..d1daa51eb812b 100644
--- a/data/json/items/ammo/40mm.json
+++ b/data/json/items/ammo/40mm.json
@@ -3,9 +3,10 @@
"abstract": "40mm_grenade",
"type": "AMMO",
"name": "40mm grenade",
- "weight": 230,
+ "weight": "230 g",
"volume": "250 ml",
- "price": 40000,
+ "price": 10000,
+ "price_postapoc": 40000,
"material": [ "steel", "powder" ],
"symbol": "=",
"color": "yellow",
diff --git a/data/json/items/ammo/410shot.json b/data/json/items/ammo/410shot.json
index 53c3419327590..69fe0ace77cec 100644
--- a/data/json/items/ammo/410shot.json
+++ b/data/json/items/ammo/410shot.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".410 000 shot",
"description": "A .410 shell with 5 000 pellets. Good for a hunting or combat load.",
- "weight": 32,
+ "weight": "32 g",
"volume": "250 ml",
- "price": 3500,
+ "price": 175,
+ "price_postapoc": 3500,
"material": [ "plastic", "powder" ],
"symbol": "=",
"color": "red",
diff --git a/data/json/items/ammo/44.json b/data/json/items/ammo/44.json
index 32f73b3cfa259..85026aba9c1c0 100644
--- a/data/json/items/ammo/44.json
+++ b/data/json/items/ammo/44.json
@@ -12,9 +12,10 @@
"type": "AMMO",
"name": ".44 Magnum",
"description": ".44 magnum ammunition with 240gr JHP bullets. The .44 magnum round is one of the most powerful handgun cartridges available. It has excellent stopping power but suffers from extremely high recoil for a handgun round.",
- "weight": 13,
+ "weight": "13 g",
"volume": "250 ml",
- "price": 2900,
+ "price": 175,
+ "price_postapoc": 2900,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "light_gray",
@@ -51,11 +52,18 @@
"id": "bp_44magnum",
"copy-from": "44magnum",
"type": "AMMO",
- "name": "blackpowder .44 Magnum",
- "description": "This .44 Magnum cartridge is loaded with 39gr of blackpowder and a 200gr cast lead semi-wadcutter.",
- "proportional": { "price": 0.6, "dispersion": 1.2 },
- "pierce": 0,
- "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
+ "name": ".44 Magnum blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
+ {
+ "id": "bp_44fmj",
+ "copy-from": "44fmj",
+ "type": "AMMO",
+ "name": ".44 Magnum FMJ blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
}
]
diff --git a/data/json/items/ammo/44paper.json b/data/json/items/ammo/44paper.json
index b8e7ee4650f22..868054794585d 100644
--- a/data/json/items/ammo/44paper.json
+++ b/data/json/items/ammo/44paper.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".44 paper cartridge",
"description": "A paper cartridge containing a premeasured amount of black powder and a .44 projectile. Used by the Colt M1860 Army.",
- "weight": 7,
+ "weight": "7 g",
"volume": "250 ml",
- "price": 5000,
+ "price": 350,
+ "price_postapoc": 5000,
"material": [ "paper", "powder", "lead" ],
"symbol": "=",
"color": "white",
@@ -16,6 +17,6 @@
"damage": 27,
"dispersion": 70,
"recoil": 580,
- "effects": [ "COOKOFF", "MUZZLE_SMOKE" ]
+ "effects": [ "COOKOFF", "MUZZLE_SMOKE", "BLACKPOWDER" ]
}
]
diff --git a/data/json/items/ammo/45.json b/data/json/items/ammo/45.json
index 0a1c6bab74768..70a6022167514 100644
--- a/data/json/items/ammo/45.json
+++ b/data/json/items/ammo/45.json
@@ -12,9 +12,10 @@
"type": "AMMO",
"name": ".45 ACP JHP",
"description": ".45 ACP ammunition with 185gr JHP bullets. The .45 ACP round was developed to replace the .38 Long Colt cartridge in the early 20th century. It has good stopping power but above average recoil.",
- "weight": 10,
+ "weight": "10 g",
"volume": "250 ml",
- "price": 2000,
+ "price": 180,
+ "price_postapoc": 2000,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "yellow",
@@ -35,10 +36,29 @@
"type": "AMMO",
"name": ".45 ACP +P",
"description": "Overpressure .45 ACP ammunition with 200gr JHP bullets. This +P ammunition has higher muzzle energy than typical loads leading to greater damage, accuracy and recoil.",
- "price": 2800,
+ "price": 210,
+ "price_postapoc": 2800,
"count": 10,
"relative": { "damage": 4, "pierce": 4, "dispersion": -10, "recoil": 60 }
},
+ {
+ "id": "bp_45_acp",
+ "copy-from": "45_acp",
+ "type": "AMMO",
+ "name": ".45 ACP FMJ blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
+ {
+ "id": "bp_45_jhp",
+ "copy-from": "45_jhp",
+ "type": "AMMO",
+ "name": ".45 ACP JHP blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
{
"id": "reloaded_45_acp",
"copy-from": "45_acp",
diff --git a/data/json/items/ammo/454.json b/data/json/items/ammo/454.json
index 7ab204a389247..171cd7e24ffba 100644
--- a/data/json/items/ammo/454.json
+++ b/data/json/items/ammo/454.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".454 Casull",
"description": ".454 Casull ammunition with 300gr jacketed soft point bullets. The .454 Casull round is derived from .45 Long Colt with a stronger, lengthened case. It is an exceptionally powerful cartridge with higher stopping power than many rifle rounds, although it suffers from extreme recoil making it unsuitable for most purposes.",
- "weight": 16,
+ "weight": "16 g",
"volume": "250 ml",
- "price": 2400,
+ "price": 500,
+ "price_postapoc": 2400,
"material": [ "steel", "powder" ],
"symbol": "=",
"color": "light_gray",
@@ -34,10 +35,9 @@
"id": "bp_454_Casull",
"copy-from": "454_Casull",
"type": "AMMO",
- "name": "blackpowder .454 Casull",
- "description": "This strange anachronism of a cartridge is loaded with 45gr of blackpowder and a relatively light 190gr cast lead hollowpoint.",
- "proportional": { "price": 0.6, "dispersion": 1.3 },
- "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
+ "name": ".454 Casull blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
}
]
diff --git a/data/json/items/ammo/4570.json b/data/json/items/ammo/4570.json
index 709ccb89f9a11..6bc56b5814a91 100644
--- a/data/json/items/ammo/4570.json
+++ b/data/json/items/ammo/4570.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".45-70 SP",
"description": ".45-70 Government ammunition loaded with a 305 grain soft point round. One of the oldest cartridges still in use, it is still a favorite for large game hunting at short ranges.",
- "weight": 35,
+ "weight": "35 g",
"volume": "250 ml",
- "price": 4000,
+ "price": 125,
+ "price_postapoc": 4000,
"material": [ "brass", "powder" ],
"symbol": "+",
"color": "green",
@@ -27,7 +28,8 @@
"type": "AMMO",
"name": ".45-70 +P penetrator",
"description": ".45-70 Government +P ammunition loaded with a 305 grain solid copper penetrator projectile. Designed for maximum penetration through thick hide and bone while maintaining ideal wounding characteristics.",
- "price": 5000,
+ "price": 175,
+ "price_postapoc": 5000,
"count": 10,
"relative": { "range": 2, "damage": 4, "pierce": 7, "recoil": 300 }
},
@@ -37,7 +39,8 @@
"type": "AMMO",
"name": ".45-70 LFN cowboy",
"description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet to original specifications for safe use in antique firearms. Quite a bit less powerful than modern ammo, but still packs a punch.",
- "price": 3500,
+ "price": 250,
+ "price_postapoc": 3500,
"relative": { "range": -8, "damage": -14, "pierce": -2, "recoil": -900 }
},
{
diff --git a/data/json/items/ammo/45colt.json b/data/json/items/ammo/45colt.json
index e34d9682b7e1c..36a4a2d3e54e8 100644
--- a/data/json/items/ammo/45colt.json
+++ b/data/json/items/ammo/45colt.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".45 Colt JHP",
"description": ".45 Colt ammunition with 250gr jacketed hollow point bullets. Originally designed for the Colt Single Action Army, and still used for modern reproduction revolvers. Originally a black powder cartridge, modern loads can make this round competitive in the new era.",
- "weight": 12,
+ "weight": "12 g",
"volume": "250 ml",
- "price": 2200,
+ "price": 200,
+ "price_postapoc": 2200,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "yellow",
diff --git a/data/json/items/ammo/46.json b/data/json/items/ammo/46.json
index f01f070835ea1..6c6b677ad5012 100644
--- a/data/json/items/ammo/46.json
+++ b/data/json/items/ammo/46.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": "4.6x30mm",
"description": "4.6x30mm ammunition with 31gr copper plated steel bullets. The 4.6x30mm round was developed by H&K to compete with FN Herstal's 5.7x28mm cartridge. It has low recoil and excellent armor penetration.",
- "weight": 5,
+ "weight": "5 g",
"volume": "250 ml",
- "price": 5200,
+ "price": 300,
+ "price_postapoc": 5200,
"material": [ "steel", "powder" ],
"symbol": "=",
"color": "dark_gray",
@@ -21,12 +22,23 @@
"recoil": 90,
"effects": [ "COOKOFF" ]
},
+ {
+ "id": "bp_46mm",
+ "copy-from": "46mm",
+ "type": "AMMO",
+ "name": "4.6x30mm blackpowder",
+ "description": "4.6x30mm ammunition with 31gr copper plated lead bullets. The 4.6x30mm round was developed by H&K to compete with FN Herstal's 5.7x28mm cartridge. It has low recoil, but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
+ "proportional": { "price": 0.3, "damage": 0.46, "recoil": 0.46, "pierce": 0.1, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
{
"id": "reloaded_46mm",
"copy-from": "46mm",
"type": "AMMO",
"name": "reloaded 4.6x30mm",
- "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+ "description": "4.6x30mm ammunition with 31gr copper plated lead bullets. The 4.6x30mm round was developed by H&K to compete with FN Herstal's 5.7x28mm cartridge. It has low recoil, but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
+ "proportional": { "price": 0.7, "damage": 0.9, "pierce": 0.2, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
}
diff --git a/data/json/items/ammo/460.json b/data/json/items/ammo/460.json
index 61d4ae0d5f67b..15b2ef0091249 100644
--- a/data/json/items/ammo/460.json
+++ b/data/json/items/ammo/460.json
@@ -17,6 +17,24 @@
"casing": "460_casing",
"proportional": { "range": 0.95, "damage": 0.95, "pierce": 0.95, "recoil": 0.95 }
},
+ {
+ "id": "bp_460_fmj",
+ "copy-from": "460_fmj",
+ "type": "AMMO",
+ "name": ".460 Rowland FMJ blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
+ {
+ "id": "bp_460_rowland",
+ "copy-from": "460_rowland",
+ "type": "AMMO",
+ "name": ".460 Rowland blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
{
"id": "reloaded_460_fmj",
"copy-from": "460_fmj",
diff --git a/data/json/items/ammo/50.json b/data/json/items/ammo/50.json
index a61dcec1e8897..f83f605b96713 100644
--- a/data/json/items/ammo/50.json
+++ b/data/json/items/ammo/50.json
@@ -14,9 +14,10 @@
"type": "AMMO",
"name": ".50 BMG Ball",
"description": "The .50 BMG is a very powerful rifle round designed for long-range use. Its stupendous accuracy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.",
- "weight": 114,
+ "weight": "114 g",
"volume": "250 ml",
- "price": 32500,
+ "price": 2200,
+ "price_postapoc": 32500,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "dark_gray",
diff --git a/data/json/items/ammo/500.json b/data/json/items/ammo/500.json
index 851d0c9931a74..d7fe1e251f462 100644
--- a/data/json/items/ammo/500.json
+++ b/data/json/items/ammo/500.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".500 S&W Magnum",
"description": ".500 S&W Magnum ammunition with 500gr bullets. The .500 S&W Magnum round is a colossally powerful handgun cartridge capable of killing almost any target with one hit. It has extremely high damage and recoil to match.",
- "weight": 15,
+ "weight": "15 g",
"volume": "250 ml",
- "price": 3500,
+ "price": 200,
+ "price_postapoc": 3500,
"material": [ "steel", "powder" ],
"symbol": "=",
"color": "light_gray",
@@ -21,6 +22,15 @@
"recoil": 3000,
"effects": [ "COOKOFF" ]
},
+ {
+ "id": "bp_500_Magnum",
+ "copy-from": "500_Magnum",
+ "type": "AMMO",
+ "name": ".500 S&W Magnum blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
{
"id": "reloaded_500_Magnum",
"copy-from": "500_Magnum",
diff --git a/data/json/items/ammo/545x39.json b/data/json/items/ammo/545x39.json
index c574ea5be882a..9021c05aa0f74 100644
--- a/data/json/items/ammo/545x39.json
+++ b/data/json/items/ammo/545x39.json
@@ -5,9 +5,10 @@
"name": "5.45x39mm 7N10",
"//": "Mainlined from Icecoon's Weapons Pack.",
"description": "5.45x39mm 7N10 ammunition with 56gr FMJ bullets. The 5.45x39mm round was introduced along with the AK-74 in 1974. It has superior wounding potential to the older 7.62x39mm round and quickly replaced it in Soviet military use.",
- "weight": 10,
+ "weight": "10 g",
"volume": "250 ml",
- "price": 2900,
+ "price": 100,
+ "price_postapoc": 2900,
"material": [ "steel", "powder" ],
"symbol": "=",
"color": "yellow",
@@ -28,7 +29,8 @@
"type": "AMMO",
"name": "5.45x39mm 7N22",
"description": "Armor piercing 5.45x39mm ammunition with 57gr bullets containing a steel penetrator. Developed in 1998 by the Russian military.",
- "price": 6500,
+ "price": 350,
+ "price_postapoc": 6500,
"symbol": "=",
"color": "yellow",
"relative": { "damage": -2, "pierce": 8 }
diff --git a/data/json/items/ammo/57.json b/data/json/items/ammo/57.json
index 1d800cc47fcb6..bcd571afac753 100644
--- a/data/json/items/ammo/57.json
+++ b/data/json/items/ammo/57.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": "5.7x28mm SS190",
"description": "5.7x28mm ammunition with 31gr AP FMJ bullets. The 5.7x28mm cartridge was designed by FN Herstal to replace the 9x19mm round in NATO use. Although the project to replace 9x19mm Parabellum was effectively canceled the 5.7x28mm round has seen action in many conflicts and has proven to be reliable. It has very low recoil and its armor penetration is a defining feature.",
- "weight": 6,
+ "weight": "6 g",
"volume": "250 ml",
- "price": 5000,
+ "price": 350,
+ "price_postapoc": 5000,
"material": [ "steel", "powder" ],
"symbol": "=",
"color": "dark_gray",
@@ -21,12 +22,23 @@
"recoil": 90,
"effects": [ "COOKOFF" ]
},
+ {
+ "id": "bp_57mm",
+ "copy-from": "57mm",
+ "type": "AMMO",
+ "name": "5.7x28mm blackpowder",
+ "description": "5.7x28mm ammunition with 31gr AP FMJ bullets. The 5.7x28mm cartridge was designed by FN Herstal to replace the 9x19mm round in NATO use. Although the project to replace 9x19mm Parabellum was effectively canceled the 5.7x28mm round has seen action in many conflicts and has proven to be reliable. It has very low recoil but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
+ "proportional": { "price": 0.3, "damage": 0.56, "recoil": 0.56, "pierce": 0.1, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
{
"id": "reloaded_57mm",
"copy-from": "57mm",
"type": "AMMO",
"name": "reloaded 5.7x28mm",
- "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+ "description": "5.7x28mm ammunition with 31gr AP FMJ bullets. The 5.7x28mm cartridge was designed by FN Herstal to replace the 9x19mm round in NATO use. Although the project to replace 9x19mm Parabellum was effectively canceled the 5.7x28mm round has seen action in many conflicts and has proven to be reliable. It has very low recoil but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
+ "proportional": { "price": 0.7, "damage": 0.9, "pierce": 0.2, "dispersion": 1.1 },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
}
diff --git a/data/json/items/ammo/5x50.json b/data/json/items/ammo/5x50.json
index a6a9b21877a70..dfef540103fa0 100644
--- a/data/json/items/ammo/5x50.json
+++ b/data/json/items/ammo/5x50.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": "RA110 5x50mm flechette",
"description": "Designed to defeat modern body armor, the Rivtech 5x50mm flechette round features a biodegradable sabot and a single, fin-stabilized penetrator.",
- "weight": 8,
+ "weight": "8 g",
"volume": "250 ml",
"price": 1125,
+ "price_postapoc": 7625,
"material": [ "plastic", "powder", "steel" ],
"symbol": "=",
"color": "green",
@@ -27,8 +28,9 @@
"type": "AMMO",
"name": "RA119 5x50mm penetrator",
"description": "Designed to defeat modern body armor, the Rivtech 5x50mm RA119 penetrator round features a biodegradable sabot and a single, fin-stabilized tungsten alloy projectile.",
- "weight": 9,
+ "weight": "9 g",
"price": 1688,
+ "price_postapoc": 8188,
"relative": { "range": -10, "damage": 5, "pierce": 20, "dispersion": 20 },
"proportional": { "recoil": 1.1 }
},
diff --git a/data/json/items/ammo/66mm.json b/data/json/items/ammo/66mm.json
new file mode 100644
index 0000000000000..ba9858d7e084c
--- /dev/null
+++ b/data/json/items/ammo/66mm.json
@@ -0,0 +1,23 @@
+[
+ {
+ "type": "AMMO",
+ "id": "m235tpa",
+ "price": 200000,
+ "//": "$500 per. Cheap!",
+ "name": "M74 rocket",
+ "symbol": "=",
+ "color": "dark_gray",
+ "description": "66mm incendiary rockets used in the M202 FLASH rocket launcher. Their warheads are filled with a thickened pyrophoric agent, which burns at 2200 degrees Fahrenheit.",
+ "material": [ "steel", "powder" ],
+ "volume": "2 L",
+ "weight": "1140 g",
+ "ammo_type": "m235",
+ "damage": 60,
+ "pierce": 10,
+ "range": 70,
+ "dispersion": 150,
+ "recoil": 150,
+ "count": 4,
+ "effects": [ "COOKOFF", "PYROPHORIC", "TRAIL", "NEVER_MISFIRES" ]
+ }
+]
diff --git a/data/json/items/ammo/700nx.json b/data/json/items/ammo/700nx.json
index 33fc9aa4a75b6..17cf3ab16efc8 100644
--- a/data/json/items/ammo/700nx.json
+++ b/data/json/items/ammo/700nx.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": ".700 NX",
"description": "The .700 Nitro Express is a very powerful rifle round designed for long-range use. Its stupendous accuracy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
- "price": 75000,
+ "price": 5700,
+ "price_postapoc": 75000,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "dark_gray",
diff --git a/data/json/items/ammo/762.json b/data/json/items/ammo/762.json
index 83d4edcc09f1c..a2fa7fce2c800 100644
--- a/data/json/items/ammo/762.json
+++ b/data/json/items/ammo/762.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": "7.62x39mm 57-N-231",
"description": "7.62x39mm 57-N-231 ammunition with 121.9gr steel core FMJ bullets. Developed in WW2 by the Soviet Union the 7.62x39mm round rapidly became extremely popular all over the world. The bullet has poor wounding potential due to its stability, only beginning to yaw after 26cm.",
- "weight": 16,
+ "weight": "16 g",
"volume": "250 ml",
- "price": 5200,
+ "price": 120,
+ "price_postapoc": 5200,
"material": [ "steel", "powder" ],
"symbol": "=",
"color": "dark_gray",
@@ -28,7 +29,8 @@
"name": "7.62x39mm M67",
"//": "Entirely provisional. Could someone design a better wound ballistics system?",
"description": "7.62x39mm M67 rounds with 123gr bullets. The inadequate terminal ballistics of the M43 round led to the development of the M67 round in Yugoslavia in the 1960s. It destabilizes much faster than M43 after hitting a target leading to greater damage.",
- "price": 6800,
+ "price": 150,
+ "price_postapoc": 6800,
"relative": { "damage": 4, "pierce": 2 }
},
{
diff --git a/data/json/items/ammo/762R.json b/data/json/items/ammo/762R.json
index 88b490c414bf9..0ca539830e5fb 100644
--- a/data/json/items/ammo/762R.json
+++ b/data/json/items/ammo/762R.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": "7.62x54mmR",
"description": "7.62x54mmR ammunition with 150gr FMJ bullets. The 7.62x54mmR round is one of the oldest still in common use, primarily due to the popularity of the Mosin-Nagant rifle. Although it has not been used by militaries for several decades it remains popular with civilians. It is a powerful cartridge capable of killing most targets with one shot.",
- "weight": 18,
+ "weight": "18 g",
"volume": "250 ml",
- "price": 2200,
+ "price": 200,
+ "price_postapoc": 2200,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "yellow",
diff --git a/data/json/items/ammo/762x25.json b/data/json/items/ammo/762x25.json
index b8ddf0a5203d8..d3ef357180280 100644
--- a/data/json/items/ammo/762x25.json
+++ b/data/json/items/ammo/762x25.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": "7.62x25mm JHP",
"description": "A commercial version of the 7.62x25mm cartridge created for the armed forces of Soviet Russia. It was derived from the 7.63x25mm cartridge used by the C96 pistol.",
- "weight": 10,
+ "weight": "10 g",
"volume": "250 ml",
- "price": 3000,
+ "price": 100,
+ "price_postapoc": 3000,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "light_gray",
@@ -37,10 +38,19 @@
"name": "7.62x25mm Type P",
"//": "Stopgap price of $1 per. Anti-China prejudice in the pre-Cataclysm US may have made this ammo tougher to come by.",
"description": "A subsonic cartridge derived from the 7.62x25mm, designed for silenced firearms. It offers good armor penetration at the cost of slightly less damage.",
- "weight": 12,
+ "weight": "12 g",
"count": 50,
"relative": { "price": 2000, "range": -1, "damage": -9, "pierce": 2, "recoil": -270 }
},
+ {
+ "id": "bp_762_25",
+ "copy-from": "762_25hot",
+ "type": "AMMO",
+ "name": "7.62x25mm FMJ blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
{
"id": "reloaded_762_25",
"copy-from": "762_25hot",
diff --git a/data/json/items/ammo/84x246mm.json b/data/json/items/ammo/84x246mm.json
index 234099f0537fc..1af52b873c615 100644
--- a/data/json/items/ammo/84x246mm.json
+++ b/data/json/items/ammo/84x246mm.json
@@ -3,6 +3,7 @@
"type": "AMMO",
"id": "84x246mm_he",
"price": 70000,
+ "price_postapoc": 70000,
"//": "Milspec ammo such as grenades and rockets: not available to the general public, so Expensive.",
"name": "84x246mm HE rocket",
"symbol": "=",
@@ -10,7 +11,7 @@
"description": "A 84x246mm High Explosive anti-personnel round for the Carl Gustav M3 recoilless rifle. Designed to be highly effective against personnel.",
"material": [ "steel", "powder" ],
"volume": "1250 ml",
- "weight": 3200,
+ "weight": "3200 g",
"ammo_type": "84x246mm",
"damage": 60,
"pierce": 10,
@@ -26,10 +27,11 @@
"id": "84x246mm_hedp",
"copy-from": "84x246mm_he",
"price": 70000,
+ "price_postapoc": 70000,
"name": "84x246mm HEDP rocket",
"description": "A 84x246mm High Explosive Dual Purpose anti-materiel round for the Carl Gustav M3 recoilless rifle. Designed to be highly effective against vehicles and structures.",
"volume": "1500 ml",
- "weight": 3300,
+ "weight": "3300 g",
"damage": 1000,
"pierce": 225,
"range": 100,
@@ -42,10 +44,11 @@
"id": "84x246mm_smoke",
"copy-from": "84x246mm_he",
"price": 45000,
+ "price_postapoc": 45000,
"name": "84x246mm smoke rocket",
"description": "A 84x246mm smoke marker round for the Carl Gustav M3 recoilless rifle. Commonly used for signaling, target designation, and for screening troop movements.",
"volume": "1500 ml",
- "weight": 3100,
+ "weight": "3100 g",
"range": 140,
"dispersion": 30,
"extend": { "effects": [ "SMOKE_BIG" ] },
diff --git a/data/json/items/ammo/8x40mm.json b/data/json/items/ammo/8x40mm.json
index a02e53e97c2a9..0b0a0f90ee8c2 100644
--- a/data/json/items/ammo/8x40mm.json
+++ b/data/json/items/ammo/8x40mm.json
@@ -15,9 +15,10 @@
"name": "8x40mm caseless",
"//": "Cased ammo tends to be roughly $1/shot, more or less. Rivtech ammo, being New and Proprietary and Expensive, $2-2.50 or so.",
"description": "8x40mm caseless rounds. Proprietary ammunition for Rivtech firearms. Being caseless rounds, these cannot be disassembled or reloaded.",
- "weight": 12,
+ "weight": "12 g",
"volume": "250 ml",
- "price": 12500,
+ "price": 225,
+ "price_postapoc": 12500,
"material": [ "plastic", "powder" ],
"symbol": "=",
"color": "pink",
@@ -54,7 +55,8 @@
"type": "AMMO",
"name": "8x40mm HVP",
"description": "8x40mm caseless rounds, saboted high-velocity penetrator type. Advanced military grade, armor-piercing ammunition that fires a single depleted uranium flechette. Being caseless rounds, these cannot be disassembled or reloaded.",
- "price": 50000,
+ "price": 2500,
+ "price_postapoc": 50000,
"count": 20,
"relative": { "damage": 5, "pierce": 20 }
},
diff --git a/data/json/items/ammo/9mm.json b/data/json/items/ammo/9mm.json
index 52f46cd205483..f64f3ee40d897 100644
--- a/data/json/items/ammo/9mm.json
+++ b/data/json/items/ammo/9mm.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": "9x19mm JHP",
"description": "9x19mm ammunition with a 116gr jacketed hollow point bullet. JHP rounds have inferior penetration to FMJ rounds but their expansion slightly increases stopping power against unarmored targets and reduces overpenetration.",
- "weight": 7,
+ "weight": "7 g",
"volume": "250 ml",
- "price": 2400,
+ "price": 150,
+ "price_postapoc": 2400,
"material": [ "brass", "powder" ],
"symbol": "=",
"color": "yellow",
@@ -34,7 +35,8 @@
"type": "AMMO",
"name": "9x19mm +P",
"description": "Overpressure 9x19mm ammunition. The round's increased velocity results in superior accuracy and stopping power at the cost of higher recoil.",
- "price": 3800,
+ "price": 300,
+ "price_postapoc": 3800,
"count": 25,
"relative": { "damage": 2, "pierce": 2, "dispersion": -15 },
"proportional": { "recoil": 1.1 }
@@ -45,7 +47,8 @@
"type": "AMMO",
"name": "9x19mm +P+",
"description": "A step beyond the high-pressure 9x19mm +P round, the +P+ has even higher internal pressure offering superior damage, accuracy, and penetration.",
- "price": 5200,
+ "price": 350,
+ "price_postapoc": 5200,
"count": 10,
"relative": { "damage": 4, "pierce": 4, "dispersion": -30 },
"proportional": { "recoil": 1.2 }
@@ -55,7 +58,7 @@
"copy-from": "9mm",
"type": "AMMO",
"name": "9x19mm JHP blackpowder",
- "proportional": { "price": 0.3, "damage": 0.65, "recoil": 0.65, "pierce": 0.5, "dispersion": 1.2 },
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
},
@@ -64,7 +67,7 @@
"copy-from": "9mmfmj",
"type": "AMMO",
"name": "9x19mm FMJ blackpowder",
- "proportional": { "price": 0.3, "damage": 0.65, "recoil": 0.65, "pierce": 0.5, "dispersion": 1.2 },
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
},
diff --git a/data/json/items/ammo/9x18.json b/data/json/items/ammo/9x18.json
index 014749ba74dca..7caba402a20f3 100644
--- a/data/json/items/ammo/9x18.json
+++ b/data/json/items/ammo/9x18.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": "9x18mm 57-N-181S",
"description": "9x18mm Makarov ammunition with 93gr steel core FMJ bullets. The 9x18mm round was very common in the Eastern Bloc during the 20th century and remained in Russian military service into the 21st century.",
- "weight": 8,
+ "weight": "8 g",
"volume": "250 ml",
- "price": 2600,
+ "price": 100,
+ "price_postapoc": 2600,
"material": [ "steel", "powder" ],
"symbol": "=",
"color": "yellow",
@@ -27,7 +28,8 @@
"type": "AMMO",
"name": "9x18mm SP-7",
"description": "9x18mm Makarov SP-7 ammunition. The 9x18mm round was very common in the Eastern Bloc during the 20th century and remained in Russian military service into the 21st century.",
- "price": 2900,
+ "price": 150,
+ "price_postapoc": 2900,
"count": 25,
"relative": { "range": 2, "damage": 4, "dispersion": -10 },
"proportional": { "recoil": 1.1 }
@@ -38,9 +40,28 @@
"type": "AMMO",
"name": "9x18mm RG028",
"description": "9x18mm Makarov RG028 ammunition. The RG028 round uses bullets with a hardened steel core to improve armor penetration.",
- "price": 3100,
+ "price": 200,
+ "price_postapoc": 3100,
"relative": { "damage": -2, "pierce": 8 }
},
+ {
+ "id": "bp_9x18mm",
+ "copy-from": "9x18mm",
+ "type": "AMMO",
+ "name": "9x18mm blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
+ {
+ "id": "bp_9x18mmfmj",
+ "copy-from": "9x18mmfmj",
+ "type": "AMMO",
+ "name": "9x18mm FMJ blackpowder",
+ "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+ "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
{
"id": "reloaded_9x18mm",
"copy-from": "9x18mm",
diff --git a/data/json/items/ammo/atgm.json b/data/json/items/ammo/atgm.json
index 63472fc063a64..5984e6d07e6e5 100644
--- a/data/json/items/ammo/atgm.json
+++ b/data/json/items/ammo/atgm.json
@@ -9,7 +9,7 @@
"description": "A tube-launched, optically tracked, wire-guided missile contained in a steel tube. Designed to be highly effective against vehicles and structures.",
"material": [ "steel", "powder" ],
"volume": "15 L",
- "weight": 22600,
+ "weight": "22600 g",
"bashing": 1,
"ammo_type": "atgm",
"casing": "atgm_spent",
diff --git a/data/json/items/ammo/barb.json b/data/json/items/ammo/barb.json
index 31ef616685e99..64f7bc372af4d 100644
--- a/data/json/items/ammo/barb.json
+++ b/data/json/items/ammo/barb.json
@@ -1,24 +1,24 @@
-{
- "type": "AMMO",
- "id": "barb_paralysis",
- "price": 400,
- "name": "paralyzing barb",
- "symbol": "=",
- "color": "green",
- "description": "Tiny droplets of venom trickle out of the sponge-like tissue of this sharp barb.",
- "material": "bone",
- "volume": "250ml",
- "weight": 37,
- "bashing": 6,
- "cutting": 2,
- "ammo_type": "barb",
- "damage": 5,
- "pierce": 5,
- "dispersion": 120,
- "loudness": 0,
- "count": 10,
- "show_stats": true,
- "effects": [
- "PARALYZEPOISON"
- ]
-}
+[
+ {
+ "type": "AMMO",
+ "id": "barb_paralysis",
+ "price": 400,
+ "name": "paralyzing barb",
+ "symbol": "=",
+ "color": "green",
+ "description": "Tiny droplets of venom trickle out of the sponge-like tissue of this sharp barb.",
+ "material": "bone",
+ "volume": "250ml",
+ "weight": "37 g",
+ "bashing": 6,
+ "cutting": 2,
+ "ammo_type": "barb",
+ "damage": 5,
+ "pierce": 5,
+ "dispersion": 120,
+ "loudness": 0,
+ "count": 10,
+ "show_stats": true,
+ "effects": [ "PARALYZEPOISON" ]
+ }
+]
diff --git a/data/json/items/ammo/chemical_spray.json b/data/json/items/ammo/chemical_spray.json
index 8bbcbbaeed0c1..1c91b439dfb8a 100644
--- a/data/json/items/ammo/chemical_spray.json
+++ b/data/json/items/ammo/chemical_spray.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": "sprayable toxic gas",
"description": "A hazardous mixture made from household cleaners, improvised for use in a chemical thrower. Best be used with some kind of mask or mouth protection.",
- "weight": 3,
+ "weight": "3 g",
"volume": "250 ml",
"price": 3500,
+ "price_postapoc": 3500,
"material": "water",
"symbol": "=",
"color": "green",
@@ -22,9 +23,10 @@
"type": "AMMO",
"name": "sprayable fungicide",
"description": "Fungicide enhanced with sulfur to create sprayable anti-fungal ammo for the chemical thrower. Best be used with some kind of mask or mouth protection.",
- "weight": 3,
+ "weight": "3 g",
"volume": "250 ml",
- "price": 3500,
+ "price": 600,
+ "price_postapoc": 3500,
"material": "water",
"symbol": "=",
"color": "yellow",
@@ -40,9 +42,10 @@
"type": "AMMO",
"name": "sprayable insecticide",
"description": "Strong sprayable insecticide ammo for the chemical thrower. Best be used with some kind of mask or mouth protection.",
- "weight": 3,
+ "weight": "3 g",
"volume": "250 ml",
- "price": 3500,
+ "price": 500,
+ "price_postapoc": 3500,
"material": "water",
"symbol": "=",
"color": "yellow",
diff --git a/data/json/items/ammo/flintlock.json b/data/json/items/ammo/flintlock.json
index c6727ac25b218..a39ee42632498 100644
--- a/data/json/items/ammo/flintlock.json
+++ b/data/json/items/ammo/flintlock.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": "paper cartridge",
"description": "A paper cartridge containing black powder and a metallic projectile. Historically used to reload muzzleloaders in a more reasonable time.",
- "weight": 40,
+ "weight": "40 g",
"volume": "250 ml",
"price": 1100,
+ "price_postapoc": 1100,
"material": [ "lead", "powder" ],
"symbol": "=",
"color": "white",
@@ -25,9 +26,10 @@
"type": "AMMO",
"name": "paper shot cartridge",
"description": "A paper cartridge containing black powder and metallic shot. Historically used to reload muzzleloaders in a more reasonable time.",
- "weight": 40,
+ "weight": "40 g",
"volume": "250 ml",
"price": 1100,
+ "price_postapoc": 1100,
"material": [ "lead", "powder" ],
"symbol": "=",
"color": "white",
diff --git a/data/json/items/ammo/metal_rail.json b/data/json/items/ammo/metal_rail.json
index 6c04defe8ae57..4e1d99cf27335 100644
--- a/data/json/items/ammo/metal_rail.json
+++ b/data/json/items/ammo/metal_rail.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": "rebar rail",
"description": "A short piece of ferromagnetic rebar which has been straightened and sharpened on one end. Could be used as a projectile by a sufficiently powerful electromagnetic weapon.",
- "weight": 160,
+ "weight": "160 g",
"volume": "25ml",
"price": 1000,
+ "price_postapoc": 1000,
"to_hit": -1,
"bashing": 5,
"cutting": 1,
@@ -29,6 +30,7 @@
"description": "A short piece of steel which has been forged true and sharpened on one end. Could be used as a projectile by a sufficiently powerful electromagnetic weapon.",
"volume": "20ml",
"price": 1500,
+ "price_postapoc": 1500,
"bashing": 4,
"cutting": 2,
"material": [ "steel" ],
diff --git a/data/json/items/ammo/nail.json b/data/json/items/ammo/nail.json
index 51716576124bb..a2054549af5bf 100644
--- a/data/json/items/ammo/nail.json
+++ b/data/json/items/ammo/nail.json
@@ -16,9 +16,10 @@
"category": "spare_parts",
"name": "nail",
"description": "A pin-shaped piece of iron, can be used to construct various things with a hammer.",
- "weight": 4,
+ "weight": "4 g",
"volume": "250 ml",
- "price": 6000,
+ "price": 1000,
+ "price_postapoc": 6000,
"material": "iron",
"symbol": "=",
"color": "cyan",
diff --git a/data/json/items/ammo/paintball.json b/data/json/items/ammo/paintball.json
index 5a9b18f533664..0b28014399196 100644
--- a/data/json/items/ammo/paintball.json
+++ b/data/json/items/ammo/paintball.json
@@ -2,14 +2,15 @@
{
"type": "AMMO",
"id": "paintball",
- "price": 500,
+ "price": 1000,
+ "price_postapoc": 500,
"name": "paintball",
"symbol": "=",
"color": "red",
"description": "A tube of small paintballs. They deal virtually no damage.",
"material": "plastic",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "paintball",
"damage": 2,
"dispersion": 100,
diff --git a/data/json/items/ammo/shot.json b/data/json/items/ammo/shot.json
index f22d2f84a571c..59ed21ea86d93 100644
--- a/data/json/items/ammo/shot.json
+++ b/data/json/items/ammo/shot.json
@@ -93,9 +93,10 @@
"type": "AMMO",
"name": "00 shot",
"description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range. Favored by SWAT forces.",
- "weight": 32,
+ "weight": "32 g",
"volume": "250 ml",
- "price": 3500,
+ "price": 500,
+ "price_postapoc": 3500,
"material": [ "plastic", "powder" ],
"symbol": "=",
"color": "red",
@@ -115,7 +116,8 @@
"type": "AMMO",
"name": "shotgun beanbag",
"description": "A beanbag round for shotguns, not deadly but designed to disable.",
- "price": 3500,
+ "price": 500,
+ "price_postapoc": 3500,
"count": 10,
"proportional": { "damage": 0.1, "recoil": 0.4, "loudness": 0.6 },
"extend": { "effects": [ "BEANBAG", "NOGIB" ] }
@@ -126,7 +128,8 @@
"type": "AMMO",
"name": "birdshot",
"description": "Weak shotgun ammunition. Designed for hunting birds and other small game, its applications in combat are very limited.",
- "price": 2400,
+ "price": 100,
+ "price_postapoc": 2400,
"proportional": { "damage": 0.3, "recoil": 0.6, "loudness": 0.8 },
"extend": { "effects": [ "NOGIB" ] }
},
@@ -136,7 +139,8 @@
"type": "AMMO",
"name": "dragon's breath shell",
"description": "A shotgun shell filled with magnesium pellets or shards, used mostly as a distress flare or pyrotechnics tool. When the round is fired, high temperature sparks and flames shoot out of the barrel, igniting everything in their path.",
- "price": 14000,
+ "price": 1000,
+ "price_postapoc": 14000,
"proportional": { "damage": 0.2, "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2, "range": 0.5 },
"extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
},
@@ -146,7 +150,8 @@
"type": "AMMO",
"name": "flechette shell",
"description": "A shotgun shell filled with tiny steel darts. Extremely damaging, plus the spread makes it very accurate at short range. Slices through most forms of armor with ease.",
- "price": 10000,
+ "price": 2000,
+ "price_postapoc": 10000,
"count": 10,
"relative": { "damage": -6, "pierce": 12 }
},
@@ -157,7 +162,8 @@
"name": "explosive slug",
"//": "$30/shot thanks to tight regulation, one way or another.",
"description": "A shotgun shell shooting a small explosive. Damaging, but rather inaccurate and short ranged. Banned in several states.",
- "price": 15000,
+ "price": 3000,
+ "price_postapoc": 15000,
"count": 5,
"damage": 10,
"pierce": 0,
@@ -173,13 +179,23 @@
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ] }
},
+ {
+ "id": "bp_shot_scrap",
+ "copy-from": "shot_scrap",
+ "type": "AMMO",
+ "name": "makeshift shotgun shot (black powder)",
+ "proportional": { "price": 0.6, "damage": 0.8 },
+ "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
+ "delete": { "effects": [ "NEVER_MISFIRES" ] }
+ },
{
"id": "shot_slug",
"copy-from": "shot_00",
"type": "AMMO",
"name": "shotgun slug",
"description": "A heavy metal slug used with shotguns to give them the range capabilities of a rifle. Extremely damaging but rather inaccurate.",
- "price": 4500,
+ "price": 400,
+ "price_postapoc": 4500,
"dispersion": 100,
"relative": { "range": 12, "pierce": 6 },
"proportional": { "recoil": 1.4 },
diff --git a/data/json/items/ammo/shotcanister.json b/data/json/items/ammo/shotcanister.json
index cbcf51fc581b6..956fd4acadcb6 100644
--- a/data/json/items/ammo/shotcanister.json
+++ b/data/json/items/ammo/shotcanister.json
@@ -3,13 +3,14 @@
"type": "AMMO",
"id": "shotcanister_scrap",
"price": 1000,
+ "price_postapoc": 1000,
"name": "scrap shotcanister",
"symbol": "=",
"color": "green",
"description": "This small paper canister resembling a crude shotshell is filled to the brim with assorted pieces of scrap metal.",
"material": [ "steel" ],
"volume": "250 ml",
- "weight": 55,
+ "weight": "55 g",
"bashing": 2,
"cutting": 1,
"ammo_type": "shotcanister",
@@ -24,13 +25,14 @@
"type": "AMMO",
"id": "shotcanister_pebble",
"price": 1000,
+ "price_postapoc": 1000,
"name": "pebble shotcanister",
"symbol": "=",
"color": "green",
"description": "This small paper canister resembling a crude shotshell is filled to the brim with tiny pebbles. Damage is pathetic but flight is much more stable than scrap",
"material": [ "steel" ],
"volume": "250 ml",
- "weight": 55,
+ "weight": "55 g",
"bashing": 2,
"cutting": 1,
"ammo_type": "shotcanister",
@@ -46,13 +48,14 @@
"type": "AMMO",
"id": "shotcanister_flechette",
"price": 1000,
+ "price_postapoc": 1000,
"name": "flechette shotcanister",
"symbol": "=",
"color": "green",
"description": "This small paper canister resembling a crude shotshell is filled to the brim with handmade flechettes, giving it some armor piercing capabilities.",
"material": [ "steel" ],
"volume": "250 ml",
- "weight": 55,
+ "weight": "55 g",
"bashing": 2,
"cutting": 1,
"ammo_type": "shotcanister",
@@ -68,13 +71,14 @@
"type": "AMMO",
"id": "shotcanister_bearing",
"price": 1000,
+ "price_postapoc": 1000,
"name": "bearing shotcanister",
"symbol": "=",
"color": "green",
"description": "This small paper canister resembling a crude shotshell is filled to the brim with handmade bearings, stabilizing it's flight pattern a tiny bit.",
"material": [ "steel" ],
"volume": "250 ml",
- "weight": 55,
+ "weight": "55 g",
"bashing": 2,
"cutting": 1,
"ammo_type": "shotcanister",
diff --git a/data/json/items/ammo/shotpaper.json b/data/json/items/ammo/shotpaper.json
new file mode 100644
index 0000000000000..cbb196696c64e
--- /dev/null
+++ b/data/json/items/ammo/shotpaper.json
@@ -0,0 +1,45 @@
+[
+ {
+ "id": "shot_paper_bird",
+ "copy-from": "shot_paper_00",
+ "type": "AMMO",
+ "name": "birdshot paper cartridge",
+ "description": "A paper cartridge containing a premeasured amount of black powder and an equal volume of birdshot. Used mostly for hunting small game or fowl.",
+ "damage": 10,
+ "proportional": { "recoil": 0.6, "loudness": 0.8 },
+ "extend": { "effects": [ "NOGIB" ] }
+ },
+ {
+ "id": "shot_paper_dragon",
+ "copy-from": "shot_paper_00",
+ "type": "AMMO",
+ "name": "pyrotechnic paper cartridge",
+ "description": "A paper cartridge containing a premeasured amount of black powder and an equal volume of flammable metals. When fired, burning chunks of metal and sparks will shoot out of the barrel, igniting everything in their path.",
+ "proportional": { "damage": 0.2, "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2, "range": 0.5 },
+ "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
+ },
+ {
+ "id": "shot_paper_00",
+ "copy-from": "bp_shot_00",
+ "type": "AMMO",
+ "name": "buckshot paper cartridge",
+ "description": "A paper cartridge containing a premeasured amount of black powder and an equal volume of 00 buckshot.",
+ "weight": 26,
+ "volume": "250 ml",
+ "material": [ "paper", "powder", "lead" ],
+ "color": "white",
+ "ammo_type": "shotpaper",
+ "proportional": { "damage": 0.8, "recoil": 0.8, "loudness": 0.8 },
+ "delete": { "effects": [ "RECYCLED" ], "casing": "shot_hull" }
+ },
+ {
+ "id": "shot_paper_slug",
+ "copy-from": "shot_paper_00",
+ "type": "AMMO",
+ "name": ".62 paper cartridge",
+ "description": "A paper cartridge containing a premeasured amount of black powder and a .605 inch lead ball.",
+ "relative": { "range": 12, "pierce": 4 },
+ "delete": { "effects": [ "SHOT" ] },
+ "dispersion": 100
+ }
+]
diff --git a/data/json/items/ammo/signal_flare.json b/data/json/items/ammo/signal_flare.json
index 2c64cf381bf90..0ac2ae6d1abfb 100644
--- a/data/json/items/ammo/signal_flare.json
+++ b/data/json/items/ammo/signal_flare.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": "signal flare",
"description": "A heavy plastic cartridge made for use in flare guns. It appears to be a modified 12 gauge shotgun shell.",
- "weight": 32,
+ "weight": "32 g",
"volume": "250 ml",
- "price": 2500,
+ "price": 500,
+ "price_postapoc": 2500,
"material": [ "plastic", "powder" ],
"symbol": "=",
"color": "red",
diff --git a/data/json/items/ammo/weldgas.json b/data/json/items/ammo/weldgas.json
index e829583bc37bc..e855c765f014c 100644
--- a/data/json/items/ammo/weldgas.json
+++ b/data/json/items/ammo/weldgas.json
@@ -4,9 +4,10 @@
"type": "AMMO",
"name": "oxyacetylene",
"description": "A highly explosive fuel mixture composed of equal parts of oxygen and acetylene gas.",
- "weight": 40,
+ "weight": "40 g",
"volume": "250 ml",
"price": 2400,
+ "price_postapoc": 2400,
"material": [ "hydrocarbons" ],
"symbol": "=",
"color": "red",
diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
index 6095eb91f3d12..90fb087e5be76 100644
--- a/data/json/items/ammo_types.json
+++ b/data/json/items/ammo_types.json
@@ -71,6 +71,12 @@
"name": "shot",
"default": "shot_00"
},
+ {
+ "type": "ammunition_type",
+ "id": "shotpaper",
+ "name": "20ga percussion",
+ "default": "shot_paper_00"
+ },
{
"type": "ammunition_type",
"id": "410shot",
@@ -485,6 +491,12 @@
"name": "paper cartridge",
"default": "flintlock_ammo"
},
+ {
+ "type": "ammunition_type",
+ "id": "papershot",
+ "name": "20ga percussion",
+ "default": "nail"
+ },
{
"type": "ammunition_type",
"id": "36paper",
diff --git a/data/json/items/archery.json b/data/json/items/archery.json
index 7bab850793b41..ca4880deb4cc0 100644
--- a/data/json/items/archery.json
+++ b/data/json/items/archery.json
@@ -9,7 +9,7 @@
"description": "A crude pointed wooden shaft with a notch at the back. Stands a very low chance of remaining intact once fired.",
"material": "wood",
"volume": "250 ml",
- "weight": 30,
+ "weight": "30 g",
"bashing": 3,
"ammo_type": "arrow",
"prop_damage": 0.7,
@@ -28,7 +28,7 @@
"description": "A fletched wooden arrow shaft with a pointed tip. Useful for piercing armor. Stands a decent chance of remaining intact once fired.",
"material": [ "wood", "steel" ],
"volume": "250 ml",
- "weight": 55,
+ "weight": "55 g",
"bashing": 3,
"ammo_type": "arrow",
"prop_damage": 1.12,
@@ -48,7 +48,7 @@
"description": "A simple fletched wooden arrow shaft with a blunted tip. Useful for hunting small woodland creatures without splattering them all over the ground. Stands a low chance of remaining intact once fired.",
"material": "wood",
"volume": "250 ml",
- "weight": 35,
+ "weight": "35 g",
"bashing": 4,
"ammo_type": "arrow",
"prop_damage": 0.5,
@@ -67,7 +67,7 @@
"description": "A fletched wooden arrow shaft with a bladed tip. Useful for maximising damage to the target. Stands a decent chance of remaining intact once fired.",
"material": [ "wood", "steel" ],
"volume": "250 ml",
- "weight": 55,
+ "weight": "55 g",
"bashing": 2,
"cutting": 1,
"ammo_type": "arrow",
@@ -88,7 +88,7 @@
"description": "A simple fletched wooden arrow shaft with a fire-hardened and sharpened tip. Stands a low chance of remaining intact once fired.",
"material": "wood",
"volume": "250 ml",
- "weight": 35,
+ "weight": "35 g",
"bashing": 4,
"ammo_type": "arrow",
"prop_damage": 0.7,
@@ -107,7 +107,7 @@
"description": "A fletched wooden arrow shaft with a blunt tip. Useful for hunting small woodland creatures without splattering them all over the ground. Stands a decent chance of remaining intact once fired.",
"material": [ "wood", "steel" ],
"volume": "250 ml",
- "weight": 60,
+ "weight": "60 g",
"bashing": 4,
"ammo_type": "arrow",
"prop_damage": 0.5,
@@ -126,7 +126,7 @@
"description": "A simple fletched wooden arrow shaft with a makeshift arrowhead. Stands a low chance of remaining intact once fired.",
"material": "wood",
"volume": "250 ml",
- "weight": 37,
+ "weight": "37 g",
"bashing": 6,
"cutting": 2,
"ammo_type": "arrow",
@@ -146,7 +146,7 @@
"description": "A simple fletched steel arrow shaft with a flattened and sharpened tip. Stands a somewhat low chance of remaining intact once fired.",
"material": "steel",
"volume": "250 ml",
- "weight": 65,
+ "weight": "65 g",
"bashing": 2,
"ammo_type": "arrow",
"pierce": 1,
@@ -166,7 +166,7 @@
"description": "A fletched aluminum arrow shaft with a bladed tip. Useful for maximising damage to the target. Stands a good chance of remaining intact once fired.",
"material": [ "aluminum", "steel" ],
"volume": "250 ml",
- "weight": 50,
+ "weight": "50 g",
"bashing": 3,
"cutting": 2,
"ammo_type": "arrow",
@@ -188,7 +188,7 @@
"description": "A fletched aluminum arrow shaft with a pointed tip. Useful for piercing armor. Stands a good chance of remaining intact once fired.",
"material": [ "aluminum", "steel" ],
"volume": "250 ml",
- "weight": 50,
+ "weight": "50 g",
"bashing": 3,
"cutting": 2,
"ammo_type": "arrow",
@@ -210,7 +210,7 @@
"description": "A fletched aluminum arrow shaft with a blunt tip. Useful for hunting small woodland creatures without splattering them all over the ground. Stands a good chance of remaining intact once fired.",
"material": [ "aluminum", "steel" ],
"volume": "250 ml",
- "weight": 50,
+ "weight": "50 g",
"bashing": 3,
"cutting": 2,
"ammo_type": "arrow",
@@ -231,7 +231,7 @@
"description": "A fletched carbon fiber arrow shaft with an expanding broadhead tip. Deals impressive damage to targets. Stands a good chance of remaining intact once fired.",
"material": [ "kevlar", "steel" ],
"volume": "250 ml",
- "weight": 40,
+ "weight": "40 g",
"bashing": 1,
"ammo_type": "arrow",
"prop_damage": 1.35,
@@ -252,7 +252,7 @@
"description": "This arrow has a small IED strapped to its tip. Horribly inaccurate, heavy, and bulky, not only does this contraption require expert hands to pull off a shot, it requires one to loose this with a small measure of confidence that the shooter won't be caught in the blast radius.",
"material": [ "steel", "powder" ],
"volume": "500 ml",
- "weight": 633,
+ "weight": "633 g",
"bashing": 2,
"ammo_type": "arrow",
"damage": 15,
@@ -272,7 +272,7 @@
"description": "This simple IED is designed to be attached to an arrow and detonate on impact.",
"price": 2000,
"material": "steel",
- "weight": 562,
+ "weight": "562 g",
"volume": "250 ml",
"bashing": 10,
"to_hit": -1,
@@ -289,7 +289,7 @@
"description": "This arrow has a flaming rag wrapped around the shaft near the head. You should shoot it soon before it burns your bow.",
"material": "steel",
"volume": "500 ml",
- "weight": 150,
+ "weight": "150 g",
"bashing": 2,
"ammo_type": "arrow",
"damage": 15,
@@ -314,7 +314,7 @@
"loudness": 8,
"skill": "archery",
"ammo": "arrow",
- "weight": 1360,
+ "weight": "1360 g",
"volume": "2500 ml",
"bashing": 6,
"armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 20 },
@@ -338,7 +338,7 @@
"skill": "archery",
"min_strength": 4,
"ammo": "arrow",
- "weight": 340,
+ "weight": "340 g",
"volume": "1500 ml",
"bashing": 6,
"armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 14 },
@@ -365,7 +365,7 @@
"skill": "archery",
"min_strength": 6,
"ammo": "arrow",
- "weight": 907,
+ "weight": "907 g",
"volume": "1500 ml",
"bashing": 8,
"to_hit": 1,
@@ -441,7 +441,7 @@
"skill": "archery",
"min_strength": 5,
"ammo": "arrow",
- "weight": 400,
+ "weight": "400 g",
"volume": "1750 ml",
"bashing": 8,
"armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 14 },
@@ -468,7 +468,7 @@
"skill": "archery",
"min_strength": 5,
"ammo": "arrow",
- "weight": 540,
+ "weight": "540 g",
"volume": "2500 ml",
"bashing": 12,
"armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 20 },
@@ -495,7 +495,7 @@
"skill": "archery",
"ammo": "arrow",
"min_strength": 5,
- "weight": 400,
+ "weight": "400 g",
"volume": "1500 ml",
"bashing": 12,
"armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 14 },
@@ -522,7 +522,7 @@
"skill": "archery",
"min_strength": 5,
"ammo": "arrow",
- "weight": 600,
+ "weight": "600 g",
"volume": "3500 ml",
"bashing": 12,
"armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 20 },
@@ -549,7 +549,7 @@
"skill": "archery",
"min_strength": 5,
"ammo": "arrow",
- "weight": 680,
+ "weight": "680 g",
"volume": "3500 ml",
"bashing": 10,
"armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 20 },
@@ -572,7 +572,7 @@
"description": "An extremely large and stiff longbow, made with enormous limbs and a thick string to take an immense amount of energy. Takes incredible strength to draw.",
"price": 150000,
"min_strength": 18,
- "weight": 3200,
+ "weight": "3200 g",
"volume": "6250 ml",
"armor_data": { "covers": [ "TORSO" ], "coverage": 7, "material_thickness": 2, "encumbrance": 25 },
"dispersion": 200,
@@ -595,7 +595,7 @@
"skill": "archery",
"min_strength": 18,
"ammo": "arrow",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "4 L",
"bashing": 14,
"reload_noise_volume": 4,
@@ -621,7 +621,7 @@
"skill": "archery",
"min_strength": 6,
"ammo": "arrow",
- "weight": 450,
+ "weight": "450 g",
"volume": "2 L",
"bashing": 12,
"armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 14 },
@@ -647,7 +647,7 @@
"description": "A thin and flat knife made for throwing. Its ineffective cutting edge and odd shape makes it unsuitable for use as a tool.",
"material": "steel",
"volume": "250 ml",
- "weight": 268,
+ "weight": "268 g",
"bashing": 1,
"cutting": 10,
"thrown_damage": [ { "damage_type": "cut", "amount": 14 } ],
@@ -665,7 +665,7 @@
"description": "A lightweight hatchet made for throwing. Its ineffective cutting edge and light weight makes it unsuitable for use as a tool.",
"material": [ "steel", "wood" ],
"volume": "750 ml",
- "weight": 792,
+ "weight": "792 g",
"bashing": 6,
"cutting": 16,
"thrown_damage": [ { "damage_type": "bash", "amount": 6 }, { "damage_type": "cut", "amount": 16 } ],
@@ -683,7 +683,7 @@
"description": "A large plastic dart made for outdoor games.",
"material": [ "plastic", "iron" ],
"volume": "500 ml",
- "weight": 175,
+ "weight": "175 g",
"to_hit": -1,
"cutting": 8,
"thrown_damage": [ { "damage_type": "stab", "amount": 16 } ],
@@ -701,7 +701,7 @@
"description": "A plastic frisbee made for outdoor games.",
"material": [ "plastic" ],
"volume": "500 ml",
- "weight": 175,
+ "weight": "175 g",
"bashing": 1,
"thrown_damage": [ { "damage_type": "bash", "amount": 1 } ],
"ammo_type": "thrown",
@@ -718,7 +718,7 @@
"description": "A plastic disc made for playing disc golf, it is smaller and denser then a normal frisbee.",
"material": [ "plastic" ],
"volume": "250 ml",
- "weight": 170,
+ "weight": "170 g",
"bashing": 2,
"thrown_damage": [ { "damage_type": "bash", "amount": 1 } ],
"ammo_type": "thrown",
@@ -734,7 +734,7 @@
"description": "An underwater fishing spear made from wood tipped with steel. It's very light, but doesn't have much range. Stands a below average chance of remaining intact once fired.",
"material": "wood",
"volume": "250 ml",
- "weight": 18,
+ "weight": "18 g",
"bashing": 1,
"ammo_type": "fishspear",
"damage": 12,
@@ -755,7 +755,7 @@
"description": "An underwater fishing spear made from metal. It's light, but doesn't have much range. Stands a very good chance of remaining intact once fired.",
"material": "iron",
"volume": "250 ml",
- "weight": 28,
+ "weight": "28 g",
"bashing": 1,
"ammo_type": "fishspear",
"damage": 14,
@@ -776,7 +776,7 @@
"description": "An underwater fishing spear made from carbon fiber. It's very light, but doesn't have much range. Stands a bad chance of remaining intact once fired.",
"material": "kevlar",
"volume": "250 ml",
- "weight": 12,
+ "weight": "12 g",
"bashing": 1,
"ammo_type": "fishspear",
"damage": 14,
@@ -797,7 +797,7 @@
"price": 500,
"material": [ "wood", "plastic" ],
"volume": "250 ml",
- "weight": 60,
+ "weight": "60 g",
"bashing": 2,
"cutting": 1,
"ammo_type": "arrow",
diff --git a/data/json/items/armor.json b/data/json/items/armor.json
index 1fb1ec5c9eb66..6b78c1d82e923 100644
--- a/data/json/items/armor.json
+++ b/data/json/items/armor.json
@@ -4,7 +4,7 @@
"type": "ARMOR",
"name": "ten-gallon hat",
"description": "These may not be the Great Plains, but you can still be the Boss with this high-crowned, wide-brimmed hat.",
- "weight": 410,
+ "weight": "410 g",
"volume": "2500 ml",
"price": 17900,
"material": [ "wool" ],
@@ -25,7 +25,7 @@
"name": "pair of 2-by-arm guards",
"name_plural": "pairs of 2-by-arm guards",
"description": "A pair of improvised arm guards made from broken pieces of a two by four that are tied to your arms with rags and string. They offer good protection, but are really uncomfortable to wear.",
- "weight": 300,
+ "weight": "300 g",
"volume": "1500 ml",
"price": 500,
"to_hit": -1,
@@ -48,7 +48,7 @@
"name": "pair of 2-by-shin guards",
"name_plural": "pairs of 2-by-shin guards",
"description": "A pair of improvised shin guards made from broken pieces of a two by four that are tied to your shins with rags and string. They offer good protection, but are really hard to run with.",
- "weight": 300,
+ "weight": "300 g",
"volume": "1500 ml",
"price": 500,
"to_hit": -1,
@@ -69,7 +69,7 @@
"category": "armor",
"name": "AEP suit",
"description": "An armored environmental protection suit. Custom-built from a cleansuit and body armor, it provides excellent protection against both physical harm and ambient radiation.",
- "weight": 7200,
+ "weight": "7200 g",
"volume": "9 L",
"price": 140000,
"material": [ "kevlar", "plastic" ],
@@ -89,7 +89,7 @@
"type": "ARMOR",
"name": "American flag",
"description": "A large American flag made to fly in even the worst conditions.",
- "weight": 3404,
+ "weight": "3404 g",
"volume": "2 L",
"price": 5000,
"to_hit": -1,
@@ -109,7 +109,7 @@
"type": "ARMOR",
"name": "leather apron",
"description": "An apron made of thick leather. Cumbersome, but offers excellent protection from cuts.",
- "weight": 1950,
+ "weight": "1950 g",
"volume": "2250 ml",
"price": 1500,
"to_hit": 1,
@@ -130,7 +130,7 @@
"type": "ARMOR",
"name": "arm splint",
"description": "A tool to help set bones and hold them in place.",
- "weight": 300,
+ "weight": "300 g",
"volume": "1 L",
"price": 20000,
"material": [ "wood", "cotton" ],
@@ -149,7 +149,7 @@
"name": "arm splint XL",
"description": "A tool to help set bones and hold them in place. It is specifically designed to fit Huge survivors.",
"copy-from": "arm_splint",
- "weight": 600,
+ "weight": "600 g",
"volume": "2 L",
"price": 25000,
"encumbrance": 140,
@@ -161,7 +161,7 @@
"name": "pair of arm warmers",
"name_plural": "pairs of arm warmers",
"description": "Snug, soft cloth sleeves to keep your arms warm.",
- "weight": 32,
+ "weight": "32 g",
"volume": "250 ml",
"price": 1000,
"material": [ "cotton" ],
@@ -181,7 +181,7 @@
"name": "pair of bone arm guards",
"name_plural": "pairs of bone arm guards",
"description": "A pair of arm guards made from leather, reinforced with bone. Light and strong.",
- "weight": 645,
+ "weight": "645 g",
"volume": "3 L",
"price": 20000,
"to_hit": 1,
@@ -203,7 +203,7 @@
"name": "pair of chitin arm guards",
"name_plural": "pairs of chitin arm guards",
"description": "A pair of arm guards made from the exoskeletons of insects. Light and durable.",
- "weight": 392,
+ "weight": "392 g",
"volume": "2500 ml",
"price": 20000,
"to_hit": 1,
@@ -236,7 +236,7 @@
"name": "pair of hard arm guards",
"name_plural": "pairs of hard arm guards",
"description": "A pair of neoprene arm sleeves covered with molded plastic sheaths.",
- "weight": 350,
+ "weight": "350 g",
"volume": "3 L",
"price": 3500,
"to_hit": 1,
@@ -258,7 +258,7 @@
"name": "pair of leather arm guards",
"name_plural": "pairs of leather arm guards",
"description": "A pair of tough leather arm guards. Light and comfortable.",
- "weight": 430,
+ "weight": "430 g",
"volume": "2 L",
"price": 4000,
"to_hit": 1,
@@ -279,7 +279,7 @@
"name": "pair of steel arm guards",
"name_plural": "pairs of steel arm guards",
"description": "A full assembly of medieval arm protection. Rerebraces, couters, and vambraces, with leather straps to secure each piece and connect it as part of a set.",
- "weight": 2720,
+ "weight": "2720 g",
"volume": "5500 ml",
"price": 20000,
"to_hit": -1,
@@ -301,7 +301,7 @@
"name_plural": "pairs of metal arm guards",
"//": "They're not actually FANCY, so calling them 'very stylish' seemed inaccurate.",
"description": "A pair of arm guards hammered out from metal. Perfect for the Post-Apocalyptic Warrior look.",
- "weight": 1080,
+ "weight": "1080 g",
"volume": "2750 ml",
"price": 30000,
"to_hit": 1,
@@ -322,7 +322,7 @@
"name": "pair of paper arm guards",
"name_plural": "pairs of paper arm guards",
"description": "Arm guards made of stacked paper sheets held together with duct tape.",
- "weight": 360,
+ "weight": "360 g",
"volume": "500 ml",
"price": 230,
"to_hit": 1,
@@ -343,7 +343,7 @@
"name": "pair of scrap arm guards",
"name_plural": "pairs of scrap arm guards",
"description": "A pair of arm guards made from scraps of metal secured by simple strings; the loose collection of plates provides decent but not the most convenient protection.",
- "weight": 3064,
+ "weight": "3064 g",
"volume": "4750 ml",
"price": 20000,
"to_hit": 1,
@@ -366,7 +366,7 @@
"name": "pair of neoprene arm sleeves",
"name_plural": "pairs of neoprene arm sleeves",
"description": "A pair of soft neoprene arm sleeves. Often used in contact sports.",
- "weight": 258,
+ "weight": "258 g",
"volume": "1500 ml",
"price": 1200,
"to_hit": 1,
@@ -387,7 +387,7 @@
"category": "armor",
"name": "boiled leather armor",
"description": "Thick leather body armor that has been hardened via chemical treatment. Light and strong.",
- "weight": 2108,
+ "weight": "2108 g",
"volume": "9500 ml",
"price": 26000,
"to_hit": -5,
@@ -409,7 +409,7 @@
"category": "armor",
"name": "bone body armor",
"description": "Body armor consisting of a leather suit with strategically-placed bone reinforcement. Light and strong.",
- "weight": 2687,
+ "weight": "2687 g",
"volume": "12500 ml",
"price": 100000,
"to_hit": -5,
@@ -430,7 +430,7 @@
"category": "armor",
"name": "chitinous armor",
"description": "Leg and body armor made from the exoskeletons of insects. Light and durable.",
- "weight": 2632,
+ "weight": "2632 g",
"volume": "17500 ml",
"price": 120000,
"to_hit": -5,
@@ -461,7 +461,7 @@
"category": "armor",
"name": "fur body armor",
"description": "Thick body armor made from furs. Warm and comfortable.",
- "weight": 3414,
+ "weight": "3414 g",
"volume": "10 L",
"price": 100000,
"to_hit": -5,
@@ -484,7 +484,7 @@
"name": "lamellar cuirass",
"name_plural": "lamellar cuirasses",
"description": "A cuirass made of multiple pieces of tough leather, laced together for durable yet flexible protection.",
- "weight": 2108,
+ "weight": "2108 g",
"volume": "9250 ml",
"price": 26000,
"to_hit": -5,
@@ -505,7 +505,7 @@
"category": "armor",
"name": "leather body armor",
"description": "Thick leather body armor. Light and comfortable.",
- "weight": 1498,
+ "weight": "1498 g",
"volume": "7 L",
"price": 12000,
"to_hit": -5,
@@ -527,7 +527,7 @@
"category": "armor",
"name": "plate armor",
"description": "A suit of Gothic plate armor.",
- "weight": 11000,
+ "weight": "11000 g",
"volume": "17500 ml",
"price": 60000,
"to_hit": -5,
@@ -548,7 +548,7 @@
"name": "lorica segmentata",
"name_plural": "lorica segmentata",
"description": "An ancient Roman laminar armor, made of overlapping metal strips connected to internal leather straps.",
- "weight": 5286,
+ "weight": "5286 g",
"volume": "6 L",
"price": 50000,
"to_hit": -5,
@@ -568,7 +568,7 @@
"type": "ARMOR",
"name": "nomad gear",
"description": "A makeshift outfit made from pre-cataclysm clothing designed for long travels. It has a lot of storage space.",
- "weight": 5830,
+ "weight": "5830 g",
"volume": "7500 ml",
"price": 35000,
"to_hit": -3,
@@ -589,7 +589,7 @@
"type": "ARMOR",
"name": "light nomad gear",
"description": "A light makeshift outfit made from pre-cataclysm clothing designed for long summer travels. It offers less storage space and armor compared to regular nomad gear.",
- "weight": 3200,
+ "weight": "3200 g",
"volume": "6500 ml",
"price": 29500,
"to_hit": -4,
@@ -612,7 +612,7 @@
"category": "armor",
"name": "plated leather armor",
"description": "Thick leather body armor that has been reinforced with strategically-placed metal plates. Strong and comfortable.",
- "weight": 4280,
+ "weight": "4280 g",
"volume": "9 L",
"price": 110000,
"to_hit": -5,
@@ -635,7 +635,7 @@
"category": "armor",
"name": "ornamental plate armor",
"description": "An extremely heavy suit of ornamental armor.",
- "weight": 18000,
+ "weight": "18000 g",
"volume": "30 L",
"price": 780000,
"to_hit": -5,
@@ -657,7 +657,7 @@
"name": "riot armor",
"description": "Black armor used by riot police officers. The padded layers and hard plastic shoulder guards offer good protection without much encumbrance. The word POLICE is emblazoned across the front.",
"looks_like": "kevlar",
- "weight": 4000,
+ "weight": "4000 g",
"volume": "7500 ml",
"price": 35000,
"to_hit": -3,
@@ -678,7 +678,7 @@
"category": "armor",
"name": "O-yoroi",
"description": "An ornamental suit of Japanese samurai armor.",
- "weight": 9220,
+ "weight": "9220 g",
"volume": "11500 ml",
"price": 90000,
"bashing": 8,
@@ -697,7 +697,7 @@
"type": "ARMOR",
"name": "scavenger gear",
"description": "A sturdy scavenger's outfit made from refitted pre-cataclysm protective gear. It has a lot of storage space.",
- "weight": 7915,
+ "weight": "7915 g",
"volume": "7500 ml",
"price": 180000,
"to_hit": -3,
@@ -719,7 +719,7 @@
"category": "armor",
"name": "scrap suit",
"description": "A suit of armor made from scraps of metal secured by simple strings; the loose collection of plates provides decent but not the most convenient protection.",
- "weight": 9534,
+ "weight": "9534 g",
"volume": "15500 ml",
"price": 60000,
"to_hit": -5,
@@ -740,7 +740,7 @@
"type": "ARMOR",
"name": "camo tank top",
"description": "A sleeveless cotton shirt with camouflage dye. Very easy to move in.",
- "weight": 78,
+ "weight": "78 g",
"volume": "250 ml",
"price": 1500,
"material": [ "cotton" ],
@@ -757,7 +757,7 @@
"name": "basketball shorts",
"name_plural": "basketball shorts",
"description": "A pair of basketball shorts. Comfortable and light.",
- "weight": 190,
+ "weight": "190 g",
"volume": "1 L",
"price": 1300,
"to_hit": 1,
@@ -776,7 +776,7 @@
"type": "ARMOR",
"name": "balaclava",
"description": "A warm covering that protects the head and face from the cold.",
- "weight": 40,
+ "weight": "40 g",
"volume": "250 ml",
"price": 3500,
"material": [ "cotton" ],
@@ -794,7 +794,7 @@
"type": "ARMOR",
"name": "baldric",
"description": "A leather scabbard, big enough for anything up to a longsword, or even a bit larger than that. Designed to be worn at the waist, secured by a shoulder belt. Activate to sheath/draw a sword.",
- "weight": 1625,
+ "weight": "1625 g",
"volume": "2 L",
"price": 7500,
"bashing": 4,
@@ -820,7 +820,7 @@
"type": "ARMOR",
"name": "bandana",
"description": "A cotton bandana, worn over the mouth for warmth and minor protection from dust and other contaminants.",
- "weight": 42,
+ "weight": "42 g",
"volume": "250 ml",
"price": 600,
"to_hit": -1,
@@ -839,7 +839,7 @@
"type": "ARMOR",
"name": "barrette",
"description": "A barrette with lots of ornaments.",
- "weight": 5,
+ "weight": "5 g",
"volume": 0,
"price": 800,
"material": [ "plastic" ],
@@ -852,7 +852,7 @@
"type": "ARMOR",
"name": "laundry basket",
"description": "A plastic basket meant for storing and hauling clothing.",
- "weight": 680,
+ "weight": "680 g",
"volume": "25 L",
"price": 75,
"to_hit": -2,
@@ -873,7 +873,7 @@
"name": "pair of beekeeping gloves",
"name_plural": "pairs of beekeeping gloves",
"description": "A pair of white beekeeping gloves made out of smooth leather.",
- "weight": 120,
+ "weight": "120 g",
"volume": "250 ml",
"price": 3000,
"to_hit": 1,
@@ -893,7 +893,7 @@
"type": "ARMOR",
"name": "beekeeping hood",
"description": "A beekeeping hood. Keeps the bees out, but lets fresh air in. Rather cumbersome to wear, as it is rather bulky and hinders vision.",
- "weight": 260,
+ "weight": "260 g",
"volume": "1500 ml",
"price": 4500,
"material": [ "cotton", "plastic" ],
@@ -912,7 +912,7 @@
"type": "ARMOR",
"name": "beekeeping suit",
"description": "A white suit commonly worn by professional beekeepers with straps on your ankles and wrists to prevent bees from flying in. It's not a very tough fabric, but it's lightweight and has plenty of storage thanks to a chest pocket.",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "3500 ml",
"price": 12000,
"to_hit": -5,
@@ -933,7 +933,7 @@
"type": "ARMOR",
"name": "beret",
"description": "A soft cotton hat. Commonly worn by armed forces and existentialists.",
- "weight": 120,
+ "weight": "120 g",
"volume": "250 ml",
"price": 1200,
"material": [ "cotton" ],
@@ -950,7 +950,7 @@
"type": "ARMOR",
"name": "wool beret",
"description": "A soft wool hat. Commonly worn by armed forces and existentialists.",
- "weight": 160,
+ "weight": "160 g",
"volume": "250 ml",
"price": 1500,
"material": [ "wool" ],
@@ -967,7 +967,7 @@
"type": "ARMOR",
"name": "bikini bottom",
"description": "A simple bikini bottom.",
- "weight": 32,
+ "weight": "32 g",
"volume": "250 ml",
"price": 1000,
"material": [ "cotton" ],
@@ -984,7 +984,7 @@
"type": "ARMOR",
"name": "bikini top",
"description": "A simple bikini top.",
- "weight": 32,
+ "weight": "32 g",
"volume": "250 ml",
"price": 1800,
"material": [ "cotton" ],
@@ -1000,7 +1000,7 @@
"type": "ARMOR",
"name": "fur bikini top",
"description": "A simple fur bikini top.",
- "weight": 44,
+ "weight": "44 g",
"volume": "250 ml",
"price": 4900,
"material": [ "fur" ],
@@ -1017,7 +1017,7 @@
"type": "ARMOR",
"name": "leather bikini top",
"description": "A simple leather bikini top.",
- "weight": 38,
+ "weight": "38 g",
"volume": "250 ml",
"price": 3500,
"material": [ "leather" ],
@@ -1034,7 +1034,7 @@
"type": "ARMOR",
"name": "bindle",
"description": "You're ready for a trip down some train tracks. Also known as a hobo stick.",
- "weight": 980,
+ "weight": "980 g",
"volume": "3 L",
"price": 80,
"to_hit": -2,
@@ -1054,7 +1054,7 @@
"type": "ARMOR",
"name": "blanket",
"description": "Hiding under here will not protect you from the monsters.",
- "weight": 1123,
+ "weight": "1123 g",
"volume": "2500 ml",
"price": 5500,
"to_hit": -1,
@@ -1074,7 +1074,7 @@
"type": "ARMOR",
"name": "blazer",
"description": "A professional-looking wool blazer. Quite cumbersome.",
- "weight": 680,
+ "weight": "680 g",
"volume": "3500 ml",
"price": 12000,
"material": [ "wool" ],
@@ -1094,7 +1094,7 @@
"name": "blindfold",
"//": "A folded bandana still takes up some space on the head.",
"description": "A simple fabric covering tied over the eyes to block sight. Useful for sleeping in bright areas.",
- "weight": 72,
+ "weight": "72 g",
"volume": "250 ml",
"price": 600,
"material": [ "cotton" ],
@@ -1113,7 +1113,7 @@
"type": "ARMOR",
"name": "bondage mask",
"description": "A tight mask made of black leather. The eyes and mouth can be closed using zippers.",
- "weight": 210,
+ "weight": "210 g",
"volume": "1 L",
"price": 4000,
"to_hit": -3,
@@ -1154,7 +1154,7 @@
"type": "ARMOR",
"name": "bondage suit",
"description": "A suit of snug, black leather. Has no pockets, but does feature an abundance of unusually located zippers.",
- "weight": 1800,
+ "weight": "1800 g",
"volume": "3250 ml",
"price": 211000,
"to_hit": -3,
@@ -1175,7 +1175,7 @@
"category": "armor",
"name": "bookplate",
"description": "A crude form of armor made from stacked paper and rolls of duct tape, this breastplate offers a surprising amount of protection.",
- "weight": 1790,
+ "weight": "1790 g",
"volume": "9500 ml",
"price": 4200,
"to_hit": -1,
@@ -1194,7 +1194,7 @@
"type": "ARMOR",
"name": "ankle sheath",
"description": "A small concealed knife sheath worn on the ankle. It is awkward to use without practice. Activate to sheathe/draw a weapon.",
- "weight": 160,
+ "weight": "160 g",
"volume": "500 ml",
"price": 5200,
"to_hit": -1,
@@ -1220,7 +1220,7 @@
"type": "ARMOR",
"name": "spear strap",
"description": "A leather strap tied around the torso for toting spears while keeping your hands free. You have to duck to get through doors while one's in it, though. Activate to holster/draw a weapon.",
- "weight": 160,
+ "weight": "160 g",
"volume": "500 ml",
"price": 5200,
"to_hit": -1,
@@ -1246,7 +1246,7 @@
"type": "ARMOR",
"name": "bowler hat",
"description": "The only hat for a made man. Look like a real good fella while laughing in the face of your foes!",
- "weight": 213,
+ "weight": "213 g",
"volume": "1250 ml",
"price": 4500,
"material": [ "cotton" ],
@@ -1266,7 +1266,7 @@
"name": "boxer briefs",
"name_plural": "boxer briefs",
"description": "The age-old question, boxers or briefs? Your answer? Yes.",
- "weight": 37,
+ "weight": "37 g",
"volume": "250 ml",
"price": 1000,
"material": [ "cotton" ],
@@ -1284,7 +1284,7 @@
"name": "boxer shorts",
"name_plural": "boxer shorts",
"description": "Men's boxer shorts. More fashionable than briefs and just as comfortable.",
- "weight": 42,
+ "weight": "42 g",
"volume": "250 ml",
"price": 1000,
"material": [ "cotton" ],
@@ -1302,7 +1302,7 @@
"name": "pair of boxing gloves",
"name_plural": "pairs of boxing gloves",
"description": "A pair of big, red, 8 oz. boxing gloves. They make dexterous tasks near impossible, but provide ample protection.",
- "weight": 453,
+ "weight": "453 g",
"volume": "1 L",
"price": 4000,
"to_hit": 1,
@@ -1323,7 +1323,7 @@
"name": "boy shorts",
"name_plural": "boy shorts",
"description": "Female underwear similar to men's boxer shorts, but much more close-fitting.",
- "weight": 42,
+ "weight": "42 g",
"volume": "250 ml",
"price": 1000,
"material": [ "cotton" ],
@@ -1340,7 +1340,7 @@
"type": "ARMOR",
"name": "bra",
"description": "A simple bra. For protecting those bits you don't want zombies to look at.",
- "weight": 32,
+ "weight": "32 g",
"volume": "250 ml",
"price": 1000,
"material": [ "cotton" ],
@@ -1358,7 +1358,7 @@
"name": "breeches",
"name_plural": "breeches",
"description": "A well-made pair of old-fashioned pants, made of stiff yet baggy material. Comfortable, but lacks pockets.",
- "weight": 520,
+ "weight": "520 g",
"volume": "1750 ml",
"price": 4900,
"to_hit": 1,
@@ -1377,7 +1377,7 @@
"type": "ARMOR",
"name": "briefcase",
"description": "Useful for carrying money, documents, or smuggled goods.",
- "weight": 1700,
+ "weight": "1700 g",
"volume": "15 L",
"price": 24000,
"to_hit": -2,
@@ -1398,7 +1398,7 @@
"name": "briefs",
"name_plural": "briefs",
"description": "A pair of briefs. Comfortable underwear worn by men.",
- "weight": 32,
+ "weight": "32 g",
"volume": "250 ml",
"price": 1000,
"material": [ "cotton" ],
@@ -1415,7 +1415,7 @@
"type": "ARMOR",
"name": "back scabbard",
"description": "A leather scabbard, big enough for almost any sword. Designed to be strapped to the back, it's very difficult to draw from without considerable practice. Activate to sheath/draw a sword.",
- "weight": 1890,
+ "weight": "1890 g",
"volume": "2250 ml",
"price": 9000,
"bashing": 4,
@@ -1442,7 +1442,7 @@
"category": "armor",
"name": "turnout coat",
"description": "A heavy protective coat worn by firefighters. Highly resistant to heat and flame, it provides excellent protection from injury.",
- "weight": 1930,
+ "weight": "1930 g",
"volume": "5 L",
"price": 91000,
"to_hit": -1,
@@ -1466,7 +1466,7 @@
"name_plural": "turnout trousers",
"//": "Fire-resistant outerwear ain't cheap.",
"description": "A heavy pair of protective overalls worn by firefighters. Highly resistant to heat and flame, they provide excellent protection from injury.",
- "weight": 2290,
+ "weight": "2290 g",
"volume": "5 L",
"price": 81500,
"to_hit": -1,
@@ -1487,7 +1487,7 @@
"type": "ARMOR",
"name": "camisole",
"description": "A small camisole made from silk. Typically used as an undergarment, they are light and easy to wear.",
- "weight": 42,
+ "weight": "42 g",
"volume": "500 ml",
"price": 2000,
"to_hit": -5,
@@ -1504,7 +1504,7 @@
"type": "ARMOR",
"name": "Foodperson's cape",
"description": "A brightly-colored cape emblazoned with the \"Fp\" symbol.",
- "weight": 900,
+ "weight": "900 g",
"volume": "3 L",
"price": 5000,
"to_hit": -1,
@@ -1524,7 +1524,7 @@
"name": "cassock",
"name_plural": "cassocks",
"description": "A piece of clerical clothing, usually worn by Christian priests.",
- "weight": 1200,
+ "weight": "1200 g",
"volume": "5 L",
"price": 20000,
"to_hit": -5,
@@ -1545,7 +1545,7 @@
"name": "pair of chainmail sleeves",
"name_plural": "pairs of chainmail sleeves",
"description": "Customized chainmail arms. Each sleeve has straps to connect them with each other. The lack of fingers makes them less cumbersome and allows them to be used with gloves.",
- "weight": 2812,
+ "weight": "2812 g",
"volume": "750 ml",
"price": 7500,
"to_hit": -1,
@@ -1564,7 +1564,7 @@
"category": "armor",
"name": "chainmail coif",
"description": "A customized chainmail hood. Can be worn comfortably under helmets.",
- "weight": 2006,
+ "weight": "2006 g",
"volume": "500 ml",
"price": 5012,
"to_hit": -1,
@@ -1584,7 +1584,7 @@
"name": "chainmail leggings",
"name_plural": "pairs of chainmail leggings",
"description": "Customized chainmail legs. Their straps keep everything in place, and the lack of toes and heels allows them to work perfectly well with footwear.",
- "weight": 4212,
+ "weight": "4212 g",
"volume": "1500 ml",
"price": 7500,
"to_hit": -1,
@@ -1603,7 +1603,7 @@
"category": "armor",
"name": "chainmail hauberk",
"description": "A fully customized chainmail outfit, leaving the head uncovered. The shirt, arms, and leggings have been modified with straps and combined with a gambeson to deal with uneven weight distribution, cold environments and to allow them to be used separately.",
- "weight": 14430,
+ "weight": "14430 g",
"volume": "2750 ml",
"price": 35988,
"to_hit": -1,
@@ -1623,7 +1623,7 @@
"category": "armor",
"name": "chainmail armor",
"description": "A fully customized chainmail suit. The coif, shirt, arms, and leggings have been modified with straps and combined with a gambeson to deal with uneven weight distribution, cold environments and to allow them to be used separately.",
- "weight": 16436,
+ "weight": "16436 g",
"volume": "3250 ml",
"price": 45000,
"to_hit": -1,
@@ -1643,7 +1643,7 @@
"category": "armor",
"name": "chainmail vest",
"description": "A customized chainmail vest. It's a sleeveless piece of chainmail with small straps designed to better distribute the weight.",
- "weight": 6953,
+ "weight": "6953 g",
"volume": "1 L",
"price": 10000,
"to_hit": -1,
@@ -1662,7 +1662,7 @@
"name": "leather chaps",
"name_plural": "leather chaps",
"description": "A pair of black leather chaps. Very tough and light, but doesn't offer any storage.",
- "weight": 1414,
+ "weight": "1414 g",
"volume": "1250 ml",
"price": 21000,
"to_hit": -1,
@@ -1682,7 +1682,7 @@
"category": "armor",
"name": "hard chest guard",
"description": "A plastron of interlocking plastic plate protecting your torso.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "7 L",
"price": 60000,
"to_hit": -2,
@@ -1702,7 +1702,7 @@
"type": "ARMOR",
"name": "chestwrap",
"description": "Rags wrapped around the chest. Preserves your modesty and keeps things out of the way, but not good for much else.",
- "weight": 64,
+ "weight": "64 g",
"volume": "500 ml",
"price": 500,
"material": [ "cotton" ],
@@ -1719,7 +1719,7 @@
"type": "ARMOR",
"name": "fur chestwrap",
"description": "Fur pelts wrapped around the chest. Preserves your modesty and keeps things out of the way, but not good for much else.",
- "weight": 154,
+ "weight": "154 g",
"volume": "750 ml",
"price": 700,
"material": [ "fur" ],
@@ -1737,7 +1737,7 @@
"type": "ARMOR",
"name": "leather chestwrap",
"description": "Leather patches wrapped around the chest. Preserves your modesty and keeps things out of the way, but not good for much else.",
- "weight": 137,
+ "weight": "137 g",
"volume": "750 ml",
"price": 525,
"material": [ "leather" ],
@@ -1755,7 +1755,7 @@
"type": "ARMOR",
"name": "wool chestwrap",
"description": "Felt patches wrapped around the chest. Preserves your modesty and keeps things out of the way, but not good for much else.",
- "weight": 64,
+ "weight": "64 g",
"volume": "500 ml",
"price": 500,
"material": [ "wool" ],
@@ -1773,7 +1773,7 @@
"type": "ARMOR",
"name": "cleansuit",
"description": "A simple hazardous materials handling suit. Though somewhat restrictive and fragile, wearing it will provide excellent protection against ambient radiation.",
- "weight": 2100,
+ "weight": "2100 g",
"volume": "2500 ml",
"price": 7700,
"material": [ "plastic" ],
@@ -1792,7 +1792,7 @@
"type": "ARMOR",
"name": "cloak",
"description": "A heavy cloak meant to be thrown over your body.",
- "weight": 1175,
+ "weight": "1175 g",
"volume": "3 L",
"price": 10700,
"to_hit": -1,
@@ -1812,7 +1812,7 @@
"type": "ARMOR",
"name": "fur cloak",
"description": "A heavy fur cloak meant to be thrown over your body.",
- "weight": 1735,
+ "weight": "1735 g",
"volume": "4 L",
"price": 24500,
"to_hit": -1,
@@ -1832,7 +1832,7 @@
"type": "ARMOR",
"name": "leather cloak",
"description": "A heavy leather cloak meant to be thrown over your body. Provides decent protection.",
- "weight": 2060,
+ "weight": "2060 g",
"volume": "3500 ml",
"price": 24500,
"to_hit": -1,
@@ -1852,7 +1852,7 @@
"type": "ARMOR",
"name": "wool cloak",
"description": "A heavy woolen cloak meant to be thrown over your body.",
- "weight": 1525,
+ "weight": "1525 g",
"volume": "3750 ml",
"price": 24500,
"to_hit": -1,
@@ -1872,7 +1872,7 @@
"type": "ARMOR",
"name": "clown suit",
"description": "A colorful and ridiculous costume fit for a clown. Provides decent storage.",
- "weight": 1420,
+ "weight": "1420 g",
"volume": "5750 ml",
"price": 2500,
"to_hit": -3,
@@ -1892,7 +1892,7 @@
"type": "ARMOR",
"name": "fur coat",
"description": "A fur coat with a couple small pockets. Extremely warm.",
- "weight": 1677,
+ "weight": "1677 g",
"volume": "5750 ml",
"price": 45000,
"to_hit": -5,
@@ -1925,7 +1925,7 @@
"type": "ARMOR",
"name": "sable coat",
"description": "A very well-made fur coat, featuring thick panels of sable fur. Very warm and very good-looking.",
- "weight": 1677,
+ "weight": "1677 g",
"volume": "5750 ml",
"price": 7760000,
"to_hit": -5,
@@ -1946,7 +1946,7 @@
"type": "ARMOR",
"name": "lab coat",
"description": "A long white coat with several large pockets. Comes with a very nice pocket protector.",
- "weight": 580,
+ "weight": "580 g",
"volume": "2250 ml",
"price": 2500,
"to_hit": -2,
@@ -1966,7 +1966,7 @@
"type": "ARMOR",
"name": "rain coat",
"description": "A plastic coat with a hood and two very large pockets. Provides protection from rain.",
- "weight": 960,
+ "weight": "960 g",
"volume": "1750 ml",
"price": 7900,
"material": [ "plastic", "cotton" ],
@@ -1986,7 +1986,7 @@
"type": "ARMOR",
"name": "gutskin parka",
"description": "An intricately sewn coat of treated and split intestines, prized for its light weight and waterproofness among the indigenous peoples of the arctic.",
- "weight": 200,
+ "weight": "200 g",
"volume": "1250 ml",
"price": 13000,
"material": [ "flesh" ],
@@ -2005,7 +2005,7 @@
"type": "ARMOR",
"name": "winter coat",
"description": "A padded coat with deep pockets and a hood. Very warm.",
- "weight": 1340,
+ "weight": "1340 g",
"volume": "6750 ml",
"price": 14000,
"to_hit": -2,
@@ -2026,7 +2026,7 @@
"type": "ARMOR",
"name": "leather corset",
"description": "A snug, black leather corset. Has no pockets, but its thick material provides good protection from harm.",
- "weight": 640,
+ "weight": "640 g",
"volume": "1250 ml",
"price": 11000,
"to_hit": -3,
@@ -2046,7 +2046,7 @@
"type": "ARMOR",
"name": "cowboy hat",
"description": "Whether yer hunting varmints, fixing up the ranch, or heading into the sunset, this is the hat for the job.",
- "weight": 390,
+ "weight": "390 g",
"volume": "2 L",
"price": 9500,
"material": [ "leather" ],
@@ -2065,7 +2065,7 @@
"type": "ARMOR",
"name": "knit cowl",
"description": "A snuggly woolen cowl. It's one of those stylish and bulky cowls you see in fashion magazines.",
- "weight": 272,
+ "weight": "272 g",
"volume": "2 L",
"price": 2000,
"to_hit": -2,
@@ -2084,7 +2084,7 @@
"type": "ARMOR",
"name": "golden crown",
"description": "A delicate golden crown featuring flowering trees.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "1 L",
"price": 30000,
"material": [ "gold" ],
@@ -2101,7 +2101,7 @@
"type": "ARMOR",
"name": "golden crown",
"description": "A golden crown for the monarch of survivors.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "1 L",
"price": 30000,
"material": [ "gold" ],
@@ -2120,7 +2120,7 @@
"name": "cuirass",
"name_plural": "cuirasses",
"description": "A steel breastplate, and a vital part of plate armor. Even as full armor went into decline, cuirasses remained in use among cavalry in Europe.",
- "weight": 4200,
+ "weight": "4200 g",
"volume": "6 L",
"price": 20000,
"to_hit": -1,
@@ -2141,7 +2141,7 @@
"name": "scrap cuirass",
"name_plural": "scrap cuirasses",
"description": "A cuirass made from scraps of metal secured by simple strings; the loose collection of plates provides decent but not the most convenient protection.",
- "weight": 3366,
+ "weight": "3366 g",
"volume": "5750 ml",
"price": 20000,
"to_hit": -1,
@@ -2157,12 +2157,34 @@
"material_thickness": 2,
"flags": [ "OUTER" ]
},
+ {
+ "id": "daypack",
+ "type": "ARMOR",
+ "name": "daypack",
+ "description": "An ultralight nylon backpack intended for one-day hiking trips. Waterproof, slim, and spacious.",
+ "symbol": "[",
+ "color": "red",
+ "weight": 411,
+ "volume": "2 L",
+ "//": "REI Co-op 22-liter daypack costs $54.95, so ballpark to $55",
+ "price": 5500,
+ "price_postapoc": 10000,
+ "material": [ "cotton", "plastic" ],
+ "covers": [ "TORSO" ],
+ "coverage": 50,
+ "material_thickness": 1,
+ "encumbrance": 18,
+ "storage": 96,
+ "warmth": 5,
+ "flags": [ "BELTED", "OVERSIZE", "STURDY" ],
+ "looks_like": "backpack"
+ },
{
"id": "dinosuit",
"type": "ARMOR",
"name": "dinosaur suit",
"description": "A full-body costume in the form of an anthropomorphic dinosaur. It is quite encumbering and has little storage but is very warm.",
- "weight": 7033,
+ "weight": "7033 g",
"volume": "12 L",
"price": 14500,
"to_hit": -3,
@@ -2183,7 +2205,7 @@
"type": "ARMOR",
"name": "down-filled blanket",
"description": "Hiding under here will not protect you from the monsters, but it'll keep you warm.",
- "weight": 1323,
+ "weight": "1323 g",
"volume": "3500 ml",
"price": 5500,
"to_hit": -1,
@@ -2204,7 +2226,7 @@
"category": "armor",
"name": "dragon skin vest",
"description": "A state-of-the-art, lightweight, flexible, bullet resistant vest. The ceramic disks used in its construction make it impossible to repair, only replace.",
- "weight": 2860,
+ "weight": "2860 g",
"volume": "6 L",
"price": 190000,
"to_hit": -3,
@@ -2225,7 +2247,7 @@
"category": "armor",
"name": "lamellar kevlar vest",
"description": "A lamellar kevlar vest, there are intricately cut voids usually filled with stitched in ceramic disks, you could repair the stitching if needed",
- "weight": 2060,
+ "weight": "2060 g",
"volume": "4 L",
"price": 1900,
"to_hit": -3,
@@ -2246,7 +2268,7 @@
"name": "dress",
"name_plural": "dresses",
"description": "A long cotton dress. Though comfortable to wear, it lacks any storage space.",
- "weight": 680,
+ "weight": "680 g",
"volume": "3500 ml",
"price": 18000,
"to_hit": -5,
@@ -2265,7 +2287,7 @@
"type": "ARMOR",
"name": "dress shirt",
"description": "A white button-down shirt with long sleeves. Looks professional!",
- "weight": 250,
+ "weight": "250 g",
"volume": "750 ml",
"price": 1500,
"material": [ "cotton" ],
@@ -2285,7 +2307,7 @@
"name": "wedding dress",
"name_plural": "wedding dresses",
"description": "A beautiful white wedding dress. What good will it be now?",
- "weight": 9333,
+ "weight": "9333 g",
"volume": "18 L",
"price": 59000,
"to_hit": -5,
@@ -2305,7 +2327,7 @@
"name": "tactical dump pouch",
"name_plural": "tactical dump pouches",
"description": "An expandable pouch secured with straps. Provides a bit of extra storage with minimal encumbrance.",
- "weight": 288,
+ "weight": "288 g",
"volume": "500 ml",
"price": 4500,
"to_hit": 2,
@@ -2325,7 +2347,7 @@
"type": "ARMOR",
"name": "duster",
"description": "A rugged full-length duster coat. Has many pockets for storage.",
- "weight": 1120,
+ "weight": "1120 g",
"volume": "5750 ml",
"price": 15500,
"to_hit": -1,
@@ -2346,7 +2368,7 @@
"type": "ARMOR",
"name": "fur duster",
"description": "A thick fur full-length duster. Has many pockets for storage.",
- "weight": 2362,
+ "weight": "2362 g",
"volume": "9750 ml",
"price": 97900,
"to_hit": -1,
@@ -2378,7 +2400,7 @@
"type": "ARMOR",
"name": "leather duster",
"description": "A thick leather full-length duster. Has many pockets for storage.",
- "weight": 2655,
+ "weight": "2655 g",
"volume": "7 L",
"price": 24500,
"to_hit": -1,
@@ -2400,7 +2422,7 @@
"category": "armor",
"name": "survivor duster",
"description": "A Kevlar armored custom full-length duster, covered with pouches and pockets. Comfortable, durable, and great for storage.",
- "weight": 2592,
+ "weight": "2592 g",
"volume": "9500 ml",
"price": 40000,
"to_hit": -1,
@@ -2422,7 +2444,7 @@
"name": "pair of ear plugs",
"name_plural": "pairs of ear plugs",
"description": "Industrial grade ear plugs. They fit inside the ear.",
- "weight": 10,
+ "weight": "10 g",
"volume": 0,
"price": 10,
"material": [ "cotton" ],
@@ -2437,7 +2459,7 @@
"type": "ARMOR",
"name": "eboshi",
"description": "A high, black cap with a very narrow top. Traditionally worn by Shinto priests.",
- "weight": 120,
+ "weight": "120 g",
"volume": "500 ml",
"price": 7000,
"material": [ "cotton" ],
@@ -2456,7 +2478,7 @@
"name": "pair of elbow pads",
"name_plural": "pairs of elbow pads",
"description": "A pair of elbow pads made of stout plastic and cloth.",
- "weight": 110,
+ "weight": "110 g",
"volume": "750 ml",
"price": 3500,
"to_hit": 1,
@@ -2474,7 +2496,7 @@
"name": "pair of stylish sunglasses",
"name_plural": "pairs of stylish sunglasses",
"description": "A pair of stylish sunglasses. Look good while keeping the glare out of your eyes.",
- "weight": 42,
+ "weight": "42 g",
"volume": "250 ml",
"price": 27500,
"to_hit": -2,
@@ -2494,7 +2516,7 @@
"type": "ARMOR",
"name": "fanny pack",
"description": "Provides a bit of extra storage, with minimal encumbrance.",
- "weight": 272,
+ "weight": "272 g",
"volume": "250 ml",
"price": 3500,
"to_hit": 2,
@@ -2515,7 +2537,7 @@
"name": "fencing jacket",
"name_plural": "fencing jackets",
"description": "A padded jacket with the zipper on the back used by fencers to prevent accidents. It doesn't have any storage room, but it is very comfortable.",
- "weight": 800,
+ "weight": "800 g",
"volume": "2500 ml",
"price": 3000,
"material": [ "cotton", "kevlar" ],
@@ -2533,7 +2555,7 @@
"type": "ARMOR",
"name": "fencing mask",
"description": "A tough hood made of steel mesh used by fencers.",
- "weight": 520,
+ "weight": "520 g",
"volume": "1250 ml",
"price": 3500,
"material": [ "cotton", "steel" ],
@@ -2551,7 +2573,7 @@
"name": "fencing pants",
"name_plural": "fencing pants",
"description": "A pair of reinforced pants used by fencers to prevent injuries.",
- "weight": 450,
+ "weight": "450 g",
"volume": "2 L",
"price": 2500,
"material": [ "cotton", "kevlar" ],
@@ -2572,7 +2594,7 @@
"name": "pair of fire gauntlets",
"name_plural": "pairs of fire gauntlets",
"description": "A heavy pair of gloves, used by firefighters and metalworkers for heat protection. Highly resistant to heat and flame, they provide excellent protection from injury.",
- "weight": 572,
+ "weight": "572 g",
"volume": "1 L",
"price": 8200,
"to_hit": 2,
@@ -2593,7 +2615,7 @@
"category": "armor",
"name": "firefighter helmet",
"description": "A distinctive helmet worn by firefighters. More than just a piece of firefighting equipment, it serves as a badge of honor and respect.",
- "weight": 1500,
+ "weight": "1500 g",
"volume": "1250 ml",
"price": 24000,
"to_hit": 1,
@@ -2614,7 +2636,7 @@
"type": "ARMOR",
"name": "firefighter belt",
"description": "A stout firefighter's belt. Useful for keeping your bunker gear up, it also doubles as an equipment belt with a reinforced loop for holding a large tool.",
- "weight": 210,
+ "weight": "210 g",
"volume": "500 ml",
"price": 9000,
"bashing": 5,
@@ -2641,7 +2663,7 @@
"name": "pair of fishing waders",
"name_plural": "pairs of fishing waders",
"description": "Waterproof plastic fishing waders with a single large front pocket.",
- "weight": 1360,
+ "weight": "1360 g",
"volume": "9500 ml",
"price": 10000,
"material": [ "plastic" ],
@@ -2662,7 +2684,7 @@
"name": "pair of fit-over sunglasses",
"name_plural": "pairs of fit-over sunglasses",
"description": "A pair of fit-over sunglasses designed to be worn over a pair of corrective glasses. Good for keeping the glare out of your eyes.",
- "weight": 45,
+ "weight": "45 g",
"volume": "250 ml",
"price": 5000,
"to_hit": -2,
@@ -2682,7 +2704,7 @@
"type": "ARMOR",
"name": "flag shirt",
"description": "A t-shirt embroidered with the pattern of an American flag.",
- "weight": 158,
+ "weight": "158 g",
"volume": "500 ml",
"price": 6000,
"material": [ "cotton" ],
@@ -2699,7 +2721,7 @@
"type": "ARMOR",
"name": "flotation vest",
"description": "A brightly-colored vest designed to keep you upright and floating in water.",
- "weight": 451,
+ "weight": "451 g",
"volume": "9 L",
"price": 11000,
"to_hit": -3,
@@ -2719,7 +2741,7 @@
"type": "ARMOR",
"name": "makeshift flotation vest",
"description": "A flotation vest made of inflated animal skins.",
- "weight": 451,
+ "weight": "451 g",
"volume": "9 L",
"price": 11000,
"to_hit": -3,
@@ -2740,7 +2762,7 @@
"category": "armor",
"name": "football armor",
"description": "Heavy plastic armor for your upper torso. Normally worn by football players.",
- "weight": 2810,
+ "weight": "2810 g",
"volume": "7 L",
"price": 11000,
"material": [ "plastic", "cotton" ],
@@ -2759,7 +2781,7 @@
"category": "armor",
"name": "survivor firesuit",
"description": "Heavy, hand-built combination armor made from a cut-down bulletproof vest and a reinforced flame-resistant Nomex jumpsuit. Protects the wearer from fire and the elements.",
- "weight": 6800,
+ "weight": "6800 g",
"volume": "11500 ml",
"price": 200000,
"to_hit": -3,
@@ -2781,7 +2803,7 @@
"type": "ARMOR",
"name": "fur blanket",
"description": "A heavy fur blanket that covers most of your body.",
- "weight": 1986,
+ "weight": "1986 g",
"volume": "3500 ml",
"price": 19500,
"to_hit": -1,
@@ -2801,7 +2823,7 @@
"type": "ARMOR",
"name": "gambeson",
"description": "A thick jacket of quilted fabric, designed to be worn underneath mail or other armor. Or worn on its own, if you can't afford proper armor.",
- "weight": 453,
+ "weight": "453 g",
"volume": "3 L",
"price": 20000,
"to_hit": -5,
@@ -2822,7 +2844,7 @@
"name": "pair of bone armor gauntlets",
"name_plural": "pairs of bone armor gauntlets",
"description": "Leather gauntlets with bone armor reinforcement. Very light and strong.",
- "weight": 690,
+ "weight": "690 g",
"volume": "1250 ml",
"price": 38000,
"to_hit": -2,
@@ -2845,7 +2867,7 @@
"name": "pair of chitinous gauntlets",
"name_plural": "pairs of chitinous gauntlets",
"description": "Gauntlets made from the exoskeletons of insects. Very light and durable.",
- "weight": 760,
+ "weight": "760 g",
"volume": "1750 ml",
"price": 38000,
"to_hit": -2,
@@ -2879,7 +2901,7 @@
"name": "pair of leather armor gauntlets",
"name_plural": "pairs of leather armor gauntlets",
"description": "Heavy fingerless leather gloves. Very flexible and comfortable.",
- "weight": 350,
+ "weight": "350 g",
"volume": "750 ml",
"price": 3400,
"to_hit": -2,
@@ -2902,7 +2924,7 @@
"name": "pair of ballistic glasses",
"name_plural": "pairs of ballistic glasses",
"description": "Modern tactical eyewear that protects from small projectiles and fragments. Provides excellent protection from environmental dangers.",
- "weight": 184,
+ "weight": "184 g",
"volume": "250 ml",
"price": 7500,
"to_hit": -2,
@@ -2924,7 +2946,7 @@
"name": "pair of eclipse glasses",
"name_plural": "pairs of eclipse glasses",
"description": "A pair of cardboard-framed glasses with UV and IR-filtered lenses topped with a layer of aluminum coating. They allow safe viewing of extremely bright and harmful sources of light, like the sun during a solar eclipse.",
- "weight": 27,
+ "weight": "27 g",
"volume": "250 ml",
"price": 2500,
"to_hit": -2,
@@ -2945,7 +2967,7 @@
"name": "pair of bifocal glasses",
"name_plural": "pairs of bifocal glasses",
"description": "A pair of bifocal glasses for those who are both near-sighted and far-sighted. You can use them to focus sunlight.",
- "weight": 30,
+ "weight": "30 g",
"volume": "250 ml",
"price": 7900,
"to_hit": -2,
@@ -2965,7 +2987,7 @@
"name": "pair of eyeglasses",
"name_plural": "pairs of eyeglasses",
"description": "A pair of glasses for the near-sighted. The concave lenses diffuse the sunlight, rendering them useless for starting fires.",
- "weight": 30,
+ "weight": "30 g",
"volume": "250 ml",
"price": 7900,
"to_hit": -2,
@@ -2984,7 +3006,7 @@
"name": "monocle",
"//": "DDA monocle is optical-grade. Costume ones go for about $10.",
"description": "An essential article of the gentleman's apparel. Also corrects near-sightedness. The concave lenses diffuse the sunlight, rendering them useless for starting fires.",
- "weight": 16,
+ "weight": "16 g",
"volume": "5 ml",
"price": 4000,
"to_hit": -2,
@@ -3003,7 +3025,7 @@
"name": "pair of reading glasses",
"name_plural": "pairs of reading glasses",
"description": "A pair of glasses for the far-sighted. Useless for anyone else. You can use them to focus sunlight.",
- "weight": 30,
+ "weight": "30 g",
"volume": "250 ml",
"price": 2000,
"to_hit": -2,
@@ -3023,7 +3045,7 @@
"name": "pair of safety glasses",
"name_plural": "pairs of safety glasses",
"description": "A pair of plastic glasses, used in workshops, sports, chemistry labs, and many other places. Provides great protection from damage.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 1000,
"to_hit": -2,
@@ -3044,7 +3066,7 @@
"name": "white glove",
"name_plural": "white gloves",
"description": "A single white glove covered with hundreds of rhinestones.",
- "weight": 59,
+ "weight": "59 g",
"volume": "250 ml",
"price": 50000,
"to_hit": 1,
@@ -3063,7 +3085,7 @@
"name": "pair of bag gloves",
"name_plural": "pairs of bag gloves",
"description": "A pair of disposable plastic bags, adapted to be used as gloves.",
- "weight": 6,
+ "weight": "6 g",
"volume": "250 ml",
"price": 50,
"to_hit": -1,
@@ -3082,7 +3104,7 @@
"name": "pair of fingerless gloves",
"name_plural": "pairs of fingerless gloves",
"description": "A pair of leather gloves with no fingers, allowing greater manual dexterity.",
- "weight": 100,
+ "weight": "100 g",
"volume": "250 ml",
"price": 1400,
"to_hit": 2,
@@ -3102,7 +3124,7 @@
"name": "pair of armored fingerless gloves",
"name_plural": "pairs of armored fingerless gloves",
"description": "A pair of leather gloves with no fingers, allowing greater manual dexterity. These have been crudely reinforced with steel guards across the back.",
- "weight": 380,
+ "weight": "380 g",
"volume": "500 ml",
"price": 9000,
"to_hit": 2,
@@ -3123,7 +3145,7 @@
"name": "pair of survivor firegloves",
"name_plural": "pairs of survivor firegloves",
"description": "A pair of customized, Kevlar armored Nomex gloves, modified to be easy to wear while providing maximum protection under extreme conditions.",
- "weight": 410,
+ "weight": "410 g",
"volume": "1 L",
"price": 18000,
"to_hit": 2,
@@ -3144,7 +3166,7 @@
"name": "pair of fur gloves",
"name_plural": "pairs of fur gloves",
"description": "A pair of warm fur gloves. They are somewhat cumbersome.",
- "weight": 410,
+ "weight": "410 g",
"volume": "1 L",
"price": 4000,
"to_hit": 1,
@@ -3164,7 +3186,7 @@
"name": "pair of survivor wetsuit gloves",
"name_plural": "pairs of survivor wetsuit gloves",
"description": "A pair of customized, Kevlar armored neoprene gloves, modified to be easy to wear while providing maximum protection under extreme conditions.",
- "weight": 390,
+ "weight": "390 g",
"volume": "750 ml",
"price": 18000,
"to_hit": 2,
@@ -3186,7 +3208,7 @@
"name": "pair of heavy survivor gloves",
"name_plural": "pairs of heavy survivor gloves",
"description": "A pair of heavily customized, steel-backed armored Kevlar gloves, modified to be easy to wear while providing maximum protection under extreme conditions.",
- "weight": 380,
+ "weight": "380 g",
"volume": "1 L",
"price": 18000,
"to_hit": 2,
@@ -3207,7 +3229,7 @@
"name": "pair of leather gloves",
"name_plural": "pairs of leather gloves",
"description": "A thin pair of black leather gloves.",
- "weight": 160,
+ "weight": "160 g",
"volume": "250 ml",
"price": 4500,
"to_hit": 2,
@@ -3227,7 +3249,7 @@
"name": "pair of light gloves",
"name_plural": "pairs of light gloves",
"description": "A pair of cotton gloves.",
- "weight": 118,
+ "weight": "118 g",
"volume": "250 ml",
"price": 1100,
"to_hit": 1,
@@ -3247,7 +3269,7 @@
"name": "pair of glove liners",
"name_plural": "pairs of glove liners",
"description": "A pair of thin cotton gloves. Often used as a liner beneath other gloves.",
- "weight": 63,
+ "weight": "63 g",
"volume": "250 ml",
"price": 600,
"to_hit": 1,
@@ -3268,7 +3290,7 @@
"name": "pair of light survivor gloves",
"name_plural": "pairs of light survivor gloves",
"description": "A pair of customized, Kevlar armored cloth gloves, modified to be easy to wear while providing maximum protection under extreme conditions.",
- "weight": 190,
+ "weight": "190 g",
"volume": "750 ml",
"price": 18000,
"to_hit": 2,
@@ -3289,7 +3311,7 @@
"name": "pair of medical gloves",
"name_plural": "pairs of medical gloves",
"description": "A pair of thin latex gloves, designed to limit the spread of disease.",
- "weight": 10,
+ "weight": "10 g",
"volume": 0,
"price": 1000,
"to_hit": 1,
@@ -3310,7 +3332,7 @@
"name": "pair of armored gauntlets",
"name_plural": "pairs of armored gauntlets",
"description": "An extremely heavy set of armor-plated leather gloves.",
- "weight": 980,
+ "weight": "980 g",
"volume": "1500 ml",
"price": 40000,
"to_hit": -2,
@@ -3332,7 +3354,7 @@
"name": "pair of rubber gloves",
"name_plural": "pairs of rubber gloves",
"description": "A pair of rubber gloves, often used while cleaning with caustic materials.",
- "weight": 20,
+ "weight": "20 g",
"volume": "1 L",
"price": 1300,
"to_hit": 2,
@@ -3354,7 +3376,7 @@
"name": "pair of survivor gloves",
"name_plural": "pairs of survivor gloves",
"description": "A pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.",
- "weight": 230,
+ "weight": "230 g",
"volume": "750 ml",
"price": 18000,
"to_hit": 2,
@@ -3376,7 +3398,7 @@
"name": "pair of tactical gloves",
"name_plural": "pairs of tactical gloves",
"description": "A pair of reinforced Kevlar tactical gloves. Commonly used by police and military units.",
- "weight": 220,
+ "weight": "220 g",
"volume": "500 ml",
"price": 5200,
"to_hit": 2,
@@ -3396,7 +3418,7 @@
"name": "pair of winter gloves",
"name_plural": "pairs of winter gloves",
"description": "A pair of padded gloves. Cumbersome, but warm.",
- "weight": 218,
+ "weight": "218 g",
"volume": "750 ml",
"price": 6500,
"to_hit": 1,
@@ -3415,7 +3437,7 @@
"name": "pair of wool gloves",
"name_plural": "pairs of wool gloves",
"description": "A thick pair of wool gloves. Cumbersome, but warm.",
- "weight": 240,
+ "weight": "240 g",
"volume": "250 ml",
"price": 3500,
"to_hit": 1,
@@ -3434,7 +3456,7 @@
"name": "pair of work gloves",
"name_plural": "pairs of work gloves",
"description": "A tough pair of gloves, for tough everyday work.",
- "weight": 195,
+ "weight": "195 g",
"volume": "250 ml",
"price": 4500,
"to_hit": 2,
@@ -3455,7 +3477,7 @@
"name": "pair of cut resistant gloves",
"name_plural": "pairs of cut resistant gloves",
"description": "A pair of cut resistant gloves, useful when rapidly breaking down carcasses.",
- "weight": 240,
+ "weight": "240 g",
"volume": "250 ml",
"price": 9000,
"to_hit": 2,
@@ -3477,7 +3499,7 @@
"name": "pair of hand wraps",
"name_plural": "pairs of hand wraps",
"description": "Long pieces of cloth that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.",
- "weight": 100,
+ "weight": "100 g",
"volume": "250 ml",
"price": 500,
"to_hit": 2,
@@ -3496,7 +3518,7 @@
"name": "pair of fur hand wraps",
"name_plural": "pairs of fur hand wraps",
"description": "Pieces of animal pelt that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.",
- "weight": 250,
+ "weight": "250 g",
"volume": "500 ml",
"price": 700,
"to_hit": 2,
@@ -3516,7 +3538,7 @@
"name": "pair of leather hand wraps",
"name_plural": "pairs of leather hand wraps",
"description": "Pieces of leather that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.",
- "weight": 200,
+ "weight": "200 g",
"volume": "500 ml",
"price": 525,
"to_hit": 2,
@@ -3536,7 +3558,7 @@
"name": "pair of wool hand wraps",
"name_plural": "pairs of wool hand wraps",
"description": "Long pieces of wool that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.",
- "weight": 100,
+ "weight": "100 g",
"volume": "250 ml",
"price": 500,
"to_hit": 2,
@@ -3557,7 +3579,7 @@
"name": "pair of winter survivor gloves",
"name_plural": "pairs of winter survivor gloves",
"description": "A pair of customized, Kevlar armored fur gloves, modified to be easy to wear while providing maximum protection under extreme conditions.",
- "weight": 300,
+ "weight": "300 g",
"volume": "1250 ml",
"price": 18000,
"to_hit": 2,
@@ -3579,7 +3601,7 @@
"name": "pair of XL survivor gloves",
"name_plural": "pairs of XL survivor gloves",
"description": "A massive pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.",
- "weight": 480,
+ "weight": "480 g",
"volume": "1500 ml",
"price": 18000,
"to_hit": 2,
@@ -3599,7 +3621,7 @@
"type": "ARMOR",
"name": "go bag",
"description": "A huge duffel bag with backpack attached, both packed to the gills. Judging by the feel, a National Guard soldier could have packed this to be ready for deployment. Activate to unpack and enjoy.",
- "weight": 18043,
+ "weight": "18043 g",
"volume": "35750 ml",
"price": 100000,
"to_hit": -5,
@@ -3628,7 +3650,7 @@
"name": "pair of ski goggles",
"name_plural": "pairs of ski goggles",
"description": "A large pair of goggles that completely seal off your eyes. Provides excellent protection from environmental dangers.",
- "weight": 354,
+ "weight": "354 g",
"volume": "500 ml",
"price": 4500,
"to_hit": -2,
@@ -3650,7 +3672,7 @@
"name": "pair of swim goggles",
"name_plural": "pairs of swim goggles",
"description": "A small pair of goggles made for swimming.",
- "weight": 81,
+ "weight": "81 g",
"volume": "250 ml",
"price": 1100,
"to_hit": -2,
@@ -3671,7 +3693,7 @@
"name": "pair of welding goggles",
"name_plural": "pairs of welding goggles",
"description": "A dark pair of goggles. They make seeing very difficult, but protect you from bright flashes.",
- "weight": 153,
+ "weight": "153 g",
"volume": "250 ml",
"price": 1400,
"to_hit": -3,
@@ -3692,7 +3714,7 @@
"type": "ARMOR",
"name": "evening gown",
"description": "A luxurious evening gown. It accentuates your curves, or lack thereof.",
- "weight": 1800,
+ "weight": "1800 g",
"volume": "5 L",
"price": 21000,
"material": [ "cotton" ],
@@ -3710,7 +3732,7 @@
"type": "ARMOR",
"name": "greatcoat",
"description": "A heavy, full-length wool coat. Cumbersome, but warm and with deep pockets.",
- "weight": 2428,
+ "weight": "2428 g",
"volume": "8 L",
"price": 18000,
"to_hit": -3,
@@ -3732,7 +3754,7 @@
"category": "armor",
"name": "survivor wetsuit",
"description": "A lightweight, hand-built combination armor made from a cut-down bulletproof vest and a reinforced neoprene wetsuit. Protects from the elements as well as from harm.",
- "weight": 6400,
+ "weight": "6400 g",
"volume": "7 L",
"price": 110000,
"to_hit": -3,
@@ -3754,7 +3776,7 @@
"type": "ARMOR",
"name": "hakama",
"description": "Plain black hakama for use in kendo and other martial arts.",
- "weight": 350,
+ "weight": "350 g",
"volume": "1 L",
"price": 2500,
"material": [ "cotton" ],
@@ -3772,7 +3794,7 @@
"type": "ARMOR",
"name": "hakama",
"description": "A flowing, pleated garment which can be worn over a kimono.",
- "weight": 500,
+ "weight": "500 g",
"volume": "1500 ml",
"price": 3000,
"material": [ "cotton" ],
@@ -3790,7 +3812,7 @@
"type": "ARMOR",
"name": "halter top",
"description": "A short top made from cotton. It is light and easy to wear.",
- "weight": 42,
+ "weight": "42 g",
"volume": "500 ml",
"price": 2000,
"to_hit": -5,
@@ -3809,7 +3831,7 @@
"name": "baseball cap",
"//": "Head encumbrance stops you from wearing additional headgear. No helmet over a ballcap, sorry. But brimmed gear gets the anti-glare flag!",
"description": "A Red Sox cap. It provides a little bit of warmth.",
- "weight": 88,
+ "weight": "88 g",
"volume": "500 ml",
"price": 2500,
"material": [ "cotton" ],
@@ -3828,7 +3850,7 @@
"type": "ARMOR",
"name": "boonie hat",
"description": "Also called a \"bucket hat.\" Often used in the military. Its wide brim helps keep the sun out of your eyes.",
- "weight": 92,
+ "weight": "92 g",
"volume": "500 ml",
"price": 1200,
"material": [ "cotton" ],
@@ -3847,7 +3869,7 @@
"type": "ARMOR",
"name": "toque",
"description": "A traditional chef's hat, standing tall and proud against the vulgarities of the world.",
- "weight": 140,
+ "weight": "140 g",
"volume": "500 ml",
"price": 500,
"material": [ "cotton" ],
@@ -3865,7 +3887,7 @@
"type": "ARMOR",
"name": "cotton hat",
"description": "A snug-fitting cotton hat. Quite warm.",
- "weight": 78,
+ "weight": "78 g",
"volume": "250 ml",
"price": 2000,
"material": [ "cotton" ],
@@ -3882,7 +3904,7 @@
"type": "ARMOR",
"name": "fur hat",
"description": "A hat made from the pelts of animals. Extremely warm.",
- "weight": 246,
+ "weight": "246 g",
"volume": "750 ml",
"price": 5000,
"material": [ "fur" ],
@@ -3910,7 +3932,7 @@
"type": "ARMOR",
"name": "hard hat",
"description": "A hard plastic hat worn in construction sites. Excellent protection from cuts and percussion.",
- "weight": 796,
+ "weight": "796 g",
"volume": "2500 ml",
"price": 1200,
"bashing": 6,
@@ -3931,7 +3953,7 @@
"category": "armor",
"name": "hooded hard hat",
"description": "A hard plastic hat worn in construction sites, with a cloth tucked in under it to serve as a makeshift hood. Makes it a bit more comfortable to wear, and better protects the neck from sun and rain.",
- "weight": 876,
+ "weight": "876 g",
"volume": "2750 ml",
"price": 1200,
"bashing": 6,
@@ -3951,7 +3973,7 @@
"type": "ARMOR",
"name": "hunting cap",
"description": "A red plaid hunting cap with ear flaps. Notably warm.",
- "weight": 206,
+ "weight": "206 g",
"volume": "750 ml",
"price": 3000,
"material": [ "wool" ],
@@ -3970,7 +3992,7 @@
"type": "ARMOR",
"name": "knit hat",
"description": "A snug-fitting wool hat. Very warm.",
- "weight": 120,
+ "weight": "120 g",
"volume": "250 ml",
"price": 3000,
"material": [ "wool" ],
@@ -3987,7 +4009,7 @@
"type": "ARMOR",
"name": "newsboy cap",
"description": "A slouching wool cap with a short front brim, traditionally associated with newspaper delivery boys. Quite warm.",
- "weight": 100,
+ "weight": "100 g",
"volume": "250 ml",
"price": 3000,
"material": [ "wool" ],
@@ -4004,7 +4026,7 @@
"type": "ARMOR",
"name": "noise canceling headgear",
"description": "Padding over your ears kept in place by some string. Blocks incoming sounds.",
- "weight": 72,
+ "weight": "72 g",
"volume": "500 ml",
"price": 2500,
"material": [ "cotton" ],
@@ -4023,7 +4045,7 @@
"name": "sombrero",
"//": "Head encumbrance stops you from wearing additional headgear. No helmet over a sombrero, sorry. But brimmed gear gets the anti-glare flag!",
"description": "A felt orange sombrero with traditional white and yellow hand stitching. The wide brim keeps the sun out of your eyes, and a thin strap hooks around your chin.",
- "weight": 140,
+ "weight": "140 g",
"volume": "3500 ml",
"price": 5500,
"material": [ "wool" ],
@@ -4042,7 +4064,7 @@
"type": "ARMOR",
"name": "headgear",
"description": "Lightweight sports headgear designed to protect the head while sparring.",
- "weight": 500,
+ "weight": "500 g",
"volume": "1 L",
"price": 4000,
"to_hit": 1,
@@ -4063,7 +4085,7 @@
"category": "armor",
"name": "army helmet",
"description": "A heavy helmet that provides excellent protection from all sorts of damage.",
- "weight": 1383,
+ "weight": "1383 g",
"volume": "1750 ml",
"price": 15000,
"to_hit": -1,
@@ -4085,7 +4107,7 @@
"category": "armor",
"name": "baseball helmet",
"description": "A hard plastic helmet that covers the head and ears. Designed to protect against a baseball to the head.",
- "weight": 453,
+ "weight": "453 g",
"volume": "1750 ml",
"price": 3100,
"to_hit": -1,
@@ -4107,7 +4129,7 @@
"category": "armor",
"name": "barbute helm",
"description": "A medieval helmet that provides excellent protection for the head, with a Y shaped opening for the face.",
- "weight": 1175,
+ "weight": "1175 g",
"volume": "2500 ml",
"price": 30000,
"bashing": 10,
@@ -4128,7 +4150,7 @@
"category": "armor",
"name": "bike helmet",
"description": "A thick foam helmet. Designed to protect against concussion.",
- "weight": 270,
+ "weight": "270 g",
"volume": "1500 ml",
"price": 17000,
"bashing": 4,
@@ -4148,7 +4170,7 @@
"category": "armor",
"name": "bone armor helmet",
"description": "A grotesque, horned helmet carved from bone. Covers the entire head; very light and strong.",
- "weight": 1621,
+ "weight": "1621 g",
"volume": "4250 ml",
"price": 42000,
"to_hit": -2,
@@ -4170,7 +4192,7 @@
"category": "armor",
"name": "chitinous helmet",
"description": "A helmet made from the exoskeletons of insects. Covers the entire head; very light and durable.",
- "weight": 1447,
+ "weight": "1447 g",
"volume": "2500 ml",
"price": 38000,
"to_hit": -2,
@@ -4192,7 +4214,7 @@
"category": "armor",
"name": "conical helm",
"description": "A conical iron helm with additional protection for the neck, associated with the Mongol Empire.",
- "weight": 1425,
+ "weight": "1425 g",
"volume": "3500 ml",
"price": 40000,
"bashing": 6,
@@ -4223,7 +4245,7 @@
"category": "armor",
"name": "football helmet",
"description": "A heavy plastic helmet normally worn by football players.",
- "weight": 1360,
+ "weight": "1360 g",
"volume": "2250 ml",
"price": 19800,
"material": [ "plastic" ],
@@ -4243,7 +4265,7 @@
"name": "galea",
"name_plural": "galeae",
"description": "An Imperial Roman helmet, with distinct projections protecting the sides of the head.",
- "weight": 1310,
+ "weight": "1310 g",
"volume": "2500 ml",
"price": 35000,
"bashing": 10,
@@ -4264,7 +4286,7 @@
"category": "armor",
"name": "heavy survivor helmet",
"description": "A customized, heavily armored steel and kevlar helmet, modified to provide maximum comfort and protection from harm.",
- "weight": 1712,
+ "weight": "1712 g",
"volume": "2500 ml",
"price": 58000,
"to_hit": -1,
@@ -4288,7 +4310,7 @@
"name": "kabuto",
"//": "Leaving this at $500 as it's either antique/priceless or player-made/Bartered, leastwise on the initial search.",
"description": "A medieval Japanese helmet with a scowling facemask that provides excellent protection to the entire head and face.",
- "weight": 1625,
+ "weight": "1625 g",
"volume": "3500 ml",
"price": 50000,
"bashing": 6,
@@ -4310,7 +4332,7 @@
"category": "armor",
"name": "leather armor helmet",
"description": "A thick leather helmet that provides excellent protection for the head.",
- "weight": 435,
+ "weight": "435 g",
"volume": "2 L",
"price": 14000,
"material": [ "leather" ],
@@ -4329,7 +4351,7 @@
"type": "ARMOR",
"name": "helmet liner",
"description": "This goes inside a helmet to help keep your head warm in cold climates.",
- "weight": 110,
+ "weight": "110 g",
"volume": "250 ml",
"price": 1000,
"to_hit": -1,
@@ -4349,7 +4371,7 @@
"category": "armor",
"name": "lobster helmet",
"description": "A heavy helmet that provides excellent protection from all sorts of damage. It has a tail coming off the back that provides protection to your neck.",
- "weight": 1383,
+ "weight": "1383 g",
"volume": "2 L",
"price": 28000,
"to_hit": -1,
@@ -4371,7 +4393,7 @@
"category": "armor",
"name": "motorcycle helmet",
"description": "A helmet with covers for your head and chin, leaving space in-between for you to wear goggles.",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "2250 ml",
"price": 32500,
"to_hit": -1,
@@ -4394,7 +4416,7 @@
"category": "armor",
"name": "nasal helm",
"description": "An early medieval helmet with a projection guarding the nose, to better protect the face without obstructing vision. Proper viking gear, unlike the stereotypical horned helm.",
- "weight": 907,
+ "weight": "907 g",
"volume": "2 L",
"price": 26000,
"bashing": 10,
@@ -4414,7 +4436,7 @@
"type": "ARMOR",
"name": "nomad cowl",
"description": "A makeshift cowl with protection for the eyes from rain and sun, designed for long travels.",
- "weight": 470,
+ "weight": "470 g",
"volume": "2500 ml",
"price": 25000,
"to_hit": -3,
@@ -4435,7 +4457,7 @@
"category": "armor",
"name": "great helm",
"description": "A medieval helmet that provides excellent protection to the entire head, at the cost of great encumbrance.",
- "weight": 2175,
+ "weight": "2175 g",
"volume": "2750 ml",
"price": 40000,
"bashing": 10,
@@ -4456,7 +4478,7 @@
"type": "ARMOR",
"name": "scavenger cowl",
"description": "A sturdy protective cowl extending down to the neck, fitted with a respirator and eye protection. For dangerous scavenging ventures.",
- "weight": 695,
+ "weight": "695 g",
"volume": "2500 ml",
"price": 55000,
"to_hit": -3,
@@ -4477,7 +4499,7 @@
"category": "armor",
"name": "scrap helmet",
"description": "A helmet made from scraps of metal secured by simple strings; the loose collection of plates provides decent but not the most convenient protection.",
- "weight": 1692,
+ "weight": "1692 g",
"volume": "2750 ml",
"price": 35000,
"to_hit": -1,
@@ -4499,7 +4521,7 @@
"category": "armor",
"name": "skid lid",
"description": "A small metal helmet that covers the head and protects against cuts and percussion.",
- "weight": 1315,
+ "weight": "1315 g",
"volume": "1250 ml",
"price": 4500,
"bashing": 8,
@@ -4519,7 +4541,7 @@
"category": "armor",
"name": "survivor helmet",
"description": "A customized, heavily armored Kevlar helmet, modified with leather reinforcements to provide maximum comfort and protection from harm.",
- "weight": 1420,
+ "weight": "1420 g",
"volume": "2500 ml",
"price": 58000,
"to_hit": -1,
@@ -4529,7 +4551,7 @@
"color": "dark_gray",
"covers": [ "HEAD" ],
"coverage": 100,
- "encumbrance": 40,
+ "encumbrance": 25,
"warmth": 15,
"material_thickness": 5,
"environmental_protection": 3,
@@ -4542,7 +4564,7 @@
"category": "armor",
"name": "XL survivor helmet",
"description": "A massive customized, heavily armored Kevlar helmet, modified with leather reinforcements to provide maximum comfort and protection from harm.",
- "weight": 3060,
+ "weight": "3060 g",
"volume": "6 L",
"price": 58000,
"to_hit": -1,
@@ -4573,9 +4595,9 @@
"coverage": 5,
"encumbrance": 100,
"storage": "15 L",
- "material_thickness": 1,
- "flags": [ "OVERSIZE", "BELTED", "RESTRICT_HANDS", "WATER_FRIENDLY" ]
- }
+ "material_thickness": 1
+ },
+ "flags": [ "OVERSIZE", "BELTED", "RESTRICT_HANDS", "WATER_FRIENDLY" ]
},
{
"id": "hide_tainted_bag",
@@ -4591,9 +4613,9 @@
"coverage": 5,
"encumbrance": 100,
"storage": "15 L",
- "material_thickness": 1,
- "flags": [ "OVERSIZE", "BELTED", "RESTRICT_HANDS", "WATER_FRIENDLY" ]
- }
+ "material_thickness": 1
+ },
+ "flags": [ "OVERSIZE", "BELTED", "RESTRICT_HANDS", "WATER_FRIENDLY" ]
},
{
"id": "hood_fsurvivor",
@@ -4601,7 +4623,7 @@
"category": "armor",
"name": "survivor firehood",
"description": "A customized armored Nomex and Kevlar hood, very strong and durable.",
- "weight": 1220,
+ "weight": "1220 g",
"volume": "1500 ml",
"price": 58000,
"to_hit": -1,
@@ -4623,7 +4645,7 @@
"category": "armor",
"name": "survivor wetsuit hood",
"description": "A customized armored neoprene and Kevlar hood, very strong and durable.",
- "weight": 860,
+ "weight": "860 g",
"volume": "1500 ml",
"price": 58000,
"to_hit": -1,
@@ -4645,7 +4667,7 @@
"category": "armor",
"name": "light survivor hood",
"description": "A customized armored cloth and Kevlar hood, very light and durable.",
- "weight": 628,
+ "weight": "628 g",
"volume": "750 ml",
"price": 58000,
"to_hit": -1,
@@ -4666,7 +4688,7 @@
"type": "ARMOR",
"name": "rain hood",
"description": "A waterproof hood made to be worn in bad weather. Provides extra protection from rain.",
- "weight": 160,
+ "weight": "160 g",
"volume": "750 ml",
"price": 2000,
"material": [ "plastic", "cotton" ],
@@ -4685,7 +4707,7 @@
"category": "armor",
"name": "survivor hood",
"description": "A customized, heavily armored leather and Kevlar hood, designed to provide comfort and protection from harm.",
- "weight": 820,
+ "weight": "820 g",
"volume": "2 L",
"price": 58000,
"to_hit": -1,
@@ -4708,7 +4730,7 @@
"category": "armor",
"name": "winter survivor hood",
"description": "A customized armored fur and Kevlar hood, very warm and durable.",
- "weight": 870,
+ "weight": "870 g",
"volume": "1500 ml",
"price": 58000,
"to_hit": -1,
@@ -4730,7 +4752,7 @@
"category": "armor",
"name": "XL survivor hood",
"description": "A massive customized, heavily armored leather and Kevlar hood, designed to provide comfort and protection from harm.",
- "weight": 1640,
+ "weight": "1640 g",
"volume": "4500 ml",
"price": 58000,
"to_hit": -1,
@@ -4752,7 +4774,7 @@
"type": "ARMOR",
"name": "hoodie",
"description": "A sweatshirt with a hood and a \"kangaroo pocket\" in the front for storage.",
- "weight": 420,
+ "weight": "420 g",
"volume": "3 L",
"price": 3800,
"material": [ "cotton" ],
@@ -4772,7 +4794,7 @@
"name": "hot pants",
"name_plural": "hot pants",
"description": "A simple pair of short shorts.",
- "weight": 92,
+ "weight": "92 g",
"volume": "250 ml",
"price": 2500,
"material": [ "cotton" ],
@@ -4789,7 +4811,7 @@
"name": "fur hot pants",
"name_plural": "fur hot pants",
"description": "A simple pair of fur short shorts.",
- "weight": 118,
+ "weight": "118 g",
"volume": "250 ml",
"price": 5500,
"material": [ "fur" ],
@@ -4807,7 +4829,7 @@
"name": "leather hot pants",
"name_plural": "leather hot pants",
"description": "A simple pair of leather short shorts.",
- "weight": 106,
+ "weight": "106 g",
"volume": "250 ml",
"price": 2500,
"material": [ "leather" ],
@@ -4824,7 +4846,7 @@
"type": "ARMOR",
"name": "housecoat",
"description": "Makes you wish you had running water to take a shower.",
- "weight": 580,
+ "weight": "580 g",
"volume": "2 L",
"price": 2200,
"to_hit": -1,
@@ -4846,7 +4868,7 @@
"category": "armor",
"name": "heavy survivor suit",
"description": "A heavy, hand-built combination armor made from a reinforced bulletproof vest and a metal-plated leather jumpsuit. Protects from the elements as well as from harm.",
- "weight": 8500,
+ "weight": "8500 g",
"volume": "12 L",
"price": 200000,
"to_hit": -3,
@@ -4869,7 +4891,7 @@
"name": "pair of snow goggles",
"name_plural": "pairs of snow goggles",
"description": "Eyewear carved from from wood or bone, with only a thin slit to see out of. Helps reduce glare, traditionally used by the Inuit to protect against snow blindness.",
- "weight": 70,
+ "weight": "70 g",
"volume": "250 ml",
"price": 4500,
"to_hit": -2,
@@ -4890,7 +4912,7 @@
"name": "army jacket",
"name_plural": "army jacket",
"description": "A tough jacket with lots of pockets. Favored by the military.",
- "weight": 780,
+ "weight": "780 g",
"volume": "3 L",
"price": 3500,
"material": [ "cotton", "plastic" ],
@@ -4909,7 +4931,7 @@
"type": "ARMOR",
"name": "chef's jacket",
"description": "This double-breasted uniform is unusually thick to protect against the heat of the kitchen.",
- "weight": 720,
+ "weight": "720 g",
"volume": "1750 ml",
"price": 7000,
"material": [ "cotton" ],
@@ -4928,7 +4950,7 @@
"type": "ARMOR",
"name": "emergency jacket",
"description": "A bright & cheaply made FEMA-issue windbreaker jacket with a hood. One size, fits none. Helps keep you unfrozen & visible for rescuers.",
- "weight": 197,
+ "weight": "197 g",
"volume": "2250 ml",
"price": 1000,
"material": [ "plastic", "cotton" ],
@@ -4947,7 +4969,7 @@
"type": "ARMOR",
"name": "flannel jacket",
"description": "A jacket made from flannel-style denim, favored by outdoorsy types. Provides decent protection from cuts.",
- "weight": 958,
+ "weight": "958 g",
"volume": "4250 ml",
"price": 6000,
"material": [ "cotton" ],
@@ -4966,7 +4988,7 @@
"type": "ARMOR",
"name": "jean jacket",
"description": "A jacket made from denim. Provides decent protection from cuts.",
- "weight": 800,
+ "weight": "800 g",
"volume": "3250 ml",
"price": 4000,
"material": [ "cotton" ],
@@ -4991,7 +5013,7 @@
"type": "ARMOR",
"name": "leather jacket",
"description": "A jacket made from thick leather. Cumbersome, but offers excellent protection from cuts.",
- "weight": 1450,
+ "weight": "1450 g",
"volume": "4500 ml",
"price": 17900,
"to_hit": 1,
@@ -5012,7 +5034,7 @@
"type": "ARMOR",
"name": "armored leather jacket",
"description": "An armored jacket made from thick leather and metal plates. Cumbersome, but offers excellent protection from harm.",
- "weight": 2180,
+ "weight": "2180 g",
"volume": "5500 ml",
"price": 17900,
"to_hit": 1,
@@ -5033,7 +5055,7 @@
"type": "ARMOR",
"name": "red leather jacket",
"description": "A candy-apple-red leather jacket with black strips and shoulder protrusions. It has a number of zippers and snaps in the front.",
- "weight": 1450,
+ "weight": "1450 g",
"volume": "4500 ml",
"price": 17900,
"to_hit": 1,
@@ -5054,7 +5076,7 @@
"type": "ARMOR",
"name": "light jacket",
"description": "A thin cotton jacket with a hood. Good for brisk weather.",
- "weight": 227,
+ "weight": "227 g",
"volume": "2250 ml",
"price": 4500,
"material": [ "cotton" ],
@@ -5073,7 +5095,7 @@
"type": "ARMOR",
"name": "windbreaker",
"description": "A light synthetic jacket with a hood. Not very warm, but will keep out the rain.",
- "weight": 197,
+ "weight": "197 g",
"volume": "2250 ml",
"price": 1000,
"material": [ "plastic" ],
@@ -5094,7 +5116,7 @@
"name": "jeans",
"name_plural": "jeans",
"description": "A pair of blue jeans with two deep pockets.",
- "weight": 600,
+ "weight": "600 g",
"volume": "2 L",
"price": 5000,
"to_hit": 1,
@@ -5115,7 +5137,7 @@
"name": "red jeans",
"name_plural": "red jeans",
"description": "A pair of tight-fitting candy-apple-red jeans with two deep pockets.",
- "weight": 600,
+ "weight": "600 g",
"volume": "2 L",
"price": 5000,
"to_hit": 1,
@@ -5135,7 +5157,7 @@
"type": "ARMOR",
"name": "Jedi cloak",
"description": "Long, flowing robes. Simple and comfortable to wear. Be sure to tear it off dramatically before fighting any foes!",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "2500 ml",
"price": 22500,
"to_hit": -1,
@@ -5156,7 +5178,7 @@
"name": "sports jersey",
"//": "Genuine team merch, and priced like it!",
"description": "A shirt made of thick material imprinted with the name and logo of a sports team.",
- "weight": 480,
+ "weight": "480 g",
"volume": "2250 ml",
"price": 8900,
"material": [ "cotton" ],
@@ -5212,7 +5234,7 @@
"type": "ARMOR",
"name": "judo belt template",
"description": "This is a template for judo belts. If found in a game it is a bug.",
- "weight": 200,
+ "weight": "200 g",
"volume": "250 ml",
"price": 1000,
"to_hit": -1,
@@ -5285,7 +5307,7 @@
"type": "ARMOR",
"name": "judo gi",
"description": "Plain white judo gi. Thick and a little stiff, it gives minor protection from cuts and punches.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "1500 ml",
"price": 5000,
"material": [ "cotton" ],
@@ -5303,7 +5325,7 @@
"type": "ARMOR",
"name": "jumpsuit",
"description": "A thin, short-sleeved jumpsuit; similar to those worn by prisoners. Provides decent storage and is not very encumbering.",
- "weight": 610,
+ "weight": "610 g",
"volume": "3500 ml",
"price": 8900,
"to_hit": -3,
@@ -5331,7 +5353,7 @@
"type": "ARMOR",
"name": "XL jumpsuit",
"description": "A thin, short-sleeved jumpsuit updated for the trans-human who needs full-body clothing. Provides some storage and is adjustable to minimize encumbrance.",
- "weight": 810,
+ "weight": "810 g",
"volume": "5 L",
"price": 20000,
"to_hit": -3,
@@ -5351,7 +5373,7 @@
"type": "ARMOR",
"name": "karate gi",
"description": "Plain white karate gi. Loose and flowing, it offers little protection, and little encumbrance.",
- "weight": 400,
+ "weight": "400 g",
"volume": "1500 ml",
"price": 5000,
"material": [ "cotton" ],
@@ -5368,7 +5390,7 @@
"type": "ARMOR",
"name": "kariginu",
"description": "A traditional, ankle-length Shinto robe with several layers and very wide sleeves.",
- "weight": 1400,
+ "weight": "1400 g",
"volume": "5500 ml",
"price": 30000,
"to_hit": -5,
@@ -5388,7 +5410,7 @@
"type": "ARMOR",
"name": "keffiyeh",
"description": "A type of headdress traditionally used in the Middle East. It can be used in different ways to protect the head and mouth from the elements.",
- "weight": 152,
+ "weight": "152 g",
"volume": "1250 ml",
"price": 250,
"to_hit": -1,
@@ -5417,7 +5439,7 @@
"type": "ARMOR",
"name": "keikogi",
"description": "Plain white keikogi for use in martial arts.",
- "weight": 250,
+ "weight": "250 g",
"volume": "750 ml",
"price": 2500,
"material": [ "cotton" ],
@@ -5435,7 +5457,7 @@
"category": "armor",
"name": "Kevlar vest",
"description": "A lightweight, bullet resistant vest. Suitable for wearing under clothing.",
- "weight": 2860,
+ "weight": "2860 g",
"volume": "6 L",
"price": 80000,
"to_hit": -3,
@@ -5455,7 +5477,7 @@
"type": "ARMOR",
"name": "kilt",
"description": "No true Scotsman would leave home without his kilt.",
- "weight": 1814,
+ "weight": "1814 g",
"volume": "1500 ml",
"price": 6500,
"material": [ "wool" ],
@@ -5473,7 +5495,7 @@
"type": "ARMOR",
"name": "leather kilt",
"description": "No true Scotsman would leave home without his kilt.",
- "weight": 1814,
+ "weight": "1814 g",
"volume": "1500 ml",
"price": 6500,
"material": [ "leather" ],
@@ -5491,7 +5513,7 @@
"type": "ARMOR",
"name": "kimono",
"description": "A traditional, ankle-length Japanese robe, wrapped around the body with a sash.",
- "weight": 1200,
+ "weight": "1200 g",
"volume": "5 L",
"price": 20000,
"to_hit": -5,
@@ -5511,7 +5533,7 @@
"type": "ARMOR",
"name": "yukata",
"description": "An easy to wear, breezy robe secured with a sash. Essentially Japanese pajamas. Great for summer nights.",
- "weight": 900,
+ "weight": "900 g",
"volume": "3 L",
"price": 5000,
"to_hit": -5,
@@ -5531,7 +5553,7 @@
"type": "ARMOR",
"name": "haori",
"description": "A loose coat with wide sleeves that is worn unfastened over a kimono. It is jet black with sparse, tasteful golden embroidery.",
- "weight": 800,
+ "weight": "800 g",
"volume": "2 L",
"price": 30000,
"to_hit": -5,
@@ -5551,7 +5573,7 @@
"name": "kippah",
"name_plural": "kippahs",
"description": "A thin, rounded skullcap. A traditional headdress in Judaism.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 5000,
"material": [ "cotton" ],
@@ -5569,7 +5591,7 @@
"name": "kittel",
"name_plural": "kittels",
"description": "A white, knee-length cotton robe, traditionally worn by Jews on special occasions.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "4 L",
"price": 20000,
"to_hit": -5,
@@ -5591,7 +5613,7 @@
"name": "pair of knee pads",
"name_plural": "pairs of knee pads",
"description": "A pair of knee pads made of stout plastic and cloth.",
- "weight": 210,
+ "weight": "210 g",
"volume": "1500 ml",
"price": 2500,
"to_hit": 1,
@@ -5609,7 +5631,7 @@
"name": "kufi cap",
"name_plural": "kufi caps",
"description": "A brimless, short and rounded cap.",
- "weight": 88,
+ "weight": "88 g",
"volume": "500 ml",
"price": 3000,
"material": [ "cotton" ],
@@ -5627,7 +5649,7 @@
"type": "ARMOR",
"name": "leather belt",
"description": "A leather belt. Useful for making your pair of pants fit.",
- "weight": 102,
+ "weight": "102 g",
"volume": "250 ml",
"price": 9000,
"bashing": 5,
@@ -5654,7 +5676,7 @@
"name": "leather pouch",
"name_plural": "leather pouches",
"description": "A bag stitched together from leather scraps. Doesn't hold an awful lot but is easy to wear.",
- "weight": 610,
+ "weight": "610 g",
"volume": "500 ml",
"price": 1000,
"to_hit": 1,
@@ -5676,7 +5698,7 @@
"name_plural": "ammo pouches",
"description": "A small pouch that can be used to store most types of small ammunition, rockets will not fit. Activate to store ammunition.",
"looks_like": "leather_pouch",
- "weight": 490,
+ "weight": "490 g",
"rigid": false,
"volume": "500 ml",
"price": 1000,
@@ -5747,7 +5769,7 @@
"type": "ARMOR",
"name": "leg splint",
"description": "A tool to help set bones and hold them in place.",
- "weight": 500,
+ "weight": "500 g",
"volume": "1 L",
"price": 20000,
"material": [ "wood", "cotton" ],
@@ -5766,7 +5788,7 @@
"name": "leg splint XL",
"description": "A tool to help set bones and hold them in place. It is specifically designed to fit Huge people.",
"copy-from": "leg_splint",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "2 L",
"price": 25000,
"encumbrance": 140,
@@ -5778,7 +5800,7 @@
"name": "pair of leg warmers",
"name_plural": "pairs of leg warmers",
"description": "Snug, soft cloth sleeves to keep your legs warm.",
- "weight": 46,
+ "weight": "46 g",
"volume": "500 ml",
"price": 1000,
"material": [ "cotton" ],
@@ -5797,7 +5819,7 @@
"name": "pair of XL leg warmers",
"name_plural": "pairs of XL leg warmers",
"description": "Large, soft, snug cloth sleeves to keep your exotic anatomy warm.",
- "weight": 50,
+ "weight": "50 g",
"volume": "750 ml",
"price": 20000,
"material": [ "cotton" ],
@@ -5816,7 +5838,7 @@
"name": "pair of fetlock furs",
"name_plural": "pairs of fetlock furs",
"description": "Snug fur sleeves to keep your fetlocks warm.",
- "weight": 66,
+ "weight": "66 g",
"volume": "750 ml",
"price": 25000,
"material": [ "fur" ],
@@ -5835,7 +5857,7 @@
"name": "leggings",
"name_plural": "leggings",
"description": "Skin-tight nylon leggings, sometimes used when exercising, that keep your legs nice and warm.",
- "weight": 155,
+ "weight": "155 g",
"volume": "500 ml",
"price": 1000,
"material": [ "cotton", "plastic" ],
@@ -5854,7 +5876,7 @@
"name": "pair of hard leg guards",
"name_plural": "pairs of hard leg guards",
"description": "A pair of polyurethane leg guards with neoprene backing.",
- "weight": 625,
+ "weight": "625 g",
"volume": "3 L",
"price": 3400,
"to_hit": 1,
@@ -5876,7 +5898,7 @@
"name": "pair of steel leg guards",
"name_plural": "pairs of steel leg guards",
"description": "A full assembly of medieval leg protection. Cuisses, poleyns, and greaves, with leather straps to secure each piece and connect it as part of a set.",
- "weight": 4080,
+ "weight": "4080 g",
"volume": "6 L",
"price": 20000,
"to_hit": -1,
@@ -5897,7 +5919,7 @@
"name": "pair of iron greaves",
"name_plural": "pairs of iron greaves",
"description": "A pair of iron leg guards with a simple leather lining.",
- "weight": 2260,
+ "weight": "2260 g",
"volume": "5500 ml",
"price": 40000,
"to_hit": 1,
@@ -5917,7 +5939,7 @@
"name": "pair of paper leg guards",
"name_plural": "pairs of paper leg guards",
"description": "Leg guards made of stacked paper sheets held together with duct tape.",
- "weight": 370,
+ "weight": "370 g",
"volume": "500 ml",
"price": 230,
"to_hit": 1,
@@ -5938,7 +5960,7 @@
"name": "pair of scrap leg guards",
"name_plural": "pairs of scrap leg guards",
"description": "A pair of leg guards made from scraps of metal secured by simple strings; the loose collection of plates provides decent but not the most convenient protection.",
- "weight": 3104,
+ "weight": "3104 g",
"volume": "5 L",
"price": 20000,
"to_hit": -1,
@@ -5960,7 +5982,7 @@
"name": "pair of drop leg pouches",
"name_plural": "pairs of drop leg pouches",
"description": "A set of pouches that can be worn on the thighs using buckled straps. This variety is favored by the military.",
- "weight": 205,
+ "weight": "205 g",
"volume": "500 ml",
"price": 3000,
"material": [ "cotton" ],
@@ -5978,7 +6000,7 @@
"type": "ARMOR",
"name": "Linux t-shirt",
"description": "A t-shirt with a picture of the Tux mascot on it. Underneath it says \"You wouldn't buy a car with the hood welded shut.\"",
- "weight": 110,
+ "weight": "110 g",
"volume": "500 ml",
"price": 2000,
"material": [ "cotton" ],
@@ -6030,7 +6052,7 @@
"type": "ARMOR",
"name": "loincloth",
"description": "Rags stitched together and tied into a makeshift loincloth. Covers your modesty, but not much else.",
- "weight": 32,
+ "weight": "32 g",
"volume": "250 ml",
"price": 900,
"material": [ "cotton" ],
@@ -6046,7 +6068,7 @@
"type": "ARMOR",
"name": "fur loincloth",
"description": "A fur pelt tied into a loincloth. Covers your modesty, but not much else. Now you are a true barbarian warrior.",
- "weight": 64,
+ "weight": "64 g",
"volume": "250 ml",
"price": 7500,
"material": [ "fur" ],
@@ -6063,7 +6085,7 @@
"type": "ARMOR",
"name": "leather loincloth",
"description": "Leather patches stitched together and tied into a makeshift loincloth. Covers your modesty, but not much else.",
- "weight": 64,
+ "weight": "64 g",
"volume": "250 ml",
"price": 7500,
"material": [ "leather" ],
@@ -6079,7 +6101,7 @@
"type": "ARMOR",
"name": "wool loincloth",
"description": "Bits of wool stitched together and tied into a makeshift loincloth. Covers your modesty, but not much else.",
- "weight": 56,
+ "weight": "56 g",
"volume": "250 ml",
"price": 900,
"material": [ "wool" ],
@@ -6097,7 +6119,7 @@
"name": "pair of extra long white gloves",
"name_plural": "pairs of extra long white gloves",
"description": "Long white costume gloves.",
- "weight": 400,
+ "weight": "400 g",
"volume": "1 L",
"price": 1100,
"to_hit": 1,
@@ -6115,7 +6137,7 @@
"type": "ARMOR",
"name": "long underwear bottom",
"description": "A pair of long underwear that help to maintain body temperature.",
- "weight": 88,
+ "weight": "88 g",
"volume": "500 ml",
"price": 1500,
"material": [ "cotton" ],
@@ -6133,7 +6155,7 @@
"type": "ARMOR",
"name": "long underwear top",
"description": "A long underwear top that helps to maintain body temperature.",
- "weight": 96,
+ "weight": "96 g",
"volume": "500 ml",
"price": 1500,
"material": [ "cotton" ],
@@ -6152,7 +6174,7 @@
"name": "sleeveless underwear top",
"description": "A sleeveless underwear top that helps to maintain body temperature.",
"looks_like": "long_undertop",
- "weight": 80,
+ "weight": "80 g",
"volume": "400 ml",
"price": 1200,
"material": [ "cotton" ],
@@ -6170,7 +6192,7 @@
"type": "ARMOR",
"name": "long-sleeved shirt",
"description": "A long-sleeved cotton shirt.",
- "weight": 146,
+ "weight": "146 g",
"volume": "750 ml",
"price": 2000,
"material": [ "cotton" ],
@@ -6189,7 +6211,7 @@
"category": "armor",
"name": "light survivor body armor",
"description": "Lightweight, custom built body armor made from Kevlar and tough fabric. Mostly waterproof.",
- "weight": 3000,
+ "weight": "3000 g",
"volume": "6 L",
"price": 60000,
"material": [ "kevlar", "cotton" ],
@@ -6211,7 +6233,7 @@
"name": "light survivor cargo pants",
"name_plural": "light survivor cargo pants",
"description": "Lightweight, Kevlar armored cargo pants designed to hold as much as possible. Strong and mostly waterproof.",
- "weight": 920,
+ "weight": "920 g",
"volume": "3500 ml",
"price": 40000,
"material": [ "kevlar", "cotton" ],
@@ -6221,7 +6243,7 @@
"coverage": 95,
"encumbrance": 16,
"storage": "2500 ml",
- "warmth": 15,
+ "warmth": 12,
"material_thickness": 3,
"environmental_protection": 1,
"flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "RAINPROOF", "STURDY" ]
@@ -6232,7 +6254,7 @@
"category": "armor",
"name": "light survivor suit",
"description": "A lightweight, hand-built combination armor made from a cut-down bulletproof vest and a reinforced fabric jumpsuit. Protects from the elements as well as from harm.",
- "weight": 5100,
+ "weight": "5100 g",
"volume": "10500 ml",
"price": 110000,
"material": [ "kevlar", "cotton" ],
@@ -6253,7 +6275,7 @@
"name": "French maid clothes",
"name_plural": "French maid clothes",
"description": "The French maid dress, blue with a frilly white apron.",
- "weight": 100,
+ "weight": "100 g",
"volume": "250 ml",
"price": 5000,
"material": [ "cotton" ],
@@ -6272,7 +6294,7 @@
"type": "ARMOR",
"name": "French maid hat",
"description": "A frilly white headpiece.",
- "weight": 10,
+ "weight": "10 g",
"volume": "250 ml",
"price": 2500,
"material": [ "cotton" ],
@@ -6291,7 +6313,7 @@
"category": "armor",
"name": "ballistic mask",
"description": "A protective reinforced Kevlar mask that covers the face. Provides excellent protection from ballistic threats.",
- "weight": 512,
+ "weight": "512 g",
"volume": "750 ml",
"price": 20000,
"to_hit": -3,
@@ -6311,7 +6333,7 @@
"type": "ARMOR",
"name": "dust mask",
"description": "A simple piece of cotton that straps over the mouth. Provides a small amount of protection from airborne illness and dust.",
- "weight": 168,
+ "weight": "168 g",
"volume": "100 ml",
"price": 800,
"to_hit": -3,
@@ -6331,7 +6353,7 @@
"category": "armor",
"name": "Guy Fawkes mask",
"description": "Remember, remember, the fifth of November.",
- "weight": 45,
+ "weight": "45 g",
"volume": "750 ml",
"price": 4000,
"to_hit": -3,
@@ -6353,7 +6375,7 @@
"name": "hockey mask",
"//": "Jason-type costume masks are much cheaper and less protective.",
"description": "A protective face mask made of thick plastic. Commonly worn by hockey goalies.",
- "weight": 228,
+ "weight": "228 g",
"volume": "750 ml",
"price": 4000,
"to_hit": -3,
@@ -6373,7 +6395,7 @@
"type": "ARMOR",
"name": "rioter mask",
"description": "This is a t-shirt with sleeves tied on the back. These are usually worn by rioters to hide their identity.",
- "weight": 123,
+ "weight": "123 g",
"volume": "500 ml",
"price": 800,
"to_hit": -1,
@@ -6394,7 +6416,7 @@
"name": "pair of mittens",
"name_plural": "pairs of mittens",
"description": "A pair of warm mittens. They are extremely cumbersome.",
- "weight": 364,
+ "weight": "364 g",
"volume": "750 ml",
"price": 2500,
"to_hit": 1,
@@ -6413,7 +6435,7 @@
"type": "ARMOR",
"name": "motorcycle armor",
"description": "A suit of armor used by dirt bikers and motorcyclists.",
- "weight": 2125,
+ "weight": "2125 g",
"volume": "1 L",
"price": 15000,
"bashing": 8,
@@ -6435,7 +6457,7 @@
"name": "motorcycle pants",
"name_plural": "pairs of motorcycle pants",
"description": "A pair of pants designed for dirt bikers and motorcyclists.",
- "weight": 1340,
+ "weight": "1340 g",
"volume": "750 ml",
"price": 10000,
"material": [ "kevlar", "cotton" ],
@@ -6455,7 +6477,7 @@
"category": "armor",
"name": "protective mouthpiece",
"description": "A protective piece of equipment commonly used by athletes, which is worn inside the mouth to protect your teeth.",
- "weight": 20,
+ "weight": "20 g",
"volume": "430 ml",
"price": 800,
"bashing": 2,
@@ -6472,7 +6494,7 @@
"type": "ARMOR",
"name": "nanoskirt",
"description": "Apparently the microskirt wasn't short enough.",
- "weight": 11,
+ "weight": "11 g",
"volume": "250 ml",
"price": 3000,
"material": [ "cotton" ],
@@ -6489,7 +6511,7 @@
"name": "pair of flame-resistant gloves",
"name_plural": "pairs of flame-resistant gloves",
"description": "A snug fitting pair of gloves made from thin and lightweight Nomex fire-resistant fabric. Tough yet breathable, they are light and comfortable to wear under clothing.",
- "weight": 190,
+ "weight": "190 g",
"volume": "500 ml",
"price": 2000,
"to_hit": -5,
@@ -6509,7 +6531,7 @@
"type": "ARMOR",
"name": "flame-resistant hood",
"description": "A snug fitting garment that protects your head and neck, made from lightweight Nomex fire-resistant fabric. Tough yet breathable, it is light and comfortable to wear under clothing.",
- "weight": 210,
+ "weight": "210 g",
"volume": "500 ml",
"price": 5000,
"to_hit": -5,
@@ -6530,7 +6552,7 @@
"name": "pair of flame-resistant socks",
"name_plural": "pairs of flame-resistant socks",
"description": "A snug fitting pair of stockings made from thin and lightweight Nomex fire-resistant fabric. Tough yet breathable, they are light and comfortable to wear under clothing.",
- "weight": 200,
+ "weight": "200 g",
"volume": "750 ml",
"price": 2000,
"to_hit": -5,
@@ -6550,7 +6572,7 @@
"type": "ARMOR",
"name": "flame-resistant suit",
"description": "A snug body suit made from thin and lightweight Nomex fire-resistant fabric. Tough yet breathable, it is light and comfortable to wear under clothing.",
- "weight": 688,
+ "weight": "688 g",
"volume": "1500 ml",
"price": 13000,
"to_hit": -5,
@@ -6570,7 +6592,7 @@
"type": "ARMOR",
"name": "obi",
"description": "A broad, black obi gi.",
- "weight": 200,
+ "weight": "200 g",
"volume": "250 ml",
"price": 2000,
"to_hit": -1,
@@ -6583,7 +6605,7 @@
"type": "ARMOR",
"name": "FB51 optical cloak",
"description": "A plastic cloak embedded with cameras and LEDs that will render you fully invisible to normal vision when powered and worn. You must be carrying a unified power supply, or UPS, to use it. Activate to toggle visibility.",
- "weight": 1552,
+ "weight": "1552 g",
"volume": "3500 ml",
"price": 5500000,
"to_hit": -1,
@@ -6609,7 +6631,7 @@
"name": "panties",
"name_plural": "panties",
"description": "Underwear designed to be worn by women. Preserves your modesty in desperate times.",
- "weight": 32,
+ "weight": "32 g",
"volume": "250 ml",
"price": 1000,
"material": [ "cotton" ],
@@ -6627,7 +6649,7 @@
"name": "pants",
"name_plural": "pants",
"description": "A pair of khaki pants. Slightly warmer than jeans.",
- "weight": 560,
+ "weight": "560 g",
"volume": "2 L",
"price": 4900,
"to_hit": 1,
@@ -6648,7 +6670,7 @@
"name": "army pants",
"name_plural": "army pants",
"description": "A tough pair of pants lined with pockets. Favored by the military.",
- "weight": 720,
+ "weight": "720 g",
"volume": "2500 ml",
"price": 3500,
"material": [ "cotton", "plastic" ],
@@ -6668,7 +6690,7 @@
"name": "cargo pants",
"name_plural": "cargo pants",
"description": "A pair of pants lined with pockets, offering lots of storage.",
- "weight": 670,
+ "weight": "670 g",
"volume": "2250 ml",
"price": 2500,
"material": [ "cotton" ],
@@ -6688,7 +6710,7 @@
"name": "checkered pants",
"name_plural": "checkered pants",
"description": "In a pinch, these pants can be used for an impromptu game of checkers.",
- "weight": 630,
+ "weight": "630 g",
"volume": "1250 ml",
"price": 4000,
"material": [ "cotton" ],
@@ -6708,7 +6730,7 @@
"name": "pair of fur leggings",
"name_plural": "pairs of fur leggings",
"description": "Snug fur sleeves to keep your legs warm. Simple yet effective since prehistoric times.",
- "weight": 694,
+ "weight": "694 g",
"volume": "1500 ml",
"price": 1500,
"material": [ "fur" ],
@@ -6727,7 +6749,7 @@
"name": "fur pants",
"name_plural": "fur pants",
"description": "A hefty pair of fur-lined pants.",
- "weight": 920,
+ "weight": "920 g",
"volume": "4 L",
"price": 20000,
"to_hit": 1,
@@ -6759,7 +6781,7 @@
"name": "leather pants",
"name_plural": "leather pants",
"description": "A pair of black leather pants. Very tough, but cumbersome and without much storage.",
- "weight": 980,
+ "weight": "980 g",
"volume": "2500 ml",
"price": 12000,
"to_hit": 1,
@@ -6780,7 +6802,7 @@
"name": "ski pants",
"name_plural": "ski pants",
"description": "A pair of pants meant for alpine skiing.",
- "weight": 450,
+ "weight": "450 g",
"volume": "2 L",
"price": 6500,
"material": [ "cotton" ],
@@ -6802,7 +6824,7 @@
"name": "survivor cargo pants",
"name_plural": "survivor cargo pants",
"description": "A pair of Kevlar armored pants covered with pouches and pockets. Custom built to be durable, comfortable, and easy to wear.",
- "weight": 2100,
+ "weight": "2100 g",
"volume": "3 L",
"price": 38000,
"material": [ "cotton", "kevlar" ],
@@ -6812,7 +6834,7 @@
"coverage": 100,
"encumbrance": 20,
"storage": "3500 ml",
- "warmth": 10,
+ "warmth": 15,
"material_thickness": 4,
"environmental_protection": 3,
"flags": [ "VARSIZE", "POCKETS", "STURDY", "WATERPROOF" ]
@@ -6822,7 +6844,7 @@
"type": "ARMOR",
"name": "peacoat",
"description": "A heavy wool coat. Cumbersome, but warm and with deep pockets.",
- "weight": 1800,
+ "weight": "1800 g",
"volume": "3 L",
"price": 18000,
"to_hit": -3,
@@ -6842,7 +6864,7 @@
"type": "ARMOR",
"name": "pearl collar",
"description": "A collar made from round and lustrous pearls, its former owner must be a wealthy individual.",
- "weight": 30,
+ "weight": "30 g",
"volume": "300 ml",
"price": 590000,
"price_postapoc": 2000,
@@ -6858,7 +6880,7 @@
"name": "pickelhaube",
"name_plural": "pickelhauben",
"description": "A spiked helmet once worn by German military officers. The spike is very sharp.",
- "weight": 980,
+ "weight": "980 g",
"volume": "1750 ml",
"price": 24000,
"to_hit": -3,
@@ -6879,7 +6901,7 @@
"type": "ARMOR",
"name": "plastic shopping bag",
"description": "A bag used to carry groceries home.",
- "weight": 2,
+ "weight": "2 g",
"volume": "250 ml",
"price": 1,
"to_hit": -2,
@@ -6899,7 +6921,7 @@
"name": "police duty belt",
"description": "Black leather belt used by police officers. It has several pouches and a holder for a baton.",
"looks_like": "fireman_belt",
- "weight": 250,
+ "weight": "250 g",
"volume": "2 L",
"price": 10000,
"bashing": 5,
@@ -6925,7 +6947,7 @@
"type": "ARMOR",
"name": "polo shirt",
"description": "A short-sleeved cotton shirt, slightly thicker than a t-shirt.",
- "weight": 136,
+ "weight": "136 g",
"volume": "750 ml",
"price": 1500,
"material": [ "cotton" ],
@@ -6943,7 +6965,7 @@
"type": "ARMOR",
"name": "wool poncho",
"description": "A simple wool garment worn over the torso. Provides a bit of protection.",
- "weight": 907,
+ "weight": "907 g",
"volume": "1250 ml",
"price": 12000,
"to_hit": -1,
@@ -6963,7 +6985,7 @@
"type": "ARMOR",
"name": "porkpie hat",
"description": "A flat-topped hat with circular indent and a narrow brim. Most popular in the 40s and 50s, still common among those in the mod scene, hipsters, and people named Heisenberg.",
- "weight": 213,
+ "weight": "213 g",
"volume": "1250 ml",
"price": 5500,
"material": [ "cotton" ],
@@ -6982,7 +7004,7 @@
"type": "ARMOR",
"name": "mail carrier hat",
"description": "A traditional mail carrier's cap, with the US postal service logo embroidered on the front above the plastic cap. A symbol of a bygone world.",
- "weight": 90,
+ "weight": "90 g",
"volume": "750 ml",
"price": 1000,
"material": [ "cotton", "plastic" ],
@@ -7001,7 +7023,7 @@
"type": "ARMOR",
"name": "mail carrier shirt",
"description": "A light blue button down shirt with a couple of pockets in front and the US postal service logo embroidered on it.",
- "weight": 110,
+ "weight": "110 g",
"volume": "500 ml",
"price": 1500,
"material": [ "cotton" ],
@@ -7020,7 +7042,7 @@
"name": "mail carrier shorts",
"name_plural": "mail carrier shorts",
"description": "A pair of dark blue shorts, the kind used by postal service workers.",
- "weight": 230,
+ "weight": "230 g",
"volume": "1 L",
"price": 4000,
"to_hit": 1,
@@ -7040,7 +7062,7 @@
"category": "armor",
"name": "pot helmet",
"description": "A helmet made from a soup pot. It's not very good protection, but it's better than nothing.",
- "weight": 760,
+ "weight": "760 g",
"volume": "2 L",
"price": 4500,
"bashing": 10,
@@ -7060,7 +7082,7 @@
"type": "ARMOR",
"name": "quiver",
"description": "A leather quiver worn at the waist that can hold 20 arrows. Activate to store arrows.",
- "weight": 260,
+ "weight": "260 g",
"volume": "500 ml",
"price": 6500,
"bashing": 2,
@@ -7079,7 +7101,7 @@
"type": "ARMOR",
"name": "birchbark quiver",
"description": "A quiver woven from strips of birch bark, worn at the waist, that can hold 20 arrows. Activate to store arrows.",
- "weight": 490,
+ "weight": "490 g",
"volume": "500 ml",
"price": 6500,
"bashing": 2,
@@ -7098,7 +7120,7 @@
"type": "ARMOR",
"name": "large quiver",
"description": "A large leather quiver trimmed with metal, worn on the back, that can hold 60 arrows. Historically used by horse archers, rather than foot archers, but neither of THEM had to fight zombies. Activate to store arrows.",
- "weight": 920,
+ "weight": "920 g",
"volume": "1500 ml",
"price": 8800,
"bashing": 4,
@@ -7117,7 +7139,7 @@
"type": "ARMOR",
"name": "large birchbark quiver",
"description": "A large quiver woven from strips of birchbark, worn on the back, that can hold 60 arrows. Activate to store arrows.",
- "weight": 1380,
+ "weight": "1380 g",
"volume": "1500 ml",
"price": 8800,
"bashing": 4,
@@ -7137,7 +7159,7 @@
"name": "pouch",
"name_plural": "pouches",
"description": "A makeshift bag, cobbled together from rags. Really gets in the way, but provides a decent amount of storage.",
- "weight": 560,
+ "weight": "560 g",
"volume": "500 ml",
"price": 1000,
"to_hit": 1,
@@ -7158,7 +7180,7 @@
"name": "robe",
"name_plural": "robes",
"description": "A loose-fitting outer garment with sleeves, and a mysterious amount of well-hidden pockets.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "5 L",
"price": 5000,
"to_hit": -5,
@@ -7178,7 +7200,7 @@
"type": "ARMOR",
"name": "scabbard",
"description": "A large, adjustable sheath for holding swords and other large blades. Activate to sheathe/draw a weapon.",
- "weight": 1360,
+ "weight": "1360 g",
"volume": "1750 ml",
"price": 6000,
"bashing": 4,
@@ -7203,7 +7225,7 @@
"type": "ARMOR",
"name": "shark suit",
"description": "A one piece chainmail suit used by scuba divers for protection against shark bites. It comes with attached plastic helmet and booties.",
- "weight": 3150,
+ "weight": "3150 g",
"volume": "3500 ml",
"price": 35000,
"to_hit": -1,
@@ -7222,7 +7244,7 @@
"type": "ARMOR",
"name": "faraday shark suit",
"description": "A one piece chainmail suit used by scuba divers for protection against shark bites. It has been conductively interconnected, protecting against electricity.",
- "weight": 3250,
+ "weight": "3250 g",
"volume": "3500 ml",
"price": 35000,
"to_hit": -1,
@@ -7242,7 +7264,7 @@
"name": "sheath",
"name_plural": "sheathes",
"description": "A leather sheath for holding knives and other small blades. It is easy to use without much practice. Activate to sheathe/draw a weapon.",
- "weight": 200,
+ "weight": "200 g",
"volume": "500 ml",
"price": 3500,
"material": [ "leather" ],
@@ -7266,7 +7288,7 @@
"type": "ARMOR",
"name": "sheet",
"description": "A large fabric sheet, could be used as a curtain or bedsheets; or cut up for a bunch of rags.",
- "weight": 771,
+ "weight": "771 g",
"volume": "5 L",
"price": 2000,
"to_hit": -1,
@@ -7285,7 +7307,7 @@
"type": "ARMOR",
"name": "sheriff's shirt",
"description": "A tan button-down shirt with long sleeves.",
- "weight": 250,
+ "weight": "250 g",
"volume": "750 ml",
"price": 1100,
"material": [ "cotton" ],
@@ -7305,7 +7327,7 @@
"name": "shorts",
"name_plural": "shorts",
"description": "A pair of khaki shorts.",
- "weight": 230,
+ "weight": "230 g",
"volume": "1 L",
"price": 2000,
"to_hit": 1,
@@ -7326,7 +7348,7 @@
"name": "cargo shorts",
"name_plural": "cargo shorts",
"description": "A pair of shorts lined with pockets, offering decent storage.",
- "weight": 340,
+ "weight": "340 g",
"volume": "1500 ml",
"price": 4000,
"to_hit": 1,
@@ -7347,7 +7369,7 @@
"name": "denim shorts",
"name_plural": "denim shorts",
"description": "A pair of denim shorts. Thick and tough, they provide excellent protection from cuts.",
- "weight": 260,
+ "weight": "260 g",
"volume": "1250 ml",
"price": 2000,
"to_hit": 1,
@@ -7367,7 +7389,7 @@
"type": "ARMOR",
"name": "skinny tie",
"description": "A skinny black and white checkered necktie.",
- "weight": 12,
+ "weight": "12 g",
"volume": 0,
"price": 750,
"material": [ "cotton" ],
@@ -7375,12 +7397,33 @@
"color": "dark_gray",
"flags": [ "FANCY" ]
},
+ {
+ "id": "ski_jacket",
+ "type": "ARMOR",
+ "name": "ski jacket",
+ "description": "An insulated, breathable hoodie made for alpine skiing. Very warm, and with sizable pockets.",
+ "weight": 1105,
+ "volume": "5 L",
+ "price": 18000,
+ "material": [ "cotton", "plastic" ],
+ "symbol": "[",
+ "color": "light_blue",
+ "covers": [ "TORSO", "ARMS" ],
+ "coverage": 95,
+ "encumbrance": 22,
+ "storage": 8,
+ "warmth": 80,
+ "material_thickness": 5,
+ "environmental_protection": 3,
+ "flags": [ "VARSIZE", "POCKETS", "HOOD", "COLLAR", "OUTER" ],
+ "looks_like": "coat_winter"
+ },
{
"id": "skirt",
"type": "ARMOR",
"name": "skirt",
"description": "A short, breezy cotton skirt. Easy to move in, but only has a single small pocket.",
- "weight": 74,
+ "weight": "74 g",
"volume": "250 ml",
"price": 6500,
"material": [ "cotton" ],
@@ -7398,7 +7441,7 @@
"type": "ARMOR",
"name": "leather skirt",
"description": "A very short leather skirt, clearly designed to look good, not be practical.",
- "weight": 230,
+ "weight": "230 g",
"volume": "250 ml",
"price": 9500,
"material": [ "leather" ],
@@ -7416,7 +7459,7 @@
"type": "ARMOR",
"name": "sleeping bag",
"description": "A large sleeping bag that covers you head to toe.",
- "weight": 981,
+ "weight": "981 g",
"volume": "3500 ml",
"price": 20500,
"to_hit": -1,
@@ -7442,7 +7485,7 @@
"type": "ARMOR",
"name": "rolled sleeping bag",
"description": "A large sleeping bag rolled up for transport. It has a strap to carry it with.",
- "weight": 981,
+ "weight": "981 g",
"volume": "1 L",
"price": 20500,
"to_hit": -1,
@@ -7461,7 +7504,7 @@
"type": "ARMOR",
"name": "fur sleeping bag",
"description": "A large sleeping bag lined with fur. Who needs a tent?",
- "weight": 1175,
+ "weight": "1175 g",
"volume": "4500 ml",
"price": 32500,
"to_hit": -1,
@@ -7487,7 +7530,7 @@
"type": "ARMOR",
"name": "rolled fur sleeping bag",
"description": "A large sleeping bag lined with fur, rolled for transport. It has a strap to carry it with.",
- "weight": 1175,
+ "weight": "1175 g",
"volume": "2 L",
"price": 32500,
"to_hit": -1,
@@ -7512,7 +7555,7 @@
"name": "sleeveless duster",
"//": "The general guideline for sleeveless dusters is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.",
"description": "A rugged full-length duster that leaves your arms unencumbered. Has plenty of storage space due to its many pockets.",
- "weight": 857,
+ "weight": "857 g",
"volume": "4500 ml",
"price": 13175,
"to_hit": -1,
@@ -7534,7 +7577,7 @@
"name": "sleeveless fur duster",
"//": "The general guideline for sleeveless dusters is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.",
"description": "A thick fur full-length duster without sleeves, leaving your arms unencumbered. Has plenty of storage space due to its many pockets.",
- "weight": 2007,
+ "weight": "2007 g",
"volume": "8250 ml",
"price": 83215,
"to_hit": -1,
@@ -7567,7 +7610,7 @@
"name": "sleeveless leather duster",
"//": "The general guideline for sleeveless dusters is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.",
"description": "A thick leather full-length duster without sleeves, leaving your arms unencumbered. Has plenty of storage space due to its many pockets.",
- "weight": 2257,
+ "weight": "2257 g",
"volume": "6 L",
"price": 20825,
"to_hit": -1,
@@ -7590,7 +7633,7 @@
"name": "sleeveless survivor duster",
"//": "The general guideline for sleeveless dusters is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.",
"description": "A custom Kevlar armored full-length duster without sleeves, covered with pouches and pockets. Comfortable, durable, and great for storage.",
- "weight": 2203,
+ "weight": "2203 g",
"volume": "8 L",
"price": 34000,
"to_hit": -1,
@@ -7612,7 +7655,7 @@
"name": "sleeveless trenchcoat",
"//": "The general guideline for sleeveless trenchcoats is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.",
"description": "A thin cotton trenchcoat that leaves your arms unencumbered. Has plenty of storage space due to its many pockets.",
- "weight": 635,
+ "weight": "635 g",
"volume": "3750 ml",
"price": 13175,
"to_hit": -1,
@@ -7634,7 +7677,7 @@
"name": "sleeveless fur trenchcoat",
"//": "The general guideline for sleeveless trenchcoats is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.",
"description": "A thick fur trenchcoat without sleeves, leaving your arms unencumbered. Has plenty of storage space due to its many pockets.",
- "weight": 1487,
+ "weight": "1487 g",
"volume": "6750 ml",
"price": 83215,
"to_hit": -1,
@@ -7667,7 +7710,7 @@
"name": "sleeveless leather trenchcoat",
"//": "The general guideline for sleeveless trenchcoats is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.",
"description": "A thick leather trenchcoat without sleeves, leaving your arms unencumbered. Has plenty of storage space due to its many pockets.",
- "weight": 1672,
+ "weight": "1672 g",
"volume": "4250 ml",
"price": 20825,
"to_hit": -1,
@@ -7690,7 +7733,7 @@
"name": "sleeveless survivor trenchcoat",
"//": "The general guideline for sleeveless trenchcoats is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original. Making it from an original takes 50% the time.",
"description": "A custom Kevlar armored trenchcoat without sleeves, covered with pouches and pockets. Comfortable, durable, and great for storage.",
- "weight": 1632,
+ "weight": "1632 g",
"volume": "6 L",
"price": 34000,
"to_hit": -1,
@@ -7711,7 +7754,7 @@
"type": "ARMOR",
"name": "sleeveless tunic",
"description": "A sleeveless cloth garment that covers the torso and legs.",
- "weight": 240,
+ "weight": "240 g",
"volume": "1 L",
"price": 4000,
"to_hit": -5,
@@ -7730,7 +7773,7 @@
"type": "ARMOR",
"name": "snuggie",
"description": "Perfect for reading all those books you scavenged.",
- "weight": 625,
+ "weight": "625 g",
"volume": "3 L",
"price": 3600,
"to_hit": -1,
@@ -7751,7 +7794,7 @@
"name": "pair of sock mitts",
"name_plural": "pairs of sock mitts",
"description": "A pair of improvised gloves made from socks with holes poked through them.",
- "weight": 32,
+ "weight": "32 g",
"volume": "250 ml",
"price": 0,
"material": [ "cotton" ],
@@ -7769,7 +7812,7 @@
"name": "pair of socks",
"name_plural": "pairs of socks",
"description": "Socks. Put 'em on your feet.",
- "weight": 32,
+ "weight": "32 g",
"volume": "250 ml",
"price": 200,
"material": [ "cotton" ],
@@ -7787,7 +7830,7 @@
"name": "pair of bag socks",
"name_plural": "pairs of bag socks",
"description": "A pair of disposable plastic bags, adapted to be used as socks.",
- "weight": 6,
+ "weight": "6 g",
"volume": "250 ml",
"price": 50,
"material": [ "plastic" ],
@@ -7805,7 +7848,7 @@
"name": "pair of disposable bowling socks",
"name_plural": "pairs of disposable bowling socks",
"description": "Cheap one time socks. Can keep your feet clean, but too thin to give any protection.",
- "weight": 20,
+ "weight": "20 g",
"volume": "250 ml",
"price": 50,
"material": [ "cotton" ],
@@ -7822,7 +7865,7 @@
"name": "pair of wool socks",
"name_plural": "pairs of wool socks",
"description": "Warm socks made of wool.",
- "weight": 44,
+ "weight": "44 g",
"volume": "250 ml",
"price": 1200,
"material": [ "wool" ],
@@ -7840,7 +7883,7 @@
"type": "ARMOR",
"name": "sports bra",
"description": "A sturdy nylon bra to provide additional support during physical movement. Typically worn when exercising, it clings to the skin and is easy to wear.",
- "weight": 92,
+ "weight": "92 g",
"volume": "500 ml",
"price": 4200,
"material": [ "cotton", "plastic" ],
@@ -7857,7 +7900,7 @@
"type": "ARMOR",
"name": "WS-47G moisture retention suit",
"description": "The WebbStar moisture retention suit utilizes advanced technology to prevent up to 30% of moisture loss through perspiration. The suit is powered by the micro-motions of the body, especially breathing and walking motions. Because of this your walking speed is impaired while wearing it.",
- "weight": 3481,
+ "weight": "3481 g",
"volume": "7500 ml",
"price": 4500000,
"material": [ "plastic", "neoprene" ],
@@ -7876,7 +7919,7 @@
"name": "pair of stockings",
"name_plural": "pairs of stockings",
"description": "Long cotton socks that reach above the knees to help protect from the cold.",
- "weight": 90,
+ "weight": "90 g",
"volume": "250 ml",
"price": 500,
"material": [ "cotton" ],
@@ -7895,7 +7938,7 @@
"name": "pair of tentacle sleeves",
"name_plural": "pairs of tentacle sleeves",
"description": "Long cotton tubes sized to fit over tentacles and help protect them from the cold.",
- "weight": 360,
+ "weight": "360 g",
"volume": "1500 ml",
"price": 400,
"material": [ "cotton" ],
@@ -7914,7 +7957,7 @@
"name": "pair of tentacle stockings",
"name_plural": "pairs of tentacle stockings",
"description": "Six long cotton tubes sized to fit over tentacles and help protect them from the cold.",
- "weight": 270,
+ "weight": "270 g",
"volume": "1500 ml",
"price": 1200,
"material": [ "cotton" ],
@@ -7932,7 +7975,7 @@
"type": "ARMOR",
"name": "straw basket",
"description": "Hand made straw basket. Carry it with you for extra storage.",
- "weight": 100,
+ "weight": "100 g",
"volume": "2500 ml",
"price": 200,
"to_hit": -1,
@@ -7951,7 +7994,7 @@
"type": "ARMOR",
"name": "straw hat",
"description": "Hat that is woven out of straw. Its brim helps keep the sun out of your eyes.",
- "weight": 50,
+ "weight": "50 g",
"volume": "750 ml",
"price": 300,
"material": [ "paper" ],
@@ -7970,7 +8013,7 @@
"name": "striped pants",
"name_plural": "striped pants",
"description": "A pair of pants with horizontal black and white stripes.",
- "weight": 560,
+ "weight": "560 g",
"volume": "2 L",
"price": 500,
"to_hit": 1,
@@ -7990,7 +8033,7 @@
"type": "ARMOR",
"name": "striped shirt",
"description": "A long-sleeved shirt with horizontal black and white stripes.",
- "weight": 146,
+ "weight": "146 g",
"volume": "750 ml",
"price": 500,
"material": [ "cotton" ],
@@ -8008,7 +8051,7 @@
"type": "ARMOR",
"name": "subject suit",
"description": "A thin, short-sleeved and short-legged one-piece suit. Judging by the odd tailoring and adjustment points... maybe you don't want to know who wore it. Provides nominal storage and is not very encumbering.",
- "weight": 810,
+ "weight": "810 g",
"volume": "5 L",
"price": 11000,
"to_hit": -3,
@@ -8028,7 +8071,7 @@
"type": "ARMOR",
"name": "suit",
"description": "A full-body cotton suit. Makes the apocalypse a truly gentlemanly experience.",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "4750 ml",
"price": 20000,
"to_hit": -5,
@@ -8049,7 +8092,7 @@
"name": "suitcase",
"//": "You drag it along with you, so it taking a hit is Rare.",
"description": "A huge wheeled suitcase used mainly for transporting clothes and other possessions during trips, provides a decent amount of storage but hauling it around is neither fast nor comfortable.",
- "weight": 5000,
+ "weight": "5000 g",
"volume": "25 L",
"price": 21000,
"material": [ "plastic" ],
@@ -8067,7 +8110,7 @@
"type": "ARMOR",
"name": "suitcase",
"description": "A mid-sized suitcase used mainly for transporting clothes and other possessions during trips, provides a decent amount of storage but hauling it around is not exactly comfortable.",
- "weight": 900,
+ "weight": "900 g",
"volume": "2500 ml",
"price": 21000,
"material": [ "cotton" ],
@@ -8086,7 +8129,7 @@
"name": "sundress",
"name_plural": "sundresses",
"description": "A light and breezy cotton dress. Though cool and comfortable to wear, it lacks any storage space.",
- "weight": 60,
+ "weight": "60 g",
"volume": "1 L",
"price": 4000,
"to_hit": -5,
@@ -8104,7 +8147,7 @@
"name": "pair of sunglasses",
"name_plural": "pairs of sunglasses",
"description": "A pair of sunglasses, good for keeping the glare out of your eyes.",
- "weight": 35,
+ "weight": "35 g",
"volume": "250 ml",
"price": 5000,
"to_hit": -2,
@@ -8124,7 +8167,7 @@
"type": "ARMOR",
"name": "survivor belt",
"description": "A custom-built leather utility belt covered with straps and pouches with a sheath to carry a smaller blade. Durable and carefully crafted to be comfortable to wear. Activate to sheathe/draw a weapon.",
- "weight": 1249,
+ "weight": "1249 g",
"volume": "2250 ml",
"price": 15000,
"material": [ "leather" ],
@@ -8152,7 +8195,7 @@
"name": "survivor goggles",
"name_plural": "pairs of survivor goggles",
"description": "A custom-built pair of armored goggles with tinted lenses. Comfortable and built to last, they provide excellent protection from environmental dangers.",
- "weight": 212,
+ "weight": "212 g",
"volume": "250 ml",
"price": 7500,
"to_hit": -2,
@@ -8174,7 +8217,7 @@
"category": "armor",
"name": "survivor suit",
"description": "A hand-built combination armor made from a bulletproof vest and a reinforced leather jumpsuit. Protects from the elements as well as from harm.",
- "weight": 6800,
+ "weight": "6800 g",
"volume": "11500 ml",
"price": 150000,
"material": [ "kevlar", "leather" ],
@@ -8194,7 +8237,7 @@
"type": "ARMOR",
"name": "swag bag",
"description": "A large canvas sack, re-purposed for makeshift storage. Goes well with a striped shirt and a domino mask.",
- "weight": 415,
+ "weight": "415 g",
"volume": "1 L",
"price": 0,
"to_hit": -5,
@@ -8215,7 +8258,7 @@
"name": "SWAT armor",
"//": "This is well within the pricing structure I found for ballistic vest, shins, and LBE. LEO gear ain't cheap.",
"description": "A suit of black bulletproof armor with lots of pockets. The word SWAT is emblazoned across the back.",
- "weight": 7800,
+ "weight": "7800 g",
"volume": "13 L",
"price": 285000,
"to_hit": -3,
@@ -8237,7 +8280,7 @@
"type": "ARMOR",
"name": "sweater",
"description": "A wool shirt. Provides warmth.",
- "weight": 344,
+ "weight": "344 g",
"volume": "2 L",
"price": 4500,
"material": [ "wool" ],
@@ -8255,7 +8298,7 @@
"type": "ARMOR",
"name": "sweatshirt",
"description": "A thick cotton shirt. Provides warmth and a bit of padding.",
- "weight": 244,
+ "weight": "244 g",
"volume": "3500 ml",
"price": 1800,
"material": [ "cotton" ],
@@ -8274,7 +8317,7 @@
"name": "pair of tabi",
"name_plural": "pairs of tabi",
"description": "A pair of black tabi, as worn with traditional Japanese clothes.",
- "weight": 50,
+ "weight": "50 g",
"volume": "250 ml",
"price": 2500,
"material": [ "cotton" ],
@@ -8292,7 +8335,7 @@
"name": "pair of gi tabi",
"name_plural": "pairs of gi tabi",
"description": "A pair of white tabi, as used by martial arts practitioners.",
- "weight": 50,
+ "weight": "50 g",
"volume": "250 ml",
"price": 2500,
"material": [ "cotton" ],
@@ -8310,7 +8353,7 @@
"category": "armor",
"name": "tactical full helmet",
"description": "An all-encompassing black helmet that covers your entire face and neck, providing excellent protection from all sorts of damage.",
- "weight": 1324,
+ "weight": "1324 g",
"volume": "2 L",
"price": 50000,
"to_hit": -1,
@@ -8333,7 +8376,7 @@
"category": "armor",
"name": "tactical helmet",
"description": "A lightweight black helmet that provides excellent protection from all sorts of damage.",
- "weight": 1110,
+ "weight": "1110 g",
"volume": "2 L",
"price": 37000,
"to_hit": -1,
@@ -8354,7 +8397,7 @@
"type": "ARMOR",
"name": "tank top",
"description": "A sleeveless cotton shirt. Very easy to move in.",
- "weight": 78,
+ "weight": "78 g",
"volume": "250 ml",
"price": 500,
"material": [ "cotton" ],
@@ -8371,7 +8414,7 @@
"name": "work pants",
"name_plural": "pairs of work pants",
"description": "A pair of gray work pants.",
- "weight": 520,
+ "weight": "520 g",
"volume": "2 L",
"price": 5000,
"to_hit": 1,
@@ -8396,7 +8439,7 @@
"type": "ARMOR",
"name": "work t-shirt",
"description": "A gray work t-shirt with a small front pocket.",
- "weight": 64,
+ "weight": "64 g",
"volume": "250 ml",
"price": 1000,
"material": [ "cotton" ],
@@ -8421,7 +8464,7 @@
"name": "thawb",
"name_plural": "thawb",
"description": "A long, loose-fitting robe with wide sleeves, a traditional Arab garment.",
- "weight": 1200,
+ "weight": "1200 g",
"volume": "4500 ml",
"price": 10000,
"to_hit": -5,
@@ -8441,7 +8484,7 @@
"type": "ARMOR",
"name": "bow tie",
"description": "A simple black bow tie. Best worn with a suit.",
- "weight": 5,
+ "weight": "5 g",
"volume": 0,
"price": 1000,
"material": [ "cotton" ],
@@ -8454,7 +8497,7 @@
"type": "ARMOR",
"name": "clip-on tie",
"description": "A clip-on necktie, with blue and silver stripes. It's quick and easy to put on, and much better than the necktie.",
- "weight": 10,
+ "weight": "10 g",
"volume": 0,
"price": 500,
"material": [ "cotton" ],
@@ -8467,7 +8510,7 @@
"type": "ARMOR",
"name": "necktie",
"description": "An ordinary, green necktie. It's more difficult to put on, but it takes real skill to do so. Wearing a necktie is much better than wearing a clip-on tie.",
- "weight": 15,
+ "weight": "15 g",
"volume": 0,
"price": 1000,
"material": [ "cotton" ],
@@ -8481,7 +8524,7 @@
"name": "tights",
"name_plural": "tights",
"description": "A snug cloth garment which clings tightly to the legs and feet to protect them from the cold.",
- "weight": 114,
+ "weight": "114 g",
"volume": "250 ml",
"price": 2000,
"material": [ "cotton" ],
@@ -8499,7 +8542,7 @@
"category": "armor",
"name": "tinfoil hat",
"description": "A sheet of aluminum foil that has been molded into a form-fitting hat. Perfect for protecting yourself from the government, Illuminati, aliens, and THEM.",
- "weight": 16,
+ "weight": "16 g",
"volume": "250 ml",
"price": 16,
"material": [ "aluminum" ],
@@ -8514,7 +8557,7 @@
"type": "ARMOR",
"name": "tool belt",
"description": "A common belt with pockets and four small belt loops. Widely used by handymen and electricians.",
- "weight": 960,
+ "weight": "960 g",
"volume": "1750 ml",
"price": 4500,
"bashing": 5,
@@ -8544,7 +8587,7 @@
"name": "top hat",
"//": "No, you're not wearing anything over your top hat.",
"description": "The only hat for a gentleman. Look exquisite while laughing in the face of danger!",
- "weight": 233,
+ "weight": "233 g",
"volume": "2500 ml",
"price": 19500,
"material": [ "cotton" ],
@@ -8563,7 +8606,7 @@
"type": "ARMOR",
"name": "leather touring suit",
"description": "A thick leather body suit made for protection while riding motorcycles. Light and very comfortable.",
- "weight": 2214,
+ "weight": "2214 g",
"volume": "6500 ml",
"price": 58000,
"to_hit": -5,
@@ -8585,7 +8628,7 @@
"type": "ARMOR",
"name": "trenchcoat",
"description": "A thin cotton trenchcoat, lined with pockets. Great for storage.",
- "weight": 830,
+ "weight": "830 g",
"volume": "4250 ml",
"price": 15500,
"to_hit": -1,
@@ -8606,7 +8649,7 @@
"type": "ARMOR",
"name": "fur trenchcoat",
"description": "A thick fur trenchcoat, lined with pockets. Great for storage.",
- "weight": 1750,
+ "weight": "1750 g",
"volume": "7250 ml",
"price": 97900,
"to_hit": -1,
@@ -8638,7 +8681,7 @@
"type": "ARMOR",
"name": "leather trenchcoat",
"description": "A thick leather trenchcoat, lined with pockets. Great for storage.",
- "weight": 1967,
+ "weight": "1967 g",
"volume": "5250 ml",
"price": 24500,
"to_hit": -1,
@@ -8660,7 +8703,7 @@
"category": "armor",
"name": "survivor trenchcoat",
"description": "A Kevlar armored custom trenchcoat, covered with pouches and pockets. Comfortable, durable, and great for storage.",
- "weight": 1920,
+ "weight": "1920 g",
"volume": "7 L",
"price": 40000,
"to_hit": -1,
@@ -8681,7 +8724,7 @@
"type": "ARMOR",
"name": "tricorne",
"description": "A classic design, the \"tricorne\", or three-cornered hat, simply pins a large and floppy brim out of the way, though this example adds well-embroidered designs and is oiled against water. Whether you're the \"guvnah\" of a settlement, or the captain of a post-apocalyptic crew, this is the hat for you.",
- "weight": 490,
+ "weight": "490 g",
"volume": "2 L",
"price": 7500,
"material": [ "leather" ],
@@ -8701,7 +8744,7 @@
"name": "pair of swimming trunks",
"name_plural": "pairs of swimming trunks",
"description": "A pair of swimming trunks, with netting.",
- "weight": 210,
+ "weight": "210 g",
"volume": "750 ml",
"price": 1800,
"to_hit": 1,
@@ -8718,7 +8761,7 @@
"type": "ARMOR",
"name": "t-shirt",
"description": "A short-sleeved cotton shirt.",
- "weight": 110,
+ "weight": "110 g",
"volume": "500 ml",
"price": 800,
"material": [ "cotton" ],
@@ -8735,7 +8778,7 @@
"type": "ARMOR",
"name": "t-shirt",
"description": "A short-sleeved cotton shirt.",
- "weight": 110,
+ "weight": "110 g",
"volume": "500 ml",
"price": 800,
"material": [ "cotton" ],
@@ -8802,7 +8845,7 @@
"type": "ARMOR",
"name": "tunic",
"description": "A simple garment long enough to cover down to the knees.",
- "weight": 250,
+ "weight": "250 g",
"volume": "1250 ml",
"price": 4200,
"to_hit": -5,
@@ -8821,7 +8864,7 @@
"type": "ARMOR",
"name": "rag tunic",
"description": "A poorly made long tunic with a string tied around the waist to keep it all in place.",
- "weight": 683,
+ "weight": "683 g",
"volume": "1 L",
"price": 70,
"material": [ "cotton" ],
@@ -8839,7 +8882,7 @@
"type": "ARMOR",
"name": "turban",
"description": "Rags worn around the head.",
- "weight": 110,
+ "weight": "110 g",
"volume": "250 ml",
"price": 85,
"to_hit": -1,
@@ -8858,7 +8901,7 @@
"type": "ARMOR",
"name": "headscarf",
"description": "A loose cloth worn over the head and around the neck.",
- "weight": 70,
+ "weight": "70 g",
"volume": "250 ml",
"price": 85,
"to_hit": -1,
@@ -8877,7 +8920,7 @@
"type": "ARMOR",
"name": "tuxedo",
"description": "A full-body tuxedo. Makes the apocalypse feel a little more classy.",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "5500 ml",
"price": 21000,
"to_hit": -5,
@@ -8897,7 +8940,7 @@
"type": "ARMOR",
"name": "compression top",
"description": "Nylon sportswear that clings to your chest and maintains body temperature.",
- "weight": 92,
+ "weight": "92 g",
"volume": "250 ml",
"price": 2000,
"material": [ "cotton", "plastic" ],
@@ -8915,7 +8958,7 @@
"name": "compression shorts",
"name_plural": "compression shorts",
"description": "Nylon sportswear that clings to your upper legs, aiding muscle tone and maintaining warmth.",
- "weight": 82,
+ "weight": "82 g",
"volume": "250 ml",
"price": 2000,
"material": [ "cotton", "plastic" ],
@@ -8932,7 +8975,7 @@
"type": "ARMOR",
"name": "undershirt",
"description": "A simple white undershirt. Worn beneath your regular clothes, it provides a little extra warmth.",
- "weight": 64,
+ "weight": "64 g",
"volume": "250 ml",
"price": 1000,
"material": [ "cotton" ],
@@ -8949,7 +8992,7 @@
"type": "ARMOR",
"name": "union suit",
"description": "A one-piece suit of full-body long underwear that helps to maintain body temperature. It laces closed in the front.",
- "weight": 168,
+ "weight": "168 g",
"volume": "1 L",
"price": 2500,
"material": [ "cotton" ],
@@ -8969,7 +9012,7 @@
"name": "pair of leather vambraces",
"name_plural": "pairs of leather vambraces",
"description": "A pair of light leather arm guards, made for archery.",
- "weight": 362,
+ "weight": "362 g",
"volume": "1 L",
"price": 2000,
"to_hit": 1,
@@ -8990,7 +9033,7 @@
"name": "wedding veil",
"name_plural": "wedding veils",
"description": "A lacy white wedding veil.",
- "weight": 78,
+ "weight": "78 g",
"volume": "750 ml",
"price": 8000,
"to_hit": -1,
@@ -9009,7 +9052,7 @@
"type": "ARMOR",
"name": "utility vest",
"description": "A light vest covered in pockets and straps for storage.",
- "weight": 516,
+ "weight": "516 g",
"volume": "1 L",
"price": 3900,
"material": [ "cotton" ],
@@ -9028,7 +9071,7 @@
"type": "ARMOR",
"name": "leather vest",
"description": "A vest made from thick leather. Offers excellent protection from cuts.",
- "weight": 997,
+ "weight": "997 g",
"volume": "2500 ml",
"price": 5500,
"to_hit": 1,
@@ -9049,7 +9092,7 @@
"type": "ARMOR",
"name": "armored leather vest",
"description": "An armored vest made from thick leather and metal plates. Cumbersome, but offers excellent protection from harm.",
- "weight": 1210,
+ "weight": "1210 g",
"volume": "3 L",
"price": 17900,
"to_hit": 1,
@@ -9070,7 +9113,7 @@
"type": "ARMOR",
"name": "waistcoat",
"description": "An elegant waistcoat. Ideal for those occasions when wearing only a shirt would be too casual and a suit would be just overdoing it.",
- "weight": 516,
+ "weight": "516 g",
"volume": "1 L",
"price": 5000,
"material": [ "cotton" ],
@@ -9089,7 +9132,7 @@
"type": "ARMOR",
"name": "wetsuit",
"description": "A full-body neoprene wetsuit.",
- "weight": 5110,
+ "weight": "5110 g",
"volume": "5 L",
"price": 10000,
"to_hit": -3,
@@ -9111,7 +9154,7 @@
"name": "pair of swimming gloves",
"name_plural": "pairs of swimming gloves",
"description": "A pair of very flexible neoprene-silicone rubber gloves, suitable for underwater use.",
- "weight": 93,
+ "weight": "93 g",
"volume": "500 ml",
"price": 3000,
"to_hit": 1,
@@ -9131,7 +9174,7 @@
"type": "ARMOR",
"name": "wetsuit hood",
"description": "A neoprene hood, commonly worn by divers.",
- "weight": 270,
+ "weight": "270 g",
"volume": "1 L",
"price": 4500,
"material": [ "neoprene", "cotton" ],
@@ -9150,7 +9193,7 @@
"type": "ARMOR",
"name": "spring suit",
"description": "A long-sleeved spring wetsuit with pink color details and cleavage-enhancing, hip-accentuating construction. Not as protective as a full-body suit, but also less restrictive.",
- "weight": 3120,
+ "weight": "3120 g",
"volume": "4 L",
"price": 12000,
"to_hit": -3,
@@ -9172,7 +9215,7 @@
"name": "pair of army winter gloves",
"name_plural": "pairs of army winter gloves",
"description": "A pair of padded gloves. Favored by the military.",
- "weight": 218,
+ "weight": "218 g",
"volume": "750 ml",
"price": 8125,
"to_hit": 1,
@@ -9191,7 +9234,7 @@
"name": "army winter jacket",
"name_plural": "army winter jackets",
"description": "A tough hooded jacket with lots of pockets, thickly padded for warmth. Favored by the military.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "3 L",
"price": 4375,
"material": [ "cotton", "plastic" ],
@@ -9211,7 +9254,7 @@
"name": "army winter pants",
"name_plural": "army winter pants",
"description": "A tough pair of pants lined with pockets, thickly padded for warmth. Favored by the military.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "2500 ml",
"price": 4375,
"material": [ "cotton", "plastic" ],
@@ -9230,7 +9273,7 @@
"type": "ARMOR",
"name": "wolf suit",
"description": "A full body fursuit in the form of an anthropomorphic wolf. It is quite encumbering and has little storage but is very warm.",
- "weight": 7033,
+ "weight": "7033 g",
"volume": "12 L",
"price": 14500,
"to_hit": -3,
@@ -9251,7 +9294,7 @@
"type": "ARMOR",
"name": "wool hoodie",
"description": "A wool hooded shirt. It offers decent protection against the cold. The front pocket offers both storage room and shelter for your hands.",
- "weight": 580,
+ "weight": "580 g",
"volume": "3250 ml",
"price": 3500,
"material": [ "wool" ],
@@ -9270,7 +9313,7 @@
"type": "ARMOR",
"name": "wool suit",
"description": "An encumbering wool suit covered in nice patterns. It looks like full body armor but it only protects against cold, sadly.",
- "weight": 883,
+ "weight": "883 g",
"volume": "3 L",
"price": 8000,
"to_hit": -1,
@@ -9290,7 +9333,7 @@
"category": "armor",
"name": "winter survivor suit",
"description": "A warm and heavy hand-built combination armor made from a reinforced bulletproof vest and an insulated leather jumpsuit. Protects from the elements as well as from harm.",
- "weight": 7800,
+ "weight": "7800 g",
"volume": "14 L",
"price": 200000,
"to_hit": -3,
@@ -9313,7 +9356,7 @@
"category": "armor",
"name": "XL survivor suit",
"description": "A massive hand-built combination armor made from a bulletproof vest and a reinforced leather jumpsuit. Protects from the elements as well as from harm.",
- "weight": 12400,
+ "weight": "12400 g",
"volume": "18 L",
"price": 150000,
"to_hit": -3,
@@ -9337,7 +9380,7 @@
"name": "XL heavy survivor suit",
"description": "A massive, heavy, hand-built combination armor made from a reinforced bulletproof vest and a metal-plated leather jumpsuit. Protects from the elements as well as from harm.",
"looks_like": "hsurvivor_suit",
- "weight": 16500,
+ "weight": "16500 g",
"volume": "18750 ml",
"price": 200000,
"to_hit": -3,
@@ -9359,7 +9402,7 @@
"type": "ARMOR",
"name": "zubon",
"description": "Plain white zubon for use in martial arts.",
- "weight": 150,
+ "weight": "150 g",
"volume": "750 ml",
"price": 2500,
"material": [ "cotton" ],
@@ -9377,7 +9420,7 @@
"name": "violin case",
"name_plural": "violin case",
"description": "Useful to carry your precious musical instrument around protected from any harm.",
- "weight": 2800,
+ "weight": "2800 g",
"volume": "5 L",
"price": 24000,
"to_hit": -4,
@@ -9397,7 +9440,7 @@
"type": "ARMOR",
"name": "hazmat suit",
"description": "An impermeable whole-body garment worn as protection against hazardous materials. Though very restrictive and fragile, wearing it will provide complete protection against ambient radiation. It requires a separate gas mask for full protection.",
- "weight": 5000,
+ "weight": "5000 g",
"volume": "17 L",
"price": 117500,
"material": [ "plastic" ],
@@ -9417,7 +9460,7 @@
"category": "armor",
"name": "ANBC suit",
"description": "An armored, impermeable full-body suit that functions as body armor, as well as protecting from nuclear, biological, and chemical hazards. It requires a separate gas mask for full protection.",
- "weight": 8700,
+ "weight": "8700 g",
"volume": "20 L",
"price": 400000,
"material": [ "kevlar", "plastic" ],
@@ -9436,7 +9479,7 @@
"type": "ARMOR",
"name": "Hub 01 enviromental suit",
"description": "A lightweight environmental suit worn by Hub personnel in their rare forays aboveground. Colored brown and blue, the white seal of Hub 01 is embroidered on both of its upper arms. It requires a separate gas mask for full protection.",
- "weight": 5000,
+ "weight": "5000 g",
"volume": "17 L",
"price": 117500,
"material": [ "nomex" ],
@@ -9456,7 +9499,7 @@
"type": "ARMOR",
"name": "entry suit",
"description": "A flame-resistant whole-body garment worn by firefighters as protection against extreme heat. Though very restrictive, wearing it will provide excellent protection against fire and smoke. It requires a separate gas mask for full protection.",
- "weight": 2900,
+ "weight": "2900 g",
"volume": "6 L",
"price": 240500,
"material": [ "nomex", "kevlar" ],
@@ -9476,7 +9519,7 @@
"name": "pair of golfing gloves",
"name_plural": "pairs of golfing gloves",
"description": "A thin pair of black leather golfing gloves.",
- "weight": 150,
+ "weight": "150 g",
"volume": "250 ml",
"price": 4000,
"to_hit": 2,
@@ -9496,7 +9539,7 @@
"name": "golf cap",
"//": "Head encumbrance stops you from wearing additional headgear. No helmet over a ballcap, sorry. But brimmed gear gets the anti-glare flag!",
"description": "You're not actually sure if this is called a golf cap but its the stereotypical cap golfers wear.",
- "weight": 85,
+ "weight": "85 g",
"volume": "500 ml",
"price": 2200,
"material": [ "cotton" ],
@@ -9516,7 +9559,7 @@
"name": "javelin bag",
"name_plural": "javelin bags",
"description": "An open medieval-looking bag, designed to store javelins for easy reach.",
- "weight": 600,
+ "weight": "600 g",
"volume": "1250 ml",
"price": 6000,
"rigid": false,
@@ -9544,7 +9587,7 @@
"category": "armor",
"name": "XL pot helmet",
"description": "A huge makeshift helmet made from a canning pot. For the truly desperate man-bear-pig.",
- "weight": 6425,
+ "weight": "6425 g",
"volume": "25 L",
"price": 22000,
"bashing": 10,
@@ -9565,7 +9608,7 @@
"category": "armor",
"name": "Corinthian helm",
"description": "An ancient Greek bronze helmet that provides excellent protection for the head, with slits for the eyes and mouth.",
- "weight": 1310,
+ "weight": "1310 g",
"volume": "2500 ml",
"price": 30000,
"bashing": 10,
@@ -9587,7 +9630,7 @@
"category": "armor",
"name_plural": "bell cuirasses",
"description": "An ancient Greek breastplate, made of bronze.",
- "weight": 5896,
+ "weight": "5896 g",
"volume": "6 L",
"price": 50000,
"to_hit": -5,
@@ -9609,7 +9652,7 @@
"name": "pair of bronze greaves",
"name_plural": "pairs of bronze greaves",
"description": "A pair of bronze leg guards with a simple leather lining.",
- "weight": 2520,
+ "weight": "2520 g",
"volume": "5500 ml",
"price": 40000,
"to_hit": 1,
@@ -9628,7 +9671,7 @@
"type": "ARMOR",
"name": "tarpaulin",
"description": "A plastic sheet with several grommets for securing it with rope or cord. Useful for improvised rain protection.",
- "weight": 1244,
+ "weight": "1244 g",
"volume": "2 L",
"price": 5000,
"to_hit": -1,
diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json
index b156d404068e3..fde60341f9818 100644
--- a/data/json/items/armor/ammo_pouch.json
+++ b/data/json/items/armor/ammo_pouch.json
@@ -4,7 +4,7 @@
"type": "ARMOR",
"name": "ammo satchel",
"description": "A fabric ammo bag worn at the waist which is capable of holding a single large magazine close at hand.",
- "weight": 180,
+ "weight": "180 g",
"volume": "500 ml",
"price": 5000,
"material": "cotton",
@@ -30,7 +30,7 @@
"name": "chest ammo pouch",
"name_plural": "chest ammo pouches",
"description": "A fabric ammo pouch that can be strapped to your chest which is capable of holding a single magazine close at hand.",
- "weight": 140,
+ "weight": "140 g",
"volume": "250 ml",
"price": 2500,
"rigid": false,
@@ -51,14 +51,14 @@
"flags": [ "WATER_FRIENDLY", "BELTED" ]
},
{
- "id": "magbandolier",
+ "id": "chestrig",
"type": "ARMOR",
- "name": "magazine bandolier",
- "name_plural": "magazine bandoliers",
- "description": "A bandolier of pouches capable of carrying four magazines close at hand.",
- "weight": 600,
- "volume": "1250 ml",
- "price": 10000,
+ "name": "chest rig",
+ "name_plural": "chest rig",
+ "description": "Popularized during the Vietnam War, chest rigs like these are typically plain, barebones affairs consisting of three or more pouches in a row, with straps to secure them on your chest. This one can hold four magazines in its pouches.",
+ "weight": "425 g",
+ "volume": "500 ml",
+ "price": 3900,
"rigid": false,
"material": "cotton",
"symbol": "[",
@@ -78,13 +78,13 @@
"flags": [ "WATER_FRIENDLY", "BELTED" ]
},
{
- "id": "chestrig",
+ "id": "tacvest",
"type": "ARMOR",
- "name": "chest rig",
- "description": "A light vest covered in webbing, pockets and straps. This variety is favored by the military, as it is capable of holding four magazines close at hand.",
- "weight": 425,
- "volume": "500 ml",
- "price": 3900,
+ "name": "tac vest",
+ "description": "This light vest is meant to carry your gear and ammunition comfortably distributed about your torso. They are popular amongst law enforcement, but less so than combination tactical vests incorporating kevlar. Lightweight and easy to don, this vest can hold four magazines close at hand in its many pouches.",
+ "weight": "600 g",
+ "volume": "1250 ml",
+ "price": 7400,
"rigid": false,
"material": "cotton",
"symbol": "[",
@@ -113,7 +113,7 @@
"name_plural": "ankle ammo pouches",
"description": "A small fabric ammo pouch that can be strapped to your ankle which is capable of holding a single small magazine close at hand.",
"volume": "250 ml",
- "weight": 60,
+ "weight": "60 g",
"price": 2000,
"material": "cotton",
"symbol": "[",
@@ -138,7 +138,7 @@
"name": "leg ammo pouch",
"name_plural": "leg ammo pouches",
"description": "A fabric ammo pouch that can be strapped to your leg and capable of holding two magazine close at hand.",
- "weight": 120,
+ "weight": "120 g",
"volume": "250 ml",
"price": 2000,
"rigid": false,
@@ -166,7 +166,7 @@
"name": "MBR vest (empty)",
"name_plural": "MBR vests (empty)",
"description": "A Modular Bullet Resistant Vest. It has pouches for extra armor inserts, but without them provides little more protection over a regular vest. It has four pouches capable of carrying magazines.",
- "weight": 2860,
+ "weight": "2860 g",
"volume": "6 L",
"price": 100000,
"to_hit": -3,
@@ -199,7 +199,7 @@
"name": "MBR vest (ceramic plates)",
"name_plural": "MBR vests (ceramic plates)",
"description": "A Modular Bullet Resistant Vest. Ceramic plates have been inserted to improve its protection. The ceramic plates cannot be repaired, only replaced. It has four pouches capable of carrying magazines.",
- "weight": 4308,
+ "weight": "4308 g",
"volume": "6 L",
"price": 120000,
"to_hit": -3,
@@ -232,7 +232,7 @@
"name": "MBR vest (hard plates)",
"name_plural": "MBR vests (hard plates)",
"description": "A Modular Bullet Resistant Vest. Hardened steel plates have been inserted, greatly increasing its protection at the cost of a great deal of weight and loss of flexibility. It has four pouches capable of carrying magazines.",
- "weight": 14860,
+ "weight": "14860 g",
"volume": "6 L",
"price": 120000,
"to_hit": -3,
@@ -265,7 +265,7 @@
"name": "MBR vest (Kevlar plates)",
"name_plural": "MBR vests (Kevlar plates)",
"description": "A Modular Bullet Resistant Vest. Kevlar plates have been inserted to improve its protection. It has four pouches capable of carrying magazines.",
- "weight": 5721,
+ "weight": "5721 g",
"volume": "6 L",
"price": 120000,
"to_hit": -3,
@@ -298,7 +298,7 @@
"name": "MBR vest (steel plating)",
"name_plural": "MBR vests (steel plating)",
"description": "A Modular Bullet Resistant Vest. Its armor pouches have steel plates in them; this improves protection, but makes the vest much heavier and encumbering. It has four pouches capable of carrying magazines.",
- "weight": 10860,
+ "weight": "10860 g",
"volume": "6 L",
"price": 120000,
"to_hit": -3,
@@ -331,7 +331,7 @@
"name": "MBR vest (superalloy)",
"name_plural": "MBR vests (superalloy)",
"description": "A Modular Bullet Resistant Vest. Its armor pouches have superalloy plating in them, giving it extra protection with marginal flexibility loss and additional weight. It has four pouches capable of carrying magazines.",
- "weight": 6460,
+ "weight": "6460 g",
"volume": "6 L",
"price": 180000,
"to_hit": -3,
@@ -364,7 +364,7 @@
"name": "XL kevlar vest",
"description": "A massive, hand-built kevlar vest based on the design of existing bullet resistant vests. It has four pouches capable of carrying magazines.",
"looks_like": "modularvest",
- "weight": 5148,
+ "weight": "5148 g",
"volume": "10750 ml",
"price": 200000,
"to_hit": -3,
diff --git a/data/json/items/armor/backpacks.json b/data/json/items/armor/backpacks.json
index d02bbc0f62a3e..dff4aff4db181 100644
--- a/data/json/items/armor/backpacks.json
+++ b/data/json/items/armor/backpacks.json
@@ -4,16 +4,18 @@
"type": "ARMOR",
"name": "backpack",
"description": "A small backpack. Good storage for a little encumbrance.",
- "weight": 633,
+ "weight": "633 g",
"volume": "2 L",
"price": 3900,
+ "rigid": false,
"material": [ "cotton" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO" ],
"coverage": 30,
- "encumbrance": 10,
- "storage": "10 L",
+ "encumbrance": 2,
+ "max_encumbrance": 15,
+ "storage": "15 L",
"warmth": 6,
"material_thickness": 2,
"flags": [ "BELTED" ]
@@ -23,15 +25,17 @@
"type": "ARMOR",
"name": "hiking backpack",
"description": "A large sized hiking backpack with plenty of storage space.",
- "weight": 2291,
+ "weight": "2291 g",
"volume": "14 L",
"price": 10000,
+ "rigid": false,
"material": [ "leather" ],
"symbol": "[",
"color": "brown",
"covers": [ "TORSO" ],
"coverage": 50,
- "encumbrance": 55,
+ "encumbrance": 10,
+ "max_encumbrance": 40,
"storage": "55 L",
"warmth": 10,
"material_thickness": 2,
@@ -52,16 +56,18 @@
"type": "ARMOR",
"name": "giant novelty backpack",
"description": "A huge fabric backpack made mostly as a joke before the cataclysm. Now, it's still rather silly, but it can store a lot of stuff.",
- "weight": 1200,
+ "weight": "1200 g",
"volume": "8750 ml",
"price": 4500,
+ "rigid": false,
"material": [ "cotton" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO", "LEGS" ],
"coverage": 75,
- "encumbrance": 100,
- "storage": "35 L",
+ "encumbrance": 10,
+ "max_encumbrance": 40,
+ "storage": "45 L",
"warmth": 5,
"material_thickness": 2,
"flags": [ "BELTED" ]
@@ -71,16 +77,18 @@
"type": "ARMOR",
"name": "leather backpack",
"description": "A small leather backpack. Good storage for a little encumbrance.",
- "weight": 818,
+ "weight": "818 g",
"volume": "2 L",
"price": 11900,
+ "rigid": false,
"material": [ "leather" ],
"symbol": "[",
"color": "brown",
"covers": [ "TORSO" ],
"coverage": 30,
- "encumbrance": 11,
- "storage": "10 L",
+ "encumbrance": 4,
+ "max_encumbrance": 17,
+ "storage": "15 L",
"warmth": 9,
"material_thickness": 3,
"flags": [ "BELTED", "WATER_FRIENDLY" ]
@@ -90,15 +98,17 @@
"type": "ARMOR",
"name": "large tactical backpack",
"description": "A large tactical multi-compartment backpack that has great lower back support.",
- "weight": 2291,
+ "weight": "2291 g",
"volume": "15 L",
"price": 9000,
+ "rigid": false,
"material": [ "leather" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO" ],
"coverage": 50,
- "encumbrance": 65,
+ "encumbrance": 10,
+ "max_encumbrance": 55,
"storage": "65 L",
"warmth": 10,
"material_thickness": 2,
@@ -109,16 +119,17 @@
"type": "ARMOR",
"name": "high-volume rucksack",
"description": "Also know as a \"bigpack\", this rucksack is prized by pack rats but may lead to a bad back.",
- "weight": 3539,
+ "weight": "3539 g",
"volume": "21 L",
"price": 20000,
- "material": [ "leather" ],
+ "rigid": false,
"symbol": "[",
"color": "black",
"covers": [ "TORSO" ],
"coverage": 50,
- "encumbrance": 100,
- "storage": "100 L",
+ "encumbrance": 16,
+ "max_encumbrance": 65,
+ "storage": "80 L",
"warmth": 10,
"material_thickness": 2,
"flags": [ "BELTED", "WATERPROOF", "ONLY_ONE", "OVERSIZE" ]
@@ -128,16 +139,18 @@
"type": "ARMOR",
"name": "dive bag",
"description": "A lightweight mesh backpack, commonly worn by swimmers and divers.",
- "weight": 512,
+ "weight": "512 g",
"volume": "1500 ml",
"price": 10900,
+ "rigid": false,
"material": [ "plastic" ],
"symbol": "[",
"color": "yellow",
"covers": [ "TORSO" ],
"coverage": 40,
- "encumbrance": 10,
- "storage": "9500 ml",
+ "encumbrance": 2,
+ "max_encumbrance": 12,
+ "storage": "12 L",
"material_thickness": 1,
"flags": [ "WATER_FRIENDLY", "BELTED" ]
},
@@ -146,16 +159,18 @@
"type": "ARMOR",
"name": "duffel bag",
"description": "A huge duffel bag. Provides plenty of storage, but is severely encumbering.",
- "weight": 933,
+ "weight": "933 g",
"volume": "6 L",
"price": 12000,
+ "rigid": false,
"material": [ "cotton" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO" ],
"coverage": 50,
- "encumbrance": 30,
- "storage": "30 L",
+ "encumbrance": 5,
+ "max_encumbrance": 35,
+ "storage": "35 L",
"warmth": 10,
"material_thickness": 2,
"flags": [ "BELTED", "WATER_FRIENDLY" ]
@@ -165,7 +180,7 @@
"type": "ARMOR",
"name": "petpack",
"description": "Before the Cataclysm this would allow your four-legged friend to see the world, now it's used to shield them from the world.",
- "weight": 1316,
+ "weight": "1316 g",
"volume": "10 L",
"price": 7900,
"material": [ "cotton", "plastic" ],
@@ -173,8 +188,8 @@
"color": "blue",
"covers": [ "TORSO" ],
"coverage": 40,
- "encumbrance": 14,
- "storage": "3750 ml",
+ "encumbrance": 10,
+ "storage": "4 L",
"warmth": 8,
"material_thickness": 2,
"properties": [ [ "monster_size_capacity", "SMALL" ] ],
@@ -186,7 +201,7 @@
"type": "ARMOR",
"name": "jerrypack",
"description": "A jerrycan modified to be worn in a similar manner to a backpack.",
- "weight": 1763,
+ "weight": "1763 g",
"volume": "10 L",
"price": 1450,
"to_hit": -1,
@@ -206,15 +221,17 @@
"type": "ARMOR",
"name": "makeshift knapsack",
"description": "A pair of pants with the bottom ends tied with string, and then passed through the belt loops so the knapsack can be carried on the back.",
- "weight": 560,
+ "weight": "560 g",
"volume": "2 L",
"price": 1000,
+ "rigid": false,
"material": [ "cotton" ],
"symbol": "[",
"color": "light_gray",
"covers": [ "TORSO" ],
"coverage": 30,
- "encumbrance": 10,
+ "encumbrance": 2,
+ "max_encumbrance": 9,
"storage": "5 L",
"warmth": 5,
"material_thickness": 1,
@@ -225,17 +242,19 @@
"type": "ARMOR",
"name": "makeshift sling",
"description": "A large sheet tied into a crude, over-the-shoulder sling.",
- "weight": 771,
+ "weight": "771 g",
"volume": "5 L",
"price": 100,
+ "rigid": false,
"to_hit": -2,
"material": [ "cotton" ],
"symbol": "[",
"color": "light_gray",
"covers": [ "TORSO" ],
"coverage": 40,
- "encumbrance": 40,
- "storage": "7500 ml",
+ "encumbrance": 4,
+ "max_encumbrance": 15,
+ "storage": "10 L",
"warmth": 10,
"material_thickness": 1,
"flags": [ "OVERSIZE", "BELTED", "WATER_FRIENDLY" ]
@@ -246,9 +265,10 @@
"name": "messenger bag",
"//": "KA101's ran about $90 but is ballistic nylon. Bit tougher than the DDA model.",
"description": "Light and easy to wear, but doesn't offer much storage.",
- "weight": 760,
+ "weight": "760 g",
"volume": "1 L",
"price": 7900,
+ "rigid": false,
"to_hit": 1,
"bashing": 1,
"material": [ "cotton", "plastic" ],
@@ -256,8 +276,9 @@
"color": "green",
"covers": [ "TORSO" ],
"coverage": 30,
- "encumbrance": 5,
- "storage": "6250 ml",
+ "encumbrance": 1,
+ "max_encumbrance": 6,
+ "storage": "6 L",
"material_thickness": 1,
"flags": [ "BELTED", "WATER_FRIENDLY" ]
},
@@ -266,15 +287,17 @@
"type": "ARMOR",
"name": "MOLLE pack",
"description": "The Modular Lightweight Load-carrying Equipment is an advanced military backpack. Covered with pockets and straps, it strikes a fine balance between storage space and encumbrance.",
- "weight": 966,
+ "weight": "966 g",
"volume": "2500 ml",
"price": 6700,
+ "rigid": false,
"material": [ "cotton", "kevlar" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO" ],
"coverage": 35,
- "encumbrance": 9,
+ "encumbrance": 2,
+ "max_encumbrance": 9,
"storage": "12 L",
"warmth": 10,
"material_thickness": 2,
@@ -285,9 +308,10 @@
"type": "ARMOR",
"name": "purse",
"description": "A bit cumbersome to wear, but provides some storage.",
- "weight": 297,
+ "weight": "297 g",
"volume": "1 L",
"price": 7500,
+ "rigid": false,
"to_hit": 2,
"bashing": 2,
"material": [ "leather" ],
@@ -295,7 +319,8 @@
"color": "dark_gray",
"covers": [ "TORSO" ],
"coverage": 10,
- "encumbrance": 7,
+ "encumbrance": 2,
+ "max_encumbrance": 7,
"storage": "5 L",
"material_thickness": 2,
"flags": [ "FANCY", "BELTED", "WATER_FRIENDLY" ]
@@ -305,16 +330,18 @@
"type": "ARMOR",
"name": "military rucksack",
"description": "A huge military rucksack, provides a lot of storage.",
- "weight": 1140,
+ "weight": "1140 g",
"volume": "4 L",
"price": 9200,
+ "rigid": false,
"material": [ "cotton", "plastic" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO" ],
"coverage": 40,
- "encumbrance": 20,
- "storage": "20 L",
+ "encumbrance": 2,
+ "max_encumbrance": 20,
+ "storage": "22 L",
"warmth": 8,
"material_thickness": 2,
"flags": [ "BELTED", "WATER_FRIENDLY" ]
@@ -324,9 +351,10 @@
"type": "ARMOR",
"name": "runner pack",
"description": "The obvious choice for outdoor athletes, this ergonomic backpack is light and easy to wear, ensuring comfort when carrying heavy and bulky items.",
- "weight": 840,
+ "weight": "840 g",
"volume": "1500 ml",
"price": 24000,
+ "rigid": false,
"to_hit": 1,
"bashing": 1,
"material": [ "cotton", "plastic" ],
@@ -334,8 +362,9 @@
"color": "green",
"covers": [ "TORSO" ],
"coverage": 20,
- "encumbrance": 3,
- "storage": "4 L",
+ "encumbrance": 1,
+ "max_encumbrance": 6,
+ "storage": "7 L",
"warmth": 2,
"material_thickness": 1,
"flags": [ "BELTED", "WATER_FRIENDLY" ]
@@ -346,16 +375,18 @@
"name": "sling pack",
"//": "Depends on if you're getting a cheap school version or something more like a range bag.",
"description": "A simple single-sling backpack. Easier to access than a normal backpack, but can't comfortably hold as much.",
- "weight": 566,
+ "weight": "566 g",
"volume": "1500 ml",
"price": 2900,
+ "rigid": false,
"bashing": 1,
"material": [ "cotton", "plastic" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO" ],
"coverage": 30,
- "encumbrance": 7,
+ "encumbrance": 2,
+ "max_encumbrance": 9,
"storage": "8 L",
"warmth": 2,
"material_thickness": 1,
@@ -366,16 +397,18 @@
"type": "ARMOR",
"name": "survivor duffel bag",
"description": "A custom-built heavy duffel bag. Durable and carefully crafted to hold as much stuff as possible.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "7500 ml",
"price": 24000,
+ "rigid": false,
"material": [ "leather", "cotton" ],
"symbol": "[",
"color": "dark_gray",
"covers": [ "TORSO" ],
"coverage": 40,
- "encumbrance": 25,
- "storage": "37500 ml",
+ "encumbrance": 8,
+ "max_encumbrance": 28,
+ "storage": "38 L",
"material_thickness": 2,
"flags": [ "WATER_FRIENDLY", "STURDY", "BELTED", "OVERSIZE" ]
},
@@ -384,16 +417,18 @@
"type": "ARMOR",
"name": "survivor backpack",
"description": "A custom-built backpack. Durable and carefully crafted to hold as much stuff as possible.",
- "weight": 600,
+ "weight": "600 g",
"volume": "2500 ml",
"price": 24000,
+ "rigid": false,
"material": [ "leather", "cotton" ],
"symbol": "[",
"color": "brown",
"covers": [ "TORSO" ],
"coverage": 30,
- "encumbrance": 8,
- "storage": "12500 ml",
+ "encumbrance": 3,
+ "max_encumbrance": 12,
+ "storage": "16 L",
"material_thickness": 2,
"flags": [ "WATER_FRIENDLY", "STURDY", "BELTED" ]
},
@@ -402,15 +437,17 @@
"type": "ARMOR",
"name": "survivor rucksack",
"description": "A custom-built heavy backpack. Durable and carefully crafted to hold as much stuff as possible.",
- "weight": 800,
+ "weight": "800 g",
"volume": "5 L",
"price": 24000,
+ "rigid": false,
"material": [ "leather", "cotton" ],
"symbol": "[",
"color": "dark_gray",
"covers": [ "TORSO" ],
"coverage": 40,
- "encumbrance": 18,
+ "encumbrance": 3,
+ "max_encumbrance": 18,
"storage": "25 L",
"material_thickness": 2,
"flags": [ "WATER_FRIENDLY", "STURDY", "BELTED", "OVERSIZE" ]
@@ -420,16 +457,18 @@
"type": "ARMOR",
"name": "survivor runner pack",
"description": "A custom-built lightweight runner pack. Durable and carefully crafted to hold as much stuff as possible.",
- "weight": 440,
+ "weight": "440 g",
"volume": "1750 ml",
"price": 24000,
+ "rigid": false,
"material": [ "leather", "cotton" ],
"symbol": "[",
"color": "brown",
"covers": [ "TORSO" ],
"coverage": 30,
- "encumbrance": 2,
- "storage": "4500 ml",
+ "encumbrance": 1,
+ "max_encumbrance": 6,
+ "storage": "8 L",
"material_thickness": 2,
"flags": [ "WATER_FRIENDLY", "STURDY", "BELTED" ]
},
@@ -438,16 +477,18 @@
"type": "ARMOR",
"name": "golf bag",
"description": "A tall canvas and plastic bag with fold-out legs used for golfing. It even has straps to be worn on the back.",
- "weight": 1900,
+ "weight": "1900 g",
"volume": "15 L",
"price": 800,
+ "rigid": false,
"material": [ "cotton", "plastic" ],
"symbol": "[",
"color": "green",
"covers": [ "TORSO" ],
"coverage": 35,
- "encumbrance": 16,
- "storage": "15 L",
+ "encumbrance": 2,
+ "max_encumbrance": 15,
+ "storage": "18 L",
"warmth": 5,
"material_thickness": 3,
"flags": [ "BELTED", "OVERSIZE" ],
@@ -465,16 +506,18 @@
"type": "ARMOR",
"name": "travelpack",
"description": "A hiking pack used for short trips.",
- "weight": 636,
+ "weight": "636 g",
"volume": "3 L",
"price": 7000,
+ "rigid": false,
"material": [ "cotton" ],
"symbol": "[",
"color": "yellow",
"covers": [ "TORSO" ],
"coverage": 40,
- "encumbrance": 25,
- "storage": "25 L",
+ "encumbrance": 3,
+ "max_encumbrance": 25,
+ "storage": "30 L",
"warmth": 8,
"material_thickness": 2,
"flags": [ "BELTED", "WATERPROOF" ]
diff --git a/data/json/items/armor/bandolier.json b/data/json/items/armor/bandolier.json
index 02f7489f55ef2..5122652e4fb47 100644
--- a/data/json/items/armor/bandolier.json
+++ b/data/json/items/armor/bandolier.json
@@ -4,7 +4,7 @@
"type": "ARMOR",
"name": "pistol bandolier",
"description": "An embroidered leather bandolier for keeping pistol cartridges close to hand. If this doesn't make you feel like a cowboy nothing will.",
- "weight": 140,
+ "weight": "140 g",
"volume": "250 ml",
"price": 1900,
"material": "leather",
@@ -27,7 +27,7 @@
"type": "ARMOR",
"name": "rifle bandolier",
"description": "A leather bandolier for keeping rifle cartridges close to hand.",
- "weight": 140,
+ "weight": "140 g",
"volume": "250 ml",
"price": 1900,
"material": "leather",
@@ -50,7 +50,7 @@
"type": "ARMOR",
"name": "waist shotgun bandolier",
"description": "A leather bandolier worn around the waist for keeping shotgun shells close to hand.",
- "weight": 140,
+ "weight": "140 g",
"volume": "500 ml",
"price": 1900,
"material": "leather",
@@ -68,7 +68,7 @@
"type": "ARMOR",
"name": "torso shotgun bandolier",
"description": "A leather bandolier strapped around the torso for keeping shotgun shells close to hand.",
- "weight": 200,
+ "weight": "200 g",
"volume": "1 L",
"price": 3900,
"material": "leather",
@@ -87,7 +87,7 @@
"name": "paper cartridge pouch",
"name_plural": "paper cartridge pouches",
"description": "A covered leather pouch, worn at the waist to store and protect prepared blackpowder cartridges.",
- "weight": 160,
+ "weight": "160 g",
"volume": "500 ml",
"price": 4900,
"material": "leather",
@@ -105,7 +105,7 @@
"type": "ARMOR",
"name": "wrist bandolier",
"description": "A small fabric bandolier for rifle cartridges designed to be worn around the wrist.",
- "weight": 30,
+ "weight": "30 g",
"volume": "250 ml",
"price": 2900,
"material": "cotton",
@@ -129,7 +129,7 @@
"name": "grenade pouch",
"name_plural": "grenade pouches",
"description": "A small pouch for storing cartridge grenades with straps for attaching it to your belt or other webbing.",
- "weight": 90,
+ "weight": "90 g",
"volume": "250 ml",
"price": 5900,
"material": [ "cotton", "plastic" ],
@@ -148,7 +148,7 @@
"name": "large grenade pouch",
"name_plural": "large grenade pouches",
"description": "A pouch for holding up to four full-sized grenades of various types.",
- "weight": 600,
+ "weight": "600 g",
"volume": "1250 ml",
"price": 3000,
"rigid": false,
diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json
index 6e76393d39de7..e8bd6b64c7abf 100644
--- a/data/json/items/armor/boots.json
+++ b/data/json/items/armor/boots.json
@@ -5,7 +5,7 @@
"name": "pair of cord sandals",
"name_plural": "pairs of cord sandals",
"description": "Lightweight sandals made from wound cord. They offer little in the way of protection, but keep you cool during warmer months.",
- "weight": 68,
+ "weight": "68 g",
"volume": "250 ml",
"price": 3000,
"to_hit": -2,
@@ -24,7 +24,7 @@
"name": "pair of boots",
"name_plural": "pairs of boots",
"description": "Tough leather boots. Very durable.",
- "weight": 1060,
+ "weight": "1060 g",
"volume": "2500 ml",
"price": 10000,
"to_hit": -1,
@@ -47,7 +47,7 @@
"name": "pair of bone armor boots",
"name_plural": "pairs of bone armor boots",
"description": "Leather boots armored with reinforcements made from bone. Light and strong.",
- "weight": 1824,
+ "weight": "1824 g",
"volume": "4250 ml",
"price": 13500,
"to_hit": -1,
@@ -70,7 +70,7 @@
"name": "pair of turnout boots",
"name_plural": "pairs of turnout boots",
"description": "A pair of steel-toed rubber boots, the sort worn by firefighters. Highly resistant to heat and flame, they provide excellent protection from injury.",
- "weight": 1930,
+ "weight": "1930 g",
"volume": "3500 ml",
"price": 13000,
"to_hit": 2,
@@ -92,7 +92,7 @@
"name": "pair of chitinous boots",
"name_plural": "pairs of chitinous boots",
"description": "Boots made from the exoskeletons of insects. Light and durable.",
- "weight": 1620,
+ "weight": "1620 g",
"volume": "4250 ml",
"price": 13500,
"to_hit": -1,
@@ -126,7 +126,7 @@
"name": "pair of combat boots",
"name_plural": "pairs of combat boots",
"description": "Modern reinforced tactical combat boots. Very durable.",
- "weight": 1060,
+ "weight": "1060 g",
"volume": "2 L",
"price": 7000,
"to_hit": -1,
@@ -149,7 +149,7 @@
"name": "pair of survivor fireboots",
"name_plural": "pairs of survivor fireboots",
"description": "A pair of customized, Kevlar armored Nomex boots, modified to provide maximum protection from harm and the elements, even when knee-deep in the dead.",
- "weight": 1980,
+ "weight": "1980 g",
"volume": "3 L",
"price": 24000,
"to_hit": -1,
@@ -171,7 +171,7 @@
"name": "pair of fur boots",
"name_plural": "pairs of fur boots",
"description": "Boots lined with fur for warmth.",
- "weight": 1890,
+ "weight": "1890 g",
"volume": "4500 ml",
"price": 14000,
"to_hit": -1,
@@ -194,7 +194,7 @@
"name": "pair of survivor wetsuit boots",
"name_plural": "pairs of survivor wetsuit boots",
"description": "A pair of customized, kevlar armored neoprene boots, modified to provide maximum protection from harm and the elements, even when knee-deep in the dead.",
- "weight": 1180,
+ "weight": "1180 g",
"volume": "1500 ml",
"price": 24000,
"to_hit": -1,
@@ -216,7 +216,7 @@
"name": "pair of hiking boots",
"name_plural": "pairs of hiking boots",
"description": "Tough yet light leather boots. Durable and comfortable.",
- "weight": 960,
+ "weight": "960 g",
"volume": "2 L",
"price": 14000,
"to_hit": -1,
@@ -239,7 +239,7 @@
"name": "pair of heavy survivor boots",
"name_plural": "pairs of heavy survivor boots",
"description": "A pair of customized kevlar boots, heavily armored with steel and modified to provide maximum protection from harm, even when knee-deep in the dead.",
- "weight": 1610,
+ "weight": "1610 g",
"volume": "3 L",
"price": 24000,
"to_hit": -1,
@@ -262,7 +262,7 @@
"name": "pair of leather armor boots",
"name_plural": "pairs of leather armor boots",
"description": "Thick leather boots made specifically to protect the feet. Light and tough.",
- "weight": 902,
+ "weight": "902 g",
"volume": "2 L",
"price": 12500,
"to_hit": -1,
@@ -285,7 +285,7 @@
"name": "pair of light survivor boots",
"name_plural": "pairs of light survivor boots",
"description": "A pair of customized, kevlar armored cloth boots, modified to provide maximum protection from harm, even when knee-deep in the dead.",
- "weight": 1120,
+ "weight": "1120 g",
"volume": "2 L",
"price": 24000,
"to_hit": -1,
@@ -308,7 +308,7 @@
"name": "pair of armored boots",
"name_plural": "pairs of armored boots",
"description": "An extremely heavy set of armor plated boots.",
- "weight": 1890,
+ "weight": "1890 g",
"volume": "3250 ml",
"price": 50000,
"to_hit": -2,
@@ -330,7 +330,7 @@
"name": "pair of rubber boots",
"name_plural": "pairs of rubber boots",
"description": "A pair of rubber boots, often used while cleaning with caustic materials.",
- "weight": 980,
+ "weight": "980 g",
"volume": "3500 ml",
"price": 8000,
"to_hit": 2,
@@ -352,7 +352,7 @@
"name": "pair of scrap boots",
"name_plural": "pairs of scrap boots",
"description": "Boots made of random scraps.",
- "weight": 1845,
+ "weight": "1845 g",
"volume": "3 L",
"price": 12000,
"to_hit": -1,
@@ -374,7 +374,7 @@
"name": "pair of steeltoed boots",
"name_plural": "pairs of steeltoed boots",
"description": "Leather boots with a steel toe. Extremely durable.",
- "weight": 1320,
+ "weight": "1320 g",
"volume": "3 L",
"price": 12000,
"to_hit": -1,
@@ -397,7 +397,7 @@
"name": "pair of survivor boots",
"name_plural": "pairs of survivor boots",
"description": "A pair of customized leather boots, armored with kevlar and modified to provide maximum protection from harm, even when knee-deep in the dead.",
- "weight": 1330,
+ "weight": "1330 g",
"volume": "2500 ml",
"price": 24000,
"to_hit": -1,
@@ -431,7 +431,7 @@
"name": "pair of winter boots",
"name_plural": "pairs of winter boots",
"description": "Cumbersome boots designed for warmth.",
- "weight": 1640,
+ "weight": "1640 g",
"volume": "3500 ml",
"price": 7000,
"to_hit": -1,
@@ -453,7 +453,7 @@
"name": "pair of winter survivor boots",
"name_plural": "pairs of winter survivor boots",
"description": "A pair of customized, Kevlar armored fur boots, modified to provide maximum protection from harm and the elements, even when knee-deep in the dead.",
- "weight": 1760,
+ "weight": "1760 g",
"volume": "3500 ml",
"price": 24000,
"to_hit": -1,
@@ -476,7 +476,7 @@
"name": "pair of XL survivor boots",
"name_plural": "pairs of XL survivor boots",
"description": "A massive pair of customized leather boots, armored with kevlar and modified to provide maximum protection from harm and the elements, even when knee-deep in the dead.",
- "weight": 2460,
+ "weight": "2460 g",
"volume": "5 L",
"price": 24000,
"to_hit": -1,
@@ -498,7 +498,7 @@
"name": "pair of cleats",
"name_plural": "pairs of cleats",
"description": "Sport shoes with hard undersides, and studs on the bottom designed to dig into the grass.",
- "weight": 860,
+ "weight": "860 g",
"volume": "1500 ml",
"price": 7000,
"bashing": 2,
@@ -518,7 +518,7 @@
"name": "pair of golf shoes",
"name_plural": "pairs of golf shoes",
"description": "Snug fit sport shoes with hard ridges on the bottom.",
- "weight": 820,
+ "weight": "820 g",
"volume": "1500 ml",
"price": 6500,
"bashing": 2,
@@ -538,7 +538,7 @@
"name": "pair of wooden clogs",
"name_plural": "pairs of wooden clogs",
"description": "Known as klompen in the Netherlands and sabots in France, these wooden shoes have endured through the ages due to their simple design and durability.",
- "weight": 916,
+ "weight": "916 g",
"volume": "1250 ml",
"price": 4000,
"to_hit": -2,
@@ -560,7 +560,7 @@
"name": "pair of clown shoes",
"name_plural": "pairs of clown shoes",
"description": "Gigantic shoes fit for a clown. Incredibly difficult to walk in.",
- "weight": 1140,
+ "weight": "1140 g",
"volume": "3500 ml",
"price": 500,
"to_hit": -1,
@@ -582,7 +582,7 @@
"name": "pair of dance shoes",
"name_plural": "pairs of dance shoes",
"description": "Expensive black dance shoes with large heels.",
- "weight": 870,
+ "weight": "870 g",
"volume": "1500 ml",
"price": 12000,
"to_hit": 1,
@@ -603,7 +603,7 @@
"name": "pair of dress shoes",
"name_plural": "pairs of dress shoes",
"description": "Fancy patent leather shoes. Not designed for running in.",
- "weight": 870,
+ "weight": "870 g",
"volume": "1500 ml",
"price": 12000,
"to_hit": 1,
@@ -624,7 +624,7 @@
"name": "pair of flip-flops",
"name_plural": "pairs of flip-flops",
"description": "Simple sandals. Very difficult to run in.",
- "weight": 62,
+ "weight": "62 g",
"volume": "250 ml",
"price": 500,
"to_hit": -2,
@@ -643,7 +643,7 @@
"name": "pair of foot rags",
"name_plural": "pairs of foot rags",
"description": "Rags tied around your feet. Not much of an improvement over being barefoot, still better than nothing.",
- "weight": 56,
+ "weight": "56 g",
"volume": "250 ml",
"price": 500,
"material": [ "cotton" ],
@@ -662,7 +662,7 @@
"name": "pair of fur foot wraps",
"name_plural": "pairs of fur foot wraps",
"description": "Fur pelts tied around your feet. Not much of an improvement over being barefoot, still better than nothing.",
- "weight": 135,
+ "weight": "135 g",
"volume": "500 ml",
"price": 700,
"material": [ "fur" ],
@@ -681,7 +681,7 @@
"name": "pair of leather foot wraps",
"name_plural": "pairs of leather foot wraps",
"description": "Leather patches tied around your feet. Not much of an improvement over being barefoot, still better than nothing.",
- "weight": 120,
+ "weight": "120 g",
"volume": "500 ml",
"price": 525,
"material": [ "leather" ],
@@ -700,7 +700,7 @@
"name": "pair of wool foot wraps",
"name_plural": "pairs of wool foot wraps",
"description": "Felt patches tied around your feet. Not much of an improvement over being barefoot, still better than nothing.",
- "weight": 56,
+ "weight": "56 g",
"volume": "250 ml",
"price": 500,
"material": [ "wool" ],
@@ -719,7 +719,7 @@
"name": "pair of geta",
"name_plural": "pairs of geta",
"description": "Simple wooden geta.",
- "weight": 460,
+ "weight": "460 g",
"volume": "1 L",
"price": 6500,
"to_hit": -2,
@@ -741,7 +741,7 @@
"name": "pair of heels",
"name_plural": "pairs of heels",
"description": "A pair of high heels. Difficult to even walk in.",
- "weight": 640,
+ "weight": "640 g",
"volume": "750 ml",
"price": 4000,
"to_hit": -2,
@@ -761,7 +761,7 @@
"name": "pair of knee-high boots",
"name_plural": "pairs of knee-high boots",
"description": "Very long leather boots that cover the lower legs. Difficult to wear but extremely durable.",
- "weight": 1520,
+ "weight": "1520 g",
"volume": "3750 ml",
"price": 8000,
"to_hit": -1,
@@ -783,7 +783,7 @@
"name": "pair of leather sandals",
"name_plural": "pairs of leather sandals",
"description": "Sturdy leather hiking sandals with a heel strap. Offers little in the way of protection, but keeps you cool during warmer months.",
- "weight": 94,
+ "weight": "94 g",
"volume": "250 ml",
"price": 4000,
"to_hit": -2,
@@ -802,7 +802,7 @@
"name": "pair of lowtop tennis shoes",
"name_plural": "pairs of lowtop tennis shoes",
"description": "Lightweight shoes made of cloth and rubber.",
- "weight": 114,
+ "weight": "114 g",
"volume": "750 ml",
"price": 1500,
"to_hit": -2,
@@ -821,7 +821,7 @@
"name": "pair of moccasins",
"name_plural": "pairs of moccasins",
"description": "Simple shoes made from animal pelts.",
- "weight": 230,
+ "weight": "230 g",
"volume": "500 ml",
"price": 5000,
"material": [ "fur", "leather" ],
@@ -840,7 +840,7 @@
"name": "pair of motorcycle boots",
"name_plural": "pairs of motorcycle boots",
"description": "A pair of durable boots to be used by dirt bikers and motorcyclists.",
- "weight": 2125,
+ "weight": "2125 g",
"volume": "2 L",
"price": 8000,
"bashing": 5,
@@ -861,7 +861,7 @@
"name": "pair of rollerblades",
"name_plural": "pairs of rollerblades",
"description": "A pair of inline skates. Very fast on flat floors, but they make it hard to move on rough terrain, take hits, or to dodge effectively.",
- "weight": 1640,
+ "weight": "1640 g",
"volume": "3750 ml",
"price": 8500,
"to_hit": -2,
@@ -882,7 +882,7 @@
"name": "pair of rollerskates",
"name_plural": "pairs of rollerskates",
"description": "An old-fashioned pair of leather rollerskates with steel frames. While quite fast on flat floors, they make it difficult to take hits or to move on rough terrain.",
- "weight": 2720,
+ "weight": "2720 g",
"volume": "3 L",
"price": 8500,
"to_hit": -2,
@@ -904,7 +904,7 @@
"name": "pair of birchbark shoes",
"name_plural": "pairs of birchbark shoes",
"description": "Simple shoes woven from strips of birch bark. Not very comfortable, but better than going barefoot.",
- "weight": 345,
+ "weight": "345 g",
"volume": "500 ml",
"price": 3500,
"material": [ "wood" ],
@@ -923,7 +923,7 @@
"name": "pair of bowling shoes",
"name_plural": "pairs of bowling shoes",
"description": "A pair of flat-soled shoes designed to give you a grip on slippery surfaces.",
- "weight": 840,
+ "weight": "840 g",
"volume": "1500 ml",
"price": 4000,
"material": [ "cotton", "leather" ],
@@ -942,7 +942,7 @@
"name": "pair of slippers",
"name_plural": "pairs of slippers",
"description": "Soft shoes that keep your feet warm. Not suitable for running.",
- "weight": 70,
+ "weight": "70 g",
"volume": "250 ml",
"price": 600,
"to_hit": -2,
@@ -962,7 +962,7 @@
"name": "pair of sneakers",
"name_plural": "pairs of sneakers",
"description": "Guaranteed to make you run faster and jump higher!",
- "weight": 840,
+ "weight": "840 g",
"volume": "1500 ml",
"price": 10000,
"material": [ "cotton", "leather" ],
@@ -981,7 +981,7 @@
"name": "pair of straw sandals",
"name_plural": "pairs of straw sandals",
"description": "Sandals made from straw rope. Not very comfortable, but can keep your feet safe.",
- "weight": 70,
+ "weight": "70 g",
"volume": "500 ml",
"price": 2000,
"to_hit": -2,
@@ -1000,7 +1000,7 @@
"name": "pair of swim fins",
"name_plural": "pairs of swim fins",
"description": "A pair of rubber flippers worn on the feet which improve swimming speed while greatly impeding the wearer's ability to walk.",
- "weight": 680,
+ "weight": "680 g",
"volume": "1250 ml",
"price": 2000,
"material": [ "plastic" ],
@@ -1019,7 +1019,7 @@
"name": "pair of thigh-high boots",
"name_plural": "pairs of thigh-high boots",
"description": "Very long leather boots that reach past the knees. Difficult to wear but extremely durable.",
- "weight": 1540,
+ "weight": "1540 g",
"volume": "4250 ml",
"price": 8000,
"to_hit": -1,
@@ -1041,7 +1041,7 @@
"name": "pair of swimming booties",
"name_plural": "pairs of swimming booties",
"description": "A pair of neoprene swimming booties, with individual toes.",
- "weight": 310,
+ "weight": "310 g",
"volume": "1 L",
"price": 6800,
"material": [ "neoprene", "cotton" ],
@@ -1061,7 +1061,7 @@
"name": "pair of heelys (off)",
"name_plural": "pairs of heelys (off)",
"description": "A pair of sneakers with wheels, currently the wheels are hidden.",
- "weight": 840,
+ "weight": "840 g",
"volume": "1500 ml",
"price": 10000,
"material": [ "cotton", "leather" ],
@@ -1081,7 +1081,7 @@
"name": "pair of heelys (on)",
"name_plural": "pairs of heelys (on)",
"description": "A pair of sneakers with wheels, currently the wheels are out.",
- "weight": 840,
+ "weight": "840 g",
"volume": "1500 ml",
"price": 10000,
"material": [ "cotton", "leather" ],
diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json
index 232dcd8e0fe1e..f9bde549aafa6 100644
--- a/data/json/items/armor/holster.json
+++ b/data/json/items/armor/holster.json
@@ -4,7 +4,7 @@
"type": "ARMOR",
"name": "back holster",
"description": "A leather holster, big enough for a rifle or other large gun. Designed to be strapped to the back. Whilst initially cumbersome it becomes much easier to use with practice. Activate to holster/draw a gun.",
- "weight": 240,
+ "weight": "240 g",
"volume": "1250 ml",
"price": 10000,
"material": "leather",
@@ -22,7 +22,7 @@
"type": "ARMOR",
"name": "ankle holster",
"description": "A small concealed holster worn on the ankle. It is awkward to use without practice. Activate to holster/draw a small pistol.",
- "weight": 200,
+ "weight": "200 g",
"volume": "250 ml",
"price": 7400,
"material": "leather",
@@ -48,7 +48,7 @@
"name": "bow sling",
"name_plural": "bow slings",
"description": "A somewhat complicated set of straps and fabric to keep your bow close to hand and (mostly) out of harms way. Activate to holster/draw your bow.",
- "weight": 320,
+ "weight": "320 g",
"volume": "500 ml",
"price": 8000,
"material": [ "cotton" ],
@@ -66,7 +66,7 @@
"type": "ARMOR",
"name": "holster",
"description": "A leather strap worn on the hip for holding pistol sized guns. Activate to holster/draw a gun.",
- "weight": 220,
+ "weight": "220 g",
"volume": "500 ml",
"price": 9000,
"material": "leather",
@@ -94,7 +94,7 @@
"type": "ARMOR",
"name": "deep concealment holster",
"description": "An elastic band with numerous provisions for concealing a very small pistol close to the body. It is awkward to use without practice. Activate to holster/draw a gun.",
- "weight": 120,
+ "weight": "120 g",
"volume": "250 ml",
"price": 3000,
"material": "plastic",
@@ -116,7 +116,7 @@
"name": "survivor harness",
"name_plural": "survivor harnesses",
"description": "A custom-built light harness covered with pouches and including an integral tactical sling for a small rifle or other such weapon. Durable and carefully crafted to be comfortable to wear. Activate to holster/draw your weapon.",
- "weight": 320,
+ "weight": "320 g",
"volume": "1250 ml",
"price": 20000,
"material": [ "leather", "cotton" ],
@@ -135,7 +135,7 @@
"type": "ARMOR",
"name": "XL holster",
"description": "A belt holster consisting of a loop and strap intended for use with larger firearms. Slightly more cumbersome than a standard holster due to the straps that hold it flat against your leg, Activate to holster/draw a gun.",
- "weight": 320,
+ "weight": "320 g",
"volume": "250 ml",
"price": 9000,
"rigid": false,
diff --git a/data/json/items/armor/jewelry.json b/data/json/items/armor/jewelry.json
index 12da1df53b8e6..88b91b59169c4 100644
--- a/data/json/items/armor/jewelry.json
+++ b/data/json/items/armor/jewelry.json
@@ -5,7 +5,7 @@
"name": "beaded bracelet",
"description": "A simple bracelet of string and wooden beads. You can wear it if you like, but it won't provide any effects.",
"looks_like": "copper_bracelet",
- "weight": 12,
+ "weight": "12 g",
"volume": 0,
"price": 100,
"flags": [ "VARSIZE", "FANCY" ],
@@ -16,9 +16,10 @@
{
"id": "bead_ear",
"type": "ARMOR",
- "name": "beaded earring",
- "description": "A simple bracelet of string and wooden beads. You can wear it if you like, but it won't provide any effects.",
- "weight": 7,
+ "name": "pair of beaded earrings",
+ "name_plural": "pairs of beaded earrings",
+ "description": "A simple pair of earrings made of string and wooden beads. You can wear it if you like, but it won't provide any effects.",
+ "weight": "7 g",
"volume": 0,
"price": 100,
"material": [ "wood" ],
@@ -31,7 +32,7 @@
"name": "beaded necklace",
"description": "A simple necklace made of string and wooden beads. You can wear it if you like, but it won't provide any effects.",
"looks_like": "necklace",
- "weight": 15,
+ "weight": "15 g",
"volume": 0,
"price": 100,
"material": [ "wood" ],
@@ -45,7 +46,7 @@
"name": "friendship bracelet",
"description": "A homemade bracelet crafted from colorful knickknacks. It's not very expensive, but it's the effort that makes it special.",
"looks_like": "copper_bracelet",
- "weight": 20,
+ "weight": "20 g",
"volume": 0,
"price": 100,
"flags": [ "VARSIZE", "FANCY" ],
@@ -58,7 +59,7 @@
"type": "ARMOR",
"name": "bronze medal",
"description": "A medal awarded for achieving third place in some event. It might be worth something if it was made of bronze; this one is made from iron.",
- "weight": 25,
+ "weight": "25 g",
"volume": 0,
"price": 1000,
"material": [ "iron" ],
@@ -71,7 +72,7 @@
"type": "ARMOR",
"name": "diamond dental grill",
"description": "Fake teeth inlaid with diamonds, worn over the teeth. Fits horribly, but looks very shiny. For that high-class gangsta rap look.",
- "weight": 10,
+ "weight": "10 g",
"volume": 0,
"price": 50000,
"price_postapoc": 1500,
@@ -89,7 +90,7 @@
"type": "ARMOR",
"name": "diamond ring",
"description": "A gold ring with a sparkling diamond mounted on top of it. Back in the old days this could be worth a fortune. You can wear it if you like, but it won't provide any effects.",
- "weight": 12,
+ "weight": "12 g",
"volume": 0,
"price": 190000,
"price_postapoc": 1700,
@@ -104,7 +105,7 @@
"name": "diver's watch",
"name_plural": "diver's watches",
"description": "A waterproof, self-winding watch on a stainless steel watchband. Tells the time and current temperature. Activate to check the digital thermometer.",
- "weight": 65,
+ "weight": "65 g",
"volume": "250 ml",
"price": 12000,
"price_postapoc": 700,
@@ -122,7 +123,7 @@
"type": "ARMOR",
"name": "collar pin",
"description": "A staple accessory for gentlemen. Keeps your shirt collar in place and provides a more aesthetically pleasing arc to your necktie. You can wear it if you like, but it won't provide any effects.",
- "weight": 10,
+ "weight": "10 g",
"volume": 0,
"price": 25000,
"price_postapoc": 200,
@@ -136,7 +137,7 @@
"type": "ARMOR",
"name": "copper bracelet",
"description": "An old-fashioned, copper bracelet. You can wear it if you like, but it won't provide any effects.",
- "weight": 86,
+ "weight": "86 g",
"volume": 0,
"price": 2500,
"price_postapoc": 100,
@@ -147,9 +148,10 @@
{
"id": "copper_ear",
"type": "ARMOR",
- "name": "copper earring",
- "description": "A copper earring. It's pretty heavy. You can wear it if you like, but it won't provide any effects.",
- "weight": 50,
+ "name": "pair of copper earrings",
+ "name_plural": "pairs of copper earrings",
+ "description": "A pair of copper earrings. It's pretty heavy. You can wear it if you like, but it won't provide any effects.",
+ "weight": "50 g",
"volume": 0,
"price": 2900,
"price_postapoc": 50,
@@ -162,7 +164,7 @@
"type": "ARMOR",
"name": "copper hairpin",
"description": "A hairpin made from copper. You can wear it if you like, but it won't provide any effects.",
- "weight": 2,
+ "weight": "2 g",
"volume": 0,
"price": 500,
"material": [ "copper" ],
@@ -174,7 +176,7 @@
"type": "ARMOR",
"name": "copper locket",
"description": "A circular, copper locket. It's been tarnished with use, and has gained some dull green spots. You can wear it if you like, but it won't provide any effects.",
- "weight": 45,
+ "weight": "45 g",
"volume": 0,
"price": 1000,
"material": [ "copper" ],
@@ -186,7 +188,7 @@
"type": "ARMOR",
"name": "copper necklace",
"description": "A simple chain of copper, with a clasp in the middle to create a necklace. You can wear it if you like, but it won't provide any effects.",
- "weight": 30,
+ "weight": "30 g",
"volume": 0,
"price": 3000,
"material": [ "copper" ],
@@ -198,7 +200,7 @@
"type": "ARMOR",
"name": "copper ring",
"description": "A plain, copper ring. Not very shiny, and not very popular. You can wear it if you like, but it won't provide any effects.",
- "weight": 50,
+ "weight": "50 g",
"volume": 0,
"price": 2000,
"material": [ "copper" ],
@@ -210,7 +212,7 @@
"type": "ARMOR",
"name": "cufflinks",
"description": "An unmarked, pair of silver cufflinks. Cufflinks are used to secure the cuffs of dress shirts - a must-have for men in formal wear. You can wear it if you like, but it won't provide any effects.",
- "weight": 15,
+ "weight": "15 g",
"volume": 0,
"price": 3000,
"material": [ "silver" ],
@@ -222,7 +224,7 @@
"type": "ARMOR",
"name": "intricate cufflinks",
"description": "An expensive pair of silver cufflinks, stylized with detailed overlays of gold gears and fractal patterns. You can wear it if you like, but it won't provide any effects.",
- "weight": 21,
+ "weight": "21 g",
"volume": 0,
"price": 7000,
"material": [ "silver", "gold" ],
@@ -234,7 +236,7 @@
"type": "ARMOR",
"name": "plug",
"description": "Those round things people plug into their earlobes as earrings, also called \"ear plug\" or \"ear spool.\" You can wear it if you like, but it won't provide any effects.",
- "weight": 10,
+ "weight": "10 g",
"volume": 0,
"price": 1200,
"price_postapoc": 10,
@@ -248,7 +250,7 @@
"type": "ARMOR",
"name": "gold bracelet",
"description": "A fancy golden bracelet. You can wear it if you like, but it won't provide any effects.",
- "weight": 40,
+ "weight": "40 g",
"volume": 0,
"price": 46000,
"price_postapoc": 1000,
@@ -262,7 +264,7 @@
"type": "ARMOR",
"name": "gold dental grill",
"description": "Fake golden teeth, worn over the teeth. Fits horribly, but looks very shiny.",
- "weight": 10,
+ "weight": "10 g",
"volume": 0,
"price": 20000,
"price_postapoc": 500,
@@ -277,9 +279,10 @@
{
"id": "gold_ear",
"type": "ARMOR",
- "name": "gold earring",
- "description": "A shiny gold earring. You can wear it if you like, but it won't provide any effects.",
- "weight": 10,
+ "name": "pair of gold earrings",
+ "name_plural": "pairs of gold earrings",
+ "description": "A pair of shiny gold earrings. You can wear it if you like, but it won't provide any effects.",
+ "weight": "10 g",
"volume": 0,
"price": 13000,
"price_postapoc": 500,
@@ -293,7 +296,7 @@
"type": "ARMOR",
"name": "gold hairpin",
"description": "A gold hairpin, designed by the rich, for the rich. You can wear it if you like, but it won't provide any effects.",
- "weight": 4,
+ "weight": "4 g",
"volume": 0,
"price": 5000,
"material": [ "gold" ],
@@ -306,7 +309,7 @@
"type": "ARMOR",
"name": "gold locket",
"description": "A heart-shaped, gold locket with a frame inside to store photographs or small objects. You can wear it if you like, but it won't provide any effects.",
- "weight": 50,
+ "weight": "50 g",
"volume": 0,
"price": 20000,
"material": [ "gold" ],
@@ -319,7 +322,7 @@
"type": "ARMOR",
"name": "gold medal",
"description": "A medal awarded for achieving first place in some event. Before everything fell apart, this could be a source of pride for its owner. Now it's just another shiny bauble.",
- "weight": 30,
+ "weight": "30 g",
"volume": 0,
"price": 10000,
"material": [ "gold" ],
@@ -332,7 +335,7 @@
"type": "ARMOR",
"name": "gold necklace",
"description": "A shiny, unadorned gold necklace. You can wear it if you like, but it won't provide any effects.",
- "weight": 30,
+ "weight": "30 g",
"volume": 0,
"price": 40000,
"material": [ "gold" ],
@@ -345,7 +348,7 @@
"type": "ARMOR",
"name": "gold ring",
"description": "A flashy gold ring. You can wear it if you like, but it won't provide any effects.",
- "weight": 10,
+ "weight": "10 g",
"volume": 0,
"price": 30000,
"material": [ "gold" ],
@@ -358,7 +361,7 @@
"name": "gold watch",
"name_plural": "gold watches",
"description": "A gold-plated steel self-winding wristwatch, suitable for a retirement present. Tells the time and looks good.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 50000,
"price_postapoc": 2000,
@@ -375,7 +378,7 @@
"type": "ARMOR",
"name": "tie clip",
"description": "A fancy silver tie clip, a great match for your skinny tie. You can wear it if you like, but it won't provide any effects.",
- "weight": 12,
+ "weight": "12 g",
"volume": 0,
"price": 28000,
"price_postapoc": 200,
@@ -389,7 +392,7 @@
"name": "silver watch",
"name_plural": "silver watches",
"description": "An elegant silver watch, crafted from silver-plated stainless steel. It's much cheaper than other metal watches, and more classy than an ordinary wristwatch.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 18000,
"to_hit": -1,
@@ -405,7 +408,7 @@
"type": "ARMOR",
"name": "silver bracelet",
"description": "A nice silver bracelet. You can wear it if you like, but it won't provide any effects.",
- "weight": 30,
+ "weight": "30 g",
"volume": 0,
"price": 25000,
"price_postapoc": 500,
@@ -417,9 +420,10 @@
{
"id": "silver_ear",
"type": "ARMOR",
- "name": "silver earring",
- "description": "A beautiful silver earring. You can wear it if you like, but it won't provide any effects.",
- "weight": 9,
+ "name": "pair of silver earrings",
+ "name_plural": "pairs of silver earrings",
+ "description": "A pair of beautiful silver earrings. You can wear it if you like, but it won't provide any effects.",
+ "weight": "9 g",
"volume": 0,
"price": 8000,
"price_postapoc": 200,
@@ -435,7 +439,7 @@
"name_plural": "fancy watches",
"//": "That's about the midpoint for a rolex.",
"description": "A rather large and expensively made wristwatch. Tells the time in elegantly wrought gold with silver detailing. It's really the only timepiece suitable for someone of your exquisitely discerning tastes.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 2200000,
"price_postapoc": 3000,
@@ -452,7 +456,7 @@
"type": "ARMOR",
"name": "small relic",
"description": "A small relic from a forgotten saint. As extraordinary as the world has become it may have some power yet.",
- "weight": 60,
+ "weight": "60 g",
"volume": 0,
"price": 1000,
"material": [ "bone", "silver" ],
@@ -466,7 +470,7 @@
"type": "ARMOR",
"name": "holy symbol",
"description": "A necklace made of fine gold chain bearing the symbol of a forgotten faith.",
- "weight": 22,
+ "weight": "22 g",
"volume": 0,
"price": 5000,
"price_postapoc": 500,
@@ -481,7 +485,7 @@
"type": "ARMOR",
"name": "handmade holy symbol",
"description": "A simple necklace representing a religious faith.",
- "weight": 38,
+ "weight": "38 g",
"volume": 0,
"price": 500,
"material": [ "wood", "cotton" ],
@@ -495,7 +499,7 @@
"name": "jade brooch",
"name_plural": "jade brooches",
"description": "A hand-crafted jade brooch of Oriental origin. You can wear it if you like, but it won't provide any effects.",
- "weight": 26,
+ "weight": "26 g",
"volume": 0,
"price": 90000,
"material": [ "stone" ],
@@ -509,7 +513,7 @@
"name": "platinum watch",
"name_plural": "platinum watches",
"description": "Flex on those gold-watch wearers with the rare, expensive and superior platinum watch. This one is made from solid platinum.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"//": "far more expensive than gold watches, around $100,000 for most platinum watches ",
"price": 10000000,
@@ -526,7 +530,7 @@
"type": "ARMOR",
"name": "platinum bracelet",
"description": "A flawless platinum bracelet. You can wear it if you like, but it won't provide any effects.",
- "weight": 50,
+ "weight": "50 g",
"volume": 0,
"price": 38000,
"material": [ "platinum" ],
@@ -539,7 +543,7 @@
"type": "ARMOR",
"name": "platinum dental grill",
"description": "Fake platinum-and-silver teeth. They may be cheaper than fake gold teeth, but they're much more rare. Fits horribly, but looks very shiny.",
- "weight": 15,
+ "weight": "15 g",
"volume": 0,
"price": 15000,
"bashing": 2,
@@ -553,9 +557,10 @@
{
"id": "platinum_ear",
"type": "ARMOR",
- "name": "gold earring",
- "description": "Plain platinum earrings, the rich person's earring - if gold is getting boring, just use another rare metal. You can wear it if you like, but it won't provide any effects.",
- "weight": 15,
+ "name": "pair of platinum earrings",
+ "name_plural": "pairs of platinum earrings",
+ "description": "A pair of plain platinum earrings - if gold is getting boring, just use another rare metal. You can wear it if you like, but it won't provide any effects.",
+ "weight": "15 g",
"volume": 0,
"price": 12000,
"material": [ "platinum" ],
@@ -568,7 +573,7 @@
"type": "ARMOR",
"name": "platinum hairpin",
"description": "The ultimate in esoteric, metal hair accessories, this hairpin is made from pure platinum. You can wear it if you like, but it won't provide any effects.",
- "weight": 7,
+ "weight": "7 g",
"volume": 0,
"price": 3500,
"material": [ "platinum" ],
@@ -581,7 +586,7 @@
"type": "ARMOR",
"name": "platinum locket",
"description": "A small, platinum locket for storing photographs or other small objects. You can wear it if you like, but it won't provide any effects.",
- "weight": 65,
+ "weight": "65 g",
"volume": 0,
"price": 16000,
"material": [ "platinum" ],
@@ -594,7 +599,7 @@
"type": "ARMOR",
"name": "platinum necklace",
"description": "A platinum necklace, with a small, empty heart frame hanging from a chain. You can wear it if you like, but it won't provide any effects.",
- "weight": 47,
+ "weight": "47 g",
"volume": 0,
"price": 50000,
"material": [ "platinum" ],
@@ -607,7 +612,7 @@
"type": "ARMOR",
"name": "platinum ring",
"description": "A platinum ring, engraved with all manner of swirls and spirals. You can wear it if you like, but it won't provide any effects.",
- "weight": 13,
+ "weight": "13 g",
"volume": 0,
"price": 24000,
"material": [ "platinum" ],
@@ -620,7 +625,7 @@
"type": "ARMOR",
"name": "engagement ring",
"description": "This ring is an intricate gold band, with a small cluster of diamonds set in the center. Before the world broke down, this ring would've cost a small fortune.",
- "weight": 14,
+ "weight": "14 g",
"volume": 0,
"price": 100000,
"material": [ "gold", "diamond" ],
@@ -633,7 +638,7 @@
"type": "ARMOR",
"name": "purity ring",
"description": "Also known as a promise ring, this ring is worn as a sign of chastity. This one bears the inscription, \"Love is patient.\"",
- "weight": 6,
+ "weight": "6 g",
"volume": 0,
"price": 1700,
"material": [ "silver" ],
@@ -646,7 +651,7 @@
"type": "ARMOR",
"name": "signet ring",
"description": "A gold and silver ring with a wide stamp attached to the band. A long time ago, the stamp was legible, but now the pattern is too worn to discern its former use.",
- "weight": 25,
+ "weight": "25 g",
"volume": 0,
"price": 10000,
"material": [ "gold", "silver" ],
@@ -659,7 +664,7 @@
"type": "ARMOR",
"name": "wedding ring",
"description": "A flawless ring, ensnaring a diamond with twists of pure gold. It's a constant reminder that the wearer is married.",
- "weight": 16,
+ "weight": "16 g",
"volume": 0,
"price": 150000,
"material": [ "gold", "diamond" ],
@@ -672,7 +677,7 @@
"type": "ARMOR",
"name": "silver necklace",
"description": "A nice silver necklace. You can wear it if you like, but it won't provide any effects.",
- "weight": 30,
+ "weight": "30 g",
"volume": 0,
"price": 12000,
"material": [ "silver" ],
@@ -685,7 +690,7 @@
"type": "ARMOR",
"name": "silver hairpin",
"description": "A shiny, silver hairpin with a tiny bee engraved onto it. You can wear it if you like, but it won't provide any effects.",
- "weight": 3,
+ "weight": "3 g",
"volume": 0,
"price": 2000,
"material": [ "silver" ],
@@ -698,7 +703,7 @@
"type": "ARMOR",
"name": "silver locket",
"description": "A small, silver locket with a frame inside to store photographs or small objects. You can wear it if you like, but it won't provide any effects.",
- "weight": 30,
+ "weight": "30 g",
"volume": 0,
"price": 4000,
"material": [ "silver" ],
@@ -711,7 +716,7 @@
"type": "ARMOR",
"name": "silver medal",
"description": "A medal awarded for achieving second place in some event. Before everything fell apart, this could be a source of pride for its owner. Now it's just another shiny bauble.",
- "weight": 20,
+ "weight": "20 g",
"volume": 0,
"price": 5000,
"material": [ "silver" ],
@@ -724,7 +729,7 @@
"type": "ARMOR",
"name": "silver ring",
"description": "A simple, silver ring. You can wear it if you like, but it won't provide any effects.",
- "weight": 6,
+ "weight": "6 g",
"volume": 0,
"price": 5000,
"material": [ "silver" ],
@@ -737,7 +742,7 @@
"type": "ARMOR",
"name": "leather collar",
"description": "A black leather 'collar' with a bell dangling from the front. Don't worry, the bell is silent.",
- "weight": 10,
+ "weight": "10 g",
"volume": "250 ml",
"price": 10000,
"material": [ "leather" ],
@@ -751,7 +756,7 @@
"name": "wrist watch",
"name_plural": "wrist watches",
"description": "A simple wristwatch on a plastic band. Tells the time and has an alarm clock feature.",
- "weight": 50,
+ "weight": "50 g",
"volume": "250 ml",
"price": 5000,
"price_postapoc": 300,
@@ -769,7 +774,7 @@
"name": "radiation badge",
"//": "These seem to be sold via subscription; makes a certain amount of sense, but low-bid seems a Bad Idea.",
"description": "A plastic badge with an embedded film strip. The film strip changes color as it is exposed to radiation. Wear on your lapel so you can notice if it changes.",
- "weight": 20,
+ "weight": "20 g",
"volume": 0,
"price": 8000,
"material": [ "plastic" ],
@@ -782,7 +787,7 @@
"type": "ARMOR",
"name": "badge template",
"description": "This is a template for police/medical badges. If found in a game it is a bug.",
- "weight": 60,
+ "weight": "60 g",
"volume": 0,
"price": 5000,
"price_postapoc": 700,
@@ -839,7 +844,7 @@
"type": "ARMOR",
"name": "doctor badge",
"material": [ "plastic" ],
- "weight": 10,
+ "weight": "10 g",
"price_postapoc": 30,
"description": "A plastic name tag marking the wearer as a real doctor of the medical kind."
},
@@ -850,7 +855,7 @@
"name": "Foodkid badge",
"material": [ "plastic" ],
"price_postapoc": 30,
- "weight": 10,
+ "weight": "10 g",
"description": "A star shaped badge, on it you can read \"Foodkid\" in bold letters. This is Foodperson's trusty sidekick's badge."
},
{
@@ -859,7 +864,7 @@
"name": "pair of fuzzy cat ears",
"name_plural": "pairs of fuzzy cat ears",
"description": "A fuzzy pair of brownish cat ears on a headband. It does nothing, but there's no reason not to look good even if no one's looking.",
- "weight": 20,
+ "weight": "20 g",
"volume": "250 ml",
"price": 1500,
"material": [ "fur", "plastic" ],
@@ -882,7 +887,7 @@
"type": "ARMOR",
"name": "fuzzy cat tail",
"description": "A fuzzy tawny tail weighted down with tiny beads of plastic. Sways behind you when you walk.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 1000,
"bashing": 4,
@@ -905,7 +910,7 @@
"type": "ARMOR",
"name": "fur kitty collar",
"description": "A decorative 'collar' made out of fur, complete with a little bell hanging from the front. Don't worry, it's silent.",
- "weight": 10,
+ "weight": "10 g",
"volume": "250 ml",
"price": 1000,
"material": [ "fur" ],
@@ -922,39 +927,13 @@
"material": [ "faux_fur" ],
"color": "pink"
},
- {
- "id": "leather_belt",
- "type": "ARMOR",
- "name": "leather belt",
- "description": "A leather belt. Useful for making your pair of pants fit.",
- "weight": 102,
- "volume": "250 ml",
- "price": 9000,
- "bashing": 5,
- "material": [ "leather" ],
- "symbol": "[",
- "color": "brown",
- "covers": [ "TORSO" ],
- "coverage": 5,
- "material_thickness": 1,
- "use_action": {
- "type": "holster",
- "holster_prompt": "Stick what into your belt",
- "holster_msg": "You tuck your %s into your %s",
- "max_volume": "500 ml",
- "max_weight": 400,
- "draw_cost": 60,
- "flags": [ "BELT_CLIP" ]
- },
- "flags": [ "WAIST", "WATER_FRIENDLY" ]
- },
{
"id": "leather_cat_ears",
"type": "ARMOR",
"name": "pair of leather cat ears",
"name_plural": "pairs of leather cat ears",
"description": "A shiny pair of black cat ears on a headband. It does nothing, but there's no reason not to look good even if no one's looking.",
- "weight": 20,
+ "weight": "20 g",
"volume": "250 ml",
"price": 3000,
"material": [ "leather", "plastic" ],
@@ -967,7 +946,7 @@
"type": "ARMOR",
"name": "leather cat tail",
"description": "A glossy black leather tail weighted down with tiny beads of plastic. Sways behind you when you walk.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 2500,
"bashing": 4,
diff --git a/data/json/items/armor/pets_dog_armor.json b/data/json/items/armor/pets_dog_armor.json
index 9228f37baa2a9..d1b113355ddc6 100644
--- a/data/json/items/armor/pets_dog_armor.json
+++ b/data/json/items/armor/pets_dog_armor.json
@@ -10,7 +10,7 @@
"price": 30000,
"price_postapoc": 3000,
"material": [ "kevlar" ],
- "weight": 4290,
+ "weight": "4290 g",
"volume": "4500 ml",
"bashing": 5,
"to_hit": -1,
@@ -32,7 +32,7 @@
"price": 50000,
"price_postapoc": 5000,
"material": [ "acidchitin" ],
- "weight": 5362,
+ "weight": "5362 g",
"environmental_protection": 7
},
{
@@ -58,7 +58,7 @@
"price": 25000,
"price_postapoc": 2500,
"material": [ "iron", "budget_steel" ],
- "weight": 6434,
+ "weight": "6434 g",
"material_thickness": 0
},
{
@@ -72,7 +72,7 @@
"price": 17500,
"price_postapoc": 1750,
"material": [ "cotton", "leather" ],
- "weight": 2145,
+ "weight": "2145 g",
"extend": { "flags": [ "NO_SALVAGE" ] }
},
{
@@ -85,7 +85,7 @@
"price": 19000,
"price_postapoc": 1900,
"material": [ "bone", "leather" ],
- "weight": 2645
+ "weight": "2645 g"
},
{
"type": "PET_ARMOR",
@@ -97,7 +97,7 @@
"price": 10000,
"price_postapoc": 1000,
"material": [ "neoprene", "plastic" ],
- "weight": 1960,
+ "weight": "1960 g",
"material_thickness": 0,
"environmental_protection": 10,
"min_pet_vol": "15000 ml",
@@ -113,7 +113,7 @@
"price": 130000,
"price_postapoc": 13000,
"material": [ "superalloy" ],
- "weight": 3125,
+ "weight": "3125 g",
"storage": "25 L",
"min_pet_vol": "20000 ml"
}
diff --git a/data/json/items/armor/pets_horse_armor.json b/data/json/items/armor/pets_horse_armor.json
index ec2280529844b..d7017b98344ab 100644
--- a/data/json/items/armor/pets_horse_armor.json
+++ b/data/json/items/armor/pets_horse_armor.json
@@ -9,7 +9,7 @@
"price": 50000,
"price_postapoc": 5000,
"material": [ "kevlar" ],
- "weight": 30000,
+ "weight": "30000 g",
"volume": "150 L",
"bashing": 10,
"to_hit": -3,
@@ -130,7 +130,7 @@
"type": "ARMOR",
"name": "saddle bags",
"description": "A pair of covered pouches laid across the back of a horse behind the saddle.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "7500 ml",
"price": 15000,
"material": [ "leather" ],
diff --git a/data/json/items/armor/power_armor.json b/data/json/items/armor/power_armor.json
index 59416d2998dd8..ac0aec9ba8f66 100644
--- a/data/json/items/armor/power_armor.json
+++ b/data/json/items/armor/power_armor.json
@@ -6,7 +6,7 @@
"name": "salvaged power armor",
"//": "These are much cheaper than powered suits, because they're extremely heavy and impractical. The good stuff is gone!",
"description": "The DoubleTech Power Armor, Mk. I: A heavy suit of basic power armor, offering very good protection against attacks, but hard to move in. This suit has had its servos and cooling system stripped out, meaning it no longer requires power, but also encumbers you greatly and doesn't provide internal thermal regulation.",
- "weight": 12214,
+ "weight": "12214 g",
"volume": "25 L",
"price": 70000,
"to_hit": 1,
@@ -29,7 +29,7 @@
"category": "armor",
"name": "salvaged power armor helmet",
"description": "A basic helmet, designed for use with the DoubleTech Power Armor, Mk. I. Offers excellent protection from both attacks and environmental hazards. This suit has had its internal computer and cooling system stripped out, meaning it no longer requires power, but it has no internal chronometer and doesn't provide internal thermal regulation.",
- "weight": 2416,
+ "weight": "2416 g",
"volume": "5 L",
"price": 30000,
"to_hit": 1,
@@ -52,7 +52,7 @@
"category": "armor",
"name": "basic power armor",
"description": "The DoubleTech Power Armor, Mk. I: A heavy suit of basic power armor, offering very good protection against attacks, but hard to move in. The UPS compartment can store other things if you don't mind powering the suit yourself. Like all DoubleTech power armor, the control and climate-regulation systems require direct skin contact.",
- "weight": 20339,
+ "weight": "20339 g",
"volume": "25 L",
"price": 7000000,
"to_hit": 1,
@@ -77,7 +77,7 @@
"category": "armor",
"name": "power armor hauling frame",
"description": "A heavy duty hauling frame designed to interface with power armor.",
- "weight": 1640,
+ "weight": "1640 g",
"volume": "12 L",
"price": 1000000,
"to_hit": 1,
@@ -98,7 +98,7 @@
"category": "armor",
"name": "heavy power armor",
"description": "A suit of DoubleTech Power Armor, Mk. II-H. This model offers several improvements over the Mk. I, most notably the improved environmental protection. Like all DoubleTech power armor, the control and climate-regulation systems require direct skin contact.",
- "weight": 29009,
+ "weight": "29009 g",
"volume": "30 L",
"price": 11500000,
"to_hit": 1,
@@ -123,7 +123,7 @@
"category": "armor",
"name": "basic power armor helmet",
"description": "A basic helmet, designed for use with the DoubleTech Power Armor, Mk. I. Offers excellent protection from both attacks and environmental hazards. Like all DoubleTech power armor, the control and climate-regulation systems require direct skin contact.",
- "weight": 3628,
+ "weight": "3628 g",
"volume": "5 L",
"price": 2500000,
"to_hit": 1,
@@ -147,7 +147,7 @@
"category": "armor",
"name": "heavy power armor helmet",
"description": "A power armor helmet designed for use with the DoubleTech Power Armor, Mk. II-H. This improved design is heavier than the Mk. I helmet, but cooler, and offers better environmental protection. Like all DoubleTech power armor, the control and climate-regulation systems require direct skin contact.",
- "weight": 5442,
+ "weight": "5442 g",
"volume": "7 L",
"price": 3750000,
"to_hit": 1,
@@ -171,7 +171,7 @@
"category": "armor",
"name": "light power armor helmet",
"description": "A power armor helmet designed for use with the DoubleTech Power Armor, Mk. II-L. This improved design is lighter and cooler than the Mk. I helmet. Like all DoubleTech power armor, the control and climate-regulation systems require direct skin contact.",
- "weight": 1814,
+ "weight": "1814 g",
"volume": "4 L",
"price": 3750000,
"to_hit": 1,
@@ -195,7 +195,7 @@
"category": "armor",
"name": "light power armor",
"description": "A suit of DoubleTech Power Armor, Mk. II-L. This model offers several improvements over the Mk. I, most notably the reduced weight. Like all DoubleTech power armor, the control and climate-regulation systems require direct skin contact.",
- "weight": 7670,
+ "weight": "7670 g",
"volume": "15 L",
"price": 11500000,
"to_hit": 1,
diff --git a/data/json/items/battery.json b/data/json/items/battery.json
index ef0ebacce0d7b..93d2ca43919a6 100644
--- a/data/json/items/battery.json
+++ b/data/json/items/battery.json
@@ -6,7 +6,7 @@
"name": "test battery",
"name_plural": "test batteries",
"description": "This is a testing item for the BATTERY item type. If you found one in game it's a bug.",
- "weight": 200,
+ "weight": "200 g",
"volume": "250 ml",
"price": 1500,
"material": [ "iron", "plastic" ],
@@ -23,7 +23,7 @@
"name": "ultra-light battery",
"name_plural": "ultra-light batteries",
"description": "This is a light battery cell designed for small size over everything else. It retains its universal compatibility, though.",
- "weight": 5,
+ "weight": "5 g",
"volume": 0,
"price": 1500,
"material": [ "iron", "plastic" ],
@@ -41,7 +41,7 @@
"name": "ultra-light plutonium fuel battery",
"name_plural": "ultra-light plutonium fuel batteries",
"description": "This battery uses a thin plutonium-244 rod to stablize an exotic nanocompound. It is universally compatible with small devices. Although it stores a huge amount of power, it cannot be recharged.",
- "weight": 80,
+ "weight": "80 g",
"volume": 0,
"price": 15000,
"material": [ "iron", "plastic" ],
@@ -60,7 +60,7 @@
"name": "ultra-light disposable battery",
"name_plural": "ultra-light disposable batteries",
"description": "This is a light battery cell designed for small size over everything else. It retains its universal compatibility, though. The battery's chemistry means that it has a very high capacity, but cannot be recharged.",
- "weight": 5,
+ "weight": "5 g",
"volume": 0,
"price": 3000,
"material": [ "iron", "plastic" ],
@@ -79,7 +79,7 @@
"name": "light battery",
"name_plural": "light batteries",
"description": "This is a light battery cell, universally compatible with all kinds of small devices.",
- "weight": 50,
+ "weight": "50 g",
"volume": "75ml",
"price": 3500,
"material": [ "iron", "plastic" ],
@@ -97,7 +97,7 @@
"name": "light battery (high-capacity)",
"name_plural": "light batteries (high-capacity)",
"description": "This is a high-capacity light battery cell, universally compatible with all kinds of small devices.",
- "weight": 75,
+ "weight": "75 g",
"volume": "115ml",
"price": 5000,
"material": [ "iron", "plastic" ],
@@ -115,7 +115,7 @@
"name": "light plutonium fuel battery",
"name_plural": "light plutonium fuel batteries",
"description": "This battery uses a thin plutonium-244 rod to stabilize an exotic nanocompound. It is universally compatible with all kinds of personal electronic devices. Although it stores a huge amount of power, it cannot be recharged.",
- "weight": 160,
+ "weight": "160 g",
"volume": "115ml",
"price": 50000,
"material": [ "iron", "plastic" ],
@@ -134,7 +134,7 @@
"name": "light disposable battery",
"name_plural": "light disposable batteries",
"description": "This is a light battery cell, universally compatible with all kinds of small devices. The battery's chemistry means that it has a very high capacity, but cannot be recharged.",
- "weight": 75,
+ "weight": "75 g",
"volume": "115ml",
"price": 10000,
"material": [ "iron", "plastic" ],
@@ -153,7 +153,7 @@
"name": "medium battery",
"name_plural": "medium batteries",
"description": "This is a medium battery cell, universally compatible with all kinds of appliances and power tools.",
- "weight": 250,
+ "weight": "250 g",
"volume": "375ml",
"price": 10000,
"material": [ "iron", "plastic" ],
@@ -171,7 +171,7 @@
"name": "medium battery (high-capacity)",
"name_plural": "medium batteries (high-capacity)",
"description": "This is a high-capacity medium battery cell, universally compatible with all kinds of appliances and power tools.",
- "weight": 350,
+ "weight": "350 g",
"volume": "450ml",
"price": 12500,
"material": [ "iron", "plastic" ],
@@ -189,7 +189,7 @@
"name": "medium plutonium fuel battery",
"name_plural": "medium plutonium fuel batteries",
"description": "This battery uses a thin plutonium-244 rod to stablize an exotic nanocompound. It is universally compatible with all kinds of appliances and power tools. Although it stores a huge amount of power, it cannot be recharged.",
- "weight": 800,
+ "weight": "800 g",
"volume": "375ml",
"price": 100000,
"material": [ "iron", "plastic" ],
@@ -208,7 +208,7 @@
"name": "medium disposable battery",
"name_plural": "medium disposable batteries",
"description": "This is a medium battery cell, universally compatible with all kinds of appliances and power tools. The battery's chemistry means that it has a very high capacity, but cannot be recharged.",
- "weight": 350,
+ "weight": "350 g",
"volume": "450ml",
"price": 10000,
"material": [ "iron", "plastic" ],
@@ -227,7 +227,7 @@
"name": "heavy battery",
"name_plural": "heavy batteries",
"description": "This is a heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.",
- "weight": 500,
+ "weight": "500 g",
"volume": "750ml",
"price": 10000,
"material": [ "iron", "plastic" ],
@@ -245,7 +245,7 @@
"name": "heavy battery (high-capacity)",
"name_plural": "heavy batteries (high-capacity)",
"description": "This is a high-capacity heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.",
- "weight": 950,
+ "weight": "950 g",
"volume": "1000ml",
"price": 12500,
"material": [ "iron", "plastic" ],
@@ -263,7 +263,7 @@
"name": "heavy plutonium fuel battery",
"name_plural": "heavy plutonium fuel batteries",
"description": "This battery uses a thin plutonium-244 rod to stablize an exotic nanocompound. It is universally compatible with all kinds of industrial-grade equipment and large tools. Although it stores a huge amount of power, it cannot be recharged.",
- "weight": 1600,
+ "weight": "1600 g",
"volume": "750ml",
"price": 100000,
"material": [ "iron", "plastic" ],
@@ -281,7 +281,7 @@
"category": "spare_parts",
"name": "military plutonium fuel cell",
"description": "This battery uses a huge plutonium-244 rod to stablize an exotic nanocompound. It was used in military mech-suits, was highly experimental, and had no civilian applications. Although it stores a stupendous amount of power, it cannot be recharged.",
- "weight": 64000,
+ "weight": "64000 g",
"volume": "30 L",
"price": 100000,
"material": [ "superalloy", "plastic" ],
@@ -300,7 +300,7 @@
"name": "heavy disposable battery",
"name_plural": "heavy disposable batteries",
"description": "This is a heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools. The battery's chemistry means that it has a very high capacity, but cannot be recharged.",
- "weight": 950,
+ "weight": "950 g",
"volume": "1000ml",
"price": 10000,
"material": [ "iron", "plastic" ],
diff --git a/data/json/items/bionics.json b/data/json/items/bionics.json
index 61b1873ec762f..473130f78d58c 100644
--- a/data/json/items/bionics.json
+++ b/data/json/items/bionics.json
@@ -4,7 +4,7 @@
"type": "BIONIC_ITEM",
"category": "bionics",
"name": "abstract bionic module",
- "weight": 2041,
+ "weight": "2041 g",
"volume": "2500 ml",
"bashing": 8,
"material": [ "steel", "plastic" ],
@@ -27,7 +27,7 @@
"type": "BIONIC_ITEM",
"name": "abstract faulty bionic module",
"price": 0,
- "weight": 500,
+ "weight": "500 g",
"description": "This CBM is broken beyond repair, you can't do anything with it."
},
{
@@ -37,7 +37,7 @@
"name": "Adrenaline Pump CBM",
"description": "A stimulator system that is implanted alongside the adrenal glands, allowing the user to trigger their body's adrenaline response at the cost of some bionic power.",
"price": 4000,
- "weight": 250,
+ "weight": "250 g",
"difficulty": 6
},
{
@@ -45,9 +45,9 @@
"copy-from": "bionic_general_npc_usable",
"type": "BIONIC_ITEM",
"name": "Active Defense System CBM",
- "description": "This bionic projects a thin forcefield around the user's body. Anything attempting to penetrate this field has a chance of being deflected at the cost of energy. Bullets will be stopped more often than swords and those in turn more often than massive objects.",
+ "description": "This bionic projects a thin forcefield around the user's body. Anything attempting to penetrate this field has a chance of being deflected at the cost of energy, reducing their ability to deal damage. Bullets will be deflected more than swords and those in turn more than massive objects.",
"price": 950000,
- "weight": 1000,
+ "weight": "1000 g",
"difficulty": 7
},
{
@@ -57,7 +57,7 @@
"name": "Alarm System CBM",
"description": "A motion-detecting alarm system will notice almost all movement within a fifteen-foot radius, and will silently alert the user. This is very useful during sleep, or if the user suspects a cloaked pursuer.",
"price": 25000,
- "weight": 500,
+ "weight": "500 g",
"difficulty": 1
},
{
@@ -76,7 +76,7 @@
"name": "Protective Lenses CBM",
"description": "A bionic package that seals the user's eye sockets with highly protective mirrored lenses and re-routes their tear ducts to their mouth. When the user cries, they must spit out or swallow their tears.",
"price": 550000,
- "weight": 500,
+ "weight": "500 g",
"difficulty": 5
},
{
@@ -86,7 +86,7 @@
"name": "Head Alloy Plating CBM",
"description": "Alloy plating that replaces the flesh on the user's head, protecting both their head and jaw regions.",
"price": 350000,
- "weight": 1000,
+ "weight": "1000 g",
"difficulty": 5
},
{
@@ -105,7 +105,7 @@
"name": "Torso Alloy Plating CBM",
"description": "Alloy plating that replaces the flesh on the user's torso, protecting it from physical trauma.",
"price": 350000,
- "weight": 3000,
+ "weight": "3000 g",
"difficulty": 4
},
{
@@ -115,7 +115,7 @@
"name": "Battery System CBM",
"description": "A battery draining attachment to make use of the energy contained in normal, everyday batteries.",
"price": 80000,
- "weight": 250,
+ "weight": "250 g",
"difficulty": 4
},
{
@@ -125,7 +125,7 @@
"name": "Monomolecular Blade CBM",
"description": "A deadly foot-long blade made of advanced material that is installed inside the forearm, capable of being extended through the back of the user's wrist at the cost of a small amount of power. Though exceptionally sharp, it will prevent the user from holding anything else while extended.",
"price": 8000,
- "weight": 250,
+ "weight": "250 g",
"difficulty": 8
},
{
@@ -144,7 +144,7 @@
"name": "Blood Analysis CBM",
"description": "Small sensors that are implanted in the user's heart, allowing them to analyze their blood. This will detect many illnesses, drugs, and other conditions.",
"price": 320000,
- "weight": 150,
+ "weight": "150 g",
"difficulty": 2
},
{
@@ -154,7 +154,7 @@
"name": "Blood Filter CBM",
"description": "A filtration system that is installed in the heart and can actively filter out chemical impurities, primarily drugs, with limited impact on viruses. Note that it is not a targeted filter; ALL drugs in the system will be affected.",
"price": 350000,
- "weight": 200,
+ "weight": "200 g",
"difficulty": 3
},
{
@@ -164,7 +164,7 @@
"name": "Cable Charger System CBM",
"description": "A complex port that is mounted above the hip. While active, it will recharge bionic power when connected to a battery via jumper cable.",
"price": 80000,
- "weight": 250,
+ "weight": "250 g",
"difficulty": 4
},
{
@@ -192,7 +192,7 @@
"name": "Bionic Claws CBM",
"description": "Vicious, retractable claws that are implanted inside the user's fingers. These do considerable cutting damage, but prevent the user from holding anything else while extended.",
"price": 550000,
- "weight": 500,
+ "weight": "500 g",
"difficulty": 5
},
{
@@ -220,7 +220,7 @@
"name": "Close Quarters Battle CBM",
"description": "A set of bionic processors and databanks, loaded with martial arts combat programs. Whilst active, the CQB module will improve the user's hand to hand combat skills, but prevents them from improving them through combat experience.",
"price": 220000,
- "weight": 250,
+ "weight": "250 g",
"difficulty": 8
},
{
@@ -230,7 +230,7 @@
"name": "Wired Reflexes CBM",
"description": "Bionic nerve stimulators that greatly enhance reaction times, granting a +2 bonus to dexterity.",
"price": 800000,
- "weight": 500,
+ "weight": "500 g",
"difficulty": 11
},
{
@@ -249,7 +249,7 @@
"name": "Enhanced Hearing CBM",
"description": "While this bionic is active, the user's hearing will be drastically improved, allowing them to hear ten times better than the average person. Additionally, high-intensity sounds will be automatically dampened before they can damage their hearing.",
"price": 500000,
- "weight": 500,
+ "weight": "500 g",
"difficulty": 6
},
{
@@ -295,7 +295,7 @@
"name": "Diamond Cornea CBM",
"description": "A set of diamond corneas which greatly enhance the user's vision, granting a +2 bonus to perception.",
"price": 800000,
- "weight": 100,
+ "weight": "100 g",
"difficulty": 11
},
{
@@ -305,7 +305,7 @@
"name": "Telescopic Eyes CBM",
"description": "An array of high-powered, auto-focusing lenses that replaces much of the material in the inner eye. This fixes any vision problems and allows for an increased vision range akin to binoculars.",
"price": 500000,
- "weight": 100,
+ "weight": "100 g",
"difficulty": 5
},
{
@@ -315,7 +315,7 @@
"name": "Facial Distortion CBM",
"description": "Through controlled application of electrochemical impulses, this bionic mudule lets the user alter their facial structure so as to subtly affect the reactions of others. This grants a bonus to all social interactions.",
"price": 850000,
- "weight": 200,
+ "weight": "200 g",
"difficulty": 5
},
{
@@ -325,7 +325,7 @@
"name": "Dielectric Capacitance System CBM",
"description": "A network of miniature piezoelectric capacitors, implanted throughout the body to protect from external electrical discharge.",
"price": 5000,
- "weight": 500,
+ "weight": "500 g",
"difficulty": 5
},
{
@@ -335,7 +335,7 @@
"name": "Fingerhack CBM",
"description": "A miniature electrohack, surgically embedded in a finger of the right hand. This is an all-purpose hacking unit used to override control panels and the like, but not computers. Computer proficiency is important, and a failed use may cause damage.",
"price": 350000,
- "weight": 100,
+ "weight": "100 g",
"difficulty": 2
},
{
@@ -345,7 +345,7 @@
"name": "Flashbang Generator CBM",
"description": "A combination of LEDs and speakers that create a flash and sound comparable to a flashbang grenade, deafening and blinding nearby enemies.",
"price": 720000,
- "weight": 500,
+ "weight": "500 g",
"difficulty": 5
},
{
@@ -355,7 +355,7 @@
"name": "Cranial Flashlight CBM",
"description": "A small, but powerful LED flashlight that is mounted between the eyes.",
"price": 20000,
- "weight": 250,
+ "weight": "250 g",
"difficulty": 2
},
{
@@ -365,7 +365,7 @@
"name": "LED Tattoo",
"description": "An LED display implanted beneath the epidermis that can display patterns or pictures through the skin. When active it glows dimly, providing a very small amount of light.",
"price": 20000,
- "weight": 20,
+ "weight": "20 g",
"difficulty": 1
},
{
@@ -375,7 +375,7 @@
"name": "Integrated Dosimeter CBM",
"description": "Small radiation sensors that are implanted throughout the body, allowing the user to analyze their level of absorbed radiation. They will also alert the user whenever exposed to environmental radiation.",
"price": 350000,
- "weight": 150,
+ "weight": "150 g",
"difficulty": 3
},
{
@@ -385,7 +385,7 @@
"name": "Respirator CBM",
"description": "A complex respiration augmentation system that increases the user's maximal oxygen uptake and allows for underwater breathing akin to gills. Will automatically activate if the user is drowning.",
"price": 450000,
- "weight": 700,
+ "weight": "700 g",
"difficulty": 6
},
{
@@ -395,7 +395,7 @@
"name": "Terranian Sonar CBM",
"description": "Precision sonar equipment, implanted in the feet to allow the detection of below-ground movement, buried traps, and unstable terrain.",
"price": 450000,
- "weight": 500,
+ "weight": "500 g",
"difficulty": 5
},
{
@@ -405,7 +405,7 @@
"name": "Heat Drain CBM",
"description": "While fighting unarmed against a warm-blooded opponent, there is a chance that a successful hit will drain body heat, inflicting a small amount of extra damage, and recharging the user's bionic power reserves slightly.",
"price": 550000,
- "weight": 500,
+ "weight": "500 g",
"difficulty": 5
},
{
@@ -433,7 +433,7 @@
"name": "Infrared Vision CBM",
"description": "A bionic module that extends the range of vision into the infrared, allowing the user to see warm-blooded creatures in the dark and through smoke.",
"price": 450000,
- "weight": 500,
+ "weight": "500 g",
"difficulty": 6
},
{
@@ -443,7 +443,7 @@
"name": "Cerebral Booster CBM",
"description": "Bionic coprocessors that are implanted in the brain, granting a +2 bonus to intelligence.",
"price": 800000,
- "weight": 100,
+ "weight": "100 g",
"difficulty": 11
},
{
@@ -453,7 +453,7 @@
"name": "Finger-Mounted Laser CBM",
"description": "A small, high-powered laser that is embedded in the fingertip. This long range weapon is not incredibly damaging, but is very accurate, and has the potential to start fires.",
"price": 720000,
- "weight": 500,
+ "weight": "500 g",
"difficulty": 5
},
{
@@ -463,7 +463,7 @@
"name": "Leukocyte Breeder System CBM",
"description": "Bionic stimulators which augment the user's haematopoiesis system, allowing them to accelerate white blood cell production using bionic power. It is designed for continuous use and may cause unpleasant side effects when turned off.",
"price": 6000,
- "weight": 600,
+ "weight": "600 g",
"difficulty": 7
},
{
@@ -473,7 +473,7 @@
"name": "Mini-Flamethrower CBM",
"description": "Powerful fire starters which extend from the tip of both hands' index fingers.",
"price": 130000,
- "weight": 500,
+ "weight": "500 g",
"difficulty": 4
},
{
@@ -483,7 +483,7 @@
"name": "Fingerpick CBM",
"description": "An electronic lockpick that is embedded in a fingertip. This automatic system will quickly unlock all but the most advanced key locks without any skill required on the part of the user.",
"price": 350000,
- "weight": 200,
+ "weight": "200 g",
"difficulty": 2
},
{
@@ -493,7 +493,7 @@
"name": "Electromagnetic Unit CBM",
"description": "A powerful electromagnet that is implanted into the user's right hand, allowing them to indiscriminately pull all nearby magnetic objects towards them. Unlucky bystanders might be injured or killed by flying objects.",
"price": 200000,
- "weight": 700,
+ "weight": "700 g",
"difficulty": 2
},
{
@@ -503,7 +503,7 @@
"name": "Nictating Membrane CBM",
"description": "A thin membrane that closes over the eyes while underwater, negating any vision penalties.",
"price": 450000,
- "weight": 1,
+ "weight": "1 g",
"difficulty": 6
},
{
@@ -513,7 +513,7 @@
"name": "Enhanced Memory Banks CBM",
"description": "A set of highly-advanced quantum storage drives used to enhance memory. While active, they increase the rate that the user learns skills, and give them near-perfect memory of skills and terrain.",
"price": 1000000,
- "weight": 100,
+ "weight": "100 g",
"difficulty": 9
},
{
@@ -523,7 +523,7 @@
"name": "Metabolic Interchange CBM",
"description": "This module interconnects the user's digestive system and power supply, letting them replenish bionic energy by burning calories.",
"price": 70000,
- "weight": 700,
+ "weight": "700 g",
"difficulty": 4
},
{
@@ -533,7 +533,7 @@
"name": "Weather Reader CBM",
"description": "A multitude of scientific instruments and sensors collect environmental data. The data is compiled and presented as a simple readout of the current weather. It also passively tells the user their external temperature.",
"price": 350000,
- "weight": 700,
+ "weight": "700 g",
"difficulty": 3
},
{
@@ -543,7 +543,7 @@
"name": "Repair Nanobots CBM",
"description": "A fleet of tiny dormant robots. While activated they will flit about the user's body, repairing damage and stopping bleeding at the cost of power.",
"price": 950000,
- "weight": 200,
+ "weight": "200 g",
"difficulty": 6
},
{
@@ -562,7 +562,7 @@
"name": "Implanted Night Vision CBM",
"description": "This bionic module modifies the user's eyes to amplify existing light, allowing them to see in the dark.",
"price": 900000,
- "weight": 100,
+ "weight": "100 g",
"difficulty": 11
},
{
@@ -572,7 +572,7 @@
"name": "Offensive Defense System CBM",
"description": "A thin forcefield gets projected around the user's body, continually draining power. This field does not deflect attacks, but rather delivers a strong shock, damaging unarmed attackers and those with a conductive weapon.",
"price": 950000,
- "weight": 1000,
+ "weight": "1000 g",
"difficulty": 7
},
{
@@ -582,7 +582,7 @@
"name": "Sensory Dulling CBM",
"description": "This module lets the user's nervous system inhibit pain signals, allowing them to dull their senses at will. However, the use of this system may cause delayed reaction times and drowsiness.",
"price": 200000,
- "weight": 300,
+ "weight": "300 g",
"difficulty": 4
},
{
@@ -592,7 +592,7 @@
"name": "Power Armor Interface CBM",
"description": "Interfaces the user's bionic power system with the internal charging port on suits of power armor, allowing them to draw from the user's bionic power banks.",
"price": 120000,
- "weight": 500,
+ "weight": "500 g",
"difficulty": 1
},
{
@@ -602,7 +602,7 @@
"name": "Power Armor Mk. II Interface CBM",
"description": "Interfaces the user's bionic power system with the internal charging port on suits of power armor, allowing them to draw from the user's bionic power banks. Twice as efficient as the Mk. I model. The Mk. II was designed by DoubleTech Inc., to meet the popularity of the Mk. II power armor series.",
"price": 1000000,
- "weight": 400,
+ "weight": "400 g",
"difficulty": 8
},
{
@@ -612,7 +612,7 @@
"name": "Power Storage CBM",
"description": "A Compact Bionics Module that upgrades the user's power capacity by 100 units. Having at least one of these is a prerequisite to using powered bionics. The user will also need a power supply, found in various CBMs.",
"price": 380000,
- "weight": 70,
+ "weight": "70 g",
"difficulty": 1
},
{
@@ -623,7 +623,7 @@
"name_plural": "Power Storage CBM Mk. II",
"description": "A Compact Bionics Module developed at DoubleTech Industries as a replacement for the highly successful Power Storage CBM. Increases the user's power capacity by 250 units.",
"price": 1000000,
- "weight": 50,
+ "weight": "50 g",
"difficulty": 1
},
{
@@ -642,7 +642,7 @@
"name": "Air Filtration System CBM",
"description": "An advanced filtration system that is implanted in the trachea. If toxins, or airborne diseases find their way into the windpipe, the filter will attempt to remove them.",
"price": 450000,
- "weight": 100,
+ "weight": "100 g",
"difficulty": 4
},
{
@@ -652,7 +652,7 @@
"name": "Radiation Scrubber System CBM",
"description": "A system of advanced piezomechanical blood filters that are implanted throughout your body, allowing the user to purge themself of absorbed radiation at the cost of some bionic power.",
"price": 450000,
- "weight": 100,
+ "weight": "100 g",
"difficulty": 4
},
{
@@ -662,7 +662,7 @@
"name": "Railgun CBM",
"description": "EM field generators in the user's arms increase the range and damage of thrown magnetic objects at a cost of 1 bionic power per throw. They will create a trail of electricity that can cause additional damage.",
"price": 220000,
- "weight": 1000,
+ "weight": "1000 g",
"difficulty": 3
},
{
@@ -672,9 +672,19 @@
"name": "Fingertip Razors CBM",
"description": "A set of ten double-edged, four centimeter long razor-sharp claws that are implanted underneath the fingernails. These will deal a small amount of unarmed slashing damage whenever the user's fingertips are uncovered.",
"price": 450000,
- "weight": 5,
+ "weight": "5 g",
"difficulty": 4
},
+ {
+ "id": "bio_fuel_cell_gasoline",
+ "copy-from": "bionic_general",
+ "type": "BIONIC_ITEM",
+ "name": "Gasoline Fuel Cell CBM",
+ "description": "A small gasoline fuel cell able to convert gasoline to bionic power. It's connected to a diffuse network of bio-plastic bladders able to hold up to 500 ml of gasoline.",
+ "price": 450000,
+ "weight": 600,
+ "difficulty": 7
+ },
{
"id": "bio_recycler",
"copy-from": "bionic_general_npc_usable",
@@ -682,7 +692,7 @@
"name": "Recycler Unit CBM",
"description": "A series of filters and processors that is implanted in the user's digestive system, allowing them to reclaim waste liquid and, to a lesser degree, nutrients. The net effect is a greatly reduced need to eat and drink.",
"price": 850000,
- "weight": 1500,
+ "weight": "1500 g",
"difficulty": 6
},
{
@@ -692,7 +702,7 @@
"name": "Remote Controller CBM",
"description": "A small module that connects to the user's brain and allows them to interface with nearby devices with wireless capabilities.",
"price": 600000,
- "weight": 250,
+ "weight": "250 g",
"difficulty": 6
},
{
@@ -711,7 +721,7 @@
"name": "Olfactory Mask CBM",
"description": "While this system is powered, the user's body will produce very little odor, making it nearly impossible for creatures to track them by scent.",
"price": 850000,
- "weight": 1000,
+ "weight": "1000 g",
"difficulty": 5
},
{
@@ -721,7 +731,7 @@
"name": "Scent Vision CBM",
"description": "This system lets the user visually sense their own scent, making it possible for them to recognize their surroundings even in complete darkness.",
"price": 450000,
- "weight": 100,
+ "weight": "100 g",
"difficulty": 8
},
{
@@ -731,7 +741,7 @@
"name": "Electroshock Unit CBM",
"description": "While fighting unarmed, or with a weapon that conducts electricity, there is a chance that a successful hit will shock the user's opponent, inflicting extra damage and disabling them temporarily at the cost of some energy.",
"price": 550000,
- "weight": 1000,
+ "weight": "1000 g",
"difficulty": 5
},
{
@@ -741,7 +751,7 @@
"name": "Shockwave Generator CBM",
"description": "This bionic module generates a powerful shockwave, knocking back all nearby creatures. Targets are stunned briefly, take damage and additional stun upon impact with impassable terrain, and knock back any creatures they collide with.",
"price": 550000,
- "weight": 1000,
+ "weight": "1000 g",
"difficulty": 5
},
{
@@ -751,7 +761,7 @@
"name": "Synaptic Accelerator CBM",
"description": "Bionic stimulators that enhance the nervous system, granting a 10% boost to your speed.",
"price": 10000,
- "weight": 400,
+ "weight": "400 g",
"difficulty": 12
},
{
@@ -761,7 +771,7 @@
"name": "Muscle Augmentation CBM",
"description": "Myomer fibers that enhance the muscular system, granting a +2 bonus to strength.",
"price": 800000,
- "weight": 1500,
+ "weight": "1500 g",
"difficulty": 11
},
{
@@ -771,7 +781,7 @@
"name": "Autonomous Surgical Scalpels CBM",
"description": "A system of surgical grade scalpels that is implanted in the user's fingers. They allow for automated precise cuts and can be used as a high-quality butchering tool.",
"price": 220000,
- "weight": 20,
+ "weight": "20 g",
"difficulty": 4
},
{
@@ -781,7 +791,7 @@
"name": "Anti-Glare Compensators CBM",
"description": "A set of quick-reacting transition lenses that are installed over the user's eyes. They negate glare penalties, partially protect from bright flashes, and protect the eyes when welding.",
"price": 450000,
- "weight": 1,
+ "weight": "1 g",
"difficulty": 4
},
{
@@ -791,7 +801,7 @@
"name": "Targeting System CBM",
"description": "This bionic module contains range finders and synchronizes the movement of the user's eyes with their arms, to a degree. Shots they fire will be much more accurate, particularly at long ranges.",
"price": 650000,
- "weight": 250,
+ "weight": "250 g",
"difficulty": 5
},
{
@@ -828,7 +838,7 @@
"name": "Joint Torsion Ratchet CBM",
"description": "Torsion ratchets that replace the user's joints to slowly generate power when they move. These can be toggled to generate more power, but movement will require more effort.",
"price": 380000,
- "weight": 1000,
+ "weight": "1000 g",
"difficulty": 4
},
{
@@ -838,7 +848,7 @@
"name": "Joint Servo CBM",
"description": "A set of servomotors that get installed on leg joints to provide power-assisted movement. They are optimized for running, but walking also requires less effort while this bionic is active. However, when it's offline it will hamper the user's movement.",
"price": 450000,
- "weight": 1000,
+ "weight": "1000 g",
"difficulty": 4
},
{
@@ -848,7 +858,7 @@
"name": "Uncanny Dodge CBM",
"description": "Bionic processors that augment the the user's nervous system, allowing them to dodge attacks beyond normal human capability, including bullets.",
"price": 950000,
- "weight": 1000,
+ "weight": "1000 g",
"difficulty": 11
},
{
@@ -858,7 +868,7 @@
"name": "Unified Power System CBM",
"description": "A Unified Power System that is wired into the user's bionic power banks. Objects that run on a UPS can now directly draw power from the bionic power supply.",
"price": 25000,
- "weight": 700,
+ "weight": "700 g",
"difficulty": 3
},
{
@@ -868,7 +878,7 @@
"name": "Internal Chronometer CBM",
"description": "This bionic module contains an atomic clock, complete with silent alarm clock function.",
"price": 1000,
- "weight": 10,
+ "weight": "10 g",
"difficulty": 1
},
{
@@ -878,7 +888,7 @@
"name": "Water Extraction Unit CBM",
"description": "This module contains nanotubes that are embedded in the palm of the hand to pump any available fluid out of a dead body, cleanse it of impurities and convert it into potable water. Water container not included.",
"price": 550000,
- "weight": 100,
+ "weight": "100 g",
"difficulty": 5
},
{
@@ -888,7 +898,7 @@
"name": "Intravenous Needletip CBM",
"description": "A small tube with a retractable needle that terminates in a net of tiny hoses instead of a plunger. Installed, it allows the user to draw substances directly into their bloodstream akin to a regular syringe.",
"price": 1000,
- "weight": 10,
+ "weight": "10 g",
"difficulty": 1
},
{
@@ -898,7 +908,7 @@
"name": "Titanium Skeletal Bracing CBM",
"description": "A set of hinges, springs, and other synthetic augments for the skeletal structure. These artificial enhancers strengthen the knees and elbows, allowing the user to carry more weight.",
"price": 50000,
- "weight": 3000,
+ "weight": "3000 g",
"difficulty": 3
},
{
@@ -908,7 +918,7 @@
"name": "Kinetic Shock Absorbers CBM",
"description": "A set of hydraulic springs and foldable padding that replaces most of the flesh in the limbs and upper torso. While active, these absorbers will negate damage from severe impacts such as falling, at the cost of reducing the user's ability to move effectively.",
"price": 10000,
- "weight": 3000,
+ "weight": "3000 g",
"difficulty": 4
},
{
@@ -918,7 +928,7 @@
"name": "Taste Modifier CBM",
"description": "A set of highly sensitive sensors implanted in the user's mouth, combined with a sophisticated analyzer. While active, it will block all unpleasant taste and texture at the cost of bionic energy.",
"price": 40000,
- "weight": 100,
+ "weight": "100 g",
"difficulty": 5
},
{
@@ -928,7 +938,7 @@
"name": "Soporific Induction CBM",
"description": "A microscopic electrode designed to gently stimulate a particular cluster of neurons in the hypothalamus, helping the user to fall asleep.",
"price": 350000,
- "weight": 50,
+ "weight": "50 g",
"difficulty": 2
},
{
@@ -938,7 +948,7 @@
"name": "Squeaky Ankles",
"name_plural": "Squeaky Ankles",
"description": "A pair of defective bionics that make squeaking noises.",
- "weight": 100,
+ "weight": "100 g",
"difficulty": 4
},
{
@@ -956,7 +966,7 @@
"type": "BIONIC_ITEM",
"name": "Acidic Leaking CBM",
"description": "This CBM has been breached in several places and some acid is leaking from it.",
- "weight": 700,
+ "weight": "700 g",
"difficulty": 11
},
{
@@ -965,7 +975,7 @@
"type": "BIONIC_ITEM",
"name": "Faulty Electric System",
"description": "This CBM is a mess of naked wire and burnt resistors.",
- "weight": 700,
+ "weight": "700 g",
"difficulty": 5
},
{
@@ -974,7 +984,7 @@
"type": "BIONIC_ITEM",
"name": "Electrical Drain",
"description": "This CBM was wired incorrectly and would drain power from any system connected to it.",
- "weight": 900,
+ "weight": "900 g",
"difficulty": 5
},
{
@@ -983,7 +993,7 @@
"type": "BIONIC_ITEM",
"name": "Itchy Metal Thing",
"description": "You can't recognise what this is supposed to be, but it's a very awkward thing to have in one's body.",
- "weight": 200,
+ "weight": "200 g",
"difficulty": 3
},
{
@@ -992,7 +1002,7 @@
"type": "BIONIC_ITEM",
"name": "Glowy Thing",
"description": "It's a... thing? And it glows, at least it did when it was plugged in.",
- "weight": 5,
+ "weight": "5 g",
"difficulty": 3
},
{
@@ -1001,7 +1011,7 @@
"type": "BIONIC_ITEM",
"name": "Leaky Bionic",
"description": "A mess of pierced pipes and broken seals, something unpleasant is leaking from it.",
- "weight": 600,
+ "weight": "600 g",
"difficulty": 7
},
{
@@ -1010,7 +1020,7 @@
"type": "BIONIC_ITEM",
"name": "Noisemaker",
"description": "A malfunctioning bionic. When powered, it occasionally emits a loud burst of noise.",
- "weight": 250,
+ "weight": "250 g",
"difficulty": 3
},
{
@@ -1019,7 +1029,7 @@
"type": "BIONIC_ITEM",
"name": "Bionic Nostril",
"description": "This thing was up someone's nose, they're probably glad to be rid of it.",
- "weight": 50,
+ "weight": "50 g",
"difficulty": 3
},
{
@@ -1028,7 +1038,7 @@
"type": "BIONIC_ITEM",
"name": "Bionic Visual Impairment",
"description": "A defective bionic that impairs vision.",
- "weight": 100,
+ "weight": "100 g",
"difficulty": 8
},
{
@@ -1053,7 +1063,7 @@
"type": "BIONIC_ITEM",
"name": "Endocrine Enervator",
"description": "This malfunctioning bionic causes fatigue by altering the unfortunate user's brain chemistry.",
- "weight": 100,
+ "weight": "100 g",
"difficulty": 11
},
{
@@ -1080,7 +1090,7 @@
"name": "Self-Locking Thumbs",
"name_plural": "Self-Locking Thumbs",
"description": "A pair of faulty, self-locking thumb bionics.",
- "weight": 50,
+ "weight": "50 g",
"difficulty": 5
},
{
@@ -1089,7 +1099,7 @@
"type": "BIONIC_ITEM",
"name": "Visual Disruptor",
"description": "A pair of defective ocular bionics that cause visual distortion and pixelation.",
- "weight": 100,
+ "weight": "100 g",
"difficulty": 8
},
{
@@ -1098,7 +1108,7 @@
"type": "BIONIC_ITEM",
"name": "Voice Remodulator",
"description": "Part of the autodoc's 'Cyborg Identity Package', this bionic gives the user a creepy robot voice.",
- "weight": 100,
+ "weight": "100 g",
"difficulty": 5
}
]
diff --git a/data/json/items/biosignatures.json b/data/json/items/biosignatures.json
index 7c0e922fc3c43..168f06ceec3b2 100644
--- a/data/json/items/biosignatures.json
+++ b/data/json/items/biosignatures.json
@@ -4,7 +4,7 @@
"id": "feces_bird",
"name": "bird litter",
"category": "chems",
- "weight": 40,
+ "weight": "40 g",
"color": "brown",
"spoils_in": "4 days 16 hours",
"comestible_type": "FOOD",
@@ -25,7 +25,7 @@
"id": "feces_cow",
"name": "cow pie",
"copy-from": "feces_bird",
- "weight": 750,
+ "weight": "750 g",
"volume": "1 L",
"description": "A fresh cow pie, could probably be used to make some great fertilizer."
},
@@ -41,7 +41,7 @@
"id": "feces_manure",
"name": "manure",
"copy-from": "feces_bird",
- "weight": 250,
+ "weight": "250 g",
"volume": "500 ml",
"description": "Common manure, could probably be used to make some great fertilizer."
},
diff --git a/data/json/items/book/archery.json b/data/json/items/book/archery.json
index 069eb622a2068..33c3973cdad35 100644
--- a/data/json/items/book/archery.json
+++ b/data/json/items/book/archery.json
@@ -5,7 +5,7 @@
"name": "Lessons for the Novice Bowhunter",
"name_plural": "Lessons for the Novice Bowhunter",
"description": "This hefty paperback book contains all the information needed for novice archers to get started hunting with a variety of bows and crossbows.",
- "weight": 932,
+ "weight": "932 g",
"volume": "1250 ml",
"price": 2000,
"material": [ "paper" ],
@@ -22,7 +22,7 @@
"name": "Archery for Kids",
"name_plural": "Archery for Kids",
"description": "Will you be able to place the arrow right into the bullseye? It is not that easy, but once you know how it's done, you will have a lot of fun with archery.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 480,
"material": [ "paper" ],
@@ -40,7 +40,7 @@
"name": "Zen and the Art of Archery",
"name_plural": "Zen and the Art of Archery",
"description": "This massive book contains a wealth of vital information for the novice archer.",
- "weight": 1454,
+ "weight": "1454 g",
"volume": "1250 ml",
"price": 1900,
"material": [ "paper" ],
diff --git a/data/json/items/book/barter.json b/data/json/items/book/barter.json
index c432a67b58c46..143a32d988df1 100644
--- a/data/json/items/book/barter.json
+++ b/data/json/items/book/barter.json
@@ -4,7 +4,7 @@
"type": "BOOK",
"name": "car buyer's guide",
"description": "Normally this glossy, ad-filled magazine about cars would be pointless, but it has a series of articles on haggling techniques.",
- "weight": 90,
+ "weight": "90 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -21,7 +21,7 @@
"name": "How to Succeed in Business",
"name_plural": "How to Succeed in Business",
"description": "Useful if you want to get a good deal when purchasing goods.",
- "weight": 454,
+ "weight": "454 g",
"volume": "750 ml",
"price": 1900,
"material": [ "paper" ],
@@ -40,7 +40,7 @@
"name_plural": "Advanced Economics",
"//": "Biz majors can afford it. Surely you're gonna make US$60K/yr out of school, and twice that in five years?",
"description": "A college textbook on economics.",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "1750 ml",
"price": 9800,
"bashing": 5,
diff --git a/data/json/items/book/bashing.json b/data/json/items/book/bashing.json
index 2439c1122bf26..b6ec917aaa953 100644
--- a/data/json/items/book/bashing.json
+++ b/data/json/items/book/bashing.json
@@ -5,7 +5,7 @@
"name": "Batter Up!",
"name_plural": "Batter Up!",
"description": "A baseball magazine that focuses on batting tips. There are lots of colorful, full-page photos of skilled athletes demonstrating proper form and technique.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -22,7 +22,7 @@
"type": "BOOK",
"name": "tactical baton defense manual",
"description": "An informative guide to self-defense using clubs and batons. Aimed at the law enforcement and military market, it is packed with time tested, no-nonsense information and written to be understandable for beginners.",
- "weight": 454,
+ "weight": "454 g",
"volume": "250 ml",
"price": 2000,
"material": [ "paper" ],
diff --git a/data/json/items/book/computer.json b/data/json/items/book/computer.json
index 489c8f5f79d05..e4c9b4b118b64 100644
--- a/data/json/items/book/computer.json
+++ b/data/json/items/book/computer.json
@@ -4,7 +4,7 @@
"type": "BOOK",
"name": "SICP",
"description": "A classic text, \"The Structure and Interpretation of Computer Programs.\" Written with examples in LISP, but applicable to any language.",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "1500 ml",
"price": 7800,
"bashing": 6,
@@ -24,7 +24,7 @@
"name": "Computer Science 301",
"name_plural": "Computer Science 301",
"description": "A college textbook on computer science.",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "1750 ml",
"price": 7900,
"bashing": 5,
@@ -44,7 +44,7 @@
"name": "How to Browse the Web",
"name_plural": "How to Browse the Web",
"description": "Very beginner-level information about computers.",
- "weight": 454,
+ "weight": "454 g",
"volume": "750 ml",
"price": 1700,
"material": [ "paper" ],
@@ -61,7 +61,7 @@
"name": "Computer World",
"name_plural": "Computer World",
"description": "An informative magazine all about computers, both hardware and software.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -79,7 +79,7 @@
"name_plural": "Computer Science 101",
"//": "College-level textbooks are Cheap at $60.",
"description": "An entry-level textbook about computers.",
- "weight": 462,
+ "weight": "462 g",
"volume": "750 ml",
"price": 5500,
"material": [ "paper" ],
@@ -96,7 +96,7 @@
"name": "Principles of Advanced Programming",
"name_plural": "Principles of Advanced Programming",
"description": "A heavy textbook dedicated to advanced-level software design, written for several different programming languages.",
- "weight": 2206,
+ "weight": "2206 g",
"volume": "1750 ml",
"price": 8500,
"bashing": 5,
diff --git a/data/json/items/book/cooking.json b/data/json/items/book/cooking.json
index a6766164a80ad..c0b15258f25cb 100644
--- a/data/json/items/book/cooking.json
+++ b/data/json/items/book/cooking.json
@@ -5,7 +5,7 @@
"name": "Advanced Physical Chemistry",
"name_plural": "Advanced Physical Chemistry",
"description": "A university-level textbook on advanced principles of chemistry, both organic and inorganic.",
- "weight": 1712,
+ "weight": "1712 g",
"volume": "2 L",
"price": 7950,
"bashing": 5,
@@ -24,7 +24,7 @@
"type": "BOOK",
"name": "The Homebrewer's Bible",
"description": "A book full of easy-to-follow recipes and useful advice on homebrewing, malting, and fermenting. It even smells faintly of booze.",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "1500 ml",
"price": 4950,
"bashing": 4,
@@ -43,7 +43,7 @@
"type": "BOOK",
"name": "Cooking on a Budget",
"description": "A nice cook book that goes beyond recipes and into the chemistry of food.",
- "weight": 454,
+ "weight": "454 g",
"volume": "1 L",
"price": 1900,
"material": [ "paper" ],
@@ -61,7 +61,7 @@
"name_plural": "To Serve Man",
"//": "Wasn't commercially traded. ('Parody' only covers so much.) Should get a serious price modifier for non-Cannibals.",
"description": "It's... it's a cookbook!",
- "weight": 454,
+ "weight": "454 g",
"volume": "1 L",
"price": 40000,
"material": [ "paper" ],
@@ -80,7 +80,7 @@
"name": "Cucina Italiana",
"name_plural": "Cucina Italiana",
"description": "This cookbook is written in Italian, but handily illustrated with step by step photo instructions.",
- "weight": 454,
+ "weight": "454 g",
"volume": "1 L",
"price": 2000,
"material": [ "paper" ],
@@ -98,7 +98,7 @@
"name": "Sushi Made Easy",
"name_plural": "copies of Sushi Made Easy",
"description": "A simple text for the aspiring sushi lover, this easy to read guide is filled with lots of helpful illustrations for everything from basic rice preparation to setting a proper Japanese table.",
- "weight": 921,
+ "weight": "921 g",
"volume": "750 ml",
"price": 3500,
"bashing": 1,
@@ -116,7 +116,7 @@
"type": "BOOK",
"name": "family cookbook",
"description": "A big binder full of somebody's family recipes. The well-turned pages and creased corners speak volumes of the culinary knowledge contained within. You could probably learn a lot about cooking from studying this domestic artifact.",
- "weight": 1887,
+ "weight": "1887 g",
"volume": "1250 ml",
"price": 1950,
"bashing": 5,
@@ -136,7 +136,7 @@
"name": "Bon Appetit",
"name_plural": "Bon Appetit",
"description": "Exciting recipes and restaurant reviews. Full of handy tips about cooking.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -153,7 +153,7 @@
"type": "BOOK",
"name": "Glamopolitan",
"description": "This is a full-size glossy women's magazine. There are a few unoriginal recipes and some simple cooking tips somewhere in between the fashion photos and the sex advice columns.",
- "weight": 160,
+ "weight": "160 g",
"volume": "500 ml",
"price": 450,
"material": [ "paper" ],
@@ -171,7 +171,7 @@
"name": "The Modern Tanner",
"name_plural": "copies of The Modern Tanner",
"description": "A in-depth and easy to read guide that details a very modern take on the ancient art of leather tanning.",
- "weight": 568,
+ "weight": "568 g",
"volume": "750 ml",
"price": 2000,
"material": [ "paper", "leather" ],
@@ -189,7 +189,7 @@
"name": "PE050 \"Alpha\": Preliminary Report",
"name_plural": "PE050 \"Alpha\": Preliminary Report",
"description": "This sheaf of papers-dated two weeks before all this started-describes some new chemical formula, and its effects on human subjects. It's stamped \"APPROVED\"...",
- "weight": 50,
+ "weight": "50 g",
"volume": "500 ml",
"price": 125000,
"material": [ "paper" ],
@@ -208,7 +208,7 @@
"name": "lab journal-Dionne",
"name_plural": "lab journals-Dionne",
"description": "This team logbook details several varieties of mutagenic experiments, focusing on those derived from various Earth fauna. The team seems quite enthusiastic--if not eager--about their results.",
- "weight": 1700,
+ "weight": "1700 g",
"volume": "500 ml",
"price": 50000,
"material": [ "paper" ],
@@ -227,7 +227,7 @@
"name": "PE065 \"Chimera\": Best Practices",
"name_plural": "PE065 \"Chimera\": Best Practices",
"description": "This sheaf of papers describes a new chemical formula in detail and supplies instructions for its use as some sort of ... crowd-control catalyst? That can't be right...",
- "weight": 50,
+ "weight": "50 g",
"volume": "500 ml",
"price": 125000,
"material": [ "paper" ],
@@ -246,7 +246,7 @@
"name": "lab journal-Smythe",
"name_plural": "lab journals-Smythe",
"description": "This team logbook details several varieties of mutagenic experiments, focusing on those derived from flesh contaminated with XE037. The results look promising but the procurement methods seem awfully vague...",
- "weight": 1700,
+ "weight": "1700 g",
"volume": "500 ml",
"price": 50000,
"material": [ "paper" ],
@@ -264,7 +264,7 @@
"type": "BOOK",
"name": "standpipe maintenance log",
"description": "This binder details the scheduled maintenance for several plumbing systems throughout the facility. However, some of the log sheets seem to be filled with...a chemical formula?",
- "weight": 400,
+ "weight": "400 g",
"volume": "750 ml",
"price": 400,
"material": [ "paper", "plastic" ],
@@ -283,7 +283,7 @@
"name": "chemical reference-CLASSIFIED",
"name_plural": "chemical references-CLASSIFIED",
"description": "This somewhat technical binder has several intimidating security warnings on the cover, yet guarantees unauthorized readers \"permanent employment, for life\". It contains useful information on \"basic\" chemical projects like methamphetamine and heroin, along with briefing on things called \"XE037\" and \"PE012\".",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "500 ml",
"price": 64000,
"material": [ "paper" ],
@@ -302,7 +302,7 @@
"name": "lab journal-x-|xp",
"name_plural": "lab journals-x-|xp",
"description": "This damaged team logbook lacks (deliberately?) any identifying information, but still contains useful information on several types of mutagen and their development.",
- "weight": 1700,
+ "weight": "1700 g",
"volume": "500 ml",
"price": 50000,
"material": [ "paper" ],
@@ -321,7 +321,7 @@
"name": "PE023 \"Medical\": Application and Findings",
"name_plural": "PE023 \"Medical\": Application and Findings",
"description": "This binder of highly technical papers describes some new chemical formula, and its effects on human subjects. It's stamped \"APPROVED\"....",
- "weight": 1934,
+ "weight": "1934 g",
"volume": "1750 ml",
"price": 62000,
"bashing": 5,
@@ -341,7 +341,7 @@
"name": "PE070 \"Raptor\": Proposal",
"name_plural": "PE070 \"Raptor\": Proposal",
"description": "This sheaf of papers is a highly speculative proposal for focusing \"PE065\". Scribbled notes throughout seem to think that it might work, but that there's no time.",
- "weight": 50,
+ "weight": "50 g",
"volume": "500 ml",
"price": 125000,
"material": [ "paper" ],
@@ -360,7 +360,7 @@
"name": "Best Practices for Compound Delivery",
"name_plural": "Best Practices for Compound Delivery",
"description": "This internal manual details several varieties of mutagenic experiments, as well as describing the protocols used to concentrate mutagens for quicker results. The authors recommend that researchers ensure that their subjects are well-fed and in good health, as the concentrated serums draw heavily on subjects' bodies.",
- "weight": 1700,
+ "weight": "1700 g",
"volume": "500 ml",
"price": 50000,
"material": [ "paper" ],
@@ -373,6 +373,24 @@
"time": "45 m",
"fun": -4
},
+ {
+ "id": "reference_cooking",
+ "type": "BOOK",
+ "name": "CRC-Merck handbook, 4th edition",
+ "name_plural": "copies of the CRC-Merck handbook, 4th edition",
+ "description": "This huge hardbound book is a collection of reference data and formulae pertinent to many technical disciplines. If poring over tables of chemical and physical data is your thing, this is the book for you.",
+ "weight": 5790,
+ "volume": "1750 ml",
+ "price": 9000,
+ "price_postapoc": 30000,
+ "bashing": 7,
+ "material": [ "paper" ],
+ "symbol": "?",
+ "color": "light_green",
+ "intelligence": 4,
+ "time": "30 m",
+ "fun": -2
+ },
{
"id": "scots_cookbook",
"type": "BOOK",
@@ -380,7 +398,7 @@
"name_plural": "copies of Ye Scots Beuk o Cuikery",
"//": "That would translate out to The Scottish Book of Cookery, or The Scottish Cookbook.",
"description": "A semi-translated cookbook from thirteenth century Scotland. While a bit difficult to read, as there are a disquieting number of illustrations of people stabbing each other mixed amongst the recipes, it provides insights into medieval Scottish culture and fashion as well as new uses for oatmeal, fish, and sheep liver.",
- "weight": 1887,
+ "weight": "1887 g",
"volume": "1250 ml",
"price": 1950,
"bashing": 5,
@@ -399,7 +417,7 @@
"type": "BOOK",
"name": "chemistry textbook",
"description": "A college textbook on chemistry.",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "2 L",
"price": 7950,
"bashing": 5,
diff --git a/data/json/items/book/cutting.json b/data/json/items/book/cutting.json
index 38537c95658f7..1886d5dd5d5ac 100644
--- a/data/json/items/book/cutting.json
+++ b/data/json/items/book/cutting.json
@@ -5,7 +5,7 @@
"name": "All About Swords",
"name_plural": "All About Swords",
"description": "An interesting magazine that contains information about swords and sword fighting techniques from all across the world.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -23,7 +23,7 @@
"name": "knife fighter's notes",
"name_plural": "knife fighter's notes",
"description": "It seems to be a guide to edged weapon combat, poorly photocopied and released on spiral- bound paper. Still, there are lots of useful tips for beginners.",
- "weight": 454,
+ "weight": "454 g",
"volume": "250 ml",
"price": 2000,
"material": [ "paper" ],
@@ -40,7 +40,7 @@
"name": "Spetsnaz Knife Techniques",
"name_plural": "Spetsnaz Knife Techniques",
"description": "A classic Soviet text on the art of attacking with a blade.",
- "weight": 454,
+ "weight": "454 g",
"volume": "250 ml",
"price": 5200,
"material": [ "paper" ],
diff --git a/data/json/items/book/dodge.json b/data/json/items/book/dodge.json
index 47e624e6e16bf..df7fd4b16f66c 100644
--- a/data/json/items/book/dodge.json
+++ b/data/json/items/book/dodge.json
@@ -5,7 +5,7 @@
"name": "Dance Dance Dance!",
"name_plural": "Dance Dance Dance!",
"description": "Learn the moves of the trendiest dances right now.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 490,
"material": [ "paper" ],
@@ -23,7 +23,7 @@
"name": "The Book of Dances",
"name_plural": "Books of Dances",
"description": "This massive antique book documents dances from all around the world in great detail. A perceptive reader could learn a lot about defensive footwork from some of the war dances.",
- "weight": 2330,
+ "weight": "2330 g",
"volume": "1250 ml",
"price": 7200,
"material": [ "paper" ],
@@ -40,7 +40,7 @@
"name": "Break a Leg!",
"name_plural": "Break a Leg!",
"description": "The Kids' Guide to Acting and Stagecraft.",
- "weight": 72,
+ "weight": "72 g",
"volume": "250 ml",
"price": 500,
"material": [ "paper" ],
diff --git a/data/json/items/book/driving.json b/data/json/items/book/driving.json
index 2096fde3fb37e..6aeaa239a2389 100644
--- a/data/json/items/book/driving.json
+++ b/data/json/items/book/driving.json
@@ -5,7 +5,7 @@
"name": "AAA Guide",
"name_plural": "AAA Guide",
"description": "A tourist-centric guide to points of interest throughout the country. Though it focuses on the north-central US, the driving sections contain some practical tips on proper driving techniques.",
- "weight": 220,
+ "weight": "220 g",
"volume": "500 ml",
"price": 2000,
"material": [ "paper" ],
@@ -22,7 +22,7 @@
"type": "BOOK",
"name": "Top Gear magazine",
"description": "Lots of articles about cars and driving techniques.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -40,7 +40,7 @@
"name": "The Rules of the Road",
"name_plural": "The Rules of the Road",
"description": "A thick textbook for beginning drivers. It contains chapters on laws, safe vehicle operation, and defensive driving concepts.",
- "weight": 404,
+ "weight": "404 g",
"volume": "500 ml",
"price": 2200,
"material": [ "paper" ],
@@ -57,7 +57,7 @@
"name": "AAA Guide",
"name_plural": "AAA Guide",
"description": "A tourist-centric guide to points of interest throughout the country. This particular copy is apparently the Anonymous Anarchist's Annual: the cover conceals a wealth of ways to help stick it to The Man, along with plenty of advice for avoiding police.",
- "weight": 223,
+ "weight": "223 g",
"volume": "500 ml",
"price": 5000,
"material": [ "paper" ],
diff --git a/data/json/items/book/electronics.json b/data/json/items/book/electronics.json
index e0d56e2c77565..f636bdcac8a0c 100644
--- a/data/json/items/book/electronics.json
+++ b/data/json/items/book/electronics.json
@@ -5,7 +5,7 @@
"name": "Advanced Electronics",
"name_plural": "Advanced Electronics",
"description": "A college textbook on circuit design.",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "1750 ml",
"price": 8200,
"bashing": 5,
@@ -25,7 +25,7 @@
"name": "Ham Radio Illustrated",
"name_plural": "Ham Radio Illustrated",
"description": "An amusing magazine about ham radio, with lots of diagrams and illustrations for making your own electronic devices.",
- "weight": 45,
+ "weight": "45 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -43,7 +43,7 @@
"name": "What's a Transistor?",
"name_plural": "What's a Transistor?",
"description": "A basic manual of electronics and circuit design.",
- "weight": 454,
+ "weight": "454 g",
"volume": "750 ml",
"price": 2200,
"material": [ "paper" ],
@@ -60,7 +60,7 @@
"name": "Amateur Home Radio for Enthusiasts",
"name_plural": "Amateur Home Radio for Enthusiasts",
"description": "A book about ham radio and citizen's band radio. It contains numerous diagrams and illustrations explaining the science behind the electronics.",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "1750 ml",
"price": 3300,
"bashing": 5,
@@ -79,7 +79,7 @@
"type": "BOOK",
"name": "computer printout",
"description": "One side of this sheet is printed with a meaningless jumble of characters, but the other side shows a complicated, hand-drawn circuit diagram.",
- "weight": 10,
+ "weight": "10 g",
"volume": 0,
"price": 40000,
"material": [ "paper" ],
@@ -98,7 +98,7 @@
"name": "Augmentative Tech Review",
"name_plural": "Augmentative Tech Review",
"description": "This annual publication covers the various ways in which people use technology to improve their bodies. There are a few in-depth and thoroughly illustrated articles on bionic systems, though they tend to use too much jargon.",
- "weight": 1909,
+ "weight": "1909 g",
"volume": "500 ml",
"price": 3000,
"material": [ "paper" ],
@@ -117,7 +117,7 @@
"name": "lab journal-Herrera",
"name_plural": "lab journals-Herrera",
"description": "This hefty binder contains a multitude of diagrams and technical specifications for various electronic materials. Some of the diagrams use symbols you've not seen before...",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "500 ml",
"price": 56000,
"material": [ "paper" ],
@@ -136,7 +136,7 @@
"name": "2XI design binder-CLASSIFIED",
"name_plural": "2XI design binders-CLASSIFIED",
"description": "This Doubletech Industries binder has several intimidating security warnings on the cover. Probably because it contains complete design specs, technical drawings, and test results for their military-grade bionic implants.",
- "weight": 1409,
+ "weight": "1409 g",
"volume": "500 ml",
"price": 74000,
"material": [ "paper" ],
@@ -155,7 +155,7 @@
"name": "plans for a radio repeater mod",
"name_plural": "plans for a radio repeater mod",
"description": "Instructions on how to create a mod for a radio station terminal which converts the entire system into a repeater.",
- "weight": 5,
+ "weight": "5 g",
"volume": "250 ml",
"price": 5000,
"bashing": 1,
@@ -174,7 +174,7 @@
"name": "Electronic Circuit Theory",
"name_plural": "Electronic Circuit Theory",
"description": "An advanced college textbook on circuit theory, design, and organization.",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "1750 ml",
"price": 9300,
"bashing": 5,
@@ -194,7 +194,7 @@
"name": "Robots for Fun & Profit",
"name_plural": "Robots for Fun & Profit",
"description": "A rare book on the design of robots, with lots of helpful step-by-step guides.",
- "weight": 2063,
+ "weight": "2063 g",
"volume": "2 L",
"price": 9200,
"bashing": 8,
@@ -213,7 +213,7 @@
"type": "BOOK",
"name": "schematics generic",
"description": "seeing this is a bug",
- "weight": 30,
+ "weight": "30 g",
"volume": "250 ml",
"price": 100000,
"to_hit": -1,
diff --git a/data/json/items/book/fabrication.json b/data/json/items/book/fabrication.json
index 8a4592c2ba713..543975aad07c6 100644
--- a/data/json/items/book/fabrication.json
+++ b/data/json/items/book/fabrication.json
@@ -5,7 +5,7 @@
"name": "The Art of Glassblowing",
"name_plural": "The Art of Glassblowing",
"description": "A textbook that illustrates the science and technique of the ancient art of glassblowing.",
- "weight": 1620,
+ "weight": "1620 g",
"volume": "1250 ml",
"price": 4500,
"bashing": 4,
@@ -24,7 +24,7 @@
"name": "Antique Adornments",
"name_plural": "Antique Adornments",
"description": "A comprehensive and illustrated history of crown, bracelet, necklace and others.",
- "weight": 600,
+ "weight": "600 g",
"volume": "1250 ml",
"price": 2000,
"material": [ "paper" ],
@@ -42,7 +42,7 @@
"name": "Crafty Crafter's Quarterly",
"name_plural": "Crafty Crafter's Quarterly",
"description": "A fun quarterly magazine all about macaroni art and things you can make by supergluing found objects together.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -60,7 +60,7 @@
"name": "101 Crafts for Beginners",
"name_plural": "101 Crafts for Beginners",
"description": "A large, paperback book detailing a hundred and one beginner's projects in fabrication.",
- "weight": 510,
+ "weight": "510 g",
"volume": "750 ml",
"price": 2200,
"material": [ "paper" ],
@@ -78,7 +78,7 @@
"name": "The Fletcher's Friend",
"name_plural": "The Fletcher's Friend",
"description": "This hefty book is devoted to folks looking to handcraft their own arrows. It starts with a hip and snappy disclaimer about the risks, both physical and legal, of using explosives and flammable materials. Look for its companion, \"The Bowyer's Buddy\"!",
- "weight": 1454,
+ "weight": "1454 g",
"volume": "1250 ml",
"price": 4800,
"material": [ "paper" ],
@@ -96,7 +96,7 @@
"name": "The Bowyer's Buddy",
"name_plural": "The Bowyer's Buddy",
"description": "This hefty book is dedicated to craftsfolk and outdoors-y types looking to make their own bows. It recommends its companion volume \"The Fletcher's Friend\" for instructions on producing their ammunition.",
- "weight": 1454,
+ "weight": "1454 g",
"volume": "1250 ml",
"price": 4800,
"material": [ "paper" ],
@@ -114,7 +114,7 @@
"name": "The Handloader's Helper",
"name_plural": "The Handloader's Helper",
"description": "Everything you could ever want to know about handloading ammunition, sealed with a ...childproof cover. Apparently a liability thing, because the chapter on explosive rounds covers them in excellent detail too.",
- "weight": 1454,
+ "weight": "1454 g",
"volume": "1500 ml",
"price": 12000,
"material": [ "paper" ],
@@ -131,7 +131,7 @@
"type": "BOOK",
"name": "Rivtech design binder",
"description": "This Rivtech binder warns that \"Unauthorized readers are our best test subjects.\" With good reason: it contains complete design specs and technical drawings for their entire line of products.",
- "weight": 1409,
+ "weight": "1409 g",
"volume": "500 ml",
"price": 84000,
"material": [ "paper" ],
@@ -150,7 +150,7 @@
"name": "lab journal-Gustav",
"name_plural": "lab journals-Gustav",
"description": "This paper notebook is mostly full of boring logs, experimental observations and notes. Mixed in, however, are musings on how to use the lab's vapor deposition machine to deposit amorphous carbon in a diamond-like form onto common metals. The author's intended goal was a better non-stick frying pan, but you can think of a couple of better uses for it.",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "500 ml",
"price": 50000,
"material": [ "paper" ],
@@ -168,7 +168,7 @@
"type": "BOOK",
"name": "The Streetfighter's Sidekick",
"description": "A sizable how-to guide for making hand-to-hand combat weapons. Though the processes are thoroughly detailed and several illustrations are provided, they rely heavily on technical jargon. More for machinists-turned-weaponsmiths than streetfighters, really.",
- "weight": 954,
+ "weight": "954 g",
"volume": "1500 ml",
"price": 8300,
"material": [ "paper" ],
@@ -186,7 +186,7 @@
"name": "238-NK: Practicality Enhancement",
"name_plural": "238-NK: Practicality Enhancement",
"description": "The authors of this thoroughly researched and documented proposal make a very persuasive case for the adoption of spring-driven nuclear shells. It's stamped \"DENIED\".",
- "weight": 854,
+ "weight": "854 g",
"volume": "1500 ml",
"price": 30000,
"material": [ "paper" ],
@@ -204,7 +204,7 @@
"name": "The Art of Japanese Armormaking",
"name_plural": "The Art of Japanese Armormaking",
"description": "This in-depth and technical text details various forms of ancient Japanese armor crafting, and is well illustrated with lots of photos.",
- "weight": 654,
+ "weight": "654 g",
"volume": "1250 ml",
"price": 6400,
"material": [ "paper" ],
@@ -223,7 +223,7 @@
"name": "Arms and Armor of Imperial China",
"name_plural": "Arms and Armor of Imperial China",
"description": "This textbook details the military history of ancient China, with a particular focus on the nature of historical arms and armor. It also details some of the equipment used by other cultures that came into conflict with the empire over various dynasties.",
- "weight": 654,
+ "weight": "654 g",
"volume": "1250 ml",
"price": 6400,
"material": "paper",
@@ -242,7 +242,7 @@
"name": "Studies in Historic Armorsmithing",
"name_plural": "Studies in Historic Armorsmithing",
"description": "This in-depth and technical text details various forms of ancient European armor crafting, and is well illustrated with lots of photos.",
- "weight": 654,
+ "weight": "654 g",
"volume": "1250 ml",
"price": 6400,
"material": [ "paper" ],
@@ -260,7 +260,7 @@
"type": "BOOK",
"name": "DIY Compendium",
"description": "A thick, hardbound book detailing countless projects for inventions that claim to improve all aspects of life.",
- "weight": 2100,
+ "weight": "2100 g",
"volume": "1750 ml",
"price": 4500,
"bashing": 4,
@@ -279,7 +279,7 @@
"name": "A History of Firefighting",
"name_plural": "A History of Firefighting",
"description": "This in-depth and technical text details the history of firefighting from ancient times into the modern era, with a focus on the technology used to save lives.",
- "weight": 528,
+ "weight": "528 g",
"volume": "1 L",
"price": 6500,
"material": [ "paper" ],
@@ -297,7 +297,7 @@
"name": "Art and Science of Chemical Warfare",
"name_plural": "Art and Science of Chemical Warfare",
"description": "This in-depth and technical text covers the design, development, dissemination of, and defenses against various chemical weapons throughout the centuries. The photographs the author chose make it a difficult read at times, though the information is top-notch.",
- "weight": 854,
+ "weight": "854 g",
"volume": "1500 ml",
"price": 400,
"material": [ "paper" ],
@@ -316,7 +316,7 @@
"name": "The Swords of the Samurai",
"name_plural": "The Swords of the Samurai",
"description": "This in-depth and technical text details various forms of ancient Japanese sword smithing, and is well illustrated with step by step photo instructions.",
- "weight": 654,
+ "weight": "654 g",
"volume": "1250 ml",
"price": 6400,
"material": [ "paper" ],
@@ -335,7 +335,7 @@
"name": "The Historic Weaponsmith",
"name_plural": "The Historic Weaponsmith",
"description": "This in-depth and technical text details various forms of ancient European weapon smithing, and is well illustrated with step by step photo instructions.",
- "weight": 654,
+ "weight": "654 g",
"volume": "1250 ml",
"price": 6400,
"material": [ "paper" ],
@@ -354,7 +354,7 @@
"name": "Welding and Metallurgy",
"name_plural": "Welding and Metallurgy",
"description": "A rather technical textbook that illustrates the science and technique of becoming a better welder.",
- "weight": 2100,
+ "weight": "2100 g",
"volume": "1750 ml",
"price": 6500,
"bashing": 4,
@@ -373,7 +373,7 @@
"name": "101 Home Repairs",
"name_plural": "101 Home Repairs",
"description": "A paperback book detailing 101 home repair projects the novice carpenter.",
- "weight": 454,
+ "weight": "454 g",
"volume": "500 ml",
"price": 1800,
"material": [ "paper" ],
@@ -390,7 +390,7 @@
"name": "The Complete Home Repair Guide",
"name_plural": "Complete Home Repair Guides",
"description": "A massive book that details virtually every aspect of remodeling and repairing a home, with concise terminology aimed at experienced carpenters.",
- "weight": 2490,
+ "weight": "2490 g",
"volume": "2 L",
"price": 8200,
"bashing": 8,
@@ -410,7 +410,7 @@
"name": "Birdhouse Monthly",
"name_plural": "Birdhouse Monthlies",
"description": "A riveting periodical all about birdhouses and their construction.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -428,7 +428,7 @@
"name": "Building for Beginners",
"name_plural": "Building for Beginners",
"description": "A large, paperback book detailing several beginner's projects in construction.",
- "weight": 454,
+ "weight": "454 g",
"volume": "500 ml",
"price": 2200,
"material": [ "paper" ],
@@ -445,7 +445,7 @@
"name": "Engineering 301",
"name_plural": "Engineering 301",
"description": "A textbook on civil engineering and construction.",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "1500 ml",
"price": 6500,
"bashing": 4,
@@ -458,5 +458,23 @@
"intelligence": 8,
"time": "30 m",
"fun": -1
+ },
+ {
+ "id": "reference_fabrication1",
+ "type": "BOOK",
+ "name": "Machinery's Handbook",
+ "name_plural": "copies of Machinery's Handbook",
+ "description": "This classic reference work contains extensive, dense chapters and tables on materials, metrology, toolmaking, gears, threading and more. This recent edition includes extensive data on what was the latest techniques in additive manufacturing. If you need to know how best complete a certain machining operation, the answer lies somewhere in these pages.",
+ "weight": 454,
+ "volume": "500 ml",
+ "price": 8000,
+ "price_postapoc": 50000,
+ "bashing": 7,
+ "material": [ "paper" ],
+ "symbol": "?",
+ "color": "blue",
+ "intelligence": 4,
+ "time": "30 m",
+ "fun": -2
}
]
diff --git a/data/json/items/book/firstaid.json b/data/json/items/book/firstaid.json
index b640008d3946d..ee741ab12a29c 100644
--- a/data/json/items/book/firstaid.json
+++ b/data/json/items/book/firstaid.json
@@ -5,7 +5,7 @@
"name": "Guide to Advanced Emergency Care",
"name_plural": "Guides to Advanced Emergency Care",
"description": "A thick textbook for paramedics describing advanced lifesaving procedures and field-expedient care methods.",
- "weight": 2063,
+ "weight": "2063 g",
"volume": "2 L",
"price": 9200,
"bashing": 8,
@@ -25,7 +25,7 @@
"name": "Paramedics",
"name_plural": "Paramedics",
"description": "An educational magazine for EMTs.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 480,
"material": [ "paper" ],
@@ -43,7 +43,7 @@
"name": "The Big Book of First Aid",
"name_plural": "Big Books of First Aid",
"description": "It's big and heavy, but full of great information about first aid.",
- "weight": 454,
+ "weight": "454 g",
"volume": "1250 ml",
"price": 2500,
"material": [ "paper" ],
@@ -60,7 +60,7 @@
"name": "Pocket Guide to First Aid",
"name_plural": "Pocket Guides to First Aid",
"description": "This pocket-sized leather-bound guide to first aid combines a wealth of concise information with simple to follow instructions and easy to read illustrations.",
- "weight": 192,
+ "weight": "192 g",
"volume": "250 ml",
"price": 4000,
"material": [ "paper", "leather" ],
@@ -77,7 +77,7 @@
"name": "First Responder Handbook",
"//": "College-level textbooks are Cheap at $60. Med book is likely more expensive.",
"description": "A hardbound book detailing advanced first aid techniques and field-expedient medical care.",
- "weight": 1360,
+ "weight": "1360 g",
"volume": "2 L",
"price": 8500,
"bashing": 4,
@@ -96,7 +96,7 @@
"name": "First Aid Kit Instruction Booklet",
"name_plural": "First Aid Kit Instruction Booklets",
"description": "Illustrated how-to guide for your first aid kit.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 480,
"material": [ "paper" ],
@@ -106,5 +106,39 @@
"max_level": 1,
"time": "8 m",
"fun": 1
+ },
+ {
+ "id": "reference_firstaid1",
+ "type": "BOOK",
+ "name": "Physicians' Desk Reference",
+ "name_plural": "copies of the Physicians' Desk Reference",
+ "description": "This hefty volume contains all the legally mandated information relevant to physicians for writing prescriptions, generously supported by the efforts and contributions of major pharmaceutical companies. For the most part, it provides information identical to what is available on that of medication packaging inserts, and cannot match the completeness of digital pharmaceutical references like Medisoft. At least it doesn't need power to be used.",
+ "weight": 2268,
+ "volume": "500 ml",
+ "price": 10000,
+ "bashing": 7,
+ "material": [ "paper" ],
+ "symbol": "?",
+ "color": "blue",
+ "intelligence": 4,
+ "time": "30 m",
+ "fun": -2
+ },
+ {
+ "id": "reference_firstaid2",
+ "type": "BOOK",
+ "name": "Merck Veterinary Manual",
+ "name_plural": "copies of The Merck Veterinary Manual",
+ "description": "This expansive text covers 'all domestic species and diseases in veterinary medicine worldwide'. Should you need information regarding zoonotic diseases, off-label use of medication for animals, common dysfunctions and diseases of animals, or any other veterinary reference info, this is your book. There are some interesting new chapters on animal cloning in this edition.",
+ "weight": 5790,
+ "volume": "500 ml",
+ "price": 8000,
+ "price_postapoc": 50000,
+ "bashing": 7,
+ "material": [ "paper" ],
+ "symbol": "?",
+ "color": "blue",
+ "intelligence": 4,
+ "time": "30 m"
}
]
diff --git a/data/json/items/book/gun.json b/data/json/items/book/gun.json
index 6584477e4819e..aa6660196775e 100644
--- a/data/json/items/book/gun.json
+++ b/data/json/items/book/gun.json
@@ -5,7 +5,7 @@
"name": "Guns n Ammo",
"name_plural": "Guns n Ammo",
"description": "Reviews of firearms, and various useful tips about their use.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 480,
"material": [ "paper" ],
@@ -22,7 +22,7 @@
"type": "BOOK",
"name": "The Gun Owner's Handbook",
"description": "A thick soft-cover book that claims to be a complete guide to safely operating, maintaining, and repairing firearms.",
- "weight": 462,
+ "weight": "462 g",
"volume": "500 ml",
"price": 3800,
"material": [ "paper" ],
@@ -39,7 +39,7 @@
"name": "Pocket Guide to Firearm Safety",
"name_plural": "Pocket Guides to Firearm Safety",
"description": "This pocket-sized leather-bound guide to firearm safety combines a wealth of concise information with simple to follow instructions and easy to read illustrations.",
- "weight": 226,
+ "weight": "226 g",
"volume": "250 ml",
"price": 4000,
"material": [ "paper", "leather" ],
diff --git a/data/json/items/book/launcher.json b/data/json/items/book/launcher.json
index ed5d066110583..5d8e1bd4f3c96 100644
--- a/data/json/items/book/launcher.json
+++ b/data/json/items/book/launcher.json
@@ -5,7 +5,7 @@
"name": "High Explosives Quarterly",
"name_plural": "High Explosives Quarterlies",
"description": "An interesting quarterly report about rocket launchers and recoilless rifles. There are lots of large, exciting photos of explosions and weaponry.",
- "weight": 90,
+ "weight": "90 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -23,7 +23,7 @@
"name": "Jane's Mortars and Rocket Launchers",
"name_plural": "copies of Jane's Mortars and Rocket Launchers",
"description": "An incredibly detailed guide to modern rockets, mortars, grenade launchers, and recoilless weaponry. Lavishly illustrated with color photographs, it contains a wealth of information.",
- "weight": 734,
+ "weight": "734 g",
"volume": "250 ml",
"price": 2000,
"material": [ "paper" ],
diff --git a/data/json/items/book/maps.json b/data/json/items/book/maps.json
index 1ee656e24e0ad..537d453db0f6b 100644
--- a/data/json/items/book/maps.json
+++ b/data/json/items/book/maps.json
@@ -5,7 +5,7 @@
"category": "maps",
"name": "abstract map",
"description": "seeing this is a bug",
- "weight": 30,
+ "weight": "30 g",
"volume": "250 ml",
"price": 1000,
"to_hit": -1,
diff --git a/data/json/items/book/mechanics.json b/data/json/items/book/mechanics.json
index 38105b82be8f0..ff557bd85eb37 100644
--- a/data/json/items/book/mechanics.json
+++ b/data/json/items/book/mechanics.json
@@ -5,7 +5,7 @@
"name": "Internal Combustion Fundamentals",
"name_plural": "Internal Combustion Fundamentals",
"description": "A college-level textbook that details the operation, maintenance, and repair of internal combustion engines.",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "1500 ml",
"price": 5950,
"bashing": 4,
@@ -34,7 +34,7 @@
"name": "Popular Mechanics",
"name_plural": "Popular Mechanics",
"description": "A magazine about mechanical innovations. Full of entertaining articles and advertisements for esoteric gadgets.",
- "weight": 70,
+ "weight": "70 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -51,7 +51,7 @@
"type": "BOOK",
"name": "Under the Hood",
"description": "An advanced mechanics manual, covering all sorts of topics.",
- "weight": 454,
+ "weight": "454 g",
"volume": "750 ml",
"price": 5500,
"material": [ "paper" ],
@@ -62,13 +62,23 @@
"intelligence": 5,
"time": "18 m"
},
+ {
+ "id": "textbook_atomic_lab",
+ "type": "BOOK",
+ "copy-from": "recipe_lab_cvd",
+ "name": "lab journal-Curie",
+ "name_plural": "lab journals-Curie",
+ "description": "This lab notebook is filled with the collective discoveries and refinements of a research team dedicated to nuclear energy. You don't think you're ready to start a second Cataclysm, but the general information provided might be useful...",
+ "skill": "mechanics",
+ "required_level": 6
+ },
{
"id": "textbook_biodiesel",
"type": "BOOK",
"name": "Biodiesel: Renewable Fuel Resource",
"name_plural": "Biodiesel: Renewable Fuel Resource",
"description": "A large textbook for college students about biodiesel.",
- "weight": 1200,
+ "weight": "1200 g",
"volume": "2 L",
"price": 1500,
"bashing": 4,
@@ -87,7 +97,7 @@
"name": "Mechanical Mastery",
"name_plural": "Mechanical Mastery",
"description": "An advanced guide on mechanics and welding, covering topics like \"Grinding off rust\" and \"Making cursive E's\".",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "1500 ml",
"price": 4950,
"bashing": 4,
diff --git a/data/json/items/book/melee.json b/data/json/items/book/melee.json
index ccd730b817986..9fd1432a71569 100644
--- a/data/json/items/book/melee.json
+++ b/data/json/items/book/melee.json
@@ -5,7 +5,7 @@
"name": "CQB Monthly",
"name_plural": "CQB Monthlies",
"description": "An in-depth look at various styles of close quarters fighting. There's an amusing essay about dirty tricks in the front section.",
- "weight": 70,
+ "weight": "70 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -22,7 +22,7 @@
"type": "BOOK",
"name": "Close Quarter Fighting Manual",
"description": "A well-thumbed hardbound book which illustrates simple strategies and techniques for close quarters combat encounters.",
- "weight": 564,
+ "weight": "564 g",
"volume": "250 ml",
"price": 2000,
"material": [ "paper" ],
diff --git a/data/json/items/book/misc.json b/data/json/items/book/misc.json
index 33a14f15d32bb..c009756235937 100644
--- a/data/json/items/book/misc.json
+++ b/data/json/items/book/misc.json
@@ -4,7 +4,7 @@
"type": "BOOK",
"name": "Zombie Survival Guide",
"description": "While this seems like it would be very useful in this situation, the sheer amount of misinformation present makes it practically useless.",
- "weight": 227,
+ "weight": "227 g",
"volume": "1 L",
"price": 1290,
"material": [ "paper" ],
@@ -21,7 +21,7 @@
"name": "black box transcript",
"//": "ooh, military records, probably Classified!",
"description": "A full flight log for a military aircraft. Nothing of interest stands out.",
- "weight": 566,
+ "weight": "566 g",
"volume": "1250 ml",
"price": 5000,
"bashing": 5,
@@ -37,7 +37,7 @@
"type": "BOOK",
"name": "children's book",
"description": "A little book for little readers. The colorful cartoon characters and sweet stories contained herein belong to a different time, before the dead walked and the world moved on.",
- "weight": 52,
+ "weight": "52 g",
"volume": "250 ml",
"price": 550,
"material": [ "paper" ],
@@ -53,7 +53,7 @@
"name": "Ranch Prospectus",
"name_plural": "Ranch Prospectus",
"description": "A short paper of the economic viability of constructing an agricultural outpost.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 3000,
"bashing": 1,
@@ -68,7 +68,7 @@
"type": "BOOK",
"name": "standpipe maintenance log",
"description": "This binder details the scheduled maintenance for several plumbing systems throughout the facility.",
- "weight": 400,
+ "weight": "400 g",
"volume": "750 ml",
"price": 400,
"material": [ "paper", "plastic" ],
@@ -84,7 +84,7 @@
"name": "book of essays",
"name_plural": "books of essays",
"description": "A collection of essays by various authors from around the world, including works by Churchill, Mailer, Eco, and Voltaire.",
- "weight": 700,
+ "weight": "700 g",
"volume": "750 ml",
"price": 1250,
"material": [ "paper" ],
@@ -101,7 +101,7 @@
"name": "book of fairy tales",
"name_plural": "books of fairy tales",
"description": "An amusing collection of folklore featuring the usual cast of fairies, goblins, and trolls.",
- "weight": 410,
+ "weight": "410 g",
"volume": "750 ml",
"price": 950,
"material": [ "paper" ],
@@ -118,7 +118,7 @@
"name": "The Hitchhiker's Guide to the Cataclysm",
"name_plural": "Hitchhiker's Guides to the Cataclysm",
"description": "Inscribed on the cover in large, friendly letters, is the message \"Don't Panic\".",
- "weight": 1764,
+ "weight": "1764 g",
"volume": "1 L",
"price": 88200,
"bashing": 2,
@@ -133,7 +133,7 @@
"type": "BOOK",
"name": "Mycenacean Hymns",
"description": "A vellum book containing the hymns central to Marloss faith. As the verses lead to each other, the text sings of unity and promised paradise.",
- "weight": 368,
+ "weight": "368 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -149,7 +149,7 @@
"type": "BOOK",
"name": "King James Bible",
"description": "An English translation of the Christian Bible, which originated in England in the early 1600s.",
- "weight": 368,
+ "weight": "368 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -165,7 +165,7 @@
"type": "BOOK",
"name": "Eastern Orthodox Bible",
"description": "An English copy of the Eastern Orthodox translation of The Holy Bible.",
- "weight": 428,
+ "weight": "428 g",
"volume": "1250 ml",
"price": 550,
"material": [ "paper" ],
@@ -181,7 +181,7 @@
"type": "BOOK",
"name": "Gideon Bible",
"description": "An English translation of the Christian Bible, distributed free of charge by Gideons International.",
- "weight": 368,
+ "weight": "368 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -198,7 +198,7 @@
"name": "The Guru Granth Sahib",
"name_plural": "copies of The Guru Granth Sahib",
"description": "A single-volume copy of the central religious texts of Sikhism.",
- "weight": 590,
+ "weight": "590 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -214,7 +214,7 @@
"type": "BOOK",
"name": "Hadith",
"description": "A Muslim religious text containing an account of the sayings and actions of the prophet Muhammad.",
- "weight": 398,
+ "weight": "398 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -231,7 +231,7 @@
"name": "Principia Discordia",
"name_plural": "copies of Principia Discordia",
"description": "A book that embodies the main beliefs of Discordianism. It seems to primarily concern chaos, and features a card in the back which informs you that you are now a 'genuine and authorized Pope of Discordia'.",
- "weight": 292,
+ "weight": "292 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -248,7 +248,7 @@
"name": "The Kojiki",
"name_plural": "copies of The Kojiki",
"description": "The oldest extant chronicle of Japan's myths and history, the stories contained in the Kojiki are part of the inspiration behind Shinto practices.",
- "weight": 368,
+ "weight": "368 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -265,7 +265,7 @@
"name": "The Book of Mormon",
"name_plural": "copies of The Book of Mormon",
"description": "The sacred text of the Latter Day Saint movement of Christianity, originally published in 1830 by Joseph Smith.",
- "weight": 368,
+ "weight": "368 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -282,7 +282,7 @@
"name": "The Gospel of the Flying Spaghetti Monster",
"name_plural": "copies of The Gospel of the Flying Spaghetti Monster",
"description": "A book that embodies the main beliefs of the Church of the Flying Spaghetti Monster. It seems to involve a lot of pirates and some sort of invisible drunken monster made of pasta.",
- "weight": 292,
+ "weight": "292 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -298,7 +298,7 @@
"type": "BOOK",
"name": "Quran",
"description": "An English translation of the Muslim book of holy scriptures, with explanatory notes and commentaries to aid in understanding.",
- "weight": 412,
+ "weight": "412 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -315,7 +315,7 @@
"name": "Dianetics",
"name_plural": "copies of Dianetics",
"description": "This book is the canonical text of Scientology. Written by a science fiction author, it contains self-improvement techniques and musings on psychology called Dianetics.",
- "weight": 486,
+ "weight": "486 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -332,7 +332,7 @@
"name": "The Book of the SubGenius",
"name_plural": "copies of The Book of the SubGenius",
"description": "A book about the Church of the SubGenius. It seems to involve a salesman named J. R. \"Bob\" Dobbs and a concept called 'slack'.",
- "weight": 292,
+ "weight": "292 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -349,7 +349,7 @@
"name": "The Sutras of the Buddha",
"name_plural": "copies of The Sutras of the Buddha",
"description": "A collection of discourses attributed to the Buddha and his close disciples.",
- "weight": 496,
+ "weight": "496 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -365,7 +365,7 @@
"type": "BOOK",
"name": "Talmud",
"description": "One of the central texts of Rabbinic Judaism, the Talmud expounds upon the Hebrew Bible with teachings and opinions of thousands of rabbis.",
- "weight": 460,
+ "weight": "460 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -381,7 +381,7 @@
"type": "BOOK",
"name": "Tanakh",
"description": "A single-volume book containing the complete canon of the Jewish Bible.",
- "weight": 512,
+ "weight": "512 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -398,7 +398,7 @@
"name": "The Tripitaka",
"name_plural": "copies of the Tripitaka",
"description": "A collection of sacred Buddhist writings describing their canons of scriptures.",
- "weight": 513,
+ "weight": "513 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -415,7 +415,7 @@
"name": "The Upanishads",
"name_plural": "copies of The Upanishads",
"description": "A collection of sacred Hindu writings regarding the nature of reality and describing the character and form of human salvation.",
- "weight": 482,
+ "weight": "482 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -432,7 +432,7 @@
"name": "The Four Vedas",
"name_plural": "copies of The Four Vedas",
"description": "A single volume containing all four Vedas, which are the oldest scriptures of Hinduism.",
- "weight": 540,
+ "weight": "540 g",
"volume": "1 L",
"price": 550,
"material": [ "paper" ],
@@ -448,7 +448,7 @@
"type": "BOOK",
"name": "comic book",
"description": "A super-hero comic.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 300,
"material": [ "paper" ],
@@ -462,7 +462,7 @@
"type": "BOOK",
"name": "Computer Gaming",
"description": "Reviews of recently released computer games and previews of upcoming titles.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 300,
"material": [ "paper" ],
@@ -477,7 +477,7 @@
"type": "BOOK",
"name": "TIME magazine",
"description": "Current events concerning a bunch of people who're all (un)dead now.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 400,
"material": [ "paper" ],
@@ -492,7 +492,7 @@
"type": "BOOK",
"name": "Playboy",
"description": "You can read it for the articles. Or not.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 400,
"material": [ "paper" ],
@@ -508,7 +508,7 @@
"name": "frequency list",
"name_plural": "frequency lists",
"description": "A notepad with a number of frequencies scribbled on it.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 3000,
"bashing": 1,
@@ -523,7 +523,7 @@
"type": "BOOK",
"name": "Rural Digest-Examiner",
"description": "A newsweekly covering regional events. There is an article on the winter's snowstorms and several letters to the editor concerning the community response.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 350,
"material": [ "paper" ],
@@ -538,7 +538,7 @@
"type": "BOOK",
"name": "adventure novel",
"description": "The stirring tale of a race against time, in search of a lost city located in the dark heart of the African continent.",
- "weight": 404,
+ "weight": "404 g",
"volume": "750 ml",
"price": 850,
"material": [ "paper" ],
@@ -554,7 +554,7 @@
"type": "BOOK",
"name": "buddy novel",
"description": "A gripping tale of two friends struggling to survive on the streets of New York City.",
- "weight": 244,
+ "weight": "244 g",
"volume": "500 ml",
"price": 650,
"material": [ "paper" ],
@@ -570,7 +570,7 @@
"type": "BOOK",
"name": "coming of age novel",
"description": "A classic tale about growing up, portraying one young man's funny and poignant experiences with life, love, and sex.",
- "weight": 187,
+ "weight": "187 g",
"volume": "500 ml",
"price": 750,
"material": [ "paper" ],
@@ -594,7 +594,7 @@
"type": "BOOK",
"name": "crime novel",
"description": "After their diamond heist goes wrong, the surviving criminals begin to suspect that one of them is a police informant.",
- "weight": 227,
+ "weight": "227 g",
"volume": "750 ml",
"price": 850,
"material": [ "paper" ],
@@ -618,7 +618,7 @@
"type": "BOOK",
"name": "drama novel",
"description": "A real book for real adults.",
- "weight": 227,
+ "weight": "227 g",
"volume": "1 L",
"price": 850,
"material": [ "paper" ],
@@ -634,7 +634,7 @@
"type": "BOOK",
"name": "erotic novel",
"description": "Hackneyed narrative concealing low-grade literary smut.",
- "weight": 200,
+ "weight": "200 g",
"volume": "500 ml",
"price": 750,
"material": [ "paper" ],
@@ -650,7 +650,7 @@
"type": "BOOK",
"name": "experimental novel",
"description": "A bizarre play about the philosophy of existential absurdity. Or maybe it's about two guys waiting for their friend to show up. It's confusing.",
- "weight": 142,
+ "weight": "142 g",
"volume": "500 ml",
"price": 750,
"material": [ "paper" ],
@@ -666,7 +666,7 @@
"type": "BOOK",
"name": "fantasy novel",
"description": "Basic sword & sorcery.",
- "weight": 227,
+ "weight": "227 g",
"volume": "1 L",
"price": 850,
"material": [ "paper" ],
@@ -682,7 +682,7 @@
"type": "BOOK",
"name": "horror novel",
"description": "Maybe not the best reading material considering the situation.",
- "weight": 227,
+ "weight": "227 g",
"volume": "1 L",
"price": 850,
"material": [ "paper" ],
@@ -698,7 +698,7 @@
"type": "BOOK",
"name": "mystery novel",
"description": "A detective investigates an unusual murder in a secluded location.",
- "weight": 227,
+ "weight": "227 g",
"volume": "1 L",
"price": 750,
"material": [ "paper" ],
@@ -714,7 +714,7 @@
"type": "BOOK",
"name": "pulp novel",
"description": "A hardboiled detective tale filled with hard hitting action and intrigue.",
- "weight": 300,
+ "weight": "300 g",
"volume": "750 ml",
"price": 650,
"material": [ "paper" ],
@@ -730,7 +730,7 @@
"type": "BOOK",
"name": "road novel",
"description": "A tale about a group of friends who wander the USA in the 1960s against a backdrop of jazz, poetry and drug use.",
- "weight": 244,
+ "weight": "244 g",
"volume": "500 ml",
"price": 750,
"material": [ "paper" ],
@@ -746,7 +746,7 @@
"type": "BOOK",
"name": "romance novel",
"description": "Drama and mild smut.",
- "weight": 227,
+ "weight": "227 g",
"volume": "1 L",
"price": 650,
"material": [ "paper" ],
@@ -762,7 +762,7 @@
"type": "BOOK",
"name": "samurai novel",
"description": "The classic tale of a wandering swordsman who comes to a small settlement and is hired to help the townsfolk defend themselves from a band of marauding outlaws.",
- "weight": 322,
+ "weight": "322 g",
"volume": "750 ml",
"price": 750,
"material": [ "paper" ],
@@ -778,7 +778,7 @@
"type": "BOOK",
"name": "satire novel",
"description": "A political satire of the pre-apocalypse world. Looking back on it from this side of Armageddon makes it seem all the more ridiculous.",
- "weight": 520,
+ "weight": "520 g",
"volume": "750 ml",
"price": 850,
"material": [ "paper" ],
@@ -794,7 +794,7 @@
"type": "BOOK",
"name": "scifi novel",
"description": "Aliens, ray guns, and space ships.",
- "weight": 227,
+ "weight": "227 g",
"volume": "750 ml",
"price": 850,
"material": [ "paper" ],
@@ -803,14 +803,158 @@
"intelligence": 6,
"time": "20 m",
"chapters": 24,
- "fun": 3
+ "fun": 3,
+ "snippet_category": [
+ {
+ "id": "scifi1_1",
+ "text": "This is a copy of Gibson's \"Neuromancer\". Written in the eighties, it was surprisingly accurate in predicting much of modern society... Until recently."
+ },
+ {
+ "id": "scifi1_2",
+ "text": "This is a copy of \"The Stars My Destination\" by Alfred Bester. \n\nTyger, Tyger, Burning bright, \nIn the forests of the night: \nWhat immortal hand or eye, \nDare frame thy fearful symmetry?"
+ },
+ {
+ "id": "scifi1_3",
+ "text": "This is a copy of \"The Lathe of Heaven\" by Ursula Le Guin. Dirty finger-stains have smudged the occasional word."
+ },
+ { "id": "scifi1_4", "text": "This is a copy of \"The Dispossessed\" by Ursula Le Guin." },
+ { "id": "scifi1_5", "text": "This copy of Ray Bradbury's \"Fahrenheit 451\"." },
+ {
+ "id": "scifi1_5",
+ "text": "This is a well-worn copy of \"The Hitchhikers Guide to the Galaxy\" by Douglas Adams."
+ },
+ { "id": "scifi1_6", "text": "This is a copy of \"Hyperion\" by Dan Simmons." },
+ {
+ "id": "scifi1_7",
+ "text": "This is a copy of \"Endymion\" by Dan Simmons. It opens with a poem by D.H. Lawrence:\n\nGive us gods. Oh give them us! \nGive us gods. \nWe are so tired of men \nAnd motor-power."
+ },
+ { "id": "scifi1_8", "text": "This is a copy of Philip K. Dick's \"Do Androids Dream of Electric Sheep?\"." },
+ { "id": "scifi1_9", "text": "This is a dog-eared copy of \"Nova Express\" by William Burroughs." },
+ {
+ "id": "scifi1_10",
+ "text": "This is a copy of \"Foundation\" by Isaac Asimov. The back cover has been ripped off."
+ },
+ {
+ "id": "scifi1_11",
+ "text": "This is a dog-eared copy of \"Dune\" by Frank Herbert. It has sand between some of its pages. Weird."
+ },
+ { "id": "scifi1_12", "text": "This is a copy of \"The Trial\" by Franz Kafka. This book is rather worn." },
+ { "id": "scifi1_13", "text": "This is a copy of \"The Handmaid's Tale\" by Margaret Atwood." },
+ {
+ "id": "scifi1_14",
+ "text": "This is a copy of \"The Windup Girl\" by Paolo Bacigalupi. The blurb makes you wonder how Thailand fared the end of the world."
+ },
+ { "id": "scifi1_15", "text": "This is a copy of \"Islands in the Net\" by Bruce Sterling." },
+ {
+ "id": "scifi1_16",
+ "text": "This is a copy of \"Foundation and Empire\" by Isaac Asimov. The back page contains a hand-written grocery list."
+ },
+ {
+ "id": "scifi1_17",
+ "text": "This is an almost new copy of \"A Scanner Darkly\" by Philip K. Dick. It still has the smell of new books within it's pages."
+ },
+ {
+ "id": "scifi1_18",
+ "text": "This is a copy of \"Mirrorshades: A Cyberpunk Anthology\" compiled by Bruce Sterling. The cover has rings of coffee stains over it."
+ },
+ {
+ "id": "scifi1_19",
+ "text": "This is a copy of \"The World of Null-A\" by A. E. van Vogt. This copy looks to have been used to press flowers."
+ },
+ { "id": "scifi1_20", "text": "This is a copy of \"Altered Carbon\" by Richard Morgan." },
+ {
+ "id": "scifi1_21",
+ "text": "This is a copy of Mary Shelly's \"Frankenstein\". Wasn't that the name of the monster?"
+ },
+ {
+ "id": "scifi1_22",
+ "text": "This is a copy of \"Wasp\" by Eric Frank Russel. The futuristic terrorists handbook."
+ },
+ {
+ "id": "scifi1_23",
+ "text": "This is a copy of \"I Am Legend\" by Richard Matheson. The sleeve is covered in dried blood."
+ },
+ { "id": "scifi1_24", "text": "This is a copy of \"Roadside Picnic\" by Arkady and Boris Strugatsky." },
+ {
+ "id": "scifi1_25",
+ "text": "This is a copy of \"The Forever War\" by Joe Haldeman. This copy looks as if it's been slightly chewed by a dog or other large animal."
+ },
+ { "id": "scifi1_26", "text": "This is a copy of \"The Moon Is a Harsh Mistress\" by Robert A. Heinlein." },
+ {
+ "id": "scifi1_27",
+ "text": "This is a copy of \"Cat's Cradle\" by Kurt Vonnegut. You notice there is a typo in the authors name on the spine of the book."
+ },
+ {
+ "id": "scifi1_28",
+ "text": "This is a copy of Samuel R. Delany's \"Nova\". The cover reads \"Review Copy. Not for re-sale.\""
+ },
+ { "id": "scifi1_29", "text": "This is a copy of Vonnegut's \"The Sirens of Titan\"." },
+ {
+ "id": "scifi1_30",
+ "text": "This is a copy of \"Grass\" by Sheri S. Tepper. A child has scribbled over the first pages in crayon."
+ },
+ {
+ "id": "scifi1_31",
+ "text": "This is a copy of William Gibson's \"Count Zero\". The spine is stamped with 'Library Copy'. And a sticker reading 'Science Fiction'."
+ },
+ {
+ "id": "scifi1_32",
+ "text": "This is a copy of \"The Fifth Season\" by N.K. Jemsin. It smells faintly of dirt."
+ },
+ { "id": "scifi1_33", "text": "This is a copy of \"The Weapon Makers\" by A. E. van Vogt." },
+ {
+ "id": "scifi1_34",
+ "text": "This is a copy of \"Record of a Spaceborn Few\" by Becky Chambers. It looks almost brand new."
+ },
+ {
+ "id": "scifi1_35",
+ "text": "This is a copy of \"Use of Weapons\" by Ian M. Banks. The spine is cracked and worn, some pages appear to be loose."
+ },
+ { "id": "scifi1_36", "text": "This is a copy of Jean-Baptiste Cousin de Grainville's \"Le Dernier Homme\"." },
+ {
+ "id": "scifi1_37",
+ "text": "This is a copy of Orwells \"Nineteen Eighty-Four\". The pages are loose and thin. You should probably be careful with this copy."
+ },
+ {
+ "id": "scifi1_38",
+ "text": "This is a copy of Heinlein's \"Stranger in a Strange Land\". The cover is dog-eared and worn."
+ },
+ { "id": "scifi1_39", "text": "This is a copy of Orson Scott Card's \"Ender's Game\"." },
+ { "id": "scifi1_40", "text": "This is a weather worn copy of \"Brave New World\" by Aldous Huxley." },
+ { "id": "scifi1_41", "text": "This is a copy of \"The Lost World\" by Arthur Conan Doyle." },
+ { "id": "scifi1_42", "text": "This is a copy of \"Islands in the Sky\" by Arthur C. Clarke." },
+ { "id": "scifi1_43", "text": "This is a copy of H. G. Wells' \"The Island of Doctor Moreau\"." },
+ { "id": "scifi1_44", "text": "This is a copy of Stanislaw Lem's \"His Masters Voice\"." },
+ { "id": "scifi_45", "text": "This is a copy of Fred Hoyle's \"The Black Cloud\"." },
+ { "id": "scifi_46", "text": "This is a copy of \"Last and First Men\" by Olaf Stapeldon." },
+ { "id": "scifi_47", "text": "This is a copy of Stanislaw Lem's \"Solaris\"." },
+ { "id": "scifi_48", "text": "This is a copy of Theodore Sturgeon's \"More Than Human\"." },
+ { "id": "scifi1_49", "text": "This is a copy of \"Vurt\" by Jeff Noon." },
+ { "id": "scifi1_50", "text": "This is a copy of \"A Canticle for Leibowitz\" by Walter M. Miller Jr." },
+ { "id": "scifi1_51", "text": "This is a copy of \"The War of The Worlds\" by H.G Wells." },
+ { "id": "scifi1_52", "text": "This is a copy of \"Iron Sunrise\" by Charles Stross." },
+ {
+ "id": "scifi1_53",
+ "text": "This is a copy of \"The Hunger Games\" by Suzanne Collins. Reading the blurb reminds you of a Japanese movie you think you once caught on the television late at night."
+ },
+ { "id": "scifi1_54", "text": "This is a copy of \"The Day of the Triffids\" by John Wyndham." },
+ { "id": "scifi1_55", "text": "This is a copy of \"A Clockwork Orange\" by Anthony Burges." },
+ { "id": "scifi1_56", "text": "This is a copy of \"The Man Who Fell to Earth\" by Walter Tevis." },
+ { "id": "scifi1_57", "text": "This is a copy of \"Simulacron-3\" by Daniel F. Galouye." },
+ { "id": "scifi1_58", "text": "This is a copy of \"The Glass Bees\" by Ernst Jünger." },
+ { "id": "scifi1_59", "text": "This is a copy of \"Journey to The Center of the Earth\" by Jules Verne." },
+ {
+ "id": "scifi1_60",
+ "text": "This is a copy of Larry Niven's \"Ringworld\". There are a couple of pages missing from the end of the book. Luckily only mail-order advertisements."
+ }
+ ]
},
{
"id": "novel_sports",
"type": "BOOK",
"name": "sports novel",
"description": "The dramatic tale of a small-time boxer who gets a rare chance to fight the heavy-weight champion, and seize his one chance to make a better life for himself while impressing the cute girl who works in the pet store.",
- "weight": 688,
+ "weight": "688 g",
"volume": "750 ml",
"price": 750,
"material": [ "paper" ],
@@ -826,7 +970,7 @@
"type": "BOOK",
"name": "spy novel",
"description": "A tale of intrigue and espionage amongst Nazis, no, Commies, no, Iraqis!",
- "weight": 227,
+ "weight": "227 g",
"volume": "1 L",
"price": 750,
"material": [ "paper" ],
@@ -842,7 +986,7 @@
"type": "BOOK",
"name": "swashbuckling novel",
"description": "An exciting seventeenth century tale of how an enslaved Irish doctor and his comrades-in-chains escape and become heroic pirates of the Robin Hood variety.",
- "weight": 582,
+ "weight": "582 g",
"volume": "750 ml",
"price": 750,
"material": [ "paper" ],
@@ -858,7 +1002,7 @@
"type": "BOOK",
"name": "thriller novel",
"description": "A suspenseful tale of betrayal and revenge.",
- "weight": 269,
+ "weight": "269 g",
"volume": "1 L",
"price": 650,
"material": [ "paper" ],
@@ -874,7 +1018,7 @@
"type": "BOOK",
"name": "tragedy novel",
"description": "The story of two young lovers whose feuding families threaten to keep them apart.",
- "weight": 263,
+ "weight": "263 g",
"volume": "1 L",
"price": 750,
"material": [ "paper" ],
@@ -890,7 +1034,7 @@
"type": "BOOK",
"name": "war novel",
"description": "A thrilling narrative of survival in a prisoner of war camp during the Second World War, filled with riveting subplots about rat farming and dysentery.",
- "weight": 686,
+ "weight": "686 g",
"volume": "750 ml",
"price": 750,
"material": [ "paper" ],
@@ -914,7 +1058,7 @@
"type": "BOOK",
"name": "western novel",
"description": "The classic tale of a gunfighting stranger who comes to a small settlement and is hired to help the townsfolk defend themselves from a band of marauding outlaws.",
- "weight": 322,
+ "weight": "322 g",
"volume": "750 ml",
"price": 750,
"material": [ "paper" ],
@@ -954,7 +1098,7 @@
},
{
"id": "philosophy6",
- "text": "A collection of texts and essays by Jacques Derrida. It's pages loose and yellowed, you should probably handle it with care."
+ "text": "A collection of texts and essays by Jacques Derrida. Its pages are loose and yellowed - you should probably handle it with care."
},
{
"id": "philosophy7",
@@ -1063,7 +1207,7 @@
"text": "This is a copy of \"Up-Wingers: A Futurist Manifesto\" by FM-2030. It seems that the author's real name is Fereidoun M. Esfandiary."
}
],
- "weight": 350,
+ "weight": "350 g",
"volume": "750 ml",
"price": 1250,
"material": [ "paper" ],
@@ -1080,7 +1224,7 @@
"name": "phone book",
"name_plural": "phone books",
"description": "This hefty volume contains the telephone numbers of individuals, businesses, and utilities in the nearby area, pretty useless during the apocalypse and all.",
- "weight": 854,
+ "weight": "854 g",
"volume": "2500 ml",
"price": 800,
"bashing": 2,
@@ -1097,7 +1241,7 @@
"type": "BOOK",
"name": "photo album",
"description": "A leather album full of photos of somebody's family. You don't know any of the people in them, but seeing these pictures still makes you think of happier times.",
- "weight": 180,
+ "weight": "180 g",
"volume": "250 ml",
"price": 3000,
"material": [ "paper", "leather" ],
@@ -1114,7 +1258,7 @@
"name": "book of plays",
"name_plural": "books of plays",
"description": "A collection of plays by various authors from around the world, including scripts by Wilde, Beckett, Checkov, and Shakespeare.",
- "weight": 700,
+ "weight": "700 g",
"volume": "750 ml",
"price": 1150,
"material": [ "paper" ],
@@ -1131,7 +1275,7 @@
"name": "book of poetry",
"name_plural": "books of poetry",
"description": "A collection of poetry by various authors from around the world, including writings by Dickinson, Goethe, Thoreau, and Yeats.",
- "weight": 400,
+ "weight": "400 g",
"volume": "500 ml",
"price": 1050,
"material": [ "paper" ],
@@ -1148,7 +1292,7 @@
"name": "priest's diary",
"name_plural": "priest's diaries",
"description": "A small book filled with journal entries in Latin.",
- "weight": 340,
+ "weight": "340 g",
"volume": "750 ml",
"price": 1500,
"bashing": 3,
@@ -1165,7 +1309,7 @@
"type": "BOOK",
"name": "corporate accounting ledger",
"description": "If you knew what to look for something might stand out...",
- "weight": 566,
+ "weight": "566 g",
"volume": "1250 ml",
"price": 2000,
"bashing": 5,
@@ -1182,7 +1326,7 @@
"name": "patient treatment records",
"name_plural": "patient treatment records",
"description": "A massive stack of medical records that contain every gory detail.",
- "weight": 680,
+ "weight": "680 g",
"volume": "1500 ml",
"price": 500,
"bashing": 6,
@@ -1199,7 +1343,7 @@
"name": "national weather transcripts",
"name_plural": "national weather transcripts",
"description": "Old weather records are about as interesting as a rock.",
- "weight": 454,
+ "weight": "454 g",
"volume": "1750 ml",
"price": 500,
"bashing": 7,
@@ -1216,7 +1360,7 @@
"name": "big book of short stories",
"name_plural": "big books of short stories",
"description": "This humongous volume contains a vast collection of short stories by different authors, spanning a wide variety of topics and genres.",
- "weight": 1720,
+ "weight": "1720 g",
"volume": "1 L",
"price": 1400,
"material": [ "paper" ],
@@ -1233,7 +1377,7 @@
"name": "book of tall tales",
"name_plural": "books of tall tales",
"description": "An entertaining collection of early American folklore, featuring tales of larger than life individuals and their amazing adventures.",
- "weight": 360,
+ "weight": "360 g",
"volume": "750 ml",
"price": 1050,
"material": [ "paper" ],
@@ -1250,7 +1394,7 @@
"name": "Visions in Solitude",
"name_plural": "Visions in Solitude",
"description": "A small book detailing 'visions' a prisoner had on death row.",
- "weight": 227,
+ "weight": "227 g",
"volume": "750 ml",
"price": 2900,
"bashing": 3,
@@ -1268,7 +1412,7 @@
"name": "Hávamál",
"name_plural": "copies of Hávamál",
"description": "An English translation of several Old Norse poems. The poems contain proverbs and stories attributed to the god Odin, many transcribed from oral history.",
- "weight": 292,
+ "weight": "292 g",
"volume": "750 ml",
"price": 550,
"material": [ "paper" ],
@@ -1359,7 +1503,7 @@
{ "id": "classic29", "text": "This is a copy of \"The Count of Monte Cristo\" by Dumas." },
{ "id": "classic30", "text": "This is a copy of \"The Secret Garden\" by Frances Burnett." }
],
- "weight": 350,
+ "weight": "350 g",
"volume": "750 ml",
"price": 2000,
"material": [ "paper" ],
@@ -1454,7 +1598,7 @@
"text": "This is a first edition copy of Terry Pratchett's \"The Colour of Magic\". In the inner cover is a handwritten note that reads \"To Chris, thanks for believing I could do it. Best regards, Terry.\""
}
],
- "weight": 400,
+ "weight": "400 g",
"volume": "750 ml",
"price": 4550,
"material": [ "paper" ],
diff --git a/data/json/items/book/pistol.json b/data/json/items/book/pistol.json
index 56c790bf91b3b..e5e995e2c4c5d 100644
--- a/data/json/items/book/pistol.json
+++ b/data/json/items/book/pistol.json
@@ -4,7 +4,7 @@
"type": "BOOK",
"name": "Tactical Handgun Digest",
"description": "A glossy magazine all about handguns and shooting. There is a good article about proper sighting near the middle.",
- "weight": 90,
+ "weight": "90 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -22,7 +22,7 @@
"name": "The Tao of the Handgun",
"name_plural": "copies of The Tao of the Handgun",
"description": "This introspective volume covers proper usage of handguns, from safety and stance, to maintenance and proper sighting technique.",
- "weight": 440,
+ "weight": "440 g",
"volume": "500 ml",
"price": 2200,
"material": [ "paper" ],
diff --git a/data/json/items/book/rifle.json b/data/json/items/book/rifle.json
index eac9d2e726519..0ccb3d87e60e3 100644
--- a/data/json/items/book/rifle.json
+++ b/data/json/items/book/rifle.json
@@ -5,7 +5,7 @@
"name": "Modern Rifleman",
"name_plural": "Modern Rifleman",
"description": "An informative magazine all about rifles and shooting. There is an excellent article about proper maintenance in this issue.",
- "weight": 100,
+ "weight": "100 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -22,7 +22,7 @@
"type": "BOOK",
"name": "FM 23-16 Army marksmanship manual",
"description": "A hefty military field manual about automatic rifle usage and techniques which improve marksmanship and proper weapons-handling.",
- "weight": 454,
+ "weight": "454 g",
"volume": "250 ml",
"price": 2000,
"material": [ "paper" ],
diff --git a/data/json/items/book/shotgun.json b/data/json/items/book/shotgun.json
index b7d4debb67fb7..6f80c4537aaf3 100644
--- a/data/json/items/book/shotgun.json
+++ b/data/json/items/book/shotgun.json
@@ -5,7 +5,7 @@
"name": "Trap and Field",
"name_plural": "Trap and Field",
"description": "An in-depth magazine all about shotguns and shooting. There is an informative article about proper shooting stance in the back pages.",
- "weight": 90,
+ "weight": "90 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -23,7 +23,7 @@
"name": "Shotguns: The art and science",
"name_plural": "Shotguns: The art and science",
"description": "This book claims to address every problem the shotgunner is likely to face, and offers solutions to ensure that shooters can make every shot count.",
- "weight": 400,
+ "weight": "400 g",
"volume": "500 ml",
"price": 2100,
"material": [ "paper" ],
diff --git a/data/json/items/book/smg.json b/data/json/items/book/smg.json
index d63f7186193cb..8064f563ec8bc 100644
--- a/data/json/items/book/smg.json
+++ b/data/json/items/book/smg.json
@@ -5,7 +5,7 @@
"name": "Submachine Gun Enthusiast",
"name_plural": "Submachine Gun Enthusiast",
"description": "An in-depth magazine about submachine guns and shooting. There is an exhaustive article about close quarter combat techniques in the front.",
- "weight": 90,
+ "weight": "90 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -22,7 +22,7 @@
"type": "BOOK",
"name": "The Submachine Gun Handbook",
"description": "This concise guide details the proper care and operation of most forms of machine pistols and submachine guns currently used by regular armed and reserve forces as well as several obsolete weapons.",
- "weight": 362,
+ "weight": "362 g",
"volume": "500 ml",
"price": 2100,
"material": [ "paper" ],
diff --git a/data/json/items/book/speech.json b/data/json/items/book/speech.json
index d5ce242103f6d..24f4418f6d797 100644
--- a/data/json/items/book/speech.json
+++ b/data/json/items/book/speech.json
@@ -5,7 +5,7 @@
"name": "US Weekly",
"name_plural": "US Weeklies",
"description": "Weekly news about a bunch of famous people who're all (un)dead now.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 400,
"material": [ "paper" ],
@@ -23,7 +23,7 @@
"name": "Self-Esteem for Dummies",
"name_plural": "Self-Esteem for Dummies",
"description": "Full of useful tips for showing confidence in your speech.",
- "weight": 454,
+ "weight": "454 g",
"volume": "750 ml",
"price": 1600,
"material": [ "paper" ],
@@ -40,7 +40,7 @@
"name": "Principles of Effective Communication",
"name_plural": "Principles of Effective Communication",
"description": "A hardbound book devoted to being an effective and persuasive speaker.",
- "weight": 1120,
+ "weight": "1120 g",
"volume": "2 L",
"price": 4000,
"bashing": 4,
@@ -59,7 +59,7 @@
"name": "Dungeon Master's Guide: 6th Edition",
"name_plural": "Dungeon Master's Guide: 6th Editions",
"description": "A thick, hardcover volume with everything needed to weave legendary stories. It's full of information, but finding the things you're looking for can be a chore.",
- "weight": 2267,
+ "weight": "2267 g",
"volume": "2500 ml",
"price": 3000,
"bashing": 7,
diff --git a/data/json/items/book/stabbing.json b/data/json/items/book/stabbing.json
index fc2381db30084..2d6cd809945eb 100644
--- a/data/json/items/book/stabbing.json
+++ b/data/json/items/book/stabbing.json
@@ -4,7 +4,7 @@
"type": "BOOK",
"name": "Duelist's Annual",
"description": "An annual publication about fencing and dueling. There are many good illustrations which describe proper technique and form.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -21,7 +21,7 @@
"type": "BOOK",
"name": "FM 23-25 Army bayonet manual",
"description": "A hefty military field manual about bayonet usage and combat theory.",
- "weight": 454,
+ "weight": "454 g",
"volume": "250 ml",
"price": 2000,
"material": [ "paper" ],
diff --git a/data/json/items/book/survival.json b/data/json/items/book/survival.json
index 1a44a04d5a749..e917a6b603784 100644
--- a/data/json/items/book/survival.json
+++ b/data/json/items/book/survival.json
@@ -5,7 +5,7 @@
"name": "Survival Under Atomic Attack",
"name_plural": "copies of Survival Under Atomic Attack",
"description": "A wordy and intricate guide to wilderness and urban survival in a worst case scenario. While filled with loads of useful information, the madman who wrote this was a terrible writer, and gleaning knowledge from the rants is a chore.",
- "weight": 1920,
+ "weight": "1920 g",
"volume": "2 L",
"price": 920,
"bashing": 8,
@@ -25,7 +25,7 @@
"name": "Through the Lens",
"name_plural": "Through the Lens",
"description": "A colorful digest devoted to backpacking and wilderness photography. The photos are beautiful, though the terminology in the sections on survivalcraft assume some proficiency.",
- "weight": 440,
+ "weight": "440 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -44,7 +44,7 @@
"name": "Alpha Male Quarterly",
"name_plural": "Alpha Male Quarterlies",
"description": "This is a full-size glossy men's magazine. There's a brief article about hiking and a list of simple wilderness survival tips somewhere in between the photos of bikini-clad women and the gadget advertisements.",
- "weight": 180,
+ "weight": "180 g",
"volume": "500 ml",
"price": 450,
"material": [ "paper" ],
@@ -62,7 +62,7 @@
"name": "Outdoor Adventures",
"name_plural": "Outdoor Adventures",
"description": "A glossy magazine about surviving and hunting in the wilderness. There's an exciting article about a bear attack in the back pages.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -80,7 +80,7 @@
"name": "Pitching a Tent",
"name_plural": "copies of Pitching a Tent",
"description": "A guide detailing the basics of woodsmanship and outdoor survival.",
- "weight": 454,
+ "weight": "454 g",
"volume": "750 ml",
"price": 2900,
"material": [ "paper" ],
@@ -96,7 +96,7 @@
"type": "BOOK",
"name": "Pocket Survival Guide",
"description": "This pocket-sized leather-bound survival guide combines a wealth of concise information with simple to follow instructions and easy to read illustrations.",
- "weight": 212,
+ "weight": "212 g",
"volume": "250 ml",
"price": 4000,
"material": [ "paper", "leather" ],
@@ -114,7 +114,7 @@
"name_plural": "Autobiography of a Mountain Man",
"//": "Since it's a novel, price point is much more reasonable.",
"description": "An amusing historical novel filled with detailed descriptions of surviving in the wild, potentially containing great insights for an experienced outdoorsman.",
- "weight": 1920,
+ "weight": "1920 g",
"volume": "2 L",
"price": 920,
"bashing": 8,
@@ -133,7 +133,7 @@
"type": "BOOK",
"name": "Outdoor Survival Guide",
"description": "A thick soft-cover book filled with vital information about surviving in the wild, aimed at the experienced backpacker.",
- "weight": 910,
+ "weight": "910 g",
"volume": "2 L",
"price": 6000,
"bashing": 4,
diff --git a/data/json/items/book/swimming.json b/data/json/items/book/swimming.json
index f468296f78550..b1e13625e3668 100644
--- a/data/json/items/book/swimming.json
+++ b/data/json/items/book/swimming.json
@@ -5,7 +5,7 @@
"name": "Swim Planet",
"name_plural": "Swim Planet",
"description": "The world's leading resource about aquatic sports.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 460,
"material": [ "paper" ],
@@ -22,7 +22,7 @@
"type": "BOOK",
"name": "Water Survival Training Field Manual",
"description": "A commercially produced survival guide that details swimming and deep water survival techniques tailored to emergency scenarios.",
- "weight": 400,
+ "weight": "400 g",
"volume": "500 ml",
"price": 2200,
"material": [ "paper" ],
diff --git a/data/json/items/book/tailor.json b/data/json/items/book/tailor.json
index ab80c255864e4..8ca3f153b5cb2 100644
--- a/data/json/items/book/tailor.json
+++ b/data/json/items/book/tailor.json
@@ -12,7 +12,7 @@
"type": "BOOK",
"name": "Beauty Magazine",
"description": "This is a full-size glossy women's magazine. There are a few simple patterns and basic sewing tips somewhere in between the fashion photos and the makeup advertisements.",
- "weight": 180,
+ "weight": "180 g",
"volume": "500 ml",
"price": 450,
"material": [ "paper" ],
@@ -30,7 +30,7 @@
"name": "Sew Awesome Monthly",
"name_plural": "Sew Awesome Monthlies",
"description": "A well presented monthly magazine all about knitting, crocheting, and needlepoint. Filled with ideas and project patterns.",
- "weight": 75,
+ "weight": "75 g",
"volume": "250 ml",
"price": 400,
"material": [ "paper" ],
@@ -48,7 +48,7 @@
"name": "Sew What? Clothing!",
"name_plural": "Sew What? Clothing!",
"description": "A colorful book about tailoring.",
- "weight": 454,
+ "weight": "454 g",
"volume": "750 ml",
"price": 1900,
"material": [ "paper" ],
@@ -64,7 +64,7 @@
"type": "BOOK",
"name": "clothing designer's portfolio",
"description": "A leather bound portfolio that once belonged to a clothing designer. Filled with sketches and notes, a skilled tailor could learn a lot from this volume.",
- "weight": 2063,
+ "weight": "2063 g",
"volume": "2 L",
"price": 9200,
"bashing": 8,
@@ -83,7 +83,7 @@
"type": "BOOK",
"name": "Traditional Japanese Kimono",
"description": "An illustrated textbook on the crafting of Japanese traditional garb.",
- "weight": 2400,
+ "weight": "2400 g",
"volume": "1500 ml",
"price": 8000,
"bashing": 8,
@@ -101,7 +101,7 @@
"type": "BOOK",
"name": "Friendly, Humane Fashion",
"description": "An educational book detailing the uses of fake fur, as well as its benefits and disadvantages. The prose is rather passionate, and a disclaimer on the cover proudly states that the book is printed and distributed by the Gryphon Animal Rights Organization.",
- "weight": 2267,
+ "weight": "2267 g",
"volume": "1 L",
"price": 5000,
"bashing": 5,
@@ -121,7 +121,7 @@
"name": "Sewing Techniques for Designers",
"name_plural": "Sewing Techniques for Designers",
"description": "A massive, hardbound book full of a wealth of information for the professional clothing designer.",
- "weight": 2600,
+ "weight": "2600 g",
"volume": "2 L",
"price": 6000,
"bashing": 4,
diff --git a/data/json/items/book/throw.json b/data/json/items/book/throw.json
index 09901d95387ad..0d6b7eda89f15 100644
--- a/data/json/items/book/throw.json
+++ b/data/json/items/book/throw.json
@@ -5,7 +5,7 @@
"name": "Diskobolus",
"name_plural": "Diskobolus",
"description": "A biannual magazine devoted to the art and science of discus-throwing.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 480,
"material": [ "paper" ],
@@ -23,7 +23,7 @@
"name": "The Complete Guide to Pitching",
"name_plural": "Complete Guides to Pitching",
"description": "A detailed guide for baseball pitchers that combines time-tested techniques and information mixed with a common sense approach to pitching.",
- "weight": 400,
+ "weight": "400 g",
"volume": "500 ml",
"price": 2800,
"material": [ "paper" ],
diff --git a/data/json/items/book/traps.json b/data/json/items/book/traps.json
index ca197b2a719e1..32a7646e49290 100644
--- a/data/json/items/book/traps.json
+++ b/data/json/items/book/traps.json
@@ -5,7 +5,7 @@
"name": "How to Trap Anything",
"name_plural": "How to Trap Anything",
"description": "A worn manual that describes how to set and disarm a wide variety of traps.",
- "weight": 454,
+ "weight": "454 g",
"volume": "500 ml",
"price": 2400,
"material": [ "paper" ],
@@ -22,7 +22,7 @@
"name": "Trapper's Life",
"name_plural": "Trapper's Life",
"description": "An in-depth magazine about trapping game. There are lots of articles and diagrams that explain simple trap designs.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -38,7 +38,7 @@
"type": "BOOK",
"name": "The Modern Trapper",
"description": "An extensive volume that details numerous methods of trapping game.",
- "weight": 422,
+ "weight": "422 g",
"volume": "500 ml",
"price": 2400,
"material": [ "paper" ],
@@ -56,7 +56,7 @@
"name_plural": "The Compleat Trapper",
"//": "The spelling is intentionally archaic, as this form is commonly used in the titles of books.",
"description": "An in-depth book about trapping game animals, covering methods both modern and ancient.",
- "weight": 1100,
+ "weight": "1100 g",
"volume": "2 L",
"price": 6000,
"bashing": 4,
@@ -75,7 +75,7 @@
"name": "The Trapper's Companion",
"name_plural": "copies of The Trapper's Companion",
"description": "A folksy guide to trapping wild game using time-tested methods. A bit in-depth for the beginner, it can provide a wealth of information to a knowledgeable trapper.",
- "weight": 1920,
+ "weight": "1920 g",
"volume": "2 L",
"price": 920,
"bashing": 8,
diff --git a/data/json/items/book/unarmed.json b/data/json/items/book/unarmed.json
index a52064fcfe408..3e4a902452bb7 100644
--- a/data/json/items/book/unarmed.json
+++ b/data/json/items/book/unarmed.json
@@ -5,7 +5,7 @@
"name": "Boxing Monthly",
"name_plural": "Boxing Monthlies",
"description": "An exciting monthly magazine about boxing. There are lots of large, colorful photos of pugilistic exploits.",
- "weight": 90,
+ "weight": "90 g",
"volume": "250 ml",
"price": 450,
"material": [ "paper" ],
@@ -23,7 +23,7 @@
"name": "101 Wrestling Moves",
"name_plural": "101 Wrestling Moves",
"description": "It seems to be a wrestling manual, poorly photocopied and released on spiral- bound paper. Still, there are lots of useful tips for unarmed combat.",
- "weight": 227,
+ "weight": "227 g",
"volume": "500 ml",
"price": 3800,
"material": [ "paper" ],
diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json
index ef445ba028755..95a6b7586938b 100644
--- a/data/json/items/chemicals_and_resources.json
+++ b/data/json/items/chemicals_and_resources.json
@@ -28,7 +28,7 @@
"description": "A handful of yellow grains of pure sulfur. Primarily used to make battery acid, sulfur is sometimes used as fuel for explosives. Can be burned to produce acidic smoke, that is deadly to bacteria and humans alike, or oxidized to make paper-bleaching agents.",
"material": "powder",
"volume": "250 ml",
- "weight": 5,
+ "weight": "5 g",
"//": "NOTE: Weights are given for ONE UNIT. The actual weight of a spawned pile of sulfur is now 5*100 = 500g. For reference, 1 C:DDA unit of volume is around a quarter of a liter (calculated from the weight of water).",
"bashing": 1,
"ammo_type": "components",
@@ -47,7 +47,7 @@
"description": "A large chunk of pure sulfur. Break it up to use it.",
"material": "powder",
"volume": "1250 ml",
- "weight": 500,
+ "weight": "500 g",
"bashing": 1,
"ammo_type": "components"
},
@@ -63,7 +63,7 @@
"description": "Portland is most likely long gone, but its memory persists in cement. This ubiquitous binder can be used for all kinds of advanced masonry. Just add water.",
"material": "powder",
"volume": "250 ml",
- "weight": 20,
+ "weight": "20 g",
"bashing": 1,
"ammo_type": "components",
"count": 50
@@ -80,7 +80,7 @@
"description": "A handful of small chunks of limestone. Useful for experiments at science fairs, but pretty useless as ammo. Maybe something could be crafted from this stuff…",
"material": "stone",
"volume": "250 ml",
- "weight": 14,
+ "weight": "14 g",
"bashing": 1,
"ammo_type": "components",
"count": 50
@@ -97,7 +97,7 @@
"description": "The product of burning limestone, this white powder is a crucial ingredient in making cement. That said, it is also extremely caustic and will cause severe burns to any tissue it comes in contact with. This property could probably be exploited.",
"material": "powder",
"volume": "250 ml",
- "weight": 15,
+ "weight": "15 g",
"bashing": 1,
"ammo_type": "components",
"count": 50
@@ -114,7 +114,7 @@
"description": "A handful of New England sand. If you had a stoked furnace, you could turn it into glass. Otherwise, it's only good for making cement.",
"material": "powder",
"volume": "250 ml",
- "weight": 8,
+ "weight": "8 g",
"bashing": 1,
"ammo_type": "components",
"count": 50
@@ -131,7 +131,7 @@
"description": "A pile of loosely packed, slightly damp loamy soil. This mixture of sand, silt and clay is ideal for growing plants.",
"material": "soil",
"volume": "5L",
- "weight": 6500,
+ "weight": "6500 g",
"bashing": 1,
"ammo_type": "components",
"stack_size": 1
@@ -146,7 +146,7 @@
"description": "A small shard of limestone. Pretty flimsy and not much of a weapon, but its alkaline properties may yet find some use.",
"price": 500,
"material": "stone",
- "weight": 700,
+ "weight": "700 g",
"volume": "1 L",
"bashing": 2,
"to_hit": -2
@@ -164,7 +164,37 @@
"description": "A handful of rock salt crystals. Could be refined into table salt.",
"material": "stone",
"volume": "3500 ml",
- "weight": 650,
+ "weight": "650 g",
+ "bashing": 1
+ },
+ {
+ "type": "GENERIC",
+ "id": "material_rhodonite",
+ "category": "spare_parts",
+ "price": 250,
+ "name": "rhodonite",
+ "name_plural": "rhodonite",
+ "symbol": "*",
+ "color": "red",
+ "description": "A chunk of rhodonite. It has manganese dioxide covering and going through it in veins, which can be obtained using a chisel.",
+ "material": "stone",
+ "volume": "2500 ml",
+ "weight": 500,
+ "bashing": 1
+ },
+ {
+ "type": "GENERIC",
+ "id": "material_zincite",
+ "category": "spare_parts",
+ "price": 250,
+ "name": "zincite",
+ "name_plural": "zincite",
+ "symbol": "*",
+ "color": "red",
+ "description": "A chunk of zincite. Could be refined into zinc oxide, then into zinc by reduction with a source of carbon.",
+ "material": "stone",
+ "volume": "2500 ml",
+ "weight": 500,
"bashing": 1
},
{
@@ -172,7 +202,7 @@
"id": "bleach",
"name": "bleach",
"name_plural": "bleach",
- "weight": 138,
+ "weight": "138 g",
"color": "white",
"use_action": "BLECH",
"container": "jug_plastic",
@@ -195,7 +225,7 @@
"id": "ammonia",
"name": "ammonia",
"name_plural": "ammonia",
- "weight": 124,
+ "weight": "124 g",
"color": "white",
"use_action": "BLECH",
"container": "jug_plastic",
@@ -217,7 +247,7 @@
"id": "fertilizer_liquid",
"name": "liquid fertilizer",
"name_plural": "liquid fertilizer",
- "weight": 67,
+ "weight": "67 g",
"color": "yellow",
"flags": [ "FERTILIZER", "NUTRIENT_OVERRIDE" ],
"use_action": "PLANTBLECH",
@@ -240,7 +270,7 @@
"id": "fertilizer_commercial",
"name": "commercial fertilizer",
"name_plural": "commercial fertilizer",
- "weight": 350,
+ "weight": "350 g",
"color": "yellow",
"flags": [ "FERTILIZER" ],
"use_action": "PLANTBLECH",
@@ -265,7 +295,7 @@
"category": "chems",
"name": "fungicide",
"name_plural": "fungicide",
- "weight": 1,
+ "weight": "1 g",
"//": "Typically sold in larger quantities, but that's handed in the charge count.",
"color": "pink",
"use_action": "FUNGICIDE",
@@ -290,7 +320,7 @@
"category": "chems",
"name": "insecticide",
"name_plural": "insecticide",
- "weight": 1,
+ "weight": "1 g",
"//": "Typically sold in larger quantities, but that's handed in the charge count.",
"color": "pink",
"looks_like": "fungicide",
@@ -314,7 +344,7 @@
"id": "salt_water",
"name": "salt water",
"name_plural": "salt water",
- "weight": 260,
+ "weight": "260 g",
"color": "light_cyan",
"container": "bottle_plastic",
"comestible_type": "DRINK",
@@ -334,7 +364,7 @@
"id": "water_acid",
"name": "acid water",
"name_plural": "acid water",
- "weight": 260,
+ "weight": "260 g",
"color": "light_green",
"flags": [ "ACID" ],
"use_action": "BLECH",
@@ -355,7 +385,7 @@
"id": "water_acid_weak",
"name": "weak acid water",
"name_plural": "weak acid water",
- "weight": 255,
+ "weight": "255 g",
"color": "light_green",
"flags": [ "ACID" ],
"use_action": "BLECH",
@@ -376,7 +406,7 @@
"id": "acid",
"name": "concentrated acid",
"name_plural": "concentrated acid",
- "weight": 250,
+ "weight": "250 g",
"color": "green",
"flags": [ "ACID", "DROP_ACTION_ONLY_IF_LIQUID" ],
"use_action": "BLECH",
@@ -398,7 +428,7 @@
"type": "COMESTIBLE",
"id": "sewage",
"name": "sewage sample",
- "weight": 280,
+ "weight": "280 g",
"color": "green",
"use_action": "SEWAGE",
"container": "bottle_plastic",
@@ -425,7 +455,7 @@
"description": "A handful of finely ground aluminum powder. This strong reducing agent was used in combination with various oxidants for chemical welding and explosives alike. Just before the Cataclysm, however, it was the basis of virtually all commercial metallic-hued paints and anti-corrosive coatings.",
"material": "powder",
"volume": "250 ml",
- "weight": 2,
+ "weight": "2 g",
"//": "Weight should be 1.76g but the game will round down the number to 1g and 1.76g is closer to 2g",
"bashing": 1,
"ammo_type": "components",
@@ -444,12 +474,84 @@
"description": "A handful of zinc powder. While commercially used mostly in cosmetics and for paints, hobbyists used to mix it with sulfur to make basic rocket fuel / smokescreen. When treated with a strong acid, it will produce hydrogen.",
"material": "powder",
"volume": "250 ml",
- "weight": 8.4,
+ "weight": "8400 mg",
+ "bashing": 1,
+ "ammo_type": "components",
+ "container": "bottle_plastic_small",
+ "count": 100
+ },
+ {
+ "type": "AMMO",
+ "id": "chem_zinc",
+ "category": "chems",
+ "price": 200,
+ "name": "zinc oxide",
+ "name_plural": "zinc oxide",
+ "symbol": "=",
+ "color": "white",
+ "description": "A handful of zinc oxide. It can be reduced into zinc, or used for some other reactions of its own.",
+ "material": "powder",
+ "volume": "250 ml",
+ "weight": 12.8,
"bashing": 1,
"ammo_type": "components",
"container": "bottle_plastic_small",
"count": 100
},
+ {
+ "type": "AMMO",
+ "id": "chem_manganese_dioxide",
+ "category": "chems",
+ "price": 600,
+ "name": "manganese dioxide",
+ "name_plural": "manganese dioxide",
+ "symbol": "=",
+ "color": "white",
+ "description": "A handful of manganese dioxide powder. Occurring naturally in the mineral pyrolusite, it is used commercially in the production of alkaline and zinc-carbon batteries.",
+ "material": "powder",
+ "volume": "250 ml",
+ "weight": 12.6,
+ "bashing": 1,
+ "ammo_type": "components",
+ "container": "bag_plastic",
+ "count": 100
+ },
+ {
+ "type": "AMMO",
+ "id": "chem_potassium_chloride",
+ "category": "chems",
+ "price": 600,
+ "name": "potassium chloride",
+ "name_plural": "potassium chloride",
+ "symbol": "=",
+ "color": "white",
+ "description": "A handful of potassium chloride. Although it occurs naturally in the mineral sylvite, it can be produced as a byproduct of the reaction of saltpeter and hydrochloric acid. It can be used for making fertilizer, or potassium hydroxide by way of electrolysis.",
+ "material": "powder",
+ "volume": "250 ml",
+ "weight": 5,
+ "bashing": 1,
+ "ammo_type": "components",
+ "container": "bag_plastic",
+ "count": 100
+ },
+ {
+ "type": "AMMO",
+ "id": "chem_potassium_hydroxide",
+ "category": "chems",
+ "price": 600,
+ "name": "potassium hydroxide",
+ "name_plural": "potassium hydroxide",
+ "symbol": "=",
+ "color": "white",
+ "description": "A handful of potassium hydroxide. Commonly called caustic potash, it was mainly used industrially for its caustic nature. It can be used as an electrolyte in alkaline batteries, among other applications.",
+ "material": "powder",
+ "volume": "250 ml",
+ "weight": 5.1,
+ "bashing": 1,
+ "ammo_type": "components",
+ "container": "bag_plastic",
+ "count": 100
+ },
{
"type": "AMMO",
"id": "chem_sulphuric_acid",
@@ -462,6 +564,27 @@
"flags": [ "DROP_ACTION_ONLY_IF_LIQUID" ],
"description": "Sulfuric acid: viscous, foul-smelling and extremely corrosive, particularly to organic matter and evil clowns. Although used to prepare a number of chemicals, it is mostly known as battery acid, due to its widest commercial application.",
"volume": "250 ml",
+ "weight": "460 g",
+ "bashing": 1,
+ "ammo_type": "components",
+ "charges": 2,
+ "phase": "liquid",
+ "container": "bottle_glass",
+ "freezing_point": 25,
+ "drop_action": { "type": "emit_actor", "emits": [ "emit_acid_drop" ], "scale_qty": true }
+ },
+ {
+ "type": "AMMO",
+ "id": "chem_muriatic_acid",
+ "category": "chems",
+ "price": 250,
+ "name": "hydrochloric acid",
+ "name_plural": "hydrochloric acid",
+ "symbol": "=",
+ "color": "white",
+ "flags": [ "DROP_ACTION_ONLY_IF_LIQUID" ],
+ "description": "Hydrochloric acid, also known as muriatic acid. It is a strong acid that has a distinctive smell, important and frequently used ever since its discovery. It still has a vast multitude of uses.",
+ "volume": "250 ml",
"weight": 460,
"bashing": 1,
"ammo_type": "components",
@@ -482,7 +605,7 @@
"color": "white",
"description": "Acetone, best known as the primary constituent of most nail polish removers. Flammable and can be easily used for potent home-made explosives, as demonstrated by the terrorist attacks of 2016.",
"volume": "250 ml",
- "weight": 200,
+ "weight": "200 g",
"bashing": 1,
"ammo_type": "components",
"phase": "liquid",
@@ -500,7 +623,7 @@
"flags": [ "DROP_ACTION_ONLY_IF_LIQUID" ],
"description": "Nitric acid, a strong oxidant and extremely corrosive material. Mainly used in the production of synthetic fertilizers, for etching of circuit boards and in woodworking. Remains quite useful both for making a vast array of pyrotechnic and explosive agents and as a direct weapon: not many beings enjoy being doused in nitric acid.",
"volume": "250 ml",
- "weight": 375,
+ "weight": "375 g",
"bashing": 1,
"ammo_type": "components",
"charges": 2,
@@ -521,7 +644,7 @@
"description": "A handful of chromium oxide pellets. This substance, typically known as the only stable green pigment for paints, is also a mild oxidizer, which can be mixed with aluminum powder to make thermite for welding. If one had access to a CVD machine and a laboratory worth of reagents, they might be able to produce very durable ceramic layers.",
"material": "powder",
"volume": "250 ml",
- "weight": 13.05,
+ "weight": "13050 mg",
"bashing": 1,
"ammo_type": "components",
"container": "bag_canvas",
@@ -539,7 +662,7 @@
"description": "A handful of calcium carbide chunks, giving off a faint, garlic-like smell. Commercially, calcium carbide was used for on-the-spot manufacture of acetylene and historically to power acetylene lamps. If mixed with water and sealed, it will explode with little strength, but with relatively loud noise and could maybe be used as a decoy.",
"material": "powder",
"volume": "250 ml",
- "weight": 5.55,
+ "weight": "5550 mg",
"bashing": 1,
"ammo_type": "components",
"container": "bag_plastic",
@@ -557,7 +680,7 @@
"description": "A handful of waxy hexamine tablets. This ubiquitous fuel was used to start up almost every garden grill and no 'real' camping trip could do its cooking without it, until the Cataclysm. Nowadays, it is even more valuable then before, being the key component in the preparation of several military-grade explosives.",
"material": "powder",
"volume": "250 ml",
- "weight": 16.625,
+ "weight": "16625 mg",
"bashing": 1,
"ammo_type": "esbit",
"container": "box_small",
@@ -574,7 +697,7 @@
"color": "white",
"description": "Concentrated hydrogen peroxide is a powerful oxidant, violently decomposing in contact with most reducing agents. Can be used as rocket fuel or to make high explosives. Causes severe burns to any organic matter and may ignite it on contact.",
"volume": "250 ml",
- "weight": 325,
+ "weight": "325 g",
"bashing": 1,
"ammo_type": "components",
"phase": "liquid",
@@ -592,7 +715,7 @@
"description": "A handful of ammonium nitrate. This white, crystalline powder is commonly used as a component of fertilizers and explosives. Could also be dissolved in water to sharply lower its temperature, but is there any use for this quality in this new world?",
"material": "powder",
"volume": "250 ml",
- "weight": 8.6,
+ "weight": "8600 mg",
"bashing": 1,
"ammo_type": "components",
"container": "bag_canvas",
@@ -610,7 +733,7 @@
"description": "A handful of saltpeter. Sometimes used as a fertilizer, this ubiquitous nitrate is the principal constituent of black gunpowder and simple rocket propellants, such as rocket candy.",
"material": "powder",
"volume": "250 ml",
- "weight": 5.275,
+ "weight": "5275 mg",
"bashing": 1,
"ammo_type": "components",
"container": "bag_canvas",
@@ -628,7 +751,7 @@
"description": "A large crystal of niter, the mineral form of potassium nitrate. It can be processed into saltpeter.",
"material": "powder",
"volume": "1250 ml",
- "weight": 790,
+ "weight": "790 g",
"bashing": 1,
"ammo_type": "components"
},
@@ -644,7 +767,7 @@
"description": "Several crystals of aluminum sulfate. Historically, an agent for purifying water and as molluscicide, due to the fact that it degenerates their slime. Just before the Cataclysm, its main uses were for adjusting the acidity of the soil and as an additive to baking powder. If mixed with a strong acid, it could be used to saturate the soil with aluminum, causing all but the most resistant of plants to wither and die.",
"material": "powder",
"volume": "250 ml",
- "weight": 13.35,
+ "weight": "13350 mg",
"bashing": 1,
"ammo_type": "components",
"container": "bag_canvas",
@@ -661,7 +784,7 @@
"color": "white",
"description": "Concentrated acetic acid, typically used as a chemical reagent and antifungal agent. Despite its horrid smell, it was used to prepare several types of perfumes, but would making perfume not be too fancy for postapocalyptic New England?",
"volume": "250 ml",
- "weight": 300,
+ "weight": "300 g",
"bashing": 1,
"ammo_type": "components",
"phase": "liquid",
@@ -678,7 +801,7 @@
"color": "white",
"description": "Formaldehyde, here dissolved in water, was widely used before the Cataclysm as a precursor to production of many chemicals and materials and as an embalming agent. Easily identifiable by its pungent odor. Terribly toxic, carcinogenic, and volatile.",
"volume": "250 ml",
- "weight": 300,
+ "weight": "300 g",
"bashing": 1,
"ammo_type": "components",
"phase": "liquid",
@@ -696,7 +819,7 @@
"description": "A handful of silvery-greenish powder, produced by mixing aluminum and chromium oxide. This mixture, burning at a constant pace and at extremely high temperature, was once used for on-the-spot welding. Can be used as an incendiary material in a pinch.",
"material": "powder",
"volume": "250 ml",
- "weight": 10,
+ "weight": "10 g",
"//": "Weight might not be accurate.",
"bashing": 1,
"ammo_type": "components",
@@ -715,7 +838,7 @@
"description": "Several brownish pellets that were made by absorbing organic fuel on ammonium nitrate. This ammonium nitrate-fuel oil or ANFO, as it is called, mixture is a common industrial explosive due to its stability and low price. Burns fast, but needs an explosive primer to detonate.",
"material": "powder",
"volume": "250 ml",
- "weight": 90,
+ "weight": "90 g",
"bashing": 1,
"ammo_type": "components",
"container": "bag_canvas",
@@ -733,7 +856,7 @@
"description": "A handful of black gunpowder, made by mixing charcoal and sulfur with saltpeter. Pretty useless for making modern cartridges, as the soot produced when it burns will quickly clog any firearm, but it could be used to make some vicious bombs.",
"material": "powder",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"bashing": 1,
"ammo_type": "components",
"container": "bag_canvas",
@@ -751,7 +874,7 @@
"description": "Several off-white crystals of RDX or hexogen: a military-grade, shelf-stable high explosive. Can be cast into shaped charges or mixed with scrap to pepper the blast area with high-velocity shrapnel.",
"material": "powder",
"volume": "250 ml",
- "weight": 100,
+ "weight": "100 g",
"bashing": 1,
"ammo_type": "components",
"count": 5
@@ -768,7 +891,7 @@
"description": "Hexamine peroxide: this fine, yellowish powder is a powerful primary explosive, used to initiate detonation of more stable explosives, such as RDX. Relatively stable, but best not store it for too long.",
"material": "powder",
"volume": "250 ml",
- "weight": 200,
+ "weight": "200 g",
"bashing": 1,
"ammo_type": "components",
"container": "bag_plastic",
@@ -786,7 +909,7 @@
"description": "A chunk of a zinc powder and sulfur mixture, bound together by superglue, that can be used as an impromptu rocket fuel.",
"material": "powder",
"volume": "250 ml",
- "weight": 70,
+ "weight": "70 g",
"bashing": 1,
"ammo_type": "components",
"container": "bag_plastic",
@@ -797,7 +920,7 @@
"id": "pur_tablets",
"name": "water purification tablet",
"category": "chems",
- "weight": 1,
+ "weight": "1 g",
"color": "white",
"use_action": "WATER_PURIFIER",
"container": "bottle_plastic_small",
@@ -820,7 +943,7 @@
"description": "A root from a hickory tree. It has an earthy smell.",
"price": 0,
"material": "wood",
- "weight": 500,
+ "weight": "500 g",
"volume": "500 ml",
"to_hit": -2
},
@@ -835,7 +958,7 @@
"description": "A handful of hard nuts from a hickory tree, still in their shell.",
"spoils_in": "180 days",
"price": 0,
- "weight": 212,
+ "weight": "212 g",
"volume": "250 ml",
"to_hit": -2
},
@@ -850,7 +973,7 @@
"description": "A handful of hard nuts from a pecan tree, still in their shell.",
"spoils_in": "180 days",
"price": 0,
- "weight": 212,
+ "weight": "212 g",
"volume": "250 ml",
"to_hit": -2
},
@@ -865,7 +988,7 @@
"description": "A handful of hard nuts from a pistachio tree, still in their shell.",
"spoils_in": "90 days",
"price": 0,
- "weight": 180,
+ "weight": "180 g",
"volume": "250 ml",
"to_hit": -2
},
@@ -880,7 +1003,7 @@
"description": "A handful of hard nuts from a almond tree, still in their shell.",
"spoils_in": "300 days",
"price": 0,
- "weight": 212,
+ "weight": "212 g",
"volume": "250 ml",
"to_hit": -2
},
@@ -895,7 +1018,7 @@
"description": "A handful of hard nuts from a peanut bush, still in their shell.",
"spoils_in": "240 days",
"price": 0,
- "weight": 200,
+ "weight": "200 g",
"volume": "250 ml",
"to_hit": -2
},
@@ -910,7 +1033,7 @@
"description": "A handful of hard nuts from a hazelnut tree, still in their shell.",
"spoils_in": "150 days",
"price": 0,
- "weight": 212,
+ "weight": "212 g",
"volume": "250 ml",
"to_hit": -2
},
@@ -925,7 +1048,7 @@
"description": "A handful of hard nuts from a chestnut tree, still in their shell.",
"spoils_in": "180 days",
"price": 0,
- "weight": 240,
+ "weight": "240 g",
"volume": "250 ml",
"to_hit": -2
},
@@ -940,7 +1063,7 @@
"description": "A handful of hard nuts from a walnut tree, still in their shell.",
"spoils_in": "180 days",
"price": 0,
- "weight": 240,
+ "weight": "240 g",
"volume": "250 ml",
"to_hit": -2
},
@@ -949,7 +1072,7 @@
"id": "water_sewage",
"name": "sewage water",
"name_plural": "sewage water",
- "weight": 280,
+ "weight": "280 g",
"color": "green",
"container": "bottle_plastic",
"comestible_type": "DRINK",
@@ -973,7 +1096,7 @@
"description": "A popular pre-cataclysm washing powder.",
"material": "powder",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "components",
"container": "box_small",
"count": 20
@@ -983,7 +1106,7 @@
"id": "lye",
"name": "lye",
"name_plural": "lye",
- "weight": 125,
+ "weight": "125 g",
"color": "white",
"container": "bottle_plastic",
"symbol": "~",
@@ -1009,7 +1132,7 @@
"description": "Steel canisters containing carbon, iron, titanium, copper and other elements in specifically engineered atomic scale configurations. A nanofabricator can assemble them into usable items.",
"material": "steel",
"volume": "15 L",
- "weight": 250,
+ "weight": "250 g",
"ammo_type": "components",
"count": 50
},
@@ -1025,7 +1148,7 @@
"description": "This is almost weightless residue left after the burning of some substance.",
"material": "powder_nonflam",
"volume": "164ml",
- "weight": 1,
+ "weight": "1 g",
"ammo_type": "components",
"count": 100
},
@@ -1130,7 +1253,7 @@
"description": "This is a pre-mixed salty solution of protein and sugar. It's meant for bacteria to eat, but if you were desperate you could eat it too; it's not much different from cup noodle stock.",
"material": "powder_nonflam",
"volume": 0.1,
- "weight": 1
+ "weight": "1 g"
},
{
"type": "COMESTIBLE",
@@ -1149,7 +1272,7 @@
"description": "These clear flakes of processed seaweed can be dissolved in boiling water to create a very sturdy, temperature resistant gel. Not only is it good for making gels to separate molecules by size, but it's a great cheat ingredient to make sure your jellies set properly.",
"material": "powder_nonflam",
"volume": 0.1,
- "weight": 1
+ "weight": "1 g"
},
{
"type": "COMESTIBLE",
@@ -1169,7 +1292,7 @@
"description": "This highly carcinogenic white powder can be readily polymerized into a whole bunch of useful water-soluble gels.",
"material": "powder_nonflam",
"volume": 0.1,
- "weight": 1
+ "weight": "1 g"
},
{
"id": "steel_grille",
@@ -1177,7 +1300,7 @@
"category": "other",
"name": "steel grille",
"description": "This is a metal grille. It can be used as a framework for making a chemical catalyst.",
- "weight": 600,
+ "weight": "600 g",
"volume": "250 ml",
"price": 500,
"to_hit": 1,
@@ -1200,7 +1323,7 @@
"material": [ "steel", "plastic" ],
"flags": [ "LEAK_ALWAYS", "RADIOACTIVE" ],
"volume": "250 ml",
- "weight": 80
+ "weight": "80 g"
},
{
"id": "wooden_bead",
@@ -1208,7 +1331,7 @@
"category": "spare_parts",
"name": "wooden bead",
"description": "This is a wooden bead. It can be used to craft inscribable jewelry or create a beaded curtain door.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 1,
"material": "wood",
@@ -1224,7 +1347,7 @@
"category": "other",
"name": "sandbag",
"description": "This is a canvas sack filled with sand. It can be used to construct simple barricades.",
- "weight": 24415,
+ "weight": "24415 g",
"volume": "16L",
"price": 0,
"material": [ "cotton", "powder" ],
@@ -1239,7 +1362,7 @@
"category": "other",
"name": "earthbag",
"description": "This is a canvas sack filled with soil. It can be used to construct simple barricades.",
- "weight": 19500,
+ "weight": "19500 g",
"volume": "16L",
"price": 0,
"material": [ "cotton", "powder" ],
@@ -1254,7 +1377,7 @@
"category": "chems",
"name": "rosin",
"description": "This is a chunk of yellowish rosin, usable as a flux for soldering.",
- "weight": 1,
+ "weight": "1 g",
"volume": "10 ml",
"count": 10,
"price": 0,
@@ -1269,7 +1392,7 @@
"name": "acetylene",
"category": "chems",
"description": "A flammable gas that explodes under pressure. Combined with oxygen, acetylene makes a great welding gas.",
- "weight": 40,
+ "weight": "40 g",
"volume": "250 ml",
"price": 1200,
"material": [ "hydrocarbons" ],
diff --git a/data/json/items/classes/book.json b/data/json/items/classes/book.json
index 8d6b9b2335ed7..ebc75337944d6 100644
--- a/data/json/items/classes/book.json
+++ b/data/json/items/classes/book.json
@@ -3,7 +3,7 @@
"abstract": "book_magazine",
"type": "BOOK",
"name": "Readable magazine",
- "weight": 70,
+ "weight": "70 g",
"volume": "250 ml",
"material": "paper",
"symbol": "?",
@@ -18,7 +18,7 @@
"type": "GENERIC",
"category": "books",
"name": "Martial art manual",
- "weight": 150,
+ "weight": "150 g",
"volume": "250 ml",
"price": 20000,
"material": "paper",
diff --git a/data/json/items/classes/comestible.json b/data/json/items/classes/comestible.json
index 8d5e1a78c7be4..708f03fe1afe9 100644
--- a/data/json/items/classes/comestible.json
+++ b/data/json/items/classes/comestible.json
@@ -6,7 +6,7 @@
"name": "Spice",
"//": "Spices are inedible in their base form but useful in crafting",
"flags": "NUTRIENT_OVERRIDE",
- "weight": 5,
+ "weight": "5 g",
"volume": "250 ml",
"price": 250,
"container": "bag_plastic",
diff --git a/data/json/items/classes/gun.json b/data/json/items/classes/gun.json
index 6a47d8956de1f..f8c5ddaf5e8e0 100644
--- a/data/json/items/classes/gun.json
+++ b/data/json/items/classes/gun.json
@@ -6,7 +6,7 @@
"name": "base gun",
"symbol": "(",
"color": "light_gray",
- "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ]
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ]
},
{
"abstract": "flamethrower_base",
@@ -29,7 +29,8 @@
"skill": "launcher",
"modes": [ [ "DEFAULT", "single", 1, "NPC_AVOID" ] ],
"valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "sights", 1 ], [ "sling", 1 ] ],
- "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEVER_JAMS" ]
+ "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEVER_JAMS" ],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ]
},
{
"abstract": "pistol_base",
@@ -80,6 +81,7 @@
"proportional": { "reload": 0.7 },
"extend": { "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEVER_JAMS" ] },
"//": "Revolvers exclude the muzzle location preventing installation of suppressors",
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
@@ -92,6 +94,24 @@
[ "underbarrel mount", 1 ]
]
},
+ {
+ "abstract": "pistol_revolver_cap_ball",
+ "copy-from": "pistol_base",
+ "type": "GUN",
+ "name": "cap & ball revolver",
+ "reload": 150,
+ "extend": { "flags": [ "RELOAD_ONE", "NO_UNLOAD" ] },
+ "//": "Slower reloads, no unloading. Base, unskilled person should take 1.5 seconds per chamber. No underbarrel mods, that's where the ram goes.",
+ "valid_mod_locations": [
+ [ "accessories", 2 ],
+ [ "barrel", 1 ],
+ [ "bore", 1 ],
+ [ "grip", 1 ],
+ [ "stock", 1 ],
+ [ "rail mount", 1 ],
+ [ "sights mount", 1 ]
+ ]
+ },
{
"abstract": "rifle_base",
"copy-from": "gun_base",
@@ -121,6 +141,7 @@
"name": "rifle with manual actions",
"name_plural": "rifles with manual actions",
"//": "Manual actions exclude the magazine location preventing installation of belt-feed adaptors",
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"valid_mod_locations": [
[ "accessories", 4 ],
[ "barrel", 1 ],
@@ -176,7 +197,8 @@
"type": "GUN",
"name": "pump action shotgun",
"reload_noise": "chuk chuk.",
- "flags": [ "RELOAD_ONE", "PUMP_ACTION" ]
+ "flags": [ "RELOAD_ONE", "PUMP_ACTION" ],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ]
},
{
"abstract": "smg_base",
diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json
index cfeb5bdcfcfb7..fe5c2e6193ee8 100644
--- a/data/json/items/comestibles/alcohol.json
+++ b/data/json/items/comestibles/alcohol.json
@@ -4,7 +4,7 @@
"id": "wine_mycus",
"name": "marloss wine",
"name_plural": "marloss wine",
- "weight": 33,
+ "weight": "33 g",
"color": "white",
"addiction_type": "alcohol",
"use_action": "MYCUS",
@@ -31,7 +31,7 @@
"id": "wine_riesling",
"name": "Riesling",
"name_plural": "Riesling",
- "weight": 50,
+ "weight": "50 g",
"color": "white",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -59,7 +59,7 @@
"id": "wine_chardonnay",
"name": "Chardonnay",
"name_plural": "Chardonnay",
- "weight": 50,
+ "weight": "50 g",
"color": "white",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -87,7 +87,7 @@
"id": "wine_cabernet",
"name": "Cabernet Sauvignon",
"name_plural": "Cabernet Sauvignon",
- "weight": 50,
+ "weight": "50 g",
"color": "red",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -113,7 +113,7 @@
"id": "wine_noir",
"name": "pinot noir",
"name_plural": "pinot noir",
- "weight": 50,
+ "weight": "50 g",
"color": "red",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -140,7 +140,7 @@
"id": "wine_marsala",
"name": "marsala",
"name_plural": "marsala",
- "weight": 50,
+ "weight": "50 g",
"color": "red",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -167,7 +167,7 @@
"id": "wine_vermouth",
"name": "vermouth",
"name_plural": "vermouth",
- "weight": 50,
+ "weight": "50 g",
"color": "red",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -194,7 +194,7 @@
"id": "wine_barley",
"name": "barley wine",
"name_plural": "barley wine",
- "weight": 249,
+ "weight": "249 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -222,7 +222,7 @@
"id": "whiskey",
"name": "whiskey",
"name_plural": "whiskey",
- "weight": 33,
+ "weight": "33 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -250,7 +250,7 @@
"id": "vodka",
"name": "vodka",
"name_plural": "vodka",
- "weight": 33,
+ "weight": "33 g",
"color": "light_cyan",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -277,7 +277,7 @@
"id": "gin",
"name": "gin",
"name_plural": "gin",
- "weight": 33,
+ "weight": "33 g",
"color": "light_cyan",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -304,7 +304,7 @@
"id": "rum",
"name": "rum",
"name_plural": "rum",
- "weight": 33,
+ "weight": "33 g",
"color": "light_cyan",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -331,7 +331,7 @@
"id": "tequila",
"name": "tequila",
"name_plural": "tequila",
- "weight": 34,
+ "weight": "34 g",
"color": "yellow",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -358,7 +358,7 @@
"id": "triple_sec",
"name": "triple sec",
"name_plural": "triple sec",
- "weight": 30,
+ "weight": "30 g",
"color": "light_cyan",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -385,7 +385,7 @@
"id": "bum_wine",
"name": "cheap wine",
"name_plural": "cheap wine",
- "weight": 35,
+ "weight": "35 g",
"color": "red",
"addiction_type": "alcohol",
"use_action": "ALCOHOL_WEAK",
@@ -413,7 +413,7 @@
"id": "mixed_alcohol_strong",
"name": "strong mixed alcohol",
"name_plural": "strong mixed alcohol",
- "weight": 34,
+ "weight": "34 g",
"color": "red",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -440,7 +440,7 @@
"id": "mixed_alcohol_weak",
"name": "weak mixed alcohol",
"name_plural": "weak mixed alcohol",
- "weight": 248,
+ "weight": "248 g",
"color": "light_red",
"addiction_type": "alcohol",
"use_action": "ALCOHOL_WEAK",
@@ -467,7 +467,7 @@
"id": "fruit_wine",
"name": "fruit wine",
"name_plural": "fruit wine",
- "weight": 36,
+ "weight": "36 g",
"color": "light_red",
"addiction_type": "alcohol",
"use_action": "ALCOHOL_WEAK",
@@ -495,7 +495,7 @@
"id": "brandy",
"name": "brandy",
"name_plural": "brandy",
- "weight": 34,
+ "weight": "34 g",
"color": "light_red",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -522,7 +522,7 @@
"id": "irish_coffee",
"name": "Irish coffee",
"name_plural": "Irish coffee",
- "weight": 260,
+ "weight": "260 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -548,7 +548,7 @@
"id": "long_island",
"name": "Long Island iced tea",
"name_plural": "Long Island iced tea",
- "weight": 51,
+ "weight": "51 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -575,7 +575,7 @@
"type": "COMESTIBLE",
"id": "drink_screwdriver",
"name": "screwdriver cocktail",
- "weight": 258,
+ "weight": "258 g",
"color": "yellow",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -603,7 +603,7 @@
"id": "drink_wild_apple",
"name": "wild apple",
"name_plural": "wild apple",
- "weight": 258,
+ "weight": "258 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -631,7 +631,7 @@
"id": "drink_rumcola",
"name": "rum & cola",
"name_plural": "rum & cola",
- "weight": 251,
+ "weight": "251 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -658,7 +658,7 @@
"id": "beer",
"name": "beer",
"name_plural": "beer",
- "weight": 251,
+ "weight": "251 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": "ALCOHOL_WEAK",
@@ -685,7 +685,7 @@
"id": "mead",
"name": "spiced mead",
"name_plural": "spiced mead",
- "weight": 36,
+ "weight": "36 g",
"color": "yellow",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -712,7 +712,7 @@
"id": "dandelion_wine",
"name": "dandelion wine",
"name_plural": "dandelion wine",
- "weight": 35,
+ "weight": "35 g",
"color": "yellow",
"addiction_type": "alcohol",
"use_action": "ALCOHOL_WEAK",
@@ -740,7 +740,7 @@
"id": "pine_wine",
"name": "pine wine",
"name_plural": "pine wine",
- "weight": 35,
+ "weight": "35 g",
"color": "light_green",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -768,7 +768,7 @@
"id": "hb_beer",
"name": "homebrew beer",
"name_plural": "homebrew beer",
- "weight": 249,
+ "weight": "249 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": "ALCOHOL_WEAK",
@@ -795,7 +795,7 @@
"id": "moonshine",
"name": "moonshine",
"name_plural": "moonshine",
- "weight": 35,
+ "weight": "35 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": "ALCOHOL_STRONG",
@@ -822,7 +822,7 @@
"id": "european_pilsner",
"name": "European pilsner",
"name_plural": "European pilsner",
- "weight": 249,
+ "weight": "249 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": "ALCOHOL_WEAK",
@@ -850,7 +850,7 @@
"id": "pale_ale",
"name": "American pale ale",
"name_plural": "American pale ale",
- "weight": 249,
+ "weight": "249 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": "ALCOHOL_WEAK",
@@ -878,7 +878,7 @@
"id": "india_pale_ale",
"name": "India pale ale",
"name_plural": "India pale ale",
- "weight": 249,
+ "weight": "249 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": "ALCOHOL_WEAK",
@@ -906,7 +906,7 @@
"id": "stout",
"name": "stout",
"name_plural": "stout",
- "weight": 205,
+ "weight": "205 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": "ALCOHOL_WEAK",
@@ -934,7 +934,7 @@
"id": "belgian_ale",
"name": "Belgian ale",
"name_plural": "Belgian ale",
- "weight": 249,
+ "weight": "249 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": "ALCOHOL_WEAK",
@@ -962,7 +962,7 @@
"id": "imperial_stout",
"name": "imperial stout",
"name_plural": "imperial stout",
- "weight": 249,
+ "weight": "249 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -989,7 +989,7 @@
"type": "COMESTIBLE",
"id": "drink_strawberry_surprise",
"name": "strawberry surprise",
- "weight": 43,
+ "weight": "43 g",
"color": "pink",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -1018,7 +1018,7 @@
"id": "drink_boozeberry",
"name": "boozeberry",
"name_plural": "boozeberries",
- "weight": 43,
+ "weight": "43 g",
"color": "cyan",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -1047,7 +1047,7 @@
"id": "single_malt_whiskey",
"name": "single malt whiskey",
"name_plural": "single malt whiskey",
- "weight": 33,
+ "weight": "33 g",
"color": "brown",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -1074,7 +1074,7 @@
"type": "COMESTIBLE",
"id": "drink_hobo",
"name": "fancy hobo",
- "weight": 50,
+ "weight": "50 g",
"color": "yellow",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -1101,7 +1101,7 @@
"type": "COMESTIBLE",
"id": "drink_kalimotxo",
"name": "kalimotxo",
- "weight": 250,
+ "weight": "250 g",
"color": "red",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -1128,7 +1128,7 @@
"type": "COMESTIBLE",
"id": "drink_beeknees",
"name": "bee's knees",
- "weight": 248,
+ "weight": "248 g",
"color": "yellow",
"addiction_type": "alcohol",
"use_action": "ALCOHOL_WEAK",
@@ -1153,7 +1153,7 @@
"type": "COMESTIBLE",
"id": "drink_wsour",
"name": "whiskey sour",
- "weight": 249,
+ "weight": "249 g",
"color": "yellow",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -1178,7 +1178,7 @@
"type": "COMESTIBLE",
"id": "honey_gold",
"name": "honeygold brew",
- "weight": 259,
+ "weight": "259 g",
"color": "yellow",
"use_action": "ALCOHOL_WEAK",
"stim": 1,
@@ -1202,7 +1202,7 @@
"type": "COMESTIBLE",
"id": "honey_ant",
"name": "honey ball",
- "weight": 178,
+ "weight": "178 g",
"color": "yellow",
"addiction_type": "alcohol",
"use_action": "ALCOHOL_WEAK",
@@ -1227,7 +1227,7 @@
"type": "COMESTIBLE",
"id": "eggnog_spiked",
"name": "spiked eggnog",
- "weight": 132,
+ "weight": "132 g",
"color": "white",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -1256,7 +1256,7 @@
"type": "COMESTIBLE",
"id": "drink_martini",
"name": "martini",
- "weight": 248,
+ "weight": "49600 mg",
"color": "white",
"addiction_type": "alcohol",
"use_action": "ALCOHOL",
@@ -1264,14 +1264,15 @@
"container": "bottle_glass",
"comestible_type": "DRINK",
"symbol": "~",
- "quench": 25,
+ "quench": 5,
"addiction_potential": 4,
- "calories": 61,
+ "calories": 13,
"description": "This is a popular cocktail made with gin and dry vermouth, dating from the Prohibition era.",
"price": 850,
"material": [ "alcohol", "water" ],
"primary_material": "alcohol",
"volume": "500 ml",
+ "charges": 5,
"phase": "liquid",
"flags": [ "EATEN_COLD" ],
"freezing_point": -22,
diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json
index 58d17f90ca37e..9e7ad6b48cef5 100644
--- a/data/json/items/comestibles/bread.json
+++ b/data/json/items/comestibles/bread.json
@@ -1,11 +1,32 @@
[
+ {
+ "id": "donut_holes",
+ "type": "COMESTIBLE",
+ "name": "donut holes",
+ "name_plural": "donut holes",
+ "weight": 226,
+ "color": "yellow",
+ "spoils_in": "10 days",
+ "comestible_type": "FOOD",
+ "symbol": "%",
+ "calories": 60,
+ "quench": -1,
+ "healthy": -1,
+ "description": "These balls of dough have been cut into shape, covered with sugar, and cooked to a crisp. A staple of fairgrounds everywhere.",
+ "price": 100,
+ "volume": "250 ml",
+ "charges": 4,
+ "flags": [ "EATEN_HOT" ],
+ "looks_like": "bread",
+ "fun": 4
+ },
{
"id": "sourdough_young",
"type": "GENERIC",
"category": "food",
"name": "juvenile sourdough starter",
"description": "This jar contains a floury paste that is slowly going bad. Someday it will be sourdough.",
- "weight": 52,
+ "weight": "52 g",
"volume": "250 ml",
"price": 10,
"bashing": 8,
@@ -28,7 +49,7 @@
"category": "food",
"name": "freshly fed sourdough starter",
"description": "This jar contains a floury paste with sourdough starter mixed in. It needs a few hours to recover its strength before it can be used again.",
- "weight": 52,
+ "weight": "52 g",
"volume": "250 ml",
"price": 10,
"bashing": 8,
@@ -51,7 +72,7 @@
"category": "food",
"name": "sourdough starter",
"description": "This jar contains a precious mix of flour, water, molds and bacteria from the air. When you add flour and water to it, after a few hours it froths and rises.",
- "weight": 52,
+ "weight": "52 g",
"looks_like": "jar_glass",
"volume": "250 ml",
"price": 50,
@@ -64,7 +85,7 @@
"type": "COMESTIBLE",
"id": "sourdough_bread",
"name": "sourdough bread",
- "weight": 56,
+ "weight": "56 g",
"color": "brown",
"spoils_in": "8 days",
"container": "bag_plastic",
@@ -85,7 +106,7 @@
"type": "COMESTIBLE",
"id": "flatbread",
"name": "flatbread",
- "weight": 85,
+ "weight": "85 g",
"color": "brown",
"spoils_in": "11 days 16 hours",
"container": "bag_plastic",
@@ -103,7 +124,7 @@
"type": "COMESTIBLE",
"id": "bread",
"name": "bread",
- "weight": 60,
+ "weight": "60 g",
"color": "brown",
"spoils_in": "10 days",
"container": "bag_plastic",
@@ -124,7 +145,7 @@
"type": "COMESTIBLE",
"id": "cornbread",
"name": "cornbread",
- "weight": 60,
+ "weight": "60 g",
"color": "yellow",
"spoils_in": "30 days",
"container": "bag_plastic",
@@ -146,7 +167,7 @@
"type": "COMESTIBLE",
"id": "johnnycake",
"name": "johnnycake",
- "weight": 49,
+ "weight": "49 g",
"color": "yellow",
"spoils_in": "20 days",
"comestible_type": "FOOD",
@@ -166,7 +187,7 @@
"type": "COMESTIBLE",
"id": "tortilla_corn",
"name": "corn tortilla",
- "weight": 24,
+ "weight": "24 g",
"color": "brown",
"spoils_in": "20 days",
"container": "bag_plastic",
@@ -188,7 +209,7 @@
"type": "COMESTIBLE",
"id": "hardtack",
"name": "hardtack",
- "weight": 80,
+ "weight": "80 g",
"color": "white",
"spoils_in": "360 days",
"comestible_type": "FOOD",
@@ -209,7 +230,7 @@
"type": "COMESTIBLE",
"id": "biscuit",
"name": "biscuit",
- "weight": 30,
+ "weight": "30 g",
"color": "brown",
"spoils_in": "7 days 12 hours",
"container": "box_small",
@@ -229,7 +250,7 @@
"type": "COMESTIBLE",
"id": "wastebread",
"name": "wastebread",
- "weight": 60,
+ "weight": "60 g",
"color": "white",
"spoils_in": 990,
"comestible_type": "FOOD",
diff --git a/data/json/items/comestibles/brewing.json b/data/json/items/comestibles/brewing.json
index 2ea3950d1258f..86d225ee20597 100644
--- a/data/json/items/comestibles/brewing.json
+++ b/data/json/items/comestibles/brewing.json
@@ -4,7 +4,7 @@
"id": "brew_mycus_wine",
"name": "mycus wine must",
"description": "Unfermented mycus wine. A goopy white mess, made from fruit of mycus. It smells sweetly of mushrooms.",
- "weight": 33,
+ "weight": "33 g",
"color": "white",
"container": "bottle_glass",
"flags": [ "EATEN_COLD", "MYCUS_OK" ],
@@ -24,7 +24,7 @@
"id": "brew_whiskey",
"name": "whiskey wort",
"description": "Unfermented whiskey. The base of a fine drink. Not the traditional preparation, but you don't have the time.",
- "weight": 33,
+ "weight": "33 g",
"color": "brown",
"container": "bottle_glass",
"flags": [ "TRADER_AVOID", "NUTRIENT_OVERRIDE" ],
@@ -45,7 +45,7 @@
"name": "whiskey wash",
"name_plural": "whiskey washes",
"description": "Fermented, but not distilled whiskey. No longer tastes sweet.",
- "weight": 33,
+ "weight": "33 g",
"color": "brown",
"addiction_type": "alcohol",
"addiction_potential": 1,
@@ -70,7 +70,7 @@
"name": "fermenting gin mash",
"name_plural": "fermenting gin mashes",
"description": "Undistilled gin mash. Distilling it will produce gin.",
- "weight": 33,
+ "weight": "33 g",
"color": "brown",
"container": "bottle_glass",
"flags": [ "TRADER_AVOID", "NUTRIENT_OVERRIDE" ],
@@ -91,7 +91,7 @@
"name": "gin mash",
"name_plural": "gin mashes",
"description": "Gin mash, after the junipers have had time to add flavor, ready to be distilled or drunk as is.",
- "weight": 33,
+ "weight": "33 g",
"color": "yellow",
"addiction_type": "alcohol",
"addiction_potential": 1,
@@ -115,7 +115,7 @@
"id": "brew_vodka",
"name": "vodka wort",
"description": "Unfermented vodka. Water with sugar from enzymatic breakdown of malted grains or just added in pure form.",
- "weight": 50,
+ "weight": "50 g",
"color": "light_cyan",
"container": "bottle_glass",
"symbol": "~",
@@ -136,7 +136,7 @@
"name": "vodka wash",
"name_plural": "vodka washes",
"description": "Fermented, but not distilled vodka. No longer tastes sweet.",
- "weight": 33,
+ "weight": "33 g",
"color": "light_cyan",
"addiction_type": "alcohol",
"addiction_potential": 1,
@@ -160,7 +160,7 @@
"id": "brew_rum",
"name": "rum wort",
"description": "Unfermented rum. Sugar caramel or molasses brewed into sweet water. Basically a saccharine soup.",
- "weight": 33,
+ "weight": "33 g",
"color": "light_cyan",
"container": "bottle_glass",
"flags": [ "TRADER_AVOID", "NUTRIENT_OVERRIDE" ],
@@ -181,7 +181,7 @@
"name": "rum wash",
"name_plural": "rum washes",
"description": "Fermented, but not distilled rum. No longer tastes sweet.",
- "weight": 50,
+ "weight": "50 g",
"color": "light_cyan",
"addiction_type": "alcohol",
"addiction_potential": 1,
@@ -205,7 +205,7 @@
"id": "brew_fruit_wine",
"name": "fruit wine must",
"description": "Unfermented fruit wine. A sweet, boiled juice made from berries or fruit.",
- "weight": 46,
+ "weight": "46 g",
"color": "light_red",
"container": "bottle_glass",
"flags": [ "TRADER_AVOID", "NUTRIENT_OVERRIDE" ],
@@ -226,7 +226,7 @@
"id": "brew_mead",
"name": "spiced mead must",
"description": "Unfermented spiced mead. Diluted honey and yeast.",
- "weight": 38,
+ "weight": "38 g",
"color": "yellow",
"container": "bottle_glass",
"flags": [ "TRADER_AVOID", "NUTRIENT_OVERRIDE" ],
@@ -248,7 +248,7 @@
"id": "brew_dandelion_wine",
"name": "dandelion wine must",
"description": "Unfermented dandelion wine. A sticky mixture of water, sugar, yeast, and dandelion petals.",
- "weight": 38,
+ "weight": "38 g",
"color": "yellow",
"container": "bottle_glass",
"symbol": "~",
@@ -268,7 +268,7 @@
"id": "brew_pine_wine",
"name": "pine wine must",
"description": "Unfermented pine wine. A sticky mixture of water, sugar, yeast, and pine resins.",
- "weight": 38,
+ "weight": "38 g",
"color": "green",
"container": "bottle_glass",
"symbol": "~",
@@ -288,7 +288,7 @@
"id": "brew_hb_beer",
"name": "beer wort",
"description": "Unfermented homebrew beer. A boiled and chilled mash of malted barley, spiced with some fine hops.",
- "weight": 249,
+ "weight": "249 g",
"color": "brown",
"container": "jug_plastic",
"flags": [ "TRADER_AVOID", "NUTRIENT_OVERRIDE" ],
@@ -308,7 +308,7 @@
"name": "moonshine mash",
"name_plural": "moonshine mashes",
"description": "Unfermented moonshine. Just some water, sugar and corn, like good ol' aunt's recipe.",
- "weight": 50,
+ "weight": "50 g",
"color": "brown",
"container": "jug_plastic",
"flags": [ "TRADER_AVOID", "NUTRIENT_OVERRIDE" ],
@@ -329,7 +329,7 @@
"name": "moonshine wash",
"name_plural": "moonshine washes",
"description": "Fermented, but not distilled moonshine. Contains all the contaminants you don't want in your moonshine.",
- "weight": 50,
+ "weight": "50 g",
"color": "brown",
"addiction_type": "alcohol",
"addiction_potential": 1,
@@ -352,7 +352,7 @@
"type": "COMESTIBLE",
"id": "brew_milk_curdled",
"name": "curdling milk",
- "weight": 236,
+ "weight": "236 g",
"color": "white",
"spoils_in": "28 days",
"container": "waterskin",
@@ -374,7 +374,7 @@
"id": "brew_vinegar",
"name": "unfermented vinegar",
"description": "Mixture of water, alcohol and fruit juice that will eventually become vinegar.",
- "weight": 127,
+ "weight": "127 g",
"color": "yellow",
"container": "jug_plastic",
"symbol": "~",
diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json
index 7baeb0254ccd2..fb5eb7cc51202 100644
--- a/data/json/items/comestibles/carnivore.json
+++ b/data/json/items/comestibles/carnivore.json
@@ -18,7 +18,7 @@
"name_plural": "fillets of fish",
"description": "Freshly caught fish. Makes a passable meal raw.",
"//": "Nutrition information based on cod",
- "weight": 148,
+ "weight": "148 g",
"volume": "250 ml",
"price": 500,
"spoils_in": "12 hours",
@@ -85,7 +85,7 @@
"name": "chunk of meat",
"name_plural": "chunks of meat",
"description": "Freshly butchered meat. You could eat it raw, but cooking it is better.",
- "weight": 296,
+ "weight": "296 g",
"volume": "250 ml",
"price": 500,
"spoils_in": "1 day",
@@ -119,7 +119,7 @@
"name_plural": "butchery refuse",
"charges": 15,
"volume": "2500 ml",
- "weight": 250,
+ "weight": "250 g",
"color": "black",
"looks_like": "feces_manure",
"description": "Eugh. This is a mess of dirt, excreta, connective tissue, and bits of matter like hair and claws, leftover from the butchering process. Eating it isn't even worth thinking about, but disposing of it might be a concern as it could attract vermin.",
@@ -217,7 +217,7 @@
"type": "COMESTIBLE",
"name": "stomach",
"description": "The stomach of a woodland creature. It is surprisingly durable.",
- "weight": 72,
+ "weight": "72 g",
"volume": "250 ml",
"price": 200,
"spoils_in": "8 hours",
@@ -242,7 +242,7 @@
"name_plural": "meat jerky",
"description": "Salty dried meat that lasts for a long time, but will make you thirsty.",
"primary_material": "cured_meat",
- "weight": 85,
+ "weight": "85 g",
"container": "bag_plastic",
"color": "brown",
"spoils_in": "24 days",
@@ -292,7 +292,7 @@
"quench": -5,
"fun": 4,
"calories": 348,
- "weight": 85,
+ "weight": "85 g",
"vitamins": [ [ "vitA", 0 ], [ "vitC", 0 ], [ "calcium", 2 ], [ "iron", 1 ], [ "vitB", 8 ] ],
"proportional": { "price": 0.44 }
},
@@ -343,7 +343,7 @@
"name": "piece of raw lung",
"name_plural": "pieces of raw lung",
"description": "A portion of lung from an animal. It's spongy and pink, and spoils very quickly. It can be a delicacy if properly prepared - but if improperly prepared, it's a chewy lump of flavorless connective tissue.",
- "weight": 56,
+ "weight": "56 g",
"volume": "250 ml",
"color": "pink",
"charges": 4,
@@ -436,7 +436,8 @@
"description": "No, this is not beans.",
"healthy": -2,
"quench": -2,
- "fun": -3
+ "fun": -3,
+ "parasites": 0
},
{
"id": "sweetbread",
@@ -466,7 +467,7 @@
"id": "blood",
"name": "blood",
"name_plural": "blood",
- "weight": 265,
+ "weight": "265 g",
"color": "red",
"container": "flask_glass",
"comestible_type": "DRINK",
@@ -486,7 +487,7 @@
"id": "bone",
"category": "spare_parts",
"name": "bone",
- "weight": 225,
+ "weight": "225 g",
"color": "white",
"symbol": "%",
"description": "A bone from some creature or other. Could be used to make some stuff, like needles.",
@@ -500,7 +501,7 @@
"id": "fat",
"name": "chunk of fat",
"name_plural": "chunks of fat",
- "weight": 220,
+ "weight": "220 g",
"color": "pink",
"spoils_in": "7 days",
"comestible_type": "FOOD",
@@ -520,7 +521,7 @@
"type": "COMESTIBLE",
"id": "tallow",
"name": "tallow",
- "weight": 110,
+ "weight": "110 g",
"color": "white",
"spoils_in": "60 days",
"comestible_type": "FOOD",
@@ -551,7 +552,7 @@
"category": "other",
"name": "chunk of tainted meat",
"name_plural": "chunks of tainted meat",
- "weight": 238,
+ "weight": "238 g",
"color": "red",
"spoils_in": "4 hours",
"use_action": "POISON",
@@ -571,7 +572,7 @@
"id": "bone_tainted",
"category": "other",
"name": "tainted bone",
- "weight": 212,
+ "weight": "212 g",
"color": "light_gray",
"use_action": "POISON",
"comestible_type": "FOOD",
@@ -598,7 +599,7 @@
"id": "fat_tainted",
"category": "other",
"name": "tainted fat",
- "weight": 192,
+ "weight": "192 g",
"color": "yellow",
"spoils_in": "4 hours",
"use_action": "POISON",
@@ -618,7 +619,7 @@
"id": "tallow_tainted",
"name": "tainted tallow",
"category": "other",
- "weight": 128,
+ "weight": "128 g",
"color": "light_gray",
"use_action": "POISON",
"comestible_type": "FOOD",
@@ -639,7 +640,7 @@
"type": "COMESTIBLE",
"id": "stomach_boiled",
"name": "large boiled stomach",
- "weight": 145,
+ "weight": "145 g",
"color": "red",
"spoils_in": "1 day",
"comestible_type": "FOOD",
@@ -664,7 +665,7 @@
"type": "COMESTIBLE",
"id": "small_stomach_boiled",
"name": "boiled stomach",
- "weight": 72,
+ "weight": "72 g",
"color": "red",
"spoils_in": "1 day",
"comestible_type": "FOOD",
@@ -690,7 +691,7 @@
"id": "raw_leather",
"category": "spare_parts",
"name": "raw hide",
- "weight": 15,
+ "weight": "15 g",
"color": "pink",
"spoils_in": "1 day 12 hours",
"comestible_type": "FOOD",
@@ -729,7 +730,7 @@
"id": "raw_fur",
"category": "spare_parts",
"name": "raw pelt",
- "weight": 17,
+ "weight": "17 g",
"color": "brown",
"spoils_in": "1 day 12 hours",
"comestible_type": "FOOD",
@@ -761,7 +762,7 @@
"comestible_type": "FOOD",
"id": "flesh_golem_heart",
"name": "seeping heart",
- "weight": 2035,
+ "weight": "2035 g",
"color": "black_red",
"symbol": "%",
"healthy": -10,
@@ -779,7 +780,7 @@
"comestible_type": "FOOD",
"id": "jabberwock_heart",
"name": "putrid heart",
- "weight": 4535,
+ "weight": "4535 g",
"color": "black_red",
"symbol": "%",
"healthy": -10,
@@ -797,7 +798,7 @@
"comestible_type": "FOOD",
"id": "jabberwock_heart_desiccated",
"name": "desiccated putrid heart",
- "weight": 1360,
+ "weight": "1360 g",
"color": "black_red",
"symbol": "%",
"healthy": -5,
diff --git a/data/json/items/comestibles/dairy.json b/data/json/items/comestibles/dairy.json
index 5e0d9c144d4f0..124978adb0080 100644
--- a/data/json/items/comestibles/dairy.json
+++ b/data/json/items/comestibles/dairy.json
@@ -27,7 +27,7 @@
"id": "milk_evap",
"name": "evaporated milk",
"name_plural": "evaporated milk",
- "weight": 20,
+ "weight": "20 g",
"color": "white",
"spoils_in": "1 day",
"container": "can_food",
@@ -50,7 +50,7 @@
"id": "buttermilk",
"name": "buttermilk",
"name_plural": "buttermilk",
- "weight": 258,
+ "weight": "258 g",
"color": "white",
"spoils_in": "2 d",
"container": "bottle_plastic",
@@ -65,14 +65,13 @@
"volume": "250 ml",
"phase": "liquid",
"flags": [ "EATEN_COLD" ],
- "fun": "0",
"vitamins": [ [ "vitA", 1 ], [ "vitC", 1 ], [ "calcium", 1 ] ]
},
{
"type": "COMESTIBLE",
"id": "yoghurt",
"name": "yogurt",
- "weight": 238,
+ "weight": "238 g",
"color": "magenta",
"spoils_in": "20 hours",
"container": "cup_plastic",
@@ -93,7 +92,7 @@
"id": "butter",
"name": "butter",
"name_plural": "butter",
- "weight": 14.18,
+ "weight": "14180 mg",
"color": "yellow",
"spoils_in": "14 days",
"comestible_type": "FOOD",
@@ -115,7 +114,7 @@
"name": "ghee",
"name_plural": "ghee",
"copy-from": "butter",
- "weight": 13.5,
+ "weight": "13500 mg",
"spoils_in": "90 days",
"container": "jar_glass_sealed",
"calories": 112,
@@ -127,7 +126,7 @@
"type": "COMESTIBLE",
"id": "pudding",
"name": "pudding",
- "weight": 232,
+ "weight": "232 g",
"color": "light_gray",
"spoils_in": "7 days 12 hours",
"container": "cup_plastic",
@@ -146,7 +145,7 @@
"type": "COMESTIBLE",
"id": "milk_curdled",
"name": "curdled milk",
- "weight": 236,
+ "weight": "236 g",
"color": "white",
"spoils_in": "28 days",
"container": "waterskin",
@@ -166,7 +165,7 @@
"id": "cheese_hard",
"name": "hard cheese",
"name_plural": "hard cheese",
- "weight": 34,
+ "weight": "34 g",
"color": "yellow",
"spoils_in": "180 days",
"stim": 1,
@@ -188,7 +187,7 @@
"id": "cheese",
"name": "cheese",
"name_plural": "cheese",
- "weight": 30,
+ "weight": "30 g",
"color": "yellow",
"spoils_in": "28 days",
"stim": 1,
@@ -209,7 +208,7 @@
"type": "COMESTIBLE",
"id": "quesadilla_cheese",
"name": "quesadilla",
- "weight": 116,
+ "weight": "116 g",
"color": "brown",
"spoils_in": "20 days",
"container": "wrapper",
@@ -231,7 +230,7 @@
"id": "milk_powder",
"name": "powdered milk",
"name_plural": "powdered milk",
- "weight": 7,
+ "weight": "7 g",
"color": "white",
"container": "bag_plastic",
"comestible_type": "FOOD",
@@ -254,7 +253,7 @@
"id": "con_milk",
"name": "condensed milk",
"name_plural": "condensed milk",
- "weight": 32,
+ "weight": "32 g",
"color": "white",
"spoils_in": "1 day",
"container": "can_food",
diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json
index 2c7b01f907c8a..4b2152c33616c 100644
--- a/data/json/items/comestibles/drink.json
+++ b/data/json/items/comestibles/drink.json
@@ -4,7 +4,7 @@
"id": "apple_cider",
"name": "apple cider",
"name_plural": "apple cider",
- "weight": 263,
+ "weight": "263 g",
"color": "brown",
"spoils_in": "6 days",
"container": "bottle_plastic",
@@ -27,7 +27,7 @@
"type": "COMESTIBLE",
"id": "almond_milk",
"name": "almond milk",
- "weight": 258,
+ "weight": "258 g",
"color": "white",
"spoils_in": "3 days",
"container": "jug_plastic",
@@ -49,7 +49,7 @@
"type": "COMESTIBLE",
"id": "soy_milk",
"name": "soy milk",
- "weight": 258,
+ "weight": "258 g",
"color": "white",
"spoils_in": "3 days",
"container": "jug_plastic",
@@ -105,7 +105,7 @@
"type": "COMESTIBLE",
"id": "can_coconut",
"name": "coconut milk",
- "weight": 238,
+ "weight": "238 g",
"color": "white",
"spoils_in": "1 day",
"container": "can_food",
@@ -126,7 +126,7 @@
"id": "chai_tea",
"name": "chai tea",
"name_plural": "chai tea",
- "weight": 259,
+ "weight": "259 g",
"color": "brown",
"spoils_in": "12 hours",
"use_action": "CAFF",
@@ -164,7 +164,7 @@
"type": "COMESTIBLE",
"id": "choc_drink",
"name": "chocolate drink",
- "weight": 236,
+ "weight": "236 g",
"color": "brown",
"container": "can_drink",
"comestible_type": "DRINK",
@@ -185,7 +185,7 @@
"id": "coffee",
"name": "coffee",
"name_plural": "coffee",
- "weight": 250,
+ "weight": "250 g",
"color": "brown",
"addiction_type": "caffeine",
"use_action": "CAFF",
@@ -209,7 +209,7 @@
"id": "coffee_substitute",
"name": "coffee substitute",
"name_plural": "coffee substitute",
- "weight": 250,
+ "weight": "250 g",
"color": "brown",
"container": "bottle_plastic",
"comestible_type": "DRINK",
@@ -230,7 +230,7 @@
"id": "chicory_coffee",
"name": "chicory brew",
"name_plural": "chicory brew",
- "weight": 252,
+ "weight": "252 g",
"color": "brown",
"comestible_type": "DRINK",
"symbol": "~",
@@ -249,7 +249,7 @@
"type": "COMESTIBLE",
"id": "cola",
"name": "dark cola",
- "weight": 248,
+ "weight": "248 g",
"color": "brown",
"addiction_type": "caffeine",
"use_action": "CAFF",
@@ -274,7 +274,7 @@
"type": "COMESTIBLE",
"id": "colamdew",
"name": "energy cola",
- "weight": 234,
+ "weight": "234 g",
"color": "light_green",
"addiction_type": "caffeine",
"use_action": "CAFF",
@@ -300,7 +300,7 @@
"id": "con_milk",
"name": "condensed milk",
"name_plural": "condensed milk",
- "weight": 32,
+ "weight": "32 g",
"color": "white",
"spoils_in": "1 day",
"container": "can_food",
@@ -322,7 +322,7 @@
"type": "COMESTIBLE",
"id": "creamsoda",
"name": "cream soda",
- "weight": 247,
+ "weight": "247 g",
"color": "light_gray",
"addiction_type": "caffeine",
"use_action": "CAFF",
@@ -347,7 +347,7 @@
"type": "COMESTIBLE",
"id": "cranberry_juice",
"name": "cranberry juice",
- "weight": 250,
+ "weight": "250 g",
"color": "magenta",
"spoils_in": "20 d",
"container": "bottle_plastic",
@@ -371,7 +371,7 @@
"id": "crispycran",
"name": "crispy cranberry",
"name_plural": "crispy cranberries",
- "weight": 250,
+ "weight": "250 g",
"color": "pink",
"container": "can_drink",
"comestible_type": "DRINK",
@@ -393,7 +393,7 @@
"id": "dandelion_tea",
"name": "dandelion tea",
"name_plural": "dandelion tea",
- "weight": 252,
+ "weight": "252 g",
"color": "yellow",
"comestible_type": "DRINK",
"symbol": "~",
@@ -412,7 +412,7 @@
"type": "COMESTIBLE",
"id": "eggnog",
"name": "eggnog",
- "weight": 134,
+ "weight": "134 g",
"color": "white",
"spoils_in": "8 hours",
"container": "bottle_glass",
@@ -434,7 +434,7 @@
"type": "COMESTIBLE",
"id": "energy_drink",
"name": "energy drink",
- "weight": 253,
+ "weight": "253 g",
"color": "magenta",
"addiction_type": "caffeine",
"use_action": "CAFF",
@@ -477,7 +477,7 @@
"id": "herbal_tea",
"name": "herbal tea",
"name_plural": "herbal tea",
- "weight": 250,
+ "weight": "250 g",
"color": "green",
"container": "bottle_plastic",
"comestible_type": "DRINK",
@@ -501,7 +501,7 @@
"name": "hot chocolate",
"name_plural": "hot chocolate",
"description": "Also known as hot cocoa, this heated chocolate beverage is perfect for a cold winter day.",
- "weight": 289,
+ "weight": "289 g",
"volume": "250 ml",
"price": 285,
"phase": "liquid",
@@ -522,7 +522,7 @@
"type": "COMESTIBLE",
"id": "juice",
"name": "fruit juice",
- "weight": 125,
+ "weight": "125 g",
"color": "light_red",
"spoils_in": "5 days",
"container": "bottle_plastic",
@@ -546,7 +546,7 @@
"type": "COMESTIBLE",
"id": "kompot",
"name": "kompot",
- "weight": 250,
+ "weight": "250 g",
"color": "red",
"spoils_in": "7 days 12 hours",
"container": "jar_3l_glass",
@@ -570,7 +570,7 @@
"id": "lemonade",
"name": "lemonade",
"name_plural": "lemonade",
- "weight": 260,
+ "weight": "260 g",
"color": "yellow",
"container": "bottle_plastic",
"comestible_type": "DRINK",
@@ -592,7 +592,7 @@
"type": "COMESTIBLE",
"id": "lemonlime",
"name": "lemon-lime soda",
- "weight": 258,
+ "weight": "258 g",
"color": "yellow",
"container": "can_drink",
"comestible_type": "DRINK",
@@ -616,7 +616,7 @@
"name": "Mexican hot chocolate",
"name_plural": "Mexican hot chocolate",
"description": "This semi-bitter chocolate drink made from cocoa, cinnamon, and chilies, traces its history to the Maya and Aztecs. Perfect for a cold winter day.",
- "weight": 263,
+ "weight": "263 g",
"volume": "250 ml",
"price": 335,
"phase": "liquid",
@@ -637,7 +637,7 @@
"id": "milk",
"name": "milk",
"name_plural": "milk",
- "weight": 258,
+ "weight": "258 g",
"color": "white",
"spoils_in": "1 d",
"container": "jug_plastic",
@@ -668,7 +668,7 @@
"type": "COMESTIBLE",
"id": "milk_coffee",
"name": "coffee milk",
- "weight": 259,
+ "weight": "259 g",
"color": "brown",
"addiction_type": "caffeine",
"spoils_in": "14 hours",
@@ -694,7 +694,7 @@
"type": "COMESTIBLE",
"id": "milk_tea",
"name": "milk tea",
- "weight": 259,
+ "weight": "259 g",
"color": "brown",
"spoils_in": "12 hours",
"use_action": "CAFF",
@@ -719,7 +719,7 @@
"type": "COMESTIBLE",
"id": "oj",
"name": "orange juice",
- "weight": 263,
+ "weight": "263 g",
"color": "yellow",
"spoils_in": "5 days",
"container": "bottle_plastic",
@@ -743,7 +743,7 @@
"type": "COMESTIBLE",
"id": "orangesoda",
"name": "orange soda",
- "weight": 248,
+ "weight": "248 g",
"color": "yellow",
"container": "can_drink",
"comestible_type": "DRINK",
@@ -765,7 +765,7 @@
"id": "pine_tea",
"name": "pine needle tea",
"name_plural": "pine needle tea",
- "weight": 268,
+ "weight": "268 g",
"color": "light_green",
"comestible_type": "DRINK",
"symbol": "~",
@@ -784,7 +784,7 @@
"type": "COMESTIBLE",
"id": "purple_drink",
"name": "grape drink",
- "weight": 260,
+ "weight": "260 g",
"color": "magenta",
"stim": 2,
"container": "can_drink",
@@ -808,7 +808,7 @@
"id": "rootbeer",
"name": "root beer",
"name_plural": "root beer",
- "weight": 260,
+ "weight": "260 g",
"color": "brown",
"container": "can_drink",
"comestible_type": "DRINK",
@@ -829,7 +829,7 @@
"type": "COMESTIBLE",
"id": "spezi",
"name": "spezi",
- "weight": 250,
+ "weight": "250 g",
"color": "brown",
"addiction_type": "caffeine",
"stim": 4,
@@ -853,7 +853,7 @@
"type": "COMESTIBLE",
"id": "sports_drink",
"name": "sports drink",
- "weight": 257,
+ "weight": "257 g",
"color": "light_red",
"container": "bottle_plastic",
"comestible_type": "DRINK",
@@ -874,7 +874,7 @@
"id": "sweet_water",
"name": "sweet water",
"name_plural": "sweet water",
- "weight": 260,
+ "weight": "260 g",
"color": "light_cyan",
"container": "bottle_plastic",
"comestible_type": "DRINK",
@@ -893,7 +893,7 @@
"type": "COMESTIBLE",
"id": "tea",
"name": "tea",
- "weight": 250,
+ "weight": "250 g",
"color": "brown",
"use_action": "CAFF",
"stim": 3,
@@ -914,7 +914,7 @@
"type": "COMESTIBLE",
"id": "tea_bark",
"name": "bark tea",
- "weight": 251,
+ "weight": "251 g",
"color": "brown",
"use_action": "ANTIPARASITIC",
"container": "bottle_plastic",
@@ -933,7 +933,7 @@
"type": "COMESTIBLE",
"id": "V8",
"name": "V8",
- "weight": 250,
+ "weight": "250 g",
"color": "red",
"spoils_in": "10 days",
"container": "can_drink",
diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json
index 11d9359303cf5..070fa133a91f3 100644
--- a/data/json/items/comestibles/drink_other.json
+++ b/data/json/items/comestibles/drink_other.json
@@ -3,7 +3,7 @@
"type": "COMESTIBLE",
"id": "sauce_red",
"name": "red sauce",
- "weight": 32,
+ "weight": "32 g",
"color": "red",
"spoils_in": "3 days",
"container": "can_food",
@@ -31,7 +31,7 @@
"copy-from": "syrup",
"description": "A water and sugar solution that has been extracted from a maple tree.",
"price": 50,
- "weight": 250,
+ "weight": "250 g",
"volume": "250 ml",
"charges": 1,
"comestible_type": "DRINK",
@@ -56,7 +56,7 @@
"description": "A gloppy mix of egg, oil, and salt that is traditionally used to moisten sandwiches.",
"price": 187,
"material": [ "junk", "egg" ],
- "weight": 15,
+ "weight": "15 g",
"volume": "250 ml",
"comestible_type": "DRINK",
"container": "bottle_plastic",
@@ -77,7 +77,7 @@
"description": "A viscous paste of tomato, salt, and vinegar.",
"price": 1875,
"material": [ "veggy", "junk" ],
- "weight": 18,
+ "weight": "18 g",
"volume": "250 ml",
"comestible_type": "DRINK",
"container": "bottle_plastic",
@@ -97,7 +97,7 @@
"description": "A condiment made from the seeds of a mustard plant (/Brassica/ or /Sinapis/), vinegar, salt, and spices.",
"price": 50,
"material": "junk",
- "weight": 5,
+ "weight": "5 g",
"volume": "250 ml",
"comestible_type": "DRINK",
"container": "bottle_plastic",
@@ -117,7 +117,7 @@
"description": "Honey, that stuff bees make. This one is \"forest honey\", a liquid form of honey. This honey won't spoil and is good for your digestion.",
"price": 250,
"material": "honey",
- "weight": 22,
+ "weight": "22 g",
"volume": "250 ml",
"comestible_type": "DRINK",
"container": "bottle_plastic",
@@ -138,7 +138,7 @@
"description": "A brown goo that tastes very little like its namesake. It's not bad, but it'll stick to the roof of your mouth.",
"price": 195,
"//": "Two tablespoons per charge.",
- "weight": 50,
+ "weight": "50 g",
"volume": "250 ml",
"comestible_type": "DRINK",
"container": "jar_glass_sealed",
@@ -164,7 +164,7 @@
"id": "vinegar",
"name": "vinegar",
"name_plural": "vinegar",
- "weight": 15,
+ "weight": "15 g",
"color": "white",
"container": "jug_plastic",
"comestible_type": "DRINK",
@@ -183,7 +183,7 @@
"id": "cooking_oil",
"name": "vegetable cooking oil",
"name_plural": "vegetable cooking oil",
- "weight": 15,
+ "weight": "15 g",
"color": "yellow",
"container": "jug_plastic",
"comestible_type": "DRINK",
@@ -215,7 +215,7 @@
"id": "molasses",
"name": "molasses",
"name_plural": "molasses",
- "weight": 89,
+ "weight": "89 g",
"color": "brown",
"stim": 3,
"container": "jar_glass",
@@ -245,7 +245,7 @@
"description": "A spicy grated root vegetable packed in vinegared brine.",
"price": 75,
"material": "veggy",
- "weight": 6,
+ "weight": "6 g",
"volume": "250 ml",
"comestible_type": "FOOD",
"container": "jar_glass",
@@ -262,7 +262,7 @@
"id": "coffee_syrup",
"name": "coffee syrup",
"name_plural": "coffee syrup",
- "weight": 32,
+ "weight": "32 g",
"color": "brown",
"addiction_type": "caffeine",
"use_action": "CAFF",
diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
index f0668c0d2e483..d0f1b7a118bd1 100644
--- a/data/json/items/comestibles/egg.json
+++ b/data/json/items/comestibles/egg.json
@@ -3,7 +3,7 @@
"type": "COMESTIBLE",
"id": "egg_bird",
"name": "bird egg",
- "weight": 57,
+ "weight": "57 g",
"color": "brown",
"spoils_in": "7 days",
"comestible_type": "FOOD",
@@ -51,7 +51,7 @@
"copy-from": "egg_chicken",
"calories": 130,
"volume": "83 ml",
- "weight": 70,
+ "weight": "70 g",
"vitamins": [ [ "vitA", 15 ], [ "calcium", 5 ], [ "iron", 15 ], [ "vitB", 158 ] ],
"rot_spawn": "GROUP_EGG_DUCK"
},
@@ -62,7 +62,7 @@
"copy-from": "egg_chicken",
"calories": 266,
"volume": "125 ml",
- "weight": 144,
+ "weight": "144 g",
"vitamins": [ [ "vitA", 30 ], [ "calcium", 9 ], [ "iron", 29 ], [ "vitB", 306 ] ],
"rot_spawn": "GROUP_EGG_GOOSE_CANADIAN"
},
@@ -72,7 +72,7 @@
"name": "turkey egg",
"copy-from": "egg_chicken",
"volume": "83 ml",
- "weight": 79,
+ "weight": "79 g",
"calories": 135,
"vitamins": [ [ "vitA", 15 ], [ "calcium", 8 ], [ "iron", 18 ], [ "vitB", 56 ] ],
"rot_spawn": "GROUP_EGG_TURKEY"
@@ -95,7 +95,7 @@
"type": "COMESTIBLE",
"id": "egg_reptile",
"name": "reptile egg",
- "weight": 60,
+ "weight": "60 g",
"color": "white",
"spoils_in": "28 days",
"comestible_type": "FOOD",
@@ -187,7 +187,7 @@
"type": "COMESTIBLE",
"id": "razorclaw_roe",
"name": "razorclaw roe",
- "weight": 236,
+ "weight": "236 g",
"color": "red",
"spoils_in": "1 day",
"comestible_type": "FOOD",
@@ -205,7 +205,7 @@
"type": "COMESTIBLE",
"id": "egg_fish",
"name": "roe",
- "weight": 24,
+ "weight": "24 g",
"color": "red",
"spoils_in": "1 day",
"comestible_type": "FOOD",
@@ -226,7 +226,7 @@
"id": "powder_eggs",
"name": "powdered egg",
"name_plural": "powdered eggs",
- "weight": 7,
+ "weight": "7 g",
"color": "yellow",
"container": "bottle_plastic_small",
"comestible_type": "FOOD",
diff --git a/data/json/items/comestibles/frozen.json b/data/json/items/comestibles/frozen.json
index 1ceda7a50b132..f58f84cd9a816 100644
--- a/data/json/items/comestibles/frozen.json
+++ b/data/json/items/comestibles/frozen.json
@@ -6,7 +6,7 @@
"name_plural": "milkshakes",
"//": "they bring the boys to the yard",
"description": "An all-natural cold beverage made with milk and sweeteners. Tastes great when frozen.",
- "weight": 160,
+ "weight": "160 g",
"volume": "250 ml",
"container": "styrofoam_cup",
"comestible_type": "DRINK",
@@ -59,7 +59,7 @@
"name": "ice cream",
"name_plural": "ice cream scoops",
"description": "A sweet, frozen food made of milk with liberal amounts of sugar.",
- "weight": 70,
+ "weight": "70 g",
"volume": "250 ml",
"container": "plastic_bucket",
"comestible_type": "FOOD",
@@ -143,7 +143,7 @@
"description": "Tarter than ice cream, this is made with yogurt and other dairy products, and is generally low-fat compared to ice cream itself.",
"calories": 127,
"price": 275,
- "weight": 80,
+ "weight": "80 g",
"primary_material": "ice_cream",
"vitamins": [ [ "vitC", 4 ], [ "calcium", 10 ] ],
"material": [ "milk" ]
@@ -160,7 +160,7 @@
"quench": 8,
"fun": 10,
"price": 175,
- "weight": 106,
+ "weight": "106 g",
"vitamins": [ ],
"material": [ "water", "fruit" ]
},
@@ -173,7 +173,7 @@
"description": "Italian-style ice cream. Less airy, and more dense, giving it a richer flavor and texture.",
"calories": 148,
"price": 300,
- "weight": 90,
+ "weight": "90 g",
"primary_material": "ice_cream",
"vitamins": [ [ "calcium", 2 ], [ "iron", 2 ] ],
"material": [ "milk" ]
diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json
index b87aac3b4a2d5..51ad0e8a9a5d3 100644
--- a/data/json/items/comestibles/fruit_dishes.json
+++ b/data/json/items/comestibles/fruit_dishes.json
@@ -22,7 +22,7 @@
"type": "COMESTIBLE",
"id": "fruit_leather",
"name": "fruit leather",
- "weight": 34,
+ "weight": "34 g",
"color": "pink",
"spoils_in": "360 days",
"container": "bag_plastic",
@@ -62,7 +62,7 @@
"id": "can_peach",
"name": "peaches in syrup",
"name_plural": "peaches in syrup",
- "weight": 277,
+ "weight": "277 g",
"color": "yellow",
"spoils_in": "1 day 6 hours",
"container": "can_food",
@@ -81,7 +81,7 @@
"type": "COMESTIBLE",
"id": "can_pineapple",
"name": "canned pineapple",
- "weight": 268,
+ "weight": "268 g",
"color": "yellow",
"spoils_in": "1 day",
"container": "can_food",
@@ -102,7 +102,7 @@
"id": "lemonade_powder",
"name": "lemonade drink mix",
"name_plural": "servings of lemonade drink mix",
- "weight": 19,
+ "weight": "19 g",
"color": "yellow",
"container": "bottle_plastic_small",
"comestible_type": "FOOD",
@@ -123,7 +123,7 @@
"type": "COMESTIBLE",
"id": "fruit_cooked",
"name": "cooked fruit",
- "weight": 150,
+ "weight": "150 g",
"color": "red",
"spoils_in": "3 days 18 hours",
"container": "jar_3l_glass",
@@ -144,7 +144,7 @@
"type": "COMESTIBLE",
"id": "jam_fruit",
"name": "fruit jam",
- "weight": 15,
+ "weight": "15 g",
"color": "red",
"spoils_in": "10 days",
"container": "jar_3l_glass_sealed",
@@ -165,7 +165,7 @@
"id": "dry_fruit",
"name": "dehydrated fruit",
"name_plural": "dehydrated fruit",
- "weight": 75,
+ "weight": "75 g",
"color": "magenta",
"spoils_in": "360 days",
"comestible_type": "FOOD",
@@ -187,7 +187,7 @@
"id": "rehydrated_fruit",
"name": "rehydrated fruit",
"name_plural": "rehydrated fruit",
- "weight": 150,
+ "weight": "150 g",
"color": "pink",
"spoils_in": "18 hours",
"comestible_type": "FOOD",
@@ -205,7 +205,7 @@
"type": "COMESTIBLE",
"id": "apple_sugar",
"name": "fruit slice",
- "weight": 42,
+ "weight": "42 g",
"color": "red",
"spoils_in": "7 days 12 hours",
"container": "plastic_bag_vac",
@@ -227,7 +227,7 @@
"id": "apple_canned",
"name": "canned fruit",
"name_plural": "canned fruit",
- "weight": 170,
+ "weight": "170 g",
"color": "red",
"spoils_in": "7 days 12 hours",
"container": "can_food",
diff --git a/data/json/items/comestibles/irradiated_veggy.json b/data/json/items/comestibles/irradiated_veggy.json
index f78bc98a9cb5d..13c0fd8770dab 100644
--- a/data/json/items/comestibles/irradiated_veggy.json
+++ b/data/json/items/comestibles/irradiated_veggy.json
@@ -108,7 +108,7 @@
"type": "COMESTIBLE",
"id": "irradiated_cucumber",
"name": "irradiated cucumber",
- "weight": 150,
+ "weight": "150 g",
"color": "green",
"container": "bag_plastic",
"comestible_type": "FOOD",
@@ -126,7 +126,7 @@
"type": "COMESTIBLE",
"id": "irradiated_celery",
"name": "irradiated celery",
- "weight": 80,
+ "weight": "80 g",
"color": "light_green",
"container": "bag_plastic",
"comestible_type": "FOOD",
diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json
index 3fe3d96a6db73..e33a8c207c703 100644
--- a/data/json/items/comestibles/junkfood.json
+++ b/data/json/items/comestibles/junkfood.json
@@ -3,7 +3,7 @@
"type": "COMESTIBLE",
"id": "toastem",
"name": "toast-em",
- "weight": 50,
+ "weight": "50 g",
"color": "red",
"spoils_in": "90 days",
"container": "box_small",
@@ -41,7 +41,7 @@
"id": "toasterpastryfrozen",
"name": "toaster pastry (uncooked)",
"name_plural": "toaster pastries (uncooked)",
- "weight": 52,
+ "weight": "52 g",
"color": "red",
"spoils_in": "2 days 12 hours",
"//": "Semi-arbitrary spoilage of 60 hours, as the cooked product.",
@@ -92,7 +92,7 @@
"id": "kernels",
"name": "popcorn kernels",
"name_plural": "popcorn kernels",
- "weight": 85,
+ "weight": "85 g",
"color": "brown",
"container": "bag_plastic",
"comestible_type": "FOOD",
@@ -110,7 +110,7 @@
"id": "popcorn",
"name": "popcorn",
"name_plural": "popcorn",
- "weight": 12,
+ "weight": "12 g",
"color": "white",
"spoils_in": "360 days",
"container": "bag_plastic",
@@ -155,7 +155,7 @@
"id": "pretzels",
"name": "pretzels",
"name_plural": "pretzels",
- "weight": 62,
+ "weight": "62 g",
"color": "brown",
"spoils_in": "90 days",
"container": "bag_plastic",
@@ -176,7 +176,7 @@
"type": "COMESTIBLE",
"id": "chocpretzels",
"name": "chocolate-covered pretzel",
- "weight": 96,
+ "weight": "96 g",
"color": "brown",
"spoils_in": "90 days",
"container": "bag_plastic",
@@ -196,7 +196,7 @@
"type": "COMESTIBLE",
"id": "chocolate",
"name": "chocolate bar",
- "weight": 34,
+ "weight": "34 g",
"color": "brown",
"spoils_in": "360 days",
"stim": 1,
@@ -217,7 +217,7 @@
"id": "marshmallow",
"name": "marshmallows",
"name_plural": "marshmallows",
- "weight": 53,
+ "weight": "53 g",
"color": "white",
"spoils_in": "90 days",
"container": "bag_plastic",
@@ -236,7 +236,7 @@
"id": "smores",
"name": "s'mores",
"name_plural": "s'mores",
- "weight": 180,
+ "weight": "180 g",
"color": "brown",
"spoils_in": "90 days",
"stim": 8,
@@ -257,7 +257,7 @@
"id": "candy",
"name": "peanut butter candy",
"name_plural": "peanut butter candies",
- "weight": 39,
+ "weight": "39 g",
"color": "brown",
"spoils_in": "360 days",
"stim": 1,
@@ -280,7 +280,7 @@
"id": "candy2",
"name": "chocolate candy",
"name_plural": "chocolate candies",
- "weight": 57,
+ "weight": "57 g",
"color": "red",
"spoils_in": "360 days",
"stim": 2,
@@ -303,7 +303,7 @@
"id": "candy3",
"name": "chewy candy",
"name_plural": "chewy candies",
- "weight": 46,
+ "weight": "46 g",
"color": "yellow",
"spoils_in": "360 days",
"stim": 2,
@@ -325,7 +325,7 @@
"id": "powder_candy",
"name": "powder candy sticks",
"name_plural": "powder candy sticks",
- "weight": 46,
+ "weight": "46 g",
"color": "red",
"spoils_in": "360 days",
"stim": 2,
@@ -347,7 +347,7 @@
"id": "maple_candy",
"name": "maple syrup candy",
"name_plural": "maple syrup candies",
- "weight": 18,
+ "weight": "18 g",
"color": "brown",
"spoils_in": "360 days",
"stim": 1,
@@ -369,7 +369,7 @@
"type": "COMESTIBLE",
"id": "grahmcrackers",
"name": "graham cracker",
- "weight": 31,
+ "weight": "31 g",
"color": "brown",
"spoils_in": "90 days",
"stim": 2,
@@ -391,7 +391,7 @@
"type": "COMESTIBLE",
"id": "cookies",
"name": "cookie",
- "weight": 33,
+ "weight": "33 g",
"color": "brown",
"spoils_in": "60 days",
"container": "box_small",
@@ -414,7 +414,7 @@
"id": "syrup",
"name": "maple syrup",
"name_plural": "maple syrup",
- "weight": 21,
+ "weight": "21 g",
"color": "brown",
"container": "bottle_glass",
"comestible_type": "FOOD",
@@ -436,7 +436,7 @@
"id": "beet_syrup",
"name": "sugar beet syrup",
"name_plural": "sugar beet syrup",
- "weight": 15,
+ "weight": "15 g",
"color": "brown",
"container": "bottle_glass",
"comestible_type": "FOOD",
@@ -455,7 +455,7 @@
"type": "COMESTIBLE",
"id": "jihelucake",
"name": "cake",
- "weight": 38,
+ "weight": "38 g",
"color": "white",
"comestible_type": "FOOD",
"symbol": "%",
@@ -490,7 +490,7 @@
"type": "COMESTIBLE",
"id": "choco_coffee_beans",
"name": "chocolate-covered coffee bean",
- "weight": 30,
+ "weight": "30 g",
"color": "brown",
"spoils_in": "360 days",
"addiction_type": "caffeine",
@@ -516,7 +516,7 @@
"id": "fries",
"name": "fast-food French fries",
"name_plural": "fast-food French fries",
- "weight": 71,
+ "weight": "71 g",
"color": "yellow",
"container": "box_small",
"comestible_type": "FOOD",
@@ -547,7 +547,7 @@
"id": "mintpatties",
"name": "peppermint patty",
"name_plural": "peppermint patties",
- "weight": 43,
+ "weight": "43 g",
"color": "brown",
"spoils_in": "180 days",
"stim": 1,
@@ -569,7 +569,7 @@
"id": "neccowafers",
"name": "Necco wafers",
"name_plural": "Necco wafers",
- "weight": 60,
+ "weight": "60 g",
"color": "magenta",
"spoils_in": "180 days",
"stim": 1,
@@ -590,7 +590,7 @@
"type": "COMESTIBLE",
"id": "candycigarette",
"name": "candy cigarette",
- "weight": 18,
+ "weight": "18 g",
"color": "white",
"spoils_in": "180 days",
"stim": 1,
@@ -613,7 +613,7 @@
"id": "sugar_fried",
"name": "caramel",
"name_plural": "caramel",
- "weight": 67,
+ "weight": "67 g",
"color": "white",
"stim": 4,
"container": "box_small",
@@ -635,7 +635,7 @@
"id": "chips",
"name": "potato chips",
"name_plural": "potato chips",
- "weight": 28,
+ "weight": "28 g",
"color": "yellow",
"spoils_in": "30 days",
"container": "bag_plastic",
@@ -656,7 +656,7 @@
"type": "COMESTIBLE",
"id": "cereal",
"name": "sugary cereal",
- "weight": 38,
+ "weight": "38 g",
"color": "yellow",
"spoils_in": "90 days",
"stim": 4,
@@ -677,7 +677,7 @@
"type": "COMESTIBLE",
"id": "cereal3",
"name": "corn cereal",
- "weight": 39,
+ "weight": "39 g",
"color": "yellow",
"spoils_in": "90 days",
"stim": 4,
@@ -699,7 +699,7 @@
"id": "nachos",
"name": "tortilla chips",
"name_plural": "tortilla chips",
- "weight": 80,
+ "weight": "80 g",
"color": "yellow",
"spoils_in": "30 days",
"container": "bag_plastic",
@@ -720,7 +720,7 @@
"id": "nachosc",
"name": "nachos with cheese",
"name_plural": "nachos with cheese",
- "weight": 85,
+ "weight": "85 g",
"color": "yellow",
"spoils_in": "1 day",
"container": "bag_plastic",
@@ -742,7 +742,7 @@
"id": "nachosm",
"name": "nachos with meat",
"name_plural": "nachos with meat",
- "weight": 125,
+ "weight": "125 g",
"color": "yellow",
"spoils_in": "1 day",
"container": "bag_plastic",
@@ -783,7 +783,7 @@
"id": "nachosmc",
"name": "nachos with meat and cheese",
"name_plural": "nachos with meat and cheese",
- "weight": 22,
+ "weight": "22 g",
"color": "yellow",
"spoils_in": "20 hours",
"container": "bag_plastic",
@@ -804,7 +804,7 @@
"type": "COMESTIBLE",
"id": "porkstick",
"name": "pork stick",
- "weight": 56,
+ "weight": "56 g",
"color": "brown",
"spoils_in": "24 days",
"container": "bag_plastic",
@@ -825,7 +825,7 @@
"type": "COMESTIBLE",
"id": "junk_burrito",
"name": "microwave burrito",
- "weight": 142,
+ "weight": "142 g",
"color": "brown",
"spoils_in": "2 days 12 hours",
"container": "bag_plastic",
@@ -846,7 +846,7 @@
"type": "COMESTIBLE",
"id": "frozen_dinner",
"name": "uncooked TV dinner",
- "weight": 453,
+ "weight": "453 g",
"color": "brown",
"spoils_in": "2 days 12 hours",
"container": "box_small",
@@ -866,7 +866,7 @@
"type": "COMESTIBLE",
"id": "cooked_dinner",
"name": "cooked TV dinner",
- "weight": 450,
+ "weight": "450 g",
"color": "brown",
"spoils_in": "12 hours",
"comestible_type": "FOOD",
@@ -887,7 +887,7 @@
"type": "COMESTIBLE",
"id": "fchicken",
"name": "deep-fried chicken",
- "weight": 168,
+ "weight": "168 g",
"color": "red",
"spoils_in": "1 day",
"container": "box_small",
@@ -908,7 +908,7 @@
"id": "chilidogs",
"name": "chili dogs",
"name_plural": "chili dogs",
- "weight": 318,
+ "weight": "318 g",
"color": "red",
"spoils_in": "1 day",
"container": "wrapper",
@@ -939,7 +939,7 @@
"id": "corndogs_frozen",
"name": "uncooked corn dogs",
"name_plural": "uncooked corn dogs",
- "weight": 78,
+ "weight": "78 g",
"color": "yellow",
"spoils_in": "11 days 16 hours",
"container": "bag_plastic",
@@ -973,7 +973,7 @@
"copy-from": "pancakes",
"name": "chocolate pancake",
"name_plural": "chocolate pancakes",
- "weight": 78,
+ "weight": "78 g",
"healthy": 0,
"calories": 219,
"description": "Fluffy and delicious pancakes with real maple syrup, with delicious chocolate baked right in.",
@@ -987,7 +987,7 @@
"type": "COMESTIBLE",
"id": "choc_waffles",
"name": "chocolate waffle",
- "weight": 70,
+ "weight": "70 g",
"color": "brown",
"spoils_in": "10 days",
"comestible_type": "FOOD",
@@ -1006,7 +1006,7 @@
"type": "COMESTIBLE",
"id": "can_cheese",
"name": "cheese spread",
- "weight": 30,
+ "weight": "30 g",
"color": "yellow",
"spoils_in": "4 days",
"stim": 1,
@@ -1029,7 +1029,7 @@
"id": "cheese_fries",
"name": "cheese fries",
"name_plural": "cheese fries",
- "weight": 101,
+ "weight": "101 g",
"color": "yellow",
"spoils_in": "3 days",
"container": "box_small",
@@ -1050,7 +1050,7 @@
"type": "COMESTIBLE",
"id": "onion_rings",
"name": "onion ring",
- "weight": 166,
+ "weight": "166 g",
"color": "brown",
"spoils_in": "3 days",
"container": "box_small",
@@ -1071,7 +1071,7 @@
"id": "hotdogs_frozen",
"name": "uncooked hot dog",
"name_plural": "uncooked hot dogs",
- "weight": 43,
+ "weight": "43 g",
"color": "red",
"spoils_in": "11 days 16 hours",
"container": "bag_plastic",
@@ -1104,7 +1104,7 @@
"id": "hotdogs_cooked",
"name": "cooked hot dog",
"name_plural": "cooked hot dogs",
- "weight": 383,
+ "weight": "383 g",
"color": "red",
"spoils_in": "1 day",
"container": "wrapper",
@@ -1124,7 +1124,7 @@
"type": "COMESTIBLE",
"id": "maltballs",
"name": "malted milk ball",
- "weight": 40,
+ "weight": "40 g",
"color": "brown",
"spoils_in": "180 days",
"stim": 3,
diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json
index 9f774e216eadf..ebff6ac7e8a7c 100644
--- a/data/json/items/comestibles/meat_dishes.json
+++ b/data/json/items/comestibles/meat_dishes.json
@@ -3,7 +3,7 @@
"type": "COMESTIBLE",
"id": "sausage_raw",
"name": "raw sausage",
- "weight": 148,
+ "weight": "148 g",
"color": "red",
"spoils_in": "1 day",
"comestible_type": "FOOD",
@@ -59,7 +59,7 @@
"id": "sweet_sausage",
"name": "sweet sausage",
"name_plural": "sweet sausages",
- "weight": 148,
+ "weight": "148 g",
"color": "brown",
"spoils_in": "2 days",
"comestible_type": "FOOD",
@@ -78,7 +78,7 @@
"id": "bratwurst_sausage",
"name": "bratwurst",
"name_plural": "bratwursts",
- "weight": 100,
+ "weight": "100 g",
"color": "brown",
"spoils_in": "2 days",
"comestible_type": "FOOD",
@@ -97,7 +97,7 @@
"type": "COMESTIBLE",
"id": "royal_beef",
"name": "royal beef",
- "weight": 446,
+ "weight": "446 g",
"color": "white",
"spoils_in": "3 days 8 hours",
"use_action": "ROYAL_JELLY",
@@ -117,7 +117,7 @@
"id": "bacon",
"name": "bacon",
"name_plural": "pieces of bacon",
- "weight": 85,
+ "weight": "85 g",
"color": "pink",
"spoils_in": "24 days",
"container": "bag_plastic",
@@ -164,7 +164,7 @@
"id": "cracklins",
"name": "cracklins",
"name_plural": "cracklins",
- "weight": 42,
+ "weight": "42 g",
"color": "brown",
"spoils_in": "7 days",
"container": "bag_plastic",
@@ -185,7 +185,7 @@
"type": "COMESTIBLE",
"id": "glazed_tenderloin",
"name": "glazed tenderloins",
- "weight": 205,
+ "weight": "205 g",
"color": "brown",
"spoils_in": "2 days 8 hours",
"comestible_type": "FOOD",
@@ -207,7 +207,7 @@
"type": "COMESTIBLE",
"id": "currywurst",
"name": "currywurst",
- "weight": 85,
+ "weight": "85 g",
"color": "red",
"spoils_in": "2 days",
"container": "wrapper",
@@ -228,7 +228,7 @@
"type": "COMESTIBLE",
"id": "meat_aspic",
"name": "aspic",
- "weight": 154,
+ "weight": "154 g",
"color": "red",
"spoils_in": "3 days 8 hours",
"comestible_type": "FOOD",
@@ -249,7 +249,7 @@
"name_plural": "dehydrated fish",
"copy-from": "fish_cooked",
"primary_material": "cured_meat",
- "weight": 85,
+ "weight": "85 g",
"color": "light_gray",
"spoils_in": "360 days",
"quench": -3,
@@ -303,7 +303,7 @@
"id": "fish_fried",
"name": "batter fried fish",
"name_plural": "batter fried fish",
- "weight": 201,
+ "weight": "201 g",
"color": "yellow",
"spoils_in": "1 day",
"container": "box_small",
@@ -322,7 +322,7 @@
"type": "COMESTIBLE",
"id": "lunchmeat",
"name": "lunch meat",
- "weight": 56,
+ "weight": "56 g",
"color": "red",
"spoils_in": "2 days 12 hours",
"container": "bag_plastic",
@@ -341,7 +341,7 @@
"type": "COMESTIBLE",
"id": "bologna",
"name": "bologna",
- "weight": 56,
+ "weight": "56 g",
"//": "Rebalanced: the recipe looks to easily make two pounds.",
"color": "red",
"spoils_in": "23 days 8 hours",
@@ -361,7 +361,7 @@
"type": "COMESTIBLE",
"id": "lutefisk",
"name": "lutefisk",
- "weight": 175,
+ "weight": "175 g",
"color": "light_gray",
"spoils_in": "360 days",
"container": "bag_plastic",
@@ -383,7 +383,7 @@
"type": "COMESTIBLE",
"id": "can_spam",
"name": "SPAM",
- "weight": 84,
+ "weight": "84 g",
"color": "pink",
"spoils_in": "1 day",
"container": "can_food",
@@ -404,7 +404,7 @@
"type": "COMESTIBLE",
"id": "can_sardine",
"name": "canned sardine",
- "weight": 200,
+ "weight": "200 g",
"color": "light_gray",
"spoils_in": "1 day",
"container": "can_food",
@@ -425,7 +425,7 @@
"id": "sausagegravy",
"name": "sausage gravy",
"name_plural": "sausage gravies",
- "weight": 60,
+ "weight": "60 g",
"color": "light_gray",
"spoils_in": "2 days",
"//": "Semi-arbitrary spoilage of 48 hours set: pretty confident sausage gravy goes bad.",
@@ -444,7 +444,7 @@
"type": "COMESTIBLE",
"id": "pemmican",
"name": "pemmican",
- "weight": 106,
+ "weight": "106 g",
"color": "brown",
"spoils_in": "360 days",
"container": "bag_plastic",
@@ -463,7 +463,7 @@
"type": "COMESTIBLE",
"id": "macaroni_helper",
"name": "hamburger helper",
- "weight": 170,
+ "weight": "170 g",
"color": "red",
"spoils_in": "1 day",
"container": "box_small",
@@ -484,7 +484,7 @@
"type": "COMESTIBLE",
"id": "ravioli",
"name": "ravioli",
- "weight": 170,
+ "weight": "170 g",
"color": "light_red",
"spoils_in": "2 days",
"container": "can_food",
@@ -503,7 +503,7 @@
"id": "chili",
"name": "chili con carne",
"name_plural": "chilis con carne",
- "weight": 253,
+ "weight": "253 g",
"color": "red",
"spoils_in": "1 day",
"container": "can_food",
@@ -524,7 +524,7 @@
"id": "pork_beans",
"name": "pork and beans",
"name_plural": "pork and beans",
- "weight": 267,
+ "weight": "267 g",
"color": "brown",
"spoils_in": "1 day 12 hours",
"container": "can_food",
@@ -545,7 +545,7 @@
"id": "can_tuna",
"name": "canned tuna fish",
"name_plural": "canned tuna fish",
- "weight": 154,
+ "weight": "154 g",
"color": "light_gray",
"spoils_in": "1 day",
"container": "can_food",
@@ -563,7 +563,7 @@
"type": "COMESTIBLE",
"id": "can_salmon",
"name": "canned salmon",
- "weight": 200,
+ "weight": "200 g",
"color": "pink",
"spoils_in": "1 day",
"container": "can_food",
@@ -581,7 +581,7 @@
"type": "COMESTIBLE",
"id": "can_chicken",
"name": "canned chicken",
- "weight": 54,
+ "weight": "54 g",
"color": "pink",
"spoils_in": "1 day",
"container": "can_food",
@@ -600,7 +600,7 @@
"type": "COMESTIBLE",
"id": "can_herring",
"name": "pickled herring",
- "weight": 232,
+ "weight": "232 g",
"color": "white",
"spoils_in": "4 days",
"container": "can_food",
@@ -620,7 +620,7 @@
"id": "can_clams",
"name": "canned clam",
"name_plural": "canned clams",
- "weight": 169,
+ "weight": "169 g",
"color": "light_gray",
"spoils_in": "1 day",
"container": "can_food",
@@ -639,7 +639,7 @@
"type": "COMESTIBLE",
"id": "can_chowder",
"name": "clam chowder",
- "weight": 253,
+ "weight": "253 g",
"color": "white",
"spoils_in": "1 day",
"container": "can_food",
@@ -660,7 +660,7 @@
"id": "deluxe_beans",
"name": "baked beans",
"name_plural": "baked beans",
- "weight": 293,
+ "weight": "293 g",
"color": "brown",
"spoils_in": "15 days",
"comestible_type": "FOOD",
@@ -681,7 +681,7 @@
"id": "deluxe_rice",
"name": "meat fried rice",
"name_plural": "meat fried rice",
- "weight": 187,
+ "weight": "187 g",
"color": "yellow",
"spoils_in": "15 days",
"comestible_type": "FOOD",
@@ -702,7 +702,7 @@
"id": "deluxe_beansnrice",
"name": "deluxe beans and rice",
"name_plural": "deluxe beans and rice",
- "weight": 312,
+ "weight": "312 g",
"color": "brown",
"spoils_in": "15 days",
"comestible_type": "FOOD",
@@ -722,7 +722,7 @@
"type": "COMESTIBLE",
"id": "pie_meat",
"name": "meat pie",
- "weight": 189,
+ "weight": "189 g",
"color": "brown",
"spoils_in": "3 days 8 hours",
"container": "box_small",
@@ -744,7 +744,7 @@
"type": "COMESTIBLE",
"id": "pizza_meat",
"name": "meat pizza",
- "weight": 230,
+ "weight": "230 g",
"color": "light_red",
"spoils_in": "2 days",
"container": "box_small",
@@ -765,7 +765,7 @@
"id": "deluxe_eggs",
"name": "deluxe scrambled eggs",
"name_plural": "deluxe scrambled eggs",
- "weight": 198,
+ "weight": "198 g",
"color": "yellow",
"spoils_in": "2 days",
"comestible_type": "FOOD",
@@ -814,7 +814,7 @@
"id": "spaghetti_bolognese",
"name": "spaghetti bolognese",
"name_plural": "spaghetti bolognese",
- "weight": 150,
+ "weight": "150 g",
"color": "red",
"spoils_in": "2 days",
"comestible_type": "FOOD",
@@ -834,7 +834,7 @@
"type": "COMESTIBLE",
"id": "lasagne",
"name": "lasagne",
- "weight": 255,
+ "weight": "255 g",
"color": "red",
"spoils_in": 64,
"comestible_type": "FOOD",
@@ -869,7 +869,7 @@
"type": "COMESTIBLE",
"id": "cheeseburger",
"name": "cheeseburger",
- "weight": 133,
+ "weight": "133 g",
"color": "brown",
"spoils_in": "1 day 12 hours",
"stim": 1,
@@ -890,7 +890,7 @@
"type": "COMESTIBLE",
"id": "hamburger",
"name": "hamburger",
- "weight": 99,
+ "weight": "99 g",
"color": "brown",
"spoils_in": "1 day 12 hours",
"stim": 1,
@@ -910,7 +910,7 @@
"type": "COMESTIBLE",
"id": "sloppyjoe",
"name": "sloppy joe",
- "weight": 113,
+ "weight": "113 g",
"color": "brown",
"spoils_in": "1 day 12 hours",
"stim": 1,
@@ -930,7 +930,7 @@
"type": "COMESTIBLE",
"id": "taco",
"name": "taco",
- "weight": 102,
+ "weight": "102 g",
"color": "yellow",
"spoils_in": "1 day",
"container": "wrapper",
@@ -963,7 +963,7 @@
"id": "dry_meat",
"name": "dehydrated meat",
"copy-from": "meat_cooked",
- "weight": 85,
+ "weight": "85 g",
"color": "red",
"spoils_in": "360 days",
"quench": -3,
@@ -989,8 +989,8 @@
"id": "haggis",
"name": "haggis",
"name_plural": "haggii",
- "//": "Yes, that is the correct plural form.",
- "weight": 156,
+ "//": "That's whisky without an 'e' because we're talking about Scotch whisky.",
+ "weight": "156 g",
"color": "brown",
"spoils_in": "15 days",
"comestible_type": "FOOD",
@@ -999,7 +999,6 @@
"healthy": 1,
"calories": 441,
"description": "This traditional Scottish savory pudding is made of meat and offal mixed with oatmeal, which is sewn into an animal's stomach and boiled. Surprisingly tasty and quite filling, it is best served with boiled root vegetables and strong whisky.",
- "//": "That's whisky without an 'e' because we're talking about Scotch whisky.",
"price": 750,
"material": [ "wheat", "flesh" ],
"volume": "250 ml",
@@ -1012,7 +1011,7 @@
"id": "sushi_fishroll",
"name": "fish makizushi",
"name_plural": "fish makizushi",
- "weight": 159,
+ "weight": "159 g",
"color": "green",
"spoils_in": "12 hours",
"comestible_type": "FOOD",
@@ -1032,7 +1031,7 @@
"id": "sushi_meatroll",
"name": "meat temaki",
"name_plural": "meat temaki",
- "weight": 273,
+ "weight": "273 g",
"color": "green",
"spoils_in": "1 day",
"comestible_type": "FOOD",
@@ -1066,7 +1065,7 @@
"id": "dry_meat_tainted",
"name": "dehydrated tainted meat",
"copy-from": "meat_tainted",
- "weight": 85,
+ "weight": "85 g",
"color": "red",
"spoils_in": "360 days",
"use_action": "POISON",
@@ -1082,7 +1081,7 @@
"type": "COMESTIBLE",
"id": "pelmeni",
"name": "pelmeni",
- "weight": 151,
+ "weight": "151 g",
"color": "light_red",
"spoils_in": "2 days",
"container": "can_food",
@@ -1102,7 +1101,7 @@
"type": "COMESTIBLE",
"id": "homemade_burrito",
"name": "homemade burrito",
- "weight": 142,
+ "weight": "142 g",
"color": "brown",
"spoils_in": "1 days 4 hours",
"comestible_type": "FOOD",
diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json
index da546a1eac5c3..c7be0e8408f55 100644
--- a/data/json/items/comestibles/med.json
+++ b/data/json/items/comestibles/med.json
@@ -5,7 +5,7 @@
"category": "drugs",
"name": "first aid kit",
"description": "A full medical kit, with bandages, local anesthetics, and rapid healing agents. Used for healing large amounts of damage. Disassemble to get its content.",
- "weight": 1750,
+ "weight": "1750 g",
"volume": "1250 ml",
"price": 3000,
"material": "plastic",
@@ -21,7 +21,7 @@
"name": "Adderall",
"name_plural": "Adderall",
"description": "Medical grade amphetamine salts mixed with Dextroamphetamine salts, commonly prescribed to treat hyperactive attention deficits. It suppresses the appetite, and is quite addictive.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 14500,
"charges": 10,
@@ -41,7 +41,7 @@
"name": "syringe of adrenaline",
"name_plural": "syringes of adrenaline",
"description": "A syringe filled with a shot of adrenaline. It serves as a powerful stimulant when you inject yourself with it. Asthmatics can use it in an emergency to clear their asthma.",
- "weight": 12,
+ "weight": "12 g",
"volume": "10ml",
"price": 3400,
"material": "plastic",
@@ -57,7 +57,7 @@
"name": "antibiotics",
"name_plural": "antibiotics",
"description": "A prescription-strength antibacterial medication designed to prevent or stop the spread of infection. It's the quickest and most reliable way to cure any infections you might have. One dose lasts twelve hours.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 9000,
"charges": 15,
@@ -73,7 +73,7 @@
"comestible_type": "MED",
"name": "antifungal drug",
"description": "Powerful chemical tablets designed to eliminate fungal infections in living creatures.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 1000,
"charges": 5,
@@ -90,7 +90,7 @@
"comestible_type": "MED",
"name": "antiparasitic drug",
"description": "Broad spectrum chemical tablets designed to eliminate parasitic infestations in living creatures. Though designed for use on pets and livestock, it will likely work on humans as well.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 3200,
"charges": 5,
@@ -108,7 +108,7 @@
"comestible_type": "MED",
"name": "aspirin",
"description": "Acetylsalicylic acid, a mild anti-inflammatory. Take to relieve pain and swelling.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 500,
"charges": 20,
@@ -129,7 +129,7 @@
"comestible_type": "MED",
"name": "bandage",
"description": "Simple cloth bandages. Used for healing small amounts of damage.",
- "weight": 70,
+ "weight": "70 g",
"volume": "250 ml",
"price": 600,
"material": "cotton",
@@ -174,7 +174,7 @@
"name": "antiseptic powder",
"name_plural": "antiseptic powder",
"description": "A powdered form of chemical antiseptic, this bismuth formic iodide cleans wounds quickly and painlessly.",
- "weight": 6,
+ "weight": "6 g",
"volume": "250 ml",
"price": 900,
"charges": 4,
@@ -193,7 +193,7 @@
"name": "caffeinated chewing gum",
"description": "Chewing gum with added caffeine. Sugary and bad for your teeth, but it's a nice pick-me-up.",
"category": "drugs",
- "weight": 3,
+ "weight": "3 g",
"volume": "250 ml",
"price": 140,
"charges": 10,
@@ -212,7 +212,7 @@
"comestible_type": "MED",
"name": "caffeine pill",
"description": "No-doz brand caffeine pills, maximum strength. Useful in pulling an all-nighter, one pill is about equivalent to a strong cup of coffee.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 1000,
"charges": 10,
@@ -231,7 +231,7 @@
"comestible_type": "MED",
"name": "chewing tobacco",
"description": "Mint flavored chewing tobacco. While still absolutely terrible for your health, it was once a favorite amongst baseball players, cowboys, and other macho types.",
- "weight": 4,
+ "weight": "4 g",
"volume": "250 ml",
"price": 2000,
"charges": 20,
@@ -255,7 +255,7 @@
"name": "hydrogen peroxide",
"name_plural": "hydrogen peroxide",
"description": "Dilute hydrogen peroxide, for use as an antiseptic and for bleaching hair or textiles. Foams a little when in contact with organic matter, but otherwise harmless.",
- "weight": 28,
+ "weight": "28 g",
"volume": "250 ml",
"price": 100,
"charges": 10,
@@ -272,7 +272,7 @@
"comestible_type": "MED",
"name": "cigarette",
"description": "A mixture of dried tobacco leaf, pesticides, and chemical additives, rolled into a filtered paper tube. Stimulates mental acuity and reduces appetite. Highly addictive and hazardous to health.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 800,
"charges": 20,
@@ -294,7 +294,7 @@
"comestible_type": "MED",
"name": "cigar",
"description": "Rolled, cured tobacco leaf, addictive and hazardous to health.\nA gentleman's vice, cigars set the civil man apart from the savage.",
- "weight": 3,
+ "weight": "3 g",
"volume": "250 ml",
"price": 1000,
"charges": 5,
@@ -314,7 +314,7 @@
"comestible_type": "MED",
"name": "chloroform soaked rag",
"description": "A debug item that lets you put NPCs (or yourself) to sleep.",
- "weight": 240,
+ "weight": "240 g",
"volume": "250 ml",
"price": 3000,
"material": "cotton",
@@ -330,7 +330,7 @@
"name": "codeine",
"name_plural": "codeine",
"description": "A mild opiate used in the suppression of pain, cough, and other ailments. While relatively weak for a narcotic, it is still addictive, with a potential for overdose.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 1200,
"charges": 10,
@@ -354,7 +354,7 @@
"name": "cocaine",
"name_plural": "cocaine",
"description": "Crystalline extract of the coca leaf, or at least, a white powder with some of that in it. A topical analgesic, it is more commonly used for its stimulatory properties. Highly addictive.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 10000,
"charges": 8,
@@ -376,7 +376,7 @@
"id": "cola_meth",
"name": "methacola",
"category": "drugs",
- "weight": 61,
+ "weight": "61 g",
"color": "brown",
"addiction_type": "amphetamine",
"use_action": "CAFF",
@@ -404,7 +404,7 @@
"name": "pair of contact lenses",
"name_plural": "pairs of contact lenses",
"description": "A pair of extended wear contacts with soft lenses designed to be discarded after a week of use. They are a great replacement to wearing glasses and sit comfortably on the surface of the eye.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 2600,
"charges": 6,
@@ -423,7 +423,7 @@
"name_plural": "cotton balls",
"description": "Fluffy balls of clean white cotton. Can serve as makeshift bandages in an emergency.",
"category": "spare_parts",
- "weight": 22,
+ "weight": "22 g",
"volume": "250 ml",
"price": 500,
"charges": 2,
@@ -441,7 +441,7 @@
"name": "crack",
"name_plural": "crack",
"description": "Deprotonated cocaine crystals, incredibly addictive and deleterious to brain chemistry.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 72000,
"charges": 4,
@@ -473,7 +473,7 @@
"name": "non-drowsy cough syrup",
"name_plural": "non-drowsy cough syrup",
"description": "Daytime cold and flu medication. Non-drowsy formula. Will suppress coughing, aching, headaches and runny noses, but you'll still need lots of fluids and rest.",
- "weight": 48,
+ "weight": "48 g",
"volume": "250 ml",
"price": 800,
"charges": 5,
@@ -490,7 +490,7 @@
"comestible_type": "MED",
"name": "antiseptic",
"description": "A powerful antiseptic commonly used for contaminated wounds.",
- "weight": 27,
+ "weight": "27 g",
"volume": "250 ml",
"price": 1500,
"charges": 10,
@@ -517,7 +517,7 @@
"name": "diazepam",
"name_plural": "diazepam",
"description": "A strong benzodiazepine drug used to treat muscle spasms, anxiety, seizures, and panic attacks.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 15000,
"charges": 10,
@@ -537,7 +537,7 @@
"comestible_type": "MED",
"name": "electronic cigarette",
"description": "This battery-operated device vaporizes a liquid that contains flavorings and nicotine. A less harmful alternative to traditional cigarettes, but it's still addictive. It can't be reused once it's empty.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 3000,
"charges": 40,
@@ -559,7 +559,7 @@
"name_plural": "saline eye drops",
"description": "Sterile saline eye drops. Can be used to treat dry eyes, or to wash out contaminants.",
"volume": "10ml",
- "weight": 3,
+ "weight": "3 g",
"price": 300,
"charges": 10,
"symbol": "!",
@@ -573,7 +573,7 @@
"comestible_type": "MED",
"name": "flu shot",
"description": "Pharmaceutical flu shot designed for mass vaccinations, still in the packaging. Purported to provide immunity to influenza.",
- "weight": 12,
+ "weight": "12 g",
"volume": "10ml",
"price": 5000,
"material": "plastic",
@@ -590,7 +590,7 @@
"name_plural": "chewing gum",
"description": "Bright pink chewing gum. Sugary, sweet, and bad for your teeth.",
"category": "food",
- "weight": 3,
+ "weight": "3 g",
"volume": "250 ml",
"price": 100,
"charges": 10,
@@ -609,7 +609,7 @@
"comestible_type": "MED",
"name": "hand-rolled cigarette",
"description": "A roll-your-own made from tobacco and rolling paper. Stimulates mental acuity and reduces appetite. Despite being hand crafted, it's still highly addictive and hazardous to health.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 90,
"//": "Tougher to market a hand rolled, could be anything in there.",
@@ -631,7 +631,7 @@
"name": "heroin",
"name_plural": "heroin",
"description": "An extremely strong opioid narcotic derived from morphine. Incredibly addictive, the risk of overdose is extreme, and the drug is contraindicated for nearly all medical purposes.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 14000,
"charges": 4,
@@ -663,7 +663,7 @@
"comestible_type": "MED",
"name": "potassium iodide tablet",
"description": "Potassium iodide tablets. If taken prior to exposure, they help to mitigate injury caused by radiation absorption.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 1000,
"charges": 10,
@@ -682,7 +682,7 @@
"comestible_type": "MED",
"name": "joint",
"description": "Marijuana, cannabis, pot. Whatever you want to call it, it's rolled up in a piece of paper and ready for smokin'.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 500,
"stack_size": 100,
@@ -702,7 +702,7 @@
"comestible_type": "MED",
"name": "pink tab",
"description": "Tiny pink tabs resembling postage stamps, already dosed with some sort of drug. Really only useful for entertainment. Will cause hallucinations.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 10000,
"charges": 5,
@@ -724,7 +724,7 @@
"comestible_type": "MED",
"name": "medical gauze",
"description": "This is decent sized piece of cotton, sterilized and sealed. It's designed for medical purposes.",
- "weight": 90,
+ "weight": "90 g",
"price": 350,
"material": "cotton",
"symbol": ",",
@@ -739,7 +739,7 @@
"name": "low-grade methamphetamine",
"name_plural": "low-grade methamphetamine",
"description": "A profoundly addictive and powerful stimulant. While extremely effective at enhancing alertness, it is hazardous to health and the risk of an adverse reaction is great.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 15000,
"charges": 6,
@@ -763,7 +763,7 @@
"comestible_type": "MED",
"name": "morphine",
"description": "A very strong semi-synthetic narcotic used to treat intense pain in hospital settings. This injectable drug is very addictive.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 4000,
"charges": 4,
@@ -790,7 +790,7 @@
"comestible_type": "MED",
"name": "mugwort oil",
"description": "Some essential oil made from mugwort, which may kill parasites when ingested. Consume it with water!",
- "weight": 40,
+ "weight": "40 g",
"volume": "250 ml",
"price": 0,
"material": "oil",
@@ -809,7 +809,7 @@
"comestible_type": "MED",
"name": "nicotine gum",
"description": "Mint flavored nicotine chewing gum. For smokers who desire to quit.",
- "weight": 4,
+ "weight": "4 g",
"volume": "250 ml",
"price": 1000,
"charges": 10,
@@ -829,7 +829,7 @@
"name": "cough syrup",
"name_plural": "cough syrup",
"description": "Nighttime cold and flu medication. Useful when trying to sleep with a head full of virions. Will cause drowsiness.",
- "weight": 48,
+ "weight": "48 g",
"volume": "250 ml",
"price": 800,
"charges": 5,
@@ -848,7 +848,7 @@
"comestible_type": "MED",
"name": "oxycodone",
"description": "A strong semi-synthetic narcotic used in the treatment of intense pain. Highly addictive.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 55000,
"//": "Fairly controlled substance as they go.",
@@ -873,7 +873,7 @@
"comestible_type": "MED",
"name": "Ambien",
"description": "A habit-forming tranquilizer with a variety of psychoactive side effects. Used in the treatment of insomnia. Its generic name is zolpidem tartrate.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 3000,
"charges": 10,
@@ -893,7 +893,7 @@
"comestible_type": "MED",
"name": "poppy painkiller",
"description": "Potent opioid palliative produced by the refining of the mutated poppy. Notably devoid of euphoric or sedative effects, as an opiate it may still be addictive.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 3000,
"charges": 10,
@@ -916,7 +916,7 @@
"comestible_type": "MED",
"name": "poppy sleep",
"description": "A potent sleep aid extracted from mutated poppy seeds. Effective, but as an opiate, it may be addictive.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 2000,
"charges": 10,
@@ -935,7 +935,7 @@
"name": "poppy cough syrup",
"name_plural": "poppy cough syrup",
"description": "Cough syrup made from mutated poppy. Will make you sleepy.",
- "weight": 48,
+ "weight": "48 g",
"volume": "250 ml",
"price": 2500,
"charges": 5,
@@ -955,7 +955,7 @@
"comestible_type": "MED",
"name": "Prozac",
"description": "A common and popular antidepressant. It will elevate mood, and can profoundly affect the action of other drugs. It is only rarely habit-forming, though adverse reactions are not uncommon. Its generic name is fluoxetine.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 9000,
"//": "Don't have a cite for this one.",
@@ -974,7 +974,7 @@
"comestible_type": "MED",
"name": "Prussian blue tablet",
"description": "Tablets containing oxidized ferrous ferrocyanide salts. Capable of purging nuclear contaminants from the body if taken after radiation exposure.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 3000,
"charges": 10,
@@ -996,7 +996,7 @@
"name": "hemostatic powder",
"name_plural": "hemostatic powder",
"description": "A powdered antihemorrhagic compound that reacts with blood to immediately form a gel-like substance that stops bleeding.",
- "weight": 5,
+ "weight": "5 g",
"volume": "250 ml",
"price": 550,
"charges": 6,
@@ -1014,7 +1014,7 @@
"comestible_type": "MED",
"name": "saline solution",
"description": "A solution of sterilized water and salt for intravenous infusion or washing contaminants from one's eyes.",
- "weight": 51,
+ "weight": "51 g",
"volume": "250 ml",
"price": 500,
"charges": 5,
@@ -1031,7 +1031,7 @@
"comestible_type": "MED",
"name": "Thorazine",
"description": "Anti-psychotic medication. Used to stabilize brain chemistry, it can arrest hallucinations and other symptoms of psychosis. Carries a sedative effect. Its generic name is chlorpromazine.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 5000,
"charges": 10,
@@ -1047,7 +1047,7 @@
"comestible_type": "MED",
"name": "thyme oil",
"description": "Some essential oil made from thyme, which can act as a mildly irritating antiseptic.",
- "weight": 40,
+ "weight": "40 g",
"volume": "250 ml",
"price": 0,
"material": "oil",
@@ -1064,7 +1064,7 @@
"comestible_type": "MED",
"name": "rolling tobacco",
"description": "Loose, fine-cut tobacco leaves. Popular in Europe and among hipsters. Highly addictive and hazardous to health.\nCan either be rolled into a cigarette with some rolling papers or smoked through a pipe.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 1100,
"charges": 20,
@@ -1095,7 +1095,7 @@
"comestible_type": "MED",
"name": "tramadol",
"description": "A painkiller used to manage moderate pain. The effects last for several hours, but are relatively subdued for an opioid.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 24500,
"charges": 10,
@@ -1117,7 +1117,7 @@
"comestible_type": "MED",
"name": "gamma globulin shot",
"description": "This immunoglobulin booster contains concentrated antibodies prepared for intravenous injection to temporarily strengthen the immune system. It is still in its original packaging.",
- "weight": 12,
+ "weight": "12 g",
"volume": "10ml",
"price": 5000,
"material": "plastic",
@@ -1132,7 +1132,7 @@
"comestible_type": "MED",
"name": "multivitamin",
"description": "Essential dietary nutrients conveniently packaged in pill form. An option of last resort when a balanced diet is not possible. Excess use can cause hypervitaminosis.",
- "weight": 1,
+ "weight": "1 g",
"volume": "100 ml",
"price": 500,
"price_postapoc": 5000,
@@ -1152,7 +1152,7 @@
"comestible_type": "MED",
"name": "calcium tablet",
"description": "White calcium tablets. Widely used by elderly people with osteoporosis as a method to supplement calcium before the apocalypse.",
- "weight": 1,
+ "weight": "1 g",
"volume": "100 ml",
"price": 400,
"price_postapoc": 4000,
@@ -1168,7 +1168,7 @@
"comestible_type": "MED",
"name": "bone meal tablet",
"description": "Homemade calcium supplement made out of bone meal. Tastes horrible and is hard to swallow but it does its job.",
- "weight": 2,
+ "weight": "2 g",
"volume": "500 ml",
"price": 10,
"fun": -8,
@@ -1187,7 +1187,7 @@
"comestible_type": "MED",
"name": "flavored bone meal tablet",
"description": "Homemade calcium supplement made out of bone meal. Due to some sweetness mixed in to counteract the powdery texture and the taste of ash, it's almost as palatable as the pre-cataclysm tablets.",
- "weight": 2,
+ "weight": "2 g",
"volume": "500 ml",
"price": 300,
"fun": -2,
@@ -1216,7 +1216,7 @@
"comestible_type": "MED",
"name": "injectable vitamin B",
"description": "Small vials of pale yellow liquid containing soluble vitamin B for injection.",
- "weight": 40,
+ "weight": "40 g",
"volume": "250 ml",
"price": 150,
"price_postapoc": 1500,
@@ -1238,7 +1238,7 @@
"comestible_type": "MED",
"name": "injectable iron",
"description": "Small vials of dark yellow liquid containing soluble iron for injection.",
- "weight": 40,
+ "weight": "40 g",
"volume": "250 ml",
"price": 2000,
"price_postapoc": 2500,
@@ -1261,7 +1261,7 @@
"name": "marijuana",
"name_plural": "marijuana",
"description": "The dried flower buds and leaves harvested from a psychoactive variety of hemp plant. Used to reduce nausea, stimulate appetite and elevate mood. It can be habit-forming, and adverse reactions are possible.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 2500,
"charges": 5,
@@ -1292,7 +1292,7 @@
"name": "Xanax",
"name_plural": "Xanax",
"description": "Anti-anxiety agent with a powerful sedative effect. May cause dissociation and loss of memory. It is dangerously addictive, and withdrawal from regular use should be gradual. Its generic name is alprazolam.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 6000,
"//": "Yeah, kinda guessing at these ones, but generic is cheaper.",
@@ -1314,7 +1314,7 @@
"name": "antiseptic soaked rag",
"name_plural": "antiseptic soaked rags",
"description": "A rag soaked in antiseptic. Useful for light wounds, probaby won't help with deep bites.",
- "weight": 80,
+ "weight": "80 g",
"//": "Can't copy-from rag, it breaks the stacking for some reason!",
"volume": "250 ml",
"price": 250,
@@ -1337,7 +1337,7 @@
"name": "antiseptic soaked cotton balls",
"name_plural": "antiseptic soaked cotton balls",
"description": "Fluffy balls of clean white cotton. Now soaked with antiseptic, they are somewhat useful to disinfect a wound.",
- "weight": 25,
+ "weight": "25 g",
"//": "Can't copy-from cotton_ball, breaks volume",
"volume": "125 ml",
"price": 250,
@@ -1361,7 +1361,7 @@
"name": "Atreyupan",
"name_plural": "Atreyupan",
"description": "A broad-spectrum antibiotic used to suppress infections and prevent them from setting in. It isn't strong enough to purge infections outright, but it boosts the body's resistance against them. One dose lasts twelve hours.",
- "weight": 15,
+ "weight": "15 g",
"volume": "250 ml",
"price": 1500,
"charges": 5,
@@ -1379,7 +1379,7 @@
"comestible_type": "MED",
"name": "heartburn medicine",
"description": "Creamy pink heartburn syrup that soothes upset stomachs and quells vomitous urges; with a twist off cap that doubles as a dosage cup.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 1000,
"container": "bottle_plastic_small",
@@ -1401,7 +1401,7 @@
"name": "Panaceus",
"name_plural": "Panaceii",
"description": "An apple-red gel capsule the size of your thumbnail, filled with a thick oily liquid that shifts from black to purple at unpredictable intervals, flecked with tiny gray dots. Given the place you got it from, it's either very potent, or highly experimental. Holding it, all the little aches and pains seem to fade, just for a moment...",
- "weight": 15,
+ "weight": "15 g",
"volume": "5 ml",
"price": 1000000,
"stack_size": 5,
@@ -1420,7 +1420,7 @@
"name_plural": "cattail jellies",
"description": "Clear jelly harvested from cattail, has antiseptic properties and works as a painkiller.",
"container": "bottle_plastic_small",
- "weight": 50,
+ "weight": "50 g",
"volume": "250 ml",
"charges": 7,
"price": 50,
diff --git a/data/json/items/comestibles/mre.json b/data/json/items/comestibles/mre.json
index 18fa410572140..8326c0a6c5d73 100644
--- a/data/json/items/comestibles/mre.json
+++ b/data/json/items/comestibles/mre.json
@@ -8,7 +8,7 @@
"category": "food",
"description": "A generic MRE box, you shouldn't see this.",
"price": 1500,
- "weight": 900,
+ "weight": "900 g",
"volume": "750 ml",
"material": [ "plastic" ],
"looks_like": "mre_beef_box",
@@ -23,7 +23,7 @@
"category": "food",
"description": "A generic small MRE box, you shouldn't see this",
"price": 500,
- "weight": 300,
+ "weight": "300 g",
"volume": "250 ml",
"material": [ "plastic" ],
"looks_like": "mre_beef_box",
@@ -33,7 +33,7 @@
"abstract": "mre_entree",
"type": "COMESTIBLE",
"name": "MRE entree",
- "weight": 125,
+ "weight": "125 g",
"color": "brown",
"spoils_in": "3 days 8 hours",
"comestible_type": "FOOD",
diff --git a/data/json/items/comestibles/mushroom.json b/data/json/items/comestibles/mushroom.json
index a3a8a47048cb2..55b8c77c7a1f0 100644
--- a/data/json/items/comestibles/mushroom.json
+++ b/data/json/items/comestibles/mushroom.json
@@ -15,7 +15,7 @@
"type": "COMESTIBLE",
"id": "mushroom_morel",
"name": "morel mushroom",
- "weight": 78,
+ "weight": "78 g",
"color": "brown",
"spoils_in": "2 days",
"use_action": "POISON",
@@ -62,7 +62,7 @@
"type": "COMESTIBLE",
"id": "dry_mushroom",
"name": "dried mushroom",
- "weight": 7,
+ "weight": "7 g",
"color": "brown",
"spoils_in": "360 days",
"comestible_type": "FOOD",
@@ -82,7 +82,7 @@
"type": "COMESTIBLE",
"id": "mushroom",
"name": "mushroom",
- "weight": 69,
+ "weight": "69 g",
"color": "brown",
"spoils_in": "2 days",
"comestible_type": "FOOD",
diff --git a/data/json/items/comestibles/mutagen.json b/data/json/items/comestibles/mutagen.json
index 9765c40ca5ba1..53a5599ce0e8b 100644
--- a/data/json/items/comestibles/mutagen.json
+++ b/data/json/items/comestibles/mutagen.json
@@ -8,7 +8,7 @@
"//": "Not commercially traded, in case there was any question.",
"comestible_type": "DRINK",
"category": "mutagen",
- "weight": 250,
+ "weight": "250 g",
"volume": "250 ml",
"phase": "liquid",
"container": "flask_glass",
@@ -30,7 +30,7 @@
"name": "abstract iv mutagen flavor",
"description": "A super-concentrated mutagen. You need a syringe to inject it... if you really want to?",
"price": 200000,
- "weight": 10,
+ "weight": "10 g",
"volume": "10ml",
"symbol": "!",
"color": "green",
@@ -460,7 +460,7 @@
"category": "mutagen",
"name": "purifier smart shot",
"description": "An experimental stem cell treatment, offering limited control over which mutations are purified. The liquid sloshes strangely inside of this syringe.",
- "weight": 12,
+ "weight": "12 g",
"volume": "10ml",
"price": 1200000,
"material": "plastic",
@@ -477,7 +477,7 @@
"category": "other",
"name": "misshapen fetus",
"name_plural": "misshapen fetuses",
- "weight": 760,
+ "weight": "760 g",
"color": "pink",
"spoils_in": "2 days",
"use_action": { "type": "mutagen", "is_weak": true },
@@ -497,7 +497,7 @@
"id": "arm",
"category": "other",
"name": "mutated arm",
- "weight": 3767,
+ "weight": "3767 g",
"color": "brown",
"spoils_in": "2 days",
"use_action": { "type": "mutagen", "is_weak": true },
@@ -517,7 +517,7 @@
"id": "leg",
"category": "other",
"name": "mutated leg",
- "weight": 11071,
+ "weight": "11071 g",
"color": "brown",
"spoils_in": "2 days",
"use_action": { "type": "mutagen", "is_weak": true },
@@ -537,7 +537,7 @@
"id": "taint_tornado",
"name": "tainted tornado",
"category": "mutagen",
- "weight": 100,
+ "weight": "100 g",
"color": "red",
"addiction_type": "alcohol",
"use_action": { "type": "mutagen", "is_weak": true },
@@ -563,7 +563,7 @@
"type": "COMESTIBLE",
"id": "drink_sewerbrew",
"name": "sewer brew",
- "weight": 250,
+ "weight": "250 g",
"color": "yellow",
"addiction_type": "alcohol",
"stim": -20,
diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json
index f1bae69ee13da..73c921678a380 100644
--- a/data/json/items/comestibles/nuts.json
+++ b/data/json/items/comestibles/nuts.json
@@ -4,7 +4,7 @@
"id": "pine_nuts",
"name": "handful of pine nuts",
"name_plural": "handfuls of pine nuts",
- "weight": 30,
+ "weight": "30 g",
"color": "brown",
"spoils_in": 1080,
"container": "bag_plastic",
@@ -27,7 +27,7 @@
"id": "juniper",
"name": "handful of junipers",
"name_plural": "handful of junipers",
- "weight": 122,
+ "weight": "122 g",
"color": "blue",
"comestible_type": "FOOD",
"symbol": "%",
@@ -46,7 +46,7 @@
"id": "pistachio_unshelled",
"name": "handful of shelled pistachios",
"name_plural": "handfuls of shelled pistachios",
- "weight": 30,
+ "weight": "30 g",
"color": "green",
"spoils_in": "90 days",
"container": "bag_plastic",
@@ -81,7 +81,7 @@
"id": "almond_unshelled",
"name": "handful of shelled almonds",
"name_plural": "handfuls of shelled almonds",
- "weight": 30,
+ "weight": "30 g",
"color": "brown",
"spoils_in": "300 days",
"container": "bag_plastic",
@@ -116,7 +116,7 @@
"id": "cashews",
"name": "handful of cashews",
"name_plural": "handfuls of cashews",
- "weight": 30,
+ "weight": "30 g",
"color": "brown",
"spoils_in": "240 days",
"container": "bag_plastic",
@@ -139,7 +139,7 @@
"id": "pecan_unshelled",
"name": "handful of shelled pecans",
"name_plural": "handfuls of shelled pecans",
- "weight": 30,
+ "weight": "30 g",
"color": "brown",
"spoils_in": "180 days",
"container": "bag_plastic",
@@ -173,7 +173,7 @@
"id": "peanut_unshelled",
"name": "handful of shelled peanuts",
"name_plural": "handful of shelled peanuts",
- "weight": 30,
+ "weight": "30 g",
"color": "brown",
"spoils_in": "240 days",
"container": "bag_plastic",
@@ -196,7 +196,7 @@
"id": "beech_nuts",
"name": "handful of beech nuts",
"name_plural": "handfuls of beech nuts",
- "weight": 30,
+ "weight": "30 g",
"color": "brown",
"spoils_in": "90 days",
"comestible_type": "FOOD",
@@ -217,7 +217,7 @@
"id": "walnut_unshelled",
"name": "handful of shelled walnuts",
"name_plural": "handfuls of shelled walnuts",
- "weight": 30,
+ "weight": "30 g",
"color": "brown",
"spoils_in": "180 days",
"comestible_type": "FOOD",
@@ -251,7 +251,7 @@
"id": "chestnut_unshelled",
"name": "handful of shelled chestnuts",
"name_plural": "handfuls of shelled chestnuts",
- "weight": 30,
+ "weight": "30 g",
"color": "brown",
"spoils_in": "180 days",
"comestible_type": "FOOD",
@@ -285,7 +285,7 @@
"id": "hazelnut_unshelled",
"name": "handful of shelled hazelnuts",
"name_plural": "handfuls of shelled hazelnuts",
- "weight": 30,
+ "weight": "30 g",
"color": "brown",
"spoils_in": "150 days",
"comestible_type": "FOOD",
@@ -307,7 +307,7 @@
"id": "edamame_roasted",
"name": "handful of roasted edamame",
"name_plural": "handful of roasted edamame",
- "weight": 30,
+ "weight": "30 g",
"color": "brown",
"spoils_in": "240 days",
"comestible_type": "FOOD",
@@ -329,7 +329,7 @@
"id": "soy_nuts",
"name": "handful of roasted soy nuts",
"name_plural": "handful of roasted soy nuts",
- "weight": 30,
+ "weight": "30 g",
"color": "brown",
"spoils_in": "240 days",
"comestible_type": "FOOD",
@@ -363,7 +363,7 @@
"id": "hickory_nut_unshelled",
"name": "handful of shelled hickory nuts",
"name_plural": "handfuls of shelled hickory nuts",
- "weight": 30,
+ "weight": "30 g",
"color": "brown",
"spoils_in": "180 days",
"comestible_type": "FOOD",
@@ -396,7 +396,7 @@
"type": "COMESTIBLE",
"id": "hickory_nut_ambrosia",
"name": "hickory nut ambrosia",
- "weight": 254,
+ "weight": "254 g",
"color": "brown",
"spoils_in": "10 days 19 hours",
"container": "bottle_plastic",
@@ -419,13 +419,13 @@
"id": "acorns",
"name": "handful of acorns",
"name_plural": "handfuls of acorns",
- "weight": 30,
+ "weight": "30 g",
"color": "brown",
"spoils_in": "240 days",
"comestible_type": "FOOD",
"symbol": "%",
"quench": -5,
- "//": "most acorns contain various amount of tannins, which can make you fairly sick. it also tastes pretty bad.",
+ "//": "no vitamins here",
"healthy": -5,
"calories": 114,
"description": "A handful of acorns, still in their shells. Squirrels like them, but they're not very good for you to eat in this state.",
@@ -454,7 +454,7 @@
"id": "acorns_cooked",
"name": "cooked acorn meal",
"name_plural": "cooked acorn meal",
- "weight": 22,
+ "weight": "22 g",
"color": "brown",
"spoils_in": "30 days",
"comestible_type": "FOOD",
diff --git a/data/json/items/comestibles/offal_dishes.json b/data/json/items/comestibles/offal_dishes.json
index 014a7fb8bccf4..090a9f04dc692 100644
--- a/data/json/items/comestibles/offal_dishes.json
+++ b/data/json/items/comestibles/offal_dishes.json
@@ -10,7 +10,7 @@
"description": "Thought it's not technically foie gras, you don't have to think about that.",
"material": [ "flesh", "fruit" ],
"color": "brown",
- "weight": 75,
+ "weight": "75 g",
"volume": "250 ml",
"charges": 3,
"spoils_in": "12 hours",
@@ -32,7 +32,7 @@
"description": "A classic way to serve liver.",
"material": [ "flesh", "veggy" ],
"color": "brown",
- "weight": 206,
+ "weight": "206 g",
"volume": "250 ml",
"charges": 2,
"spoils_in": "1 day",
@@ -53,7 +53,7 @@
"material": [ "flesh", "wheat", "milk" ],
"primary_material": "flesh",
"color": "brown",
- "weight": 58,
+ "weight": "58 g",
"volume": "250 ml",
"charges": 3,
"spoils_in": "3 days",
@@ -80,7 +80,7 @@
"material": [ "wheat", "flesh" ],
"primary_material": "processed_food",
"volume": "750ml",
- "weight": 249,
+ "weight": "249 g",
"charges": 3,
"flags": [ "EATEN_HOT" ],
"vitamins": [ [ "vitA", 36 ], [ "vitC", 15 ], [ "calcium", 1 ], [ "iron", 40 ], [ "vitB", 171 ] ]
@@ -101,7 +101,7 @@
"color": "brown",
"spoils_in": "1 days",
"volume": "250 ml",
- "weight": 70,
+ "weight": "70 g",
"flag": [ "EATEN_HOT" ],
"calories": 130
},
@@ -121,7 +121,7 @@
"color": "brown",
"spoils_in": "1 days",
"volume": "250 ml",
- "weight": 70,
+ "weight": "70 g",
"flag": [ "EATEN_HOT" ],
"calories": 310
},
@@ -140,7 +140,7 @@
"color": "magenta",
"spoils_in": "360 days",
"volume": "1750 ml",
- "weight": 112,
+ "weight": "112 g",
"charges": 14,
"calories": 344,
"vitamins": [ [ "vitA", 43 ], [ "vitC", 0 ], [ "calcium", 1 ], [ "iron", 5 ], [ "vitB", 193 ] ]
@@ -160,7 +160,7 @@
"color": "brown",
"spoils_in": "1 days",
"volume": "250 ml",
- "weight": 250,
+ "weight": "250 g",
"flag": [ "EATEN_HOT" ],
"calories": 285,
"charges": 3,
@@ -181,7 +181,7 @@
"color": "yellow",
"spoils_in": "1 days",
"volume": "250 ml",
- "weight": 180,
+ "weight": "180 g",
"charges": 3,
"flag": [ "EATEN_HOT" ],
"calories": 301,
diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
index 6c0fc9a2a5c6c..b51a3f24a00c1 100644
--- a/data/json/items/comestibles/other.json
+++ b/data/json/items/comestibles/other.json
@@ -3,7 +3,7 @@
"type": "COMESTIBLE",
"id": "testcomest",
"name": "diet pill",
- "weight": 100,
+ "weight": "100 g",
"color": "red",
"spoils_in": "4 days 4 hours",
"container": "bag_plastic",
@@ -19,7 +19,7 @@
"id": "slime_scrap",
"category": "other",
"name": "blob glob",
- "weight": 238,
+ "weight": "238 g",
"color": "dark_gray",
"use_action": "POISON",
"comestible_type": "FOOD",
@@ -34,7 +34,7 @@
"type": "COMESTIBLE",
"id": "honeycomb",
"name": "honey comb",
- "weight": 150,
+ "weight": "150 g",
"color": "yellow",
"use_action": "HONEYCOMB",
"comestible_type": "FOOD",
@@ -52,7 +52,7 @@
"id": "wax",
"name": "wax",
"name_plural": "waxes",
- "weight": 97,
+ "weight": "97 g",
"color": "white",
"comestible_type": "FOOD",
"symbol": "%",
@@ -70,7 +70,7 @@
"name": "royal jelly",
"name_plural": "royal jellies",
"category": "drugs",
- "weight": 150,
+ "weight": "150 g",
"color": "white",
"use_action": "ROYAL_JELLY",
"comestible_type": "FOOD",
@@ -89,7 +89,7 @@
"id": "marloss_berry",
"name": "marloss berry",
"name_plural": "marloss berries",
- "weight": 177,
+ "weight": "177 g",
"color": "pink",
"addiction_type": "marloss_r",
"use_action": "MARLOSS",
@@ -112,7 +112,7 @@
"id": "marloss_gel",
"name": "marloss gelatin",
"name_plural": "marloss gelatin",
- "weight": 177,
+ "weight": "177 g",
"color": "yellow",
"addiction_type": "marloss_y",
"use_action": "MARLOSS_GEL",
@@ -134,7 +134,7 @@
"id": "mycus_fruit",
"name": "mycus fruit",
"name_plural": "mycus fruits",
- "weight": 354,
+ "weight": "354 g",
"color": "light_gray",
"use_action": "MYCUS",
"comestible_type": "FOOD",
@@ -154,7 +154,7 @@
"type": "COMESTIBLE",
"id": "yeast",
"name": "yeast",
- "weight": 11,
+ "weight": "11 g",
"color": "white",
"container": "bag_plastic",
"comestible_type": "FOOD",
@@ -173,7 +173,7 @@
"type": "COMESTIBLE",
"id": "meal_bone",
"name": "bone meal",
- "weight": 112,
+ "weight": "112 g",
"color": "white",
"comestible_type": "FOOD",
"symbol": "%",
@@ -189,7 +189,7 @@
"type": "COMESTIBLE",
"id": "meal_bone_tainted",
"name": "tainted bone meal",
- "weight": 112,
+ "weight": "112 g",
"color": "white",
"use_action": "POISON",
"comestible_type": "FOOD",
@@ -207,7 +207,7 @@
"id": "meal_chitin_piece",
"name": "chitin powder",
"name_plural": "chitin powder",
- "weight": 112,
+ "weight": "112 g",
"color": "brown",
"comestible_type": "FOOD",
"symbol": "%",
@@ -226,7 +226,7 @@
"id": "paper",
"name": "paper",
"category": "spare_parts",
- "weight": 3,
+ "weight": "3 g",
"color": "white",
"comestible_type": "FOOD",
"symbol": "`",
@@ -244,7 +244,7 @@
"id": "can_beans",
"name": "canned beans",
"name_plural": "beans",
- "weight": 256,
+ "weight": "256 g",
"color": "brown",
"spoils_in": "2 days",
"container": "can_food",
@@ -264,7 +264,7 @@
"id": "dry_beans",
"name": "dried beans",
"name_plural": "dried beans",
- "weight": 56,
+ "weight": "56 g",
"color": "light_gray",
"spoils_in": "360 days",
"container": "bag_plastic",
@@ -288,7 +288,7 @@
"id": "beans_cooked",
"name": "cooked beans",
"name_plural": "cooked beans",
- "weight": 270,
+ "weight": "270 g",
"color": "light_gray",
"spoils_in": "10 days",
"comestible_type": "FOOD",
@@ -309,7 +309,7 @@
"id": "tofu",
"name": "tofu",
"name_plural": "tofu",
- "weight": 85,
+ "weight": "85 g",
"color": "white",
"spoils_in": "4 days",
"comestible_type": "FOOD",
@@ -330,7 +330,7 @@
"id": "tofu_fried",
"name": "fried tofu",
"name_plural": "fried tofu",
- "weight": 85,
+ "weight": "85 g",
"color": "white",
"spoils_in": "4 days",
"comestible_type": "FOOD",
@@ -350,7 +350,7 @@
"id": "dry_tofu",
"name": "dehydrated tofu",
"name_plural": "dehydrated tofu",
- "weight": 65,
+ "weight": "65 g",
"color": "white",
"spoils_in": "360 days",
"comestible_type": "FOOD",
@@ -369,7 +369,7 @@
"name": "soybeans",
"name_plural": "soybeans",
"copy-from": "seed",
- "weight": 160,
+ "weight": "160 g",
"symbol": ".",
"color": "yellow",
"healthy": -5,
@@ -386,7 +386,7 @@
"id": "raw_edamame",
"name": "raw edamame",
"copy-from": "seed",
- "weight": 160,
+ "weight": "160 g",
"symbol": ".",
"color": "green",
"healthy": -2,
@@ -403,7 +403,7 @@
"id": "dry_lentils",
"name": "dried lentils",
"name_plural": "dried lentils",
- "weight": 132,
+ "weight": "132 g",
"color": "light_gray",
"comestible_type": "FOOD",
"symbol": ",",
@@ -424,7 +424,7 @@
"id": "lentils_cooked",
"name": "cooked lentils",
"name_plural": "cooked lentils",
- "weight": 198,
+ "weight": "198 g",
"copy-from": "dry_lentils",
"color": "light_gray",
"spoils_in": "5 days",
@@ -442,7 +442,7 @@
"id": "coffee_raw",
"name": "coffee powder",
"name_plural": "coffee powder",
- "weight": 14,
+ "weight": "14 g",
"color": "brown",
"addiction_type": "caffeine",
"addiction_potential": 1,
@@ -481,7 +481,7 @@
"description": "Honey, that stuff the bees make. This variant is \"candied honey\", a variant of very thick consistence. This honey won't spoil and is good for your digestion.",
"price": 800,
"material": "honey",
- "weight": 51,
+ "weight": "51 g",
"volume": "250 ml",
"comestible_type": "FOOD",
"container": "jar_glass",
@@ -496,7 +496,7 @@
"id": "can_tomato",
"name": "canned tomato",
"name_plural": "canned tomatoes",
- "weight": 256,
+ "weight": "256 g",
"color": "red",
"spoils_in": "3 days 18 hours",
"container": "can_food",
@@ -517,7 +517,7 @@
"id": "human_brain_embalmed",
"name": "embalmed human brain",
"name_plural": "embalmed human brains",
- "weight": 56,
+ "weight": "56 g",
"color": "pink",
"looks_like": "offal",
"use_action": "POISON",
@@ -541,7 +541,7 @@
"name": "cattle fodder",
"name_plural": "cattle fodder",
"description": "What cattle eat. Mainly made of grass, silage or legumes. It's perfect for ruminants.",
- "weight": 300,
+ "weight": "300 g",
"volume": "250 ml",
"price": 100,
"to_hit": -5,
@@ -563,7 +563,7 @@
"name": "bird food",
"name_plural": "bird food",
"description": "What birds eat. Mainly made of seeds, silage or legumes. It's perfect for small birds.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 20,
"to_hit": -5,
@@ -584,7 +584,7 @@
"name": "dog food",
"name_plural": "dog food",
"description": "This is food for dogs. It smells strange, but dogs seem to love it.",
- "weight": 554,
+ "weight": "554 g",
"spoils_in": "1 day",
"container": "can_food",
"volume": "250 ml",
@@ -608,7 +608,7 @@
"name": "cat food",
"name_plural": "cat food",
"description": "This is food for cats. It smells strange, but cats seem to love it.",
- "weight": 223,
+ "weight": "223 g",
"spoils_in": "1 day",
"container": "can_food",
"volume": "250 ml",
@@ -630,7 +630,7 @@
"id": "grass",
"name": "grass",
"name_plural": "grasses",
- "weight": 100,
+ "weight": "100 g",
"color": "green",
"comestible_type": "FOOD",
"symbol": "%",
@@ -647,7 +647,7 @@
"id": "underbrush",
"name": "underbrush",
"name_plural": "underbrushes",
- "weight": 100,
+ "weight": "100 g",
"color": "green",
"comestible_type": "FOOD",
"symbol": "%",
@@ -664,7 +664,7 @@
"id": "nectar",
"name": "nectar",
"name_plural": "nectars",
- "weight": 100,
+ "weight": "100 g",
"color": "green",
"comestible_type": "FOOD",
"symbol": "%",
diff --git a/data/json/items/comestibles/protein.json b/data/json/items/comestibles/protein.json
index cfcd10683a011..b3e38106fc054 100644
--- a/data/json/items/comestibles/protein.json
+++ b/data/json/items/comestibles/protein.json
@@ -40,7 +40,7 @@
"comestible_type": "DRINK",
"name": "protein drink",
"description": "A thin slurry of refined protein mixed with water. While quite nutritious, it is not particularly tasty.",
- "weight": 288,
+ "weight": "288 g",
"volume": "250 ml",
"price": 200,
"symbol": "~",
@@ -62,7 +62,7 @@
"name": "protein powder",
"name_plural": "servings of protein powder",
"description": "Raw, refined protein. While quite nutritious, it is impossible to enjoy in its pure form, try adding water.",
- "weight": 38,
+ "weight": "38 g",
"volume": "250 ml",
"price": 1100,
"charges": 4,
diff --git a/data/json/items/comestibles/raw_fruit.json b/data/json/items/comestibles/raw_fruit.json
index 8a65b752b4569..139d4139992a8 100644
--- a/data/json/items/comestibles/raw_fruit.json
+++ b/data/json/items/comestibles/raw_fruit.json
@@ -3,7 +3,7 @@
"type": "COMESTIBLE",
"id": "apple",
"name": "apple",
- "weight": 182,
+ "weight": "182 g",
"color": "red",
"spoils_in": "6 days 16 hours",
"comestible_type": "FOOD",
@@ -24,7 +24,7 @@
"type": "COMESTIBLE",
"id": "banana",
"name": "banana",
- "weight": 118,
+ "weight": "118 g",
"color": "yellow",
"spoils_in": "5 days",
"comestible_type": "FOOD",
@@ -44,7 +44,7 @@
"type": "COMESTIBLE",
"id": "orange",
"name": "orange",
- "weight": 140,
+ "weight": "140 g",
"color": "light_red",
"spoils_in": "21 days",
"comestible_type": "FOOD",
@@ -65,7 +65,7 @@
"type": "COMESTIBLE",
"id": "lemon",
"name": "lemon",
- "weight": 84,
+ "weight": "84 g",
"color": "yellow",
"spoils_in": "21 days",
"comestible_type": "FOOD",
@@ -87,7 +87,7 @@
"id": "blueberries",
"name": "handful of blueberries",
"name_plural": "handful of blueberries",
- "weight": 156,
+ "weight": "156 g",
"color": "blue",
"spoils_in": "2 days 12 hours",
"comestible_type": "FOOD",
@@ -109,7 +109,7 @@
"id": "strawberries",
"name": "handful of strawberries",
"name_plural": "handful of strawberries",
- "weight": 144,
+ "weight": "144 g",
"color": "red",
"spoils_in": "2 days 12 hours",
"comestible_type": "FOOD",
@@ -131,7 +131,7 @@
"id": "cranberries",
"name": "handful of cranberries",
"name_plural": "handful of cranberries",
- "weight": 116,
+ "weight": "116 g",
"color": "red",
"spoils_in": 640,
"comestible_type": "FOOD",
@@ -153,7 +153,7 @@
"id": "raspberries",
"name": "handful of raspberries",
"name_plural": "handful of raspberries",
- "weight": 148,
+ "weight": "148 g",
"color": "red",
"spoils_in": "2 days 12 hours",
"comestible_type": "FOOD",
@@ -175,7 +175,7 @@
"id": "huckleberries",
"name": "handful of huckleberries",
"name_plural": "handful of huckleberries",
- "weight": 150,
+ "weight": "150 g",
"color": "blue",
"spoils_in": "2 days 12 hours",
"comestible_type": "FOOD",
@@ -197,7 +197,7 @@
"id": "mulberries",
"name": "handful of mulberries",
"name_plural": "handful of mulberries",
- "weight": 148,
+ "weight": "148 g",
"color": "red",
"spoils_in": "2 days 12 hours",
"comestible_type": "FOOD",
@@ -219,7 +219,7 @@
"id": "elderberries",
"name": "handful of elderberries",
"name_plural": "handful of elderberries",
- "weight": 153,
+ "weight": "153 g",
"color": "red",
"spoils_in": "2 days 12 hours",
"comestible_type": "FOOD",
@@ -241,7 +241,7 @@
"id": "rose_hips",
"name": "handful of rose hips",
"name_plural": "handful of rose hips",
- "weight": 134,
+ "weight": "134 g",
"color": "red",
"spoils_in": "2 days 12 hours",
"comestible_type": "FOOD",
@@ -262,7 +262,7 @@
"type": "COMESTIBLE",
"id": "juice_pulp",
"name": "juice pulp",
- "weight": 62,
+ "weight": "62 g",
"color": "light_red",
"spoils_in": "2 days 12 hours",
"comestible_type": "FOOD",
@@ -283,7 +283,7 @@
"type": "COMESTIBLE",
"id": "pear",
"name": "pear",
- "weight": 148,
+ "weight": "148 g",
"color": "yellow",
"spoils_in": "4 days",
"comestible_type": "FOOD",
@@ -304,7 +304,7 @@
"type": "COMESTIBLE",
"id": "grapefruit",
"name": "grapefruit",
- "weight": 246,
+ "weight": "246 g",
"color": "yellow",
"spoils_in": 336,
"comestible_type": "FOOD",
@@ -326,7 +326,7 @@
"id": "cherries",
"name": "handful of cherries",
"name_plural": "handful of cherries",
- "weight": 146,
+ "weight": "146 g",
"color": "red",
"spoils_in": "2 days 12 hours",
"comestible_type": "FOOD",
@@ -347,7 +347,7 @@
"type": "COMESTIBLE",
"id": "plums",
"name": "plum",
- "weight": 66,
+ "weight": "66 g",
"color": "magenta",
"spoils_in": "2 days 12 hours",
"comestible_type": "FOOD",
@@ -369,7 +369,7 @@
"id": "grapes",
"name": "handful of grapes",
"name_plural": "handful of grapes",
- "weight": 97,
+ "weight": "97 g",
"color": "light_green",
"spoils_in": "5 days",
"comestible_type": "FOOD",
@@ -390,7 +390,7 @@
"type": "COMESTIBLE",
"id": "pineapple",
"name": "pineapple",
- "weight": 174,
+ "weight": "174 g",
"color": "brown",
"spoils_in": "3 days",
"comestible_type": "FOOD",
@@ -413,7 +413,7 @@
"type": "COMESTIBLE",
"id": "coconut",
"name": "coconut",
- "weight": 84,
+ "weight": "84 g",
"color": "brown",
"spoils_in": "360 days",
"comestible_type": "FOOD",
@@ -434,7 +434,7 @@
"id": "peach",
"name": "peach",
"name_plural": "peaches",
- "weight": 163,
+ "weight": "163 g",
"color": "yellow",
"spoils_in": "3 days",
"comestible_type": "FOOD",
@@ -455,7 +455,7 @@
"type": "COMESTIBLE",
"id": "watermelon",
"name": "watermelon",
- "weight": 161,
+ "weight": "161 g",
"color": "green",
"spoils_in": "7 days 12 hours",
"comestible_type": "FOOD",
@@ -480,7 +480,7 @@
"id": "melon",
"name": "melon",
"//": "based on a canteloupe",
- "weight": 165,
+ "weight": "165 g",
"color": "light_green",
"spoils_in": "7 days 12 hours",
"comestible_type": "FOOD",
@@ -504,7 +504,7 @@
"id": "blackberries",
"name": "handful of blackberries",
"name_plural": "handful of blackberries",
- "weight": 166,
+ "weight": "166 g",
"color": "blue",
"spoils_in": "2 days 12 hours",
"comestible_type": "FOOD",
@@ -525,7 +525,7 @@
"type": "COMESTIBLE",
"id": "mango",
"name": "mango",
- "weight": 174,
+ "weight": "174 g",
"color": "red",
"spoils_in": "5 days",
"comestible_type": "FOOD",
@@ -548,7 +548,7 @@
"type": "COMESTIBLE",
"id": "pomegranate",
"name": "pomegranate",
- "weight": 184,
+ "weight": "184 g",
"color": "red",
"spoils_in": 336,
"comestible_type": "FOOD",
@@ -570,7 +570,7 @@
"type": "COMESTIBLE",
"id": "papaya",
"name": "papaya",
- "weight": 243,
+ "weight": "243 g",
"color": "yellow",
"spoils_in": "5 days",
"comestible_type": "FOOD",
@@ -592,7 +592,7 @@
"type": "COMESTIBLE",
"id": "kiwi",
"name": "kiwi",
- "weight": 74,
+ "weight": "74 g",
"color": "brown",
"spoils_in": "7 days",
"comestible_type": "FOOD",
@@ -615,7 +615,7 @@
"name": "handful of apricots",
"name_plural": "handful of apricots",
"//": "a handful of apricots is about 4.6 apricots",
- "weight": 164,
+ "weight": "164 g",
"color": "yellow",
"spoils_in": "2 days",
"comestible_type": "FOOD",
@@ -636,7 +636,7 @@
"type": "COMESTIBLE",
"id": "cactus_pad",
"name": "cactus pad",
- "weight": 100,
+ "weight": "100 g",
"color": "green",
"spoils_in": "1 days",
"comestible_type": "FOOD",
diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json
index 2827e20aef2c4..ec069de459539 100644
--- a/data/json/items/comestibles/raw_veggy.json
+++ b/data/json/items/comestibles/raw_veggy.json
@@ -3,7 +3,7 @@
"type": "COMESTIBLE",
"id": "barley",
"name": "barley",
- "weight": 211,
+ "weight": "211 g",
"color": "brown",
"comestible_type": "FOOD",
"symbol": ",",
@@ -27,7 +27,7 @@
"comestible_type": "FOOD",
"calories": 9,
"fun": -5,
- "weight": 40,
+ "weight": "40 g",
"to_hit": -3,
"color": "white",
"symbol": ",",
@@ -40,7 +40,7 @@
"id": "broccoli",
"name": "broccoli",
"name_plural": "broccoli",
- "weight": 96,
+ "weight": "96 g",
"color": "green",
"spoils_in": "6 days 16 hours",
"comestible_type": "FOOD",
@@ -60,7 +60,7 @@
"id": "buckwheat",
"name": "buckwheat",
"name_plural": "buckwheat",
- "weight": 180,
+ "weight": "180 g",
"color": "brown",
"comestible_type": "FOOD",
"symbol": ",",
@@ -80,7 +80,7 @@
"type": "COMESTIBLE",
"id": "cabbage",
"name": "cabbage",
- "weight": 139,
+ "weight": "139 g",
"color": "white",
"spoils_in": "10 days",
"comestible_type": "FOOD",
@@ -103,7 +103,7 @@
"id": "spinach",
"name": "spinach",
"name_plural": "spinach",
- "weight": 139,
+ "weight": "139 g",
"color": "green",
"spoils_in": "8 days",
"comestible_type": "FOOD",
@@ -124,7 +124,7 @@
"id": "carrot",
"name": "carrot",
"name_plural": "carrots",
- "weight": 68,
+ "weight": "68 g",
"color": "light_red",
"spoils_in": "5 days",
"comestible_type": "FOOD",
@@ -146,7 +146,7 @@
"id": "cattail_rhizome",
"name": "cattail rhizome",
"name_plural": "cattail rhizomes",
- "weight": 209,
+ "weight": "209 g",
"color": "brown",
"spoils_in": "3 days 8 hours",
"comestible_type": "FOOD",
@@ -164,7 +164,7 @@
"id": "cattail_stalk",
"name": "cattail stalk",
"name_plural": "cattail stalks",
- "weight": 100,
+ "weight": "100 g",
"color": "green",
"spoils_in": "3 days 8 hours",
"comestible_type": "FOOD",
@@ -183,7 +183,7 @@
"type": "COMESTIBLE",
"id": "celery",
"name": "celery",
- "weight": 107,
+ "weight": "107 g",
"color": "light_green",
"spoils_in": "6 days 6 hours",
"comestible_type": "FOOD",
@@ -203,7 +203,7 @@
"id": "corn",
"name": "corn",
"name_plural": "corn",
- "weight": 153,
+ "weight": "153 g",
"color": "light_green",
"spoils_in": "5 days",
"comestible_type": "FOOD",
@@ -225,7 +225,7 @@
"name": "cotton boll",
"name_plural": "cotton bolls",
"category": "other",
- "weight": 26,
+ "weight": "26 g",
"color": "light_green",
"comestible_type": "FOOD",
"symbol": "%",
@@ -243,7 +243,7 @@
"type": "COMESTIBLE",
"id": "chili_pepper",
"name": "chili pepper",
- "weight": 53,
+ "weight": "53 g",
"color": "red",
"spoils_in": "30 days",
"comestible_type": "FOOD",
@@ -263,7 +263,7 @@
"type": "COMESTIBLE",
"id": "cucumber",
"name": "cucumber",
- "weight": 330,
+ "weight": "330 g",
"color": "green",
"spoils_in": "6 days 6 hours",
"comestible_type": "FOOD",
@@ -283,7 +283,7 @@
"type": "COMESTIBLE",
"id": "dahlia_root",
"name": "dahlia root",
- "weight": 190,
+ "weight": "190 g",
"color": "brown",
"spoils_in": "30 days",
"comestible_type": "FOOD",
@@ -301,7 +301,7 @@
"id": "salsify_raw",
"name": "salsify",
"name_plural": "handfuls of salsify",
- "weight": 133,
+ "weight": "133 g",
"color": "green",
"spoils_in": "30 days",
"comestible_type": "FOOD",
@@ -322,7 +322,7 @@
"id": "chicory_raw",
"name": "chicory",
"name_plural": "handfuls of chicory",
- "weight": 60,
+ "weight": "60 g",
"color": "cyan",
"spoils_in": "30 days",
"comestible_type": "FOOD",
@@ -360,7 +360,7 @@
"calories": 9,
"fun": -15,
"healthy": -2,
- "weight": 40,
+ "weight": "40 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
@@ -372,7 +372,7 @@
"type": "COMESTIBLE",
"id": "garlic",
"name": "garlic bulb",
- "weight": 14,
+ "weight": "14 g",
"color": "white",
"spoils_in": "360 days",
"comestible_type": "FOOD",
@@ -393,7 +393,7 @@
"id": "hops",
"name": "hops flower",
"name_plural": "hops flowers",
- "weight": 92,
+ "weight": "92 g",
"color": "light_green",
"comestible_type": "FOOD",
"symbol": ",",
@@ -412,7 +412,7 @@
"type": "COMESTIBLE",
"id": "lettuce",
"name": "lettuce",
- "weight": 38,
+ "weight": "38 g",
"color": "light_green",
"spoils_in": "10 days",
"comestible_type": "FOOD",
@@ -437,7 +437,7 @@
"spoils_in": "10 days",
"calories": 9,
"fun": -8,
- "weight": 40,
+ "weight": "40 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
@@ -449,7 +449,7 @@
"type": "COMESTIBLE",
"id": "onion",
"name": "onion",
- "weight": 150,
+ "weight": "150 g",
"color": "white",
"spoils_in": "30 days",
"comestible_type": "FOOD",
@@ -470,7 +470,7 @@
"type": "COMESTIBLE",
"id": "plant_sac",
"name": "fungal fluid sac",
- "weight": 278,
+ "weight": "278 g",
"color": "light_green",
"spoils_in": "3 days 8 hours",
"//": "wild vegetables as a reference",
@@ -492,7 +492,7 @@
"id": "potato",
"name": "raw potato",
"name_plural": "raw potatoes",
- "weight": 210,
+ "weight": "210 g",
"color": "brown",
"spoils_in": "60 days",
"comestible_type": "FOOD",
@@ -512,7 +512,7 @@
"type": "COMESTIBLE",
"id": "pumpkin",
"name": "pumpkin",
- "weight": 123,
+ "weight": "123 g",
"color": "light_red",
"spoils_in": "60 days",
"comestible_type": "FOOD",
@@ -536,7 +536,7 @@
"id": "raw_dandelion",
"name": "handful of dandelions",
"name_plural": "handfuls of dandelions",
- "weight": 58,
+ "weight": "58 g",
"color": "yellow",
"spoils_in": "1 day 6 hours",
"comestible_type": "FOOD",
@@ -557,7 +557,7 @@
"type": "COMESTIBLE",
"id": "rhubarb",
"name": "rhubarb",
- "weight": 129,
+ "weight": "129 g",
"color": "red",
"spoils_in": "6 days 16 hours",
"comestible_type": "FOOD",
@@ -577,7 +577,7 @@
"type": "COMESTIBLE",
"id": "sugar_beet",
"name": "sugar beet",
- "weight": 143,
+ "weight": "143 g",
"color": "brown",
"spoils_in": "95 days",
"stim": 1,
@@ -599,7 +599,7 @@
"id": "tea_raw",
"name": "tea leaf",
"name_plural": "tea leaves",
- "weight": 14,
+ "weight": "14 g",
"color": "green",
"use_action": "CAFF",
"stim": 1,
@@ -621,7 +621,7 @@
"id": "tomato",
"name": "tomato",
"name_plural": "tomatoes",
- "weight": 212,
+ "weight": "212 g",
"color": "red",
"spoils_in": "3 days 18 hours",
"comestible_type": "FOOD",
@@ -641,7 +641,7 @@
"type": "COMESTIBLE",
"id": "veggy",
"name": "plant marrow",
- "weight": 119,
+ "weight": "119 g",
"color": "green",
"spoils_in": "3 days 8 hours",
"comestible_type": "FOOD",
@@ -686,7 +686,7 @@
"type": "COMESTIBLE",
"id": "zucchini",
"name": "zucchini",
- "weight": 196,
+ "weight": "196 g",
"color": "light_green",
"spoils_in": "5 days",
"comestible_type": "FOOD",
@@ -709,7 +709,7 @@
"comestible_type": "FOOD",
"calories": 9,
"fun": -8,
- "weight": 40,
+ "weight": "40 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
@@ -725,7 +725,7 @@
"color": "brown",
"spoils_in": "2 days",
"comestible_type": "FOOD",
- "weight": 194,
+ "weight": "194 g",
"symbol": "%",
"healthy": -2,
"calories": 56,
@@ -746,7 +746,7 @@
"color": "light_green",
"spoils_in": "2 days",
"comestible_type": "FOOD",
- "weight": 194,
+ "weight": "194 g",
"symbol": "%",
"healthy": -2,
"calories": 42,
diff --git a/data/json/items/comestibles/sandwich.json b/data/json/items/comestibles/sandwich.json
index 408c3df035cbe..6297fe7e92a72 100644
--- a/data/json/items/comestibles/sandwich.json
+++ b/data/json/items/comestibles/sandwich.json
@@ -4,7 +4,7 @@
"id": "sandwich_cheese_grilled",
"name": "grilled cheese sandwich",
"name_plural": "grilled cheese sandwiches",
- "weight": 106,
+ "weight": "106 g",
"color": "brown",
"spoils_in": "1 day 10 hours",
"stim": 1,
@@ -27,7 +27,7 @@
"id": "sandwich_deluxe",
"name": "deluxe sandwich",
"name_plural": "deluxe sandwiches",
- "weight": 292,
+ "weight": "292 g",
"color": "brown",
"spoils_in": "1 day 8 hours",
"stim": 1,
@@ -51,7 +51,7 @@
"id": "sandwich_cucumber",
"name": "cucumber sandwich",
"name_plural": "cucumber sandwiches",
- "weight": 500,
+ "weight": "500 g",
"color": "light_green",
"spoils_in": "1 day 12 hours",
"container": "wrapper",
@@ -73,7 +73,7 @@
"id": "sandwich_cheese",
"name": "cheese sandwich",
"name_plural": "cheese sandwiches",
- "weight": 106,
+ "weight": "106 g",
"color": "brown",
"spoils_in": "1 day 12 hours",
"stim": 1,
@@ -94,7 +94,7 @@
"id": "sandwich_jam",
"name": "jam sandwich",
"name_plural": "jam sandwiches",
- "weight": 97,
+ "weight": "97 g",
"color": "brown",
"spoils_in": "1 day 13 hours",
"container": "wrapper",
@@ -115,7 +115,7 @@
"id": "sandwich_fairy",
"name": "fairy bread",
"name_plural": "fairy bread",
- "weight": 114,
+ "weight": "114 g",
"color": "brown",
"spoils_in": "3 days",
"container": "wrapper",
@@ -134,7 +134,7 @@
"id": "sandwich_honey",
"name": "honey sandwich",
"name_plural": "honey sandwiches",
- "weight": 192,
+ "weight": "192 g",
"color": "brown",
"spoils_in": "10 days",
"container": "wrapper",
@@ -171,7 +171,7 @@
"id": "sandwich_veggy",
"name": "vegetable sandwich",
"name_plural": "vegetable sandwiches",
- "weight": 289,
+ "weight": "289 g",
"color": "light_gray",
"spoils_in": "2 days",
"container": "wrapper",
@@ -193,7 +193,7 @@
"id": "sandwich_t",
"name": "meat sandwich",
"name_plural": "meat sandwiches",
- "weight": 233,
+ "weight": "233 g",
"color": "light_gray",
"spoils_in": "1 day 12 hours",
"container": "wrapper",
@@ -213,7 +213,7 @@
"id": "sandwich_pb",
"name": "peanut butter sandwich",
"name_plural": "peanut butter sandwiches",
- "weight": 204,
+ "weight": "204 g",
"color": "brown",
"spoils_in": "1 day 12 hours",
"container": "wrapper",
@@ -233,7 +233,7 @@
"id": "sandwich_pbj",
"name": "PB&J sandwich",
"name_plural": "PB&J sandwiches",
- "weight": 102,
+ "weight": "102 g",
"color": "brown",
"spoils_in": "1 day 12 hours",
"container": "wrapper",
@@ -254,7 +254,7 @@
"id": "sandwich_pbh",
"name": "PB&H sandwich",
"name_plural": "PB&H sandwiches",
- "weight": 97,
+ "weight": "97 g",
"color": "brown",
"spoils_in": "1 day 12 hours",
"container": "wrapper",
@@ -275,7 +275,7 @@
"id": "sandwich_pbm",
"name": "PB&M sandwich",
"name_plural": "PB&M sandwiches",
- "weight": 225,
+ "weight": "225 g",
"color": "brown",
"spoils_in": "1 day 12 hours",
"container": "wrapper",
@@ -295,7 +295,7 @@
"id": "fish_sandwich",
"name": "fish sandwich",
"name_plural": "fish sandwiches",
- "weight": 201,
+ "weight": "201 g",
"color": "yellow",
"spoils_in": "1 day",
"container": "wrapper",
@@ -313,7 +313,7 @@
"type": "COMESTIBLE",
"id": "blt",
"name": "BLT",
- "weight": 220,
+ "weight": "220 g",
"color": "brown",
"spoils_in": "2 days 12 hours",
"stim": 1,
diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json
index b114697111536..1a9c9223e3f03 100644
--- a/data/json/items/comestibles/seed.json
+++ b/data/json/items/comestibles/seed.json
@@ -7,7 +7,7 @@
"name_plural": "seeds",
"category": "seeds",
"volume": "250 ml",
- "weight": 1,
+ "weight": "1 g",
"price": 120,
"charges": 4,
"stack_size": 100,
@@ -42,7 +42,7 @@
"name": "hop rhizomes",
"name_plural": "hop rhizomes",
"description": "Roots of a hop plant, for growing your own.",
- "weight": 152,
+ "weight": "152 g",
"price": 160,
"charges": 2,
"stack_size": 8,
@@ -155,7 +155,7 @@
"name": "barley seeds",
"name_plural": "barley seeds",
"description": "Some barley seeds.",
- "weight": 5,
+ "weight": "5 g",
"charges": 2,
"stack_size": 40,
"seed_data": { "plant_name": "barley", "fruit": "barley", "byproducts": [ "straw_pile" ], "grow": "70 days" }
@@ -169,7 +169,7 @@
"name_plural": "sugar beet seeds",
"description": "Some sugar beet seeds.",
"volume": 0,
- "weight": 5,
+ "weight": "5 g",
"stack_size": 40,
"seed_data": { "plant_name": "sugar beet", "fruit": "sugar_beet", "grow": "90 days" }
},
@@ -212,7 +212,7 @@
"name": "cotton seeds",
"name_plural": "cotton seeds",
"description": "Some cotton seeds. Can be processed to produce an edible oil.",
- "weight": 5,
+ "weight": "5 g",
"charges": 8,
"stack_size": 40,
"seed_data": { "plant_name": "cotton", "fruit": "cotton_boll", "byproducts": [ "withered" ], "grow": "130 days" }
@@ -334,7 +334,7 @@
"id": "garlic_clove",
"name": "garlic clove",
"name_plural": "garlic cloves",
- "weight": 3,
+ "weight": "3 g",
"color": "white",
"spoils_in": "360 days",
"comestible_type": "FOOD",
@@ -400,7 +400,7 @@
"name": "seed potato",
"name_plural": "seed potatoes",
"description": "A raw potato, cut into pieces, separating each bud for planting.",
- "weight": 20,
+ "weight": "20 g",
"stack_size": 10,
"seed_data": { "plant_name": "potatoes", "fruit": "potato", "byproducts": [ "withered" ], "grow": "95 days" }
},
@@ -417,7 +417,7 @@
"calories": 17,
"description": "Seeds of the cannabis plant. Filled with vitamins, they can be roasted or eaten raw.",
"price": 100,
- "weight": 2,
+ "weight": "2 g",
"charges": 2,
"seed_data": { "plant_name": "cannabis", "fruit": "cannabis", "grow": "91 days" }
},
@@ -440,7 +440,7 @@
"category": "seeds",
"name": "marloss seed",
"name_plural": "marloss seeds",
- "weight": 177,
+ "weight": "177 g",
"color": "cyan",
"addiction_type": "marloss_b",
"use_action": "MARLOSS_SEED",
@@ -465,7 +465,7 @@
"copy-from": "seed",
"name": "bean seeds",
"name_plural": "bean seeds",
- "weight": 194,
+ "weight": "194 g",
"symbol": "%",
"description": "Raw, uncooked beans, ready for planting.",
"charges": 2,
@@ -478,7 +478,7 @@
"copy-from": "seed",
"name": "soybean seeds",
"name_plural": "soybean seeds",
- "weight": 160,
+ "weight": "160 g",
"symbol": ".",
"color": "yellow",
"description": "Some soybean seeds.",
@@ -491,7 +491,7 @@
"copy-from": "seed",
"name": "raw lentils",
"name_plural": "raw lentils",
- "weight": 194,
+ "weight": "194 g",
"symbol": "%",
"description": "Raw, uncooked lentils, ready for planting.",
"charges": 2,
@@ -527,7 +527,7 @@
"copy-from": "seed",
"name": "pumpkin seeds",
"name_plural": "pumpkin seeds",
- "weight": 2,
+ "weight": "2 g",
"color": "green",
"use_action": "SEED",
"calories": 17,
@@ -542,7 +542,7 @@
"copy-from": "seed",
"name": "sunflower seeds",
"name_plural": "sunflower seeds",
- "weight": 2,
+ "weight": "2 g",
"color": "green",
"use_action": "SEED",
"calories": 17,
@@ -664,7 +664,7 @@
"name": "datura seeds",
"name_plural": "datura seeds",
"description": "Small, dark seeds from the spiny pods of a datura plant. Full of powerful psychoactive chemicals, these tiny seeds are a potent analgesic and deliriant, and can be deadly in cases of overdose.",
- "weight": 2,
+ "weight": "2 g",
"price": 0,
"stim": 6,
"healthy": -2,
@@ -692,7 +692,7 @@
"description": "Some oat seeds.",
"material": "wheat",
"primary_material": "dried_vegetable",
- "weight": 5,
+ "weight": "5 g",
"stack_size": 40,
"seed_data": { "plant_name": "oats", "fruit": "oats", "byproducts": [ "withered" ], "grow": "45 days" }
},
@@ -703,7 +703,7 @@
"name": "wheat seeds",
"name_plural": "wheat seeds",
"description": "Some wheat seeds.",
- "weight": 5,
+ "weight": "5 g",
"price": 50,
"stack_size": 40,
"material": "wheat",
@@ -715,7 +715,7 @@
"id": "fried_seeds",
"name": "fried seeds",
"name_plural": "fried seeds",
- "weight": 32,
+ "weight": "32 g",
"color": "yellow",
"container": "bag_plastic",
"comestible_type": "FOOD",
@@ -737,7 +737,7 @@
"name": "Kentucky coffee pod",
"name_plural": "Kentucky coffee pods",
"category": "other",
- "weight": 26,
+ "weight": "26 g",
"color": "light_green",
"comestible_type": "FOOD",
"looks_like": "hickory_nuts",
@@ -776,7 +776,7 @@
"vitamins": [ [ "calcium", 4 ], [ "iron", 8 ] ],
"flags": [ "EDIBLE_FROZEN" ],
"stack_size": 40,
- "weight": 106
+ "weight": "106 g"
},
{
"type": "COMESTIBLE",
diff --git a/data/json/items/comestibles/soup.json b/data/json/items/comestibles/soup.json
index 3575b01dfd6ef..0efe41c5fada2 100644
--- a/data/json/items/comestibles/soup.json
+++ b/data/json/items/comestibles/soup.json
@@ -3,7 +3,7 @@
"type": "COMESTIBLE",
"id": "broth",
"name": "broth",
- "weight": 253,
+ "weight": "253 g",
"color": "yellow",
"spoils_in": "6 days 16 hours",
"container": "can_food",
@@ -24,7 +24,7 @@
"type": "COMESTIBLE",
"id": "broth_bone",
"name": "bone broth",
- "weight": 267,
+ "weight": "267 g",
"color": "yellow",
"spoils_in": "6 days 16 hours",
"container": "can_food",
@@ -55,7 +55,7 @@
"type": "COMESTIBLE",
"id": "soup_veggy",
"name": "vegetable soup",
- "weight": 254,
+ "weight": "254 g",
"color": "red",
"spoils_in": "5 days",
"container": "can_food",
@@ -77,7 +77,7 @@
"type": "COMESTIBLE",
"id": "soup_meat",
"name": "meat soup",
- "weight": 253,
+ "weight": "253 g",
"color": "red",
"spoils_in": "5 days",
"container": "can_food",
@@ -99,7 +99,7 @@
"type": "COMESTIBLE",
"id": "soup_fish",
"name": "fish soup",
- "weight": 265,
+ "weight": "265 g",
"color": "light_gray",
"spoils_in": "5 days",
"container": "can_food",
@@ -122,7 +122,7 @@
"id": "curry_veggy",
"name": "curry",
"name_plural": "curries",
- "weight": 263,
+ "weight": "263 g",
"color": "red",
"spoils_in": "5 days",
"container": "can_food",
@@ -145,7 +145,7 @@
"id": "curry_meat",
"name": "curry with meat",
"name_plural": "curries with meat",
- "weight": 289,
+ "weight": "289 g",
"color": "red",
"spoils_in": "5 days",
"container": "can_food",
@@ -168,7 +168,7 @@
"type": "COMESTIBLE",
"id": "soup_woods",
"name": "woods soup",
- "weight": 250,
+ "weight": "250 g",
"color": "red",
"spoils_in": "5 days",
"container": "can_food",
@@ -199,7 +199,7 @@
"type": "COMESTIBLE",
"id": "soup_chicken",
"name": "chicken noodle soup",
- "weight": 261,
+ "weight": "261 g",
"color": "light_gray",
"spoils_in": "5 days",
"container": "can_food",
@@ -222,7 +222,7 @@
"type": "COMESTIBLE",
"id": "soup_mushroom",
"name": "mushroom soup",
- "weight": 266,
+ "weight": "266 g",
"color": "light_gray",
"spoils_in": "5 days",
"container": "can_food",
@@ -245,7 +245,7 @@
"type": "COMESTIBLE",
"id": "soup_tomato",
"name": "tomato soup",
- "weight": 257,
+ "weight": "257 g",
"color": "red",
"spoils_in": "6 days 16 hours",
"container": "can_food",
@@ -268,7 +268,7 @@
"id": "soup_dumplings",
"name": "chicken and dumplings",
"name_plural": "chicken and dumplings",
- "weight": 263,
+ "weight": "263 g",
"color": "light_gray",
"spoils_in": "6 days 16 hours",
"container": "can_food",
@@ -291,7 +291,7 @@
"type": "COMESTIBLE",
"id": "soup_cullenskink",
"name": "cullen skink",
- "weight": 261,
+ "weight": "261 g",
"color": "white",
"spoils_in": "5 days",
"container": "can_food",
diff --git a/data/json/items/comestibles/spice.json b/data/json/items/comestibles/spice.json
index a7b59e5ebcec8..8c8b8dbbda88e 100644
--- a/data/json/items/comestibles/spice.json
+++ b/data/json/items/comestibles/spice.json
@@ -67,7 +67,7 @@
"id": "sugar",
"name": "sugar",
"name_plural": "sugar",
- "weight": 5,
+ "weight": "5 g",
"color": "white",
"container": "box_small",
"comestible_type": "FOOD",
@@ -87,7 +87,7 @@
"id": "sprinkles",
"name": "sprinkles",
"name_plural": "sprinkles",
- "weight": 4,
+ "weight": "4 g",
"copy-from": "sugar",
"container": "bottle_plastic_small",
"description": "Known as nonpareils, sprinkles, jimmies, sugar strands or 'hundreds-and-thousands', these colorful balls, rods or flakes of sugar and starch are intended for use decorating soft surfaces of sweets. Like sugar, they are bad for your teeth and surprisingly not very tasty on their own.",
@@ -100,7 +100,7 @@
"id": "wild_herbs",
"name": "wild herbs",
"name_plural": "wild herbs",
- "weight": 7,
+ "weight": "7 g",
"color": "green",
"comestible_type": "FOOD",
"symbol": "%",
@@ -124,7 +124,7 @@
"name_plural": "soy sauce",
"description": "Salty fermented soybean sauce.",
"price": 190,
- "weight": 24,
+ "weight": "24 g",
"volume": "250 ml",
"calories": 17,
"comestible_type": "DRINK",
@@ -145,7 +145,7 @@
"comestible_type": "FOOD",
"calories": 9,
"fun": -4,
- "weight": 40,
+ "weight": "40 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json
index fa88406b4b6b1..bd4433dced8fb 100644
--- a/data/json/items/comestibles/veggy_dishes.json
+++ b/data/json/items/comestibles/veggy_dishes.json
@@ -16,7 +16,7 @@
"id": "starch",
"name": "starch",
"name_plural": "starch",
- "weight": 180,
+ "weight": "180 g",
"color": "light_gray",
"spoils_in": "1 day 6 hours",
"comestible_type": "FOOD",
@@ -82,7 +82,7 @@
"type": "COMESTIBLE",
"id": "veggy_aspic",
"name": "vegetable aspic",
- "weight": 120,
+ "weight": "120 g",
"color": "green",
"spoils_in": "3 days 8 hours",
"comestible_type": "FOOD",
@@ -126,7 +126,7 @@
"type": "COMESTIBLE",
"id": "cornmeal",
"name": "cornmeal",
- "weight": 19,
+ "weight": "19 g",
"color": "yellow",
"spoils_in": "360 days",
"container": "box_small",
@@ -148,7 +148,7 @@
"id": "deluxe_veggy_beans",
"name": "vegetarian baked beans",
"name_plural": "vegetarian baked beans",
- "weight": 270,
+ "weight": "270 g",
"color": "brown",
"spoils_in": "15 days",
"comestible_type": "FOOD",
@@ -169,7 +169,7 @@
"id": "dry_rice",
"name": "dried rice",
"name_plural": "dried rice",
- "weight": 40,
+ "weight": "40 g",
"color": "white",
"spoils_in": "360 days",
"container": "bag_plastic",
@@ -194,7 +194,7 @@
"name": "cooked rice",
"name_plural": "cooked rice",
"copy-from": "dry_rice",
- "weight": 62,
+ "weight": "62 g",
"color": "light_gray",
"spoils_in": "10 days",
"quench": 0,
@@ -212,7 +212,7 @@
"id": "deluxe_veggy_rice",
"name": "fried rice",
"name_plural": "fried rice",
- "weight": 135,
+ "weight": "135 g",
"color": "yellow",
"spoils_in": "15 days",
"comestible_type": "FOOD",
@@ -232,7 +232,7 @@
"id": "beansnrice",
"name": "beans and rice",
"name_plural": "beans and rice",
- "weight": 70,
+ "weight": "70 g",
"color": "light_gray",
"spoils_in": "10 days",
"comestible_type": "FOOD",
@@ -252,7 +252,7 @@
"id": "tofu_rice",
"name": "tofu fried rice",
"name_plural": "tofu fried rice",
- "weight": 135,
+ "weight": "135 g",
"color": "yellow",
"spoils_in": "15 days",
"comestible_type": "FOOD",
@@ -272,7 +272,7 @@
"id": "tofu_stirfry",
"name": "tofu stirfry",
"name_plural": "tofu stirfry",
- "weight": 135,
+ "weight": "135 g",
"color": "yellow",
"spoils_in": "4 days",
"comestible_type": "FOOD",
@@ -293,7 +293,7 @@
"id": "deluxe_veggy_beansnrice",
"name": "deluxe vegetarian beans and rice",
"name_plural": "deluxe vegetarian beans and rice",
- "weight": 140,
+ "weight": "140 g",
"color": "brown",
"spoils_in": "15 days",
"comestible_type": "FOOD",
@@ -314,7 +314,7 @@
"id": "potato_baked",
"name": "baked potato",
"name_plural": "baked potatoes",
- "weight": 241,
+ "weight": "241 g",
"color": "brown",
"spoils_in": "2 days",
"comestible_type": "FOOD",
@@ -348,7 +348,7 @@
"type": "COMESTIBLE",
"id": "pie_veggy",
"name": "vegetable pie",
- "weight": 240,
+ "weight": "240 g",
"color": "brown",
"spoils_in": "3 days",
"container": "box_small",
@@ -370,7 +370,7 @@
"type": "COMESTIBLE",
"id": "pizza_veggy",
"name": "vegetable pizza",
- "weight": 230,
+ "weight": "230 g",
"color": "light_green",
"spoils_in": "2 days",
"container": "box_small",
@@ -390,7 +390,7 @@
"type": "COMESTIBLE",
"id": "sauce_pesto",
"name": "pesto",
- "weight": 65,
+ "weight": "65 g",
"color": "light_green",
"spoils_in": 144,
"container": "jar_glass",
@@ -412,7 +412,7 @@
"id": "veggy_canned",
"name": "canned veggy",
"name_plural": "canned veggies",
- "weight": 259,
+ "weight": "259 g",
"color": "green",
"spoils_in": "2 days 12 hours",
"container": "can_food",
@@ -430,7 +430,7 @@
"type": "COMESTIBLE",
"id": "veggy_salted",
"name": "salted veggy chunk",
- "weight": 192,
+ "weight": "192 g",
"color": "green",
"spoils_in": "3 days",
"container": "plastic_bag_vac",
@@ -450,7 +450,7 @@
"id": "spaghetti_pesto",
"name": "spaghetti al pesto",
"name_plural": "spaghetti al pesto",
- "weight": 80,
+ "weight": "80 g",
"color": "green",
"spoils_in": "2 days",
"comestible_type": "FOOD",
@@ -485,7 +485,7 @@
"id": "sauerkraut_onions",
"name": "sauerkraut w/ sautee'd onions",
"name_plural": "sauerkraut w/ sautee'd onions",
- "weight": 424,
+ "weight": "424 g",
"color": "light_gray",
"spoils_in": "5 days",
"comestible_type": "FOOD",
@@ -547,7 +547,7 @@
"type": "COMESTIBLE",
"id": "veggy_salad",
"name": "vegetable salad",
- "weight": 227,
+ "weight": "227 g",
"color": "green",
"spoils_in": "5 days 20 hours",
"container": "bowl_plastic",
@@ -569,7 +569,7 @@
"id": "dried_salad",
"name": "dried salad",
"copy-from": "veggy_salad",
- "weight": 150,
+ "weight": "150 g",
"spoils_in": "360 days",
"container": "box_small",
"quench": -2,
@@ -621,7 +621,7 @@
"id": "sushi_rice",
"name": "sushi rice",
"name_plural": "sushi rice",
- "weight": 55,
+ "weight": "55 g",
"color": "white",
"spoils_in": "3 days",
"comestible_type": "FOOD",
@@ -642,7 +642,7 @@
"id": "onigiri",
"name": "onigiri",
"name_plural": "onigiri",
- "weight": 99,
+ "weight": "99 g",
"color": "white",
"spoils_in": "1 day 12 hours",
"comestible_type": "FOOD",
@@ -663,7 +663,7 @@
"id": "sushi_veggyroll",
"name": "vegetable hosomaki",
"name_plural": "vegetable hosomaki",
- "weight": 312,
+ "weight": "312 g",
"color": "green",
"spoils_in": "1 day 12 hours",
"comestible_type": "FOOD",
@@ -695,7 +695,7 @@
"id": "sauerkraut",
"name": "sauerkraut",
"name_plural": "sauerkraut",
- "weight": 255,
+ "weight": "255 g",
"color": "green",
"spoils_in": "30 days",
"container": "jar_glass",
@@ -715,7 +715,7 @@
"type": "COMESTIBLE",
"id": "nopalitos",
"name": "nopalito",
- "weight": 200,
+ "weight": "200 g",
"color": "green",
"spoils_in": "10 days",
"symbol": "%",
diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json
index 65b82319025b9..105b6af60c5cf 100644
--- a/data/json/items/comestibles/wheat.json
+++ b/data/json/items/comestibles/wheat.json
@@ -3,7 +3,7 @@
"type": "COMESTIBLE",
"id": "cereal2",
"name": "wheat cereal",
- "weight": 52,
+ "weight": "52 g",
"color": "yellow",
"spoils_in": "90 days",
"stim": 4,
@@ -27,7 +27,7 @@
"id": "wheat",
"name": "wheat",
"name_plural": "wheat",
- "weight": 203,
+ "weight": "203 g",
"color": "brown",
"comestible_type": "FOOD",
"symbol": ",",
@@ -47,7 +47,7 @@
"id": "spaghetti_raw",
"name": "raw spaghetti pasta",
"name_plural": "raw spaghetti pasta",
- "weight": 60,
+ "weight": "60 g",
"color": "yellow",
"spoils_in": "360 days",
"container": "box_small",
@@ -68,7 +68,7 @@
"name": "raw lasagne pasta",
"name_plural": "raw lasagne pasta",
"spoils_in": "360 days",
- "weight": 60,
+ "weight": "60 g",
"color": "yellow",
"container": "box_small",
"comestible_type": "FOOD",
@@ -87,7 +87,7 @@
"id": "spaghetti_cooked",
"name": "boiled noodles",
"name_plural": "boiled noodles",
- "weight": 148,
+ "weight": "148 g",
"color": "yellow",
"spoils_in": "20 hours",
"container": "box_small",
@@ -107,7 +107,7 @@
"id": "macaroni_raw",
"name": "raw macaroni",
"name_plural": "raw macaroni",
- "weight": 60,
+ "weight": "60 g",
"color": "yellow",
"spoils_in": "360 days",
"container": "box_small",
@@ -127,7 +127,7 @@
"id": "macaroni_cooked",
"name": "mac & cheese",
"name_plural": "mac & cheese",
- "weight": 209,
+ "weight": "209 g",
"color": "yellow",
"spoils_in": "10 hours",
"container": "box_small",
@@ -148,7 +148,7 @@
"id": "flour",
"name": "flour",
"name_plural": "flour",
- "weight": 13,
+ "weight": "13 g",
"color": "white",
"spoils_in": "360 days",
"container": "box_small",
@@ -169,7 +169,7 @@
"type": "COMESTIBLE",
"id": "oatmeal",
"name": "oatmeal",
- "weight": 25,
+ "weight": "25 g",
"color": "light_gray",
"spoils_in": "360 days",
"container": "box_small",
@@ -191,7 +191,7 @@
"id": "oats",
"name": "oats",
"name_plural": "oats",
- "weight": 86,
+ "weight": "86 g",
"color": "brown",
"comestible_type": "FOOD",
"symbol": ",",
@@ -210,7 +210,7 @@
"type": "COMESTIBLE",
"id": "oatmeal_cooked",
"name": "cooked oatmeal",
- "weight": 247,
+ "weight": "247 g",
"color": "light_gray",
"spoils_in": "10 days",
"comestible_type": "FOOD",
@@ -229,7 +229,7 @@
"type": "COMESTIBLE",
"id": "oatmeal_deluxe",
"name": "deluxe cooked oatmeal",
- "weight": 164,
+ "weight": "164 g",
"color": "light_gray",
"spoils_in": "10 days",
"comestible_type": "FOOD",
@@ -250,7 +250,7 @@
"id": "pancakes",
"name": "pancake",
"name_plural": "pancakes",
- "weight": 40,
+ "weight": "40 g",
"color": "brown",
"spoils_in": "10 days",
"comestible_type": "FOOD",
@@ -273,7 +273,7 @@
"copy-from": "pancakes",
"name": "fruit pancake",
"name_plural": "fruit pancakes",
- "weight": 80,
+ "weight": "80 g",
"color": "brown",
"calories": 217,
"description": "Fluffy and delicious pancakes with real maple syrup, made sweeter and healthier with the addition of wholesome fruit.",
@@ -286,7 +286,7 @@
"id": "frenchtoast",
"name": "French toast",
"name_plural": "French toasts",
- "weight": 42,
+ "weight": "42 g",
"color": "brown",
"spoils_in": "10 days",
"comestible_type": "FOOD",
@@ -307,7 +307,7 @@
"type": "COMESTIBLE",
"id": "waffles",
"name": "waffle",
- "weight": 75,
+ "weight": "75 g",
"color": "yellow",
"spoils_in": "10 days",
"comestible_type": "FOOD",
@@ -326,7 +326,7 @@
"type": "COMESTIBLE",
"id": "fruit_waffles",
"name": "fruit waffle",
- "weight": 156,
+ "weight": "156 g",
"color": "yellow",
"spoils_in": "10 days",
"comestible_type": "FOOD",
@@ -346,7 +346,7 @@
"type": "COMESTIBLE",
"id": "crackers",
"name": "cracker",
- "weight": 56,
+ "weight": "56 g",
"color": "brown",
"spoils_in": "90 days",
"container": "box_small",
@@ -367,7 +367,7 @@
"type": "COMESTIBLE",
"id": "pie",
"name": "fruit pie",
- "weight": 125,
+ "weight": "125 g",
"color": "brown",
"spoils_in": "3 days",
"stim": 2,
@@ -391,7 +391,7 @@
"type": "COMESTIBLE",
"id": "pizza_cheese",
"name": "cheese pizza",
- "weight": 170,
+ "weight": "170 g",
"color": "yellow",
"spoils_in": "2 days",
"stim": 1,
@@ -413,7 +413,7 @@
"type": "COMESTIBLE",
"id": "granola",
"name": "granola",
- "weight": 32,
+ "weight": "32 g",
"color": "brown",
"spoils_in": "180 days",
"container": "bag_plastic",
@@ -436,7 +436,7 @@
"type": "COMESTIBLE",
"id": "pie_maple",
"name": "maple pie",
- "weight": 74,
+ "weight": "74 g",
"color": "brown",
"spoils_in": "3 days",
"stim": 2,
@@ -461,7 +461,7 @@
"id": "noodles_fast",
"name": "fast noodles",
"name_plural": "fast noodles",
- "weight": 81,
+ "weight": "81 g",
"color": "yellow",
"spoils_in": "360 days",
"container": "bag_plastic",
@@ -480,7 +480,7 @@
"type": "COMESTIBLE",
"id": "cloutie_dumpling",
"name": "cloutie dumpling",
- "weight": 91,
+ "weight": "91 g",
"color": "brown",
"spoils_in": "2 days",
"container": "box_small",
@@ -500,7 +500,7 @@
"type": "COMESTIBLE",
"id": "brioche",
"name": "brioche",
- "weight": 77,
+ "weight": "77 g",
"color": "brown",
"spoils_in": "10 days",
"container": "box_small",
@@ -525,7 +525,7 @@
"name": "sponge cake",
"description": "Plain, fluffy cake for the proletariat.",
"container": "box_small",
- "weight": 68,
+ "weight": "68 g",
"volume": "750 ml",
"price": 5000,
"charges": 4,
@@ -553,7 +553,7 @@
"name": "brownie",
"copy-from": "sponge_cake",
"description": "A rich chocolate brownie, just like how grandma used to bake them.",
- "weight": 45,
+ "weight": "45 g",
"calories": 292,
"fun": 7
},
diff --git a/data/json/items/containers.json b/data/json/items/containers.json
index 931b41e1c3fda..c3ead892eff5c 100644
--- a/data/json/items/containers.json
+++ b/data/json/items/containers.json
@@ -5,7 +5,7 @@
"category": "clothing",
"name": "2.5L canteen",
"description": "A large plastic water canteen, with a 2.5 liter capacity and carrying strap.",
- "weight": 155,
+ "weight": "155 g",
"volume": "2500 ml",
"price": 1000,
"to_hit": -1,
@@ -25,7 +25,7 @@
"category": "other",
"name": "30 gallon barrel",
"description": "A huge plastic barrel with a resealable lid.",
- "weight": 6800,
+ "weight": "6800 g",
"volume": "112500 ml",
"price": 5000,
"to_hit": -5,
@@ -45,7 +45,7 @@
"name": "steel drum (100L)",
"name_plural": "steel drums (100L)",
"description": "A huge steel barrel with a resealable lid.",
- "weight": 12000,
+ "weight": "12000 g",
"volume": "100 L",
"price": 8000,
"to_hit": -5,
@@ -65,7 +65,7 @@
"name": "steel drum (200L)",
"name_plural": "steel drums (200L)",
"description": "A massive steel barrel with a resealable lid.",
- "weight": 20000,
+ "weight": "20000 g",
"volume": "200 L",
"price": 10000,
"to_hit": -5,
@@ -84,7 +84,7 @@
"category": "other",
"name": "canvas sack",
"description": "A large and sturdy canvas sack. Smells faintly of earth and hard work.",
- "weight": 415,
+ "weight": "415 g",
"volume": "1 L",
"price": 0,
"to_hit": -5,
@@ -101,7 +101,7 @@
"category": "other",
"name": "canvas bag",
"description": "Small bag made of canvas. Looks fine to store dried herbs in.",
- "weight": 5,
+ "weight": "5 g",
"volume": "250 ml",
"price": 0,
"to_hit": -5,
@@ -118,7 +118,7 @@
"category": "other",
"name": "plastic bag",
"description": "A small, open plastic bag. Essentially trash.",
- "weight": 2,
+ "weight": "2 g",
"volume": 0,
"price": 0,
"to_hit": -1,
@@ -136,7 +136,7 @@
"name": "zipper bag",
"looks_like": "bag_plastic",
"description": "An inexpensive flexible rectangular storage bag on its typical small size. Transparent and made of plastic, it can be sealed and opened by a slider which works in a similar way to a zip fastener.",
- "weight": 2,
+ "weight": "2 g",
"volume": 0,
"price": 0,
"rigid": false,
@@ -154,7 +154,7 @@
"name": "body bag",
"looks_like": "bag_canvas",
"description": "A large, human size, rectangular bag made of strong plastic, with a zipper in the middle. Used to hold a dead body.",
- "weight": 500,
+ "weight": "500 g",
"volume": "1 L",
"price": 0,
"to_hit": -5,
@@ -171,7 +171,7 @@
"category": "other",
"name": "glass bottle",
"description": "A resealable glass bottle, holds 750 ml of liquid.",
- "weight": 200,
+ "weight": "200 g",
"volume": "750 ml",
"price": 0,
"to_hit": 1,
@@ -190,7 +190,7 @@
"category": "other",
"name": "plastic bottle",
"description": "A resealable plastic bottle, holds 500 ml of liquid.",
- "weight": 13,
+ "weight": "13 g",
"volume": "500 ml",
"price": 0,
"to_hit": 1,
@@ -207,7 +207,7 @@
"category": "other",
"name": "small plastic bottle",
"description": "A resealable plastic bottle, holds 250 ml of liquid.",
- "weight": 7,
+ "weight": "7 g",
"volume": "250 ml",
"price": 0,
"to_hit": 1,
@@ -224,7 +224,7 @@
"category": "other",
"name": "large plastic bottle",
"description": "It's a two-liter plastic bottle that can hold a lot of soda, or, nowadays, boiled water.",
- "weight": 13,
+ "weight": "13 g",
"volume": "2 L",
"price": 25,
"price_postapoc": 500,
@@ -241,7 +241,7 @@
"category": "other",
"name": "clay bowl",
"description": "A clay bowl with a waterproofed hide lid. Can be used as a container or as a tool. Holds 250 ml of liquid.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 100,
"to_hit": -1,
@@ -260,7 +260,7 @@
"name": "pack",
"name_plural": "packs",
"description": "SURGEON GENERAL'S WARNING: Smoking Causes Lung Cancer, Heart Disease, Emphysema And May Complicate Pregnancy.",
- "weight": 15,
+ "weight": "15 g",
"volume": "250 ml",
"price": 0,
"material": "paper",
@@ -275,7 +275,7 @@
"name": "small cardboard box",
"name_plural": "small cardboard boxes",
"description": "A small cardboard box. No bigger than a foot in dimension.",
- "weight": 151,
+ "weight": "151 g",
"volume": "1 L",
"price": 0,
"material": "paper",
@@ -290,7 +290,7 @@
"name": "cardboard box",
"name_plural": "cardboard boxes",
"description": "A sturdy cardboard box, about the size of a banana box. Great for packing.",
- "weight": 850,
+ "weight": "850 g",
"volume": "2 L",
"//": "Volume is much lower than the actual volume of a box this size because presumably if it's in your pack, it isn't empty and full of air; and if it's in your hands, it's irrelevant what the volume is.",
"price": 0,
@@ -306,7 +306,7 @@
"name": "large cardboard box",
"name_plural": "large cardboard boxes",
"description": "A very large cardboard box, the sort children would have loved to hide in, when there were still children.",
- "weight": 1250,
+ "weight": "1250 g",
"volume": "3 L",
"//": "Volume is much lower than the actual volume of a box this size because presumably if it's in your pack, it isn't empty and full of air; and if it's in your hands, it's irrelevant what the volume is.",
"price": 0,
@@ -323,7 +323,7 @@
"name": "bucket",
"name_plural": "buckets",
"description": "A galvanized bucket for peanuts, chilled wine, iced beer, lobster, crab legs, French fries, animal feed, farm use, tailgating, crafts, planting flowers, holding gift baskets, containing a fruit basket and herbs, loose item storage or as an ice bucket.",
- "weight": 725,
+ "weight": "725 g",
"volume": "5 L",
"price": 300,
"material": "steel",
@@ -339,7 +339,7 @@
"category": "other",
"name": "hydration pack",
"description": "A slim and lightweight insulated plastic bladder worn on the back. It has a large pocket and a capped mouth for filling with liquid with a hose that allows the wearer to drink hands-free.",
- "weight": 286,
+ "weight": "286 g",
"volume": "2500 ml",
"price": 10000,
"to_hit": -1,
@@ -359,7 +359,7 @@
"category": "other",
"name": "aluminum can",
"description": "An aluminum can, like what soda comes in.",
- "weight": 13,
+ "weight": "13 g",
"volume": "250 ml",
"price": 0,
"to_hit": -3,
@@ -390,7 +390,7 @@
"category": "other",
"name": "paper carton",
"description": "A half gallon carton constructed of a paper, aluminum and plastic laminate. It has a threaded cap for easy resealing.",
- "weight": 28,
+ "weight": "28 g",
"volume": "2 L",
"price": 0,
"to_hit": 1,
@@ -422,7 +422,7 @@
"category": "other",
"name": "vacuum-packed bag",
"description": "This is a bag of vacuum-packed food.",
- "weight": 2,
+ "weight": "2 g",
"volume": 0,
"contains": "500 ml",
"price": 0,
@@ -440,7 +440,7 @@
"category": "other",
"name": "tin can",
"description": "A tin can, like what beans come in.",
- "weight": 40,
+ "weight": "40 g",
"volume": "250 ml",
"price": 0,
"material": "steel",
@@ -469,7 +469,7 @@
"category": "clothing",
"name": "plastic canteen",
"description": "A military-style water canteen with a 1.5 liter capacity. Commonly worn at the hip.",
- "weight": 155,
+ "weight": "155 g",
"volume": "1500 ml",
"price": 800,
"to_hit": 1,
@@ -489,7 +489,7 @@
"name": "thermos",
"name_plural": "thermoses",
"description": "A Thermos brand vacuum flask. Built for temperature retention, helps keep things hot or cold. Contains 1L of liquid.",
- "weight": 530,
+ "weight": "530 g",
"price": 1595,
"volume": "1250 ml",
"contains": "1 L",
@@ -506,7 +506,7 @@
"category": "other",
"name": "clay canister",
"description": "A fragile clay vessel. It can be used to make crude impact grenades or to store liquid.",
- "weight": 268,
+ "weight": "268 g",
"volume": "250 ml",
"price": 1000,
"to_hit": 1,
@@ -524,7 +524,7 @@
"category": "other",
"name": "clay hydria",
"description": "A 15-liter clay pot with three handles for carrying and for pouring.",
- "weight": 1955,
+ "weight": "1955 g",
"volume": "15 L",
"price": 2000,
"to_hit": -1,
@@ -543,7 +543,7 @@
"category": "other",
"name": "large clay pot",
"description": "A bulky and heavy clay pot with a waterproofed hide lid, meant to store water, but can carry other liquids in a pinch.",
- "weight": 4887,
+ "weight": "4887 g",
"volume": "37500 ml",
"price": 10000,
"to_hit": -2,
@@ -561,7 +561,7 @@
"category": "other",
"name": "plastic cup",
"description": "A small, vacuum formed cup.",
- "weight": 6,
+ "weight": "6 g",
"volume": "250 ml",
"price": 0,
"to_hit": 1,
@@ -589,7 +589,7 @@
"category": "other",
"name": "glass flask",
"description": "A 250 ml laboratory conical flask, with a rubber bung.",
- "weight": 48,
+ "weight": "48 g",
"volume": "250 ml",
"price": 400,
"to_hit": 1,
@@ -608,7 +608,7 @@
"category": "other",
"name": "test tube",
"description": "A 10ml laboratory cylindrical test tube, with a rubber stopper.",
- "weight": 36,
+ "weight": "36 g",
"volume": "10ml",
"price": 300,
"to_hit": -1,
@@ -627,7 +627,7 @@
"category": "other",
"name": "beaker",
"description": "A 250ml laboratory beaker. Basically a cup with delusions of grandeur.",
- "weight": 150,
+ "weight": "150 g",
"volume": "250ml",
"price": 500,
"to_hit": -1,
@@ -645,7 +645,7 @@
"category": "other",
"name": "graduated cylinder",
"description": "A tall, narrow glass cylinder with precise markings for measuring fluid quantities. An important science tool, it is also useful for anal retentive chefs.",
- "weight": 150,
+ "weight": "150 g",
"volume": "100ml",
"price": 500,
"to_hit": -1,
@@ -663,7 +663,7 @@
"category": "other",
"name": "microcentrifuge tube",
"description": "These plastic tubes, with little built in snap-caps, are a great way to store a tiny amount of liquid. Great for jello shooters if 1mL is enough for a shot for you. Cool people call these \"eppies\".",
- "weight": 1,
+ "weight": "1 g",
"volume": "1ml",
"price": 10,
"to_hit": -1,
@@ -681,7 +681,7 @@
"category": "clothing",
"name": "hip flask",
"description": "A 250 ml metal flask with a hinged screw-on lid, commonly used to discreetly transport alcohol.",
- "weight": 120,
+ "weight": "120 g",
"volume": "250 ml",
"price": 1000,
"to_hit": 1,
@@ -701,7 +701,7 @@
"type": "CONTAINER",
"name": "3L glass jar",
"description": "A three-liter glass jar with a metal screw top lid, used for canning.",
- "weight": 365,
+ "weight": "365 g",
"volume": "3 L",
"price": 0,
"to_hit": -1,
@@ -733,7 +733,7 @@
"category": "other",
"name": "glass jar",
"description": "A half-liter glass jar with a metal screw top lid, used for canning.",
- "weight": 150,
+ "weight": "150 g",
"volume": "500 ml",
"price": 0,
"bashing": 4,
@@ -764,7 +764,7 @@
"category": "other",
"name": "plastic jerrycan",
"description": "A bulky plastic jerrycan, meant to carry fuel, but can carry other liquids in a pinch.",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "10L",
"price": 1250,
"to_hit": -2,
@@ -781,7 +781,7 @@
"category": "other",
"name": "steel jerrycan",
"description": "A steel jerrycan, meant to carry fuel, but can carry other liquids in a pinch.",
- "weight": 4815,
+ "weight": "4815 g",
"volume": "20L",
"price": 5000,
"to_hit": -3,
@@ -800,7 +800,7 @@
"category": "other",
"name": "clay jug",
"description": "A clay container with a lid, used to hold and pour liquids.",
- "weight": 400,
+ "weight": "400 g",
"volume": "1 L",
"price": 100,
"bashing": 1,
@@ -818,7 +818,7 @@
"category": "other",
"name": "gallon jug",
"description": "A standard plastic jug used for milk and household cleaning chemicals.",
- "weight": 190,
+ "weight": "190 g",
"volume": "3750 ml",
"price": 0,
"to_hit": 1,
@@ -835,7 +835,7 @@
"category": "other",
"name": "aluminum keg",
"description": "A reusable lightweight aluminum keg, used for shipping beer. It has a capacity of 50 liters.",
- "weight": 5040,
+ "weight": "5040 g",
"volume": "50 L",
"price": 10000,
"to_hit": -5,
@@ -854,7 +854,7 @@
"category": "other",
"name": "steel keg",
"description": "A reusable heavy steel keg, used for shipping beer. It has a capacity of 50 liters.",
- "weight": 12600,
+ "weight": "12600 g",
"volume": "50 L",
"price": 8000,
"to_hit": -5,
@@ -873,7 +873,7 @@
"category": "other",
"name": "large sealed stomach",
"description": "The stomach of a large creature, cleaned and sealed with strings. It can hold 3 liters of water.",
- "weight": 783,
+ "weight": "783 g",
"volume": "500 ml",
"price": 4000,
"to_hit": -1,
@@ -893,7 +893,7 @@
"name": "metal tank (60L)",
"name_plural": "metal tanks (60L)",
"description": "A large metal tank for holding liquids. Useful for crafting.",
- "weight": 5668,
+ "weight": "5668 g",
"volume": "60L",
"price": 10000,
"to_hit": -4,
@@ -913,7 +913,7 @@
"name": "metal tank (2L)",
"name_plural": "metal tanks (2L)",
"description": "A small metal tank for gas or liquids. Useful for crafting.",
- "weight": 800,
+ "weight": "800 g",
"volume": "2L",
"price": 1000,
"to_hit": -4,
@@ -932,7 +932,7 @@
"category": "clothing",
"name": "wooden canteen",
"description": "A water canteen made from wood, secured by metal bands and sealed with wax or pitch. Holds 1.5 liters and has a simple carry strap.",
- "weight": 232,
+ "weight": "232 g",
"volume": "1750 ml",
"price": 800,
"to_hit": 1,
@@ -951,7 +951,7 @@
"category": "other",
"name": "sealed stomach",
"description": "The stomach of a creature, cleaned and sealed with a string. It can hold 1.5 liters of water.",
- "weight": 453,
+ "weight": "453 g",
"volume": "250 ml",
"price": 2000,
"to_hit": -1,
@@ -970,7 +970,7 @@
"category": "clothing",
"name": "small waterskin",
"description": "A small watertight leather bag with a carrying strap, can hold 1.5 liters of water.",
- "weight": 453,
+ "weight": "453 g",
"volume": "250 ml",
"price": 2000,
"to_hit": -1,
@@ -991,7 +991,7 @@
"category": "clothing",
"name": "waterskin",
"description": "A watertight leather bag with a carrying strap, can hold 3 liters of water.",
- "weight": 783,
+ "weight": "783 g",
"volume": "500 ml",
"price": 4000,
"to_hit": -1,
@@ -1012,7 +1012,7 @@
"category": "clothing",
"name": "large waterskin",
"description": "A large watertight leather bag with a carrying strap, can hold 5 liters of water.",
- "weight": 990,
+ "weight": "990 g",
"volume": "750 ml",
"price": 6000,
"to_hit": -1,
@@ -1033,7 +1033,7 @@
"category": "other",
"name": "wooden barrel",
"description": "Traditionally made of white oak; these vessels are known for delivering delicious whiskey to the future. It has a capacity of 100 liters.",
- "weight": 42408,
+ "weight": "42408 g",
"volume": "100 L",
"price": 12000,
"to_hit": -5,
@@ -1052,7 +1052,7 @@
"category": "other",
"name": "paper wrapper",
"description": "Just a piece of butcher's paper. Good for starting fires.",
- "weight": 3,
+ "weight": "3 g",
"volume": 0,
"price": 0,
"to_hit": -2,
@@ -1069,7 +1069,7 @@
"category": "other",
"name": "styrofoam cup",
"description": "A cheap, disposable cup with a plastic lid and straw.",
- "weight": 50,
+ "weight": "50 g",
"volume": "500 ml",
"price": 0,
"material": "plastic",
@@ -1085,7 +1085,7 @@
"category": "other",
"name": "plastic tub",
"description": "A big, square plastic bucket usually used for carrying ice cream.",
- "weight": 1360,
+ "weight": "1360 g",
"volume": "4 L",
"price": 10,
"price_postapoc": 100,
@@ -1102,7 +1102,7 @@
"category": "other",
"name": "condom",
"description": "A gentleman's balloon. A single use life preventer. A thumbless latex mitten. This could be used as a makeshift water container, but otherwise it's anyone's guess what it's for.",
- "weight": 5,
+ "weight": "5 g",
"volume": 0,
"price": 0,
"to_hit": -5,
@@ -1121,7 +1121,7 @@
"category": "other",
"name": "large tin can",
"description": "A large tin can, like what beans come in. Holds a substantial amount of food.",
- "weight": 350,
+ "weight": "350 g",
"volume": "3L",
"price": 0,
"material": "steel",
diff --git a/data/json/items/corpses.json b/data/json/items/corpses.json
new file mode 100644
index 0000000000000..e5e0803afa2eb
--- /dev/null
+++ b/data/json/items/corpses.json
@@ -0,0 +1,167 @@
+[
+ {
+ "type": "GENERIC",
+ "id": "corpse",
+ "symbol": "%",
+ "color": "white",
+ "name": "corpse",
+ "description": "A dead body.",
+ "//": "most of the properties depend on the monster type and are created at runtime!",
+ "price": 0,
+ "volume": 0,
+ "flags": [ "NO_UNLOAD", "TRADER_AVOID", "CORPSE" ]
+ },
+ {
+ "type": "GENERIC",
+ "id": "rmi2_corpse",
+ "symbol": "%",
+ "color": "white",
+ "name": "desiccated corpse",
+ "description": "A badly mangled and desiccated partial corpse. It seems whatever thing killed him did so with a single swipe of a gigantic claw.",
+ "category": "other",
+ "material": "hflesh",
+ "price": 0,
+ "volume": "7500 ml",
+ "flags": [ "TRADER_AVOID" ]
+ },
+ {
+ "type": "GENERIC",
+ "id": "corpse_generic_male",
+ "copy-from": "corpse",
+ "name": "corpse",
+ "description": "A dead body of a middle-aged man.",
+ "looks_like": "corpse",
+ "material": "hflesh"
+ },
+ {
+ "type": "GENERIC",
+ "id": "corpse_generic_female",
+ "copy-from": "corpse",
+ "name": "corpse",
+ "description": "A dead body of a young woman.",
+ "looks_like": "corpse",
+ "volume": "40000 ml",
+ "weight": "52000 g",
+ "material": "hflesh"
+ },
+ {
+ "type": "GENERIC",
+ "id": "corpse_generic_boy",
+ "copy-from": "corpse",
+ "name": "corpse",
+ "description": "A dead body of a little boy.",
+ "looks_like": "corpse",
+ "material": "hflesh"
+ },
+ {
+ "type": "GENERIC",
+ "id": "corpse_generic_girl",
+ "copy-from": "corpse",
+ "name": "corpse",
+ "description": "A dead body of a little girl.",
+ "looks_like": "corpse",
+ "material": "hflesh"
+ },
+ {
+ "type": "GENERIC",
+ "id": "corpse_child_calm",
+ "copy-from": "corpse",
+ "name": "corpse",
+ "description": "Facial expression of this child is surprisingly calm. It seems that he died instantly and most probably didn't even know that he is dying. You could even say he's a lucky to die this way in this crazy world.",
+ "looks_like": "corpse",
+ "volume": "30000 ml",
+ "weight": "40750 g",
+ "material": "hflesh"
+ },
+ {
+ "type": "GENERIC",
+ "id": "corpse_child_gunned",
+ "copy-from": "corpse",
+ "name": "corpse",
+ "description": "You can't even say for sure if it's a boy or a girl because the body of this poor little creature has been literally riddled by bullets. It's beyond your understanding what kind of a monster could have done this to a child.",
+ "looks_like": "corpse",
+ "volume": "30000 ml",
+ "weight": "40750 g",
+ "material": "hflesh"
+ },
+ {
+ "type": "GENERIC",
+ "id": "corpse_oldwoman_jewelry",
+ "copy-from": "corpse",
+ "name": "corpse",
+ "description": "A dead body of a old woman. You notice that both of her earlobes are torn, and several fingers on both of her hands are chopped off, and she is missing many teeth in her mouth, and her bloodied lips are smashed. It seems that someone naive is thinking that jewelry still worth something even after the Cataclysm.",
+ "looks_like": "corpse",
+ "volume": "40000 ml",
+ "weight": "52000 g",
+ "material": "hflesh"
+ },
+ {
+ "type": "GENERIC",
+ "id": "corpse_bloody",
+ "copy-from": "corpse",
+ "name": "corpse",
+ "description": "A dead body lying in the puddle of its own blood.",
+ "looks_like": "corpse",
+ "material": "hflesh"
+ },
+ {
+ "type": "GENERIC",
+ "id": "corpse_painful",
+ "copy-from": "corpse",
+ "name": "corpse",
+ "description": "It's hard to tell how exactly did this person die, but judging from his twisted body and frightful grimace, it was a really painful death.",
+ "looks_like": "corpse",
+ "material": "hflesh"
+ },
+ {
+ "type": "GENERIC",
+ "id": "corpse_scorched",
+ "copy-from": "corpse",
+ "name": "corpse",
+ "description": "An awful mass of charred flesh. You're not even sure if it's a man or a woman. Judging by the stain of vaporized blood next to the body, they probably were shot prior to the burning.",
+ "looks_like": "corpse",
+ "material": "hflesh"
+ },
+ {
+ "type": "GENERIC",
+ "id": "corpse_stabbed",
+ "copy-from": "corpse",
+ "name": "corpse",
+ "description": "A dead body with a big hole in the back of its neck. Looks like someone backstabbed this fellow. You can only guess whether he deserved it.",
+ "looks_like": "corpse",
+ "material": "hflesh"
+ },
+ {
+ "type": "GENERIC",
+ "id": "corpse_gunned",
+ "copy-from": "corpse",
+ "name": "corpse",
+ "description": "One might say that face of this woman is devoid of flaws. That could be true if there wasn't this big ugly hole right in the center of her forehead, and even bigger hole in the back of her head.",
+ "looks_like": "corpse",
+ "volume": "40000 ml",
+ "weight": "52000 g",
+ "material": "hflesh"
+ },
+ {
+ "type": "GENERIC",
+ "id": "corpse_halved_upper",
+ "copy-from": "corpse",
+ "name": "corpse",
+ "description": "An upper half of someone's body. Looks like its lower half has been brutally torn away by someone or something with enormous force. Some remnants of its wrecked bowels are still attached to the body. Everything else below the waistline is missing.",
+ "looks_like": "corpse",
+ "volume": "30000 ml",
+ "weight": "40000 g",
+ "material": "hflesh"
+ },
+ {
+ "type": "GENERIC",
+ "id": "corpse_half_beheaded",
+ "copy-from": "corpse",
+ "name": "corpse",
+ "description": "The remains of lower jaw and cheeks are still visible on this half-decapitated body. Looks like half of its head has been torn off after hit of a high-caliber bullet. Or maybe it was bit off by some huge beast?",
+ "looks_like": "corpse",
+ "volume": "57000 ml",
+ "weight": "78000 g",
+ "material": "hflesh"
+ }
+]
diff --git a/data/json/items/corpses/inactive_bots.json b/data/json/items/corpses/inactive_bots.json
index 83b7d997cbfed..0bb10dc18ec18 100644
--- a/data/json/items/corpses/inactive_bots.json
+++ b/data/json/items/corpses/inactive_bots.json
@@ -4,7 +4,7 @@
"type": "TOOL",
"name": "inactive EMP hack",
"description": "This is an inactive EMP hack. EMP hacks are fist-sized robots that fly through the air. This one contains a EMP grenade and attacks by flying at its target and detonating. Use this item to reprogram and release the EMP hack. Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
- "weight": 4700,
+ "weight": "4700 g",
"volume": "750 ml",
"price": 64500,
"to_hit": -3,
@@ -30,7 +30,7 @@
"type": "TOOL",
"name": "inactive C-4 hack",
"description": "This is an inactive C-4 hack. C-4 hacks are fist-sized robots that fly through the air. This one contains some C-4 and attacks by flying at its target and detonating. Use this item to reprogram and activate the C-4 hack. Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
- "weight": 5870,
+ "weight": "5870 g",
"volume": "250 ml",
"price": 67500,
"to_hit": -3,
@@ -56,7 +56,7 @@
"type": "TOOL",
"name": "inactive flashbang hack",
"description": "This is an inactive flashbang hack. Flashbang hacks are fist-sized robots that fly through the air. This one contains a flashbang and attacks by flying at its target and detonating. Use this item to reprogram and activate the flashbang hack. Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
- "weight": 4536,
+ "weight": "4536 g",
"volume": "750 ml",
"price": 59500,
"to_hit": -3,
@@ -82,7 +82,7 @@
"type": "TOOL",
"name": "inactive tear gas hack",
"description": "This is an inactive tear gas hack. Tear gas hacks are fist-sized robots that fly through the air. This one contains a tear gas canister and attacks by flying at its target and releasing tear gas. Use this item to reprogram and activate the tear gas hack. Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
- "weight": 5360,
+ "weight": "5360 g",
"volume": "750 ml",
"price": 60500,
"to_hit": -3,
@@ -108,7 +108,7 @@
"type": "TOOL",
"name": "inactive grenade hack",
"description": "This is an inactive grenade hack. Grenade hacks are fist-sized robots that fly through the air. This one contains a grenade and attacks by flying at its target and detonating. Use this item to reprogram and activate the grenade hack. Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
- "weight": 4480,
+ "weight": "4480 g",
"volume": "250 ml",
"price": 60000,
"to_hit": -3,
@@ -134,7 +134,7 @@
"type": "TOOL",
"name": "inactive laser turret",
"description": "This is an inactive laser turret. Using this item involves turning it on and placing it on the ground, where it will attach itself. If reprogrammed and rewired successfully the turret will identify you as a friendly, and attack all enemies with its revolving laser cannons. It requires sunlight in order to fire.",
- "weight": 1450,
+ "weight": "1450 g",
"volume": "3 L",
"price": 600000,
"to_hit": -3,
@@ -154,9 +154,9 @@
{
"id": "bot_antimateriel",
"type": "TOOL",
- "name": "inactive anti-materiel turret",
- "description": "This is an inactive anti-materiel turret. Using this item involves loading the unit with the factory-loaded .50 BMG Ball rounds in your inventory (if you wish to divide your ammunition, set aside whatever .50 BMG Ball you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If reprogrammed and rewired successfully the turret will identify you as a friendly, and attack all enemies with a built-in rifle.",
- "weight": 1550,
+ "name": "inactive M2HB autonomous CROWS II",
+ "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded .50 BMG rounds in your inventory (if you wish to divide your ammunition, set aside whatever .50 BMG rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its M2HB.",
+ "weight": "1550 g",
"volume": "3500 ml",
"price": 500500,
"to_hit": -3,
@@ -178,7 +178,7 @@
"type": "TOOL",
"name": "inactive manhack",
"description": "This is an inactive manhack. Manhacks are fist-sized robots that fly through the air. They are covered with whirring blades and attack by throwing themselves against their target. Use this item to reprogram and activate the manhack. Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
- "weight": 5400,
+ "weight": "5400 g",
"volume": "750 ml",
"price": 60000,
"to_hit": -3,
@@ -204,7 +204,7 @@
"type": "TOOL",
"name": "inactive mininuke hack",
"description": "This is an inactive mininuke hack. Many times as large as a normal manhack, a mininuke hack contains a mininuke and attack by flying at their target and detonating. Use this item to reprogram and activate the mininuke hack. Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.",
- "weight": 25000,
+ "weight": "25000 g",
"volume": "18750 ml",
"price": 2677500,
"to_hit": -3,
@@ -228,9 +228,9 @@
{
"id": "bot_rifleturret",
"type": "TOOL",
- "name": "inactive rifle turret",
- "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded 5.56 NATO rounds in your inventory (if you wish to divide your ammunition, set aside whatever 5.56 you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If reprogrammed and rewired successfully the turret will then identify you as a friendly, and attack all enemies with a built-in rifle.",
- "weight": 1507,
+ "name": "inactive autonomous M249 CROWS II",
+ "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded 5.56x45mm rounds in your inventory (if you wish to divide your ammunition, set aside whatever 5.56x45mm rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its M249.",
+ "weight": "1507 g",
"volume": "3500 ml",
"price": 500000,
"to_hit": -3,
@@ -247,12 +247,34 @@
"skill2": "computer"
}
},
+ {
+ "id": "bot_crows_m240",
+ "type": "TOOL",
+ "name": "inactive autonomous M240 CROWS II",
+ "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded 7.62x51mm rounds in your inventory (if you wish to divide your ammunition, set aside whatever 7.62x51mm rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its M240.",
+ "weight": "1507 g",
+ "volume": "3500 ml",
+ "price": 500000,
+ "to_hit": -3,
+ "bashing": 8,
+ "material": [ "steel", "plastic" ],
+ "symbol": ";",
+ "color": "green",
+ "use_action": {
+ "type": "place_monster",
+ "monster_id": "mon_crows_m240",
+ "difficulty": 6,
+ "moves": 100,
+ "skill1": "electronics",
+ "skill2": "computer"
+ }
+ },
{
"id": "bot_turret",
"type": "TOOL",
"name": "inactive turret",
- "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded 9x19mm rounds in your inventory (if you wish to divide your ammunition, set aside whatever 9x19mm you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself. If reprogrammed and rewired successfully the turret will then identify you as a friendly, and attack all enemies with a built-in SMG.",
- "weight": 1507,
+ "description": "This is an inactive turret. Using this item involves loading the unit with the factory-loaded 9x19mm rounds in your inventory (if you wish to divide your ammunition, set aside whatever 9x19mm you do NOT want to give the turret) turning it on, and placing it on the ground. If reprogrammed and rewired successfully the turret will then identify you as a friendly, and attack all enemies with its SMG.",
+ "weight": "1507 g",
"volume": "3 L",
"price": 400000,
"to_hit": -3,
@@ -272,9 +294,9 @@
{
"id": "bot_secubot",
"type": "TOOL",
- "name": "inactive security bot",
- "description": "This is an inactive security bot. Using this item involves loading the unit with the factory-loaded 9x19mm rounds in your inventory (if you wish to divide your ammunition, set aside whatever 9x19mm you do NOT want to give the robot) turning it on, and placing it on the ground. If reprogrammed and rewired successfully the security bot will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in SMG.",
- "weight": 40750,
+ "name": "inactive TALON UGV",
+ "description": "This is an inactive TALON UGV equipped with an M16A4. Using this item involves loading the unit with the factory-loaded 5.56x45mm rounds in your inventory (if you wish to divide your ammunition, set aside whatever 5.56x45mm you do NOT want to give the robot) turning it on, and placing it on the ground. If reprogrammed and rewired successfully the security bot will then identify you as a friendly, roam around or follow you, and attack all enemies with its rifle.",
+ "weight": "40750 g",
"volume": "30 L",
"price": 750000,
"to_hit": -3,
@@ -293,13 +315,37 @@
"skill2": "computer"
}
},
+ {
+ "id": "bot_talon_m202a1",
+ "type": "TOOL",
+ "name": "inactive M202A1 TALON UGV",
+ "description": "This is an inactive TALON UGV equipped with an M202A1. Using this item involves loading the unit with the M235 rockets in your inventory (if you wish to divide your ammunition, set aside whatever M235 rockets you do NOT want to give the robot) turning it on, and placing it on the ground. If reprogrammed and rewired successfully the security bot will then identify you as a friendly, roam around or follow you, and attack all enemies with its M202A1.",
+ "weight": "40750 g",
+ "volume": "30 L",
+ "price": 750000,
+ "to_hit": -3,
+ "bashing": 8,
+ "material": [ "steel" ],
+ "symbol": ";",
+ "color": "light_green",
+ "use_action": {
+ "type": "place_monster",
+ "monster_id": "mon_talon_m202a1",
+ "friendly_msg": "The security bot beeps affirmatively and begins scanning for hostiles.",
+ "hostile_msg": "You misprogram the security bot and it trains its gun on you. RUN!",
+ "difficulty": 6,
+ "moves": 150,
+ "skill1": "electronics",
+ "skill2": "computer"
+ }
+ },
{
"id": "bot_nursebot",
"type": "TOOL",
"name": "inactive nurse bot",
"description": "This is an inactive nurse bot. Using this item involves placing it on the ground and reactivating its mechanical body. If reprogrammed and rewired successfully the nurse bot will then identify you as a friendly, roam around or follow you, and assist you in surgeries.",
"volume": "62500 ml",
- "weight": 81500,
+ "weight": "81500 g",
"price": 750000,
"to_hit": -3,
"bashing": 8,
@@ -322,7 +368,7 @@
"type": "TOOL",
"name": "inactive broken cyborg",
"description": "This is a deactivated broken cyborg, the last shreds of its humanity still rotting away. Using this item involves placing it on the ground and reactivating its mechanical body. If reprogrammed and rewired successfully the cyborg will then follow you and attack enemies. You monster.",
- "weight": 81500,
+ "weight": "81500 g",
"volume": "62500 ml",
"//": "It is a disgusting mass of rotting flesh and jagged metal pieces, no one will buy it.",
"price": 0,
@@ -348,7 +394,7 @@
"type": "TOOL",
"name": "inactive prototype cyborg",
"description": "This is a deactivated prototype cyborg, glimpses of humanity can still be seen in its empty eyes. Using this item involves placing it on the ground and reactivating its mechanical body. If reprogrammed and rewired successfully the cyborg will then follow you and attack enemies. You monster.",
- "weight": 81500,
+ "weight": "81500 g",
"volume": "62500 ml",
"//": "It is an affront to humanity, no one will buy it.",
"price": 0,
@@ -374,7 +420,7 @@
"type": "TOOL",
"name": "inactive chicken walker",
"description": "This is an inactive chicken walker. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the chicken walker will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.",
- "weight": 120000,
+ "weight": "120000 g",
"volume": "92500 ml",
"price": 50000000,
"to_hit": -3,
@@ -400,7 +446,7 @@
"type": "TOOL",
"name": "inactive police bot",
"description": "This is an inactive police robot. Using this item involves placing it on the ground and turning it on. If reprogrammed and rewired successfully the police bot will then identify you as law enforcement, roam around or follow you, and attempt to detain lawbreakers.",
- "weight": 81500,
+ "weight": "81500 g",
"volume": "62500 ml",
"price": 100000,
"to_hit": -3,
@@ -426,7 +472,7 @@
"type": "TOOL",
"name": "inactive eyebot",
"description": "This is an inactive eyebot. Using this item involves turning it on and launching the UAV. If reprogrammed and rewired successfully the eyebot will then keep watch for intruders.",
- "weight": 40750,
+ "weight": "40750 g",
"volume": "30 L",
"price": 10000,
"to_hit": -3,
@@ -451,7 +497,7 @@
"type": "TOOL",
"name": "inactive cleaner bot",
"description": "This is an inactive cleaner bot. Using this item involves placing it on the ground and turning it on. If reprogrammed and rewired successfully the cleaner bot will respond to future commands.",
- "weight": 81500,
+ "weight": "81500 g",
"volume": "62500 ml",
"price": 10000,
"to_hit": -3,
@@ -477,7 +523,7 @@
"type": "TOOL",
"name": "inactive miner bot",
"description": "This is an inactive mining robot. Using this item involves placing it on the ground and turning it on. If reprogrammed and rewired successfully the miner bot will respond to future commands.",
- "weight": 81500,
+ "weight": "81500 g",
"volume": "62500 ml",
"price": 25000,
"to_hit": -3,
@@ -503,7 +549,7 @@
"type": "TOOL",
"name": "inactive riot control bot",
"description": "This is an inactive riot control bot. Using this item involves placing it on the ground and turning it on. If reprogrammed and rewired successfully the robot will bring order and peace to the horde.",
- "weight": 81500,
+ "weight": "81500 g",
"volume": "62500 ml",
"price": 35000,
"to_hit": -3,
@@ -529,7 +575,7 @@
"type": "TOOL",
"name": "inactive skitterbot",
"description": "This is an inactive skitterbot. Using this item involves placing it on the ground and turning it on. If reprogrammed and rewired successfully the robot will race towards enemies and shock them.",
- "weight": 40750,
+ "weight": "40750 g",
"volume": "30 L",
"price": 80000,
"to_hit": -3,
@@ -555,7 +601,7 @@
"type": "TOOL",
"name": "inactive lab defense bot",
"description": "This is an inactive experimental robot plundered from a science lab. It resembles a human-sized spider and was designed to deploy manhacks. Using this item involves placing it on the ground and turning it on. If reprogrammed and rewired successfully the robot will race towards enemies and deploy a variety of experimental devices.",
- "weight": 100000,
+ "weight": "100000 g",
"volume": "65000 ml",
"price": 80000,
"to_hit": -3,
@@ -581,7 +627,7 @@
"type": "TOOL",
"name": "inactive tank drone",
"description": "This is an inactive Beagle Mini-Tank UGV. Using this item involves placing it on the ground, loading the unit with the factory-loaded 5.56 rounds and 40mm cartridge grenades in your inventory (if you wish to divide your ammunition, set aside whatever ammunition you do NOT want to give the robot) and turning it on. If reprogrammed and rewired successfully the tank drone will then identify you as a friendly, roam around or follow you, and attack all enemies with a built-in firearm and grenade launcher.",
- "weight": 200000,
+ "weight": "200000 g",
"//": "cheating a bit with the volume due to lack of proper vehicle storage options",
"volume": "250 L",
"price": 100000000,
@@ -608,7 +654,7 @@
"type": "TOOL",
"name": "inactive tripod",
"description": "This is an inactive Honda Regnal. Using this item involves placing it on the ground, wondering how it fuels its flamethrower and turning it on. If reprogrammed and rewired successfully the tribot will then identify you as an ally, roam around or follow you, and impale hostiles with its spiked cable weapons.",
- "weight": 120000,
+ "weight": "120000 g",
"volume": "92500 ml",
"price": 100000000,
"to_hit": -3,
@@ -633,7 +679,7 @@
"type": "TOOL",
"name": "inactive milspec searchlight",
"description": "This is an inactive military-grade automated searchlight. Using this item involves placing it on the ground and turning it on. If reprogrammed and rewired successfully the searchlight will then identify you as an ally, survey the area, and illuminate approaching hostiles. Seems to have an unhealthy fascination with you.",
- "weight": 120000,
+ "weight": "120000 g",
"volume": "92500 ml",
"price": 500000,
"to_hit": -3,
@@ -659,7 +705,7 @@
"name": "inactive dispatch",
"description": "An inactive Northrop Dispatch, guard model, serving as a mobile assembler and deployer of kamikaze manhacks for defense. Activate it to place it onto the ground; due to a one-way switch triggered during deactivation, however, it will be nonaggressive, and serves only as a distraction.",
"volume": "95000 ml",
- "weight": 100000,
+ "weight": "100000 g",
"price": 10000000,
"price_postapoc": 100000,
"to_hit": -3,
@@ -684,7 +730,7 @@
"name": "inactive military dispatch",
"description": "An inactive Northrop Dispatch, military model, serving as a mobile assembler and deployer of lethal manhacks for combat situations. Activate it to place it onto the ground; due to a one-way switch triggered during deactivation, however, it will be nonaggressive, and serves only as a distraction.",
"volume": "95000 ml",
- "weight": 100000,
+ "weight": "100000 g",
"price": 100000000,
"price_postapoc": 500000,
"to_hit": -3,
diff --git a/data/json/items/crossbows.json b/data/json/items/crossbows.json
index bd04cf5cb9189..7dc46ad9dccbd 100644
--- a/data/json/items/crossbows.json
+++ b/data/json/items/crossbows.json
@@ -9,7 +9,7 @@
"description": "A crude pointed wooden crossbow bolt with a notch at the back. Stands a very low chance of remaining intact once fired.",
"material": "wood",
"volume": "250 ml",
- "weight": 20,
+ "weight": "20 g",
"bashing": 3,
"ammo_type": "bolt",
"prop_damage": 0.7,
@@ -28,7 +28,7 @@
"description": "A simple fletched wooden crossbow bolt with a fire-hardened and sharpened tip. Stands a low chance of remaining intact once fired.",
"material": "wood",
"volume": "250 ml",
- "weight": 25,
+ "weight": "25 g",
"bashing": 4,
"ammo_type": "bolt",
"prop_damage": 0.7,
@@ -47,7 +47,7 @@
"description": "A simple fletched wooden crossbow bolt with a blunted tip. Useful for hunting small woodland creatures without splattering them all over the ground. Stands a low chance of remaining intact once fired.",
"material": "wood",
"volume": "250 ml",
- "weight": 25,
+ "weight": "25 g",
"bashing": 4,
"ammo_type": "bolt",
"prop_damage": 0.5,
@@ -66,7 +66,7 @@
"description": "A simple fletched wooden crossbow bolt with a makeshift head. Stands a low chance of remaining intact once fired.",
"material": "wood",
"volume": "250 ml",
- "weight": 27,
+ "weight": "27 g",
"bashing": 6,
"cutting": 2,
"ammo_type": "bolt",
@@ -86,7 +86,7 @@
"description": "A fletched wooden crossbow bolt with a bladed tip. Useful for maximising damage to the target. Stands a decent chance of remaining intact once fired.",
"material": [ "wood", "steel" ],
"volume": "250 ml",
- "weight": 45,
+ "weight": "45 g",
"bashing": 1,
"ammo_type": "bolt",
"prop_damage": 1.25,
@@ -106,7 +106,7 @@
"description": "A fletched wooden crossbow bolt with a pointed tip. Useful for piercing armor. Stands a decent chance of remaining intact once fired.",
"material": [ "wood", "steel" ],
"volume": "250 ml",
- "weight": 45,
+ "weight": "45 g",
"bashing": 3,
"ammo_type": "bolt",
"prop_damage": 1.12,
@@ -126,7 +126,7 @@
"description": "A fletched wooden crossbow bolt with a blunt tip. Useful for hunting small woodland creatures without splattering them all over the ground. Stands a decent chance of remaining intact once fired.",
"material": [ "wood", "steel" ],
"volume": "250 ml",
- "weight": 50,
+ "weight": "50 g",
"bashing": 4,
"ammo_type": "bolt",
"prop_damage": 0.5,
@@ -145,7 +145,7 @@
"description": "A simple fletched steel crossbow bolt with a flattened and sharpened tip. Stands a somewhat low chance of remaining intact once fired.",
"material": "steel",
"volume": "250 ml",
- "weight": 55,
+ "weight": "55 g",
"bashing": 1,
"ammo_type": "bolt",
"pierce": 1,
@@ -165,7 +165,7 @@
"description": "A fletched aluminum crossbow bolt with a bladed tip. Useful for maximising damage to the target. Stands a good chance of remaining intact once fired.",
"material": [ "aluminum", "steel" ],
"volume": "250 ml",
- "weight": 40,
+ "weight": "40 g",
"bashing": 5,
"ammo_type": "bolt",
"prop_damage": 1.25,
@@ -186,7 +186,7 @@
"description": "A fletched aluminum crossbow bolt with a pointed tip. Useful for piercing armor. Stands a good chance of remaining intact once fired.",
"material": [ "aluminum", "steel" ],
"volume": "250 ml",
- "weight": 40,
+ "weight": "40 g",
"bashing": 3,
"cutting": 2,
"ammo_type": "bolt",
@@ -208,7 +208,7 @@
"description": "A fletched aluminum crossbow bolt with a blunt tip. Useful for hunting small woodland creatures without splattering them all over the ground. Stands a good chance of remaining intact once fired.",
"material": [ "aluminum", "steel" ],
"volume": "250 ml",
- "weight": 40,
+ "weight": "40 g",
"bashing": 3,
"cutting": 2,
"ammo_type": "bolt",
@@ -230,7 +230,7 @@
"description": "A lightweight, sharpened bolt made from some kind of metal. It is fairly unwieldy and only provides moderate accuracy, due to being filled with explosives and fitted with an impact trigger.",
"material": [ "steel", "powder" ],
"volume": "250 ml",
- "weight": 620,
+ "weight": "620 g",
"bashing": 1,
"ammo_type": "bolt",
"damage": 12,
@@ -254,7 +254,7 @@
"flags": "PRIMITIVE_RANGED_WEAPON",
"skill": "pistol",
"ammo": "bolt",
- "weight": 900,
+ "weight": "900 g",
"volume": "500 ml",
"bashing": 4,
"ranged_damage": 7,
@@ -286,7 +286,7 @@
"flags": [ "STR_RELOAD", "PRIMITIVE_RANGED_WEAPON" ],
"skill": "rifle",
"ammo": "bolt",
- "weight": 2728,
+ "weight": "2728 g",
"volume": "1500 ml",
"bashing": 11,
"to_hit": 1,
@@ -322,7 +322,7 @@
"flags": [ "STR_RELOAD", "PRIMITIVE_RANGED_WEAPON" ],
"skill": "rifle",
"ammo": "bolt",
- "weight": 3500,
+ "weight": "3500 g",
"volume": "1750 ml",
"bashing": 11,
"to_hit": 1,
@@ -358,7 +358,7 @@
"flags": [ "STR_RELOAD", "PRIMITIVE_RANGED_WEAPON" ],
"skill": "rifle",
"ammo": "bolt",
- "weight": 3000,
+ "weight": "3000 g",
"volume": "1750 ml",
"bashing": 11,
"to_hit": 1,
@@ -395,7 +395,7 @@
"flags": [ "FIRE_TWOHAND", "STR_RELOAD", "PRIMITIVE_RANGED_WEAPON", "TRADER_AVOID" ],
"skill": "rifle",
"ammo": "bolt",
- "weight": 6803,
+ "weight": "6803 g",
"volume": "5 L",
"bashing": 20,
"to_hit": -1,
@@ -431,7 +431,7 @@
"flags": [ "FIRE_TWOHAND", "PRIMITIVE_RANGED_WEAPON", "TRADER_AVOID" ],
"skill": "smg",
"ammo": "bolt",
- "weight": 3628,
+ "weight": "3628 g",
"volume": "2500 ml",
"bashing": 13,
"to_hit": -1,
diff --git a/data/json/items/fake.json b/data/json/items/fake.json
index caad22a045428..58e7a7614f424 100644
--- a/data/json/items/fake.json
+++ b/data/json/items/fake.json
@@ -78,7 +78,7 @@
"description": "Item to test aep_clairvoyance_plus flag. If this spawns randomly, then it's a bug.",
"price": 5000,
"material": [ "steel" ],
- "weight": 150,
+ "weight": "150 g",
"volume": "750 ml",
"bashing": 1,
"to_hit": -1,
@@ -110,7 +110,7 @@
"flags": [ "REACH_ATTACK" ],
"skill": "archery",
"ammo": "arrow",
- "weight": 340,
+ "weight": "340 g",
"volume": "1500 ml",
"bashing": 6,
"ranged_damage": 3,
diff --git a/data/json/items/fluff.json b/data/json/items/fluff.json
index f675025690b83..00199fd6afb81 100644
--- a/data/json/items/fluff.json
+++ b/data/json/items/fluff.json
@@ -6,7 +6,7 @@
"name": "Magic 8-Ball",
"name_plural": "Magic 8-Balls",
"description": "A fortune-telling device from the 1950s. The kind of moral support you didn't know you needed.",
- "weight": 40,
+ "weight": "40 g",
"volume": "250 ml",
"price": 1000,
"material": [ "plastic" ],
@@ -21,7 +21,7 @@
"name": "coin",
"name_plural": "coins",
"description": "A now-ancient form of currency. Stripped of its original purpose, it now serves, faithfully, flippant Flippists for free.",
- "weight": 6,
+ "weight": "6 g",
"volume": 0,
"price": 25,
"material": [ "silver" ],
@@ -36,7 +36,7 @@
"category": "other",
"name": "family photo",
"description": "A photo of a smiling family on a camping trip. One of the parents looks like a cleaner, happier version of the person you know.",
- "weight": 1,
+ "weight": "1 g",
"volume": 0,
"price": 800,
"material": [ "paper" ],
diff --git a/data/json/items/fuel.json b/data/json/items/fuel.json
index e86e42b1f52b4..151ce35758b6c 100644
--- a/data/json/items/fuel.json
+++ b/data/json/items/fuel.json
@@ -5,7 +5,7 @@
"name": "ethanol",
"name_plural": "ethanol",
"description": "Extremely pure alcohol suitable for use as a component in chemical reactions. You could also water it down and drink it, or use it as fuel in alcohol-burning stoves.",
- "weight": 1,
+ "weight": "1 g",
"volume": "200ml",
"price": 200,
"price_postapoc": 500,
@@ -48,7 +48,7 @@
"name_plural": "diesel",
"description": "Petroleum-based fuel made from a byproduct of the gasoline making process.",
"category": "fuel",
- "weight": 1,
+ "weight": "1 g",
"volume": "200ml",
"price": 50,
"price_postapoc": 500,
@@ -91,7 +91,7 @@
"name_plural": "gasoline",
"description": "Gasoline is a highly flammable liquid. When under pressure, it has the potential for violent explosion.",
"category": "fuel",
- "weight": 1,
+ "weight": "1 g",
"volume": "200ml",
"price": 40,
"price_postapoc": 800,
@@ -120,7 +120,7 @@
"name_plural": "lamp oil",
"description": "A thin and clean-burning oil made for use in oil lamps.",
"category": "fuel",
- "weight": 1,
+ "weight": "1 g",
"volume": "200ml",
"price": 20,
"price_postapoc": 200,
@@ -149,7 +149,7 @@
"name_plural": "napalm",
"description": "This is gasoline mixed with some other components to make it stick to the surface and increase burning temperature, meant to be used with a flamethrower.",
"category": "fuel",
- "weight": 1,
+ "weight": "1 g",
"volume": "200ml",
"price": 8000,
"count": 250,
diff --git a/data/json/items/generic.json b/data/json/items/generic.json
index 71525a2ea1366..fa06a0f676ca6 100644
--- a/data/json/items/generic.json
+++ b/data/json/items/generic.json
@@ -1,16 +1,4 @@
[
- {
- "type": "GENERIC",
- "id": "corpse",
- "symbol": "%",
- "color": "white",
- "name": "corpse",
- "description": "A dead body.",
- "//": "most of the properties depend on the monster type and are created at runtime!",
- "price": 0,
- "volume": 0,
- "flags": [ "NO_UNLOAD", "TRADER_AVOID" ]
- },
{
"type": "GENERIC",
"//": "pseudo item, used as fuel type for engines that are animal-powered",
@@ -101,7 +89,7 @@
"name": "file",
"category": "books",
"description": "Several documents with all kinds of information, customer data and charts kept together, pretty useless now though.",
- "weight": 15,
+ "weight": "15 g",
"to_hit": -3,
"color": "white",
"symbol": ",",
@@ -120,7 +108,7 @@
"price": 0,
"material": "paper",
"flags": "TRADER_AVOID",
- "weight": 3,
+ "weight": "3 g",
"volume": 0
},
{
@@ -131,7 +119,7 @@
"name": "withered plant",
"description": "A dead plant. Good for starting fires or making a pile of leaves to sleep on.",
"material": "paper",
- "weight": 20,
+ "weight": "20 g",
"volume": "250 ml",
"to_hit": -2,
"flags": [ "TRADER_AVOID" ]
@@ -146,7 +134,7 @@
"price": 1000,
"material": [ "fur", "leather" ],
"flags": [ "NO_SALVAGE" ],
- "weight": 114,
+ "weight": "114 g",
"volume": "250 ml",
"category": "spare_parts"
},
@@ -170,7 +158,7 @@
"price": 2000,
"material": [ "leather", "flesh" ],
"flags": [ "NO_SALVAGE" ],
- "weight": 100,
+ "weight": "100 g",
"volume": "250 ml",
"category": "spare_parts",
"to_hit": -1
@@ -186,7 +174,7 @@
"price": 2000,
"material": [ "wool" ],
"flags": [ "NO_SALVAGE" ],
- "weight": 100,
+ "weight": "100 g",
"volume": "250 ml",
"category": "spare_parts",
"to_hit": -1
@@ -204,7 +192,7 @@
"price_postapoc": 200,
"material": [ "nomex" ],
"flags": [ "NO_SALVAGE" ],
- "weight": 42,
+ "weight": "42 g",
"volume": "250 ml"
},
{
@@ -217,7 +205,7 @@
"description": "A tube of strong glue. Used in many crafting recipes.",
"price": 1800,
"material": "plastic",
- "weight": 45,
+ "weight": "45 g",
"volume": "250 ml",
"to_hit": -2,
"flags": [ "UNRECOVERABLE" ]
@@ -232,7 +220,7 @@
"description": "Glue made from boiling animal bones. The adhesive isn't strong enough for heavy duty usages, but it can be used as a varnish or holding together small items.",
"price": 1800,
"material": "bone",
- "weight": 45,
+ "weight": "45 g",
"volume": "250 ml",
"to_hit": -2,
"flags": [ "UNRECOVERABLE" ]
@@ -252,7 +240,7 @@
"category": "spare_parts",
"name": "steel chain",
"description": "A heavy steel chain. Useful as a weapon, or for crafting. It has a chance to wrap around your target, allowing for a bonus unarmed attack.",
- "weight": 3628,
+ "weight": "3628 g",
"color": "dark_gray",
"symbol": "/",
"material": [ "steel" ],
@@ -272,7 +260,7 @@
"description": "A piece of an insect's exoskeleton. It is light and very durable.",
"price": 0,
"material": "chitin",
- "weight": 89,
+ "weight": "89 g",
"volume": "250 ml",
"bashing": 1,
"to_hit": -2
@@ -288,7 +276,7 @@
"description": "A set of small slightly elongated disks, made of high-grade ceramic. They remind you of scales",
"price": 0,
"material": "lightceramic",
- "weight": 100,
+ "weight": "100 g",
"volume": "250 ml",
"bashing": 1,
"to_hit": -3
@@ -311,7 +299,7 @@
"name": "bundle of rags",
"name_plural": "bundles of rags",
"description": "Cotton rags, bundled tightly together for storage. Disassemble to unpack.",
- "weight": 800,
+ "weight": "800 g",
"volume": "750 ml",
"price": 0,
"material": "cotton",
@@ -325,7 +313,7 @@
"name": "bundle of leather",
"name_plural": "bundles of leather",
"description": "Leather patches, bundled tightly together for storage. Disassemble to unpack.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "1 L",
"price": 20000,
"material": "leather",
@@ -339,7 +327,7 @@
"name": "bundle of felt",
"name_plural": "bundles of felt",
"description": "Felt patches, bundled tightly together for storage. Disassemble to unpack.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "1 L",
"price": 20000,
"material": "wool",
@@ -355,7 +343,7 @@
"description": "An unopened biollante flower, brilliant purple in color. It may still have its sap-producing organ intact.",
"price": 0,
"material": "veggy",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"to_hit": -3
},
@@ -367,7 +355,7 @@
"name": "empty canister",
"description": "An empty canister, which may have once held tear gas or other substances.",
"material": "steel",
- "weight": 158,
+ "weight": "158 g",
"volume": "250 ml",
"bashing": 2,
"to_hit": -1,
@@ -384,7 +372,7 @@
"price": 200000,
"price_postapoc": 1000,
"material": "stone",
- "weight": 907,
+ "weight": "907 g",
"volume": "250 ml",
"bashing": 6,
"to_hit": -1,
@@ -401,7 +389,7 @@
"price": 20000,
"price_postapoc": 1000,
"material": "stone",
- "weight": 493,
+ "weight": "493 g",
"volume": "250 ml",
"bashing": 6,
"to_hit": -1,
@@ -417,7 +405,7 @@
"price": 10000,
"price_postapoc": 100,
"material": "plastic",
- "weight": 18,
+ "weight": "18 g",
"volume": 0,
"to_hit": -3
},
@@ -431,7 +419,7 @@
"price": 10000,
"price_postapoc": 100,
"material": "plastic",
- "weight": 18,
+ "weight": "18 g",
"volume": 0,
"to_hit": -3
},
@@ -441,7 +429,7 @@
"category": "other",
"name": "golf tee",
"description": "A pin shaped piece of wood meant for holding a golf ball slightly off the ground.",
- "weight": 3,
+ "weight": "3 g",
"volume": "250 ml",
"price": 1000,
"material": "wood",
@@ -454,7 +442,7 @@
"category": "other",
"name": "golf ball",
"description": "A small ball with round indentations on it.",
- "weight": 50,
+ "weight": "50 g",
"volume": "250 ml",
"price": 2000,
"material": "plastic",
@@ -474,7 +462,7 @@
"price": 3000,
"price_postapoc": 0,
"material": "plastic",
- "weight": 170,
+ "weight": "170 g",
"volume": "250 ml",
"bashing": 8,
"to_hit": -3
@@ -489,7 +477,7 @@
"category": "other",
"price": 30,
"material": "ceramic",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "2500 ml",
"bashing": 16,
"to_hit": -2
@@ -505,7 +493,7 @@
"price": 10000,
"price_postapoc": 100,
"material": "gold",
- "weight": 1500,
+ "weight": "1500 g",
"volume": "250 ml",
"bashing": 9
},
@@ -520,7 +508,7 @@
"price": 28000,
"price_postapoc": 1000,
"material": "steel",
- "weight": 553,
+ "weight": "553 g",
"volume": "750 ml",
"bashing": 6,
"cutting": 8,
@@ -538,7 +526,7 @@
"price": 28000,
"price_postapoc": 1000,
"material": "steel",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "1500 ml",
"bashing": 6,
"cutting": 8,
@@ -556,7 +544,7 @@
"price": 20000,
"price_postapoc": 1000,
"material": "steel",
- "weight": 349,
+ "weight": "349 g",
"volume": "250 ml",
"cutting": 14,
"flags": [ "HURT_WHEN_WIELDED" ],
@@ -572,7 +560,7 @@
"category": "tools",
"price": 5,
"material": "steel",
- "weight": 11,
+ "weight": "11 g",
"volume": 0
},
{
@@ -586,7 +574,7 @@
"price": 20000,
"price_postapoc": 300,
"material": "steel",
- "weight": 151,
+ "weight": "151 g",
"volume": "500 ml",
"to_hit": -2
},
@@ -600,7 +588,7 @@
"price": 20000,
"price_postapoc": 500,
"material": "steel",
- "weight": 302,
+ "weight": "302 g",
"volume": "500 ml",
"to_hit": -2
},
@@ -615,7 +603,7 @@
"price": 7500,
"price_postapoc": 1000,
"material": "steel",
- "weight": 908,
+ "weight": "908 g",
"volume": "1500 ml",
"bashing": 12,
"to_hit": 2,
@@ -634,7 +622,7 @@
"price": 10000,
"price_postapoc": 100,
"material": "powder",
- "weight": 2340,
+ "weight": "2340 g",
"volume": "1 L",
"bashing": 4
},
@@ -648,7 +636,7 @@
"category": "other",
"material": "bone",
"flags": [ "NO_SALVAGE", "TRADER_AVOID" ],
- "weight": 10,
+ "weight": "10 g",
"volume": 0,
"to_hit": -5,
"qualities": [ [ "COOK", 1 ] ]
@@ -663,7 +651,7 @@
"description": "A torch that has consumed all its fuel; it can be recrafted into another torch.",
"category": "other",
"material": "wood",
- "weight": 751,
+ "weight": "751 g",
"volume": "750 ml",
"bashing": 8,
"to_hit": 3,
@@ -680,7 +668,7 @@
"description": "This is a spent magnesium flare. It is essentially trash.",
"material": "plastic",
"flags": "TRADER_AVOID",
- "weight": 39,
+ "weight": "39 g",
"volume": "250 ml",
"to_hit": -1
},
@@ -695,7 +683,7 @@
"price": 1000,
"price_postapoc": 100,
"material": "iron",
- "weight": 3220,
+ "weight": "3220 g",
"volume": "750 ml"
},
{
@@ -709,7 +697,7 @@
"price": 5000,
"price_postapoc": 500,
"material": "steel",
- "weight": 8440,
+ "weight": "8440 g",
"volume": "5 L"
},
{
@@ -723,7 +711,7 @@
"price": 10000,
"price_postapoc": 500,
"material": [ "steel", "iron" ],
- "weight": 22680,
+ "weight": "22680 g",
"volume": "6250 ml",
"bashing": 6,
"to_hit": -4
@@ -737,7 +725,7 @@
"description": "A small tent, just big enough to fit a person comfortably. This tent is broken and cannot be deployed.",
"price": 6500,
"material": [ "plastic", "aluminum" ],
- "weight": 1133,
+ "weight": "1133 g",
"volume": "2500 ml",
"bashing": 4,
"to_hit": -3,
@@ -752,7 +740,7 @@
"description": "A family sized tent, very bulky but with plenty of space. This tent is broken and can not be deployed.",
"price": 10000,
"material": [ "plastic", "aluminum" ],
- "weight": 2266,
+ "weight": "2266 g",
"volume": "10 L",
"bashing": 4,
"to_hit": -3,
@@ -769,7 +757,7 @@
"price": 1000,
"price_postapoc": 100,
"material": "iron",
- "weight": 226,
+ "weight": "226 g",
"volume": "250 ml"
},
{
@@ -783,7 +771,7 @@
"price": 1000,
"price_postapoc": 100,
"material": "iron",
- "weight": 226,
+ "weight": "226 g",
"volume": "250 ml"
},
{
@@ -795,7 +783,7 @@
"description": "A large cathode ray tube television, full of delicious electronics.",
"price": 0,
"material": "plastic",
- "weight": 22600,
+ "weight": "22600 g",
"volume": "3 L",
"bashing": 5,
"to_hit": -5
@@ -811,7 +799,7 @@
"price": 1000,
"price_postapoc": 50,
"material": [ "aluminum", "plastic" ],
- "weight": 5,
+ "weight": "5 g",
"volume": 0
},
{
@@ -823,7 +811,7 @@
"description": "A small two slice toaster, not much use as anything but spare parts",
"price": 1000,
"material": [ "aluminum", "plastic" ],
- "weight": 725,
+ "weight": "725 g",
"volume": "750 ml"
},
{
@@ -835,7 +823,7 @@
"description": "A home microwave, has probably seen its share of baked beans. Good for scrap parts.",
"price": 1000,
"material": [ "steel", "plastic" ],
- "weight": 11339,
+ "weight": "11339 g",
"volume": "3 L"
},
{
@@ -848,7 +836,7 @@
"description": "A broken laptop, basically a paperweight now.",
"price": 1000,
"material": [ "plastic", "aluminum" ],
- "weight": 2721,
+ "weight": "2721 g",
"volume": "750 ml",
"bashing": 6
},
@@ -862,7 +850,7 @@
"description": "A broken eyebot. Much less threatening now that it won't be calling for backup. Could be gutted for parts.",
"price": 1000,
"material": [ "steel", "plastic" ],
- "weight": 31520,
+ "weight": "31520 g",
"volume": "15 L",
"bashing": 6,
"cutting": 6,
@@ -879,7 +867,7 @@
"description": "A broken skitterbot. Much less threatening now that it lies limp on solid ground. Could be gutted for parts.",
"price": 1000,
"material": [ "steel", "plastic" ],
- "weight": 62650,
+ "weight": "62650 g",
"volume": "30 L",
"bashing": 4,
"cutting": 4,
@@ -896,7 +884,7 @@
"description": "A broken lab defense bot, with its casing broken and fluid drained. Could be gutted for parts.",
"price": 1000,
"material": [ "steel", "plastic" ],
- "weight": 100000,
+ "weight": "100000 g",
"volume": "65000 ml",
"bashing": 4,
"cutting": 4,
@@ -914,7 +902,7 @@
"price": 30000,
"price_postapoc": 1000,
"material": [ "steel", "plastic" ],
- "weight": 140000,
+ "weight": "140000 g",
"volume": "62500 ml",
"bashing": 6,
"cutting": 6,
@@ -932,7 +920,7 @@
"price": 30000,
"price_postapoc": 1000,
"material": [ "steel", "plastic" ],
- "weight": 140000,
+ "weight": "140000 g",
"volume": "62500 ml",
"bashing": 6,
"cutting": 6,
@@ -956,7 +944,7 @@
"price": 30000,
"price_postapoc": 1000,
"material": [ "steel", "plastic" ],
- "weight": 140000,
+ "weight": "140000 g",
"volume": "62500 ml",
"bashing": 6,
"cutting": 6,
@@ -974,7 +962,7 @@
"price": 30000,
"price_postapoc": 1000,
"material": [ "steel", "plastic" ],
- "weight": 140000,
+ "weight": "140000 g",
"volume": "62500 ml",
"bashing": 6,
"cutting": 6,
@@ -992,7 +980,7 @@
"price": 20000,
"price_postapoc": 1000,
"material": [ "steel", "plastic" ],
- "weight": 170200,
+ "weight": "170200 g",
"volume": "62500 ml",
"bashing": 6,
"cutting": 10,
@@ -1009,7 +997,7 @@
"description": "A broken tribot. Now that its legs lie broken and immobile, the world seems a little less threatening. Could be gutted for parts.",
"price": 1000,
"material": [ "steel", "plastic" ],
- "weight": 430000,
+ "weight": "430000 g",
"volume": "187500 ml",
"bashing": 10,
"cutting": 6,
@@ -1026,7 +1014,7 @@
"description": "A broken tank drone. Still looks intimidating despite being permanently inoperative, possibly due to the sheer size and mass. Could be gutted for parts.",
"price": 1000,
"material": [ "steel", "plastic" ],
- "weight": 1223850,
+ "weight": "1223850 g",
"volume": "875 L",
"bashing": 20,
"cutting": 15,
@@ -1038,7 +1026,7 @@
"id": "broken_mech_recon",
"name": "broken recon mech",
"description": "This is a broken mech exoskeleton suit, it looks beyond repair.",
- "weight": 700388,
+ "weight": "700388 g",
"volume": "125 L",
"price": 1000,
"to_hit": -3,
@@ -1053,7 +1041,7 @@
"id": "broken_mech_lifter",
"name": "broken mech lifter",
"description": "This is a broken mech exoskeleton suit, it looks beyond repair.",
- "weight": 1280388,
+ "weight": "1280388 g",
"volume": "250 L",
"price": 1000,
"to_hit": -3,
@@ -1068,7 +1056,7 @@
"id": "broken_mech_combat",
"name": "broken combat mech",
"description": "This is a broken mech exoskeleton suit, it looks beyond repair.",
- "weight": 1480388,
+ "weight": "1480388 g",
"volume": "250 L",
"price": 1000,
"to_hit": -3,
@@ -1088,7 +1076,7 @@
"description": "A broken riot dispatch, with its mesh midsection filled with fried manhacks and its motor limp and still. Could be gutted for parts.",
"price": 1000,
"material": [ "steel", "plastic" ],
- "weight": 100000,
+ "weight": "100000 g",
"volume": "85000 ml",
"bashing": 4,
"cutting": 4,
@@ -1105,7 +1093,7 @@
"description": "A broken military dispatch. Though the scratched, disarmed manhacks visible in its belly are disarmed, their destructive potential still inspires a spark of fear, even now. Could be gutted for parts.",
"price": 1000,
"material": [ "steel", "plastic" ],
- "weight": 100000,
+ "weight": "100000 g",
"volume": "85000 ml",
"bashing": 4,
"cutting": 4,
@@ -1122,7 +1110,7 @@
"description": "A broken manhack. Much less threatening now that it lies limp on solid ground. Could be gutted for parts.",
"price": 1000,
"material": [ "aluminum", "plastic" ],
- "weight": 5400,
+ "weight": "5400 g",
"volume": "750 ml",
"bashing": 6,
"cutting": 6,
@@ -1140,7 +1128,7 @@
"price": 9000,
"price_postapoc": 1000,
"material": [ "aluminum", "plastic" ],
- "weight": 4480,
+ "weight": "4480 g",
"volume": "750 ml",
"bashing": 6,
"cutting": 6,
@@ -1158,7 +1146,7 @@
"price": 18000,
"price_postapoc": 1000,
"material": [ "aluminum", "plastic" ],
- "weight": 25000,
+ "weight": "25000 g",
"volume": "18750 ml",
"bashing": 6,
"cutting": 6,
@@ -1176,7 +1164,7 @@
"price": 9000,
"price_postapoc": 1000,
"material": [ "aluminum", "plastic" ],
- "weight": 5360,
+ "weight": "5360 g",
"volume": "750 ml",
"bashing": 6,
"cutting": 6,
@@ -1194,7 +1182,7 @@
"price": 9000,
"price_postapoc": 1000,
"material": [ "aluminum", "plastic" ],
- "weight": 4700,
+ "weight": "4700 g",
"volume": "750 ml",
"bashing": 6,
"cutting": 6,
@@ -1212,7 +1200,7 @@
"price": 9000,
"price_postapoc": 1000,
"material": [ "aluminum", "plastic" ],
- "weight": 4536,
+ "weight": "4536 g",
"volume": "750 ml",
"bashing": 6,
"cutting": 6,
@@ -1230,7 +1218,7 @@
"price": 9000,
"price_postapoc": 1000,
"material": [ "aluminum", "plastic" ],
- "weight": 5870,
+ "weight": "5870 g",
"volume": "750 ml",
"bashing": 6,
"cutting": 6,
@@ -1247,7 +1235,7 @@
"description": "A central processor unit, useful in advanced electronics crafting.",
"price": 12000,
"material": [ "plastic" ],
- "weight": 56,
+ "weight": "56 g",
"volume": "250 ml",
"to_hit": -1
},
@@ -1261,7 +1249,7 @@
"description": "A stick of memory. Useful in advanced electronics crafting.",
"price": 9000,
"material": [ "plastic" ],
- "weight": 30,
+ "weight": "30 g",
"volume": "250 ml",
"to_hit": -1
},
@@ -1275,7 +1263,7 @@
"description": "A power supply unit. Useful in lots of electronics recipes.",
"price": 17000,
"material": [ "aluminum", "plastic" ],
- "weight": 113,
+ "weight": "113 g",
"volume": "1 L",
"bashing": 5,
"to_hit": -1
@@ -1290,7 +1278,7 @@
"description": "A circuit designed to amplify the strength of a signal. Useful in lots of electronics recipes.",
"price": 20000,
"material": [ "plastic" ],
- "weight": 114,
+ "weight": "114 g",
"volume": "250 ml",
"to_hit": -1
},
@@ -1304,7 +1292,7 @@
"description": "A circuit designed to repeat a signal. Useful for crafting communications equipment.",
"price": 14000,
"material": [ "aluminum", "plastic" ],
- "weight": 480,
+ "weight": "480 g",
"volume": "250 ml",
"to_hit": -1
},
@@ -1318,7 +1306,7 @@
"description": "A module designed to receive many forms of signals. Useful for crafting communications equipment.",
"price": 13500,
"material": [ "aluminum", "plastic" ],
- "weight": 114,
+ "weight": "114 g",
"volume": "250 ml",
"to_hit": -1
},
@@ -1332,7 +1320,7 @@
"description": "A small backlit screen, used for displaying images. Useful in some electronics recipes.",
"price": 24000,
"material": "plastic",
- "weight": 500,
+ "weight": "500 g",
"volume": "250 ml",
"to_hit": -4
},
@@ -1347,7 +1335,7 @@
"description": "A high-quality lens, useful for focusing or diffusing light. Might be useful for starting a fire.",
"price": 120000,
"material": "glass",
- "weight": 340,
+ "weight": "340 g",
"volume": 0,
"to_hit": -3,
"use_action": { "type": "firestarter", "moves": 1000, "moves_slow": 30000, "need_sunlight": true },
@@ -1364,7 +1352,7 @@
"description": "A small high-quality lens, useful for focusing or diffusing light. Might be useful for crafting.",
"price": 6000,
"material": "glass",
- "weight": 170,
+ "weight": "170 g",
"volume": 0
},
{
@@ -1378,7 +1366,7 @@
"description": "A pair of small darkened glass, like the one that sunglasses are made of.",
"price": 1000,
"material": "glass",
- "weight": 340,
+ "weight": "340 g",
"volume": 0,
"to_hit": -3
},
@@ -1392,7 +1380,7 @@
"description": "Once a valuable bionic implant, it has not held up well under repeated use. This object has been destroyed by excessive electric current and is now useless.",
"price": 13500,
"material": [ "steel", "plastic" ],
- "weight": 317,
+ "weight": "317 g",
"volume": "2500 ml",
"to_hit": -1,
"flags": [ "TRADER_AVOID" ]
@@ -1408,7 +1396,7 @@
"price": 150000,
"price_postapoc": 15000,
"material": [ "steel", "plastic" ],
- "weight": 317,
+ "weight": "317 g",
"volume": "250 ml",
"to_hit": -1,
"flags": [ "NANOFAB_TEMPLATE", "TRADER_AVOID" ]
@@ -1435,7 +1423,7 @@
"description": "A simple thin aluminum shaft. Useful in lots of electronics recipes.",
"price": 8000,
"material": "aluminum",
- "weight": 68,
+ "weight": "68 g",
"volume": "250 ml",
"to_hit": 2
},
@@ -1449,7 +1437,7 @@
"description": "A very small electric motor like those used in RC cars. Useful in lots of electronics recipes.",
"price": 1000,
"material": [ "steel", "plastic" ],
- "weight": 110,
+ "weight": "110 g",
"volume": "250 ml"
},
{
@@ -1462,7 +1450,7 @@
"description": "A printed card that supports and electrically connects electronic components on a non-conductive substrate.",
"price": 5000,
"material": "plastic",
- "weight": 26,
+ "weight": "26 g",
"volume": 0,
"to_hit": 2
},
@@ -1476,7 +1464,7 @@
"description": "A random collection of resistors, capacitors, and diodes which have been stripped from printed circuits.",
"price": 3000,
"material": "aluminum",
- "weight": 14,
+ "weight": "14 g",
"volume": 0,
"to_hit": 2
},
@@ -1490,7 +1478,7 @@
"description": "A system designed to convert a radio station into an autonomous repeater.",
"price": 25000,
"material": [ "aluminum", "plastic" ],
- "weight": 21000,
+ "weight": "21000 g",
"volume": "2 L",
"bashing": 4,
"to_hit": 1
@@ -1505,7 +1493,7 @@
"price": 1000,
"price_postapoc": 100,
"material": [ "aluminum", "plastic" ],
- "weight": 2857,
+ "weight": "2857 g",
"volume": "1 L"
},
{
@@ -1519,7 +1507,7 @@
"price": 8000,
"price_postapoc": 1000,
"material": "ceramic",
- "weight": 362,
+ "weight": "362 g",
"volume": "500 ml",
"bashing": 4
},
@@ -1533,7 +1521,7 @@
"description": "A filled fish bowl, the tag says 'to Ed' and the fish's name, 'Hoss'. The fish appears to have tiny antlers.",
"price": 100,
"material": "glass",
- "weight": 7042,
+ "weight": "7042 g",
"volume": "1 L",
"to_hit": -6
},
@@ -1546,7 +1534,7 @@
"description": "A large rag, drenched in blood. It could be cleaned with boiling water.",
"material": "cotton",
"flags": [ "NO_SALVAGE", "TRADER_AVOID" ],
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml"
},
{
@@ -1554,7 +1542,7 @@
"type": "GENERIC",
"name": "pipe cleaner",
"description": "This is a tool designed to clean interior surface of pipes, bottles, and similar objects. This one is thin enough to be used for cleaning firearm barrels from dirt and fouling.",
- "weight": 50,
+ "weight": "50 g",
"volume": "250 ml",
"price": 500,
"material": [ "steel", "cotton" ],
@@ -1571,7 +1559,7 @@
"price": 1000,
"price_postapoc": 0,
"material": [ "plastic", "steel" ],
- "weight": 725,
+ "weight": "725 g",
"volume": "250 ml",
"bashing": 4,
"to_hit": -3
@@ -1588,7 +1576,7 @@
"price": 200,
"price_postapoc": 0,
"material": "steel",
- "weight": 50,
+ "weight": "50 g",
"volume": "250 ml"
},
{
@@ -1601,7 +1589,7 @@
"category": "other",
"description": "This not-so-little bundle of joy contains Leadworks, LLC's premier offerings: the Enforcer autorevolver (with holster) and Long Ranger rifle. Maintenance kit, batteries for same, and a complimentary copy of the Gun Owner's Handbook are included. The perfect investment for a new family starting out! Disassemble to unpack and enjoy.",
"price": 463500,
- "weight": 8932,
+ "weight": "8932 g",
"volume": "4500 ml",
"to_hit": -2,
"material": [ "wood", "steel" ]
@@ -1616,7 +1604,7 @@
"category": "other",
"description": "A beautiful wooden stock and hardware built to support common Mosin-Nagant actions. With gunsmithing tools, some skill, and a few hours, you could take a 'tacti-cool' rifle and convert it to the classic Russian design.",
"price": 12000,
- "weight": 2000,
+ "weight": "2000 g",
"volume": "2750 ml",
"to_hit": -2,
"material": [ "wood", "steel" ]
@@ -1631,7 +1619,7 @@
"category": "spare_parts",
"description": "A synthetic stock and hardware designed to accommodate common Mosin-Nagant actions. With gunsmithing tools, some skill, and a few hours, you could give the classic Russian design modern furniture and customization capacity.",
"price": 12000,
- "weight": 2000,
+ "weight": "2000 g",
"volume": "2750 ml",
"to_hit": -2,
"material": [ "plastic", "steel" ]
@@ -1646,7 +1634,7 @@
"category": "spare_parts",
"description": "All the parts necessary to convert an L523 to the Carbine configuration, Leadworks LLC's choice for close-quarters work. In order to reconfigure an already-configured L523, you'll need to disassemble it to the base platform, then assemble with the parts you prefer.",
"price": 170000,
- "weight": 400,
+ "weight": "400 g",
"volume": "500 ml",
"to_hit": -2,
"material": [ "steel", "plastic" ]
@@ -1661,7 +1649,7 @@
"category": "spare_parts",
"description": "All the parts necessary to convert an L523 to a Main Battle Rifle, a balanced weapon for all situations. In order to reconfigure an already-configured L523, you'll need to disassemble it to the base platform, then assemble with the parts you prefer.",
"price": 170000,
- "weight": 700,
+ "weight": "700 g",
"volume": "750 ml",
"to_hit": -2,
"material": [ "steel", "plastic" ]
@@ -1676,7 +1664,7 @@
"category": "spare_parts",
"description": "All the parts necessary to convert an L523 to a Designated Shootist Rifle, suitable for long-ranged work. In order to reconfigure an already-configured L523, you'll need to disassemble it to the base platform, then assemble with the parts you prefer.",
"price": 200000,
- "weight": 1900,
+ "weight": "1900 g",
"volume": "2500 ml",
"to_hit": -2,
"material": [ "steel", "plastic" ]
@@ -1691,7 +1679,7 @@
"category": "spare_parts",
"description": "All the parts necessary to convert an L523 to a light machine gun. In order to reconfigure an already-configured L523, you'll need to disassemble it to the base platform, then assemble with the parts you prefer.",
"price": 270000,
- "weight": 2300,
+ "weight": "2300 g",
"volume": "2750 ml",
"to_hit": -2,
"material": [ "steel", "plastic" ]
@@ -1707,7 +1695,7 @@
"price_postapoc": 0,
"material": "plastic",
"flags": [ "MC_MOBILE", "MC_RANDOM_STUFF", "MC_MAY_BE_ENCRYPTED", "MC_TURN_USED" ],
- "weight": 5,
+ "weight": "5 g",
"volume": 0
},
{
@@ -1722,7 +1710,7 @@
"price_postapoc": 0,
"material": "plastic",
"flags": [ "MC_MOBILE", "MC_USED" ],
- "weight": 5,
+ "weight": "5 g",
"volume": 0
},
{
@@ -1737,7 +1725,7 @@
"price_postapoc": 0,
"material": "plastic",
"flags": [ "MC_MOBILE", "MC_ENCRYPTED", "MC_TURN_USED" ],
- "weight": 5,
+ "weight": "5 g",
"volume": 0
},
{
@@ -1752,7 +1740,7 @@
"price_postapoc": 0,
"material": "plastic",
"flags": [ "MC_MOBILE", "MC_ENCRYPTED", "MC_TURN_USED", "MC_SCIENCE_STUFF" ],
- "weight": 5,
+ "weight": "5 g",
"volume": 0
},
{
@@ -1764,7 +1752,7 @@
"description": "A small hand mirror.",
"price": 15000,
"material": "glass",
- "weight": 300,
+ "weight": "300 g",
"volume": "750 ml",
"bashing": 2,
"to_hit": -3
@@ -1780,7 +1768,7 @@
"price": 20000,
"material": "iron",
"flags": [ "DURABLE_MELEE", "TRADER_AVOID" ],
- "weight": 36287,
+ "weight": "36287 g",
"volume": "3 L",
"bashing": 20,
"to_hit": -5
@@ -1793,7 +1781,7 @@
"name": "pine bough",
"description": "A branch from a pine tree, oozing sticky sap and bristling with prickly needles.",
"material": "wood",
- "weight": 220,
+ "weight": "220 g",
"volume": "500 ml",
"to_hit": -2,
"flags": [ "TRADER_AVOID", "FIREWOOD" ]
@@ -1805,7 +1793,7 @@
"color": "brown",
"name": "pinecone",
"description": "A spiny pod from a pine tree. Dry seeds rattle around inside when you shake it.",
- "weight": 90,
+ "weight": "90 g",
"volume": "250 ml",
"to_hit": -2,
"flags": [ "TRADER_AVOID" ]
@@ -1815,7 +1803,7 @@
"id": "poppy_flower",
"name": "poppy flower",
"description": "A poppy stalk with some petals.",
- "weight": 40,
+ "weight": "40 g",
"to_hit": -3,
"color": "light_red",
"symbol": ",",
@@ -1828,7 +1816,7 @@
"id": "poppy_bud",
"name": "poppy bud",
"description": "A poppy bud. Contains some substances commonly produced by a mutated poppy flower.",
- "weight": 30,
+ "weight": "30 g",
"to_hit": -3,
"color": "light_red",
"symbol": ",",
@@ -1841,7 +1829,7 @@
"id": "bluebell_flower",
"name": "bluebell",
"description": "A bluebell stalk with some petals.",
- "weight": 40,
+ "weight": "40 g",
"to_hit": -3,
"color": "blue",
"symbol": ",",
@@ -1854,7 +1842,7 @@
"id": "bluebell_bud",
"name": "bluebell bud",
"description": "A bluebell bud. Contains some substances commonly produced by a bluebell flower.",
- "weight": 30,
+ "weight": "30 g",
"to_hit": -3,
"color": "blue",
"symbol": ",",
@@ -1867,7 +1855,7 @@
"id": "dahlia_flower",
"name": "dahlia",
"description": "A dahlia stalk with some petals.",
- "weight": 40,
+ "weight": "40 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
@@ -1880,7 +1868,7 @@
"id": "dahlia_bud",
"name": "dahlia bud",
"description": "A dahlia bud. Contains some substances commonly produced by a dahlia.",
- "weight": 30,
+ "weight": "30 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
@@ -1893,7 +1881,7 @@
"id": "rose_flower",
"name": "rose",
"description": "A rose stalk with some petals.",
- "weight": 40,
+ "weight": "40 g",
"to_hit": -3,
"color": "red",
"symbol": ",",
@@ -1906,7 +1894,7 @@
"id": "rose_bud",
"name": "rose bud",
"description": "A rose bud. Contains some substances commonly produced by a rose flower.",
- "weight": 30,
+ "weight": "30 g",
"to_hit": -3,
"color": "red",
"symbol": ",",
@@ -1919,7 +1907,7 @@
"id": "hydrangea_flower",
"name": "hydrangea",
"description": "A hydrangea stalk with some petals.",
- "weight": 40,
+ "weight": "40 g",
"to_hit": -3,
"color": "light_blue",
"symbol": ",",
@@ -1932,7 +1920,7 @@
"id": "hydrangea_bud",
"name": "hydrangea bud",
"description": "A hydrangea bud. Contains some substances commonly produced by a hydrangea flower.",
- "weight": 30,
+ "weight": "30 g",
"to_hit": -3,
"color": "light_blue",
"symbol": ",",
@@ -1945,7 +1933,7 @@
"id": "tulip_flower",
"name": "tulip",
"description": "A tulip stalk with some petals.",
- "weight": 40,
+ "weight": "40 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
@@ -1958,7 +1946,7 @@
"id": "tulip_bud",
"name": "tulip bud",
"description": "A tulip bud. Contains some substances commonly produced by a tulip flower.",
- "weight": 30,
+ "weight": "30 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
@@ -1971,7 +1959,7 @@
"id": "spurge_flower",
"name": "spurge",
"description": "A spurge stalk with some petals.",
- "weight": 40,
+ "weight": "40 g",
"to_hit": -3,
"color": "light_green",
"symbol": ",",
@@ -1984,7 +1972,7 @@
"id": "spurge_bud",
"name": "spurge bud",
"description": "A spurge bud. Contains some substances commonly produced by a spurge flower.",
- "weight": 30,
+ "weight": "30 g",
"to_hit": -3,
"color": "light_green",
"symbol": ",",
@@ -1997,7 +1985,7 @@
"id": "black_eyed_susan_flower",
"name": "black eyed susan",
"description": "A black eyed susan stalk with some petals.",
- "weight": 40,
+ "weight": "40 g",
"to_hit": -3,
"color": "yellow",
"symbol": ",",
@@ -2010,7 +1998,7 @@
"id": "black_eyed_susan_bud",
"name": "black eyed susan bud",
"description": "A black eyed susan bud. Contains some substances commonly produced by a black eyed susan flower.",
- "weight": 30,
+ "weight": "30 g",
"to_hit": -3,
"color": "yellow",
"symbol": ",",
@@ -2023,7 +2011,7 @@
"id": "lily_flower",
"name": "lily",
"description": "A lily stalk with some petals.",
- "weight": 40,
+ "weight": "40 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
@@ -2036,7 +2024,7 @@
"id": "lily_bud",
"name": "lily bud",
"description": "A lily bud. Contains some substances commonly produced by a lily flower.",
- "weight": 30,
+ "weight": "30 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
@@ -2049,7 +2037,7 @@
"id": "lotus_flower",
"name": "lotus",
"description": "A lotus stalk with some petals.",
- "weight": 40,
+ "weight": "40 g",
"to_hit": -3,
"color": "yellow",
"symbol": ",",
@@ -2062,7 +2050,7 @@
"id": "lotus_bud",
"name": "lotus bud",
"description": "A lotus bud. Contains some substances commonly produced by a lotus flower.",
- "weight": 30,
+ "weight": "30 g",
"to_hit": -3,
"color": "yellow",
"symbol": ",",
@@ -2075,7 +2063,7 @@
"id": "lilac_flower",
"name": "lilac",
"description": "A lilac stalk with some petals.",
- "weight": 40,
+ "weight": "40 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
@@ -2088,7 +2076,7 @@
"id": "lilac_bud",
"name": "lilac bud",
"description": "A lilac bud. Contains some substances commonly produced by a lilac flower.",
- "weight": 30,
+ "weight": "30 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
@@ -2101,7 +2089,7 @@
"id": "sunflower",
"name": "sunflower",
"description": "The top of a sunflower, with yellow pedals and some seeds that have yet to be eaten by animals.",
- "weight": 450,
+ "weight": "450 g",
"to_hit": -2,
"color": "yellow",
"symbol": ",",
@@ -2115,7 +2103,7 @@
"name": "handful of chamomile flowers",
"name_plural": "handfuls of chamomile flowers",
"description": "White chamomile flowers, used as a herbal remedy since the ancient times.",
- "weight": 50,
+ "weight": "50 g",
"color": "white",
"symbol": ",",
"material": [ "veggy" ],
@@ -2133,7 +2121,7 @@
"description": "A fresh piece of clay. Useful for some crafting recipes.",
"price": 531,
"material": "freshclay",
- "weight": 530,
+ "weight": "530 g",
"volume": "250 ml",
"to_hit": -4
},
@@ -2147,7 +2135,7 @@
"description": "A fire hardened building block used in masonry construction.",
"price": 2500,
"material": [ "clay", "stone" ],
- "weight": 969,
+ "weight": "969 g",
"volume": "500 ml",
"bashing": 8,
"to_hit": -2,
@@ -2165,7 +2153,7 @@
"container": "bag_canvas",
"price": 5000,
"material": "powder",
- "weight": 2340,
+ "weight": "2340 g",
"volume": "1 L",
"bashing": 4
},
@@ -2180,7 +2168,7 @@
"description": "A compacted mass of soil and natural fibers, still too wet to build with. Load it onto a pallet and leave it to dry.",
"price": 0,
"material": "soil",
- "weight": 1750,
+ "weight": "1750 g",
"volume": "750 ml",
"bashing": 2,
"to_hit": -3,
@@ -2205,7 +2193,7 @@
"description": "A compacted mass of soil and natural fibers, baked dry enough to harden into a brick.",
"material": "soil",
"flags": "NONCONDUCTIVE",
- "weight": 1500,
+ "weight": "1500 g",
"volume": "750 ml",
"bashing": 10,
"to_hit": -2,
@@ -2224,7 +2212,7 @@
"container": "bag_canvas",
"price": 200,
"material": "soil",
- "weight": 2340,
+ "weight": "2340 g",
"volume": "1 L",
"bashing": 4
},
@@ -2237,7 +2225,7 @@
"description": "A sheet of tannin-rich bark from a tree, useful for tanning leather",
"price": 0,
"material": "wood",
- "weight": 323,
+ "weight": "323 g",
"volume": "250 ml",
"bashing": 4,
"to_hit": 1
@@ -2251,7 +2239,7 @@
"description": "A sheet of tough, water-resistant bark taken from a birch tree.",
"price": 0,
"material": "wood",
- "weight": 323,
+ "weight": "323 g",
"volume": "250 ml",
"bashing": 4,
"to_hit": 1
@@ -2265,7 +2253,7 @@
"description": "A sheet of bark taken from a willow tree. Used in the production of aspirin.",
"price": 0,
"material": "wood",
- "weight": 323,
+ "weight": "323 g",
"volume": "250 ml",
"bashing": 4,
"to_hit": 1
@@ -2280,7 +2268,7 @@
"price": 1000000,
"price_postapoc": 100,
"material": "diamond",
- "weight": 120,
+ "weight": "120 g",
"volume": "250 ml",
"to_hit": -5
},
@@ -2295,7 +2283,7 @@
"price": 2000,
"material": [ "flesh" ],
"flags": [ "NO_SALVAGE" ],
- "weight": 600,
+ "weight": "600 g",
"volume": "750 ml",
"category": "spare_parts",
"to_hit": -1
@@ -2310,7 +2298,7 @@
"description": "A folded sheet of leather made from carefully tanned animal hide. Can be cut up or used as is.",
"price": 5000,
"material": [ "leather" ],
- "weight": 600,
+ "weight": "600 g",
"volume": "1500 ml",
"category": "spare_parts",
"to_hit": -1
@@ -2326,7 +2314,7 @@
"price": 2000,
"material": [ "fur", "flesh" ],
"flags": [ "NO_SALVAGE" ],
- "weight": 684,
+ "weight": "684 g",
"volume": "1 L",
"category": "spare_parts",
"to_hit": -1
@@ -2341,7 +2329,7 @@
"description": "A folded sheet of leather made from carefully tanned animal hide, with the fur still intact. Can be cut up or used as is.",
"price": 5000,
"material": [ "fur" ],
- "weight": 684,
+ "weight": "684 g",
"volume": "1500 ml",
"category": "spare_parts",
"to_hit": -1
@@ -2357,7 +2345,7 @@
"description": "A pile of dry grass. Can be used to craft a straw bed if there is nothing else to sleep on.",
"material": [ "paper" ],
"flags": "TRADER_AVOID",
- "weight": 20,
+ "weight": "20 g",
"volume": "250 ml",
"to_hit": -2
},
@@ -2371,7 +2359,7 @@
"description": "Old straw doll. Represents a woman in a dress.",
"price": 100,
"material": [ "paper" ],
- "weight": 80,
+ "weight": "80 g",
"volume": "500 ml"
},
{
@@ -2383,7 +2371,7 @@
"description": "A pillow to rest your head on when sleeping.",
"price": 1000,
"material": [ "cotton" ],
- "weight": 514,
+ "weight": "514 g",
"volume": "1 L",
"flags": [ "SLEEP_AID" ],
"category": "other"
@@ -2397,7 +2385,7 @@
"description": "A big, body-sized pillow with a print of an anime character on the front and their scantily clad version on the back.",
"price": 1500,
"material": [ "cotton" ],
- "weight": 774,
+ "weight": "774 g",
"volume": "1750 ml",
"flags": [ "SLEEP_AID" ],
"category": "other"
@@ -2411,7 +2399,7 @@
"description": "A fluffy pillow to rest your head on when sleeping.",
"price": 1000,
"material": [ "cotton" ],
- "weight": 514,
+ "weight": "514 g",
"volume": "1 L",
"flags": [ "SLEEP_AID" ],
"category": "other"
@@ -2425,7 +2413,7 @@
"description": "An old and half rotten teddy bear. Looks like this one commemorates the grave of the child who once owned it.",
"price": 200,
"material": [ "cotton" ],
- "weight": 514,
+ "weight": "514 g",
"volume": "750 ml",
"flags": [ "SLEEP_AID" ]
},
@@ -2434,7 +2422,7 @@
"id": "money_bundle",
"name": "money bundle",
"description": "A bundle holding many 20 dollar bills, pretty useless now though.",
- "weight": 20,
+ "weight": "20 g",
"to_hit": -3,
"color": "green",
"symbol": ",",
@@ -2450,7 +2438,7 @@
"name": "autoclave pouch",
"name_plural": "autoclave pouches",
"description": "This is a medical device that bears the approval of the FDA (Food and Drug Administration). If used properly, these pouches can keep things sterile indefinitely.",
- "weight": 2,
+ "weight": "2 g",
"volume": 0,
"price": 5,
"use_action": "PACK_CBM",
@@ -2563,7 +2551,7 @@
"description": "A psychoactive plant indigenous to Central Asia and the Indian subcontinent traditionally cultivated for its fiber, oil, for medicinal purposes, and for use as a recreational drug. It requires further processing to be useful.",
"price": 2000,
"material": "veggy",
- "weight": 420,
+ "weight": "420 g",
"volume": "1 L"
},
{
@@ -2577,7 +2565,7 @@
"looks_like": "wild_herbs",
"price": 300,
"material": "veggy",
- "weight": 100,
+ "weight": "100 g",
"volume": "250 ml"
},
{
@@ -2591,7 +2579,7 @@
"price_postapoc": 10,
"material": "plastic",
"flags": [ "NO_UNLOAD", "NO_RELOAD" ],
- "weight": 6,
+ "weight": "6 g",
"volume": 0,
"to_hit": -3,
"max_charges": 200000000,
@@ -2647,23 +2635,10 @@
"category": "other",
"price": 500,
"material": "plastic",
- "weight": 6,
+ "weight": "6 g",
"volume": 0,
"to_hit": -3
},
- {
- "type": "GENERIC",
- "id": "rmi2_corpse",
- "symbol": "%",
- "color": "white",
- "name": "desiccated corpse",
- "description": "A badly mangled and desiccated partial corpse. It seems whatever thing killed him did so with a single swipe of a gigantic claw.",
- "category": "other",
- "material": "hflesh",
- "price": 0,
- "volume": "7500 ml",
- "flags": [ "TRADER_AVOID" ]
- },
{
"id": "gasdiscount_silver",
"type": "TOOL",
@@ -2675,7 +2650,7 @@
"price": 500,
"material": "plastic",
"flags": [ "GAS_DISCOUNT", "DISCOUNT_VALUE_1" ],
- "weight": 6,
+ "weight": "6 g",
"volume": 0,
"to_hit": -3
},
@@ -2690,7 +2665,7 @@
"price": 500,
"material": "plastic",
"flags": [ "GAS_DISCOUNT", "DISCOUNT_VALUE_2" ],
- "weight": 6,
+ "weight": "6 g",
"volume": 0,
"to_hit": -3
},
@@ -2705,7 +2680,7 @@
"price": 500,
"material": "plastic",
"flags": [ "GAS_DISCOUNT", "DISCOUNT_VALUE_3" ],
- "weight": 6,
+ "weight": "6 g",
"volume": 0,
"to_hit": -3
},
@@ -2719,7 +2694,7 @@
"price": 60000,
"price_postapoc": 5000,
"material": "plastic",
- "weight": 6,
+ "weight": "6 g",
"volume": 0,
"to_hit": -3
},
@@ -2733,7 +2708,7 @@
"price": 120000,
"price_postapoc": 10000,
"material": "plastic",
- "weight": 6,
+ "weight": "6 g",
"volume": 0,
"to_hit": -3
},
@@ -2748,7 +2723,7 @@
"price": 120000,
"price_postapoc": 10000,
"material": "plastic",
- "weight": 6,
+ "weight": "6 g",
"volume": 0,
"to_hit": -3
},
@@ -2762,7 +2737,7 @@
"price": 1000,
"material": "neoprene",
"flags": [ "NO_SALVAGE" ],
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"category": "spare_parts"
},
@@ -2775,7 +2750,7 @@
"description": "A laser cannon stripped from the barrel of a TX-5LR Cerberus laser turret. Unusable as a weapon on its own without the necessary parts.",
"price": 5000000,
"material": [ "steel", "plastic" ],
- "weight": 5000,
+ "weight": "5000 g",
"volume": "750 ml",
"category": "spare_parts"
},
@@ -2787,7 +2762,7 @@
"symbol": ",",
"color": "white",
"material": "glass",
- "weight": 10,
+ "weight": "10 g",
"volume": "250 ml",
"price": 500
},
@@ -2796,7 +2771,7 @@
"type": "AMMO",
"name": "shrapnel",
"description": "A twisted shard of jagged metal.",
- "weight": 5,
+ "weight": "5 g",
"volume": "250 ml",
"price": 0,
"stack_size": 50,
@@ -2811,7 +2786,7 @@
"category": "other",
"name": "clay flower pot",
"description": "A nice looking clay pot used for planting.",
- "weight": 480,
+ "weight": "480 g",
"volume": "2500 ml",
"price": 600,
"bashing": 1,
@@ -2825,7 +2800,7 @@
"category": "other",
"name": "plastic flower pot",
"description": "A cheap plastic pot used for planting.",
- "weight": 190,
+ "weight": "190 g",
"volume": "2500 ml",
"price": 300,
"bashing": 1,
@@ -2839,7 +2814,7 @@
"category": "other",
"name": "fluid preserved brain",
"description": "This 3L jar contains a human brain preserved in a formaldehyde solution.",
- "weight": 365,
+ "weight": "365 g",
"volume": "3 L",
"price": 100,
"to_hit": -1,
@@ -2855,7 +2830,7 @@
"category": "spare_parts",
"name": "evaporator coil",
"description": "A set of long, snakelike tubes for evaporating refrigerant.",
- "weight": 20000,
+ "weight": "20000 g",
"volume": "2 L",
"price": 1000,
"material": "steel",
@@ -2868,7 +2843,7 @@
"category": "spare_parts",
"name": "condensor coil",
"description": "A compressor and a fan work together to cool down the refrigerant.",
- "weight": 20000,
+ "weight": "20000 g",
"volume": "2 L",
"price": 1000,
"material": "steel",
@@ -2881,7 +2856,7 @@
"name": "refrigerant tank",
"name_plural": "refrigerant tanks",
"description": "A small tank containing some sort of refrigerant often used in devices such as freezers. Hermetically sealed to prevent evaporation - cannot be opened without prior connection to compatible valve.",
- "weight": 410,
+ "weight": "410 g",
"volume": "1L",
"price": 3000,
"to_hit": -4,
@@ -2900,7 +2875,7 @@
"description": "An armor plating made of a very thick steel, specifically engineered for use in a bullet resistant vest.",
"price": 10000,
"material": "hardsteel",
- "weight": 1500,
+ "weight": "1500 g",
"volume": "500 ml",
"bashing": 6
},
@@ -2914,7 +2889,7 @@
"description": "A steel armor plate, specifically engineered for use in a bullet resistant vest.",
"price": 9000,
"material": "steel",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "500 ml",
"bashing": 5
},
@@ -2928,7 +2903,7 @@
"description": "A small lock, with a set of keys still inserted.",
"price": 500,
"material": "steel",
- "weight": 5,
+ "weight": "5 g",
"volume": "250 ml",
"bashing": 1
},
@@ -2940,7 +2915,7 @@
"name": "in progress craft",
"description": "This is an in progress craft.",
"price": 0,
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"max_charges": 20,
"use_action": "CRAFT",
@@ -2956,7 +2931,7 @@
"description": "A bumper mounted rig for attaching and storing a spare tire on the back of a vehicle. Combine it with a wheel to get a mountable piece.",
"price": 3500,
"material": "steel",
- "weight": 5000,
+ "weight": "5000 g",
"volume": "5 L",
"bashing": 8
},
@@ -2970,7 +2945,7 @@
"name": "welding component kit",
"description": "A set of components useful for constructing a full-featured welding station, complete with soldering capability.",
"price": 9000,
- "weight": 4500,
+ "weight": "4500 g",
"volume": "3 L",
"bashing": 8
},
@@ -2984,7 +2959,7 @@
"price": 25000,
"price_postapoc": 2000,
"material": [ "steel", "plastic", "wood" ],
- "weight": 11339,
+ "weight": "11339 g",
"volume": "3 L"
},
{
@@ -2997,7 +2972,7 @@
"description": "A broken turret. Much less threatening now that it's laid limp on solid ground. Could be gutted for parts.",
"price": 1000,
"material": [ "steel", "plastic" ],
- "weight": 62650,
+ "weight": "62650 g",
"volume": "30 L",
"bashing": 4,
"cutting": 4,
@@ -3009,8 +2984,17 @@
"id": "broken_turret_rifle",
"symbol": ",",
"color": "green",
- "name": "broken milspec turret",
- "weight": 70000,
+ "name": "broken M249 autonomous CROWS II",
+ "weight": "70000 g",
+ "copy-from": "broken_turret"
+ },
+ {
+ "type": "GENERIC",
+ "id": "broken_crows_m240",
+ "symbol": ",",
+ "color": "green",
+ "name": "broken M240 autonomous CROWS II",
+ "weight": "70000 g",
"copy-from": "broken_turret"
},
{
@@ -3018,8 +3002,8 @@
"id": "broken_turret_bmg",
"symbol": ",",
"color": "green",
- "name": "broken antimateriel turret",
- "weight": 100000,
+ "name": "broken M2 autonomous CROWS II",
+ "weight": "100000 g",
"copy-from": "broken_turret"
},
{
@@ -3028,7 +3012,7 @@
"symbol": ",",
"color": "green",
"name": "broken laser turret",
- "weight": 110000,
+ "weight": "110000 g",
"copy-from": "broken_turret"
},
{
@@ -3041,7 +3025,24 @@
"description": "A broken secubot, with its casing broken and fluid drained. Could be gutted for parts.",
"price": 1000,
"material": [ "steel", "plastic" ],
- "weight": 100000,
+ "weight": "100000 g",
+ "volume": "65000 ml",
+ "bashing": 4,
+ "cutting": 4,
+ "to_hit": -3,
+ "flags": [ "TRADER_AVOID", "NO_REPAIR" ]
+ },
+ {
+ "type": "GENERIC",
+ "id": "broken_talon_m202a1",
+ "symbol": ",",
+ "color": "green",
+ "name": "broken M202A1 TALON",
+ "category": "other",
+ "description": "A broken TALON UGV, with its casing broken and fluid drained. Could be gutted for parts.",
+ "price": 1000,
+ "material": [ "steel", "plastic" ],
+ "weight": "100000 g",
"volume": "65000 ml",
"bashing": 4,
"cutting": 4,
@@ -3058,7 +3059,7 @@
"description": "A reinforced brick designed to withstand intense heat.",
"price": 2500,
"material": [ "clay", "stone" ],
- "weight": 969,
+ "weight": "969 g",
"volume": "500 ml",
"bashing": 8,
"to_hit": -2,
diff --git a/data/json/items/generic/ammolink.json b/data/json/items/generic/ammolink.json
index e6e2234d3f819..7d08013a2769f 100644
--- a/data/json/items/generic/ammolink.json
+++ b/data/json/items/generic/ammolink.json
@@ -5,7 +5,7 @@
"category": "spare_parts",
"name": "ammo belt linkage",
"description": "A small metal linkage from a disintegrating ammo belt.",
- "weight": 2,
+ "weight": "2 g",
"volume": "2ml",
"stackable": true,
"material": "steel",
@@ -32,7 +32,7 @@
"copy-from": "ammolink",
"type": "GENERIC",
"name": "40mm grenade belt linkage",
- "weight": 10,
+ "weight": "10 g",
"volume": "10ml",
"use_action": { "type": "ammobelt", "belt": "belt40mm" }
},
diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json
index d52ccb6c33167..e278185091429 100644
--- a/data/json/items/generic/casing.json
+++ b/data/json/items/generic/casing.json
@@ -16,7 +16,7 @@
"type": "GENERIC",
"name": ".223 casing",
"description": "An empty casing from a .223 round.",
- "weight": 5,
+ "weight": "5 g",
"volume": "5ml"
},
{
@@ -25,7 +25,7 @@
"type": "GENERIC",
"name": ".22 LR casing",
"description": "An empty casing from a .22 LR round. These can't be hand-reloaded.",
- "weight": 2,
+ "weight": "2 g",
"volume": "3ml"
},
{
@@ -34,7 +34,7 @@
"type": "GENERIC",
"name": ".30-06 casing",
"description": "An empty casing from a .30-06 round.",
- "weight": 7,
+ "weight": "7 g",
"volume": "10ml"
},
{
@@ -43,7 +43,7 @@
"type": "GENERIC",
"name": ".270 Winchester casing",
"description": "An empty casing from a .270 Winchester round.",
- "weight": 7,
+ "weight": "7 g",
"volume": "10ml"
},
{
@@ -52,7 +52,7 @@
"type": "GENERIC",
"name": ".300 Win Mag casing",
"description": "An empty casing from a .300 Winchester Magnum round.",
- "weight": 7,
+ "weight": "7 g",
"volume": "10ml"
},
{
@@ -61,7 +61,7 @@
"type": "GENERIC",
"name": ".308 casing",
"description": "An empty casing from a .308 round.",
- "weight": 6,
+ "weight": "6 g",
"volume": "9ml"
},
{
@@ -70,7 +70,7 @@
"type": "GENERIC",
"name": "7.62x51mm casing",
"description": "An empty casing from a 7.62x51mm M80 round.",
- "weight": 6,
+ "weight": "6 g",
"volume": "9ml"
},
{
@@ -79,7 +79,7 @@
"type": "GENERIC",
"name": ".32 ACP casing",
"description": "An empty casing from a .32 ACP round.",
- "weight": 2,
+ "weight": "2 g",
"volume": "3ml"
},
{
@@ -88,7 +88,7 @@
"type": "GENERIC",
"name": ".38 Special casing",
"description": "An empty casing from a .38 Special round.",
- "weight": 3,
+ "weight": "3 g",
"volume": "4ml"
},
{
@@ -97,7 +97,7 @@
"type": "GENERIC",
"name": ".38 Super casing",
"description": "An empty casing from a .38 Super round.",
- "weight": 3,
+ "weight": "3 g",
"volume": "4ml"
},
{
@@ -106,7 +106,7 @@
"type": "GENERIC",
"name": ".40 S&W casing",
"description": "An empty casing from a .40 S&W round.",
- "weight": 3,
+ "weight": "3 g",
"volume": "5ml"
},
{
@@ -115,7 +115,7 @@
"type": "GENERIC",
"name": "10mm Auto casing",
"description": "An empty casing from a 10mm Auto round.",
- "weight": 3,
+ "weight": "3 g",
"volume": "5ml"
},
{
@@ -124,7 +124,7 @@
"category": "spare_parts",
"name": "40mm canister",
"description": "A large canister from a spent 40mm grenade.",
- "weight": 50,
+ "weight": "50 g",
"volume": "25ml",
"material": "steel",
"symbol": "=",
@@ -136,7 +136,7 @@
"type": "GENERIC",
"name": ".44 Magnum casing",
"description": "An empty casing from a .44 Magnum round.",
- "weight": 4,
+ "weight": "4 g",
"volume": "6ml"
},
{
@@ -145,7 +145,7 @@
"type": "GENERIC",
"name": ".454 Casull casing",
"description": "An empty casing from a .454 Casull round.",
- "weight": 7,
+ "weight": "7 g",
"volume": "10ml"
},
{
@@ -154,7 +154,7 @@
"type": "GENERIC",
"name": ".45 ACP casing",
"description": "An empty casing from a .45 ACP round.",
- "weight": 4,
+ "weight": "4 g",
"volume": "6ml"
},
{
@@ -163,7 +163,7 @@
"type": "GENERIC",
"name": ".45 Colt casing",
"description": "An empty casing from a .45 Colt round.",
- "weight": 4,
+ "weight": "4 g",
"volume": "6ml"
},
{
@@ -172,7 +172,7 @@
"type": "GENERIC",
"name": ".45-70 casing",
"description": "An empty casing from a .45-70 Government round.",
- "weight": 4,
+ "weight": "4 g",
"volume": "10ml"
},
{
@@ -181,7 +181,7 @@
"type": "GENERIC",
"name": "4.6x30mm casing",
"description": "An empty casing from a 4.6x30mm round.",
- "weight": 2,
+ "weight": "2 g",
"volume": "3ml"
},
{
@@ -190,7 +190,7 @@
"type": "GENERIC",
"name": ".460 Rowland casing",
"description": "An empty casing from a .460 Rowland round. It looks deceptively like a .45ACP casing.",
- "weight": 4,
+ "weight": "4 g",
"volume": "6ml"
},
{
@@ -199,7 +199,7 @@
"type": "GENERIC",
"name": "5x50mm hull",
"description": "An empty plastic hull from a 5x50mm flechette round.",
- "weight": 1,
+ "weight": "1 g",
"volume": "5ml",
"material": "plastic",
"color": "light_green"
@@ -210,7 +210,7 @@
"type": "GENERIC",
"name": ".500 S&W Magnum casing",
"description": "An empty casing from a .500 S&W Magnum round.",
- "weight": 7,
+ "weight": "7 g",
"volume": "10ml"
},
{
@@ -219,7 +219,7 @@
"type": "GENERIC",
"name": ".50 BMG casing",
"description": "An empty casing from a .50 BMG round. These are rare, so you might want to hold onto these.",
- "weight": 18,
+ "weight": "18 g",
"volume": "12ml"
},
{
@@ -228,7 +228,7 @@
"type": "GENERIC",
"name": "5.45x39mm casing",
"description": "An empty casing from a 5.45x39mm round.",
- "weight": 4,
+ "weight": "4 g",
"volume": "7ml"
},
{
@@ -237,7 +237,7 @@
"type": "GENERIC",
"name": "5.7x28mm casing",
"description": "An empty casing from a 5.7x28mm round.",
- "weight": 2,
+ "weight": "2 g",
"volume": "3ml"
},
{
@@ -246,7 +246,7 @@
"type": "GENERIC",
"name": ".700 NX casing",
"description": "An empty casing from a .700 NX round. These are rare, so you might want to hold onto these.",
- "weight": 18,
+ "weight": "18 g",
"volume": "12ml"
},
{
@@ -255,7 +255,7 @@
"type": "GENERIC",
"name": "7.62x54mmR casing",
"description": "An empty casing from a 7.62x54mmR round.",
- "weight": 7,
+ "weight": "7 g",
"volume": "10ml"
},
{
@@ -264,7 +264,7 @@
"type": "GENERIC",
"name": "7.62x39mm casing",
"description": "An empty casing from a 7.62x39mm round.",
- "weight": 6,
+ "weight": "6 g",
"volume": "9ml"
},
{
@@ -273,7 +273,7 @@
"type": "GENERIC",
"name": "7.62x25mm casing",
"description": "An empty casing from a 7.62x25mm round.",
- "weight": 4,
+ "weight": "4 g",
"volume": "7ml"
},
{
@@ -282,7 +282,7 @@
"type": "GENERIC",
"name": "9x19mm casing",
"description": "An empty casing from a 9x19mm round.",
- "weight": 3,
+ "weight": "3 g",
"volume": "5ml"
},
{
@@ -291,7 +291,7 @@
"type": "GENERIC",
"name": ".357 SIG casing",
"description": "An empty casing from a .357 SIG round.",
- "weight": 3,
+ "weight": "3 g",
"volume": "5ml"
},
{
@@ -300,7 +300,7 @@
"type": "GENERIC",
"name": ".357 magnum casing",
"description": "An empty casing from a .357 magnum round.",
- "weight": 3,
+ "weight": "3 g",
"volume": "5ml"
},
{
@@ -309,7 +309,7 @@
"type": "GENERIC",
"name": "9x18mm casing",
"description": "An empty casing from a 9x18mm round.",
- "weight": 3,
+ "weight": "3 g",
"volume": "5ml"
},
{
@@ -318,7 +318,7 @@
"type": "GENERIC",
"name": ".380 ACP casing",
"description": "An empty casing from a .380 ACP round.",
- "weight": 3,
+ "weight": "3 g",
"volume": "5ml"
},
{
@@ -329,7 +329,7 @@
"color": "dark_gray",
"description": "An empty steel tube which once contained a 152mm ATGM. Now it's essentially just a huge pipe.",
"material": "steel",
- "weight": 9500,
+ "weight": "9500 g",
"volume": "7500 ml"
},
{
@@ -338,7 +338,7 @@
"category": "spare_parts",
"name": "shotgun hull",
"description": "An empty hull from a shotgun shell.",
- "weight": 8,
+ "weight": "8 g",
"volume": "12ml",
"stackable": true,
"material": "plastic",
@@ -352,7 +352,7 @@
"category": "spare_parts",
"name": ".410 hull",
"description": "An empty hull from a .410 shotgun shell.",
- "weight": 8,
+ "weight": "8 g",
"volume": "12ml",
"stackable": true,
"material": "plastic",
@@ -366,7 +366,7 @@
"type": "GENERIC",
"name": ".300BLK casing",
"description": "An empty casing from a .300 AAC Blackout round.",
- "weight": 6,
+ "weight": "6 g",
"volume": "9ml"
}
]
diff --git a/data/json/items/generic/currency.json b/data/json/items/generic/currency.json
index 78fd96a5dd74c..666d35ed9f6af 100644
--- a/data/json/items/generic/currency.json
+++ b/data/json/items/generic/currency.json
@@ -7,7 +7,7 @@
"price": 5000,
"price_postapoc": 320,
"//": "$50 bills have substantial pre-Cataclysm value, but are worth 1 meat jerky",
- "weight": 1,
+ "weight": "1 g",
"to_hit": -3,
"color": "white",
"symbol": "$",
@@ -21,7 +21,7 @@
"price": 90000,
"price_postapoc": 5000,
"//": "Low carat gold alloy for hardness, but it's still the best part of an ounce of gold. Yes, the weight is correct for the volume.",
- "weight": 28,
+ "weight": "28 g",
"to_hit": -3,
"color": "brown",
"symbol": "$",
@@ -35,7 +35,7 @@
"description": "This is a coin that has been flattened in a novelty coin flattening machine. The machine has been somewhat crudely altered so that the design - which appears to once have been Mickey Mouse - is overlayed with a handwritten emblem of a book. There is some text that faintly reads 'Campus Exchange Token'.",
"price": 5,
"price_postapoc": 320,
- "weight": 18,
+ "weight": "18 g",
"to_hit": -3,
"color": "brown",
"symbol": "$",
@@ -48,7 +48,7 @@
"description": "This is a slip of paper signed by the issuer.",
"price": 5,
"price_postapoc": 320,
- "weight": 1,
+ "weight": "1 g",
"to_hit": -3,
"color": "white",
"symbol": "$",
diff --git a/data/json/items/generic/dining_kitchen.json b/data/json/items/generic/dining_kitchen.json
index e78fa69d59fb5..3e2ee89af1b28 100644
--- a/data/json/items/generic/dining_kitchen.json
+++ b/data/json/items/generic/dining_kitchen.json
@@ -8,7 +8,7 @@
"color": "light_gray",
"price": 100,
"price_postapoc": 0,
- "weight": 48,
+ "weight": "48 g",
"volume": "25 ml",
"material": "steel",
"bashing": 2,
@@ -24,7 +24,7 @@
"color": "light_gray",
"price": 200,
"price_postapoc": 0,
- "weight": 158,
+ "weight": "158 g",
"volume": "75 ml",
"material": "steel",
"bashing": 3,
@@ -40,7 +40,7 @@
"color": "light_gray",
"price": 10,
"price_postapoc": 0,
- "weight": 28,
+ "weight": "28 g",
"volume": "25 ml",
"material": "plastic",
"bashing": 1,
@@ -57,7 +57,7 @@
"price": 1200,
"price_postapoc": 0,
"material": "ceramic",
- "weight": 322,
+ "weight": "322 g",
"volume": "250 ml",
"bashing": 3,
"to_hit:": -1
@@ -72,7 +72,7 @@
"price": 1400,
"price_postapoc": 0,
"material": "glass",
- "weight": 322,
+ "weight": "322 g",
"volume": "250 ml",
"bashing": 3,
"to_hit:": -1
@@ -87,7 +87,7 @@
"price": 400,
"price_postapoc": 0,
"material": "tin",
- "weight": 262,
+ "weight": "262 g",
"volume": "250 ml",
"bashing": 2,
"to_hit:": -1
@@ -102,7 +102,7 @@
"price": 400,
"price_postapoc": 0,
"material": "plastic",
- "weight": 130,
+ "weight": "130 g",
"volume": "250 ml",
"bashing": 1,
"to_hit:": -1
@@ -521,7 +521,7 @@
"color": "light_gray",
"price": 100,
"price_postapoc": 0,
- "weight": 28,
+ "weight": "28 g",
"volume": "15 ml",
"material": "wood",
"bashing": 1,
@@ -601,7 +601,7 @@
"id": "rolling_pin",
"name": "rolling pin",
"description": "A stout piece of hardwood, turned and sanded smooth, with rounded handles at the ends. This timeless kitchen tool also doubles as a very effective club.",
- "weight": 725,
+ "weight": "725 g",
"to_hit": 1,
"color": "brown",
"symbol": "/",
@@ -621,7 +621,7 @@
"copy-from": "base_cookpot",
"material": "steel",
"color": "light_gray",
- "weight": 550,
+ "weight": "550 g",
"volume": "2 L",
"bashing": 6,
"container_data": { "contains": "2 L", "watertight": true }
@@ -635,7 +635,7 @@
"copy-from": "base_cookpot",
"material": "iron",
"color": "dark_gray",
- "weight": 3000,
+ "weight": "3000 g",
"volume": "2 L",
"bashing": 10,
"container_data": { "contains": "2 L", "watertight": true }
@@ -649,7 +649,7 @@
"copy-from": "base_cookpot",
"material": "copper",
"color": "light_red",
- "weight": 750,
+ "weight": "750 g",
"volume": "2 L",
"bashing": 6,
"container_data": { "contains": "2 L", "watertight": true }
@@ -663,7 +663,7 @@
"copy-from": "base_cookpot",
"material": "ceramic",
"color": "white",
- "weight": 650,
+ "weight": "650 g",
"volume": "2 L",
"bashing": 4,
"container_data": { "contains": "2 L", "watertight": true }
@@ -677,7 +677,7 @@
"copy-from": "base_cookpot",
"material": "steel",
"color": "light_gray",
- "weight": 2490,
+ "weight": "2490 g",
"volume": "9 L",
"//": "Volume assumes you can stick some stuff in the pot inside your bag",
"bashing": 8,
@@ -689,7 +689,7 @@
"category": "tools",
"name": "canning pot",
"description": "A very large 25 liter pot, primarily meant for canning food in glass jars via the water bath method, though it can cook normal foods just as well. Canning foods with it will require a lot of water. If you're only canning a couple of jars at a time, you'd fill it up with rocks or something to displace the water above the lids.",
- "weight": 5625,
+ "weight": "5625 g",
"volume": "25 L",
"price": 20000,
"to_hit": -2,
@@ -711,7 +711,7 @@
"material": "iron",
"color": "dark_gray",
"proportional": { "to_hit": 2 },
- "weight": 2628,
+ "weight": "2628 g",
"volume": "1 L",
"bashing": 12,
"container_data": { "contains": "1 L", "watertight": true },
@@ -728,7 +728,7 @@
"material": "steel",
"color": "light_gray",
"proportional": { "to_hit": 2 },
- "weight": 528,
+ "weight": "528 g",
"volume": "1 L",
"bashing": 8,
"container_data": { "contains": "2 L", "watertight": true },
@@ -745,7 +745,7 @@
"material": "copper",
"color": "light_red",
"proportional": { "to_hit": 2 },
- "weight": 628,
+ "weight": "628 g",
"volume": "1 L",
"bashing": 7,
"container_data": { "contains": "1 L", "watertight": true },
@@ -758,7 +758,7 @@
"category": "tools",
"name": "makeshift pot",
"description": "A sheet of metal crudely hammered into a cooking pot. Good enough to cook food and boil water, but not as useful as proper cookware.",
- "weight": 6000,
+ "weight": "6000 g",
"volume": "1 L",
"price": 200,
"price_postapoc": 5,
@@ -777,7 +777,7 @@
"category": "tools",
"name": "makeshift copper pot",
"description": "A cooking pot crudely hammered out of copper. Good enough to cook food and boil water, but not as useful as proper cookware.",
- "weight": 884,
+ "weight": "884 g",
"volume": "1 L",
"price": 200,
"price_postapoc": 5,
@@ -799,7 +799,7 @@
"copy-from": "base_cookpot",
"material": "steel",
"color": "light_gray",
- "weight": 728,
+ "weight": "728 g",
"volume": "1500 ml",
"bashing": 5,
"container_data": { "contains": "1500 ml", "watertight": true },
@@ -834,7 +834,7 @@
"category": "other",
"name": "cutting board",
"description": "A large flat piece of wood for chopping vegetables on without ruining your knife or your countertop.",
- "weight": 945,
+ "weight": "945 g",
"to_hit": -1,
"color": "brown",
"symbol": "/",
diff --git a/data/json/items/generic/spares.json b/data/json/items/generic/spares.json
index 9d74f72bc0a8c..7814edabf8aa4 100644
--- a/data/json/items/generic/spares.json
+++ b/data/json/items/generic/spares.json
@@ -16,7 +16,7 @@
"name": "drive belt",
"description": "A synthetic rubber V-belt with steel reinforcement fibers commonly fitted to engines or other industrial equipment.",
"material": [ "plastic", "steel" ],
- "weight": 850,
+ "weight": "850 g",
"volume": "500 ml",
"price": 1200
},
@@ -27,7 +27,7 @@
"name": "makeshift drive belt",
"description": "An improvised belt useful for repairing engines or other industrial equipment when no better alternative is available.",
"material": [ "cotton", "leather" ],
- "weight": 1250,
+ "weight": "1250 g",
"volume": "750 ml",
"price": 200
},
@@ -38,7 +38,7 @@
"name": "air filter",
"description": "A plastic box containing crêped paper used to filter the air supply for combustion engines or other industrial equipment.",
"material": [ "plastic", "paper" ],
- "weight": 360,
+ "weight": "360 g",
"volume": "500 ml",
"price": 1900
},
@@ -49,7 +49,7 @@
"name": "makeshift air filter",
"description": "An improvised air filter useful for repairing engines or other industrial equipment when no better alternative is available.",
"material": [ "plastic", "paper" ],
- "weight": 480,
+ "weight": "480 g",
"volume": "750 ml",
"price": 200
},
@@ -60,7 +60,7 @@
"name": "automotive filter",
"description": "A steel can containing filter paper designed for automotive use.",
"material": [ "steel", "paper" ],
- "weight": 480,
+ "weight": "480 g",
"volume": "500 ml",
"price": 1900
},
@@ -71,7 +71,7 @@
"name": "makeshift automotive filter",
"description": "An improvised automotive filter useful for repairing engines or other industrial equipment when no better alternative is available.",
"material": [ "steel", "paper" ],
- "weight": 690,
+ "weight": "690 g",
"volume": "750 ml",
"price": 200
},
@@ -82,7 +82,7 @@
"name": "glow plug",
"description": "A cylindrical heating device designed to be screwed in to a diesel engine to aid starting in cold weather.",
"material": [ "plastic", "copper" ],
- "weight": 260,
+ "weight": "260 g",
"volume": "250 ml",
"price": 2300
},
@@ -93,7 +93,7 @@
"name": "high-pressure pump",
"description": "An complex mechanical pump capable of achieving high pressures. Far beyond anything you could reasonably improvise.",
"material": "iron",
- "weight": 2800,
+ "weight": "2800 g",
"volume": "1250 ml",
"price": 28900
},
@@ -104,7 +104,7 @@
"name": "mechanical pump",
"description": "An simple cast iron mechanical impeller pump. It's not good for much of anything on its own.",
"material": "iron",
- "weight": 2400,
+ "weight": "2400 g",
"volume": "1 L",
"price": 1800
}
diff --git a/data/json/items/generic/string.json b/data/json/items/generic/string.json
index e2462ac8e19d2..4245e49612ac5 100644
--- a/data/json/items/generic/string.json
+++ b/data/json/items/generic/string.json
@@ -5,7 +5,7 @@
"category": "spare_parts",
"name": "small string",
"description": "A 6-inch long piece of cotton string.",
- "weight": 6,
+ "weight": "6 g",
"volume": "10ml",
"price": 10,
"material": "cotton",
@@ -78,6 +78,6 @@
"health": -20,
"volume": "1 L",
"stack_size": 10,
- "weight": 80
+ "weight": "80 g"
}
]
diff --git a/data/json/items/generic/toys_and_sports.json b/data/json/items/generic/toys_and_sports.json
index 0fdb1db4b1cc7..b28140f1c4e9d 100644
--- a/data/json/items/generic/toys_and_sports.json
+++ b/data/json/items/generic/toys_and_sports.json
@@ -4,7 +4,7 @@
"type": "TOOL",
"name": "talking doll",
"description": "This is a talking doll, meant for children. Fortunately it still works, and you could unload the batteries out of it.",
- "weight": 907,
+ "weight": "907 g",
"volume": "750 ml",
"price": 2000,
"to_hit": -1,
@@ -19,13 +19,13 @@
[
"battery",
[
+ "light_minus_disposable_cell",
+ "light_disposable_cell",
"light_minus_battery_cell",
"light_battery_cell",
"light_plus_battery_cell",
"light_atomic_battery_cell",
- "light_minus_atomic_battery_cell",
- "light_minus_disposable_cell",
- "light_disposable_cell"
+ "light_minus_atomic_battery_cell"
]
]
],
@@ -36,7 +36,7 @@
"type": "TOOL",
"name": "talking doll",
"description": "This is a talking doll, meant for children. Fortunately it still works, and you could unload the batteries out of it.",
- "weight": 907,
+ "weight": "907 g",
"volume": "750 ml",
"price": 2000,
"to_hit": -1,
@@ -51,13 +51,13 @@
[
"battery",
[
+ "light_minus_disposable_cell",
+ "light_disposable_cell",
"light_minus_battery_cell",
"light_battery_cell",
"light_plus_battery_cell",
"light_atomic_battery_cell",
- "light_minus_atomic_battery_cell",
- "light_minus_disposable_cell",
- "light_disposable_cell"
+ "light_minus_atomic_battery_cell"
]
]
],
@@ -73,7 +73,7 @@
"description": "A baseball, good for throwing at enemies. Getting hit with one of these hurts a lot more than you might think.",
"price": 1000,
"material": "leather",
- "weight": 150,
+ "weight": "150 g",
"volume": "250 ml",
"bashing": 6,
"to_hit": 3
@@ -88,7 +88,7 @@
"description": "An oval made of leather and string, it's easily thrown but does little damage. You could take it apart into leather if you wanted.",
"price": 1000,
"material": "leather",
- "weight": 400,
+ "weight": "400 g",
"volume": "750 ml",
"bashing": 4,
"to_hit": -1
@@ -103,7 +103,7 @@
"description": "A high-quality indoor basketball. You may throw it at zombies.",
"price": 1200,
"material": "leather",
- "weight": 800,
+ "weight": "800 g",
"volume": "1 L",
"bashing": 6,
"to_hit": -1
@@ -118,7 +118,7 @@
"description": "A heavy circular block of solid rubber, normally used for playing hockey. You can throw it to cause some serious harm.",
"price": 1000,
"material": "plastic",
- "weight": 170,
+ "weight": "170 g",
"volume": "250 ml",
"bashing": 7,
"to_hit": 2
diff --git a/data/json/items/grenades.json b/data/json/items/grenades.json
index 9ea91b6f512a3..db1eab4e9eda1 100644
--- a/data/json/items/grenades.json
+++ b/data/json/items/grenades.json
@@ -5,7 +5,7 @@
"category": "weapons",
"name": "grenade",
"description": "This is a military-grade fragmentary hand grenade. Use this item to pull the pin and light the fuse. You will then have five turns before it explodes; throwing it would be a good idea.",
- "weight": 397,
+ "weight": "397 g",
"volume": "250 ml",
"price": 1500,
"to_hit": -1,
@@ -29,7 +29,7 @@
"category": "weapons",
"name": "active grenade",
"description": "This is an active grenade, and will explode any second now. Better throw it!",
- "weight": 397,
+ "weight": "397 g",
"volume": "250 ml",
"price": 0,
"to_hit": -1,
@@ -55,7 +55,7 @@
"type": "TOOL",
"name": "makeshift grenade",
"description": "An improvised explosive device cobbled together from parts. Use this item to pull the pin and light the fuse. You will then have some amount of time before it explodes; throwing it would be a good idea.",
- "weight": 350,
+ "weight": "350 g",
"price": 750,
"material": [ "aluminum", "iron" ],
"symbol": "*",
@@ -97,7 +97,7 @@
"category": "weapons",
"name": "incendiary grenade",
"description": "This is a military-grade incendiary hand grenade. Use this item to pull the pin and light the fuse. You will then have five turns before it explodes into a raging inferno; throwing it would be a good idea.",
- "weight": 180,
+ "weight": "180 g",
"volume": "250 ml",
"price": 2000,
"to_hit": -1,
@@ -121,7 +121,7 @@
"category": "weapons",
"name": "active incendiary grenade",
"description": "This is an active incendiary grenade, likely to burst into an inferno any second now. Better throw it!",
- "weight": 180,
+ "weight": "180 g",
"volume": "250 ml",
"price": 0,
"to_hit": -1,
@@ -142,7 +142,7 @@
"category": "weapons",
"name": "scrambler grenade",
"description": "This is a highly modified EMP grenade, designed to scramble robots' IFF control chips rather than destroy them. This converts the robot to your side for a short time, before the backup systems kick in. Use this item to pull the pin and light the fuse, turning it into an active scrambler grenade.",
- "weight": 500,
+ "weight": "500 g",
"volume": "250 ml",
"price": 6000,
"to_hit": -1,
@@ -166,7 +166,7 @@
"category": "weapons",
"name": "active scrambler grenade",
"description": "This scrambler grenade is active, and will soon detonate, releasing a control wave that temporarily converts robots to your side.",
- "weight": 500,
+ "weight": "500 g",
"volume": "250 ml",
"price": 0,
"to_hit": -1,
@@ -193,7 +193,7 @@
"type": "GENERIC",
"category": "weapons",
"name": "canister grenade",
- "weight": 1058,
+ "weight": "1058 g",
"volume": "250 ml",
"material": [ "steel" ],
"symbol": "*",
@@ -228,7 +228,7 @@
"name": "nail bomb",
"description": "A crude and bulky improvised fragmentation grenade. Use this item to light the fuse. You will then have five turns before it explodes; throwing it would be a good idea.",
"category": "weapons",
- "weight": 470,
+ "weight": "470 g",
"volume": "500 ml",
"bashing": 4,
"to_hit": 1,
diff --git a/data/json/items/gun/12mm.json b/data/json/items/gun/12mm.json
index 4047789e1006d..4f9b8a5f9511b 100644
--- a/data/json/items/gun/12mm.json
+++ b/data/json/items/gun/12mm.json
@@ -5,7 +5,7 @@
"type": "GUN",
"name": "H&K G80 Railgun",
"description": "Developed by Heckler & Koch in 2033, the railgun magnetically propels a ferromagnetic projectile using an alternating current. Powered by UPS.",
- "weight": 3914,
+ "weight": "3914 g",
"volume": "2750 ml",
"price": 1920000,
"to_hit": -1,
diff --git a/data/json/items/gun/20x66mm.json b/data/json/items/gun/20x66mm.json
index 062ff834ada05..2c903c1145e18 100644
--- a/data/json/items/gun/20x66mm.json
+++ b/data/json/items/gun/20x66mm.json
@@ -6,7 +6,7 @@
"reload_noise": "chuk chuk.",
"name": "RM120c shotgun",
"description": "Utilizing a powerful and unusual caliber, the Rivtech RM120c caseless pump-action shotgun was designed for hunting big game, with durability and ease of use as priorities.",
- "weight": 1880,
+ "weight": "1880 g",
"volume": "2250 ml",
"price": 310000,
"to_hit": -1,
@@ -41,7 +41,7 @@
"reload_noise_volume": 10,
"name": "RM20 autoshotgun",
"description": "Utilizing a powerful and unusual caliber, the Rivtech RM20 caseless automatic combat shotgun was designed with durability and overwhelming power in mind.",
- "weight": 2820,
+ "weight": "2820 g",
"volume": "1750 ml",
"price": 1320000,
"to_hit": -1,
@@ -75,7 +75,7 @@
"reload_noise_volume": 10,
"name": "RM228 PDW",
"description": "Chambering the powerful 20x66mm caseless shotgun cartridge, the Rivtech RM228 PDW was designed for the civilian personal defense market with durability and ease of use as priorities. While lauded for its small size and light weight, its hefty price tag kept it out of the reach of casual collectors.",
- "weight": 780,
+ "weight": "780 g",
"volume": "750 ml",
"price": 330000,
"to_hit": -2,
diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
index f80075afbbcae..026ad368bdf8d 100644
--- a/data/json/items/gun/22.json
+++ b/data/json/items/gun/22.json
@@ -6,7 +6,7 @@
"name": "American-180",
"name_plural": "American-180",
"description": "The American-180 is a submachine gun developed in the 1960's that fires .22 LR, unusual for an SMG. Though the round is low-powered, the high rate of fire and large magazine makes the 180 a formidable weapon.",
- "weight": 1840,
+ "weight": "1840 g",
"volume": "1250 ml",
"price": 163000,
"to_hit": -2,
@@ -44,7 +44,7 @@
"name": "Marlin 39A",
"name_plural": "Marlin 39A",
"description": "The oldest and longest-produced shoulder firearm in the world. Though it fires the weak .22 round, it is highly accurate and damaging, and has essentially no recoil.",
- "weight": 2948,
+ "weight": "2948 g",
"volume": "2500 ml",
"price": 23000,
"to_hit": -1,
@@ -82,7 +82,7 @@
"name": "Mossberg Brownie",
"name_plural": "Mossberg Brownie",
"description": "The first gun produced by O.F. Mossberg & Sons. A small pocket pistol, marketed to trappers during the early 20th century. Its four barrels can accept .22 Short and .22 LR cartridges.",
- "weight": 130,
+ "weight": "130 g",
"volume": "137ml",
"price": 110000,
"to_hit": -1,
@@ -113,7 +113,7 @@
"name": "pipe rifle: .22",
"name_plural": "pipe rifles: .22",
"description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
- "weight": 1953,
+ "weight": "1953 g",
"volume": "1750 ml",
"price": 10000,
"to_hit": -1,
@@ -148,7 +148,7 @@
"reload_noise_volume": 10,
"name": "RM360 rotary carbine",
"description": "This unusual Rivtech carbine features five rotating barrels and a large capacity helical magazine. Durable and easy to handle, it was designed to overcome the deficiencies of its low power .22LR cartridge by rapidly delivering a large number of projectiles.",
- "weight": 1620,
+ "weight": "1620 g",
"volume": "1 L",
"price": 180000,
"to_hit": -2,
@@ -184,7 +184,7 @@
"name": "Ruger 10/22",
"name_plural": "Ruger 10/22",
"description": "A combination of negligible recoil, high customization, and inexpensive ammunition made the Ruger 10/22 a popular choice among enthusiasts and small game hunters. Even though it fires the weak .22 round, it's perfectly capable of killing.",
- "weight": 2220,
+ "weight": "2220 g",
"volume": "2500 ml",
"price": 27000,
"to_hit": -1,
@@ -232,7 +232,7 @@
"name": "SIG Mosquito",
"name_plural": "SIG Mosquito",
"description": "A popular, small .22 LR pistol. One of the many polymer frame pistols produced during the latter 20th-early 21st centuries; it has an underbarrel rail.",
- "weight": 640,
+ "weight": "640 g",
"volume": "250 ml",
"price": 36000,
"to_hit": -2,
@@ -268,7 +268,7 @@
"name": "S&W 22A",
"name_plural": "S&W 22A",
"description": "A popular .22 pistol.",
- "weight": 900,
+ "weight": "900 g",
"volume": "500 ml",
"price": 35000,
"to_hit": -2,
@@ -287,7 +287,7 @@
"type": "GUN",
"name": "Jennings J-22",
"description": "One of the quintessential 'saturday night specials', the Jennings J-22 was very affordably priced with its injection molded zinc slide and frame. Intended to fill the void left after small pocket pistols were banned from import, these were more commonly used by criminals unfazed by their glaring safety issues.",
- "weight": 340,
+ "weight": "340 g",
"volume": "123ml",
"price": 7000,
"to_hit": -3,
@@ -305,7 +305,7 @@
"type": "GUN",
"name": "Walther P22",
"description": "The Walther P22 is a blowback operated semi-automatic pistol. It is about half the size of most Walthers. It is made mostly with plastic, with the slide and key components being made of die-cast zinc alloy",
- "weight": 480,
+ "weight": "480 g",
"volume": "263 ml",
"price": 8500,
"to_hit": -3,
diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index fcd9be7ff9a7e..f05dc5aea9cdc 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -5,7 +5,7 @@
"type": "GUN",
"name": "Remington ACR",
"description": "This carbine was developed for military use in the early 21st century. It is damaging and accurate, though its rate of fire is a bit slower than competing .223 carbines.",
- "weight": 3495,
+ "weight": "3495 g",
"volume": "2 L",
"price": 234300,
"to_hit": -1,
@@ -29,7 +29,7 @@
"name": "AR-15",
"//": "This is assumed to be the standard model matching the (currently not in-game) M16.",
"description": "This ubiquitous rifle is the forefather of M16 rifle series. It is lightweight and accurate, but will malfunction if not properly maintained. This one is a semi automatic civilian version.",
- "weight": 2815,
+ "weight": "2815 g",
"volume": "2 L",
"price": 125000,
"to_hit": -1,
@@ -49,7 +49,7 @@
"name": "HK416 A5",
"//": "*Current* milspec gear is now ridiculously overpriced, as seen with the M2010 IRL.",
"description": "Designed to replace the M4A1, the Heckler and Koch 416A5 features most of the former's strengths, while being considerably more durable.",
- "weight": 1920,
+ "weight": "1920 g",
"volume": "1750 ml",
"price": 540000,
"to_hit": -1,
@@ -70,7 +70,7 @@
"type": "GUN",
"name": "H&K G36",
"description": "Designed as a replacement for the early H&K G3 battle rifle, the G36 is more accurate, and uses the much-lighter .223 round, allowing for a higher ammo capacity.",
- "weight": 3270,
+ "weight": "3270 g",
"volume": "2500 ml",
"price": 210000,
"to_hit": -1,
@@ -92,7 +92,7 @@
"name_plural": "L2037 Backups",
"//": "Most real-life autorevolvers use 6-7.5 inch barrel, but this one's mentioned to be particularly massive.",
"description": "The logical extension of Leadworks' autorevolver series, this massive 'sidearm' fires 5.56 NATO to share ammo with a soldier's rifle. The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum. Similar to other Leadworks products it doesn't accept third-party modifications.",
- "weight": 2370,
+ "weight": "2370 g",
"volume": "750 ml",
"price": 267000,
"to_hit": -2,
@@ -118,7 +118,7 @@
"name": "L523 platform",
"//": "Current milspec, so Expensive.",
"description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next. The base mechanism could--theoretically--be used on its own, but such use is inadvisable and will void your warranty. There's no real place to incorporate aftermarket modifications on this barren proto-weapon.",
- "weight": 2500,
+ "weight": "2500 g",
"volume": "1500 ml",
"price": 350000,
"material": [ "steel", "plastic" ],
@@ -228,7 +228,7 @@
"type": "GUN",
"name": "M249",
"description": "The M249 is a mountable machine gun used by the US military and SWAT teams. Quite inaccurate and difficult to control, the M249 is designed to fire many rounds very quickly.",
- "weight": 6400,
+ "weight": "6400 g",
"volume": "3 L",
"price": 750000,
"to_hit": -1,
@@ -263,7 +263,7 @@
"type": "GUN",
"name": "M27 IAR",
"description": "A H&K416 carbine outfitted with a heavier barrel to enable higher amounts of suppressive fire while retaining a good degree of mobility.",
- "weight": 3495,
+ "weight": "3495 g",
"burst": 13,
"magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ],
"relative": { "ranged_damage": 1, "durability": 1 }
@@ -274,7 +274,7 @@
"type": "GUN",
"name": "M4A1",
"description": "A popular carbine, long used by the US military. Though accurate, small, and lightweight, it is infamous for its unreliability when not properly maintained.",
- "weight": 2520,
+ "weight": "2520 g",
"volume": "1750 ml",
"price": 240000,
"to_hit": -1,
@@ -289,6 +289,26 @@
"burst": 14,
"magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
},
+ {
+ "id": "m16a4",
+ "copy-from": "rifle_semi",
+ "type": "GUN",
+ "name": "M16A4",
+ "description": "The M16 is a very common assault rifle descended from the AR-15, used by militaries across the world for over 50 years. It is a gas operated, rotating bolt rifle known for its accuracy and controllable recoil.",
+ "weight": "2890 g",
+ "volume": "1750 ml",
+ "price": 240000,
+ "to_hit": -1,
+ "bashing": 12,
+ "material": [ "steel", "plastic" ],
+ "symbol": "(",
+ "color": "dark_gray",
+ "ammo": "223",
+ "dispersion": 150,
+ "durability": 7,
+ "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3rd burst", 3 ] ],
+ "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
+ },
{
"id": "rifle_223",
"copy-from": "gun_base",
@@ -296,7 +316,7 @@
"name": "pipe rifle: .223",
"name_plural": "pipe rifles: .223",
"description": "A homemade rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
- "weight": 4080,
+ "weight": "4080 g",
"volume": "3 L",
"price": 110000,
"to_hit": -1,
@@ -331,7 +351,7 @@
"type": "GUN",
"name": "Ruger Mini-14",
"description": "A small, lightweight semi-auto carbine designed for civilian and police use. Its superb accuracy and low recoil makes it more suitable than full-auto rifles for some situations.",
- "weight": 2800,
+ "weight": "2800 g",
"volume": "2 L",
"price": 92100,
"to_hit": -1,
@@ -366,7 +386,7 @@
"type": "GUN",
"name": "FN SCAR-L",
"description": "A highly accurate and modular assault rifle specially designed for the United States Special Operations Command. The 'L' in its name stands for light, as it uses the lightweight .223 round.",
- "weight": 2960,
+ "weight": "2960 g",
"volume": "2250 ml",
"price": 280000,
"to_hit": -1,
@@ -387,7 +407,7 @@
"type": "GUN",
"name": "SIG 552",
"description": "A compact selective fire automatic rifle designed for the Swiss military. It features a three-round burst mode and an integrated folding stock.",
- "weight": 3200,
+ "weight": "3200 g",
"volume": "1750 ml",
"price": 320000,
"to_hit": -1,
@@ -406,7 +426,7 @@
"type": "GUN",
"name": "Steyr AUG",
"description": "The Steyr AUG is an Austrian assault rifle that uses a bullpup design. It is used in the armed forces and police forces of many nations, and enjoys low recoil and high accuracy.",
- "weight": 3184,
+ "weight": "3184 g",
"volume": "1500 ml",
"price": 490000,
"to_hit": -1,
@@ -442,7 +462,7 @@
"name": "handmade carbine",
"//": "It's smaller than an M4A1, plus it's a homemade firearm.",
"description": "A well-designed improvised carbine with a shortened barrel. Accepting crude detachable magazines or STANAG magazines, this is one of the better homemade weapons.",
- "weight": 1950,
+ "weight": "1950 g",
"volume": "1500 ml",
"price": 10000,
"to_hit": -1,
diff --git a/data/json/items/gun/270win.json b/data/json/items/gun/270win.json
index 17c4a8ddafc3c..4b8566ed7a710 100644
--- a/data/json/items/gun/270win.json
+++ b/data/json/items/gun/270win.json
@@ -5,7 +5,7 @@
"type": "GUN",
"name": "Remington 700",
"description": "A classic bolt action rifle chambered for .270 Winchester, very polular among hunters. This is a CDL SF model with a forged, fluted, 416 stainless steel barrel threaded into the receiver and a recessed bolt face. It has checkered walnut furniture and a recoil pad to reduce perceived recoil.",
- "weight": 4080,
+ "weight": "4080 g",
"volume": "3 L",
"price": 112600,
"to_hit": -1,
diff --git a/data/json/items/gun/300.json b/data/json/items/gun/300.json
index 0158ca8fb77e5..84d5c6c9ce48f 100644
--- a/data/json/items/gun/300.json
+++ b/data/json/items/gun/300.json
@@ -7,7 +7,7 @@
"name_plural": "M2010 ESR",
"//": "http://www.guns.com/2012/05/17/remington-xm2010-army-sniper-system-esr-now-in-stores/.",
"description": "A bolt-action, box-magazine-fed, sniper rifle chambered in the powerful .300 Winchester Magnum round. The M2010 had completely replaced the M24 rifle series by 2017.",
- "weight": 4002,
+ "weight": "4002 g",
"volume": "2750 ml",
"price": 1701000,
"to_hit": -1,
@@ -28,7 +28,7 @@
"name_plural": "Weatherby Mark V",
"//": "MSRP, believe it or not.",
"description": "The Weatherby Mark V is one of the finest bolt action rifles. Designed in 1955 by Roy Weatherby and Fred Jennie, it has a strong action designed to safely fire high-pressure cartridges. These rifles were presented to celebrities as part of a marketing campaign.",
- "weight": 4200,
+ "weight": "4200 g",
"volume": "3 L",
"price": 259500,
"to_hit": -1,
@@ -49,7 +49,7 @@
"name": "Winchester Model 70",
"name_plural": "Winchester Model 70",
"description": "The Winchester Model 70 is a bolt action sporting rifle. It has an iconic place in American sporting culture and has been held in high regard by shooters since it was introduced in 1936.",
- "weight": 4100,
+ "weight": "4100 g",
"volume": "3 L",
"price": 46000,
"to_hit": -1,
diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json
index c68b4c552f83d..339c343b332b6 100644
--- a/data/json/items/gun/3006.json
+++ b/data/json/items/gun/3006.json
@@ -6,7 +6,7 @@
"name": "Browning BLR",
"name_plural": "Browning BLR",
"description": "A highly accurate lever-action hunting rifle chambered for the powerful .30-06 round. Notable for using a detachable magazine instead of a traditional tube.",
- "weight": 3135,
+ "weight": "3135 g",
"volume": "3 L",
"price": 85000,
"to_hit": -1,
@@ -43,7 +43,7 @@
"reload_noise_volume": 10,
"name": "M1 Garand",
"description": "A semi-automatic .30-06 battle rifle, developed to replace the M1903 Springfield. It didn't completely supplant the older bolt-action until after World War II.",
- "weight": 4280,
+ "weight": "4280 g",
"volume": "2500 ml",
"price": 90000,
"to_hit": -1,
@@ -78,7 +78,7 @@
"type": "GUN",
"name": "M1903 Springfield",
"description": "A powerful military rifle chambered in .30-06, developed to replace the US Army's older Krag rifle. Served as the main American rifle in World War I, was used alongside the M1 Garand in World War II, and was used as a sniper rifle as late as the Vietnam War.",
- "weight": 4080,
+ "weight": "4080 g",
"volume": "3 L",
"price": 80000,
"to_hit": -1,
@@ -113,7 +113,7 @@
"reload_noise_volume": 10,
"name": "Browning Automatic Rifle",
"description": "Designed near the end of World War I, the BAR provided fire support for the US Army from World War II all the way to the Vietnam War. Too much firepower to serve as a battle rifle, but not enough to be an ideal light machine gun, it still found a niche on the battlefield.",
- "weight": 7050,
+ "weight": "7050 g",
"volume": "2500 ml",
"price": 350000,
"to_hit": -1,
@@ -150,7 +150,7 @@
"name": "Remington 700",
"name_plural": "Remington 700",
"description": "A very popular and durable hunting or sniping rifle. Popular among SWAT and US Marine snipers. Highly damaging, but perhaps not as accurate as the competing Browning BLR.",
- "weight": 4080,
+ "weight": "4080 g",
"volume": "3 L",
"price": 87000,
"to_hit": -1,
@@ -172,7 +172,7 @@
"name_plural": "pipe rifles: .30-06",
"//": "It's the same size as the others, but it's still a scrap weapon.",
"description": "A homemade rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
- "weight": 4080,
+ "weight": "4080 g",
"volume": "3 L",
"price": 110000,
"to_hit": -1,
diff --git a/data/json/items/gun/300BLK.json b/data/json/items/gun/300BLK.json
index cb8ef67564906..269ebfe923e82 100644
--- a/data/json/items/gun/300BLK.json
+++ b/data/json/items/gun/300BLK.json
@@ -5,7 +5,7 @@
"type": "GUN",
"name": "Remington ACR .300BLK",
"description": "This carbine was developed for military use in the early 21st century. It is damaging and accurate, though its rate of fire is a bit slower than competing carbines. This version is chambered for the .300 AAC Blackout round.",
- "weight": 3495,
+ "weight": "3495 g",
"volume": "2 L",
"price": 234300,
"to_hit": -1,
@@ -28,7 +28,7 @@
"type": "GUN",
"name": "IWI Tavor X95 .300BLK",
"description": "The IWI Tavor X95 (also called Micro-Tavor or MTAR) is an Israeli bullpup assault rifle designed and produced by Israel Weapon Industries. This is the civilian version chambered for .300 AAC Blackout.",
- "weight": 3400,
+ "weight": "3400 g",
"volume": "1500 ml",
"price": 490000,
"to_hit": -1,
@@ -63,7 +63,7 @@
"name": "AR-15",
"//": "This is assumed to be the standard model matching the (currently not in-game) M16.",
"description": "This ubiquitous rifle is the forefather of M16 rifle series. It is lightweight and accurate, but will malfunction if not properly maintained. This one is a semi automatic civilian version.",
- "weight": 2815,
+ "weight": "2815 g",
"volume": "2 L",
"price": 125000,
"to_hit": -1,
diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json
index c73774aefd34b..9a1e3f95f06fd 100644
--- a/data/json/items/gun/308.json
+++ b/data/json/items/gun/308.json
@@ -6,7 +6,7 @@
"name": "FN FAL",
"name_plural": "FN FAL",
"description": "Originally designed during the Cold War, the FN FAL is probably the most successful battle rifle ever designed. Even though often labeled as obsolete, its high rate of fire and powerful ammunition make it perfectly capable of holding its ground against modern competitors.",
- "weight": 3840,
+ "weight": "3840 g",
"volume": "2 L",
"price": 350000,
"to_hit": -1,
@@ -29,7 +29,7 @@
"name": "H&K G3",
"name_plural": "H&K G3",
"description": "An early battle rifle developed after the end of WWII. The G3 is designed to unload large amounts of deadly ammunition, but it is less suitable over long ranges.",
- "weight": 3980,
+ "weight": "3980 g",
"volume": "2 L",
"price": 205000,
"to_hit": -1,
@@ -50,7 +50,7 @@
"reload_noise_volume": 10,
"name": "M134D-H Minigun",
"description": "The M134D-H Minigun is a (relatively) lightweight heavy rotary machine gun. Its six barrels are rotated by an electric motor, powered by UPS or vehicle. If you could find enough ammo for it, it would become a devastating weapon. It must be mounted on a vehicle before use.",
- "weight": 19500,
+ "weight": "19500 g",
"volume": "6 L",
"price": 5500000,
"to_hit": -4,
@@ -77,7 +77,7 @@
"name": "M14 EBR-RI",
"name_plural": "M14 EBR-RI",
"description": "A highly modified version of the M14 rifle designed to cover both CQB and designated marksman roles. A very powerful and versatile rifle, if somewhat heavy.",
- "weight": 4820,
+ "weight": "4820 g",
"price": 195000,
"material": [ "steel", "plastic" ],
"burst": 12,
@@ -103,7 +103,7 @@
"name": "M1A",
"name_plural": "M1A",
"description": "The child of the M1 Garand World War 2 rifle, the M1A is a semi-automatic variant of the M14, favored for its accuracy and modular use.",
- "weight": 3940,
+ "weight": "3940 g",
"volume": "2250 ml",
"price": 130000,
"to_hit": -1,
@@ -138,7 +138,7 @@
"type": "GUN",
"name": "M240",
"description": "The M240 is a medium machine gun used by the US military, replacing the older M60. Quite inaccurate and difficult to control, the M240 is designed to fire many rounds very quickly.",
- "weight": 8800,
+ "weight": "8800 g",
"volume": "3 L",
"price": 1000000,
"to_hit": -1,
@@ -173,7 +173,7 @@
"type": "GUN",
"name": "M60",
"description": "The M60 is a general-purpose machine gun developed to replace the .30-caliber M1918 and M1919. Heavy and difficult to handle fired from the shoulder, as most people aren't action-movie heroes.",
- "weight": 8300,
+ "weight": "8300 g",
"volume": "3 L",
"price": 1000000,
"to_hit": -1,
@@ -211,7 +211,7 @@
"name_plural": "pipe rifles: .308",
"//": "It's amongst the smallest of the .308 firearms, and a scrap weapon as well. This means a short handmade barrel, and considerable loss of energy.",
"description": "A homemade lever-action rifle. While still a primitive pipe and 2x4 design, some minor improvements have been made, such as an integral magazine for rounds, and chambering the more powerful .308 rounds.",
- "weight": 2311,
+ "weight": "2311 g",
"volume": "2 L",
"price": 10000,
"to_hit": -1,
@@ -249,7 +249,7 @@
"name": "Savage 111F",
"name_plural": "Savage 111F",
"description": "A very accurate rifle chambered for the powerful .308 round. Its very low ammo capacity is offset by its accuracy and near-complete lack of recoil.",
- "weight": 2993,
+ "weight": "2993 g",
"volume": "3 L",
"price": 53000,
"to_hit": -1,
@@ -283,7 +283,7 @@
"name": "M24",
"name_plural": "M24",
"description": "The M24 Sniper is the military and police version of the Remington Model 700 rifle, M24 being the model name assigned by the United States Army after adoption as their standard sniper rifle in 1988. The M24 is referred to as a 'weapon system' because it consists of not only a rifle, but also a detachable telescopic sight and other accessories.",
- "weight": 4500,
+ "weight": "4500 g",
"volume": "2750 ml",
"price": 350000,
"to_hit": -1,
@@ -319,7 +319,7 @@
"type": "GUN",
"name": "HK417 A2",
"description": "A German battle rifle with a 13\" barrel and telescopic stock. It is a gas operated, rotating bolt rifle with a short-stroke piston design similar to that of the G36.",
- "weight": 3870,
+ "weight": "3870 g",
"volume": "1750 ml",
"price": 320000,
"to_hit": -1,
@@ -341,7 +341,7 @@
"type": "GUN",
"name": "M110A1",
"description": "A derivative of H&K's G28 with an aluminium upper reciever to meet US Army weight requirements. It is a gas operated, rotating bolt rifle accurate to 1.5 MOA with standard ammunition.",
- "weight": 3800,
+ "weight": "3800 g",
"volume": "2 L",
"price": 320000,
"to_hit": -1,
@@ -362,7 +362,7 @@
"type": "GUN",
"name": "AR-10",
"description": "Somewhat similar to the later AR-15, the AR-10 is a gas operated, rotating bolt rifle chambered for 7.62x51mm rounds.",
- "weight": 3290,
+ "weight": "3290 g",
"volume": "2 L",
"price": 120000,
"to_hit": -1,
diff --git a/data/json/items/gun/32.json b/data/json/items/gun/32.json
index e6e622b681843..7f7f8ca02b450 100644
--- a/data/json/items/gun/32.json
+++ b/data/json/items/gun/32.json
@@ -6,7 +6,7 @@
"name": "SIG Sauer P230",
"name_plural": "SIG Sauer P230",
"description": "The SIG Sauer P230 is a small, semi-automatic handgun chambered in .32 ACP. Due to its small dimensions, it was often carried as a backup weapon.",
- "weight": 460,
+ "weight": "460 g",
"volume": "250 ml",
"price": 43000,
"to_hit": -1,
@@ -18,6 +18,7 @@
"skill": "pistol",
"dispersion": 480,
"durability": 8,
+ "min_cycle_recoil": 135,
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
@@ -31,6 +32,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "32", [ "sigp230mag" ] ] ]
},
@@ -41,7 +43,7 @@
"name": "Skorpion Vz. 61",
"//": "Total unloaded weight of gun 1301.81 grams, rounded to 1302. Current weight of folding stock 200 grams.",
"description": "The Skorpion Vz. 61 is a Czechoslovak submachine gun from the 1950s, chambered in .32 ACP.",
- "weight": 1102,
+ "weight": "1102 g",
"volume": "750 ml",
"price": 150000,
"to_hit": -2,
@@ -53,6 +55,7 @@
"skill": "smg",
"dispersion": 360,
"durability": 6,
+ "min_cycle_recoil": 135,
"burst": 14,
"built_in_mods": [ "folding_stock" ],
"valid_mod_locations": [
@@ -69,6 +72,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazines": [ [ "32", [ "skorpion61mag" ] ] ]
},
{
@@ -78,7 +82,7 @@
"name": "Walther PPK",
"name_plural": "Walther PPK",
"description": "One of the most famous handguns of the 20th century. Your name is not Bond, but you might find this little gun still useful.",
- "weight": 525,
+ "weight": "525 g",
"volume": "250 ml",
"price": 45000,
"to_hit": -1,
@@ -90,6 +94,7 @@
"skill": "pistol",
"dispersion": 480,
"durability": 8,
+ "min_cycle_recoil": 135,
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
@@ -103,6 +108,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "32", [ "ppkmag" ] ] ]
},
@@ -112,7 +118,7 @@
"type": "GUN",
"name": "Kel-Tec P32",
"description": "One of Kel-tec's oldest designs, the P32 is a popular option for deep concealment and backup usage. Despite its extreme light weight and small size, its .32 ACP chambering makes for good handling and recoil control.",
- "weight": 186,
+ "weight": "186 g",
"volume": "186ml",
"price": 14000,
"to_hit": -3,
@@ -122,6 +128,7 @@
"ammo": "32",
"dispersion": 480,
"durability": 8,
+ "min_cycle_recoil": 135,
"magazines": [ [ "32", [ "kp32mag" ] ] ]
}
]
diff --git a/data/json/items/gun/357sig.json b/data/json/items/gun/357sig.json
index f4056c967f398..9c4962fd88b4c 100644
--- a/data/json/items/gun/357sig.json
+++ b/data/json/items/gun/357sig.json
@@ -5,7 +5,7 @@
"type": "GUN",
"name": "SIG P226",
"description": "A SIG Sauer P226 chambered for .357 SIG. The P226 is a DA/SA, short-recoil operated semi-automatic pistol.",
- "weight": 800,
+ "weight": "800 g",
"volume": "500 ml",
"price": 50000,
"to_hit": -1,
@@ -34,7 +34,7 @@
"type": "GUN",
"name": "SIG P320",
"description": "The P320 is a semi automatic, short recoil operated pistol. This one is chambered for .357 SIG.",
- "weight": 800,
+ "weight": "800 g",
"volume": "500 ml",
"price": 69000,
"to_hit": -2,
diff --git a/data/json/items/gun/36paper.json b/data/json/items/gun/36paper.json
index 4c41fd6334022..6faa9d58bb5b0 100644
--- a/data/json/items/gun/36paper.json
+++ b/data/json/items/gun/36paper.json
@@ -1,12 +1,12 @@
[
{
"id": "colt_navy",
- "copy-from": "pistol_revolver",
+ "copy-from": "pistol_revolver_cap_ball",
"type": "GUN",
"name": "Colt M1861 Navy",
"name_plural": "Colt M1861 Navy",
"description": "The Colt Model 1861 Navy cap & ball .36-caliber revolver was a six-shot, single-action percussion weapon produced by Colt's Manufacturing Company from 1861 until 1873.",
- "weight": 1190,
+ "weight": "1190 g",
"volume": "750 ml",
"price": 30000,
"to_hit": -1,
@@ -15,6 +15,7 @@
"ammo": "36paper",
"dispersion": 450,
"durability": 7,
+ "blackpowder_tolerance": 96,
"clip_size": 6,
"proportional": { "reload": 2 }
}
diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json
index ba46a8ebee15c..781465e80a304 100644
--- a/data/json/items/gun/38.json
+++ b/data/json/items/gun/38.json
@@ -6,7 +6,7 @@
"name": "2 Shot Special",
"//": "It's hard to say just how big this is, although it's (very large) pistol sized. But it is a handmade weapon.",
"description": "A crudely made double barrel pistol firing 38 special ammo. Unfortunately, the name is less about the double barrels and more about the number of shots you'll get before it breaks down on you.",
- "weight": 750,
+ "weight": "750 g",
"volume": "1 L",
"price": 2000,
"to_hit": -1,
@@ -19,6 +19,7 @@
"ranged_damage": -1,
"dispersion": 620,
"durability": 3,
+ "blackpowder_tolerance": 60,
"clip_size": 2,
"reload": 200,
"valid_mod_locations": [
@@ -29,6 +30,7 @@
[ "rail mount", 1 ],
[ "stock mount", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"flags": [ "RELOAD_ONE", "RELOAD_EJECT" ]
},
{
@@ -38,7 +40,7 @@
"name": "COP .38",
"name_plural": "COP .38",
"description": "The COP .38 is a small, chubby derringer pistol that bears a slight resemblance to the Mossberg Brownie. It has four barrels arranged in a square formation.",
- "weight": 857,
+ "weight": "857 g",
"volume": "399ml",
"price": 120000,
"to_hit": -1,
@@ -48,6 +50,7 @@
"range": 3,
"dispersion": 520,
"durability": 6,
+ "blackpowder_tolerance": 96,
"clip_size": 4,
"valid_mod_locations": [
[ "accessories", 2 ],
@@ -59,6 +62,7 @@
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ]
},
{
@@ -68,7 +72,7 @@
"name": "pipe rifle: .38 Special",
"name_plural": "pipe rifles: .38 Special",
"description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
- "weight": 2114,
+ "weight": "2114 g",
"volume": "2 L",
"price": 10000,
"to_hit": -1,
@@ -80,6 +84,7 @@
"ranged_damage": 1,
"dispersion": 550,
"durability": 6,
+ "blackpowder_tolerance": 60,
"loudness": 25,
"clip_size": 1,
"reload": 200,
@@ -94,6 +99,7 @@
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"flags": [ "RELOAD_EJECT" ]
},
{
@@ -103,7 +109,7 @@
"name": "Ruger LCR .38",
"name_plural": "Ruger LCR .38",
"description": "A compact, double-action-only revolver designed for easy concealment, with a stainless steel cylinder and aluminum frame.",
- "weight": 382,
+ "weight": "382 g",
"volume": "250 ml",
"price": 54500,
"to_hit": -2,
@@ -115,6 +121,7 @@
"ranged_damage": -2,
"dispersion": 480,
"durability": 10,
+ "blackpowder_tolerance": 56,
"clip_size": 5,
"magazines": [ [ "38", [ "38_speedloader5" ] ] ],
"valid_mod_locations": [
@@ -136,7 +143,7 @@
"name": "S&W 619",
"name_plural": "S&W 619",
"description": "A seven-round .38 revolver sold by Smith & Wesson. It features a fixed rear sight and a reinforced frame.",
- "weight": 1074,
+ "weight": "1074 g",
"volume": "500 ml",
"price": 62000,
"to_hit": -2,
@@ -147,6 +154,7 @@
"ammo": [ "357mag", "38" ],
"dispersion": 320,
"durability": 10,
+ "blackpowder_tolerance": 56,
"clip_size": 7,
"magazines": [ [ "38", [ "38_speedloader" ] ] ],
"valid_mod_locations": [
@@ -168,7 +176,7 @@
"name": "Taurus Pro .38",
"name_plural": "Taurus Pro .38",
"description": "A popular .38 pistol. Designed with numerous safety features and built from high-quality, durable materials.",
- "weight": 515,
+ "weight": "515 g",
"volume": "500 ml",
"price": 64000,
"to_hit": -2,
@@ -180,6 +188,7 @@
"skill": "pistol",
"dispersion": 480,
"durability": 7,
+ "min_cycle_recoil": 225,
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
@@ -193,6 +202,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "38", [ "taurus38mag" ] ] ]
}
diff --git a/data/json/items/gun/380.json b/data/json/items/gun/380.json
index c00b135442695..22a0d98f7561f 100644
--- a/data/json/items/gun/380.json
+++ b/data/json/items/gun/380.json
@@ -5,11 +5,12 @@
"type": "GUN",
"name": "MAC-11",
"description": "A lesser known variant of the MAC-10, this machine pistol is chambered in .380 ACP for a smaller overall size while remaining inherently subsonic. Smaller in almost every dimension, this inexpensive automatic weapon was declared 'fit only for combat in a phone booth' due to its low weight and absurd fire rate ranging from 1200 to 1400 rounds per minute.",
- "weight": 1590,
+ "weight": "1590 g",
"volume": "500 ml",
"price": 160000,
"bashing": 5,
"ammo": "380",
+ "min_cycle_recoil": 270,
"burst": 23,
"magazines": [ [ "380", [ "mac11mag" ] ] ]
},
@@ -19,10 +20,11 @@
"type": "GUN",
"name": "Kel-Tec P3AT",
"description": "Essentially a slightly scaled up Kel-tec P32 in .380 ACP, the ever popular P3AT offers better ballistics in a small, concealable lightweight package. Handling leaves something to be desired due to snappier recoil and diminuitive controls.",
- "weight": 240,
+ "weight": "240 g",
"volume": "231ml",
"price": 25000,
"ammo": "380",
+ "min_cycle_recoil": 270,
"magazines": [ [ "380", [ "kp3atmag" ] ] ]
},
{
@@ -31,7 +33,7 @@
"type": "GUN",
"name": "FN 1910 .380",
"description": "Made infamous in Sarajevo in 1914, the FN1910 was a popular pocket pistol, albeit in .32 ACP. Collectors value the .380 model for its notoriety and more modern terminal performance. If such a humble firearm could start a world war, could it perhaps protect you from the undead?",
- "weight": 680,
+ "weight": "680 g",
"volume": "186ml",
"price": 75000,
"to_hit": -3,
@@ -41,6 +43,7 @@
"ammo": "380",
"dispersion": 480,
"durability": 7,
+ "min_cycle_recoil": 270,
"magazines": [ [ "380", [ "fn1910mag" ] ] ]
},
{
@@ -49,7 +52,7 @@
"type": "GUN",
"name": "Ruger LCP",
"description": "One of the best selling modern day 'pocket pistol's, the LCP is an affordable, polymer framed pistol chambered in .380 ACP. Despite the round's relatively low power, the pistol's low weight and short sight radius make for a moderately poor handling pistol.",
- "weight": 267,
+ "weight": "267 g",
"volume": "250 ml",
"price": 21000,
"to_hit": -3,
@@ -59,6 +62,7 @@
"ammo": "380",
"dispersion": 480,
"durability": 8,
+ "min_cycle_recoil": 270,
"magazines": [ [ "380", [ "rugerlcpmag" ] ] ]
},
{
@@ -67,7 +71,7 @@
"type": "GUN",
"name": "Hi-Point CF-380",
"description": "The Hi-Point CF-380 is a blowback operated semi automatic pistol designed by Hi-Point Firearms, which is known for making inexpensive firearms, and for making said firearms bulky and uncomfortable. Hi-Points have slides made with a zinc pot-metal which is relatively fragile compared to steel slides.",
- "weight": 709,
+ "weight": "709 g",
"volume": "539 ml",
"price": 7500,
"to_hit": -2,
diff --git a/data/json/items/gun/38super.json b/data/json/items/gun/38super.json
index 52e75f5c34a86..b6221d38e8415 100644
--- a/data/json/items/gun/38super.json
+++ b/data/json/items/gun/38super.json
@@ -5,7 +5,7 @@
"type": "GUN",
"name": "M1911A1",
"description": "The M1911A1 is an extremely popular pistol known for its reliability. This one is chambered for .38 Super.",
- "weight": 1035,
+ "weight": "1035 g",
"volume": "500 ml",
"price": 78400,
"to_hit": -2,
diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
index c5f882ec16d8f..0f60f2313ef75 100644
--- a/data/json/items/gun/40.json
+++ b/data/json/items/gun/40.json
@@ -6,7 +6,7 @@
"name": "Glock 22",
"name_plural": "Glock 22",
"description": "A .40 S&W variant of the popular Glock 17 pistol. The standard-issue firearm of the FBI and of countless other law enforcement agencies worldwide.",
- "weight": 440,
+ "weight": "440 g",
"volume": "500 ml",
"price": 69000,
"to_hit": -2,
@@ -19,6 +19,8 @@
"ranged_damage": 1,
"dispersion": 480,
"durability": 6,
+ "blackpowder_tolerance": 48,
+ "min_cycle_recoil": 425,
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
@@ -32,6 +34,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "40", [ "glock40mag", "glock40bigmag" ] ] ]
},
@@ -42,7 +45,7 @@
"name": "pipe rifle: .40 S&W",
"name_plural": "pipe rifles: .40 S&W",
"description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
- "weight": 2114,
+ "weight": "2114 g",
"volume": "2 L",
"price": 10000,
"to_hit": -1,
@@ -54,6 +57,7 @@
"ranged_damage": 1,
"dispersion": 550,
"durability": 6,
+ "blackpowder_tolerance": 60,
"loudness": 25,
"clip_size": 1,
"reload": 200,
@@ -68,6 +72,7 @@
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"flags": [ "RELOAD_EJECT" ]
},
{
@@ -77,7 +82,7 @@
"name": "SIG Pro .40",
"name_plural": "SIG Pro .40",
"description": "Originally marketed as a lightweight and compact alternative to older SIG handguns, the Pro .40 is popular among European police forces.",
- "weight": 680,
+ "weight": "680 g",
"volume": "500 ml",
"price": 75000,
"to_hit": -2,
@@ -89,6 +94,7 @@
"skill": "pistol",
"dispersion": 480,
"durability": 7,
+ "min_cycle_recoil": 504,
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
@@ -102,6 +108,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "40", [ "sig40mag" ] ] ]
},
@@ -113,7 +120,7 @@
"name_plural": "Luty SMGs: .40 S&W",
"description": "A Luty pattern makeshift smoothbore SMG crudely constructed out of various steel parts using some of the more advanced powered hand tools; likely one of the most complex guns that are feasible to make outside of a machine shop, but still very unreliable. This one is chambered for .40 S&W cartridges and accepts Glock 22 magazines, or alternatively custom-made makeshift ones.",
"//": "Crafting recipe must make use of angle grinder, bench grinder, set square and vise, which don't yet exist in game. No factory mags until UMP40, mp5/40, or other straight .40 mags are implemented.",
- "weight": 3274,
+ "weight": "3274 g",
"volume": "1750 ml",
"price": 20000,
"to_hit": -1,
@@ -124,6 +131,8 @@
"ranged_damage": -4,
"dispersion": 590,
"durability": 4,
+ "blackpowder_tolerance": 24,
+ "min_cycle_recoil": 425,
"modes": [ [ "DEFAULT", "auto", 10 ] ],
"loudness": 25,
"barrel_length": 1,
@@ -148,7 +157,7 @@
"reload_noise_volume": 10,
"name": "handmade six-shooter",
"description": "A homemade 6-shot revolver. While it's not as good as the pre-Cataclysm manufactured weapons, it's a decent piece of work, all things considered.",
- "weight": 1333,
+ "weight": "1333 g",
"volume": "750 ml",
"price": 15000,
"to_hit": -2,
@@ -161,6 +170,7 @@
"ranged_damage": -1,
"dispersion": 620,
"durability": 6,
+ "blackpowder_tolerance": 60,
"loudness": 25,
"clip_size": 6,
"reload": 200,
@@ -174,6 +184,7 @@
[ "underbarrel", 1 ],
[ "rail mount", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ]
},
{
@@ -183,7 +194,7 @@
"name": "S&W 610",
"name_plural": "S&W 610",
"description": "The Smith and Wesson 610 is a classic six-shooter revolver chambered for 10mm rounds, or for S&W's own .40 round.",
- "weight": 1133,
+ "weight": "1133 g",
"volume": "500 ml",
"price": 74000,
"to_hit": -2,
@@ -195,6 +206,7 @@
"ranged_damage": 1,
"dispersion": 320,
"durability": 8,
+ "blackpowder_tolerance": 56,
"clip_size": 6,
"magazines": [ [ "40", [ "40_speedloader6" ] ] ],
"valid_mod_locations": [
@@ -214,7 +226,7 @@
"type": "GUN",
"name": "Browning Hi-Power .40 S&W",
"description": "The Browning Hi-Power is a semi-automatic handgun developed shortly before the second world war. Widely issued since then, it remains in use by India, Canada and Australia. This is a commercial variant produced by Browning Arms in .40 S&W.",
- "weight": 900,
+ "weight": "900 g",
"volume": "418 ml",
"price": 54000,
"to_hit": -2,
@@ -233,7 +245,7 @@
"type": "GUN",
"name": "Walther PPQ .40 S&W",
"description": "The Walther PPQ is a semi-automatic pistol originating from the Walther P99QA, and maintains compatibility with some of its predecessor's accessories. This model is chambered in .40 S&W.",
- "weight": 625,
+ "weight": "625 g",
"volume": "422 ml",
"price": 72500,
"bashing": 8,
@@ -251,7 +263,7 @@
"type": "GUN",
"name": "Hi-Point Model JCP",
"description": "The Hi-Point Model JCP is a blowback operated semi automatic pistol designed by Hi-Point Firearms, which is known for making inexpensive firearms, and for making said firearms bulky and uncomfortable. Hi-Points have slides made with a zinc pot-metal which is relatively fragile compared to steel slides.",
- "weight": 800,
+ "weight": "800 g",
"volume": "703 ml",
"price": 7500,
"to_hit": -2,
diff --git a/data/json/items/gun/40mm.json b/data/json/items/gun/40mm.json
index 1576845ae05b5..a9b605ed1ff50 100644
--- a/data/json/items/gun/40mm.json
+++ b/data/json/items/gun/40mm.json
@@ -5,7 +5,7 @@
"type": "GUN",
"name": "tube 40mm launcher",
"description": "A simple, home-made grenade launcher. Basically a tube with a pin firing mechanism to activate the grenade.",
- "weight": 2267,
+ "weight": "2267 g",
"volume": "1250 ml",
"price": 40000,
"to_hit": -3,
@@ -33,7 +33,7 @@
"type": "GUN",
"name": "M320 stand alone launcher",
"description": "Heckler & Koch's M320 grenade launcher offers the functionality of larger launchers in a very small package at the cost of decreased accuracy. This one is combined with a buttstock for stand alone operation.",
- "weight": 2100,
+ "weight": "2100 g",
"volume": "750 ml",
"price": 850000,
"to_hit": -3,
@@ -52,7 +52,7 @@
"type": "GUN",
"name": "M79 launcher",
"description": "A widely-used grenade launcher that first saw use by American forces in the Vietnam war. Though mostly replaced by more modern launchers, the M79 still sees use with many units worldwide.",
- "weight": 2930,
+ "weight": "2930 g",
"volume": "1 L",
"price": 400000,
"to_hit": -3,
@@ -81,7 +81,7 @@
"type": "GUN",
"name": "Mark 19 grenade launcher",
"description": "A heavy, tripod-mounted belt-fed grenade launcher used by the US Military since the start of the cold war all the way to the cataclysm, and if you can find some 40mm grenades, maybe even beyond.",
- "weight": 35200,
+ "weight": "35200 g",
"volume": "4 L",
"price": 1650000,
"to_hit": -1,
@@ -113,7 +113,7 @@
"name": "Milkor MGL",
"name_plural": "Milkor MGL",
"description": "The Milkor Multi-Grenade Launcher is designed to compensate for the drawback of single-shot grenade launchers by allowing sustained heavy firepower. However, it is still slow to reload and must be used with careful planning.",
- "weight": 5300,
+ "weight": "5300 g",
"volume": "2250 ml",
"price": 1040000,
"to_hit": -3,
@@ -142,7 +142,7 @@
"name": "RM802 grenade launcher",
"//": "Either Rivtech or milspec would make it Expensive. Combined, you could buy a half-decent car for the price.",
"description": "The Rivtech RM802 pump-action 40mm grenade launcher was designed to be a step ahead of single-shot grenade launchers by allowing sustained heavy firepower. However, its capacity is fairly limited so it must be used with careful planning.",
- "weight": 3120,
+ "weight": "3120 g",
"volume": "1500 ml",
"price": 2920000,
"to_hit": -1,
diff --git a/data/json/items/gun/410shot.json b/data/json/items/gun/410shot.json
index 2c6705a9dd6e8..cec4e28b82f9d 100644
--- a/data/json/items/gun/410shot.json
+++ b/data/json/items/gun/410shot.json
@@ -5,7 +5,7 @@
"type": "GUN",
"name": "Saiga-410",
"description": "The Saiga-410 is a semi-automatic shotgun designed on the same Kalashnikov pattern as the AK47 rifle. It reloads with a magazine, rather than one shell at a time like most shotguns.",
- "weight": 3550,
+ "weight": "3550 g",
"volume": "2750 ml",
"price": 189000,
"to_hit": -1,
diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json
index 4c2d995483e58..a4c239f22ebc0 100644
--- a/data/json/items/gun/44.json
+++ b/data/json/items/gun/44.json
@@ -6,7 +6,7 @@
"name": "Desert Eagle .44",
"name_plural": "Desert Eagle .44",
"description": "One of the most recognizable handguns due to its popularity in movies and video games, the Desert Eagle is better known for its menacing appearance than its performance. It's a large pistol, but its heavy weight reduces recoil.",
- "weight": 1800,
+ "weight": "1800 g",
"volume": "750 ml",
"price": 87500,
"to_hit": -2,
@@ -19,6 +19,7 @@
"ranged_damage": -1,
"dispersion": 480,
"durability": 7,
+ "min_cycle_recoil": 1413,
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
@@ -32,6 +33,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "44", [ "deaglemag" ] ] ]
},
@@ -42,7 +44,7 @@
"name": "Henry Big Boy .44",
"name_plural": "Henry Big Boy .44",
"description": "This fine lever action rifle is chambered in the powerful .44 magnum cartridge and features a sleek octagonal barrel with a tube fed magazine. Go get 'em cowboy!",
- "weight": 3937,
+ "weight": "3937 g",
"volume": "3 L",
"price": 89995,
"to_hit": -1,
@@ -53,6 +55,7 @@
"ranged_damage": 2,
"dispersion": 180,
"durability": 8,
+ "blackpowder_tolerance": 32,
"clip_size": 10,
"valid_mod_locations": [
[ "accessories", 2 ],
@@ -69,38 +72,6 @@
[ "underbarrel mount", 1 ]
]
},
- {
- "id": "lemat_revolver",
- "copy-from": "pistol_revolver",
- "type": "GUN",
- "name": "LeMat revolver",
- "//": "Could only find barrel figures for the Baby LeMat; this is a best-guess estimate.",
- "description": "A modernized version of the original LeMat revolver, a rare and expensive firearm produced during the civil war. With a capacity of 9 modern .44 cartridges and a single 12 gauge shell, it makes a great companion for those who wander the \"Earth-that-was\".",
- "weight": 1295,
- "volume": "750 ml",
- "price": 86100,
- "bashing": 4,
- "material": [ "steel", "wood" ],
- "symbol": "(",
- "color": "brown",
- "ammo": "44",
- "ranged_damage": -1,
- "dispersion": 360,
- "durability": 8,
- "clip_size": 9,
- "built_in_mods": [ "lemat_revolver_shotgun" ],
- "valid_mod_locations": [
- [ "accessories", 2 ],
- [ "barrel", 1 ],
- [ "bore", 1 ],
- [ "grip", 1 ],
- [ "mechanism", 4 ],
- [ "rail", 1 ],
- [ "sights", 1 ],
- [ "stock", 1 ],
- [ "underbarrel", 1 ]
- ]
- },
{
"id": "rifle_44",
"copy-from": "gun_base",
@@ -108,7 +79,7 @@
"name": "pipe rifle: .44 Magnum",
"name_plural": "pipe rifles: .44 Magnum",
"description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
- "weight": 2114,
+ "weight": "2114 g",
"volume": "2 L",
"price": 10000,
"to_hit": -1,
@@ -120,6 +91,7 @@
"ranged_damage": 1,
"dispersion": 550,
"durability": 6,
+ "blackpowder_tolerance": 60,
"loudness": 25,
"clip_size": 1,
"reload": 200,
@@ -134,6 +106,7 @@
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"flags": [ "RELOAD_EJECT" ]
},
{
@@ -143,7 +116,7 @@
"name": "Ruger Redhawk",
"name_plural": "Ruger Redhawk",
"description": "One of the most powerful handguns in the world when it was released in 1979, the Redhawk offers very sturdy construction, with an appearance that is reminiscent of \"Wild West\" revolvers.",
- "weight": 1386,
+ "weight": "1386 g",
"volume": "750 ml",
"price": 86100,
"to_hit": -2,
@@ -154,6 +127,7 @@
"ammo": "44",
"dispersion": 280,
"durability": 8,
+ "blackpowder_tolerance": 56,
"clip_size": 6,
"magazines": [ [ "44", [ "44_speedloader6" ] ] ],
"valid_mod_locations": [
@@ -175,7 +149,7 @@
"name": "S&W 629",
"name_plural": "S&W 629",
"description": "A stainless steel, six-shot, double-action revolver with a matte black plastic handle manufactured by Smith & Wesson. Though hardly the most powerful handgun in the world any more, it could still blow a zombie's head clean off.",
- "weight": 1276,
+ "weight": "1276 g",
"volume": "750 ml",
"price": 86100,
"bashing": 10,
@@ -186,6 +160,7 @@
"ranged_damage": -1,
"dispersion": 280,
"durability": 8,
+ "blackpowder_tolerance": 56,
"clip_size": 6,
"magazines": [ [ "44", [ "44_speedloader6" ] ] ],
"valid_mod_locations": [
diff --git a/data/json/items/gun/44paper.json b/data/json/items/gun/44paper.json
index eb80319e6fd6b..4a5494bb81311 100644
--- a/data/json/items/gun/44paper.json
+++ b/data/json/items/gun/44paper.json
@@ -1,12 +1,12 @@
[
{
"id": "colt_army",
- "copy-from": "pistol_revolver",
+ "copy-from": "pistol_revolver_cap_ball",
"type": "GUN",
"name": "Colt M1860 Army",
"name_plural": "Colt M1860 Army",
"description": "The Colt Army Model 1860 is a cap & ball .44-caliber revolver. It was used during the American Civil War, and made by Colt's Manufacturing Company.",
- "weight": 1220,
+ "weight": "1220 g",
"volume": "750 ml",
"price": 43000,
"to_hit": -1,
@@ -15,7 +15,38 @@
"ammo": "44paper",
"dispersion": 400,
"durability": 7,
- "clip_size": 5,
- "proportional": { "reload": 2 }
+ "blackpowder_tolerance": 96,
+ "clip_size": 5
+ },
+ {
+ "id": "lemat_revolver",
+ "copy-from": "pistol_revolver_cap_ball",
+ "type": "GUN",
+ "name": "LeMat revolver",
+ "description": "A Pietta reproduction of the civil war era LeMat revolver, a rare and unusual cap & ball .44-caliber revolver. While its original non-standard .42 or .35 caliber curbed its usefulness for the CSA army, this reproduction is offered in more prevalent .44 caliber. Despite modern quality materials, the design is still rather delicate.",
+ "weight": 1295,
+ "volume": "851 ml",
+ "price": 120000,
+ "bashing": 4,
+ "material": [ "steel", "wood" ],
+ "symbol": "(",
+ "color": "brown",
+ "ammo": "44paper",
+ "dispersion": 420,
+ "durability": 6,
+ "blackpowder_tolerance": 56,
+ "clip_size": 9,
+ "valid_mod_locations": [
+ [ "accessories", 2 ],
+ [ "barrel", 1 ],
+ [ "bore", 1 ],
+ [ "grip", 1 ],
+ [ "stock", 1 ],
+ [ "underbarrel", 1 ],
+ [ "rail mount", 1 ],
+ [ "sights mount", 1 ]
+ ],
+ "built_in_mods": [ "lemat_revolver_shotgun" ],
+ "extend": { "flags": [ "NO_UNLOAD" ] }
}
]
diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json
index 328febeb11fd2..2dcb39c36d378 100644
--- a/data/json/items/gun/45.json
+++ b/data/json/items/gun/45.json
@@ -5,7 +5,7 @@
"reload_noise_volume": 10,
"name": "TDI Vector",
"description": "The TDI Vector is a submachine gun with a unique, in-line design that makes recoil very manageable, even in the powerful .45 caliber.",
- "weight": 2600,
+ "weight": "2600 g",
"volume": "1750 ml",
"price": 310000,
"to_hit": -2,
@@ -17,6 +17,7 @@
"skill": "smg",
"dispersion": 280,
"durability": 7,
+ "min_cycle_recoil": 540,
"burst": 20,
"valid_mod_locations": [
[ "accessories", 3 ],
@@ -32,6 +33,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazine_well": 2,
"magazines": [ [ "45", [ "tdi_mag" ] ] ]
},
@@ -41,7 +43,7 @@
"reload_noise_volume": 10,
"name": "H&K UMP45",
"description": "Developed as a successor to the MP5 submachine gun, the UMP45 retains the earlier model's supreme accuracy and low recoil, but in the higher .45 caliber.",
- "weight": 2300,
+ "weight": "2300 g",
"volume": "1250 ml",
"price": 290000,
"to_hit": -2,
@@ -54,6 +56,7 @@
"ranged_damage": 1,
"dispersion": 240,
"durability": 8,
+ "min_cycle_recoil": 540,
"burst": 10,
"valid_mod_locations": [
[ "accessories", 3 ],
@@ -69,6 +72,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazines": [ [ "45", [ "ump45mag" ] ] ]
},
{
@@ -78,7 +82,7 @@
"name": "M1911",
"//": "You can get 'em for over US$1K if you want. This is a fairly cheap remake.",
"description": "The M1911 was the US Military standard-issue sidearm for most of the 20th Century. It remains one of the most popular .45 pistols today.",
- "weight": 1035,
+ "weight": "1035 g",
"volume": "500 ml",
"price": 78400,
"to_hit": -2,
@@ -89,6 +93,8 @@
"ammo": "45",
"dispersion": 480,
"durability": 7,
+ "min_cycle_recoil": 540,
+ "blackpowder_tolerance": 48,
"magazine_well": 1,
"magazines": [ [ "45", [ "m1911mag", "m1911bigmag" ] ] ]
},
@@ -110,7 +116,7 @@
"reload_noise_volume": 10,
"name": "MAC-10",
"description": "The MAC-10 is a popular machine pistol originally designed for military use. For many years they were the most inexpensive automatic weapon in the US, and enjoyed great popularity among criminals less concerned with quality firearms.",
- "weight": 2630,
+ "weight": "2630 g",
"volume": "750 ml",
"price": 180000,
"to_hit": -2,
@@ -122,6 +128,7 @@
"skill": "smg",
"dispersion": 520,
"durability": 7,
+ "min_cycle_recoil": 540,
"burst": 18,
"built_in_mods": [ "wire_stock" ],
"valid_mod_locations": [
@@ -138,6 +145,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "45", [ "mac10mag" ] ] ]
},
@@ -148,7 +156,7 @@
"name": "pipe rifle: .45",
"name_plural": "pipe rifles: .45",
"description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
- "weight": 2114,
+ "weight": "2114 g",
"volume": "2 L",
"price": 10000,
"to_hit": -1,
@@ -161,6 +169,7 @@
"ranged_damage": 1,
"dispersion": 550,
"durability": 6,
+ "blackpowder_tolerance": 60,
"loudness": 25,
"clip_size": 1,
"reload": 200,
@@ -175,6 +184,7 @@
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"flags": [ "RELOAD_EJECT" ]
},
{
@@ -185,7 +195,7 @@
"name_plural": "Luty SMGs: .45",
"description": "A Luty pattern makeshift smoothbore SMG crudely constructed out of various steel parts using some of the more advanced powered hand tools; likely one of the most complex guns that are feasible to make outside of a machine shop, but still very unreliable. This one is chambered for .45 ACP cartridges and accepts MAC-10 magazines, or alternatively custom-made makeshift ones.",
"//": "Crafting recipe must make use of angle grinder, bench grinder, set square and vise, which don't yet exist in game.",
- "weight": 3274,
+ "weight": "3274 g",
"volume": "1750 ml",
"price": 20000,
"to_hit": -1,
@@ -196,6 +206,8 @@
"ranged_damage": -4,
"dispersion": 590,
"durability": 4,
+ "blackpowder_tolerance": 24,
+ "min_cycle_recoil": 456,
"modes": [ [ "DEFAULT", "auto", 10 ] ],
"loudness": 25,
"barrel_length": 1,
@@ -221,7 +233,7 @@
"name": "homemade hand cannon",
"//": "On one hand, it's very big for a handgun. On the other, it's still a scrap weapon.",
"description": "A large and heavy pistol evidently welded from scrap. It's not pretty, but the .45 it's chambered with packs a serious punch. Just watch out for the kick.",
- "weight": 1200,
+ "weight": "1200 g",
"volume": "1 L",
"price": 60000,
"to_hit": -3,
@@ -233,6 +245,7 @@
"ranged_damage": 2,
"dispersion": 620,
"durability": 7,
+ "blackpowder_tolerance": 60,
"loudness": 25,
"clip_size": 5
},
@@ -242,7 +255,7 @@
"reload_noise_volume": 10,
"name": "Thompson submachine gun",
"description": "An American-made submachine gun developed during the very end of World War I, too late to see action. Infamous during the 1920s for its use by gangsters, and was used during World War II before being mostly replaced with less-expensive alternatives.",
- "weight": 4630,
+ "weight": "4630 g",
"volume": "2 L",
"price": 450000,
"to_hit": -2,
@@ -255,6 +268,7 @@
"ranged_damage": 2,
"dispersion": 360,
"durability": 7,
+ "min_cycle_recoil": 540,
"burst": 10,
"barrel_length": 2,
"valid_mod_locations": [
@@ -271,6 +285,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazines": [ [ "45", [ "thompson_mag", "thompson_bigmag", "thompson_drum" ] ] ]
},
{
@@ -300,7 +315,7 @@
"type": "GUN",
"name": "Walther PPQ .45 ACP",
"description": "The Walther PPQ is a semi-automatic pistol originating from the Walther P99QA, and maintains compatibility with some of its predecessor's accessories. This model is chambered in .45 ACP.",
- "weight": 714,
+ "weight": "714 g",
"volume": "470 ml",
"price": 80000,
"bashing": 8,
@@ -318,7 +333,7 @@
"type": "GUN",
"name": "Hi-Point Model JHP",
"description": "The Hi-Point Model JHP is a blowback operated semi automatic pistol designed by Hi-Point Firearms, which is known for making inexpensive firearms, and for making said firearms bulky and uncomfortable. Hi-Points have slides made with a zinc pot-metal which is relatively fragile compared to steel slides.",
- "weight": 800,
+ "weight": "800 g",
"volume": "720 ml",
"price": 7500,
"to_hit": -2,
@@ -329,6 +344,6 @@
"dispersion": 480,
"durability": 7,
"magazine_well": 1,
- "magzines": [ [ "45", [ "hptjhpmag" ] ] ]
+ "magazines": [ [ "45", [ "hptjhpmag" ] ] ]
}
]
diff --git a/data/json/items/gun/454.json b/data/json/items/gun/454.json
index 4656f9572b870..f77932835115d 100644
--- a/data/json/items/gun/454.json
+++ b/data/json/items/gun/454.json
@@ -6,7 +6,7 @@
"name": "Taurus Raging Bull",
"name_plural": "Taurus Raging Bull",
"description": "The Taurus Raging Bull is a 5-shot revolver chambered in .454 Casull. It has impressive stopping power.",
- "weight": 1700,
+ "weight": "1700 g",
"volume": "750 ml",
"price": 64100,
"to_hit": -2,
@@ -14,9 +14,10 @@
"material": [ "steel", "plastic" ],
"symbol": "(",
"color": "light_gray",
- "ammo": [ "454", "45colt" ],
+ "ammo": [ "454", "410shot", "45colt" ],
"dispersion": 280,
"durability": 8,
+ "blackpowder_tolerance": 56,
"clip_size": 5,
"magazines": [ [ "454", [ "454_speedloader5" ] ] ],
"valid_mod_locations": [
diff --git a/data/json/items/gun/4570.json b/data/json/items/gun/4570.json
index 1acd41844bf5e..676966f184572 100644
--- a/data/json/items/gun/4570.json
+++ b/data/json/items/gun/4570.json
@@ -5,7 +5,7 @@
"type": "GUN",
"name": "Marlin 1895 SBL",
"description": "A handy but powerful lever-action rifle chambered for .45-70 Government. Designed for wilderness guides for defense against large predators such as grizzly bears, moose, and dinosaurs.",
- "weight": 3650,
+ "weight": "3650 g",
"volume": "2250 ml",
"price": 100000,
"to_hit": 1,
@@ -37,7 +37,7 @@
"type": "GUN",
"name": "Magnum Research BFR",
"description": "A massive single-action revolver. While the .45-70 rifle round loses significant velocity in its short pistol barrel, it still competes with other large magnum handguns in terms of power.",
- "weight": 1950,
+ "weight": "1950 g",
"volume": "1 L",
"price": 105000,
"to_hit": -2,
@@ -68,7 +68,7 @@
"name": "1874 Sharps",
"name_plural": "1874 Sharps",
"description": "A reproduction of an antique single-shot .45-70 rifle once used to hunt buffalo and other large game in the late 19th Century. Highly accurate and powerful for the time, this one is made to handle modern smokeless ammunition.",
- "weight": 5500,
+ "weight": "5500 g",
"volume": "3250 ml",
"price": 210000,
"to_hit": 1,
diff --git a/data/json/items/gun/45colt.json b/data/json/items/gun/45colt.json
new file mode 100644
index 0000000000000..65a6023bedc52
--- /dev/null
+++ b/data/json/items/gun/45colt.json
@@ -0,0 +1,21 @@
+[
+ {
+ "id": "colt_saa",
+ "copy-from": "pistol_revolver",
+ "type": "GUN",
+ "name": "Uberti Cattleman",
+ "name_plural": "Uberti Cattleman",
+ "description": "This 7.5\" barreled Uberti Cattleman is a modern reproduction of the legendary Colt Single Action Army, or Colt Peacemaker, one of the first revolvers to use a modern self-contained cartridge. Made famous by westerns, it is still in demand for Cowboy Action Shooting, reenactors and collectors. Unlike modern revolvers, the cylinder cannot swing out for loading, and spent brass must be ejected one at a time.",
+ "weight": 1048,
+ "volume": "500 ml",
+ "price": 47900,
+ "to_hit": -1,
+ "bashing": 8,
+ "material": [ "steel", "wood" ],
+ "ammo": "45colt",
+ "dispersion": 360,
+ "durability": 8,
+ "clip_size": 6,
+ "proportional": { "reload": 1.5 }
+ }
+]
diff --git a/data/json/items/gun/46.json b/data/json/items/gun/46.json
index 8cd5144be7741..b44e2145b0977 100644
--- a/data/json/items/gun/46.json
+++ b/data/json/items/gun/46.json
@@ -5,9 +5,9 @@
"reload_noise_volume": 10,
"name": "H&K MP7A2",
"description": "Designed as a personal defense weapon, the MP7 fires the high powered 4.6x30mm round while being lightweight, compact in size, and practically recoil free.",
- "weight": 1780,
- "volume": "3587 ml",
- "price": 340000,
+ "weight": "1780 g",
+ "volume": "2034 ml",
+ "price": 175000,
"to_hit": -2,
"bashing": 7,
"material": [ "steel", "plastic" ],
@@ -17,6 +17,7 @@
"skill": "smg",
"dispersion": 260,
"durability": 8,
+ "min_cycle_recoil": 81,
"burst": 16,
"built_in_mods": [ "wire_stock" ],
"valid_mod_locations": [
@@ -32,6 +33,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "46", [ "hk46mag", "hk46bigmag" ] ] ]
}
diff --git a/data/json/items/gun/460.json b/data/json/items/gun/460.json
index 8dc01286010b0..d100bb54ec71a 100644
--- a/data/json/items/gun/460.json
+++ b/data/json/items/gun/460.json
@@ -8,6 +8,7 @@
"price": 90000,
"ammo": [ "460", "45" ],
"magazines": [ [ "460", [ "lw12mag" ] ], [ "45", [ "lw12mag" ] ] ],
+ "min_cycle_recoil": 540,
"relative": { "durability": -1 },
"built_in_mods": [ "lead_holo_sight", "muzzle_brake", "lead_laser_sight" ]
},
@@ -19,6 +20,7 @@
"description": "After the success of their 9x19mm machine pistol, Leadworks LLC developed the L39B-45 from their .460 Rowland semi-autos, intending them to be used with .45ACP. Because it shares most of its parts with the L39-460, this variant retains the ability to fire fearsome .460 Rowland, though users are strongly advised not to do so during automatic fire. Comes with built in red dot, recoil compensator and laser sights. Similar to other Leadworks products it doesn't accept third-party modifications.",
"ammo": [ "460", "45" ],
"magazines": [ [ "460", [ "lw12mag" ] ], [ "45", [ "lw12mag" ] ] ],
+ "min_cycle_recoil": 540,
"relative": { "durability": -1 },
"built_in_mods": [ "lead_holo_sight", "muzzle_brake", "lead_laser_sight" ]
},
@@ -30,7 +32,7 @@
"name_plural": "L2031 Enforcer",
"//": "Real-life Autorevolvers tended to vary between 6-7.5 inch barrels, so we'll err on the side of a +1 here.",
"description": "An \"autorevolver\", this Leadworks LLC six-shooter combines the ease-of-action of a semi-auto with the ease-of-reloading and style of a revolver. In addition to ubiquitous .45 ACP, the Enforcer also fires powerful .460 Rowland, offering .44 Magnum performance in a smaller package. It achieved overnight stardom when it appeared in \"Treasure Trail\", a popular space-Western series. Comes with built in holographic and laser sights. Similar to other Leadworks products it doesn't accept third-party modifications.",
- "weight": 1370,
+ "weight": "1370 g",
"volume": "500 ml",
"price": 83000,
"to_hit": -2,
@@ -42,6 +44,7 @@
"ranged_damage": 1,
"dispersion": 360,
"durability": 8,
+ "blackpowder_tolerance": 56,
"clip_size": 6,
"magazines": [ [ "460", [ "460_speedloader6" ] ], [ "45", [ "460_speedloader6" ] ] ],
"built_in_mods": [ "lead_holo_sight", "lead_laser_sight" ],
@@ -62,7 +65,7 @@
"name_plural": "L1820 Long Ranger",
"//": "If it's based off the Winchester 94, it's likely got a 20 inch barrel. For sanity's sake though, let's cap it at +4.",
"description": "The Leadworks Long Ranger was designed to give Enforcer users (or anyone using .460/.45 caliber cartridges) a little extra reach while using the same ammunition. Loaded with powerful .460 Rowland ammunition, this rifle offers a competitive replacement to the AR-15 in politically restrictive climates, but was met with disgust from lever action purists because of its synthetic furniture and built in holographic and laser sights. Similar to other Leadworks products it doesn't accept third-party modifications.",
- "weight": 4175,
+ "weight": "4175 g",
"volume": "3250 ml",
"price": 90000,
"to_hit": -1,
@@ -76,6 +79,7 @@
"ranged_damage": 4,
"dispersion": 180,
"durability": 9,
+ "blackpowder_tolerance": 32,
"clip_size": 12,
"barrel_length": 2,
"built_in_mods": [ "lead_holo_sight", "lead_laser_sight" ],
@@ -90,6 +94,7 @@
[ "rail mount", 1 ],
[ "stock mount", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"flags": [ "RELOAD_ONE" ]
}
]
diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json
index 8c185c65f6efb..e2233bfafafbd 100644
--- a/data/json/items/gun/50.json
+++ b/data/json/items/gun/50.json
@@ -7,7 +7,7 @@
"name_plural": "Barrett M107A1",
"//": "Price based on unit cost quote for fiscal year 2005 listed at inetres.com, with gunmod modifiers to be added later.",
"description": "A large, shoulder-fired, .50 caliber anti-materiel rifle. Its large size, recoil, and noise is offset by its damage and range.",
- "weight": 12602,
+ "weight": "12602 g",
"volume": "3500 ml",
"price": 1483300,
"to_hit": -1,
@@ -28,10 +28,10 @@
"id": "m2browning",
"copy-from": "gun_base",
"type": "GUN",
- "name": "M2 Browning HMG",
- "name_plural": "M2 Browning HMG",
+ "name": "M2HB Browning HMG",
+ "name_plural": "M2HB Browning HMG",
"description": "A heavy machine gun used by the US Military from its inception to the cataclysm, and even rarely by cataclysm survivors. Its massive size and design make it impossible to use unless deployed or mounted to a vehicle.",
- "weight": 38000,
+ "weight": "38000 g",
"volume": "5 L",
"price": 1800000,
"to_hit": -1,
@@ -44,7 +44,7 @@
"durability": 8,
"reload": 400,
"barrel_length": 5,
- "modes": [ [ "DEFAULT", "auto", 8 ], [ "SEMI", "semi-auto", 1 ] ],
+ "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 8 ] ],
"valid_mod_locations": [
[ "accessories", 4 ],
[ "barrel", 1 ],
diff --git a/data/json/items/gun/500.json b/data/json/items/gun/500.json
index 15e2321081d3b..914e52db98862 100644
--- a/data/json/items/gun/500.json
+++ b/data/json/items/gun/500.json
@@ -6,7 +6,7 @@
"name": "Big Horn Model 89",
"name_plural": "Big Horn Model 89",
"description": "Built in the image of the venerable Winchester Model 1886, Big Horn Armory's Model 89 rifle packs all the power of the .500 S&W Magnum cartridge in to a package less likely to break one's wrist.",
- "weight": 3447,
+ "weight": "3447 g",
"volume": "3 L",
"price": 329900,
"to_hit": -1,
@@ -17,6 +17,7 @@
"ranged_damage": 2,
"dispersion": 180,
"durability": 8,
+ "blackpowder_tolerance": 32,
"clip_size": 7,
"valid_mod_locations": [
[ "accessories", 2 ],
@@ -40,7 +41,7 @@
"name": "S&W 500",
"name_plural": "S&W 500",
"description": "The 5-shot Smith and Wesson 500 revolver fires the comparably-named .500 S&W Magnum. It's an impressive weapon.",
- "weight": 2055,
+ "weight": "2055 g",
"volume": "750 ml",
"price": 90000,
"to_hit": -2,
@@ -51,6 +52,7 @@
"ammo": "500",
"dispersion": 280,
"durability": 8,
+ "blackpowder_tolerance": 56,
"clip_size": 5,
"magazines": [ [ "500", [ "500_speedloader5" ] ] ],
"valid_mod_locations": [
diff --git a/data/json/items/gun/545x39.json b/data/json/items/gun/545x39.json
index f07e63ca9aa1f..c4b827601b875 100644
--- a/data/json/items/gun/545x39.json
+++ b/data/json/items/gun/545x39.json
@@ -6,7 +6,7 @@
"name": "AK-74M",
"//": "AKs likewise aren't commercially traded in the US, plus this is newer.",
"description": "The successor to the well-known AK-47 rifle. It combines the reliability of the AK series with the high-velocity, lightweight 5.45x39mm cartridge.",
- "weight": 3170,
+ "weight": "3170 g",
"volume": "1750 ml",
"price": 390000,
"to_hit": -1,
@@ -43,7 +43,7 @@
"reload_noise_volume": 10,
"name": "AN-94",
"description": "Intended to replace the AK-74, this rifle uses a sophisticated mechanism to delay felt recoil, along with a very fast two-round burst mode. While its increased complexity prevented it from being adopted by the Russian military, it has seen service among their special forces.",
- "weight": 3620,
+ "weight": "3620 g",
"volume": "1750 ml",
"price": 420000,
"to_hit": -1,
diff --git a/data/json/items/gun/57.json b/data/json/items/gun/57.json
index 47cdd2bb6e5bc..02e4655068908 100644
--- a/data/json/items/gun/57.json
+++ b/data/json/items/gun/57.json
@@ -5,7 +5,7 @@
"reload_noise_volume": 10,
"name": "FN Five-Seven",
"description": "Designed to work with FN's proprietary 5.7x28mm round, the Five-Seven is a lightweight pistol with a very high capacity, best used against armored opponents.",
- "weight": 490,
+ "weight": "490 g",
"volume": "500 ml",
"price": 124900,
"to_hit": -2,
@@ -18,6 +18,7 @@
"ranged_damage": -2,
"dispersion": 440,
"durability": 8,
+ "min_cycle_recoil": 81,
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
@@ -31,6 +32,7 @@
[ "underbarrel", 1 ]
],
"magazine_well": 1,
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazines": [ [ "57", [ "fn57mag" ] ] ]
},
{
@@ -39,7 +41,7 @@
"reload_noise_volume": 10,
"name": "FN P90",
"description": "The first in a new genre of guns, termed \"personal defense weapons.\" FN designed the P90 to use their proprietary 5.7x28mm ammunition. It is made for firing bursts manageably.",
- "weight": 2300,
+ "weight": "2300 g",
"volume": "1500 ml",
"price": 350000,
"to_hit": -2,
@@ -51,6 +53,7 @@
"skill": "smg",
"dispersion": 260,
"durability": 8,
+ "min_cycle_recoil": 81,
"burst": 15,
"valid_mod_locations": [
[ "accessories", 3 ],
@@ -66,6 +69,7 @@
[ "underbarrel", 1 ]
],
"magazine_well": 2,
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazines": [ [ "57", [ "fnp90mag" ] ] ]
}
]
diff --git a/data/json/items/gun/5x50.json b/data/json/items/gun/5x50.json
index c96d6dc9ae9c2..1827c111e41d3 100644
--- a/data/json/items/gun/5x50.json
+++ b/data/json/items/gun/5x50.json
@@ -5,7 +5,7 @@
"reload_noise_volume": 10,
"name": "RM216 SPIW",
"description": "This light carbine fires 5x50mm armor-piercing flechette cartridges. Classified as a special purpose individual weapon, this advanced firearm was developed by Rivtech for the US military shortly before the end of the world. Designed to be fired in bursts, it excels in close combat.",
- "weight": 1302,
+ "weight": "1302 g",
"volume": "1250 ml",
"price": 2320000,
"to_hit": -2,
@@ -44,7 +44,7 @@
"reload_noise_volume": 10,
"name": "RM232 IDW",
"description": "This lightweight machine pistol fires 5x50mm armor-piercing flechette cartridges. Classified as an individual defense weapon, this advanced firearm was developed by Rivtech for the US military shortly before the end of the world. Designed to be fired in bursts, it excels in close combat.",
- "weight": 682,
+ "weight": "682 g",
"volume": "750 ml",
"price": 1200000,
"to_hit": -2,
diff --git a/data/json/items/gun/66mm.json b/data/json/items/gun/66mm.json
new file mode 100644
index 0000000000000..c685a0d489b9b
--- /dev/null
+++ b/data/json/items/gun/66mm.json
@@ -0,0 +1,28 @@
+[
+ {
+ "id": "m202_flash",
+ "type": "GUN",
+ "symbol": "(",
+ "color": "dark_gray",
+ "name": "M202A1 FLASH",
+ "name_plural": "M202A1 FLASH",
+ "description": "An American rocket launcher designed in the 1970s to replace WW2 era flamethrowers still in use in Vietnam. It has four barrels sharing the 66mm caliber of the M72 LAW.",
+ "price": 2900000,
+ "material": "steel",
+ "skill": "launcher",
+ "ammo": "m235",
+ "weight": "5220 g",
+ "volume": "6 L",
+ "reload_noise_volume": 10,
+ "bashing": 12,
+ "to_hit": -3,
+ "dispersion": 300,
+ "durability": 7,
+ "modes": [ [ "DEFAULT", "single shot", 1 ], [ "BURST", "all barrels", 4 ] ],
+ "magazines": [ [ "m235", [ "m74_clip" ] ] ],
+ "reload": 600,
+ "loudness": 200,
+ "valid_mod_locations": [ [ "accessories", 4 ], [ "grip", 1 ], [ "sling", 1 ] ],
+ "flags": [ "BACKBLAST", "NEVER_JAMS" ]
+ }
+]
diff --git a/data/json/items/gun/700nx.json b/data/json/items/gun/700nx.json
index 80c83ff531890..b1f3c43d71b3b 100644
--- a/data/json/items/gun/700nx.json
+++ b/data/json/items/gun/700nx.json
@@ -5,7 +5,7 @@
"reload_noise_volume": 10,
"name": "Elephant gun",
"description": "A custom-made single shot rifle specially designed for the hunting of huge game. You could obviously kill everything with this, EVERYTHING. If you ever find enough ammo of course.",
- "weight": 8082,
+ "weight": "8082 g",
"volume": "3 L",
"price": 2000000,
"to_hit": 1,
diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
index 510c7c750593d..875861494f443 100644
--- a/data/json/items/gun/762.json
+++ b/data/json/items/gun/762.json
@@ -5,7 +5,7 @@
"reload_noise_volume": 10,
"name": "AKM",
"description": "One of the most recognizable assault rifles ever made, the AKM is renowned for its durability even under the worst conditions.",
- "weight": 2710,
+ "weight": "2710 g",
"volume": "1750 ml",
"price": 290000,
"to_hit": -1,
@@ -44,7 +44,7 @@
"name_plural": "Beretta ARX-160",
"//": "Total unloaded weight of gun 3000 grams. Current weight of folding stock 200 grams.",
"description": "The Beretta ARX-160 was a Phase II contender in the United States Army Individual Carbine competition to replace the M4 carbine. It failed to replace it, but it is widely used by military all around the world. This version is chambered for 7.62x39mm.",
- "weight": 2800,
+ "weight": "2800 g",
"volume": "1750 ml",
"price": 450000,
"to_hit": -1,
@@ -81,7 +81,7 @@
"reload_noise_volume": 10,
"name": "SKS",
"description": "Developed by the Soviets in 1945, this rifle was quickly replaced by the full-auto AK47. However, due to its superb accuracy, low recoil and deployable integrated bayonet, this gun maintains immense popularity.",
- "weight": 3850,
+ "weight": "3850 g",
"volume": "2500 ml",
"price": 38000,
"to_hit": -1,
diff --git a/data/json/items/gun/762R.json b/data/json/items/gun/762R.json
index 752b0d55f5caa..bf11bf1efe134 100644
--- a/data/json/items/gun/762R.json
+++ b/data/json/items/gun/762R.json
@@ -40,7 +40,7 @@
"name": "Mosin-Nagant 1891/30",
"name_plural": "Mosin-Nagant 1891/30",
"description": "The Mosin-Nagant 1891/30 is a bolt action, internal magazine-fed, military rifle, developed by the Russian Empire, and later used and perfected by the Soviet Union.",
- "weight": 4000,
+ "weight": "4000 g",
"volume": "3 L",
"price": 19000,
"to_hit": -1,
diff --git a/data/json/items/gun/762x25.json b/data/json/items/gun/762x25.json
index 4e525282f9299..aefaba094d9ab 100644
--- a/data/json/items/gun/762x25.json
+++ b/data/json/items/gun/762x25.json
@@ -5,7 +5,7 @@
"reload_noise_volume": 10,
"name": "PPSh-41",
"description": "The Soviet-made PPSh-41 is a mass-produced selective-fire submachine gun. It has a relatively high rate of fire.",
- "weight": 3630,
+ "weight": "3630 g",
"volume": "1750 ml",
"price": 280000,
"to_hit": -2,
@@ -19,6 +19,7 @@
"ranged_damage": 2,
"dispersion": 120,
"durability": 8,
+ "min_cycle_recoil": 270,
"barrel_length": 2,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 15 ] ],
"valid_mod_locations": [
@@ -34,6 +35,7 @@
[ "underbarrel", 1 ],
[ "rail mount", 1 ]
],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazines": [ [ "762x25", [ "ppshmag", "ppshdrum" ] ] ]
},
{
@@ -44,7 +46,7 @@
"name_plural": "Tokarev TT-33",
"//": "And it's therefore expensive.",
"description": "The Tokarev TT-33 is an antique Russian semiautomatic pistol, famous for its durability, accuracy, and uncomfortable grip angle. It was chambered for the 7.62x25mm due to the popularity of the C96 pistol among Russian revolutionaries.",
- "weight": 798,
+ "weight": "798 g",
"volume": "500 ml",
"price": 100000,
"to_hit": -2,
@@ -53,6 +55,7 @@
"ammo": "762x25",
"dispersion": 225,
"durability": 7,
+ "min_cycle_recoil": 270,
"magazine_well": 1,
"magazines": [ [ "762x25", [ "tokarevmag" ] ] ]
}
diff --git a/data/json/items/gun/84x246mm.json b/data/json/items/gun/84x246mm.json
index ea82c3a220515..535f0635808f7 100644
--- a/data/json/items/gun/84x246mm.json
+++ b/data/json/items/gun/84x246mm.json
@@ -12,7 +12,7 @@
"flags": [ "RELOAD_ONE", "BACKBLAST", "NEVER_JAMS" ],
"skill": "launcher",
"ammo": "84x246mm",
- "weight": 6900,
+ "weight": "6900 g",
"volume": "4500 ml",
"bashing": 8,
"to_hit": -3,
@@ -38,7 +38,7 @@
"description": "Mil-Spec rocket launcher. An 84-mm unguided, portable, single-shot recoilless smoothbore weapon used primarily by the US military.",
"extend": { "flags": [ "FIRE_TWOHAND", "NO_REPAIR" ] },
"ammo": "84x246mm",
- "weight": 6803,
+ "weight": "6803 g",
"volume": "3500 ml",
"bashing": 4,
"dispersion": 200,
diff --git a/data/json/items/gun/8x40mm.json b/data/json/items/gun/8x40mm.json
index 145263279caf9..9845f215b3620 100644
--- a/data/json/items/gun/8x40mm.json
+++ b/data/json/items/gun/8x40mm.json
@@ -6,7 +6,7 @@
"name": "RM103A automagnum",
"//": "Rivtech don't come cheap.",
"description": "Considered overkill by many, the Rivtech M103A remains one of the most powerful sidearms ever developed. Accepts stick magazines.",
- "weight": 1450,
+ "weight": "1450 g",
"volume": "750 ml",
"price": 230000,
"to_hit": -2,
@@ -39,7 +39,7 @@
"reload_noise_volume": 10,
"name": "RM11B scout rifle",
"description": "Intended to function as a long-range sharpshooter support weapon for the military, the Rivtech RM11B scout rifle was designed for durability and accuracy under less than ideal circumstances. Its bullpup layout, integrated suppressor and digital scope, and two round burst mode allows it to deliver precise long-range takedowns, utilizing the proprietary Rivtech 8mm caseless round. Accepts stick magazines.",
- "weight": 3100,
+ "weight": "3100 g",
"volume": "2 L",
"price": 2900000,
"to_hit": -1,
@@ -75,7 +75,7 @@
"reload_noise_volume": 10,
"name": "RM2000 submachine gun",
"description": "Utilizing a powerful and unusual caliber, the Rivtech RM2000 submachine gun was designed for durability and ease of carrying under less than ideal circumstances. Accepts stick magazines.",
- "weight": 1900,
+ "weight": "1900 g",
"volume": "1 L",
"price": 1900000,
"to_hit": -2,
@@ -109,7 +109,7 @@
"reload_noise_volume": 10,
"name": "RM298 HMG",
"description": "Utilizing a powerful and unusual caliber, the Rivtech RM298 heavy machine gun was designed for durability and extreme volume of sustained fire under the worst possible circumstances. Accepts RMXB500 box and RMGD250 drum magazines.",
- "weight": 24500,
+ "weight": "24500 g",
"volume": "4500 ml",
"price": 7500000,
"to_hit": -4,
@@ -137,7 +137,7 @@
"reload_noise_volume": 10,
"name": "RM51 assault rifle",
"description": "Originally produced for military use, the Rivtech RM51 assault rifle was designed for durability and ease of use under less than ideal circumstances, with its considerable bulk minimized by a compact and ergonomic layout. Accepts box magazines.",
- "weight": 2850,
+ "weight": "2850 g",
"volume": "1750 ml",
"price": 1800000,
"to_hit": -1,
@@ -172,7 +172,7 @@
"reload_noise_volume": 10,
"name": "RM614 LMG",
"description": "Utilizing a powerful and unusual caliber, the Rivtech RM614 light machine gun was designed for durability and extreme volume of sustained fire under the worst possible circumstances. Accepts RMXB500 box and RMGD250 drum magazines.",
- "weight": 4600,
+ "weight": "4600 g",
"volume": "2750 ml",
"price": 3750000,
"to_hit": -1,
@@ -209,7 +209,7 @@
"reload_noise_volume": 10,
"name": "RM88 battle rifle",
"description": "Originally produced for military use, the Rivtech RM88 battle rifle was designed for durability and extreme firepower under less than ideal circumstances, with a heavy ported barrel for maximum controllability. Accepts box and RMGD250 drum magazines.",
- "weight": 3200,
+ "weight": "3200 g",
"volume": "2500 ml",
"price": 900000,
"to_hit": -1,
@@ -245,7 +245,7 @@
"name": "RM99 revolver",
"//": "Bear in mind that most revolvers don't reach $1K. Expensive.",
"description": "Considered overkill by some, the Rivtech M99 remains an exceedingly powerful addition to the arsenal of any gunslinger.",
- "weight": 1204,
+ "weight": "1204 g",
"volume": "750 ml",
"price": 210000,
"to_hit": -2,
diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
index d6b93e9af6651..bd355100efe48 100644
--- a/data/json/items/gun/9mm.json
+++ b/data/json/items/gun/9mm.json
@@ -5,7 +5,7 @@
"reload_noise_volume": 10,
"name": "briefcase SMG",
"description": "A custom built 9x19mm submachine gun camouflaged to look as the average businessman suitcase, panes of cutting edge materials and its clever internal construction allowed it to bypass even the most scrupulous of security checkpoints. Due to the fact that the average security guard is now only concerned in eating you, this million dollar baby has been reduced to little more than a novelty item.",
- "weight": 2640,
+ "weight": "2640 g",
"volume": "1250 ml",
"price": 400000,
"bashing": 15,
@@ -19,7 +19,7 @@
"min_cycle_recoil": 450,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 5 ] ],
"armor_data": { "covers": [ "ARM_EITHER", "HAND_EITHER" ], "coverage": 10, "encumbrance": 30, "material_thickness": 1 },
- "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazines": [ [ "9mm", [ "stenmag", "survivor9mm_mag" ] ] ],
"valid_mod_locations": [ [ "rail mount", 1 ] ],
"flags": [ "OVERSIZE", "BELTED", "FANCY", "RESTRICT_HANDS" ]
@@ -32,7 +32,7 @@
"name_plural": "Calico M960",
"//": "Automatic variant. Cyclic fire rate: 750 rpm",
"description": "The Calico M960 is an automatic carbine with a unique circular magazine that allows for high capacities and reduced recoil.",
- "weight": 1680,
+ "weight": "1680 g",
"volume": "1 L",
"price": 240000,
"to_hit": -2,
@@ -61,7 +61,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
- "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "9mm", [ "calicomag" ] ] ]
},
@@ -71,7 +71,7 @@
"reload_noise_volume": 10,
"name": "Cx4 Storm",
"description": "A small pistol caliber carbine designed for police use and civilian self-defense, the Cx4 Storm uses magazines that are interchangeable with other Beretta 9x19mm handguns.",
- "weight": 2300,
+ "weight": "2300 g",
"volume": "1500 ml",
"price": 90000,
"to_hit": -1,
@@ -85,6 +85,7 @@
"ranged_damage": 2,
"dispersion": 180,
"durability": 10,
+ "min_cycle_recoil": 450,
"barrel_length": 1,
"valid_mod_locations": [
[ "accessories", 4 ],
@@ -100,7 +101,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
- "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "9mm", [ "m9bigmag", "m9mag" ] ] ]
},
@@ -110,7 +111,7 @@
"type": "GUN",
"name": "Glock 19",
"description": "Possibly the most popular pistol in existence. The Glock 19 is often derided for its plastic construction, but it is easy to shoot.",
- "weight": 595,
+ "weight": "595 g",
"volume": "500 ml",
"price": 69000,
"to_hit": -2,
@@ -123,6 +124,7 @@
"dispersion": 480,
"durability": 6,
"blackpowder_tolerance": 48,
+ "min_cycle_recoil": 380,
"magazine_well": 1,
"magazines": [ [ "9mm", [ "glockmag", "glockbigmag", "glock17_17", "glock17_22", "glock_drum_50rd", "glock_drum_100rd" ] ] ]
},
@@ -132,7 +134,7 @@
"reload_noise_volume": 10,
"name": "H&K MP5",
"description": "The Heckler & Koch MP5 is one of the most widely-used submachine guns in the world, and has been adopted by special police forces and militaries alike. Its high degree of accuracy and low recoil are universally praised.",
- "weight": 2550,
+ "weight": "2550 g",
"volume": "1250 ml",
"price": 280000,
"to_hit": -2,
@@ -162,7 +164,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
- "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazines": [ [ "9mm", [ "mp5mag", "mp5bigmag" ] ] ]
},
{
@@ -185,7 +187,6 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
- "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 12 ] ],
"built_in_mods": [ "mp5sd_suppressor" ]
},
@@ -196,7 +197,7 @@
"name": "Kel-Tec SUB-2000",
"name_plural": "Kel-Tec SUB-2000",
"description": "A uniquely designed pistol caliber carbine with an integral folding stock and that makes use of 9x19mm Glock magazines.",
- "weight": 1985,
+ "weight": "1985 g",
"volume": "1750 ml",
"price": 75000,
"to_hit": -1,
@@ -210,6 +211,7 @@
"ranged_damage": 3,
"dispersion": 180,
"durability": 7,
+ "min_cycle_recoil": 450,
"barrel_length": 1,
"built_in_mods": [ "folding_stock" ],
"valid_mod_locations": [
@@ -224,7 +226,7 @@
[ "sights", 1 ],
[ "sling", 1 ]
],
- "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "9mm", [ "glockmag", "glockbigmag", "glock17_17", "glock17_22", "glock_drum_50rd", "glock_drum_100rd" ] ] ]
},
@@ -248,7 +250,6 @@
"description": "A selective-firing 9x19mm handgun introduced by Leadworks LLC's, L39B provides accurate single-shot placement as well as controllable short-range firepower with its three-round burst mode. Users praised its accuracy and fearsome appearance. Comes with built in red dot and laser sights. Similar to other Leadworks products it doesn't accept third-party modifications.",
"price": 95000,
"burst": 3,
- "min_cycle_recoil": 450,
"relative": { "weight": 130, "durability": -1 }
},
{
@@ -258,7 +259,7 @@
"name": "L39",
"//": "L39s are based off the Robocop Auto-9, in turn a dolled-up Beretta 93R.",
"description": "A semiautomatic 9x19mm handgun introduced by Leadworks LLC's, L39 provides accurate single-shot placement in a very robust frame with built in red dot and laser sights. Several urban legends describe using it in ways that would have destroyed a lesser weapon. Similar to other Leadworks products it doesn't accept third-party modifications.",
- "weight": 935,
+ "weight": "935 g",
"volume": "500 ml",
"price": 70000,
"to_hit": -2,
@@ -270,6 +271,7 @@
"range": 1,
"dispersion": 340,
"durability": 9,
+ "min_cycle_recoil": 450,
"built_in_mods": [ "lead_red_dot_sight", "lead_laser_sight" ],
"valid_mod_locations": [
[ "accessories", 2 ],
@@ -291,7 +293,7 @@
"type": "GUN",
"name": "Beretta M9",
"description": "A very popular 9x19mm pistol, the M9 has been the standard issue sidearm of the US army since 1985.",
- "weight": 590,
+ "weight": "590 g",
"volume": "500 ml",
"price": 65000,
"to_hit": -2,
@@ -303,6 +305,7 @@
"range": 1,
"dispersion": 480,
"durability": 6,
+ "min_cycle_recoil": 450,
"magazine_well": 1,
"magazines": [ [ "9mm", [ "m9mag", "m9bigmag" ] ] ]
},
@@ -314,7 +317,7 @@
"name_plural": "pipe rifles: 9x19mm",
"//": "Despite its quality, it IS a small rifle, although not as effective as a genuine pistol carbine.",
"description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
- "weight": 2114,
+ "weight": "2114 g",
"volume": "2 L",
"price": 10000,
"to_hit": -1,
@@ -353,7 +356,7 @@
"name_plural": "Luty SMGs: 9x19mm",
"description": "A Luty pattern makeshift smoothbore SMG crudely constructed out of various steel parts using some of the more advanced powered hand tools; likely one of the most complex guns that are feasible to make outside of a machine shop, but still very unreliable. This one is chambered for 9x19mm cartridges and accepts STEN magazines, or alternatively custom-made makeshift ones.",
"//": "Crafting recipe must make use of angle grinder, bench grinder, set square and vise, which don't yet exist in game.",
- "weight": 3274,
+ "weight": "3274 g",
"volume": "1750 ml",
"price": 20000,
"to_hit": -1,
@@ -365,7 +368,7 @@
"dispersion": 590,
"durability": 4,
"blackpowder_tolerance": 24,
- "min_cycle_recoil": 325,
+ "min_cycle_recoil": 380,
"modes": [ [ "DEFAULT", "auto", 10 ] ],
"loudness": 25,
"barrel_length": 1,
@@ -390,7 +393,7 @@
"reload_noise_volume": 10,
"name": "STEN",
"description": "A British submachine gun developed during World War II, to make up for shortages of supplies. Designed to be made using unskilled labor and not known for reliability, its main advantages were low cost and being able to use German 9mm ammunition.",
- "weight": 2945,
+ "weight": "2945 g",
"volume": "1750 ml",
"price": 40000,
"bashing": 10,
@@ -415,7 +418,7 @@
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
- "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazines": [ [ "9mm", [ "stenmag", "survivor9mm_mag" ] ] ]
},
{
@@ -425,7 +428,7 @@
"name": "TEC-9",
"name_plural": "TEC-9",
"description": "The TEC-9 is a machine pistol made of cheap polymers and machine stamped parts. Its rise in popularity among criminals is largely due to its intimidating looks and low cost.",
- "weight": 1080,
+ "weight": "1080 g",
"volume": "500 ml",
"price": 125000,
"to_hit": -2,
@@ -453,7 +456,7 @@
[ "stock", 1 ],
[ "underbarrel", 1 ]
],
- "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
+ "faults": [ "fault_gun_blackpowder", "fault_gun_clogged", "fault_gun_chamber_spent" ],
"magazine_well": 1,
"magazines": [ [ "9mm", [ "tec9mag" ] ] ]
},
@@ -464,7 +467,7 @@
"name": "USP 9mm",
"name_plural": "USP 9mm",
"description": "A popular pistol, widely used among law enforcement. Extensively tested for durability, it has been found to stay accurate even after being subjected to extreme abuse.",
- "weight": 520,
+ "weight": "520 g",
"volume": "500 ml",
"price": 68000,
"to_hit": -2,
@@ -477,6 +480,7 @@
"dispersion": 400,
"durability": 9,
"blackpowder_tolerance": 48,
+ "min_cycle_recoil": 450,
"magazine_well": 1,
"magazines": [ [ "9mm", [ "usp9mag" ] ] ]
},
@@ -488,7 +492,7 @@
"name_plural": "Uzi 9mm",
"//": "SMGs aren't as commercially traded as rifles/handguns/SGs, so no cite for price points. Total weight of gun 3500 grams. Current weight of folding stock 200 grams.",
"description": "The Uzi 9x19mm has enjoyed immense popularity, selling more units than any other submachine gun. It is widely used as a personal defense weapon, or as a primary weapon by elite frontline forces.",
- "weight": 3300,
+ "weight": "3300 g",
"volume": "1250 ml",
"price": 208000,
"to_hit": -2,
@@ -525,7 +529,7 @@
"type": "GUN",
"name": "Glock 17",
"description": "Designed for all shooters, the Glock 17 is marketed towards law-enforcement and military.",
- "weight": 595,
+ "weight": "595 g",
"volume": "500 ml",
"price": 69000,
"to_hit": -2,
@@ -537,6 +541,7 @@
"dispersion": 480,
"durability": 6,
"blackpowder_tolerance": 48,
+ "min_cycle_recoil": 380,
"magazine_well": 1,
"//": "Glock 17s cannot load a 15 round magazine. See http://guns-of-fun.com/portals/0/LiveContent/Mounts/Glock-Mags-Comp.jpg and #33038",
"magazines": [ [ "9mm", [ "glockbigmag", "glock17_17", "glock17_22", "glock_drum_50rd", "glock_drum_100rd" ] ] ]
@@ -549,8 +554,7 @@
"description": "A selective fire variation on the Glock 17, originally designed for Austria's EKO Cobra unit. It has compensator cuts along its barrel to make recoil more manageable.",
"price": 100000,
"burst": 20,
- "built_in_mods": [ "barrel_ported" ],
- "min_cycle_recoil": 325
+ "built_in_mods": [ "barrel_ported" ]
},
{
"id": "kpf9",
@@ -558,12 +562,13 @@
"type": "GUN",
"name": "Kel-Tec PF-9",
"description": "The Kel-Tec PF-9 remains one of the most popular backup pistols due to its history of reliability, affordability, and concealability. Chambered in 9x19mm, recoil is best described as unpleasant, and follow up shots are difficult to place quickly.",
- "weight": 360,
+ "weight": "360 g",
"volume": "360ml",
"ranged_damage": -1,
"price": 18000,
"bashing": 2,
"ammo": "9mm",
+ "min_cycle_recoil": 450,
"magazines": [ [ "9mm", [ "kpf9mag" ] ] ]
},
{
@@ -572,7 +577,7 @@
"type": "GUN",
"name": "M17",
"description": "The M17 is a semi automatic, short recoil operated pistol derived from the SIG Sauer P320.",
- "weight": 800,
+ "weight": "800 g",
"volume": "500 ml",
"price": 69000,
"to_hit": -2,
@@ -582,6 +587,7 @@
"ammo": "9mm",
"dispersion": 480,
"durability": 6,
+ "min_cycle_recoil": 450,
"magazine_well": 1,
"magazines": [ [ "9mm", [ "p320mag_17rd_9x19mm" ] ] ]
},
@@ -591,7 +597,7 @@
"type": "GUN",
"name": "Browning Hi-Power 9x19mm",
"description": "The Browning Hi-Power is a semi-automatic handgun developed shortly before the second world war. Widely issued since then, it remains in use by India, Canada and Australia. This is a commercial variant produced by Browning Arms in 9x19mm Parabellum.",
- "weight": 900,
+ "weight": "900 g",
"volume": "418 ml",
"price": 32000,
"to_hit": -2,
@@ -610,7 +616,7 @@
"type": "GUN",
"name": "Walther P38",
"description": "The Walther P38 is a semi-automatic handgun adopted shortly before the second world war. Developed due to the high production costs of its predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum. This early DA/SA locked-breech design would introduce features later seen on more modern firearms such as the Beretta 92 series, and served Germany until 2004.",
- "weight": 950,
+ "weight": "950 g",
"volume": "547 ml",
"price": 39000,
"to_hit": -2,
@@ -629,7 +635,7 @@
"type": "GUN",
"name": "Walther PPQ 9mm",
"description": "The Walther PPQ is a semi-automatic pistol originating from the Walther P99QA, and maintains compatibility with some of its predecessor's accessories. This model is chambered in 9x19mm Parabellum.",
- "weight": 615,
+ "weight": "615 g",
"volume": "413 ml",
"price": 65000,
"bashing": 8,
@@ -647,7 +653,7 @@
"type": "GUN",
"name": "Hi-Point C-9",
"description": "The Hi-Point C-9 is a blowback operated semi automatic pistol designed by Hi-Point Firearms, which is known for making inexpensive firearms, and for making said firearms bulky and uncomfortable. Hi-Points have slides made with a zinc pot-metal which is relatively fragile compared to steel slides.",
- "weight": 709,
+ "weight": "709 g",
"volume": "539 ml",
"price": 7500,
"to_hit": -2,
@@ -666,7 +672,7 @@
"type": "GUN",
"name": "CZ-75",
"description": "The CZ-75 is a semi-automatic pistol developed in Czechoslovakia, and is one of the original wonder nines. Though designed for export to western countries, it was declared a state secret; lack of international patent protection meant that many clones and variants were produced and distributed around the world, with Česká zbrojovka only joining in the 90's. This pistol remains wildly popular among competition shooters.",
- "weight": 1120,
+ "weight": "1120 g",
"volume": "526 ml",
"price": 10000,
"to_hit": -2,
@@ -685,7 +691,7 @@
"type": "GUN",
"name": "Walther CCP",
"description": "The Walther CCP is a gas-delayed blowback semi-automatic pistol intended for the concealed carry consumer market. Internally, it is nearly identical to the cult classic H&K P7. Its fixed barrel design makes it potentially more accurate than many other pistols, though this may difficult to realize with its average trigger and short sight radius.",
- "weight": 633,
+ "weight": "633 g",
"volume": "318 ml",
"price": 12500,
"to_hit": -2,
diff --git a/data/json/items/gun/9x18.json b/data/json/items/gun/9x18.json
index 3a20ab8353523..78d0fb13b3bc9 100644
--- a/data/json/items/gun/9x18.json
+++ b/data/json/items/gun/9x18.json
@@ -6,7 +6,7 @@
"name": "Makarov PM",
"//": "10 and 12-round magazines exist, but were made for the newer PMM, and are not compatible with the old PM.",
"description": "The Pistolet Makarova was developed by the Soviet Union to replace the WWII-era TT-33 pistol. It uses the 9x18mm cartridge, which remains in use among various former Soviet countries.",
- "weight": 730,
+ "weight": "730 g",
"volume": "250 ml",
"price": 25000,
"to_hit": -2,
@@ -16,6 +16,7 @@
"ammo": "9x18",
"dispersion": 480,
"durability": 6,
+ "min_cycle_recoil": 270,
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
@@ -39,8 +40,9 @@
"name": "Skorpion Vz. 82",
"//": "Total unloaded weight of gun 1451.496 grams, rounded to 1451. Current weight of folding stock 200 grams.",
"description": "A version of the Skorpion submachine gun chambered in 9x18mm Makarov, with a slightly longer barrel than the original design.",
- "weight": 1251,
+ "weight": "1251 g",
"ammo": "9x18",
+ "min_cycle_recoil": 270,
"burst": 15,
"magazines": [ [ "9x18", [ "skorpion82mag" ] ] ]
}
diff --git a/data/json/items/gun/atgm.json b/data/json/items/gun/atgm.json
index f8f7390f39c20..0f85ccb6cda32 100644
--- a/data/json/items/gun/atgm.json
+++ b/data/json/items/gun/atgm.json
@@ -6,7 +6,7 @@
"name": "BGM-71F TOW",
"name_plural": "BGM-71F TOW",
"description": "A launcher for anti-tank guided missiles, capable of being deployed as a crew-served weapon or mounted on vehicles. While fairly accurate, it isn't fire-and-forget.",
- "weight": 93000,
+ "weight": "93000 g",
"volume": "25 L",
"price": 8500000,
"to_hit": -6,
diff --git a/data/json/items/gun/bio.json b/data/json/items/gun/bio.json
index 02ba153c2033a..1d7fef4a58782 100644
--- a/data/json/items/gun/bio.json
+++ b/data/json/items/gun/bio.json
@@ -24,7 +24,7 @@
"type": "GUN",
"name": "EMP Projector",
"description": "this a pseudo item",
- "weight": 2950,
+ "weight": "2950 g",
"volume": "2 L",
"price": 1600000,
"to_hit": -1,
diff --git a/data/json/items/gun/blunderbuss.json b/data/json/items/gun/blunderbuss.json
index 9a834c72f8c3e..1dbd7fac55f2b 100644
--- a/data/json/items/gun/blunderbuss.json
+++ b/data/json/items/gun/blunderbuss.json
@@ -6,7 +6,7 @@
"name": "blunderbuss",
"name_plural": "blunderbusses",
"description": "A homemade version of a crude precursor to the shotgun. Able to fire just about anything you put down the barrel, but it will degrade pretty quick.",
- "weight": 8267,
+ "weight": "8267 g",
"volume": "3 L",
"price": 15000,
"to_hit": -1,
diff --git a/data/json/items/gun/chemical_spray.json b/data/json/items/gun/chemical_spray.json
index 843960a5ca5e2..9e7dc9c1eb01e 100644
--- a/data/json/items/gun/chemical_spray.json
+++ b/data/json/items/gun/chemical_spray.json
@@ -6,7 +6,7 @@
"reload_noise": "slosh.",
"name": "makeshift chemical thrower",
"description": "A bulky, self-made chemical sprayer with an internal conversion mechanism that allows all sorts of chemicals to be dispersed to your surroundings.",
- "weight": 4588,
+ "weight": "4588 g",
"volume": "4250 ml",
"price": 10000,
"to_hit": -1,
diff --git a/data/json/items/gun/faults_gun.json b/data/json/items/gun/faults_gun.json
index e83d7b8b47655..3211654de0a80 100644
--- a/data/json/items/gun/faults_gun.json
+++ b/data/json/items/gun/faults_gun.json
@@ -11,6 +11,15 @@
"tools": [ [ [ "pipe_cleaner", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ]
}
},
+ {
+ "id": "fault_gun_chamber_spent",
+ "type": "fault",
+ "name": "spent casing in chamber",
+ "description": "This gun currently has an empty casing chambered. It will have to be removed before firing.",
+ "time": 50,
+ "skills": [ ],
+ "requirements": { }
+ },
{
"id": "fault_gun_clogged",
"type": "fault",
diff --git a/data/json/items/gun/flammable.json b/data/json/items/gun/flammable.json
index f9e5bf69e087a..f085a27d79d28 100644
--- a/data/json/items/gun/flammable.json
+++ b/data/json/items/gun/flammable.json
@@ -5,7 +5,7 @@
"type": "GUN",
"name": "flamethrower",
"description": "A large flamethrower with substantial gas reserves. Very menacing and deadly.",
- "weight": 1587,
+ "weight": "1587 g",
"volume": "4 L",
"price": 80000,
"to_hit": -1,
@@ -32,7 +32,7 @@
"type": "GUN",
"name": "RM451 flamethrower",
"description": "A military-grade combat flamethrower designed by Rivtech, the RM451 flamethrower incorporates a cycling pressure rapid-feed fuel system with a high-speed piezoelectric igniter. Solidly built with durability in mind, it serves as an incredibly destructive weapon in the right hands.",
- "weight": 1320,
+ "weight": "1320 g",
"volume": "3500 ml",
"price": 970000,
"to_hit": -1,
diff --git a/data/json/items/gun/flintlock.json b/data/json/items/gun/flintlock.json
index be315774cc83d..0b42d0d1992ba 100644
--- a/data/json/items/gun/flintlock.json
+++ b/data/json/items/gun/flintlock.json
@@ -34,7 +34,7 @@
"reload_noise_volume": 10,
"name": "flintlock pistol",
"description": "A beautifully decorated flintlock pistol. If using this doesn't makes you feel a pirate, nothing will.",
- "weight": 753,
+ "weight": "753 g",
"volume": "750 ml",
"price": 35000,
"to_hit": -1,
@@ -66,7 +66,7 @@
"reload_noise_volume": 10,
"name": "flintlock rifle",
"description": "For once, something *good* came back from the dead. This ancient design lacks the fire-rate of modern weapons, but packs as much punch as the best of 'em and rewards the skilled shooter with easily-crafted ammunition.",
- "weight": 1950,
+ "weight": "1950 g",
"volume": "2500 ml",
"price": 41000,
"to_hit": -1,
diff --git a/data/json/items/gun/metal_rail.json b/data/json/items/gun/metal_rail.json
index ab70e915530f9..53c94951b072b 100644
--- a/data/json/items/gun/metal_rail.json
+++ b/data/json/items/gun/metal_rail.json
@@ -5,7 +5,7 @@
"reload_noise_volume": 10,
"name": "heavy rail rifle",
"description": "This overpowered and overengineered variant of the ferromagnetic rail rifle was designed to deliver electromagnetically-driven obliteration right through whatever obstacles that lies in front of it, be it buildings, vehicles or hordes of walking dead. However, the hefty bulk and weight of this weapon compared to most contemporary rifles makes it somewhat cumbersome to wield; not to mention that it consumes UPS charges at a tremendous rate, making it impractical for use in prolonged engagements.",
- "weight": 11500,
+ "weight": "11500 g",
"volume": "4500 ml",
"price": 900000,
"to_hit": -1,
@@ -41,7 +41,7 @@
"reload_noise_volume": 10,
"name": "ferromagnetic rail rifle",
"description": "A single-shot, electrically propelled, steel rail launcher handcrafted from scrap. The hypervelocity metal stake that it fires is accelerated to the point of spontaneous combustion by a Lorentz force generated by electromagnetic induction, powered by a standard UPS.",
- "weight": 4213,
+ "weight": "4213 g",
"volume": "2500 ml",
"price": 550000,
"to_hit": -3,
diff --git a/data/json/items/gun/monster_gun.json b/data/json/items/gun/monster_gun.json
index 8806081e2f6ca..c8506e441fb22 100644
--- a/data/json/items/gun/monster_gun.json
+++ b/data/json/items/gun/monster_gun.json
@@ -1,33 +1,33 @@
-{
- "id": "barb_launcher",
- "type": "GUN",
- "symbol": "%",
- "color": "red",
- "name": "barb launching organ",
- "description": "A mutated organ capable of launching bony barbs at great speed.",
- "material": [
- "hflesh"
- ],
- "flags": [
- "PRIMITIVE_RANGED_WEAPON",
- "NEVER_JAMS",
- "NONCONDUCTIVE",
- "NO_REPAIR",
- "WATERPROOF_GUN",
- "NO_SALVAGE",
- "NO_UNLOAD",
- "RELOAD_AND_SHOOT"
- ],
- "skill": "pistol",
- "ammo": "barb",
- "clip_size": 1,
- "weight": 540,
- "volume": "750ml",
- "bashing": 2,
- "to_hit": 1,
- "reload_noise_volume": 2,
- "loudness": 2,
- "range": 12,
- "dispersion": 100,
- "durability": 8
-}
+[
+ {
+ "id": "barb_launcher",
+ "type": "GUN",
+ "symbol": "%",
+ "color": "red",
+ "name": "barb launching organ",
+ "description": "A mutated organ capable of launching bony barbs at great speed.",
+ "material": [ "hflesh" ],
+ "flags": [
+ "PRIMITIVE_RANGED_WEAPON",
+ "NEVER_JAMS",
+ "NONCONDUCTIVE",
+ "NO_REPAIR",
+ "WATERPROOF_GUN",
+ "NO_SALVAGE",
+ "NO_UNLOAD",
+ "RELOAD_AND_SHOOT"
+ ],
+ "skill": "pistol",
+ "ammo": "barb",
+ "clip_size": 1,
+ "weight": "540 g",
+ "volume": "750ml",
+ "bashing": 2,
+ "to_hit": 1,
+ "reload_noise_volume": 2,
+ "loudness": 2,
+ "range": 12,
+ "dispersion": 100,
+ "durability": 8
+ }
+]
diff --git a/data/json/items/gun/nail.json b/data/json/items/gun/nail.json
index 00893999384b7..e38c791c11c53 100644
--- a/data/json/items/gun/nail.json
+++ b/data/json/items/gun/nail.json
@@ -6,7 +6,7 @@
"name": "coilgun",
"//": "Hard to make, plentiful and cheap ammo, and silent - people will want this thing.",
"description": "A homemade gun, using electromagnets to accelerate a ferromagnetic projectile to high velocity. Powered by UPS.",
- "weight": 3341,
+ "weight": "3341 g",
"volume": "2750 ml",
"price": 75000,
"to_hit": -2,
@@ -38,7 +38,7 @@
"reload_noise_volume": 10,
"name": "nail gun",
"description": "A tool used to drive nails into wood or other material. It could also be used as a ad-hoc weapon.",
- "weight": 3904,
+ "weight": "3904 g",
"volume": "750 ml",
"price": 13000,
"to_hit": -2,
diff --git a/data/json/items/gun/paintball.json b/data/json/items/gun/paintball.json
index 50aa9daf9882e..5dfb5b8954cc7 100644
--- a/data/json/items/gun/paintball.json
+++ b/data/json/items/gun/paintball.json
@@ -12,7 +12,7 @@
"flags": "NEVER_JAMS",
"skill": "smg",
"ammo": "paintball",
- "weight": 1600,
+ "weight": "1600 g",
"volume": "1250 ml",
"bashing": 5,
"to_hit": -1,
diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
index 761aa6b99a418..4321239ab327c 100644
--- a/data/json/items/gun/shot.json
+++ b/data/json/items/gun/shot.json
@@ -5,7 +5,7 @@
"type": "GUN",
"name": "heavy automatic shotgun",
"description": "Modified from the massive M2 Browning, this heavy machine gun has been re-chambered and re-bored for shotgun shells, and completely redesigned to be wielded unmounted by one user.",
- "weight": 21800,
+ "weight": "21800 g",
"volume": "4 L",
"price": 745000,
"to_hit": -3,
@@ -27,7 +27,7 @@
"reload_noise_volume": 10,
"name": "12 gauge pistol",
"description": "A single shot pistol that loads 12 gauge shotgun shells, handcrafted from scrap.",
- "weight": 828,
+ "weight": "828 g",
"volume": "500 ml",
"price": 100000,
"to_hit": -2,
@@ -60,7 +60,7 @@
"name": "manual autoshotgun",
"//": "Hard to value this thing, but considering what a $2000 pricepoint puts it on par with, that is too much.",
"description": "A six-barrel hand-cranked automatic shotgun made from bicycle parts. Though a bit unwieldy, it is exceedingly powerful for such a simple machine.",
- "weight": 4980,
+ "weight": "4980 g",
"volume": "2500 ml",
"price": 180000,
"to_hit": -2,
@@ -89,7 +89,7 @@
"name": "Kel-Tec KSG",
"name_plural": "Kel-Tec KSG",
"description": "A bullpup pump-action shotgun, the Kel-Tec KSG uses a pair of magazine tubes to increase its capacity. Each tube has to be loaded separately, but this offers the option of loading different ammunition for different situations.",
- "weight": 1550,
+ "weight": "1550 g",
"volume": 0,
"price": 99000,
"to_hit": -1,
@@ -122,7 +122,7 @@
"name_plural": "L12 Defender",
"//": "Similar stats to the NeoStead 2000 which has a similar operating mechanism",
"description": "Leadworks LLC's sole shotgun offering to date is surprisingly compact thanks to its moving barrel and forward-back pump mechanism. Additionally it has built in red dot and laser sights. Like most other Leadworks products it doesn't accept third-party modifications.",
- "weight": 3850,
+ "weight": "3850 g",
"volume": "1500 ml",
"price": 92000,
"to_hit": -1,
@@ -152,7 +152,7 @@
"name": "M1014 shotgun",
"name_plural": "M1014 shotguns",
"description": "Its relative simplicity and reliability made the Benelli M4 the most successful semi-automatic shotgun ever created.",
- "weight": 3820,
+ "weight": "3820 g",
"volume": "2500 ml",
"price": 169900,
"to_hit": -1,
@@ -172,7 +172,7 @@
"name": "Mossberg 500",
"name_plural": "Mossberg 500",
"description": "The Mossberg 500 is a popular series of pump-action shotguns, often acquired for military use. It is noted for its high durability and low recoil.",
- "weight": 3401,
+ "weight": "3401 g",
"volume": "2500 ml",
"price": 53800,
"to_hit": -1,
@@ -211,7 +211,7 @@
"type": "GUN",
"name": "pipe shotgun",
"description": "A home-made shotgun. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
- "weight": 2267,
+ "weight": "2267 g",
"volume": "2250 ml",
"price": 20000,
"to_hit": -1,
@@ -243,7 +243,7 @@
"name": "Remington 870",
"name_plural": "Remington 870",
"description": "One of the most popular shotguns on the market, the Remington 870 is used by hunters and law enforcement agencies alike thanks to its high accuracy and muzzle velocity.",
- "weight": 3400,
+ "weight": "3400 g",
"volume": "2500 ml",
"price": 58700,
"to_hit": -1,
@@ -261,7 +261,7 @@
"type": "GUN",
"name": "shotgun revolver",
"description": "A shotgun modified to use a revolver cylinder mechanism, it can hold 6 cartridges.",
- "weight": 5443,
+ "weight": "5443 g",
"volume": "3 L",
"price": 75000,
"to_hit": -1,
@@ -290,7 +290,7 @@
"type": "GUN",
"name": "Saiga-12",
"description": "The Saiga-12 is a semi-automatic shotgun designed on the same Kalashnikov pattern as the AK47 rifle. It reloads with a magazine, rather than one shell at a time like most shotguns.",
- "weight": 3550,
+ "weight": "3550 g",
"volume": "2750 ml",
"price": 189000,
"to_hit": -1,
@@ -331,7 +331,7 @@
"type": "GUN",
"name": "single barrel shotgun",
"description": "An old shotgun, possibly antique. It is little more than a barrel, a wood stock, and a hammer to strike the cartridge. Its simple design keeps it both light and accurate.",
- "weight": 5216,
+ "weight": "5216 g",
"volume": "2 L",
"price": 40000,
"to_hit": -1,
@@ -361,7 +361,7 @@
"type": "GUN",
"name": "handmade lever shotgun",
"description": "A well designed homemade lever-action shotgun. With a 8 round magazine, this is one of the better homemade weapons.",
- "weight": 3934,
+ "weight": "3934 g",
"volume": "2500 ml",
"price": 135000,
"to_hit": -1,
diff --git a/data/json/items/gun/signal_flare.json b/data/json/items/gun/signal_flare.json
index 0093e286bd648..9c87aa5321cf6 100644
--- a/data/json/items/gun/signal_flare.json
+++ b/data/json/items/gun/signal_flare.json
@@ -5,7 +5,7 @@
"reload_noise_volume": 10,
"name": "flaregun",
"description": "A plastic single shot pistol that can be loaded with signal flares.",
- "weight": 213,
+ "weight": "213 g",
"volume": "500 ml",
"price": 5000,
"material": [ "plastic", "steel" ],
diff --git a/data/json/items/gun/ups.json b/data/json/items/gun/ups.json
index 9c79cb2a598f4..31ce0f1b34b01 100644
--- a/data/json/items/gun/ups.json
+++ b/data/json/items/gun/ups.json
@@ -5,7 +5,7 @@
"reload_noise_volume": 10,
"name": "XM34 EMP projector",
"description": "A powerful electrolaser developed by the R&D outfit \"Aerial Labs\". Especially effective against electronic targets.",
- "weight": 2950,
+ "weight": "2950 g",
"volume": "3 L",
"price": 1600000,
"to_hit": -1,
@@ -42,7 +42,7 @@
"reload_noise_volume": 20,
"name": "CMES laser cannon",
"description": "This is the integral weapon system for the CMES exoskeleton mech-suit, a rotating-barrel active-cooled rapid-fire laser system, can spray death downrange with ease.",
- "weight": 39500,
+ "weight": "39500 g",
"volume": "11 L",
"price": 9500000,
"to_hit": -4,
@@ -69,7 +69,7 @@
"reload_noise_volume": 2,
"name": "RMES marksman system",
"description": "This is the integral weapon system for the RMES exoskeleton mech-suit, a quiet and accurate marksman laser rifle.",
- "weight": 12500,
+ "weight": "12500 g",
"volume": "5500 ml",
"price": 9500000,
"to_hit": -2,
@@ -86,7 +86,6 @@
"loudness": 1,
"ups_charges": 180,
"reload": 0,
- "default_mods": [ "inter_bayonet" ],
"ammo_effects": [ "LASER", "INCENDIARY" ],
"flags": [ "NO_UNLOAD", "NEVER_JAMS", "MECH_WEAPON", "NO_UNWIELD", "NO_SALVAGE", "NO_REPAIR", "UNBREAKABLE_MELEE" ]
},
@@ -96,7 +95,7 @@
"reload_noise_volume": 10,
"name": "handheld laser cannon",
"description": "This is a laser cannon stripped from the barrel of a TX-5LR Cerberus laser turret that has been modified to use UPS power for firing.",
- "weight": 5140,
+ "weight": "5140 g",
"volume": "1500 ml",
"price": 400000,
"to_hit": -1,
@@ -132,7 +131,7 @@
"reload_noise_volume": 10,
"name": "A7 laser rifle",
"description": "A state of the art laser rifle developed by the R&D outfit \"Aerial Labs\". Initial performance rivaled Rivtech's finest, with rumors flying about corporate skulduggery. Though the cataclysm put that on the ash heap of history, this weapon can still do the same to your foes.",
- "weight": 2950,
+ "weight": "2950 g",
"volume": "3 L",
"price": 1600000,
"to_hit": -1,
@@ -170,7 +169,7 @@
"reload_noise_volume": 10,
"name": "V29 laser pistol",
"description": "The V29 laser pistol was designed in the mid-21st century and was one of the first handheld laser weapons. It is larger than most traditional handguns, but displays no recoil whatsoever.",
- "weight": 680,
+ "weight": "680 g",
"volume": "1 L",
"price": 720000,
"to_hit": -2,
@@ -199,41 +198,5 @@
],
"ammo_effects": [ "LASER", "INCENDIARY" ],
"flags": [ "NEVER_JAMS", "NO_UNLOAD" ]
- },
- {
- "id": "v29_cheap",
- "type": "GUN",
- "reload_noise_volume": 10,
- "name": "homemade laser pistol",
- "description": "This laser pistol was based on the V29 laser pistol designed in the mid-21st century. While little more than duct tape and electronics, it runs on a standard UPS.",
- "weight": 540,
- "volume": "2 L",
- "price": 500000,
- "to_hit": -2,
- "bashing": 5,
- "material": [ "steel", "plastic" ],
- "symbol": "(",
- "color": "magenta",
- "skill": "pistol",
- "range": 30,
- "ranged_damage": 10,
- "pierce": 6,
- "dispersion": 180,
- "durability": 4,
- "loudness": 7,
- "ups_charges": 20,
- "reload": 300,
- "valid_mod_locations": [
- [ "accessories", 2 ],
- [ "emitter", 1 ],
- [ "grip", 1 ],
- [ "lens", 1 ],
- [ "rail", 1 ],
- [ "sights", 1 ],
- [ "stock", 1 ],
- [ "underbarrel mount", 1 ]
- ],
- "ammo_effects": [ "LASER", "INCENDIARY" ],
- "flags": [ "NO_UNLOAD" ]
}
]
diff --git a/data/json/items/gunmod/accessories.json b/data/json/items/gunmod/accessories.json
index cf38eff2d85e6..0f24b985a77e8 100644
--- a/data/json/items/gunmod/accessories.json
+++ b/data/json/items/gunmod/accessories.json
@@ -4,7 +4,7 @@
"type": "GUNMOD",
"name": "arrow rest",
"description": "A small extension above the grip which an arrow rests upon while being aimed. Improves accuracy with no drawbacks.",
- "weight": 16,
+ "weight": "16 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 4000,
@@ -21,7 +21,7 @@
"type": "GUNMOD",
"name": "bow stabilizer",
"description": "A counterweight placed forward of the bow's grip allows for greater accuracy. Aside from increased weight and size, there are no drawbacks.",
- "weight": 88,
+ "weight": "88 g",
"volume": "500 ml",
"price": 4000,
"material": [ "aluminum", "plastic" ],
@@ -38,7 +38,7 @@
"type": "GUNMOD",
"name": "bow stabilizer system",
"description": "A set of three stabilizing, dampened rods with a spring-loaded bracket to mount on modern bows. Takes extra time to set up when wielding, but doesn't take much extra space.",
- "weight": 300,
+ "weight": "300 g",
"volume": "500 ml",
"price": 15000,
"material": [ "aluminum", "plastic" ],
@@ -56,7 +56,7 @@
"type": "GUNMOD",
"name": "bow dampening kit",
"description": "A set of simple pads and strips of fur or rubber with adhesive backing, designed to stick on the limbs and string of a bow to absorb vibrations. This substantially reduces noise during firing and can help with accuracy.",
- "weight": 50,
+ "weight": "50 g",
"volume": "250 ml",
"price": 500,
"material": [ "plastic" ],
@@ -74,7 +74,7 @@
"type": "GUNMOD",
"name": "belt clip",
"description": "This is a belt clip that attaches to the grip or slide of a pistol so as to facilitate 'Mexican carry', the practice of carrying without a holster. It does not offer any protection for the trigger, so users are strongly advised to carry with the chamber empty or select a firearm with a very heavy trigger pull.",
- "weight": 40,
+ "weight": "40 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 2000,
diff --git a/data/json/items/gunmod/barrel.json b/data/json/items/gunmod/barrel.json
index ecd2fa06f61e5..e0cdf596f6a2a 100644
--- a/data/json/items/gunmod/barrel.json
+++ b/data/json/items/gunmod/barrel.json
@@ -20,7 +20,7 @@
"type": "GUNMOD",
"name": "upstest",
"description": "Testmod for UPS drain on mods, this should never spawn, if you see this, it's a bug. 50 UPS drain.",
- "weight": 450,
+ "weight": "450 g",
"volume": "500 ml",
"price": 20000,
"bashing": 5,
diff --git a/data/json/items/gunmod/bionicmods.json b/data/json/items/gunmod/bionicmods.json
index dcd43b18d773e..81c97d0cee89f 100644
--- a/data/json/items/gunmod/bionicmods.json
+++ b/data/json/items/gunmod/bionicmods.json
@@ -4,7 +4,7 @@
"type": "GUNMOD",
"name": "Power shot",
"description": "This is a pseudo item -- the builtin part of a fusion blaster for the maximum power firing mode.",
- "weight": 1,
+ "weight": "1 g",
"volume": 0,
"price": 85000,
"material": [ "steel" ],
diff --git a/data/json/items/gunmod/brass_catcher.json b/data/json/items/gunmod/brass_catcher.json
index faa9f0023a093..9319edf089cb8 100644
--- a/data/json/items/gunmod/brass_catcher.json
+++ b/data/json/items/gunmod/brass_catcher.json
@@ -4,7 +4,7 @@
"type": "GUNMOD",
"name": "brass catcher",
"description": "A bag that hangs off the side of your gun and catches ejected casings so you don't have to pick them up.",
- "weight": 114,
+ "weight": "114 g",
"volume": "250 ml",
"price": 2000,
"material": [ "cotton" ],
diff --git a/data/json/items/gunmod/conversions.json b/data/json/items/gunmod/conversions.json
index 0c09d24470176..c1f590501879e 100644
--- a/data/json/items/gunmod/conversions.json
+++ b/data/json/items/gunmod/conversions.json
@@ -4,7 +4,7 @@
"type": "GUNMOD",
"name": ".300 AAC Blackout AR-15 conversion kit",
"description": "A complete AR-15 upper assembly with a .300 AAC Blackout barrel.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "500 ml",
"integral_volume": 0,
"integral_weight": 0,
@@ -13,7 +13,7 @@
"symbol": ":",
"color": "green",
"location": "bore",
- "mod_targets": [ "ar15", "m4a1", "h&k416a5", "m27iar" ],
+ "mod_targets": [ "ar15", "m4a1", "m16a4", "h&k416a5", "m27iar" ],
"install_time": "1 m",
"ammo_modifier": "300blk",
"magazine_adaptor": [ [ "300blk", [ "stanag30", "stanag50" ] ] ],
diff --git a/data/json/items/gunmod/grip.json b/data/json/items/gunmod/grip.json
index 95170309ca7e6..d941a244cdc81 100644
--- a/data/json/items/gunmod/grip.json
+++ b/data/json/items/gunmod/grip.json
@@ -4,7 +4,7 @@
"type": "GUNMOD",
"name": "lightweight replacement furniture",
"description": "A set of lightweight composite grips and furniture that reduces a firearm's weight, and as a consequence, its handling and melee damage.",
- "weight": 140,
+ "weight": "140 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 48000,
@@ -22,7 +22,7 @@
"type": "GUNMOD",
"name": "ergonomic grip",
"description": "A set of ergonomic replacement furniture for a firearm improving handling.",
- "weight": 125,
+ "weight": "125 g",
"volume": "250 ml",
"integral_volume": 0,
"integral_weight": 0,
diff --git a/data/json/items/gunmod/laser_gunmods.json b/data/json/items/gunmod/laser_gunmods.json
index d810e72de47ac..3646b1e600f49 100644
--- a/data/json/items/gunmod/laser_gunmods.json
+++ b/data/json/items/gunmod/laser_gunmods.json
@@ -4,7 +4,7 @@
"type": "GUNMOD",
"name": "beam scatterer",
"description": "A set of optics made to fit on laser weapons, which will diffract the laser beam into several lower powered beams. This increases point-blank damage, but greatly reduces range.",
- "weight": 380,
+ "weight": "380 g",
"volume": "250 ml",
"price": 84000,
"material": [ "steel" ],
@@ -22,7 +22,7 @@
"type": "GUNMOD",
"name": "focusing lens",
"description": "A set of optics to concentrate the laser beam on a smaller focus point. This increases range and damage output, but complicates targeting.",
- "weight": 380,
+ "weight": "380 g",
"volume": "250 ml",
"price": 84000,
"material": [ "steel" ],
@@ -40,7 +40,7 @@
"type": "GUNMOD",
"name": "electrolaser conversion",
"description": "A set of high-tech electronics and optics. These converts a laser pistol into a less-lethal electrolaser capable of stunning targets, at the cost of a decreased damage output and increased power consumption.",
- "weight": 380,
+ "weight": "380 g",
"volume": "1 L",
"price": 84000,
"material": [ "steel" ],
@@ -59,7 +59,7 @@
"type": "GUNMOD",
"name": "effective emitter",
"description": "A set of electronics to optimize emitter workcycle and increase overall energy efficiency. Decreases power consumption.",
- "weight": 380,
+ "weight": "380 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 84000,
@@ -76,7 +76,7 @@
"type": "GUNMOD",
"name": "high density capacitor",
"description": "A capacitor with a higher energy density increases range and damage; at the cost of a markedly increased power consumption.",
- "weight": 380,
+ "weight": "380 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 84000,
diff --git a/data/json/items/gunmod/magazine.json b/data/json/items/gunmod/magazine.json
index ef24027bb3606..df499def0809c 100644
--- a/data/json/items/gunmod/magazine.json
+++ b/data/json/items/gunmod/magazine.json
@@ -4,7 +4,7 @@
"type": "GUNMOD",
"name": "Leadworks magazine adapter",
"description": "A bootleg adapter for permanently converting a firearm to accept proprietary Leadworks magazines. Guaranteed to void your warranty.",
- "weight": 140,
+ "weight": "140 g",
"volume": "250 ml",
"integral_volume": "250 ml",
"price": 48000,
diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json
index f64a0f939545a..38f8645fe82e4 100644
--- a/data/json/items/gunmod/mechanism.json
+++ b/data/json/items/gunmod/mechanism.json
@@ -4,7 +4,7 @@
"type": "GUNMOD",
"name": "match trigger",
"description": "A precision weighted trigger assembly that slightly improves a firearm's accuracy.",
- "weight": 120,
+ "weight": "120 g",
"volume": "250 ml",
"integral_volume": 0,
"integral_weight": 0,
@@ -23,7 +23,7 @@
"type": "GUNMOD",
"name": "drop-in auto sear",
"description": "This is a vaguely 'U' shaped piece of metal with a vaguely 'T' shaped flapper on a pin. Once tucked into an AR-15's lower receiver, the rifle will become selective fire-capable. The handcrafted-sear surface isn't as good as actual full-auto parts, so precision and reliability suffer slightly.",
- "weight": 113,
+ "weight": "113 g",
"volume": "250 ml",
"integral_volume": 0,
"integral_weight": 0,
@@ -45,7 +45,7 @@
"type": "GUNMOD",
"name": "lightning link",
"description": "Originally designed for the Colt SP-1, this 'reproduction' is intended to convert an AR-15 into a full-auto only rifle. Once the necessary modifications are made and the link is in place, semi-auto is disabled and full-auto is enabled. Reliability and precision suffer greatly due to questionable craftsmanship and lack of unobtainium SP-1 parts.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 24000,
@@ -69,7 +69,7 @@
"type": "GUNMOD",
"name": "firearm waterproofing",
"description": "A set of seals and gaskets that will allow a firearm to operate reliably while submerged in water.",
- "weight": 220,
+ "weight": "220 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 50000,
diff --git a/data/json/items/gunmod/mount.json b/data/json/items/gunmod/mount.json
index 0f3cf6a6c46e4..a696327589556 100644
--- a/data/json/items/gunmod/mount.json
+++ b/data/json/items/gunmod/mount.json
@@ -4,7 +4,7 @@
"type": "GUNMOD",
"name": "replaceable furniture kit",
"description": "This is a kit consisting of various steel and plastic parts; when installed, it would permanently modify and partially replace some of the weapon's furniture so that it could be easily changed if needed. This allows installing any kind of more advanced grips or other furniture.",
- "weight": 80,
+ "weight": "80 g",
"volume": "50ml",
"integral_volume": 0,
"price": 6000,
@@ -23,7 +23,7 @@
"type": "GUNMOD",
"name": "side mount",
"description": "This is a plastic mount for attaching a rail accessory, designed to be permanently installed onto almost any weapon, along with some fasteners. Ideal for bringing out your inner tacticool on older guns.",
- "weight": 10,
+ "weight": "10 g",
"volume": "8ml",
"price": 6000,
"material": [ "steel", "plastic" ],
@@ -41,7 +41,7 @@
"type": "GUNMOD",
"name": "sights mount",
"description": "This is a plastic mount for attaching a sight, designed to be permanently installed onto almost any weapon other than launchers and pistols, along with some fasteners. Ideal for bringing out your inner tacticool on older guns.",
- "weight": 10,
+ "weight": "10 g",
"volume": "8ml",
"price": 6000,
"material": [ "steel", "plastic" ],
@@ -59,7 +59,7 @@
"type": "GUNMOD",
"name": "launcher sights mount",
"description": "This is a plastic mount for attaching a sight, designed to be permanently installed onto almost any launcher, along with some fasteners. Ideal for bringing out your inner tacticool on rocket launchers.",
- "weight": 60,
+ "weight": "60 g",
"volume": "80ml",
"price": 6000,
"material": [ "steel", "plastic" ],
@@ -77,7 +77,7 @@
"type": "GUNMOD",
"name": "pistol sights mount",
"description": "This is a plastic mount for attaching a sight, designed to be permanently installed onto almost any pistol, along with some fasteners. Ideal for bringing out your inner tacticool on pocket pistols.",
- "weight": 60,
+ "weight": "60 g",
"volume": "80ml",
"price": 6000,
"material": [ "steel", "plastic" ],
@@ -95,7 +95,7 @@
"type": "GUNMOD",
"name": "replaceable stock kit",
"description": "This is a kit consisting of various steel parts; when installed, it would remove the weapon's original fixed stock, install a new stock mount on its place, modify original stock to fit it and then reattach it to the gun, or simply attach a stock mount if gun had no stock to start with. This allows easy installation of any kind of more advanced stocks.",
- "weight": 80,
+ "weight": "80 g",
"volume": "50ml",
"integral_volume": 0,
"price": 6000,
@@ -114,7 +114,7 @@
"type": "GUNMOD",
"name": "bottom mount",
"description": "This is a plastic mount for attaching an underbarrel accessory, designed to be permanently installed onto almost any weapon, along with some fasteners. Ideal for bringing out your inner tacticool on older guns.",
- "weight": 10,
+ "weight": "10 g",
"volume": "8ml",
"price": 6000,
"material": [ "steel", "plastic" ],
diff --git a/data/json/items/gunmod/muzzle.json b/data/json/items/gunmod/muzzle.json
index ff011ece69d15..81946e1ef1a2c 100644
--- a/data/json/items/gunmod/muzzle.json
+++ b/data/json/items/gunmod/muzzle.json
@@ -4,7 +4,7 @@
"type": "GUNMOD",
"name": "ported barrel",
"description": "A ported barrel redirects exhaust gases to compensate for muzzle climb, improves recoil but increases noise and reduces accuracy slightly.",
- "weight": 225,
+ "weight": "225 g",
"integral_weight": 0,
"volume": 0,
"price": 72000,
@@ -23,7 +23,7 @@
"type": "GUNMOD",
"name": "muzzle brake",
"description": "A muzzle brake redirects exhaust gases to compensate for muzzle climb, improving recoil but increasing bulk, noise, and reducing accuracy slightly.",
- "weight": 380,
+ "weight": "380 g",
"volume": "250 ml",
"price": 84000,
"material": [ "steel" ],
@@ -41,7 +41,7 @@
"type": "GUNMOD",
"name": "homemade suppressor",
"description": "A homemade suppressor made from a pipe and improvised wipe media. For as long as the wipes hold up, it will reduce the amount of noise and muzzle flash generated by the report of a firearm. Gunfire is extremely loud and can damage your hearing without protection; a suppressor will bring the loudness of a report down to generally safe levels, as well as slightly reducing recoil and muzzle velocity. This simple suppressor is large and, when attached, will interfere with your ability to aim down the base sights of the gun.",
- "weight": 880,
+ "weight": "880 g",
"volume": "750 ml",
"price": 480,
"to_hit": 1,
@@ -64,7 +64,7 @@
"type": "GUNMOD",
"name": "'solvent trap' suppressor",
"description": "This is an automotive filter crudely adapted to mate up with a firearm's barrel, generating an illegal, unregistered suppressor. Good thing there don't seem to be any ATF agents around to arrest you. While close in design to a real suppressor, it was not designed for high pressures involved and will eventually lose effectiveness. The installed filter is large and, when attached, will interfere with your ability to aim down the base sights of the gun.",
- "weight": 880,
+ "weight": "880 g",
"volume": "750 ml",
"price": 480,
"to_hit": 1,
@@ -86,7 +86,7 @@
"type": "GUNMOD",
"name": "soda bottle silencer",
"description": "This is a 'silencer' made from a 2 liter soda bottle, some smaller bottles for baffles, and a generous length of duct tape. Gunfire is extremely loud and can damage your hearing without protection and you can be certain that this will not save your ears whatsoever. What it might do is allow you to get a shot or two off with a slightly quieter report. This simple suppressor is large and, when attached, will interfere with your ability to aim down the base sights of the gun.",
- "weight": 202,
+ "weight": "202 g",
"volume": "2 L",
"price": 480,
"material": [ "plastic" ],
@@ -107,7 +107,7 @@
"type": "GUNMOD",
"name": "RK6S34 suppressor",
"description": "A suppressor reduces the amount of noise and muzzle flash generated by the report of a firearm. This RK6S34 Mustela is a rather advanced version integral to the RM11B rifle system.",
- "weight": 0,
+ "weight": "0 g",
"volume": 0,
"price": 0,
"material": [ "superalloy", "ceramic" ],
@@ -122,7 +122,7 @@
"type": "GUNMOD",
"name": "shotgun suppressor",
"description": "A suppressor designed to work with shotguns. It's a lot more complex than a suppressor for a pistol or rifle.",
- "weight": 600,
+ "weight": "600 g",
"volume": "1 L",
"price": 140000,
"to_hit": 1,
@@ -144,7 +144,7 @@
"type": "GUNMOD",
"name": "suppressor",
"description": "A suppressor reduces the amount of noise and muzzle flash generated by the report of a firearm. Gunfire is extremely loud and can damage your hearing without protection; a suppressor will bring the loudness of a report down to generally safe levels.",
- "weight": 410,
+ "weight": "410 g",
"volume": "500 ml",
"price": 48000,
"to_hit": 1,
@@ -157,7 +157,8 @@
"install_time": "0 m",
"handling_modifier": 2,
"consume_divisor": 840,
- "loudness_modifier": -50
+ "loudness_modifier": -50,
+ "flags": [ "CONSUMABLE" ]
},
{
"id": "mp5sd_suppressor",
@@ -166,7 +167,7 @@
"name": "mp5sd integral suppressor",
"description": "The integrated suppressor for the mp5sd.",
"damage_modifier": -7,
- "weight": 250,
+ "weight": "250 g",
"integral_volume": 0,
"//": "weight is accounted for in gun item",
"integral_weight": 0,
@@ -181,7 +182,7 @@
"type": "GUNMOD",
"name": "compact suppressor",
"description": "A compact suppressor designed for pistols and best used with smaller calibers.",
- "weight": 140,
+ "weight": "140 g",
"volume": "250 ml",
"price": 78000,
"material": "steel",
@@ -193,6 +194,7 @@
"consume_chance": 7000,
"consume_divisor": 85,
"handling_modifier": 1,
- "loudness_modifier": -30
+ "loudness_modifier": -30,
+ "flags": [ "CONSUMABLE" ]
}
]
diff --git a/data/json/items/gunmod/rail.json b/data/json/items/gunmod/rail.json
index c5d61f2fd48f6..565a3bdf91463 100644
--- a/data/json/items/gunmod/rail.json
+++ b/data/json/items/gunmod/rail.json
@@ -4,7 +4,7 @@
"type": "GUNMOD",
"name": "rail-mounted crossbow",
"description": "A kit to attach a pair of crossbow arms and a firing rail to the barrel of a long firearm. It allows crossbow bolts to be fired.",
- "weight": 1450,
+ "weight": "1450 g",
"volume": "500 ml",
"price": 50000,
"material": [ "steel", "wood" ],
@@ -43,7 +43,7 @@
"type": "GUNMOD",
"name": "offset sight rail",
"description": "An additional rail set at 45° for attaching a secondary optic.",
- "weight": 40,
+ "weight": "40 g",
"volume": "125ml",
"price": 6000,
"material": [ "steel" ],
@@ -59,7 +59,7 @@
"type": "GUNMOD",
"name": "rail laser sight",
"description": "A small visible-light laser that mounts on a firearm's accessory rail to enhance ease and speed of target acquisition. Aside from increased weight, there are no drawbacks.",
- "weight": 120,
+ "weight": "120 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 12000,
@@ -77,7 +77,7 @@
"type": "GUNMOD",
"name": "gyroscopic stabilizer",
"description": "An advanced unit that straps onto the side of your firearm and reduces vibration, greatly reducing recoil and slightly increasing accuracy.",
- "weight": 286,
+ "weight": "286 g",
"volume": "750 ml",
"integral_volume": "500 ml",
"price": 68000,
@@ -96,7 +96,7 @@
"type": "GUNMOD",
"name": "LW gyroscopic stabilizer",
"description": "An advanced Leadworks built in gyroscopic stabilizer.",
- "weight": 0,
+ "weight": "0 g",
"volume": 0,
"price": 0,
"flags": [ "IRREMOVABLE" ]
diff --git a/data/json/items/gunmod/sights.json b/data/json/items/gunmod/sights.json
index 167dc8830d226..63332c14007f4 100644
--- a/data/json/items/gunmod/sights.json
+++ b/data/json/items/gunmod/sights.json
@@ -4,7 +4,7 @@
"type": "GUNMOD",
"name": "five pin bow sight",
"description": "A set of adjustable optic fiber aiming pins with a bracket to mount on modern bows. Improves accuracy substantially, but takes a bit longer to line up.",
- "weight": 120,
+ "weight": "120 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 5000,
@@ -22,7 +22,7 @@
"type": "GUNMOD",
"name": "single pin bow sight",
"description": "A single aluminum pin with a bracket to mount on modern bows. Quick to use, but not very accurate.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 3000,
@@ -39,7 +39,7 @@
"type": "GUNMOD",
"name": "bow scope",
"description": "A single magnifying scope mounted on an adjustable bracket, with accompanying clarifier peep sight. Designed for extra long shots, but easily adjusted for short range. Spectacularly accurate.",
- "weight": 180,
+ "weight": "180 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 20000,
@@ -57,7 +57,7 @@
"type": "GUNMOD",
"name": "holographic sight",
"description": "Used extensively by military forces, it increases accuracy and weight. This is a step up from a red dot sight.",
- "weight": 400,
+ "weight": "400 g",
"volume": "250 ml",
"price": 68000,
"material": [ "plastic", "steel" ],
@@ -76,7 +76,7 @@
"name": "iron sights",
"name_plural": "iron sights",
"description": "A basic set of iron sights",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"integral_volume": 0,
"integral_weight": 0,
@@ -96,7 +96,7 @@
"type": "GUNMOD",
"name": "pistol scope",
"description": "A small scope intended for use on a handgun. Increases weight but improves accuracy greatly.",
- "weight": 212,
+ "weight": "212 g",
"volume": "250 ml",
"price": 54000,
"material": [ "aluminum", "glass" ],
@@ -114,7 +114,7 @@
"type": "GUNMOD",
"name": "red dot sight",
"description": "Adds a red dot optic to the top of your gun, replacing the iron sights. Increases accuracy and weight.",
- "weight": 300,
+ "weight": "300 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 68000,
@@ -133,7 +133,7 @@
"type": "GUNMOD",
"name": "rifle scope",
"description": "A long ranged rifle scope used by civilians and military alike, increases weight but improves accuracy greatly.",
- "weight": 450,
+ "weight": "450 g",
"volume": "500 ml",
"price": 68000,
"material": [ "aluminum", "glass" ],
@@ -152,7 +152,7 @@
"type": "GUNMOD",
"name": "ACOG scope",
"description": "An Advanced Combat Optical Gunsight, a milspec medium magnification scope. Increases weight but improves accuracy significantly.",
- "weight": 450,
+ "weight": "450 g",
"volume": "500 ml",
"price": 68000,
"material": [ "aluminum", "glass" ],
@@ -172,7 +172,7 @@
"type": "GUNMOD",
"name": "RS1219 scope",
"description": "An integral component of the RM11B rifle system, the RS1219 Accipiter digital scope provides auto-adjusting focal length, a user-selectable reticle, and an offset reflex sight for close objectives.",
- "weight": 0,
+ "weight": "0 g",
"volume": 0,
"price": 0,
"material": [ "superalloy", "ceramic" ],
@@ -184,7 +184,7 @@
"type": "GUNMOD",
"name": "telescopic sight",
"description": "A simple telescopic sight, essentially a small telescope with crosshairs. Increases weight but improves accuracy.",
- "weight": 300,
+ "weight": "300 g",
"volume": "250 ml",
"price": 30000,
"material": [ "plastic", "steel", "glass" ],
@@ -205,7 +205,7 @@
"type": "GUNMOD",
"name": "telescopic pistol sight",
"description": "A simple telescopic sight intended for use on a handgun. Increases weight but improves accuracy greatly.",
- "weight": 220,
+ "weight": "220 g",
"volume": "250 ml",
"price": 27000,
"material": [ "plastic", "steel", "glass" ],
@@ -226,7 +226,7 @@
"type": "GUNMOD",
"name": "LW red dot sight",
"description": "Built in red-dot sight for the Leadworks weapon.",
- "weight": 0,
+ "weight": "0 g",
"volume": 0,
"price": 0,
"flags": [ "DISABLE_SIGHTS", "IRREMOVABLE" ]
@@ -237,7 +237,7 @@
"type": "GUNMOD",
"name": "LW rifle scope",
"description": "Built in rifle scope for the Leadworks weapon.",
- "weight": 0,
+ "weight": "0 g",
"volume": 0,
"price": 0,
"flags": [ "DISABLE_SIGHTS", "ZOOM", "IRREMOVABLE" ]
@@ -248,7 +248,7 @@
"type": "GUNMOD",
"name": "LW ACOG scope",
"description": "An Leadworks built in Advanced Combat Optical Gunsight, a milspec medium magnification scope. Improves accuracy significantly.",
- "weight": 0,
+ "weight": "0 g",
"volume": 0,
"price": 0,
"flags": [ "DISABLE_SIGHTS", "ZOOM", "IRREMOVABLE" ]
@@ -259,7 +259,7 @@
"type": "GUNMOD",
"name": "LW holographic sight",
"description": "Leadworks built in holographic sight.",
- "weight": 0,
+ "weight": "0 g",
"price": 0,
"flags": [ "DISABLE_SIGHTS", "IRREMOVABLE" ]
}
diff --git a/data/json/items/gunmod/sling.json b/data/json/items/gunmod/sling.json
index fea50d8f8c2c6..1299bbc098c05 100644
--- a/data/json/items/gunmod/sling.json
+++ b/data/json/items/gunmod/sling.json
@@ -4,7 +4,7 @@
"type": "GUNMOD",
"name": "shoulder strap",
"description": "A shoulder strap allows the rifle to be worn over your shoulders like a piece of clothing. However, it offers no protection.",
- "weight": 100,
+ "weight": "100 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 480,
diff --git a/data/json/items/gunmod/stock.json b/data/json/items/gunmod/stock.json
index f1070c7938bf9..1c68143a5c9b3 100644
--- a/data/json/items/gunmod/stock.json
+++ b/data/json/items/gunmod/stock.json
@@ -4,7 +4,7 @@
"type": "GUNMOD",
"name": "adjustable stock",
"description": "An adjustable replacement stock improving both recoil and accuracy.",
- "weight": 350,
+ "weight": "350 g",
"volume": "500 ml",
"integral_volume": 0,
"integral_weight": 0,
@@ -24,7 +24,7 @@
"type": "GUNMOD",
"name": "folding stock",
"description": "A folding stock which reduces volume but needs unfolding before use. Increases the time needed to wield the weapon.",
- "weight": 200,
+ "weight": "200 g",
"volume": "500 ml",
"integral_volume": 0,
"integral_weight": 0,
@@ -42,7 +42,7 @@
"type": "GUNMOD",
"name": "folding wire stock",
"description": "A folding wire stock which folds up very compactly but needs unfolding before use. It's somewhat wobbly but is better than nothing at all. Increases the time needed to wield the weapon.",
- "weight": 170,
+ "weight": "170 g",
"volume": "250 ml",
"integral_volume": 0,
"integral_weight": 0,
@@ -61,7 +61,7 @@
"type": "GUNMOD",
"name": "pistol stock",
"description": "An add on stock for handguns considerably improving control of recoil.",
- "weight": 350,
+ "weight": "350 g",
"volume": "500 ml",
"price": 38000,
"material": [ "plastic", "steel" ],
@@ -77,7 +77,7 @@
"type": "GUNMOD",
"name": "recoil stock",
"description": "A replacement stock designed to absorb perceived recoil.",
- "weight": 960,
+ "weight": "960 g",
"volume": "500 ml",
"integral_volume": 0,
"integral_weight": 0,
@@ -97,7 +97,7 @@
"type": "GUNMOD",
"name": "cheek pad",
"description": "A stock accessory for sniper rifles and even DMRs considerably improving eye relief efficiency, prevents slipping, and reduces recoil to the neck and cheek.",
- "weight": 300,
+ "weight": "300 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 4500,
diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json
index 6d4ebe9901e33..e662e1cf9d7cf 100644
--- a/data/json/items/gunmod/underbarrel.json
+++ b/data/json/items/gunmod/underbarrel.json
@@ -4,7 +4,7 @@
"type": "GUNMOD",
"name": "aux flamethrower",
"description": "This custom-built miniature flamethrower is made to be attached to almost any sort of firearm, greatly expanding its lethality.",
- "weight": 1820,
+ "weight": "1820 g",
"volume": "1 L",
"price": 85000,
"material": [ "steel" ],
@@ -24,7 +24,7 @@
"type": "GUNMOD",
"name": "bipod",
"description": "Bipods are commonly used on rifles and machine guns to provide a forward rest and reduce motion. Although they greatly improve handling of recoil they are usable only on certain surfaces and are slow to equip.",
- "weight": 400,
+ "weight": "400 g",
"volume": "500 ml",
"price": 68000,
"to_hit": -1,
@@ -43,7 +43,7 @@
"type": "GUNMOD",
"name": "combination gun shotgun",
"description": "The integrated underbarrel shotgun of a combination gun which holds two shots. It's irremovable.",
- "weight": 2600,
+ "weight": "2600 g",
"volume": 0,
"price": 95000,
"to_hit": -1,
@@ -61,7 +61,7 @@
"type": "GUNMOD",
"name": "pipe combination gun shotgun",
"description": "The integrated underbarrel shotgun of a pipe combination gun which holds two shots. It's irremovable.",
- "weight": 1134,
+ "weight": "1134 g",
"volume": "1 L",
"price": 10000,
"to_hit": -1,
@@ -78,7 +78,7 @@
"type": "GUNMOD",
"name": "forward grip",
"description": "A grip placed forward on the barrel allows for greater control. Not as effective as a bipod but usable under all conditions.",
- "weight": 113,
+ "weight": "113 g",
"volume": "250 ml",
"price": 6000,
"material": [ "steel", "plastic" ],
@@ -95,7 +95,7 @@
"type": "GUNMOD",
"name": "integrated bayonet",
"description": "This is the bayonet integrated in the firearm.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 4000,
"to_hit": -1,
@@ -115,7 +115,7 @@
"type": "GUNMOD",
"name": "KSG second magazine",
"description": "The integrated second shotgun magazine of the Kel-Tec KSG which holds 7 shots. It's irremovable.",
- "weight": 1550,
+ "weight": "1550 g",
"volume": "1750 ml",
"price": 0,
"material": [ "steel" ],
@@ -139,7 +139,7 @@
"type": "GUNMOD",
"name": "underbarrel laser sight",
"description": "A visible-light laser that mounts under a firearm's barrel to enhance ease and speed of target acquisition. Aside from increased weight, there are no drawbacks.",
- "weight": 120,
+ "weight": "120 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 10000,
@@ -157,25 +157,25 @@
"id": "lemat_revolver_shotgun",
"type": "GUNMOD",
"name": "LeMat revolver shotgun",
- "description": "The integrated underbarrel shotgun of a modified LeMat revolver which holds a single shot. It's irremovable.",
- "weight": 500,
- "volume": 0,
- "price": 95000,
+ "description": "The Lemat revolver is unique in that its cylinder axis pin is also a fully functional 20ga percussion-primed smoothbore barrel. It's irremovable.",
+ "volume": "250 ml",
+ "integral_volume": 0,
"material": [ "steel" ],
"symbol": ":",
"color": "light_red",
"location": "underbarrel",
"mod_targets": [ "pistol" ],
"gun_data": {
- "ammo": "shot",
+ "ammo": "shotpaper",
"skill": "shotgun",
"range": -2,
- "ranged_damage": 2,
+ "ranged_damage": -12,
"dispersion": 600,
"durability": 10,
+ "reload": 150,
"clip_size": 1
},
- "flags": [ "RELOAD_ONE", "IRREMOVABLE" ]
+ "flags": [ "RELOAD_ONE", "NO_UNLOAD", "IRREMOVABLE" ]
},
{
"id": "m203",
@@ -183,7 +183,7 @@
"name": "M203",
"name_plural": "M203",
"description": "The M203 was originally designed for use with M16 variants but today can be attached to almost any rifle. It allows a single 40mm grenade to be loaded and fired.",
- "weight": 1360,
+ "weight": "1360 g",
"volume": "500 ml",
"price": 65000,
"material": [ "steel", "plastic" ],
@@ -202,7 +202,7 @@
"name": "M320 GLM",
"name_plural": "M320 GLM",
"description": "The M320 Grenade Launcher Module offers the functionality of larger launchers in a very small package at the cost of decreased accuracy. It can be either attached to a rifle or combined with a buttstock for stand alone use.",
- "weight": 1500,
+ "weight": "1500 g",
"volume": "500 ml",
"price": 84000,
"material": "steel",
@@ -235,7 +235,7 @@
"type": "GUNMOD",
"name": "masterkey shotgun",
"description": "A minimalist pump action shotgun, which can be mounted under the barrel of many rifles. It allows a total of four shotgun shells to be loaded and fired.",
- "weight": 2600,
+ "weight": "2600 g",
"volume": "500 ml",
"price": 95000,
"material": [ "steel" ],
@@ -253,7 +253,7 @@
"type": "GUNMOD",
"name": "40mm pipe launcher",
"description": "This is a home built launcher tube that can be attached to almost any rifle. It allows a single 40mm grenade to be loaded and fired.",
- "weight": 2080,
+ "weight": "2080 g",
"volume": "750 ml",
"price": 25000,
"material": [ "steel", "plastic" ],
@@ -270,7 +270,7 @@
"type": "GUNMOD",
"name": "pistol bayonet",
"description": "A pistol bayonet is a stabbing weapon that can be attached to the front of a handgun, allowing a melee attack to deal piercing damage.",
- "weight": 122,
+ "weight": "122 g",
"volume": "250 ml",
"price": 4000,
"to_hit": -4,
@@ -290,7 +290,7 @@
"type": "GUNMOD",
"name": "RM121 aux shotgun",
"description": "The Rivtech RM121 auxiliary weapon system is a magazine-fed semi-automatic caseless shotgun, which can be mounted under the barrel of many rifles. Accepts RMSA10 box magazines.",
- "weight": 1140,
+ "weight": "1140 g",
"volume": "750 ml",
"price": 120000,
"material": [ "superalloy", "ceramic" ],
@@ -310,7 +310,7 @@
"type": "GUNMOD",
"name": "underslung shotgun",
"description": "A short shotgun with 2 barrels, which can be mounted under the barrel of many rifles. It allows two shotgun shells to be loaded and fired.",
- "weight": 1500,
+ "weight": "1500 g",
"volume": "750 ml",
"price": 65000,
"material": [ "steel" ],
@@ -329,7 +329,7 @@
"type": "GUNMOD",
"name": "LW underbarrel laser sight",
"description": "A Leadworks built in visible-light laser that mounts under a firearm's barrel to enhance ease and speed of target acquisition.",
- "weight": 0,
+ "weight": "0 g",
"volume": 0,
"price": 0,
"flags": [ "PUMP_RAIL_COMPATIBLE", "IRREMOVABLE" ]
@@ -340,7 +340,7 @@
"type": "GUNMOD",
"name": "LW forward grip",
"description": "A Leadworks built in grip placed forward on the barrel allows for greater control.",
- "weight": 0,
+ "weight": "0 g",
"volume": 0,
"price": 0,
"flags": [ "PUMP_RAIL_COMPATIBLE", "IRREMOVABLE" ]
@@ -351,7 +351,7 @@
"type": "GUNMOD",
"name": "LW bipod",
"description": "Leadworks built in bipod designed to provide a forward rest and reduce motion. Although it greatly improve handling of recoil it is usable only on certain surfaces and are slow to equip.",
- "weight": 0,
+ "weight": "0 g",
"volume": 0,
"price": 0,
"flags": [ "BIPOD", "SLOW_WIELD", "IRREMOVABLE" ]
@@ -362,7 +362,7 @@
"type": "GUNMOD",
"name": "LW underslung shotgun",
"description": "Leadworks built in minimalist pump action shotgun module. It allows 4 shotgun shells to be loaded and fired.",
- "weight": 0,
+ "weight": "0 g",
"volume": 0,
"price": 0,
"dispersion_modifier": 0,
@@ -375,7 +375,7 @@
"name": "LW GLM",
"name_plural": "LW GLM",
"description": "The Leadworks built in Grenade Launcher Module offers the functionality of larger launchers in a very small package.",
- "weight": 0,
+ "weight": "0 g",
"volume": 0,
"price": 0,
"dispersion_modifier": 0,
diff --git a/data/json/items/handloaded_bullets.json b/data/json/items/handloaded_bullets.json
index 5d337830cda3b..c03ba7b536d38 100644
--- a/data/json/items/handloaded_bullets.json
+++ b/data/json/items/handloaded_bullets.json
@@ -9,7 +9,7 @@
"description": "A prepared blunderbuss shot of a large hunk of metal. Better for distance.",
"material": [ "paper", "powder" ],
"volume": "100 ml",
- "weight": 3,
+ "weight": "3 g",
"bashing": 1,
"ammo_type": "blunderbuss",
"damage": 60,
@@ -29,7 +29,7 @@
"description": "A prepared blunderbuss shot of a marbles, pebbles, bearings, basically whatever is at hand. The homemade pellet spread and number makes up for the shoddy quality.",
"material": [ "paper", "powder" ],
"volume": "100 ml",
- "weight": 2,
+ "weight": "2 g",
"bashing": 1,
"ammo_type": "blunderbuss",
"damage": 60,
@@ -47,7 +47,7 @@
"description": "A prepared blunderbuss shot of homemade flechette made out of nails. Shreds armor.",
"material": [ "plastic", "powder" ],
"volume": "100 ml",
- "weight": 3,
+ "weight": "3 g",
"bashing": 1,
"ammo_type": "blunderbuss",
"damage": 53,
diff --git a/data/json/items/magazine/12mm.json b/data/json/items/magazine/12mm.json
index 9bf36d9d26e7a..a6008f2bb3aa8 100644
--- a/data/json/items/magazine/12mm.json
+++ b/data/json/items/magazine/12mm.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "H&K G80 magazine",
"description": "A magazine for H&K G80 Railgun which can hold up to 20 ferromagnetic projectiles.",
- "weight": 168,
+ "weight": "168 g",
"volume": "250 ml",
"price": 8000,
"material": "steel",
diff --git a/data/json/items/magazine/20x60mm.json b/data/json/items/magazine/20x60mm.json
index 1c0a99d359b2c..b5501a4fa5f92 100644
--- a/data/json/items/magazine/20x60mm.json
+++ b/data/json/items/magazine/20x60mm.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "RMSA10 20x66mm compact magazine",
"description": "A 10 round box magazine for use with the RM228 PDW and RM121 auxiliary shotgun.",
- "weight": 210,
+ "weight": "210 g",
"volume": "250 ml",
"price": 40000,
"material": [ "superalloy", "plastic" ],
@@ -21,7 +21,7 @@
"type": "MAGAZINE",
"name": "RMSB20 20x66mm magazine",
"description": "A 20 round box magazine for use with the RM20 caseless shotgun.",
- "weight": 280,
+ "weight": "280 g",
"volume": "500 ml",
"price": 40000,
"material": [ "superalloy", "plastic" ],
@@ -38,7 +38,7 @@
"type": "MAGAZINE",
"name": "RMSB40 20x66mm extended magazine",
"description": "A 40 round box magazine for use with the RM20 caseless shotgun.",
- "weight": 280,
+ "weight": "280 g",
"volume": "750 ml",
"price": 60000,
"material": [ "superalloy", "plastic" ],
diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json
index f0ed5211cc042..d6e5635fa15a3 100644
--- a/data/json/items/magazine/22.json
+++ b/data/json/items/magazine/22.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": ".22 8-round speedloader",
"description": "This speedloader can hold 8 rounds of .22 and quickly reload a compatible revolver.",
- "weight": 64,
+ "weight": "64 g",
"volume": "250 ml",
"price": 600,
"material": "steel",
@@ -19,7 +19,7 @@
"type": "MAGAZINE",
"name": "RMRB200 .22 magazine",
"description": "A 200 round box magazine for use with the RM360 rotary carbine.",
- "weight": 360,
+ "weight": "360 g",
"volume": "500 ml",
"price": 20000,
"material": [ "superalloy", "plastic" ],
@@ -36,7 +36,7 @@
"type": "MAGAZINE",
"name": "RMRD400 .22 drum magazine",
"description": "A 400 round drum magazine for use with the RM360 rotary carbine.",
- "weight": 440,
+ "weight": "440 g",
"volume": "750 ml",
"price": 30000,
"material": [ "superalloy", "plastic" ],
@@ -53,7 +53,7 @@
"type": "MAGAZINE",
"name": "A-180 magazine",
"description": "An unusually shaped pan magazine for the American-180.",
- "weight": 760,
+ "weight": "760 g",
"volume": "500 ml",
"price": 7300,
"material": "steel",
@@ -70,7 +70,7 @@
"type": "MAGAZINE",
"name": ".22 19-round tube loader",
"description": "This is a tube which holds 19 rounds of .22, designed for quick reloading of a compatible rifle with tubular magazine.",
- "weight": 180,
+ "weight": "180 g",
"volume": "250 ml",
"price": 1200,
"material": "steel",
@@ -85,7 +85,7 @@
"type": "MAGAZINE",
"name": "SIG Mosquito magazine",
"description": "A factory specification 10-round magazine for the SIG Mosquito.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 1700,
"material": "steel",
@@ -101,7 +101,7 @@
"type": "MAGAZINE",
"name": "Ruger BX-25 magazine",
"description": "Extended 25-round stick magazine for the Ruger 10/22.",
- "weight": 180,
+ "weight": "180 g",
"volume": "500 ml",
"price": 7900,
"material": "steel",
@@ -117,7 +117,7 @@
"type": "MAGAZINE",
"name": "Ruger 10/22 rotary magazine",
"description": "Removable 10-round rotary magazine for the Ruger 10/22 which allows the magazine to fit flush with the bottom of the stock.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 1400,
"material": "steel",
@@ -134,7 +134,7 @@
"type": "MAGAZINE",
"name": "S&W 22A magazine",
"description": "A standard capacity magazine for the popular S&W 22A pistol.",
- "weight": 70,
+ "weight": "70 g",
"volume": "250 ml",
"price": 2100,
"material": "steel",
@@ -150,7 +150,7 @@
"type": "MAGAZINE",
"name": "Jennings J-22 magazine",
"description": "A cheap 6-round steel box magazine for the Jennings J-22.",
- "weight": 55,
+ "weight": "55 g",
"volume": "27ml",
"price": 2800,
"material": "steel",
@@ -166,7 +166,7 @@
"type": "MAGAZINE",
"name": "Walther P22 magazine",
"description": "A 10-round box magazine for the Walther P22.",
- "weight": 25,
+ "weight": "25 g",
"volume": "126 ml",
"price": 3250,
"material": "steel",
diff --git a/data/json/items/magazine/223.json b/data/json/items/magazine/223.json
index 2e89fa9df023c..0258d548e8d0e 100644
--- a/data/json/items/magazine/223.json
+++ b/data/json/items/magazine/223.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "LW-5 speedloader",
"description": "This speedloader, made by Leadworks for use with L2037 Backup revolver, can hold 5 rounds of .223 and quickly reload a compatible revolver.",
- "weight": 116,
+ "weight": "116 g",
"volume": "250 ml",
"price": 3200,
"material": "plastic",
@@ -30,7 +30,7 @@
"type": "MAGAZINE",
"name": "LW-56 magazine",
"description": "A 56-round polymer magazine for Leadworks LLC 223 firearms. It's compact design makes it surprisingly easy to store. Lightweight and reliable but somewhat more difficult to reload.",
- "weight": 340,
+ "weight": "340 g",
"volume": "750 ml",
"price": 14200,
"material": "plastic",
@@ -47,7 +47,7 @@
"type": "MAGAZINE",
"name": "LW-32 magazine",
"description": "A 32-round polymer magazine for Leadworks LLC 223 firearms. Lightweight and reliable but somewhat more difficult to reload.",
- "weight": 190,
+ "weight": "190 g",
"volume": "500 ml",
"price": 10200,
"material": "plastic",
@@ -64,7 +64,7 @@
"type": "MAGAZINE",
"name": "Ruger .223 5-round magazine",
"description": "A compact 5-round magazine used with the Ruger Mini-14 rifle.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 4000,
"material": "steel",
@@ -81,7 +81,7 @@
"type": "MAGAZINE",
"name": "Ruger .223 10-round magazine",
"description": "A compact 10-round magazine used with the Ruger Mini-14 rifle.",
- "weight": 100,
+ "weight": "100 g",
"volume": "250 ml",
"price": 5000,
"material": "steel",
@@ -97,7 +97,7 @@
"type": "MAGAZINE",
"name": "Ruger .223 high-capacity magazine",
"description": "A high capacity magazine for use with the Ruger Mini-14 rifle.",
- "weight": 360,
+ "weight": "360 g",
"volume": "500 ml",
"price": 8000,
"material": "steel",
@@ -113,7 +113,7 @@
"type": "MAGAZINE",
"name": "STANAG magazine",
"description": "A standard capacity magazine for use with STANAG compatible rifles.",
- "weight": 360,
+ "weight": "360 g",
"volume": "500 ml",
"price": 8000,
"material": "steel",
@@ -129,7 +129,7 @@
"type": "MAGAZINE",
"name": "STANAG drum magazine",
"description": "A 50-round magazine with a bulky green drum for use with STANAG compatible rifles.",
- "weight": 600,
+ "weight": "600 g",
"volume": "1 L",
"price": 9000,
"to_hit": -2,
@@ -148,7 +148,7 @@
"type": "MAGAZINE",
"name": "makeshift .223 magazine",
"description": "An improvised magazine consisting of little more than a bent sheet of rusted metal held together by duct tape and hope.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 1200,
"material": "steel",
diff --git a/data/json/items/magazine/300.json b/data/json/items/magazine/300.json
index 1ff0d42d69b65..13116feae1bc9 100644
--- a/data/json/items/magazine/300.json
+++ b/data/json/items/magazine/300.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "M2010 ESR magazine",
"description": "A 5-round box magazine used by M2010 ESR sniper rifle.",
- "weight": 78,
+ "weight": "78 g",
"volume": "250 ml",
"price": 3500,
"material": "steel",
diff --git a/data/json/items/magazine/3006.json b/data/json/items/magazine/3006.json
index f105448e1fe40..946c1577acb29 100644
--- a/data/json/items/magazine/3006.json
+++ b/data/json/items/magazine/3006.json
@@ -5,7 +5,7 @@
"name": "rifle clip - .30-06",
"//": "Provisional.",
"description": "A tiny piece of grooved metal designed to allow a shooter to quickly load a bolt-action rifle.",
- "weight": 40,
+ "weight": "40 g",
"volume": "50ml",
"price": 500,
"material": "steel",
@@ -20,7 +20,7 @@
"type": "MAGAZINE",
"name": "Browning BLR magazine",
"description": "A compact 4-round box magazine for the Browning BLR.",
- "weight": 40,
+ "weight": "40 g",
"volume": "250 ml",
"price": 5600,
"material": "steel",
@@ -36,7 +36,7 @@
"type": "MAGAZINE",
"name": "M1 Garand Clip",
"description": "A light-weight en-bloc clip for use with the M1 Garand that will be ejected after the last round is fired.",
- "weight": 30,
+ "weight": "30 g",
"volume": "250 ml",
"price": 600,
"material": "steel",
@@ -53,7 +53,7 @@
"type": "MAGAZINE",
"name": "BAR extended magazine",
"description": "An aftermarket magazine for use with the Browning Automatic Rifle, holds 30 rounds.",
- "weight": 300,
+ "weight": "300 g",
"volume": "750 ml",
"price": 8500,
"material": "steel",
@@ -71,7 +71,7 @@
"name": "BAR magazine",
"//": "Compatable magazines made for reproductions exist, and the standard-capacity mags are fairly cheap compared to variants.",
"description": "A standard capacity magazine for use with the Browning Automatic Rifle, holds 20 rounds.",
- "weight": 200,
+ "weight": "200 g",
"volume": "500 ml",
"price": 3600,
"material": "steel",
diff --git a/data/json/items/magazine/308.json b/data/json/items/magazine/308.json
index c073105a68cf5..00f371e13def4 100644
--- a/data/json/items/magazine/308.json
+++ b/data/json/items/magazine/308.json
@@ -15,7 +15,7 @@
"type": "MAGAZINE",
"name": "FN FAL extended magazine",
"description": "An extended 30-round steel box magazine for the FN FAL rifle.",
- "weight": 360,
+ "weight": "360 g",
"volume": "750 ml",
"price": 2100,
"material": "steel",
@@ -32,7 +32,7 @@
"type": "MAGAZINE",
"name": "FN FAL magazine",
"description": "A military issue 20-round steel box magazine for the FN FAL rifle.",
- "weight": 240,
+ "weight": "240 g",
"volume": "500 ml",
"price": 1200,
"material": "steel",
@@ -49,7 +49,7 @@
"type": "MAGAZINE",
"name": "H&K G3 drum magazine",
"description": "An 50-round drum magazine for the H&K G3 rifle.",
- "weight": 650,
+ "weight": "650 g",
"volume": "1 L",
"price": 7900,
"material": "steel",
@@ -67,7 +67,7 @@
"type": "MAGAZINE",
"name": "H&K G3 magazine",
"description": "A lightweight aluminum box magazine for the H&K G3 rifle.",
- "weight": 120,
+ "weight": "120 g",
"volume": "500 ml",
"price": 1200,
"material": "aluminum",
@@ -84,7 +84,7 @@
"type": "MAGAZINE",
"name": "M14 magazine",
"description": "A military issue 20-round steel box magazine compatible with M14 pattern rifles.",
- "weight": 280,
+ "weight": "280 g",
"volume": "500 ml",
"price": 1700,
"material": "steel",
@@ -101,7 +101,7 @@
"type": "MAGAZINE",
"name": "M14 compact magazine",
"description": "An compact aftermarket 5-round steel box magazine compatible with M14 pattern rifles. Although it has a low capacity it is easy to store and quick to reload.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 2900,
"material": "steel",
@@ -119,7 +119,7 @@
"type": "MAGAZINE",
"name": "FN SCAR-H drum magazine",
"description": "An 50-round drum magazine for the FN SCAR-H rifle.",
- "weight": 400,
+ "weight": "400 g",
"volume": "1 L",
"price": 8900,
"material": "steel",
@@ -137,7 +137,7 @@
"type": "MAGAZINE",
"name": "FN SCAR-H magazine",
"description": "A military issue 20-round steel box magazine for the FN SCAR-H rifle.",
- "weight": 300,
+ "weight": "300 g",
"volume": "500 ml",
"price": 5600,
"material": "steel",
@@ -154,7 +154,7 @@
"type": "MAGAZINE",
"name": "HK417 magazine",
"description": "A 20 round double stack box magazine for the HK417 rifle.",
- "weight": 160,
+ "weight": "160 g",
"volume": "500 ml",
"price": 5600,
"material": "steel",
@@ -171,7 +171,7 @@
"type": "MAGAZINE",
"name": "HK417 compact magazine",
"description": "A 10 round double stack box magazine for the HK417 rifle.",
- "weight": 110,
+ "weight": "110 g",
"volume": "250 ml",
"price": 5000,
"material": "steel",
@@ -188,7 +188,7 @@
"type": "MAGAZINE",
"name": "AR-10 magazine",
"description": "A 20 round double stack box magazine for the AR-10 rifle.",
- "weight": 300,
+ "weight": "300 g",
"volume": "500 ml",
"price": 3000,
"material": "steel",
diff --git a/data/json/items/magazine/32.json b/data/json/items/magazine/32.json
index 97ffa3ccb8381..1929717362c34 100644
--- a/data/json/items/magazine/32.json
+++ b/data/json/items/magazine/32.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "Walther PPK magazine",
"description": "A standard 8-round steel box magazine for the Walther PPK.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 2600,
"material": "steel",
@@ -20,7 +20,7 @@
"type": "MAGAZINE",
"name": "SIG P230 magazine",
"description": "A factory specification 8-round magazine for the SIG Sauer P230.",
- "weight": 70,
+ "weight": "70 g",
"volume": "250 ml",
"price": 1900,
"material": "steel",
@@ -36,7 +36,7 @@
"type": "MAGAZINE",
"name": "Skorpion Vz. 61 magazine",
"description": "A standard 20-round magazine for the Skorpion Vz. 61, in .32 ACP.",
- "weight": 120,
+ "weight": "120 g",
"volume": "250 ml",
"price": 2300,
"material": "steel",
@@ -52,7 +52,7 @@
"type": "MAGAZINE",
"name": "Kel-Tec P32 magazine",
"description": "A standard 7-round steel box magazine for the Kel-Tec P32.",
- "weight": 65,
+ "weight": "65 g",
"volume": "47ml",
"price": 2600,
"material": "steel",
diff --git a/data/json/items/magazine/357sig.json b/data/json/items/magazine/357sig.json
index 75886b20126bb..f6299b8b751d4 100644
--- a/data/json/items/magazine/357sig.json
+++ b/data/json/items/magazine/357sig.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "P226 magazine .357 SIG",
"description": "A 15 round double stack box magazine for a SIG P226 chambered for .357 SIG rounds.",
- "weight": 150,
+ "weight": "150 g",
"volume": "250 ml",
"price": 3000,
"material": "steel",
@@ -20,7 +20,7 @@
"type": "MAGAZINE",
"name": "P320 magazine .357 SIG",
"description": "A 14 round double stack box magazine for the SIG Sauer P320.",
- "weight": 105,
+ "weight": "105 g",
"volume": "250 ml",
"price": 2900,
"material": "plastic",
diff --git a/data/json/items/magazine/38.json b/data/json/items/magazine/38.json
index ca7ba0bd1281b..d69500f3231d6 100644
--- a/data/json/items/magazine/38.json
+++ b/data/json/items/magazine/38.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "Taurus .38 magazine",
"description": "A compact steel box magazine for use with the Taurus Pro .38 pistol.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 3400,
"material": "steel",
@@ -20,7 +20,7 @@
"type": "MAGAZINE",
"name": ".38/.357 7-round speedloader",
"description": "This speedloader can hold 7 rounds of .357 Magnum or .38 Special and quickly reload a compatible revolver.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 1000,
"material": "steel",
@@ -35,7 +35,7 @@
"type": "MAGAZINE",
"name": ".38/.357 5-round speedloader",
"description": "This speedloader can hold 5 rounds of .357 Magnum or .38 Special and quickly reload a compatible revolver.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 800,
"material": "steel",
diff --git a/data/json/items/magazine/380.json b/data/json/items/magazine/380.json
index c014a016840e7..7fa647be06f2e 100644
--- a/data/json/items/magazine/380.json
+++ b/data/json/items/magazine/380.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "Kel-Tec P3AT magazine",
"description": "A standard 6-round steel box magazine for the Kel-Tec P3AT.",
- "weight": 60,
+ "weight": "60 g",
"volume": "50ml",
"price": 1900,
"material": "steel",
@@ -20,7 +20,7 @@
"type": "MAGAZINE",
"name": "FN 1910 magazine",
"description": "A standard 6-round steel box magazine for the FN 1910. It looks a bit old.",
- "weight": 80,
+ "weight": "80 g",
"volume": "60ml",
"price": 3500,
"material": "steel",
@@ -36,7 +36,7 @@
"type": "MAGAZINE",
"name": "Ruger LCP magazine",
"description": "A standard 6-round capacity magazine for the Ruger LCP pistol.",
- "weight": 65,
+ "weight": "65 g",
"volume": "60ml",
"price": 2200,
"material": "steel",
@@ -52,7 +52,7 @@
"type": "MAGAZINE",
"name": "MAC-11 magazine",
"description": "A cheap 32-round steel box magazine for use with the MAC-11 SMG.",
- "weight": 200,
+ "weight": "200 g",
"volume": "737ml",
"price": 4500,
"material": "steel",
@@ -68,7 +68,7 @@
"type": "MAGAZINE",
"name": "CF-380 magazine",
"description": "An 8-round steel box magazine for use with the Hi-Point CF-380.",
- "weight": 110,
+ "weight": "110 g",
"volume": "236 ml",
"price": 2500,
"material": "steel",
@@ -84,7 +84,7 @@
"type": "MAGAZINE",
"name": "CF-380 magazine",
"description": "A 10-round steel box magazine for use with the Hi-Point CF-380.",
- "weight": 110,
+ "weight": "110 g",
"volume": "236 ml",
"price": 2500,
"material": "steel",
diff --git a/data/json/items/magazine/38super.json b/data/json/items/magazine/38super.json
index 4aad6b8e82435..2de2d7f4bd04d 100644
--- a/data/json/items/magazine/38super.json
+++ b/data/json/items/magazine/38super.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "M1911 .38 Super magazine",
"description": "A compact single stack box magazine for the M1911.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 3400,
"material": "steel",
diff --git a/data/json/items/magazine/40.json b/data/json/items/magazine/40.json
index 881a07b656008..4f3637ffc5670 100644
--- a/data/json/items/magazine/40.json
+++ b/data/json/items/magazine/40.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": ".40 6-round speedloader",
"description": "This speedloader can hold 6 rounds of .40 S&W or 10mm Auto and quickly reload a compatible revolver.",
- "weight": 92,
+ "weight": "92 g",
"volume": "250 ml",
"price": 1500,
"material": "steel",
@@ -19,7 +19,7 @@
"type": "MAGAZINE",
"name": "Glock 22 extended magazine",
"description": "An extended 22-round magazine for use with Glock pistols chambered for .40 S&W or .357 SIG.",
- "weight": 200,
+ "weight": "200 g",
"volume": "500 ml",
"price": 5900,
"material": "plastic",
@@ -36,7 +36,7 @@
"type": "MAGAZINE",
"name": "Glock 22 magazine",
"description": "A compact light-weight polymer magazine for use with Glock pistols chambered for .40 S&W or .357 SIG.",
- "weight": 125,
+ "weight": "125 g",
"volume": "250 ml",
"price": 3200,
"material": "plastic",
@@ -52,7 +52,7 @@
"type": "MAGAZINE",
"name": "SIG Pro .40 magazine",
"description": "A compact and reliable magazine for use with the SIG Pro .40 pistol.",
- "weight": 90,
+ "weight": "90 g",
"volume": "250 ml",
"price": 3900,
"material": "plastic",
@@ -68,7 +68,7 @@
"type": "MAGAZINE",
"name": "makeshift .40 20-round magazine",
"description": "An improvised magazine that is mostly compatible with a homemade 'Luty' submachinegun, with a simplified feed system. It looks like it might feed 20 rounds of .40S&W.",
- "weight": 300,
+ "weight": "300 g",
"volume": "750 ml",
"price": 4000,
"material": "steel",
@@ -85,7 +85,7 @@
"type": "MAGAZINE",
"name": "Hi-Power magazine .40 S&W",
"description": "A 10 round steel box magazine for the Browning Hi-Power .40 S&W.",
- "weight": 120,
+ "weight": "120 g",
"volume": "185 ml",
"price": 4000,
"material": "steel",
@@ -101,7 +101,7 @@
"type": "MAGAZINE",
"name": "PPQ magazine .40 S&W",
"description": "A 10 round steel box magazine for the Walther PPQ .40 S&W.",
- "weight": 80,
+ "weight": "80 g",
"volume": "200 ml",
"price": 4000,
"material": "steel",
@@ -117,7 +117,7 @@
"type": "MAGAZINE",
"name": "PPQ magazine .40 S&W",
"description": "A 12 round steel box magazine for the Walther PPQ .40 S&W.",
- "weight": 80,
+ "weight": "80 g",
"volume": "200 ml",
"price": 4400,
"material": "steel",
@@ -133,7 +133,7 @@
"type": "MAGAZINE",
"name": "PPQ magazine .40 S&W",
"description": "A 14 round steel box magazine for the Walther PPQ .40 S&W.",
- "weight": 80,
+ "weight": "80 g",
"volume": "200 ml",
"price": 4800,
"material": "steel",
@@ -149,7 +149,7 @@
"type": "MAGAZINE",
"name": "Model JCP magazine",
"description": "A 10-round steel box magazine for use with the Hi-Point Model JCP.",
- "weight": 110,
+ "weight": "110 g",
"volume": "312 ml",
"price": 2500,
"material": "steel",
diff --git a/data/json/items/magazine/410shot.json b/data/json/items/magazine/410shot.json
index 4afbc5f23d8a4..a2330598a08c3 100644
--- a/data/json/items/magazine/410shot.json
+++ b/data/json/items/magazine/410shot.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "Saiga-410 box magazine",
"description": "A removable plastic box magazine for the Saiga-410 shotgun. Holds 10 shells.",
- "weight": 210,
+ "weight": "210 g",
"volume": "500 ml",
"price": 4500,
"material": "plastic",
@@ -20,7 +20,7 @@
"type": "MAGAZINE",
"name": "Saiga-410 drum magazine",
"description": "A removable plastic drum magazine for the Saiga-410 shotgun. Holds 30 shells.",
- "weight": 460,
+ "weight": "460 g",
"volume": "1 L",
"price": 11000,
"material": "plastic",
diff --git a/data/json/items/magazine/44.json b/data/json/items/magazine/44.json
index 759355137d005..b71620238a90d 100644
--- a/data/json/items/magazine/44.json
+++ b/data/json/items/magazine/44.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": ".44 6-round speedloader",
"description": "This speedloader can hold 6 rounds of .44 and quickly reload a compatible revolver.",
- "weight": 98,
+ "weight": "98 g",
"volume": "250 ml",
"price": 1600,
"material": "steel",
@@ -19,7 +19,7 @@
"type": "MAGAZINE",
"name": "Desert Eagle magazine",
"description": "A standard 7-round steel box magazine for use with the IMI Desert Eagle.",
- "weight": 90,
+ "weight": "90 g",
"volume": "250 ml",
"price": 6750,
"material": "steel",
diff --git a/data/json/items/magazine/45.json b/data/json/items/magazine/45.json
index 80499629d9bb3..a1f5921704334 100644
--- a/data/json/items/magazine/45.json
+++ b/data/json/items/magazine/45.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "M1911 extended magazine",
"description": "An extended 10-round magazine for use with the M1911 handgun.",
- "weight": 100,
+ "weight": "100 g",
"volume": "500 ml",
"price": 3720,
"material": "steel",
@@ -20,7 +20,7 @@
"type": "MAGAZINE",
"name": "M1911 magazine",
"description": "A military issue 7-round magazine for use with the M1911 handgun.",
- "weight": 70,
+ "weight": "70 g",
"volume": "250 ml",
"price": 2980,
"material": "steel",
@@ -36,7 +36,7 @@
"type": "MAGAZINE",
"name": "MAC-10 magazine",
"description": "A cheap 30-round steel box magazine for use with the MAC-10 SMG.",
- "weight": 210,
+ "weight": "210 g",
"volume": "500 ml",
"price": 1800,
"material": "steel",
@@ -52,7 +52,7 @@
"type": "MAGAZINE",
"name": "makeshift .45 20-round magazine",
"description": "An improvised magazine that is mostly compatible with a homemade 'Luty' submachinegun, with a simplified feed system. It looks like it might feed 20 rounds of .45 ACP.",
- "weight": 300,
+ "weight": "300 g",
"volume": "750 ml",
"price": 4000,
"material": "steel",
@@ -69,7 +69,7 @@
"type": "MAGAZINE",
"name": "TDI Vector magazine",
"description": "A 30-round steel box magazine for use with the TDI Vector",
- "weight": 210,
+ "weight": "210 g",
"volume": "500 ml",
"price": 1800,
"material": "steel",
@@ -85,7 +85,7 @@
"type": "MAGAZINE",
"name": "Thompson extended magazine",
"description": "An extended 30-round magazine for the Thompson submachine gun.",
- "weight": 255,
+ "weight": "255 g",
"volume": "750 ml",
"price": 4000,
"material": "steel",
@@ -102,7 +102,7 @@
"type": "MAGAZINE",
"name": "Thompson drum magazine",
"description": "A 50-round drum magazine for the Thompson submachine gun. Made famous by gangsters, but the military preferred standard 20 and 30-round magazines due to greater reliability.",
- "weight": 500,
+ "weight": "500 g",
"volume": "1 L",
"price": 8000,
"material": "steel",
@@ -119,7 +119,7 @@
"type": "MAGAZINE",
"name": "Thompson magazine",
"description": "A standard 20-round magazine for the Thompson submachine gun.",
- "weight": 170,
+ "weight": "170 g",
"volume": "500 ml",
"price": 3000,
"material": "steel",
@@ -135,7 +135,7 @@
"type": "MAGAZINE",
"name": "UMP45 magazine",
"description": "A standard 25-round box magazine for use with the H&K UMP45 SMG.",
- "weight": 200,
+ "weight": "200 g",
"volume": "500 ml",
"price": 4950,
"material": "steel",
@@ -151,7 +151,7 @@
"type": "MAGAZINE",
"name": "USP .45 magazine",
"description": "A standard capacity magazine for use with the H&K USP handgun.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 5900,
"material": "plastic",
@@ -167,7 +167,7 @@
"type": "MAGAZINE",
"name": "PPQ magazine .45 ACP",
"description": "A 12 round steel box magazine for the Walther PPQ .45 ACP.",
- "weight": 80,
+ "weight": "80 g",
"volume": "240 ml",
"price": 5000,
"material": "steel",
@@ -183,7 +183,7 @@
"type": "MAGAZINE",
"name": "Model JHP magazine",
"description": "A 9-round steel box magazine for use with the Hi-Point Model JHP.",
- "weight": 110,
+ "weight": "110 g",
"volume": "353 ml",
"price": 2500,
"material": "steel",
diff --git a/data/json/items/magazine/454.json b/data/json/items/magazine/454.json
index f8b66dd9fcb67..6464ba7dae9ce 100644
--- a/data/json/items/magazine/454.json
+++ b/data/json/items/magazine/454.json
@@ -3,14 +3,14 @@
"id": "454_speedloader5",
"type": "MAGAZINE",
"name": ".454 5-round speedloader",
- "description": "This speedloader can hold 5 rounds of .454 and quickly reload a compatible revolver.",
- "weight": 108,
+ "description": "This speedloader can hold 5 rounds of .454 or .45 Colt and quickly reload a compatible revolver.",
+ "weight": "108 g",
"volume": "250 ml",
"price": 2200,
"material": "steel",
"symbol": "#",
"color": "light_gray",
- "ammo_type": "454",
+ "ammo_type": [ "454", "45colt" ],
"capacity": 5,
"flags": [ "SPEEDLOADER" ]
}
diff --git a/data/json/items/magazine/46.json b/data/json/items/magazine/46.json
index e14a3b53c1be4..44b6672d242d1 100644
--- a/data/json/items/magazine/46.json
+++ b/data/json/items/magazine/46.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "H&K 4.6mm extended magazine",
"description": "An extended 40-round magazine for use with H&K's proprietary 4.6x30mm round.",
- "weight": 240,
+ "weight": "240 g",
"volume": "500 ml",
"price": 6300,
"material": "steel",
@@ -20,7 +20,7 @@
"type": "MAGAZINE",
"name": "H&K 4.6mm magazine",
"description": "A standard capacity 20-round magazine for use with H&K's proprietary 4.6x30mm round.",
- "weight": 120,
+ "weight": "120 g",
"volume": "250 ml",
"price": 4700,
"material": "steel",
diff --git a/data/json/items/magazine/460.json b/data/json/items/magazine/460.json
index 46f5ae4042201..395790879fc6e 100644
--- a/data/json/items/magazine/460.json
+++ b/data/json/items/magazine/460.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": ".460 6-round speedloader",
"description": "This speedloader, made by Leadworks for use with L2031 Enforcer revolver, can hold 6 rounds of .460 or .45 and quickly reload a compatible revolver.",
- "weight": 86,
+ "weight": "86 g",
"volume": "250 ml",
"price": 3200,
"material": "plastic",
@@ -19,7 +19,7 @@
"type": "MAGAZINE",
"name": "LW-12 magazine",
"description": "A 12-round polymer magazine for use with the Leadworks LLC L39-460 and L39B-45 pistols.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 5800,
"material": "plastic",
diff --git a/data/json/items/magazine/50.json b/data/json/items/magazine/50.json
index 1bd014219e628..98611b7a66163 100644
--- a/data/json/items/magazine/50.json
+++ b/data/json/items/magazine/50.json
@@ -15,7 +15,7 @@
"name": "Barrett magazine",
"//": "Fully loaded 10 magazine, presumably loaded with the 114.7 gram M33 Ball cartridge, weighs 1868.801 grams. Source inetres.com",
"description": "Standard 10-round box magazine for a Barrett M107A1 anti-materiel rifle.",
- "weight": 727,
+ "weight": "727 g",
"volume": "500 ml",
"price": 10000,
"material": "steel",
diff --git a/data/json/items/magazine/500.json b/data/json/items/magazine/500.json
index 6bdfadd733679..9d934b0284808 100644
--- a/data/json/items/magazine/500.json
+++ b/data/json/items/magazine/500.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": ".500 5-round speedloader",
"description": "This speedloader can hold 5 rounds of .500 and quickly reload a compatible revolver.",
- "weight": 118,
+ "weight": "118 g",
"volume": "250 ml",
"price": 2500,
"material": "steel",
diff --git a/data/json/items/magazine/545x39.json b/data/json/items/magazine/545x39.json
index 7cf39bdac93eb..55d4f5485b2c7 100644
--- a/data/json/items/magazine/545x39.json
+++ b/data/json/items/magazine/545x39.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "AK-74M magazine",
"description": "A standard magazine made for the AK-74M rifle, made of steel-reinforced polymer. Holds 30 rounds.",
- "weight": 230,
+ "weight": "230 g",
"volume": "500 ml",
"price": 1500,
"material": [ "steel", "plastic" ],
@@ -21,7 +21,7 @@
"name": "AK-74M extended magazine",
"//": "Technically it's meant for the RPK-74, but can always rename if we add an RPK.",
"description": "A 45-round magazine compatible with the AK-74M rifle, though originally designed for the RPK-74 light machine gun.",
- "weight": 300,
+ "weight": "300 g",
"volume": "750 ml",
"price": 8500,
"material": "plastic",
diff --git a/data/json/items/magazine/57.json b/data/json/items/magazine/57.json
index bce5b54482051..acf1c26553dc7 100644
--- a/data/json/items/magazine/57.json
+++ b/data/json/items/magazine/57.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "FN-57 magazine",
"description": "A standard capacity magazine for use with the FN Five-Seven.",
- "weight": 120,
+ "weight": "120 g",
"volume": "250 ml",
"price": 3700,
"material": "steel",
@@ -20,7 +20,7 @@
"type": "MAGAZINE",
"name": "FN-P90 magazine",
"description": "A factory issue translucent polymer box magazine that fits with the frame of the FN P90.",
- "weight": 300,
+ "weight": "300 g",
"volume": "500 ml",
"price": 5400,
"material": "plastic",
diff --git a/data/json/items/magazine/5x50.json b/data/json/items/magazine/5x50.json
index beabff82a2adb..a7ad5abbe781d 100644
--- a/data/json/items/magazine/5x50.json
+++ b/data/json/items/magazine/5x50.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "RMFB100 5x50mm extended magazine",
"description": "A 100 round box magazine for use with 5x50mm flechette firearms.",
- "weight": 360,
+ "weight": "360 g",
"volume": "630ml",
"price": 15000,
"material": [ "superalloy", "plastic" ],
@@ -21,7 +21,7 @@
"type": "MAGAZINE",
"name": "RMFB50 5x50mm magazine",
"description": "A 50 round box magazine for use with 5x50mm flechette firearms.",
- "weight": 240,
+ "weight": "240 g",
"volume": "315ml",
"price": 12500,
"material": [ "superalloy", "plastic" ],
diff --git a/data/json/items/magazine/66mm.json b/data/json/items/magazine/66mm.json
new file mode 100644
index 0000000000000..9ca257fe9c2df
--- /dev/null
+++ b/data/json/items/magazine/66mm.json
@@ -0,0 +1,16 @@
+[
+ {
+ "id": "m74_clip",
+ "type": "MAGAZINE",
+ "name": "M74 rocket clip",
+ "description": "This is a clip for the M202A1 FLASH that can hold 4 M74 incendiary rockets.",
+ "weight": "200 g",
+ "volume": "500 ml",
+ "price": 1000,
+ "material": "steel",
+ "symbol": "#",
+ "color": "light_gray",
+ "ammo_type": [ "m235" ],
+ "capacity": 4
+ }
+]
diff --git a/data/json/items/magazine/762.json b/data/json/items/magazine/762.json
index 61bbb04f395f8..3329572b30d7e 100644
--- a/data/json/items/magazine/762.json
+++ b/data/json/items/magazine/762.json
@@ -5,7 +5,7 @@
"name": "rifle clip - 7.62x39mm",
"//": "Provisional.",
"description": "A tiny piece of grooved metal designed to allow a shooter to quickly load a bolt-action rifle.",
- "weight": 40,
+ "weight": "40 g",
"volume": "100ml",
"price": 1000,
"material": "steel",
@@ -20,7 +20,7 @@
"type": "MAGAZINE",
"name": "AKM extended magazine",
"description": "A 40-round, 7.62x39mm magazine initially designed for the RPK but compatible with the AKM rifle.",
- "weight": 570,
+ "weight": "570 g",
"volume": "750 ml",
"price": 8300,
"material": "steel",
@@ -37,7 +37,7 @@
"type": "MAGAZINE",
"name": "AKM magazine",
"description": "A standard 30-round magazine made for the AKM rifle, made of stamped sheet metal.",
- "weight": 430,
+ "weight": "430 g",
"volume": "500 ml",
"price": 2800,
"material": "steel",
diff --git a/data/json/items/magazine/762R.json b/data/json/items/magazine/762R.json
index e0b3ef6080552..9e7806069c043 100644
--- a/data/json/items/magazine/762R.json
+++ b/data/json/items/magazine/762R.json
@@ -5,7 +5,7 @@
"name": "rifle clip - 7.62x54mmR",
"//": "Provisional.",
"description": "A tiny piece of grooved metal designed to allow a shooter to quickly load a bolt-action rifle.",
- "weight": 40,
+ "weight": "40 g",
"volume": "50ml",
"price": 1000,
"material": "steel",
diff --git a/data/json/items/magazine/762x25.json b/data/json/items/magazine/762x25.json
index 2da622a07b131..4642a443ffc8f 100644
--- a/data/json/items/magazine/762x25.json
+++ b/data/json/items/magazine/762x25.json
@@ -5,7 +5,7 @@
"name": "PPSh 71-round drum magazine",
"//": "Provisional.",
"description": "A high-capacity drum magazine for the PPSh-41.",
- "weight": 1387,
+ "weight": "1387 g",
"volume": "750 ml",
"price": 7000,
"material": "steel",
@@ -22,7 +22,7 @@
"type": "MAGAZINE",
"name": "PPSh 35-round magazine",
"description": "A 35-round box magazine for the PPSh-41.",
- "weight": 470,
+ "weight": "470 g",
"volume": "500 ml",
"price": 2200,
"material": "steel",
@@ -38,7 +38,7 @@
"type": "MAGAZINE",
"name": "Tokarev TT-33 magazine",
"description": "Standard 8-round magazine for Tokarev TT-33.",
- "weight": 56,
+ "weight": "56 g",
"volume": "250 ml",
"price": 1300,
"material": "steel",
diff --git a/data/json/items/magazine/8x40mm.json b/data/json/items/magazine/8x40mm.json
index 177d49e954d2c..10228b4eb79dd 100644
--- a/data/json/items/magazine/8x40mm.json
+++ b/data/json/items/magazine/8x40mm.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "RMGB100 8x40mm magazine",
"description": "A 100 round box magazine for use with Rivtech 8x40mm caseless firearms.",
- "weight": 150,
+ "weight": "150 g",
"volume": "750 ml",
"price": 40000,
"material": [ "superalloy", "plastic" ],
@@ -21,7 +21,7 @@
"type": "MAGAZINE",
"name": "RMGP10 8x40mm stick magazine",
"description": "A 10 round stick magazine for use with Rivtech 8x40mm caseless firearms.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 9000,
"material": [ "superalloy", "plastic" ],
@@ -38,7 +38,7 @@
"type": "MAGAZINE",
"name": "RMGD250 8x40mm drum magazine",
"description": "A 250 round drum magazine for use with Rivtech 8x40mm caseless firearms.",
- "weight": 340,
+ "weight": "340 g",
"volume": "2 L",
"price": 70000,
"material": [ "superalloy", "plastic" ],
@@ -54,7 +54,7 @@
"type": "MAGAZINE",
"name": "RMGP25 8x40mm stick magazine",
"description": "A 25 round stick magazine for use with Rivtech 8x40mm caseless firearms.",
- "weight": 90,
+ "weight": "90 g",
"volume": "500 ml",
"price": 12500,
"material": [ "superalloy", "plastic" ],
@@ -71,7 +71,7 @@
"type": "MAGAZINE",
"name": "RMGB500 8x40mm drum magazine",
"description": "A 500 round drum magazine for use with Rivtech 8x40mm caseless firearms.",
- "weight": 1400,
+ "weight": "1400 g",
"volume": "4 L",
"price": 100000,
"material": [ "superalloy", "plastic" ],
@@ -86,7 +86,7 @@
"type": "MAGAZINE",
"name": "RMGB50 8x40mm magazine",
"description": "A 50 round box magazine for use with Rivtech 8x40mm caseless firearms.",
- "weight": 110,
+ "weight": "110 g",
"volume": "500 ml",
"price": 25000,
"material": [ "superalloy", "plastic" ],
@@ -103,7 +103,7 @@
"type": "MAGAZINE",
"name": "RMGS5 8x40mm speedloader",
"description": "This speedloader, made by Rivtech for use with RM99 revolver, can hold 5 rounds of 8x40mm caseless rounds and quickly reload a compatible revolver.",
- "weight": 92,
+ "weight": "92 g",
"volume": "250 ml",
"price": 8000,
"material": [ "superalloy", "plastic" ],
diff --git a/data/json/items/magazine/9mm.json b/data/json/items/magazine/9mm.json
index 140e5c8ba6953..3c4766da409e5 100644
--- a/data/json/items/magazine/9mm.json
+++ b/data/json/items/magazine/9mm.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "LW-7 speedloader",
"description": "This speedloader, made by Leadworks for use with L2032 Lookout revolver, can hold 7 rounds of 9x19mm and quickly reload a compatible revolver.",
- "weight": 72,
+ "weight": "72 g",
"volume": "250 ml",
"price": 2800,
"material": "plastic",
@@ -19,7 +19,7 @@
"type": "MAGAZINE",
"name": "Calico magazine",
"description": "A surprisingly compact 50-round helical magazine for use with the Calico M960 SMG.",
- "weight": 490,
+ "weight": "490 g",
"volume": "500 ml",
"price": 9920,
"material": "steel",
@@ -36,7 +36,7 @@
"type": "MAGAZINE",
"name": "Glock extended magazine",
"description": "An extended 30-round polymer magazine for use with Glock compatible firearms.",
- "weight": 210,
+ "weight": "210 g",
"volume": "500 ml",
"price": 4700,
"material": "plastic",
@@ -53,7 +53,7 @@
"type": "MAGAZINE",
"name": "Glock magazine",
"description": "A compact light-weight polymer magazine for use with Glock compatible firearms.",
- "weight": 105,
+ "weight": "105 g",
"volume": "250 ml",
"price": 2900,
"material": "plastic",
@@ -69,7 +69,7 @@
"type": "MAGAZINE",
"name": "Glock 17 magazine - 17 rd",
"description": "Made for the Glock 17, this magazine holds 17 rounds.",
- "weight": 105,
+ "weight": "105 g",
"volume": "250 ml",
"price": 2900,
"material": "plastic",
@@ -86,7 +86,7 @@
"type": "MAGAZINE",
"name": "Glock 17 magazine - 22 rd",
"description": "Made for the Glock 17, this magazine holds 22 rounds.",
- "weight": 105,
+ "weight": "105 g",
"volume": "500 ml",
"price": 3500,
"material": "plastic",
@@ -94,14 +94,15 @@
"color": "light_gray",
"ammo_type": "9mm",
"capacity": 22,
- "reliability": 8
+ "reliability": 8,
+ "flags": [ "MAG_COMPACT" ]
},
{
"id": "glock_drum_50rd",
"type": "MAGAZINE",
"name": "Glock Drum magazine - 50 rd",
"description": "Made to fit most Glock pistols. This drum magazine holds 50 rounds.",
- "weight": 100,
+ "weight": "100 g",
"volume": "500 ml",
"price": 2000,
"material": "plastic",
@@ -117,7 +118,7 @@
"type": "MAGAZINE",
"name": "Glock Drum magazine - 100 rd",
"description": "Made to fit most Glock pistols. This drum magazine holds 100 rounds.",
- "weight": 100,
+ "weight": "100 g",
"volume": "1 L",
"price": 3100,
"material": "plastic",
@@ -133,7 +134,7 @@
"type": "MAGAZINE",
"name": "LW-21 magazine",
"description": "A 21-round polymer magazine for Leadworks LLC 9x19mm firearms. Lightweight and reliable but somewhat more difficult to reload.",
- "weight": 105,
+ "weight": "105 g",
"volume": "500 ml",
"price": 7600,
"material": "plastic",
@@ -150,7 +151,7 @@
"type": "MAGAZINE",
"name": "M9 extended magazine",
"description": "A 30-round extended magazine compatible with both the M9 handgun as well as some modern carbines.",
- "weight": 270,
+ "weight": "270 g",
"volume": "500 ml",
"price": 3500,
"material": "steel",
@@ -167,7 +168,7 @@
"type": "MAGAZINE",
"name": "M9 magazine",
"description": "A military issue 15-round box magazine originally intended for use with the Beretta M9 handgun.",
- "weight": 135,
+ "weight": "135 g",
"volume": "250 ml",
"price": 2300,
"material": "steel",
@@ -183,7 +184,7 @@
"type": "MAGAZINE",
"name": "MP5 extended magazine",
"description": "An drum magazine for use with the H&K MP5 SMG. Much greater capacity but less reliable the factory specification magazine.",
- "weight": 350,
+ "weight": "350 g",
"volume": "750 ml",
"price": 6920,
"material": "steel",
@@ -200,7 +201,7 @@
"type": "MAGAZINE",
"name": "MP5 magazine",
"description": "A standard capacity curved magazine for use with the H&K MP5 SMG.",
- "weight": 210,
+ "weight": "210 g",
"volume": "500 ml",
"price": 4100,
"material": "steel",
@@ -216,7 +217,7 @@
"type": "MAGAZINE",
"name": "STEN magazine",
"description": "A double-column, single-feed 9x19mm magazine used by the STEN submachine gun, based off the magazines for the German MP-28 and later MP-40.",
- "weight": 255,
+ "weight": "255 g",
"volume": "500 ml",
"price": 4000,
"material": "steel",
@@ -232,7 +233,7 @@
"type": "MAGAZINE",
"name": "makeshift STEN magazine",
"description": "An improvised magazine that is mostly compatible with the STEN submachine gun, with a simplified feed system.",
- "weight": 300,
+ "weight": "300 g",
"volume": "500 ml",
"price": 4000,
"material": "steel",
@@ -249,7 +250,7 @@
"type": "MAGAZINE",
"name": "TEC-9 magazine",
"description": "A cheap and somewhat unreliable 32-round steel box magazine for use with the TEC-9 SMG.",
- "weight": 220,
+ "weight": "220 g",
"volume": "500 ml",
"price": 3100,
"material": "steel",
@@ -265,7 +266,7 @@
"type": "MAGAZINE",
"name": "USP 9mm magazine",
"description": "A factory specification 15-round box magazine for use with the dependable H&K USP 9x19mm pistol.",
- "weight": 75,
+ "weight": "75 g",
"volume": "250 ml",
"price": 3850,
"material": "steel",
@@ -281,7 +282,7 @@
"type": "MAGAZINE",
"name": "UZI magazine",
"description": "A standard 32-round steel box magazine for use with the UZI SMG.",
- "weight": 220,
+ "weight": "220 g",
"volume": "500 ml",
"price": 4100,
"material": "steel",
@@ -297,7 +298,7 @@
"type": "MAGAZINE",
"name": "Kel-Tec PF-9 magazine",
"description": "A standard 7-round steel box magazine for the Kel-Tec PF-9.",
- "weight": 60,
+ "weight": "60 g",
"volume": "60ml",
"price": 1900,
"material": "steel",
@@ -313,7 +314,7 @@
"type": "MAGAZINE",
"name": "P320 magazine 9x19mm",
"description": "A 17 round double stack box magazine for the SIG Sauer P320.",
- "weight": 105,
+ "weight": "105 g",
"volume": "250 ml",
"price": 2900,
"material": "plastic",
@@ -330,7 +331,7 @@
"type": "MAGAZINE",
"name": "Hi-Power magazine 9x19mm",
"description": "A 13 round steel box magazine for the Browning Hi-Power 9x19mm.",
- "weight": 100,
+ "weight": "100 g",
"volume": "191 ml",
"price": 2400,
"material": "steel",
@@ -346,7 +347,7 @@
"type": "MAGAZINE",
"name": "Hi-Power magazine 9x19mm",
"description": "A 15 round steel box magazine for the Browning Hi-Power 9x19mm.",
- "weight": 100,
+ "weight": "100 g",
"volume": "191 ml",
"price": 2700,
"material": "steel",
@@ -362,7 +363,7 @@
"type": "MAGAZINE",
"name": "P38 magazine",
"description": "An 8 round steel box magazine for the Walther P38.",
- "weight": 70,
+ "weight": "70 g",
"volume": "228 ml",
"price": 1500,
"material": "steel",
@@ -378,7 +379,7 @@
"type": "MAGAZINE",
"name": "PPQ magazine 9x19mm",
"description": "A 10 round steel box magazine for the Walther PPQ 9mm.",
- "weight": 80,
+ "weight": "80 g",
"volume": "207 ml",
"price": 2200,
"material": "steel",
@@ -394,7 +395,7 @@
"type": "MAGAZINE",
"name": "PPQ magazine 9x19mm",
"description": "A 15 round steel box magazine for the Walther PPQ 9mm.",
- "weight": 80,
+ "weight": "80 g",
"volume": "207 ml",
"price": 2800,
"material": "steel",
@@ -410,7 +411,7 @@
"type": "MAGAZINE",
"name": "PPQ magazine 9x19mm",
"description": "A 17 round steel box magazine for the Walther PPQ 9mm.",
- "weight": 80,
+ "weight": "80 g",
"volume": "207 ml",
"price": 3200,
"material": "steel",
@@ -426,7 +427,7 @@
"type": "MAGAZINE",
"name": "C-9 magazine",
"description": "An 8-round steel box magazine for use with the Hi-Point C-9.",
- "weight": 110,
+ "weight": "110 g",
"volume": "284 ml",
"price": 2500,
"material": "steel",
@@ -442,7 +443,7 @@
"type": "MAGAZINE",
"name": "C-9 magazine",
"description": "A 10-round steel box magazine for use with the Hi-Point C-9.",
- "weight": 110,
+ "weight": "110 g",
"volume": "284 ml",
"price": 2500,
"material": "steel",
@@ -458,7 +459,7 @@
"type": "MAGAZINE",
"name": "C-9 magazine",
"description": "A 15-round steel box magazine for use with the Hi-Point C-9.",
- "weight": 110,
+ "weight": "110 g",
"volume": "284 ml",
"price": 2500,
"material": "steel",
@@ -474,7 +475,7 @@
"type": "MAGAZINE",
"name": "CZ 75 magazine",
"description": "A 12-round steel box magazine for use with the CZ 75.",
- "weight": 100,
+ "weight": "100 g",
"volume": "230 ml",
"price": 7500,
"material": "steel",
@@ -490,7 +491,7 @@
"type": "MAGAZINE",
"name": "CZ 75 magazine",
"description": "A 20-round steel box magazine for use with the CZ 75.",
- "weight": 100,
+ "weight": "100 g",
"volume": "230 ml",
"price": 7500,
"material": "steel",
@@ -506,7 +507,7 @@
"type": "MAGAZINE",
"name": "CZ 75 magazine",
"description": "A 26-round steel box magazine for use with the CZ 75.",
- "weight": 100,
+ "weight": "100 g",
"volume": "230 ml",
"price": 7500,
"material": "steel",
@@ -522,7 +523,7 @@
"type": "MAGAZINE",
"name": "CCP magazine",
"description": "An 8-round steel box magazine for use with the Walther CCP.",
- "weight": 75,
+ "weight": "75 g",
"volume": "176 ml",
"price": 7500,
"material": "steel",
diff --git a/data/json/items/magazine/9x18.json b/data/json/items/magazine/9x18.json
index 4376872de7a54..e4897bbee4aa9 100644
--- a/data/json/items/magazine/9x18.json
+++ b/data/json/items/magazine/9x18.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "Makarov PM magazine",
"description": "The standard magazine for the Pistolet Makarova, holds 8 rounds.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 2300,
"material": "steel",
@@ -20,7 +20,7 @@
"type": "MAGAZINE",
"name": "Skorpion Vz. 82 magazine",
"description": "A standard 20-round magazine for the Skorpion Vz. 82, in 9x18mm Makarov.",
- "weight": 170,
+ "weight": "170 g",
"volume": "500 ml",
"price": 2300,
"material": "steel",
diff --git a/data/json/items/magazine/chemical_spray.json b/data/json/items/magazine/chemical_spray.json
index 8c59f974d0b08..91a017c071ea8 100644
--- a/data/json/items/magazine/chemical_spray.json
+++ b/data/json/items/magazine/chemical_spray.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "pressurized chemical tank",
"description": "A makeshift pressurized 2L canister designed to feed a makeshift chemical thrower.",
- "weight": 800,
+ "weight": "800 g",
"volume": "2 L",
"price": 5000,
"material": "steel",
diff --git a/data/json/items/magazine/liquid.json b/data/json/items/magazine/liquid.json
index b3f6e3590e510..46737e7ddd511 100644
--- a/data/json/items/magazine/liquid.json
+++ b/data/json/items/magazine/liquid.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "pressurized fuel tank",
"description": "A pressurized 3L canister designed to feed a flamethrower.",
- "weight": 600,
+ "weight": "600 g",
"volume": "3 L",
"price": 5000,
"material": "steel",
@@ -20,7 +20,7 @@
"type": "MAGAZINE",
"name": "small pressurized fuel tank",
"description": "A pressurized 0.5L canister built for use with a small auxiliary flamethrower.",
- "weight": 100,
+ "weight": "100 g",
"volume": "500 ml",
"price": 3000,
"material": "steel",
@@ -36,7 +36,7 @@
"type": "MAGAZINE",
"name": "RM450-2 fuel canister",
"description": "A 2L pressurized steel canister with a valve designed for the RM451's feed system.",
- "weight": 400,
+ "weight": "400 g",
"volume": "2 L",
"price": 15000,
"material": "steel",
@@ -52,7 +52,7 @@
"type": "MAGAZINE",
"name": "RM450-4 fuel canister",
"description": "A 4L pressurized steel canister with a valve designed for the RM451's feed system.",
- "weight": 800,
+ "weight": "800 g",
"volume": "4 L",
"price": 20000,
"material": "steel",
diff --git a/data/json/items/magazine/nail.json b/data/json/items/magazine/nail.json
index 375a57de73dee..309ef54a1f302 100644
--- a/data/json/items/magazine/nail.json
+++ b/data/json/items/magazine/nail.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "nail rifle magazine",
"description": "An improvised magazine for use with a nail rifle. Little more than a tin can, spring and some duct tape it is awkward to reload and not especially reliable.",
- "weight": 60,
+ "weight": "60 g",
"volume": "250 ml",
"price": 1920,
"material": "steel",
diff --git a/data/json/items/magazine/shot.json b/data/json/items/magazine/shot.json
index d0acd36bcac16..ff8c065cefabe 100644
--- a/data/json/items/magazine/shot.json
+++ b/data/json/items/magazine/shot.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "Saiga-12 box magazine",
"description": "A removable plastic magazine for the Saiga-12 shotgun. Holds 10 rounds.",
- "weight": 210,
+ "weight": "210 g",
"volume": "500 ml",
"price": 4500,
"material": "plastic",
@@ -20,7 +20,7 @@
"type": "MAGAZINE",
"name": "Saiga-12 drum magazine",
"description": "A removable plastic magazine for the Saiga-12 shotgun. Holds 30 rounds.",
- "weight": 460,
+ "weight": "460 g",
"volume": "1 L",
"price": 11000,
"material": "plastic",
@@ -37,7 +37,7 @@
"type": "MAGAZINE",
"name": "shotshell belt",
"description": "A non-disintegrating cloth ammo belt which can hold up to 20 shotgun shells. Notably less reliable than metal ammo belts.",
- "weight": 200,
+ "weight": "200 g",
"volume": "500 ml",
"price": 1000,
"material": "cotton",
@@ -54,7 +54,7 @@
"type": "MAGAZINE",
"name": "shotgun 6-round speedloader",
"description": "A steel tube with attached handle that when inserted into a 6 round shotgun can be used to quickly load the full tube in a much shorter period of time than by hand.",
- "weight": 480,
+ "weight": "480 g",
"volume": "1750 ml",
"price": 3200,
"material": "steel",
@@ -69,7 +69,7 @@
"type": "MAGAZINE",
"name": "shotgun 8-round speedloader",
"description": "A steel tube with attached handle that when inserted into an 8 round shotgun can be used to quickly load the full tube in a much shorter period of time than by hand.",
- "weight": 510,
+ "weight": "510 g",
"volume": "2 L",
"price": 3250,
"material": "steel",
diff --git a/data/json/items/magazine/weldgas.json b/data/json/items/magazine/weldgas.json
index 5add892174a91..1d5aa9908e142 100644
--- a/data/json/items/magazine/weldgas.json
+++ b/data/json/items/magazine/weldgas.json
@@ -4,7 +4,7 @@
"type": "MAGAZINE",
"name": "small welding tank",
"description": "A compact steel cylinder designed for holding pressurized welding gases. It is marked with several faded and now unreadable symbols.",
- "weight": 1500,
+ "weight": "1500 g",
"volume": "1 L",
"price": 5600,
"material": "steel",
@@ -21,7 +21,7 @@
"type": "MAGAZINE",
"name": "welding tank",
"description": "A large steel cylinder designed for holding pressurized welding gases. It is marked with several faded and now unreadable symbols.",
- "weight": 6000,
+ "weight": "6000 g",
"volume": "3 L",
"price": 5600,
"material": "steel",
@@ -38,7 +38,7 @@
"type": "MAGAZINE",
"name": "oxygen cylinder",
"description": "A large steel cylinder used for storing pressurized gas. It is marked with a faded, but legible O2 symbol.",
- "weight": 12888,
+ "weight": "12888 g",
"volume": "2500 ml",
"price": 13400,
"material": "steel",
diff --git a/data/json/items/melee.json b/data/json/items/melee.json
index ebd1f58be2275..053a89fae488c 100644
--- a/data/json/items/melee.json
+++ b/data/json/items/melee.json
@@ -5,7 +5,7 @@
"category": "weapons",
"name": "throwing stick",
"description": "A stick carved into a shape suitable for throwing at a target. Not a boomerang, so don't expect it to return to your hand.",
- "weight": 574,
+ "weight": "574 g",
"volume": "500 ml",
"price": 200,
"bashing": 5,
@@ -22,7 +22,7 @@
"name": "bolas",
"name_plural": "bolases",
"description": "Some ropes with weights, designed to tangle the legs of a target when thrown, usually at an animal. Used by the Gauchos of Argentina.",
- "weight": 400,
+ "weight": "400 g",
"volume": "750 ml",
"price": 600,
"material": [ "cotton", "stone" ],
@@ -38,7 +38,7 @@
"category": "weapons",
"name": "net",
"description": "A mesh of string and weights, traditionally used to catch fish, and to entangle oponents in combat.",
- "weight": 1100,
+ "weight": "1100 g",
"volume": "1500 ml",
"price": 650,
"material": [ "cotton", "stone" ],
@@ -59,7 +59,7 @@
"price_postapoc": 5000,
"material": [ "steel", "wood" ],
"techniques": [ "WBLOCK_1" ],
- "weight": 907,
+ "weight": "907 g",
"volume": "1 L",
"bashing": 13,
"cutting": 7,
@@ -78,7 +78,7 @@
"category": "spare_parts",
"material": "stone",
"flags": "TRADER_AVOID",
- "weight": 657,
+ "weight": "657 g",
"volume": "250 ml",
"bashing": 7,
"to_hit": -2,
@@ -92,7 +92,7 @@
"name": "sharp rock",
"description": "A rock with sharp edges, that can be used as a butchering tool, if nothing else is available. Makes a passable melee weapon.",
"material": "stone",
- "weight": 500,
+ "weight": "500 g",
"volume": "250 ml",
"bashing": 5,
"cutting": 3,
@@ -108,7 +108,7 @@
"description": "A broken ceramic shard. It is heavy and has a somewhat sharp edge, but it's too irregular to cut properly.",
"material": "ceramic",
"flags": "TRADER_AVOID",
- "weight": 750,
+ "weight": "750 g",
"volume": "250 ml",
"bashing": 5,
"cutting": 2,
@@ -120,7 +120,7 @@
"id": "broom",
"name": "broom",
"description": "A long-handled broom. Makes a terrible weapon unless you're chasing cats.",
- "weight": 929,
+ "weight": "929 g",
"to_hit": 1,
"color": "yellow",
"symbol": "/",
@@ -136,7 +136,7 @@
"id": "nailboard",
"name": "nailboard",
"description": "A long piece of wood with several nails through one end; essentially a simple mace. Makes an acceptable melee weapon.",
- "weight": 1424,
+ "weight": "1424 g",
"to_hit": 1,
"color": "brown",
"symbol": "/",
@@ -154,7 +154,7 @@
"id": "nailbat",
"name": "nail bat",
"description": "A baseball bat with several nails driven through it, an excellent melee weapon.",
- "weight": 1159,
+ "weight": "1159 g",
"to_hit": 3,
"color": "brown",
"symbol": "/",
@@ -171,7 +171,7 @@
"id": "bwirebat",
"name": "barbed wire bat",
"description": "A baseball bat wrapped with barbed wire. A brutal melee weapon.",
- "weight": 1420,
+ "weight": "1420 g",
"to_hit": 3,
"color": "brown",
"symbol": "/",
@@ -189,7 +189,7 @@
"name": "The 7-10 Split",
"name_plural": "7-10 Splits",
"description": "An improvised weapon, made from two spikes attached to a bowling pin in the shape of a 'T'.",
- "weight": 2433,
+ "weight": "2433 g",
"to_hit": -1,
"color": "brown",
"symbol": "/",
@@ -212,7 +212,7 @@
"description": "A pair of knuckles consisting of two small squares of wood with several nails coming through them. Useful in nasty street fights.",
"material": "wood",
"volume": "250 ml",
- "weight": 430,
+ "weight": "430 g",
"bashing": 4,
"cutting": 6,
"flags": [ "UNARMED_WEAPON" ]
@@ -222,7 +222,7 @@
"id": "bowling_pin",
"name": "bowling pin",
"description": "A blunt bowling pin. Makes a decent melee weapon, if somewhat short.",
- "weight": 1530,
+ "weight": "1530 g",
"to_hit": -1,
"color": "brown",
"symbol": "/",
@@ -238,7 +238,7 @@
"id": "battletorch_done",
"name": "burnt out Louisville Slaughterer",
"description": "A sturdy wood bat, wrapped in flame-resistant Nomex fabric. Makes a good melee weapon but better be disassembled to recycle the baseball bat and some Nomex patches.",
- "weight": 1343,
+ "weight": "1343 g",
"to_hit": 3,
"color": "brown",
"symbol": "/",
@@ -254,7 +254,7 @@
"id": "bee_sting",
"name": "bee sting",
"description": "A six-inch stinger from a giant bee. Makes a mediocre melee weapon.",
- "weight": 540,
+ "weight": "540 g",
"to_hit": -1,
"color": "white",
"symbol": ",",
@@ -269,7 +269,7 @@
"id": "fighter_sting",
"name": "fungal fighter sting",
"description": "A short dart from a fungal fighter. Makes an poor melee weapon.",
- "weight": 270,
+ "weight": "270 g",
"to_hit": -1,
"color": "green",
"symbol": ",",
@@ -284,7 +284,7 @@
"id": "wasp_sting",
"name": "wasp sting",
"description": "A six-inch stinger from a giant wasp. Makes a poor melee weapon.",
- "weight": 540,
+ "weight": "540 g",
"to_hit": -1,
"color": "dark_gray",
"symbol": ",",
@@ -299,7 +299,7 @@
"id": "cane",
"name": "walking cane",
"description": "Handicapped or not, you always walk in style. Consisting of a metal headpiece and a wooden body, this makes a great bashing weapon in a pinch.",
- "weight": 453,
+ "weight": "453 g",
"to_hit": 2,
"color": "dark_gray",
"symbol": "/",
@@ -316,7 +316,7 @@
"id": "pool_cue",
"name": "pool cue",
"description": "A hard-wood stick designed for hitting colorful balls around a felt table. Truly, the coolest of sports.",
- "weight": 520,
+ "weight": "520 g",
"to_hit": 3,
"color": "brown",
"symbol": "/",
@@ -348,7 +348,7 @@
"id": "bio_blade_weapon",
"name": "monomolecular blade",
"description": "A foot-long blade made from high-tech alloy and edged with bonded nanocrystals.",
- "weight": 100,
+ "weight": "100 g",
"to_hit": 3,
"color": "dark_gray",
"symbol": "{",
@@ -364,7 +364,7 @@
"id": "punch_dagger",
"name": "punch dagger",
"description": "A short and sharp double edged dagger made to be gripped in the palm, with the blade protruding between the fingers.",
- "weight": 168,
+ "weight": "168 g",
"to_hit": 2,
"color": "dark_gray",
"symbol": "{",
@@ -382,7 +382,7 @@
"name": "tiger claws",
"name_plural": "tiger claws",
"description": "Also called bagh nakha or iron paw, this is a small claw-like bladed weapon from India designed to be concealed under and against the palm.",
- "weight": 92,
+ "weight": "92 g",
"to_hit": 3,
"color": "dark_gray",
"symbol": "{",
@@ -403,7 +403,7 @@
"description": "A mass of scrap metal crudely beat into shape, with folded rags underneath to protect the wearers knuckles. A good, quick weapon - but you have to get within punching range to use it.",
"material": "steel",
"volume": "250 ml",
- "weight": 430,
+ "weight": "430 g",
"bashing": 8,
"qualities": [ [ "HAMMER", 1 ] ],
"flags": [ "UNARMED_WEAPON" ]
@@ -417,7 +417,7 @@
"description": "Five pieces of rebar sharpened to cruel points and strapped to a brace fastened at wrist and forearm on both arms. The next bub better watch out.",
"material": "steel",
"volume": "500 ml",
- "weight": 1150,
+ "weight": "1150 g",
"cutting": 16,
"to_hit": 2,
"qualities": [ [ "CUT", 1 ], [ "BUTCHER", 8 ] ],
@@ -434,7 +434,7 @@
"description": "A heavy metal guard that covers the fist and increases striking power, with stout padding underneath to protect the wearers hand.",
"material": [ "steel", "leather" ],
"volume": "500 ml",
- "weight": 970,
+ "weight": "970 g",
"bashing": 12,
"qualities": [ [ "HAMMER", 1 ] ],
"flags": [ "UNARMED_WEAPON", "DURABLE_MELEE", "NONCONDUCTIVE" ]
@@ -449,7 +449,7 @@
"category": "weapons",
"description": "A metal weapon made of brass, designed to be gripped in the palm and cause punches to do extra damage. A good, quick weapon - but you have to get within punching range to use it.",
"material": "brass",
- "weight": 320,
+ "weight": "320 g",
"bashing": 6,
"flags": [ "UNARMED_WEAPON", "DURABLE_MELEE" ]
},
@@ -464,7 +464,7 @@
"price_postapoc": 2000,
"material": [ "wood", "plastic" ],
"techniques": [ "WBLOCK_1" ],
- "weight": 420,
+ "weight": "420 g",
"volume": "1750 ml",
"bashing": 14,
"cutting": 1,
@@ -480,7 +480,7 @@
"price": 13000,
"price_postapoc": 2200,
"material": "aluminum",
- "weight": 300,
+ "weight": "300 g",
"volume": "1 L",
"bashing": 14,
"to_hit": 1,
@@ -497,7 +497,7 @@
"price": 1000,
"price_postapoc": 300,
"material": [ "cotton", "stone" ],
- "weight": 1007,
+ "weight": "1007 g",
"volume": "500 ml",
"bashing": 8,
"to_hit": 1,
@@ -511,7 +511,7 @@
"name": "glass shiv",
"description": "A glass shard with wrapping at one end so it can be safely wielded.",
"material": [ "glass", "cotton" ],
- "weight": 115,
+ "weight": "115 g",
"volume": "30 ml",
"cutting": 6,
"flags": [ "SHEATH_KNIFE", "CONDUCTIVE", "FRAGILE_MELEE" ],
@@ -528,7 +528,7 @@
"category": "weapons",
"price": 400,
"material": [ "plastic" ],
- "weight": 49,
+ "weight": "49 g",
"volume": "250 ml",
"bashing": 2,
"cutting": 1,
@@ -544,7 +544,7 @@
"description": "A collapsible buttstock designed for the M320 grenade launcher. When combined with this stock, the M320 can be used as a stand alone weapon",
"price": 10000,
"material": [ "plastic", "steel" ],
- "weight": 600,
+ "weight": "600 g",
"volume": "250 ml",
"to_hit": 1
},
@@ -560,7 +560,7 @@
"material": [ "aluminum", "wood" ],
"flags": "NONCONDUCTIVE",
"techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ],
- "weight": 2068,
+ "weight": "2068 g",
"volume": "3250 ml",
"bashing": 16,
"cutting": 2,
@@ -576,7 +576,7 @@
"description": "This is a huge axe designed for warfare. You notice that the axe heads aren't seated properly at all.",
"price": 40000,
"material": [ "budget_steel", "wood" ],
- "weight": 2002,
+ "weight": "2002 g",
"volume": "2500 ml",
"bashing": 16,
"cutting": 24,
@@ -592,7 +592,7 @@
"name": "pitchfork",
"category": "tools",
"description": "An agricultural tool with long wooden shaft and four spikes. Is used to lift hay.",
- "weight": 1000,
+ "weight": "1000 g",
"to_hit": 1,
"color": "brown",
"symbol": "/",
@@ -612,7 +612,7 @@
"color": "brown",
"name": "bullwhip",
"description": "A long strip of braided leather with a handle on one end. Originally developed to settle disagreements with cattle, it's better used now for flaying the rotten flesh off of walking corpses. Great for when a problem comes along.",
- "weight": 3460,
+ "weight": "3460 g",
"volume": "2 L",
"price": 3500,
"material": [ "leather" ],
@@ -625,7 +625,7 @@
"type": "TOOL",
"name": "lobotomizer",
"description": "This is a hand-forged collapsible tool that has two axe heads and sharp shovel-like tip on one end. It can be used as a shovel, or you could chop some zombies with it instead.",
- "weight": 2722,
+ "weight": "2722 g",
"volume": "1750 ml",
"price": 25000,
"to_hit": -3,
@@ -644,7 +644,7 @@
"category": "weapons",
"name": "tazer",
"description": "This is a high-powered stun gun. Use this item to attempt to electrocute an adjacent enemy, damaging and temporarily paralyzing them. Because the shock can actually jump through the air, it is difficult to miss.",
- "weight": 151,
+ "weight": "151 g",
"volume": "250 ml",
"price": 14000,
"to_hit": -1,
@@ -670,7 +670,7 @@
"category": "weapons",
"name": "battle axe",
"description": "This is a huge axe designed for warfare. Though intended for use as a weapon, it can also be pressed into service as a rather clumsy woodcutting tool.",
- "weight": 2002,
+ "weight": "2002 g",
"volume": "2500 ml",
"price": 40000,
"to_hit": 1,
@@ -688,7 +688,7 @@
"type": "TOOL",
"name": "wood axe",
"description": "This is a large, two-handed wood axe. It makes a good melee weapon, but is a bit slow to recover between swings.",
- "weight": 2267,
+ "weight": "2267 g",
"volume": "2500 ml",
"price": 10500,
"to_hit": 1,
diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json
index c5e551169f755..8eca974ee0b55 100644
--- a/data/json/items/melee/bludgeons.json
+++ b/data/json/items/melee/bludgeons.json
@@ -4,7 +4,7 @@
"id": "hammer_sledge",
"name": "sledge hammer",
"description": "A large, heavy hammer. Makes an acceptable melee weapon for the very strong, but is nearly useless in the hands of the weak.",
- "weight": 4500,
+ "weight": "4500 g",
"color": "brown",
"symbol": "/",
"material": [ "wood", "steel" ],
@@ -20,7 +20,7 @@
"id": "warhammer",
"name": "war hammer",
"description": "A medieval hammer made for battle. Its odd shape and balance make it an excellent weapon, but an ineffective tool.",
- "weight": 1337,
+ "weight": "1337 g",
"to_hit": 1,
"color": "brown",
"symbol": "/",
@@ -39,7 +39,7 @@
"id": "homewrecker",
"name": "homewrecker",
"description": "A long piece of wood with several chunks of steel firmly tied to it. The resulting weapon is unwieldy and slow but very heavy hitting.",
- "weight": 3024,
+ "weight": "3024 g",
"to_hit": -3,
"color": "brown",
"symbol": "/",
@@ -57,7 +57,7 @@
"id": "bat",
"name": "baseball bat",
"description": "A sturdy wood bat. Makes a great melee weapon.",
- "weight": 1133,
+ "weight": "1133 g",
"to_hit": 3,
"color": "brown",
"symbol": "/",
@@ -73,7 +73,7 @@
"id": "bat_metal",
"name": "aluminum bat",
"description": "An aluminum baseball bat, lighter than a wooden bat and a little easier to swing as a result.",
- "weight": 765,
+ "weight": "765 g",
"to_hit": 3,
"color": "light_gray",
"symbol": "/",
@@ -91,7 +91,7 @@
"category": "weapons",
"name": "expandable baton",
"description": "A telescoping baton that collapses for easy storage. Makes an excellent melee weapon. Activate to expand.",
- "weight": 725,
+ "weight": "725 g",
"to_hit": 2,
"color": "dark_gray",
"symbol": "/",
@@ -109,7 +109,7 @@
"name": "expandable baton (extended)",
"name_plural": "expandable batons (extended)",
"description": "A telescoping baton that collapses for easy storage. Makes an excellent melee weapon. Activate to collapse.",
- "weight": 725,
+ "weight": "725 g",
"to_hit": 2,
"color": "dark_gray",
"symbol": "/",
@@ -133,7 +133,7 @@
"material": "wood",
"techniques": [ "WBLOCK_2", "RAPID", "SWEEP" ],
"flags": [ "DURABLE_MELEE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
- "weight": 1400,
+ "weight": "1400 g",
"volume": "3 L",
"bashing": 19,
"category": "weapons",
@@ -151,7 +151,7 @@
"material": [ "wood", "iron" ],
"techniques": [ "WBLOCK_2", "RAPID", "SWEEP" ],
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
- "weight": 2200,
+ "weight": "2200 g",
"volume": "3 L",
"bashing": 25,
"category": "weapons",
@@ -165,7 +165,7 @@
"name": "powered quarterstaff",
"name_plural": "powered quarterstaves",
"description": "This is an ironshod quarterstaff that has a high-voltage stun gun built into the handle. The stun gun is wired to the metal caps at either end of the staff, allowing you to zap a dangerous opponent should beating them senseless with it prove too hazardous.",
- "weight": 2351,
+ "weight": "2351 g",
"volume": "3250 ml",
"price": 8000,
"to_hit": 3,
@@ -194,7 +194,7 @@
"name": "tactical tonfa (off)",
"name_plural": "tactical tonfas (off)",
"description": "This is a reinforced plastic tonfa; the core is hollowed out and is filled with capacitors and a high-yield rechargeable storage battery. When a switch on the handle is pressed, a high-voltage current is transmitted to the two electrodes mounted in the end of the tonfa, and by extension to anyone unfortunate enough to be in contact with them. It also has a nifty flashlight, which is off at the moment.",
- "weight": 726,
+ "weight": "726 g",
"volume": "2250 ml",
"price": 17000,
"to_hit": 2,
@@ -233,7 +233,7 @@
"id": "mace",
"name": "mace",
"description": "A medieval weapon consisting of a wood handle with a heavy iron end. It is heavy and slow, but its crushing damage is devastating.",
- "weight": 1500,
+ "weight": "1500 g",
"to_hit": 1,
"color": "dark_gray",
"symbol": "/",
@@ -251,7 +251,7 @@
"id": "morningstar",
"name": "morningstar",
"description": "A medieval weapon consisting of a wood handle with a heavy, spiked iron ball on the end. It deals devastating crushing damage, with a small amount of piercing to boot.",
- "weight": 1400,
+ "weight": "1400 g",
"to_hit": 1,
"color": "dark_gray",
"symbol": "/",
@@ -269,7 +269,7 @@
"id": "mace_fake",
"name": "mace",
"description": "A light, cheaply made replica of a medieval weapon that would normally consist of a wood handle with a heavy iron end.",
- "weight": 750,
+ "weight": "750 g",
"to_hit": 1,
"color": "dark_gray",
"symbol": "/",
@@ -286,7 +286,7 @@
"id": "mace_inferior",
"name": "mace",
"description": "A medieval weapon consisting of a wood handle with a heavy iron end. That iron end feels a bit loose.",
- "weight": 1000,
+ "weight": "1000 g",
"to_hit": 1,
"color": "dark_gray",
"symbol": "/",
@@ -304,7 +304,7 @@
"id": "morningstar_fake",
"name": "morningstar",
"description": "A light, cheaply made replica of a medieval weapon that would normally consist of a wood handle with a heavy, spiked iron ball on the end.",
- "weight": 700,
+ "weight": "700 g",
"to_hit": 1,
"color": "dark_gray",
"symbol": "/",
@@ -322,7 +322,7 @@
"id": "morningstar_inferior",
"name": "morningstar",
"description": "A medieval weapon consisting of a wood handle with a heavy, spiked iron ball on the end. That end feels lighter than it should.",
- "weight": 1000,
+ "weight": "1000 g",
"to_hit": 1,
"color": "dark_gray",
"symbol": "/",
@@ -342,7 +342,7 @@
"category": "weapons",
"name": "war flail",
"description": "This is a stout pole with a large steel flanged mace head on a short chain attached to it, based on the peasant flail agricultural tool except now with a metal head and made to thresh people in metal armor rather than grain.",
- "weight": 4550,
+ "weight": "4550 g",
"volume": "3750 ml",
"price": 25000,
"bashing": 40,
@@ -358,7 +358,7 @@
"category": "weapons",
"name": "peasant flail",
"description": "This is a stout pole with a wooden club on a leather cord attached to it, this is a tool used to thresh wheat and occasionally people when the peasants got angry at their feudal lords.",
- "weight": 1700,
+ "weight": "1700 g",
"volume": "3750 ml",
"price": 4000,
"bashing": 19,
@@ -374,7 +374,7 @@
"id": "glass_macuahuitl",
"name": "makeshift macuahuitl",
"description": "A flat wooden club with sharpened pieces of stone sticking to both of its sides.",
- "weight": 955,
+ "weight": "955 g",
"to_hit": 1,
"color": "dark_gray",
"symbol": "/",
@@ -391,7 +391,7 @@
"id": "tonfa",
"name": "tonfa",
"description": "A hard plastic truncheon commonly employed by police. Originally an Okinawan weapon, it consists of a stick with a perpendicular handle attached a third of the way down its length.",
- "weight": 575,
+ "weight": "575 g",
"to_hit": 2,
"color": "dark_gray",
"symbol": "/",
@@ -407,7 +407,7 @@
"id": "tonfa_wood",
"name": "wooden tonfa",
"description": "A stout wooden truncheon of the sort commonly employed by police. Originally an Okinawan weapon, it consists of a stick with a perpendicular handle attached a third of the way down its length.",
- "weight": 921,
+ "weight": "921 g",
"to_hit": 2,
"color": "brown",
"symbol": "/",
@@ -425,7 +425,7 @@
"name": "PR-24 baton (retracted)",
"name_plural": "PR-24 batons (retracted)",
"description": "The Monadnock PR-24 baton is a collapsible, lightweight, side-handle baton used by law enforcement all over the world. The PR designation is rumored to mean Public Relations. Activate to extend.",
- "weight": 680,
+ "weight": "680 g",
"to_hit": 1,
"color": "dark_gray",
"symbol": "/",
@@ -444,7 +444,7 @@
"name": "PR-24 baton (extended)",
"name_plural": "PR-24 batons (extended)",
"description": "The Monadnock PR-24 baton is a collapsible, lightweight, side-handle baton used by law enforcement all over the world. The PR designation is rumored to mean Public Relations. Activate to retract.",
- "weight": 680,
+ "weight": "680 g",
"to_hit": 2,
"color": "dark_gray",
"symbol": "/",
@@ -467,7 +467,7 @@
"material": "wood",
"techniques": [ "RAPID", "WBLOCK_2", "SWEEP" ],
"flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ],
- "weight": 1133,
+ "weight": "1133 g",
"volume": "2 L",
"//": "MA reference I used held that a bokken crushes rather than cuts (or impales) but is otherwise just as damaging as a katana. Nerfed by popular demand.",
"bashing": 25,
@@ -487,7 +487,7 @@
"material": "wood",
"techniques": [ "RAPID", "WBLOCK_2", "SWEEP" ],
"flags": [ "SHEATH_SWORD" ],
- "weight": 680,
+ "weight": "680 g",
"volume": "2 L",
"bashing": 10,
"cutting": 1,
@@ -506,7 +506,7 @@
"material": "wood",
"techniques": [ "RAPID", "WBLOCK_2", "SWEEP" ],
"flags": [ "SHEATH_SWORD" ],
- "weight": 1133,
+ "weight": "1133 g",
"volume": "2 L",
"bashing": 18,
"cutting": 1,
@@ -520,7 +520,7 @@
"name": "L-stick (off)",
"name_plural": "L-sticks (off)",
"description": "Produced by the Light corporation, this stylish staff not only functions as a light source, but doubles as a light-weight weapon, due to the superalloy materials it is made of. Due to proprietary efficiency improvements over standard light sources, the L-stick or light stick as it is commonly called, batteries last longer than other light sources.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "3 L",
"price": 5000,
"to_hit": 3,
@@ -566,7 +566,7 @@
"id": "cudgel",
"name": "cudgel",
"description": "A slender long rod of wood, while traditionally intended as a training tool for many dueling moves, it still makes a good melee weapon in a pinch.",
- "weight": 875,
+ "weight": "875 g",
"to_hit": 2,
"color": "brown",
"symbol": "/",
@@ -583,7 +583,7 @@
"category": "weapons",
"name": "Louisville Slaughterer",
"description": "This is sturdy wood bat, wrapped in gasoline-soaked rags and flame-resistant Nomex fabric. Light it, and the ball game will REALLY heat up. You'll need a lighter or matches to light it.",
- "weight": 1485,
+ "weight": "1485 g",
"volume": "2 L",
"price": 16000,
"to_hit": 3,
@@ -612,7 +612,7 @@
"name": "Louisville Slaughterer",
"name_plural": "Louisville Slaughterers",
"description": "This is a sturdy wood bat, wrapped in gasoline-soaked rags and flame-resistant Nomex fabric. It is burning brightly, and makes it much easier to see the baselines at night games (It also makes the umpire FAR more likely to call a ball instead of a strike).",
- "weight": 1485,
+ "weight": "1485 g",
"volume": "2 L",
"price": 16000,
"to_hit": 3,
@@ -642,7 +642,7 @@
"id": "mjolnir",
"name": "Mjölnir",
"description": "A large hammer, forged from the heart of a dying star. It bears the inscription:\n \nWhosoever holds this hammer,\nIf he be worthy,\nShall possess the power to...\nCRUSH!'",
- "weight": 5443,
+ "weight": "5443 g",
"color": "light_gray",
"symbol": "/",
"material": [ "wood", "steel" ],
@@ -664,7 +664,7 @@
"material": [ "wood", "steel" ],
"flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR", "SPEAR", "ALWAYS_TWOHAND" ],
"techniques": [ "WBLOCK_1", "WIDE", "SWEEP" ],
- "weight": 3200,
+ "weight": "3200 g",
"volume": "3750 ml",
"bashing": 30,
"cutting": 22,
@@ -683,7 +683,7 @@
"material": [ "wood", "aluminum" ],
"flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR", "SPEAR", "ALWAYS_TWOHAND" ],
"techniques": [ "WBLOCK_1", "SWEEP" ],
- "weight": 2700,
+ "weight": "2700 g",
"volume": "3750 ml",
"bashing": 14,
"cutting": 3,
@@ -701,7 +701,7 @@
"material": "wood",
"techniques": [ "WBLOCK_1", "SWEEP" ],
"flags": [ "DURABLE_MELEE" ],
- "weight": 910,
+ "weight": "910 g",
"volume": "1500 ml",
"bashing": 22,
"to_hit": 2,
@@ -718,7 +718,7 @@
"material": [ "lead", "wood" ],
"techniques": [ "WBLOCK_1", "SWEEP" ],
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE" ],
- "weight": 1135,
+ "weight": "1135 g",
"volume": "1500 ml",
"bashing": 27,
"to_hit": 2,
@@ -734,7 +734,7 @@
"price": 2500,
"material": "wood",
"techniques": [ "WBLOCK_1", "SWEEP" ],
- "weight": 850,
+ "weight": "850 g",
"volume": "1500 ml",
"bashing": 10,
"to_hit": 2,
@@ -751,7 +751,7 @@
"material": [ "leather", "lead" ],
"techniques": [ "PRECISE", "RAPID" ],
"flags": [ "BELT_CLIP", "NONCONDUCTIVE" ],
- "weight": 450,
+ "weight": "450 g",
"volume": "350 ml",
"bashing": 13,
"to_hit": 1,
@@ -768,7 +768,7 @@
"material": [ "leather", "steel" ],
"techniques": [ "PRECISE", "RAPID" ],
"flags": [ "BELT_CLIP", "NONCONDUCTIVE" ],
- "weight": 400,
+ "weight": "400 g",
"volume": "350 ml",
"bashing": 9,
"to_hit": 1,
diff --git a/data/json/items/melee/knives_kitchen.json b/data/json/items/melee/knives_kitchen.json
index ef0cc16f0dca9..08bf943232987 100644
--- a/data/json/items/melee/knives_kitchen.json
+++ b/data/json/items/melee/knives_kitchen.json
@@ -16,7 +16,7 @@
"category": "weapons",
"description": "This is a sharp, heavy knife. It makes a good melee weapon, and is an ideal item for butchering corpses.",
"copy-from": "base_kitchen_knife",
- "weight": 380,
+ "weight": "380 g",
"volume": "300 ml",
"price": 3000,
"bashing": 2,
@@ -32,7 +32,7 @@
"category": "weapons",
"description": "This is a sharp knife, designed for cutting meat. It makes a poor melee weapon, but is decent at butchering corpses.",
"copy-from": "base_kitchen_knife",
- "weight": 112,
+ "weight": "112 g",
"volume": "100 ml",
"price": 250,
"to_hit": -1,
@@ -50,7 +50,7 @@
"description": "This is a short-bladed knife with a sharp blade, made for fine controlled cuts to vegetables without using a cutting board.",
"copy-from": "base_kitchen_knife",
"looks_like": "knife_steak",
- "weight": 100,
+ "weight": "100 g",
"volume": "250 ml",
"price": 250,
"to_hit": -1,
@@ -68,7 +68,7 @@
"description": "This is a long-bladed kitchen knife. The blade is wider than the handle, giving room for the wielder's knuckles, and it has a characteristic curve for a fast rocking action for chopping vegetables. It makes a good melee weapon, but the wide blade is unwieldy for butchering.",
"copy-from": "base_kitchen_knife",
"looks_like": "knife_butcher",
- "weight": 280,
+ "weight": "280 g",
"volume": "200 ml",
"price": 1500,
"bashing": 1,
@@ -85,7 +85,7 @@
"description": "This is a long-bladed kitchen knife with a thin, slightly curved blade for deftly slicing meat either in flat sheets or around the bone. It would be a decent melee weapon, and excellent for butchery.",
"copy-from": "base_kitchen_knife",
"looks_like": "knife_butcher",
- "weight": 280,
+ "weight": "280 g",
"volume": "200 ml",
"price": 1500,
"bashing": 1,
@@ -102,7 +102,7 @@
"description": "This knife has quite a long blade with a scalloped edge for cutting bread. It's not that sharp, but its length and heft mean it could do a bit of damage and cause some nasty tearing.",
"copy-from": "base_kitchen_knife",
"looks_like": "knife_butcher",
- "weight": 280,
+ "weight": "280 g",
"volume": "200 ml",
"price": 500,
"bashing": 4,
@@ -118,7 +118,7 @@
"description": "This is a menacing looking knife with a broad, square shaped blade, curved for fast vegetable chopping. Its heft and sharpness would make it a decent weapon as well, although not as good as a meat cleaver.",
"copy-from": "base_kitchen_knife",
"looks_like": "knife_butcher",
- "weight": 250,
+ "weight": "250 g",
"volume": "250 ml",
"price": 2500,
"bashing": 2,
@@ -134,7 +134,7 @@
"description": "This is a menacing looking knife with a broad, square shaped blade. Its heft and sharpness would make it a very effective melee weapon, and an excellent butchering tool.",
"copy-from": "base_kitchen_knife",
"looks_like": "knife_butcher",
- "weight": 350,
+ "weight": "350 g",
"volume": "300 ml",
"price": 3500,
"bashing": 2,
diff --git a/data/json/items/melee/spears_and_polearms.json b/data/json/items/melee/spears_and_polearms.json
index 794c1e8e2048e..aabc9260b3f6c 100644
--- a/data/json/items/melee/spears_and_polearms.json
+++ b/data/json/items/melee/spears_and_polearms.json
@@ -8,7 +8,7 @@
"description": "A simple wood pole with one end sharpened.",
"material": "wood",
"volume": "1250 ml",
- "weight": 900,
+ "weight": "900 g",
"bashing": 4,
"cutting": 8,
"to_hit": 1,
@@ -21,7 +21,7 @@
"id": "spear_wood",
"name": "wooden spear",
"description": "A stout pole with an improvised grip and a fire-hardened point.",
- "weight": 898,
+ "weight": "898 g",
"to_hit": 1,
"color": "brown",
"symbol": "/",
@@ -40,7 +40,7 @@
"category": "weapons",
"name": "makeshift war scythe",
"description": "This farming tool has been modified into an improvised weapon by rotating its blade 90 degrees, transforming it into a deadly giant blade on the end of a stick. However it's quite fragile.",
- "weight": 3013,
+ "weight": "3013 g",
"volume": "3250 ml",
"price": 16000,
"bashing": 2,
@@ -58,7 +58,7 @@
"category": "weapons",
"name": "spike on a stick",
"description": "A flimsy pole made of wood with a basic metal spike tied to it. It's barely sharp, and crudely constructed, but it will keep the zombies out of arm's reach until you can find something better.",
- "weight": 1487,
+ "weight": "1487 g",
"volume": "1250 ml",
"price": 400,
"to_hit": 1,
@@ -77,7 +77,7 @@
"category": "weapons",
"name": "simple knife spear",
"description": "A flimsy pole made of wood with a knife bound to the end. It's long enough to slice from a distance, but the knife isn't that well attached. You could take a bit more time to carefully split the shaft and attach the knife blade more permanently.",
- "weight": 1487,
+ "weight": "1487 g",
"volume": "1250 ml",
"price": 700,
"to_hit": 1,
@@ -96,7 +96,7 @@
"category": "weapons",
"name": "knife spear",
"description": "A sturdy wooden pole that has been carefully split and reinforced. At the split point, a sharp blade has been bolted into place and reinforced with layers of sturdy wrapped bindings.",
- "weight": 1487,
+ "weight": "1487 g",
"volume": "1250 ml",
"price": 12000,
"to_hit": 1,
@@ -115,7 +115,7 @@
"category": "weapons",
"name": "homemade halfpike",
"description": "A short do-it-yourself spear made out of a smooth wooden shaft with a metal spike seated and bound into place at its tip. Its functional grip and decent construction makes it a usable, if not effective, weapon.",
- "weight": 1814,
+ "weight": "1814 g",
"volume": "1500 ml",
"price": 1400,
"to_hit": 1,
@@ -132,14 +132,13 @@
"id": "spear_forked",
"name": "forked spear",
"description": "A wooden pole with three spikes tied to it and decent grip. It's specialized for catching weapons, and not intended for extended use in combat.",
- "weight": 1650,
- "//": "That's strictly the weight of three spikes. Shaft is free, be happy.",
+ "weight": "1650 g",
+ "//": "Block 2 until we re-implement defensive-disarm, I'm afraid.",
"to_hit": 1,
"color": "brown",
"symbol": "/",
"material": [ "wood", "steel" ],
"techniques": [ "WBLOCK_2", "DEF_DISARM" ],
- "//": "Block 2 until we re-implement defensive-disarm, I'm afraid.",
"volume": "1500 ml",
"bashing": 6,
"cutting": 17,
@@ -152,7 +151,7 @@
"id": "spear_copper",
"name": "copper spear",
"description": "A stout wooden pole with a spearhead worked from copper.",
- "weight": 1450,
+ "weight": "1450 g",
"to_hit": 1,
"color": "light_red",
"symbol": "/",
@@ -170,7 +169,7 @@
"id": "spear_steel",
"name": "steel spear",
"description": "A stout wooden pole with a hand-forged steel spearhead.",
- "weight": 1498,
+ "weight": "1498 g",
"to_hit": 2,
"color": "light_gray",
"symbol": "/",
@@ -189,7 +188,7 @@
"//": "stats of original steel spear, after it was made into a less makeshift version",
"name": "pipe spear",
"description": "A stout metal pole with a sharp point.",
- "weight": 1398,
+ "weight": "1398 g",
"to_hit": 1,
"color": "light_gray",
"symbol": "/",
@@ -212,7 +211,7 @@
"price": 500,
"price_postapoc": 2000,
"material": "iron",
- "weight": 908,
+ "weight": "908 g",
"volume": "1500 ml",
"bashing": 14,
"techniques": [ "WBLOCK_1" ],
@@ -225,7 +224,7 @@
"id": "qiang",
"name": "qiang",
"description": "An ancient Chinese spear, typically with a tassel just below the spearhead. One of the four major weapons in folklore, alongside the dao sabre, jian sword, and gun staff.",
- "weight": 1398,
+ "weight": "1398 g",
"to_hit": 2,
"color": "light_gray",
"symbol": "/",
@@ -249,7 +248,7 @@
"material": [ "wood", "steel" ],
"flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
"techniques": [ "WBLOCK_1", "WIDE", "SWEEP" ],
- "weight": 3175,
+ "weight": "3175 g",
"volume": "3750 ml",
"bashing": 16,
"cutting": 36,
@@ -267,7 +266,7 @@
"material": [ "wood", "aluminum" ],
"flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
"techniques": [ "WBLOCK_1", "SWEEP" ],
- "weight": 1644,
+ "weight": "1644 g",
"volume": "3750 ml",
"bashing": 15,
"cutting": 2,
@@ -286,7 +285,7 @@
"qualities": [ [ "CUT", 1 ], [ "BUTCHER", -28 ] ],
"flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
"techniques": [ "WIDE", "WBLOCK_1" ],
- "weight": 2100,
+ "weight": "2100 g",
"volume": "2500 ml",
"bashing": 8,
"cutting": 30,
@@ -298,7 +297,7 @@
"name": "naginata",
"name_plural": "naginata",
"description": "A sturdy polearm with a curved blade, made in the same manner as the katana and other Japanese blades. Occasionally used by samurai in early periods, or by their wives in defense of the household.",
- "weight": 1700,
+ "weight": "1700 g",
"to_hit": 2,
"color": "light_gray",
"symbol": "/",
@@ -317,7 +316,7 @@
"name": "naginata",
"name_plural": "naginata",
"description": "A sturdy polearm with a curved blade, made in the same manner as the katana and other Japanese blades. This one has a bit of wiggle to its blade and feels a bit shoddily made.",
- "weight": 1700,
+ "weight": "1700 g",
"color": "light_gray",
"symbol": "/",
"material": [ "budget_steel", "wood" ],
@@ -336,7 +335,7 @@
"name": "naginata",
"name_plural": "naginata",
"description": "This is a dull, slightly floppy replica of a Japanese polearm with a curved blade. With a little difficulty, you could use it administer a solid slap from a distance.",
- "weight": 1400,
+ "weight": "1400 g",
"color": "light_gray",
"symbol": "/",
"material": [ "aluminum", "wood" ],
@@ -354,7 +353,7 @@
"name": "survivor naginata",
"name_plural": "survivor naginata",
"description": "This sturdy steel shaft with a sword blade at the end is good for both slashing and stabbing.",
- "weight": 1700,
+ "weight": "1700 g",
"to_hit": 2,
"color": "light_gray",
"symbol": "/",
@@ -373,7 +372,7 @@
"id": "javelin",
"name": "wooden javelin",
"description": "A fire-hardened wooden spear honed to a sharper point. The grip area has been carved and covered for better grip.",
- "weight": 600,
+ "weight": "600 g",
"to_hit": 2,
"color": "brown",
"symbol": "/",
@@ -392,7 +391,7 @@
"id": "javelin_iron",
"name": "iron javelin",
"description": "An iron-tipped wooden throwing spear. The grip area has been carved and covered for better grip.",
- "weight": 960,
+ "weight": "960 g",
"to_hit": 2,
"color": "light_gray",
"symbol": "/",
@@ -412,7 +411,7 @@
"category": "weapons",
"name": "pike",
"description": "This is a medieval weapon consisting of a wood shaft tipped with an iron spearhead.",
- "weight": 2500,
+ "weight": "2500 g",
"volume": "3500 ml",
"price": 40000,
"to_hit": -2,
@@ -431,7 +430,7 @@
"category": "weapons",
"name": "pike",
"description": "This is a dull, cheaply made replica of a medieval weapon consisting of a wood shaft tipped with an iron spearhead.",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "3500 ml",
"price": 4000,
"to_hit": -2,
@@ -451,7 +450,7 @@
"category": "weapons",
"name": "pike",
"description": "This is a medieval weapon consisting of a wood shaft tipped with an iron spearhead. The head seems to be pretty dull, and the whole thing feels poorly made.",
- "weight": 2500,
+ "weight": "2500 g",
"volume": "3500 ml",
"price": 40000,
"to_hit": -2,
@@ -470,7 +469,7 @@
"id": "scythe_war",
"name": "war scythe",
"description": "A pole weapon with a curving single-edged blade. Its blade bears some superficial resemblance to that of an agricultural scythe from which it likely evolved.",
- "weight": 3013,
+ "weight": "3013 g",
"volume": "3250 ml",
"price": 16000,
"to_hit": 1,
@@ -489,7 +488,7 @@
"name": "dory",
"name_plural": "dories",
"description": "A well-made spear with a bronze head, Greek in origin.",
- "weight": 1598,
+ "weight": "1598 g",
"volume": "3500 ml",
"price": 10000,
"to_hit": 2,
@@ -509,7 +508,7 @@
"name_plural": "ji",
"//": "Couldn't find a good way to pluralize the transliteration.",
"description": "This is a bronze polearm that originated in the Shang dynasty of China, if not earlier. It combines a spear head with the perpendicular blade of the earlier ge or dagger-axe.",
- "weight": 3175,
+ "weight": "3175 g",
"volume": "3750 ml",
"price": 50000,
"to_hit": 2,
@@ -526,7 +525,7 @@
"type": "GENERIC",
"name": "stone spear",
"description": "A stout wooden pole with a sharp stone spearhead.",
- "weight": 1098,
+ "weight": "1098 g",
"volume": "1250 ml",
"price": 1300,
"to_hit": 1,
diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json
index 47b6c82c76e90..259d620d2e016 100644
--- a/data/json/items/melee/swords_and_blades.json
+++ b/data/json/items/melee/swords_and_blades.json
@@ -8,7 +8,7 @@
"description": "A two by four with a cross guard and whittled down point; not much for slashing, but much better than your bare hands.",
"material": "wood",
"volume": "1250 ml",
- "weight": 600,
+ "weight": "600 g",
"bashing": 12,
"cutting": 1,
"to_hit": 1,
@@ -24,7 +24,7 @@
"description": "The nail sword, or nord for short. This wooden sword has a dozen nails sticking at jagged angles from edge of the blade, making it much better at chopping than slashing.",
"material": "wood",
"volume": "1750 ml",
- "weight": 648,
+ "weight": "648 g",
"bashing": 12,
"cutting": 4,
"techniques": [ "WBLOCK_1" ]
@@ -38,7 +38,7 @@
"description": "Several bits of thin scrap metal crudely beat into the semblance of an edge over a wooden sword. The added weight is unbalanced, but the jagged edge offers a good bit of slashing power.",
"material": "wood",
"volume": "2 L",
- "weight": 1100,
+ "weight": "1100 g",
"bashing": 6,
"cutting": 14,
"to_hit": -1,
@@ -52,7 +52,7 @@
"category": "weapons",
"name": "switchblade",
"description": "This is a long and thin knife with a spring-loaded blade that rests inside the handle while not in use.",
- "weight": 464,
+ "weight": "464 g",
"volume": 0,
"price": 2000,
"to_hit": -2,
@@ -70,7 +70,7 @@
"name": "folding knife",
"name_plural": "folding knives",
"description": "This is a small folding knife, with a locking blade and a pocket clip. Not as good a weapon as a solid fixed-blade knife, but better than a penknife.",
- "weight": 256,
+ "weight": "256 g",
"volume": "250 ml",
"price": 1500,
"bashing": 1,
@@ -88,7 +88,7 @@
"name": "combat knife",
"name_plural": "combat knives",
"description": "This is a military combat knife. It is light and extremely sharp, and could be deadly in either the right hands or when attached as a bayonet.",
- "weight": 558,
+ "weight": "558 g",
"volume": "500 ml",
"price": 10000,
"to_hit": 1,
@@ -116,7 +116,7 @@
"name_plural": "hunting knives",
"//": "Highest non-powertool butchering quality. It's made for skinning and butchering game, which is what you're generally doing.",
"description": "Commonly used by hunters, this single-edge sheath knife is designed for cutting and skinning game rather than combat.",
- "weight": 390,
+ "weight": "390 g",
"volume": "250 ml",
"price": 4000,
"cutting": 16,
@@ -134,7 +134,7 @@
"name_plural": "survival knives",
"//": "This isn't really supposed to be a very good knife, or a very good saw. It's more for looking scary.",
"description": "This massive knife features a hollow handle with a compass built into the pommel and a row of fearsome looking saw teeth along the back of its blade.",
- "weight": 612,
+ "weight": "612 g",
"volume": "1 L",
"price": 2000,
"bashing": 4,
@@ -153,7 +153,7 @@
"name": "RM42 fighting knife",
"name_plural": "RM42 fighting knives",
"description": "This sturdy matte black Rivtech combat dagger features a long and slim double-edged blade with a spear-point and a distinctive slip-resistant grip which can also be used to affix it to a suitable firearm. Originally manufactured for the military, it was very popular in films and among collectors due to its fearsome appearance.",
- "weight": 188,
+ "weight": "188 g",
"volume": "750 ml",
"price": 45000,
"to_hit": 2,
@@ -180,7 +180,7 @@
"name_plural": "Swiss Army knives",
"//": "The swiss army knife is a bit more of a knife than a toolkit.",
"description": "An iconic pocket knife imported from Europe. Its red plastic handle conceals many small tools.",
- "weight": 246,
+ "weight": "246 g",
"volume": 0,
"price": 3000,
"to_hit": -2,
@@ -198,7 +198,7 @@
"name": "trench knife",
"name_plural": "trench knives",
"description": "This stout combat knife features a steel guard to protect the user's knuckles. The guard can also be used for striking or blocking, and the knife can also be used to butcher corpses.",
- "weight": 608,
+ "weight": "608 g",
"volume": "500 ml",
"price": 11000,
"to_hit": 1,
@@ -217,7 +217,7 @@
"name": "makeshift knife",
"name_plural": "makeshift knives",
"description": "A knife consisting of a long, somewhat sharpened, spike and a tightly wrapped rag as a handle. It makes a good melee weapon.",
- "weight": 550,
+ "weight": "550 g",
"volume": "500 ml",
"price": 0,
"to_hit": -1,
@@ -235,7 +235,7 @@
"category": "weapons",
"name": "makeshift machete",
"description": "This is a large blade that has had a portion of the handle wrapped in duct tape, making it easier to wield as a rough machete.",
- "weight": 581,
+ "weight": "581 g",
"volume": "2 L",
"price": 1000,
"to_hit": 1,
@@ -254,7 +254,7 @@
"category": "weapons",
"name": "machete",
"description": "This huge steel knife makes an excellent tool for cutting down large vegetation or other 'obstacles.'",
- "weight": 538,
+ "weight": "538 g",
"volume": "1 L",
"price": 2800,
"to_hit": 2,
@@ -274,7 +274,7 @@
"name": "No. 9",
"name_plural": "No. 9's",
"description": "This huge steel knife has been modified with a fuel tank, insulated handguard, and ignition system. When filled with gasoline, a system of torches heats the blade, burning your target.",
- "weight": 1814,
+ "weight": "1814 g",
"volume": "1500 ml",
"price": 28000,
"to_hit": 1,
@@ -306,7 +306,7 @@
"name": "No. 9",
"name_plural": "No. 9's",
"description": "This huge steel knife has been modified with a fuel tank, insulated handguard, and ignition system. The blade is glowing with heat, making it a great plant scorcher and nightlight.",
- "weight": 1814,
+ "weight": "1814 g",
"volume": "1500 ml",
"price": 28000,
"to_hit": 1,
@@ -343,7 +343,7 @@
"category": "weapons",
"name": "cavalry saber",
"description": "This is a curved sword associated with cavalry from the Early Modern period onwards. Lightweight but a deadly slashing weapon.",
- "weight": 910,
+ "weight": "910 g",
"volume": "1250 ml",
"price": 97000,
"to_hit": 2,
@@ -363,7 +363,7 @@
"name": "kris",
"name_plural": "krises",
"description": "This wavy bladed dagger comes from Southeast Asia. The design of the blade causes it to make broad, painful wounds.",
- "weight": 558,
+ "weight": "558 g",
"volume": "750 ml",
"price": 9000,
"to_hit": 1,
@@ -382,7 +382,7 @@
"category": "weapons",
"name": "kukri",
"description": "This versatile implement is a modern take on a traditional weapon that originated in Nepal. Featuring a heavy blade with an inwardly curved edge, it is used as both a tool and as a weapon.",
- "weight": 450,
+ "weight": "450 g",
"volume": "750 ml",
"price": 8000,
"to_hit": 1,
@@ -407,7 +407,7 @@
"material": "steel",
"flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ],
"techniques": [ "WBLOCK_2" ],
- "weight": 800,
+ "weight": "800 g",
"volume": "2 L",
"bashing": 8,
"cutting": 30,
@@ -427,7 +427,7 @@
"material": "budget_steel",
"flags": [ "SHEATH_SWORD" ],
"techniques": [ "WBLOCK_2" ],
- "weight": 800,
+ "weight": "800 g",
"volume": "2 L",
"bashing": 7,
"cutting": 24,
@@ -448,7 +448,7 @@
"material": "aluminum",
"flags": "SHEATH_SWORD",
"techniques": [ "WBLOCK_2" ],
- "weight": 414,
+ "weight": "414 g",
"volume": "2 L",
"bashing": 8,
"cutting": 2,
@@ -466,7 +466,7 @@
"material": "iron",
"techniques": [ "WBLOCK_2" ],
"flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ],
- "weight": 1133,
+ "weight": "1133 g",
"volume": "2 L",
"bashing": 6,
"cutting": 30,
@@ -485,7 +485,7 @@
"material": "budget_steel",
"techniques": [ "WBLOCK_2" ],
"flags": [ "SHEATH_SWORD" ],
- "weight": 1133,
+ "weight": "1133 g",
"volume": "2 L",
"bashing": 5,
"cutting": 24,
@@ -505,7 +505,7 @@
"material": "aluminum",
"techniques": [ "WBLOCK_2" ],
"flags": "SHEATH_SWORD",
- "weight": 586,
+ "weight": "586 g",
"volume": "2 L",
"bashing": 6,
"cutting": 2,
@@ -523,7 +523,7 @@
"material": "steel",
"techniques": [ "WBLOCK_2", "PRECISE" ],
"flags": [ "STAB", "DURABLE_MELEE", "SHEATH_SWORD" ],
- "weight": 1814,
+ "weight": "1814 g",
"volume": "2750 ml",
"bashing": 4,
"cutting": 38,
@@ -543,7 +543,7 @@
"material": "budget_steel",
"techniques": [ "WBLOCK_2", "PRECISE" ],
"flags": "SHEATH_SWORD",
- "weight": 1814,
+ "weight": "1814 g",
"volume": "2750 ml",
"bashing": 4,
"cutting": 30,
@@ -562,7 +562,7 @@
"material": "aluminum",
"techniques": [ "WBLOCK_2", "PRECISE" ],
"flags": "SHEATH_SWORD",
- "weight": 939,
+ "weight": "939 g",
"volume": "2750 ml",
"bashing": 4,
"cutting": 2,
@@ -580,7 +580,7 @@
"material": "steel",
"flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ],
"techniques": [ "WBLOCK_2" ],
- "weight": 1814,
+ "weight": "1814 g",
"volume": "2750 ml",
"bashing": 10,
"cutting": 38,
@@ -599,7 +599,7 @@
"material": "budget_steel",
"flags": [ "SHEATH_SWORD" ],
"techniques": [ "WBLOCK_2" ],
- "weight": 1814,
+ "weight": "1814 g",
"volume": "2750 ml",
"bashing": 10,
"cutting": 30,
@@ -619,7 +619,7 @@
"material": "aluminum",
"flags": "SHEATH_SWORD",
"techniques": [ "WBLOCK_2" ],
- "weight": 939,
+ "weight": "939 g",
"volume": "2750 ml",
"bashing": 10,
"cutting": 2,
@@ -637,7 +637,7 @@
"material": "steel",
"flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ],
"techniques": [ "WBLOCK_2" ],
- "weight": 1360,
+ "weight": "1360 g",
"volume": "2 L",
"bashing": 14,
"cutting": 31,
@@ -657,7 +657,7 @@
"material": "aluminum",
"flags": "SHEATH_SWORD",
"techniques": [ "WBLOCK_2" ],
- "weight": 704,
+ "weight": "704 g",
"volume": "2 L",
"bashing": 14,
"cutting": 2,
@@ -675,7 +675,7 @@
"material": "budget_steel",
"flags": [ "SHEATH_SWORD" ],
"techniques": [ "WBLOCK_2" ],
- "weight": 2721,
+ "weight": "2721 g",
"volume": "2 L",
"bashing": 12,
"cutting": 25,
@@ -690,7 +690,7 @@
"name": "xiphos",
"name_plural": "xiphoses",
"description": "A bronze sword of ancient Greek origin, wielded as a sidearm to the dory spear.",
- "weight": 800,
+ "weight": "800 g",
"volume": "2 L",
"price": 12000,
"to_hit": 2,
@@ -710,7 +710,7 @@
"name": "khopesh",
"name_plural": "khopeshes",
"description": "This ancient bronze weapon features a curved, sickle-like blade sharpened on the outside edge. Associated with the New Kingdom period of ancient Egypt, it was designed mainly to hack through the light armor common to the region.",
- "weight": 750,
+ "weight": "750 g",
"volume": "1750 ml",
"price": 12000,
"to_hit": 1,
@@ -730,7 +730,7 @@
"name": "dao",
"name_plural": "dao",
"description": "An ancient Chinese sword consisting of a curved blade and a guard with a cupped design. Existing since the Shang dynasty, this one is made of bronze. One of the four major weapons in folklore, alongside the jian sword, qiang spear, and gun staff.",
- "weight": 850,
+ "weight": "850 g",
"volume": "1750 ml",
"price": 12500,
"to_hit": 2,
@@ -749,7 +749,7 @@
"category": "weapons",
"name": "survivor machete",
"description": "This common gardening tool has been customized and rebalanced to improve its performance as a weapon.",
- "weight": 565,
+ "weight": "565 g",
"volume": "1 L",
"price": 2800,
"to_hit": 2,
@@ -768,7 +768,7 @@
"category": "weapons",
"name": "sword bayonet",
"description": "A sword bayonet is a large slashing weapon that can be attached to the front of a firearm or crossbow converting it into a pike.",
- "weight": 923,
+ "weight": "923 g",
"volume": "1750 ml",
"price": 25000,
"to_hit": 1,
@@ -794,7 +794,7 @@
"category": "weapons",
"name": "tanto",
"description": "Long Japanese knives like this more-modern remake were the samurai's backup weapon, before the advent of the larger wakizashi. It's still a deadly blade, even if it's smaller than its more famous relatives.",
- "weight": 558,
+ "weight": "558 g",
"volume": "500 ml",
"price": 18000,
"to_hit": 2,
@@ -814,7 +814,7 @@
"name": "wakizashi",
"name_plural": "wakizashi",
"description": "This is a comparatively-common Japanese short sword. Smaller and lighter than a katana, but still effective in combat.",
- "weight": 835,
+ "weight": "835 g",
"volume": "1500 ml",
"price": 17800,
"to_hit": 1,
@@ -835,7 +835,7 @@
"name_plural": "flammenschwerter (aus)",
"//": "All of this is SUPPOSED to be in German.",
"description": "Ein großes zweihändiges Schwert aus Deutschland, an dessen Klinge sich, unter Zuführung von Benzin, eine anhaltende Flamme erzeugen lässt. Es ist eine sehr mächtige Waffe.",
- "weight": 3400,
+ "weight": "3400 g",
"volume": "3750 ml",
"price": 160000,
"bashing": 17,
@@ -865,7 +865,7 @@
"name_plural": "flammenschwerter",
"//": "All of this is SUPPOSED to be in German.",
"description": "Ein großes zweihändiges Schwert aus Deutschland, an dessen Klinge sich, unter Zuführung von Benzin, eine anhaltende Flamme erzeugen lässt. Es ist eine sehr mächtige Waffe.",
- "weight": 3400,
+ "weight": "3400 g",
"volume": "3750 ml",
"price": 160000,
"bashing": 17,
@@ -897,7 +897,7 @@
"category": "weapons",
"name": "zweihänder",
"description": "This is a huge two-handed sword from Germany. It packs a real wallop.",
- "weight": 3176,
+ "weight": "3176 g",
"volume": "3250 ml",
"price": 160000,
"to_hit": 1,
@@ -916,7 +916,7 @@
"name": "kirpan",
"description": "A ceremonial dagger carried by Sikh men. This one is sharp and could be an effective weapon.",
"looks_like": "kukri",
- "weight": 374,
+ "weight": "374 g",
"volume": "500 ml",
"price": 1800,
"to_hit": 1,
@@ -935,7 +935,7 @@
"name": "kirpan",
"description": "A ceremonial dagger carried by Sikh men. This one is not particularly well made.",
"looks_like": "kirpan",
- "weight": 374,
+ "weight": "374 g",
"volume": "500 ml",
"price": 900,
"bashing": 1,
@@ -953,7 +953,7 @@
"category": "weapons",
"name": "tanto",
"description": "This is a dull, cheaply made replica of a long Japanese knife, typically used as a samurai's backup weapon.",
- "weight": 374,
+ "weight": "374 g",
"volume": "500 ml",
"price": 1800,
"to_hit": 1,
@@ -973,7 +973,7 @@
"category": "weapons",
"name": "tanto",
"description": "Long Japanese knives like this more-modern remake were the samurai's backup weapon, before the advent of the larger wakizashi. This one doesn't feel well-balanced",
- "weight": 3,
+ "weight": "3 g",
"volume": "500 ml",
"price": 18000,
"to_hit": 2,
@@ -994,7 +994,7 @@
"name": "nodachi",
"name_plural": "nodachi",
"description": "This is a huge, curved, two-handed sword from Japan. It is surprisingly light for its size.",
- "weight": 2822,
+ "weight": "2822 g",
"volume": "3250 ml",
"price": 150000,
"to_hit": 1,
@@ -1020,7 +1020,7 @@
"material": "aluminum",
"flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND" ],
"techniques": [ "WBLOCK_1", "RAPID", "WIDE" ],
- "weight": 1882,
+ "weight": "1882 g",
"volume": "3250 ml",
"bashing": 2,
"cutting": 8,
@@ -1040,7 +1040,7 @@
"material": "budget_steel",
"flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND" ],
"techniques": [ "WBLOCK_1", "RAPID", "WIDE" ],
- "weight": 1882,
+ "weight": "1882 g",
"volume": "3250 ml",
"bashing": 5,
"cutting": 15,
@@ -1057,7 +1057,7 @@
"price": 2000,
"price_postapoc": 0,
"material": "steel",
- "weight": 450,
+ "weight": "450 g",
"volume": "1250 ml",
"bashing": 1,
"cutting": 2,
@@ -1075,7 +1075,7 @@
"price": 2000,
"price_postapoc": 1000,
"material": "steel",
- "weight": 650,
+ "weight": "650 g",
"volume": "1250 ml",
"bashing": 3,
"cutting": 7,
@@ -1093,7 +1093,7 @@
"price": 2000,
"price_postapoc": 0,
"material": "steel",
- "weight": 400,
+ "weight": "400 g",
"volume": "1250 ml",
"bashing": 1,
"cutting": 6,
@@ -1111,7 +1111,7 @@
"price": 2000,
"price_postapoc": 1000,
"material": [ "wood" ],
- "weight": 200,
+ "weight": "200 g",
"volume": "1531 ml",
"bashing": 3,
"to_hit": 2,
@@ -1136,7 +1136,7 @@
"price": 2000,
"price_postapoc": 1000,
"material": [ "steel" ],
- "weight": 650,
+ "weight": "650 g",
"volume": "1200 ml",
"bashing": 2,
"cutting": 25,
@@ -1150,7 +1150,7 @@
"category": "weapons",
"name": "broadsword",
"description": "This is an early modern sword seeing use in the 16th, 17th, and 18th centuries. Called 'broad' to contrast with the slimmer rapiers.",
- "weight": 1133,
+ "weight": "1133 g",
"volume": "1750 ml",
"price": 120000,
"to_hit": 2,
@@ -1174,7 +1174,7 @@
"material": "budget_steel",
"flags": [ "SHEATH_SWORD" ],
"techniques": "WBLOCK_2",
- "weight": 1133,
+ "weight": "1133 g",
"volume": "1750 ml",
"bashing": 7,
"cutting": 29,
@@ -1189,7 +1189,7 @@
"name": "firebrand (off)",
"name_plural": "firebrands (off)",
"description": "This is a combination of two Dark Age conflict-resolution classics, the broadsword and the torch. Use to light it up and show those heathen zombies who's Lord around here.",
- "weight": 1474,
+ "weight": "1474 g",
"volume": "2250 ml",
"price": 120000,
"to_hit": 1,
@@ -1247,7 +1247,7 @@
"material": "aluminum",
"techniques": "WBLOCK_2",
"flags": "SHEATH_SWORD",
- "weight": 634,
+ "weight": "634 g",
"volume": "1750 ml",
"bashing": 8,
"cutting": 2,
@@ -1265,7 +1265,7 @@
"price": 96000,
"material": "budget_steel",
"techniques": "WBLOCK_2",
- "weight": 955,
+ "weight": "955 g",
"volume": "1250 ml",
"bashing": 6,
"cutting": 25,
@@ -1280,7 +1280,7 @@
"category": "weapons",
"name": "rapier",
"description": "This is a thin sword with an ornate hand guard. It looks like the preferred weapon of gentlemen and swashbucklers. Light and quick, it makes any battle a stylish battle.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "1500 ml",
"price": 98000,
"to_hit": 2,
@@ -1299,7 +1299,7 @@
"category": "weapons",
"name": "katana",
"description": "This is a rare sword from Japan. Deadly against unarmored targets, and still very effective against armor.",
- "weight": 1133,
+ "weight": "1133 g",
"volume": "2 L",
"price": 98000,
"to_hit": 1,
@@ -1324,7 +1324,7 @@
"material": "aluminum",
"techniques": [ "RAPID", "WBLOCK_2" ],
"flags": "SHEATH_SWORD",
- "weight": 753,
+ "weight": "753 g",
"volume": "2 L",
"bashing": 10,
"cutting": 3,
@@ -1342,7 +1342,7 @@
"material": "budget_steel",
"techniques": [ "RAPID", "WBLOCK_2" ],
"flags": [ "SHEATH_SWORD" ],
- "weight": 1133,
+ "weight": "1133 g",
"volume": "2 L",
"bashing": 4,
"cutting": 24,
@@ -1357,7 +1357,7 @@
"name": "Rising Sun",
"name_plural": "Rising Suns",
"description": "This is a katana with a nozzle just behind the cutting edge of the blade. People love fire, and people love katanas, so why not put them together? The gas burners attached to this blade can really turn up the heat on your foes. Use to ignite.",
- "weight": 1400,
+ "weight": "1400 g",
"volume": "2250 ml",
"price": 98000,
"bashing": 4,
@@ -1386,7 +1386,7 @@
"name": "Rising Sun",
"name_plural": "Rising Suns",
"description": "This is a katana that glows with the fury and heat of the SUN! Well, okay it's not THAT hot, but getting hit with it still stings like the dickens. Use to shut off the gas.",
- "weight": 1400,
+ "weight": "1400 g",
"volume": "2250 ml",
"price": 98000,
"bashing": 4,
@@ -1425,7 +1425,7 @@
"material": "aluminum",
"flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND" ],
"techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ],
- "weight": 3176,
+ "weight": "3176 g",
"volume": "3250 ml",
"bashing": 15,
"cutting": 2,
@@ -1443,7 +1443,7 @@
"material": "budget_steel",
"flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND" ],
"techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ],
- "weight": 3176,
+ "weight": "3176 g",
"volume": "3250 ml",
"bashing": 13,
"cutting": 35,
@@ -1463,7 +1463,7 @@
"material": "aluminum",
"flags": "SHEATH_SWORD",
"techniques": "WBLOCK_2",
- "weight": 753,
+ "weight": "753 g",
"volume": "1750 ml",
"bashing": 10,
"cutting": 2,
@@ -1476,7 +1476,7 @@
"category": "weapons",
"name": "cavalry saber",
"description": "This is a dull, cheap replica of a curved sword associated with cavalry, from the Early Modern period onwards.",
- "weight": 600,
+ "weight": "600 g",
"volume": "1250 ml",
"price": 9700,
"price_postapoc": 0,
@@ -1501,7 +1501,7 @@
"material": "aluminum",
"techniques": [ "RAPID", "WBLOCK_2", "PRECISE" ],
"flags": "SHEATH_SWORD",
- "weight": 660,
+ "weight": "660 g",
"volume": "1500 ml",
"bashing": 4,
"cutting": 2,
@@ -1520,7 +1520,7 @@
"material": "aluminum",
"techniques": [ "RAPID", "WBLOCK_2" ],
"flags": "SHEATH_SWORD",
- "weight": 557,
+ "weight": "557 g",
"volume": "1500 ml",
"bashing": 7,
"cutting": 2,
@@ -1539,7 +1539,7 @@
"material": "budget_steel",
"techniques": [ "RAPID", "WBLOCK_2" ],
"flags": [ "SHEATH_SWORD" ],
- "weight": 835,
+ "weight": "835 g",
"volume": "1500 ml",
"bashing": 3,
"cutting": 20,
@@ -1559,7 +1559,7 @@
"price_postapoc": 0,
"material": "aluminum",
"techniques": [ "WBLOCK_1", "RAPID" ],
- "weight": 558,
+ "weight": "558 g",
"volume": "750 ml",
"bashing": 2,
"cutting": 2,
@@ -1581,7 +1581,7 @@
"material": "steel",
"flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "ALWAYS_TWOHAND" ],
"techniques": [ "WBLOCK_2" ],
- "weight": 1766,
+ "weight": "1766 g",
"volume": "1500 ml",
"to_hit": 2,
"bashing": 6,
@@ -1596,7 +1596,7 @@
"name": "chainsaw lajatang (off)",
"name_plural": "chainsaw lajatangs (off)",
"description": "A long wooden pole with chainsaws impractically attached to both ends. The product of either genius or insanity, but not both; the weight ensures that only someone both strong and very skilled could possibly hope to use it.",
- "weight": 14254,
+ "weight": "14254 g",
"volume": "7500 ml",
"price": 40000,
"to_hit": -5,
@@ -1632,7 +1632,7 @@
"name": "electric chainsaw lajatang (off)",
"name_plural": "electric chainsaw lajatangs (off)",
"description": "A long wooden pole with electric chainsaws impractically attached to both ends. The product of either genius or insanity, but not both; the weight ensures that only someone both strong and very skilled could possibly hope to use it.",
- "weight": 14254,
+ "weight": "14254 g",
"volume": "7500 ml",
"price": 40000,
"to_hit": -5,
@@ -1672,7 +1672,7 @@
"name": "cutlass",
"name_plural": "cutlasses",
"description": "This is a broad saber known for its use by sailors and pirates, as its short blade is easy to handle in close quarters.",
- "weight": 955,
+ "weight": "955 g",
"volume": "1250 ml",
"price": 96000,
"to_hit": 2,
@@ -1696,7 +1696,7 @@
"material": [ "wood", "iron" ],
"techniques": [ "WBLOCK_1", "SPIN" ],
"flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ],
- "weight": 2500,
+ "weight": "2500 g",
"volume": "6500 ml",
"bashing": 4,
"cutting": 26,
@@ -1710,7 +1710,7 @@
"name": "combat chainsaw (off)",
"name_plural": "combat chainsaws (off)",
"description": "This is a chainsaw that has been lightened, tuned, and extensively modified to be a more effective weapon. Unfortunately these modifications have rendered it much less effective as a woodcutting tool.",
- "weight": 5122,
+ "weight": "5122 g",
"volume": "2250 ml",
"price": 25000,
"to_hit": -3,
@@ -1719,7 +1719,7 @@
"symbol": "/",
"color": "light_gray",
"ammo": "gasoline",
- "max_charges": 1000,
+ "max_charges": 450,
"use_action": "COMBATSAW_OFF",
"techniques": [ "WBLOCK_1", "SWEEP" ],
"flags": [ "ALWAYS_TWOHAND" ]
@@ -1733,7 +1733,7 @@
"description": "This combat chainsaw is on, and is continuously draining gasoline. Use it to turn it off.",
"to_hit": -4,
"cutting": 82,
- "turns_per_charge": 1,
+ "turns_per_charge": 4,
"revert_to": "combatsaw_off",
"qualities": [ [ "AXE", 3 ], [ "BUTCHER", -120 ] ],
"use_action": "COMBATSAW_ON",
@@ -1746,7 +1746,7 @@
"name": "electric combat chainsaw (off)",
"name_plural": "electric combat chainsaws (off)",
"description": "This is an electric chainsaw that has been lightened, tuned, and extensively modified to be a more effective weapon. Unfortunately these modifications have rendered it much less effective as a woodcutting tool.",
- "weight": 5122,
+ "weight": "5122 g",
"volume": "2250 ml",
"price": 25000,
"to_hit": -3,
diff --git a/data/json/items/migration.json b/data/json/items/migration.json
index 26c5316dbea45..5391d3162a283 100644
--- a/data/json/items/migration.json
+++ b/data/json/items/migration.json
@@ -634,6 +634,56 @@
"type": "MIGRATION",
"replace": "reloaded_270win_jsp"
},
+ {
+ "id": "afs_rolling_pin",
+ "type": "MIGRATION",
+ "replace": "rolling_pin"
+ },
+ {
+ "id": "afs_welding_mask",
+ "type": "MIGRATION",
+ "replace": "welding_mask"
+ },
+ {
+ "id": "afs_atomic_reading_light",
+ "type": "MIGRATION",
+ "replace": "atomic_light_off"
+ },
+ {
+ "id": "afs_atomic_reading_light_on",
+ "type": "MIGRATION",
+ "replace": "atomic_light"
+ },
+ {
+ "id": "afs_large_storage_battery",
+ "type": "MIGRATION",
+ "replace": "large_storage_battery"
+ },
+ {
+ "id": "afs_daypack",
+ "type": "MIGRATION",
+ "replace": "daypack"
+ },
+ {
+ "id": "afs_ski_jacket",
+ "type": "MIGRATION",
+ "replace": "ski_jacket"
+ },
+ {
+ "id": "afs_cake",
+ "type": "MIGRATION",
+ "replace": "cake2"
+ },
+ {
+ "id": "afs_fried_donut_holes",
+ "type": "MIGRATION",
+ "replace": "donut_holes"
+ },
+ {
+ "id": "afs_welding_mask_makeshift",
+ "type": "MIGRATION",
+ "replace": "welding_mask_crude"
+ },
{
"id": "smg_38",
"type": "MIGRATION",
@@ -653,5 +703,10 @@
"id": "smg_22_mag",
"type": "MIGRATION",
"replace": "survivor9mm_mag"
+ },
+ {
+ "id": "magbandolier",
+ "type": "MIGRATION",
+ "replace": "chestrig"
}
]
diff --git a/data/json/items/newspaper.json b/data/json/items/newspaper.json
index 18989127cd68c..75cb276de6c1f 100644
--- a/data/json/items/newspaper.json
+++ b/data/json/items/newspaper.json
@@ -11,7 +11,7 @@
"description": "A scrap of paper.",
"price": 0,
"material": "paper",
- "weight": 3,
+ "weight": "3 g",
"volume": 0
},
{
@@ -27,7 +27,7 @@
"price": 0,
"material": "paper",
"flags": "TRADER_AVOID",
- "weight": 3,
+ "weight": "3 g",
"volume": 0
},
{
@@ -43,7 +43,7 @@
"price": 0,
"material": "paper",
"flags": "TRADER_AVOID",
- "weight": 3,
+ "weight": "3 g",
"volume": 0
},
{
@@ -59,7 +59,7 @@
"price": 0,
"material": "paper",
"flags": "TRADER_AVOID",
- "weight": 3,
+ "weight": "3 g",
"volume": 0
},
{
@@ -74,7 +74,7 @@
"description": "A single sheet of newspaper broadsheet. It is possibly one of the last issues printed before New England was overwhelmed. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
"price": 0,
"material": "paper",
- "weight": 3,
+ "weight": "3 g",
"volume": 0
},
{
@@ -89,7 +89,7 @@
"description": "A single sheet of newspaper broadsheet. It seems to date from several years ago, and you've NO idea how it lasted this long. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
"price": 0,
"material": "paper",
- "weight": 3,
+ "weight": "3 g",
"volume": 0
},
{
@@ -104,7 +104,7 @@
"description": "A single sheet of newspaper broadsheet. It seems to date from a few years ago--amazing it has lasted this long. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
"price": 0,
"material": "paper",
- "weight": 3,
+ "weight": "3 g",
"volume": 0
},
{
@@ -119,7 +119,7 @@
"description": "A single sheet of newspaper broadsheet. It was printed more than a year ago. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
"price": 0,
"material": "paper",
- "weight": 3,
+ "weight": "3 g",
"volume": 0
},
{
@@ -134,7 +134,7 @@
"description": "A single sheet of newspaper broadsheet. It was printed in the months leading up to the Cataclysm. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
"price": 0,
"material": "paper",
- "weight": 3,
+ "weight": "3 g",
"volume": 0
},
{
@@ -149,7 +149,7 @@
"description": "A single sheet of newspaper broadsheet. It was printed in the weeks leading up to the Cataclysm. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
"price": 0,
"material": "paper",
- "weight": 3,
+ "weight": "3 g",
"volume": 0
},
{
@@ -164,7 +164,23 @@
"description": "A folded glossy handout that appears to be an introduction to living in a massive underground complex.",
"price": 0,
"material": "paper",
- "weight": 1,
+ "weight": "1 g",
+ "volume": 0
+ },
+ {
+ "type": "GENERIC",
+ "id": "death_note",
+ "category": "books",
+ "symbol": ",",
+ "color": "white",
+ "name": "note",
+ "snippet_category": "death_note",
+ "description": "A scrap of paper. Something's written on it, scrawled in bad handwriting.",
+ "price": 0,
+ "looks_like": "survnote",
+ "material": "paper",
+ "flags": "TRADER_AVOID",
+ "weight": "3 g",
"volume": 0
}
]
diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json
index 189ff12890ff6..1112543287171 100644
--- a/data/json/items/obsolete.json
+++ b/data/json/items/obsolete.json
@@ -5,7 +5,7 @@
"name": "anesthetic kit",
"category": "chems",
"description": "A kit for inducing anesthesia for surgery, containing specialized canisters with a variety of powerful hypnotic, analgetic, and stimulative drugs. It's intended for use in specialized medical equipment, and can't be administered manually.",
- "weight": 100,
+ "weight": "100 g",
"volume": "250 ml",
"price": 50000,
"ammo_type": "components",
@@ -21,7 +21,7 @@
"type": "GUNMOD",
"name": "barrel extension",
"description": "A longer barrel increases the muzzle velocity of a firearm, contributing to both accuracy and damage but reduces portability and slows aiming.",
- "weight": 426,
+ "weight": "426 g",
"volume": "1 L",
"price": 20000,
"to_hit": 2,
@@ -53,7 +53,7 @@
"type": "GUNMOD",
"name": "rifled barrel",
"description": "Rifling a shotgun barrel is mainly done in order to improve its accuracy when firing slugs. The rifling makes the gun less suitable for shot, however.",
- "weight": 226,
+ "weight": "226 g",
"volume": "500 ml",
"integral_volume": 0,
"price": 22000,
@@ -73,7 +73,7 @@
"type": "GUNMOD",
"name": "rapid blowback",
"description": "An improved blowback mechanism makes your firearm's automatic fire faster, at the cost of reduced accuracy and increased noise.",
- "weight": 114,
+ "weight": "114 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 70000,
@@ -93,7 +93,7 @@
"type": "GUNMOD",
"name": "auto-fire mechanism",
"description": "A simple mechanism that converts a pistol to a selective fire weapon with a burst size of three rounds. However it reduces accuracy and increases noise.",
- "weight": 113,
+ "weight": "113 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 65000,
@@ -115,7 +115,7 @@
"id": "autofire_654",
"name": "handmade auto-fire mechanism",
"location": "mechanism",
- "weight": 250,
+ "weight": "250 g",
"color": "red",
"mode_modifier": [ [ "AUTO", "auto", 8 ] ],
"loudness_modifier": 1,
@@ -135,7 +135,7 @@
"type": "GUNMOD",
"name": ".22 caliber conversion kit",
"description": "Replacing several key parts of a 9x19mm, .38, .40, 5.7mm, 4.6mm, 7.62x39mm or .223 firearm converts it to a .22 firearm. The conversion results in a slight reduction to accuracy.",
- "weight": 114,
+ "weight": "114 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 32000,
@@ -156,7 +156,7 @@
"type": "GUNMOD",
"name": ".223 caliber conversion kit",
"description": "This kit is used to convert a shotgun, 5.45x39mm, 7.62x39mm, .30-06, or .308 rifle to the popular, accurate, and lighter .223 caliber. The conversion results in slight reductions to both accuracy and ammo capacity.",
- "weight": 114,
+ "weight": "114 g",
"volume": "500 ml",
"integral_volume": 0,
"price": 50000,
@@ -177,7 +177,7 @@
"type": "GUNMOD",
"name": ".308 caliber conversion kit",
"description": "This kit is used to convert a shotgun or 7.62x39mm, .223 or .30-06 rifle to the popular and powerful .308 caliber. The conversion results in reduced ammo capacity and a slight reduction to accuracy.",
- "weight": 114,
+ "weight": "114 g",
"volume": "500 ml",
"integral_volume": 0,
"price": 52000,
@@ -198,7 +198,7 @@
"type": "GUNMOD",
"name": ".45 caliber conversion kit",
"description": "Replacing several key parts of a 9x19mm, .38, .40 or .44 firearm converts it to a .45 firearm. The conversion results in a slight reduction to accuracy.",
- "weight": 226,
+ "weight": "226 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 48000,
@@ -219,7 +219,7 @@
"type": "GUNMOD",
"name": "4.6mm caliber conversion kit",
"description": "A conversion kit produced by Heckler and Koch, used to convert .22, 9x19mm, or .38 firearms to their proprietary 4.6x30mm, a round designed for accuracy and armor penetration.",
- "weight": 114,
+ "weight": "114 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 46000,
@@ -240,7 +240,7 @@
"type": "GUNMOD",
"name": "5.7mm caliber conversion kit",
"description": "A conversion kit produced by FN Herstal, used to convert .22, 9x19mm, or .38 firearms to their proprietary 5.7x28mm, a round designed for accuracy and armor penetration.",
- "weight": 114,
+ "weight": "114 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 46000,
@@ -261,7 +261,7 @@
"type": "GUNMOD",
"name": "9x19mm caliber conversion kit",
"description": "Replacing several key parts of a 9x18mm, .38, .40, .44 or .45 firearm converts it to a 9x19mm firearm. The conversion results in a slight reduction to accuracy.",
- "weight": 114,
+ "weight": "114 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 42000,
@@ -291,7 +291,7 @@
"type": "GUNMOD",
"name": "belt feed adapter",
"description": "A kit providing the necessary parts for permanently converting a firearm from magazine to belt-feed. Guaranteed to void your warranty.",
- "weight": 950,
+ "weight": "950 g",
"volume": "750 ml",
"integral_volume": "250 ml",
"price": 32000,
@@ -324,7 +324,7 @@
"type": "GUNMOD",
"name": "tuned mechanism",
"description": "A set of finely tuned internal components which increase the precision and reliably of a firearm.",
- "weight": 120,
+ "weight": "120 g",
"volume": "250 ml",
"integral_volume": 0,
"price": 2500,
@@ -345,7 +345,7 @@
"type": "GUN",
"name": "spraycan flamethrower",
"description": "A favorite of hooligans around the world, this lighter duct-taped to a spray can is probably as dangerous to the user as anyone else. The nozzle has been crudely modified to disperse gasoline, and a small pump attached to the side allows for repressurization, though this process takes a few minutes.",
- "weight": 451,
+ "weight": "451 g",
"volume": "500 ml",
"price": 16000,
"material": "steel",
@@ -380,7 +380,7 @@
"type": "GUN",
"name": "simple flamethrower",
"description": "A simple, home-made flamethrower. While its capacity is not superb, it is more than capable of igniting terrain and monsters alike.",
- "weight": 907,
+ "weight": "907 g",
"volume": "5 L",
"price": 20000,
"to_hit": -1,
@@ -408,7 +408,7 @@
"name": "Plutonium Filter CBM",
"description": "A system of tanks and filters that are connected to a microreactor to extract plutonium from radioactive slurry.",
"price": 60000,
- "weight": 1000,
+ "weight": "1000 g",
"difficulty": 6
},
{
@@ -430,5 +430,41 @@
"price": 250000,
"difficulty": 11,
"is_upgrade": true
+ },
+ {
+ "id": "v29_cheap",
+ "type": "GUN",
+ "reload_noise_volume": 10,
+ "name": "homemade laser pistol",
+ "description": "This laser pistol was based on the V29 laser pistol designed in the mid-21st century. While little more than duct tape and electronics, it runs on a standard UPS.",
+ "weight": 540,
+ "volume": "2 L",
+ "price": 500000,
+ "to_hit": -2,
+ "bashing": 5,
+ "material": [ "steel", "plastic" ],
+ "symbol": "(",
+ "color": "magenta",
+ "skill": "pistol",
+ "range": 30,
+ "ranged_damage": 10,
+ "pierce": 6,
+ "dispersion": 180,
+ "durability": 4,
+ "loudness": 7,
+ "ups_charges": 20,
+ "reload": 300,
+ "valid_mod_locations": [
+ [ "accessories", 2 ],
+ [ "emitter", 1 ],
+ [ "grip", 1 ],
+ [ "lens", 1 ],
+ [ "rail", 1 ],
+ [ "sights", 1 ],
+ [ "stock", 1 ],
+ [ "underbarrel mount", 1 ]
+ ],
+ "ammo_effects": [ "LASER", "INCENDIARY" ],
+ "flags": [ "NO_UNLOAD" ]
}
]
diff --git a/data/json/items/ranged.json b/data/json/items/ranged.json
index 63077faac4cd0..cf1b9c665e887 100644
--- a/data/json/items/ranged.json
+++ b/data/json/items/ranged.json
@@ -13,7 +13,7 @@
"flags": "NEVER_JAMS",
"skill": "rifle",
"ammo": "BB",
- "weight": 1723,
+ "weight": "1723 g",
"volume": "1500 ml",
"bashing": 9,
"to_hit": -1,
@@ -46,7 +46,7 @@
"flags": [ "RELOAD_AND_SHOOT", "NEVER_JAMS", "PRIMITIVE_RANGED_WEAPON", "BELT_CLIP" ],
"skill": "throw",
"ammo": "pebble",
- "weight": 96,
+ "weight": "96 g",
"volume": "250 ml",
"to_hit": -2,
"ranged_damage": 6,
@@ -67,7 +67,7 @@
"flags": [ "RELOAD_AND_SHOOT", "NEVER_JAMS", "PRIMITIVE_RANGED_WEAPON", "BELT_CLIP" ],
"skill": "archery",
"ammo": "pebble",
- "weight": 254,
+ "weight": "254 g",
"volume": "250 ml",
"to_hit": -2,
"ranged_damage": 3,
@@ -89,7 +89,7 @@
"flags": [ "RELOAD_AND_SHOOT", "NEVER_JAMS", "PRIMITIVE_RANGED_WEAPON", "BELT_CLIP" ],
"skill": "archery",
"ammo": "pebble",
- "weight": 322,
+ "weight": "322 g",
"volume": "500 ml",
"to_hit": -2,
"ranged_damage": 5,
@@ -112,7 +112,7 @@
"flags": [ "STR_RELOAD", "PRIMITIVE_RANGED_WEAPON" ],
"skill": "rifle",
"ammo": "pebble",
- "weight": 1906,
+ "weight": "1906 g",
"volume": "1250 ml",
"bashing": 9,
"ranged_damage": 10,
@@ -147,7 +147,7 @@
"flags": [ "NO_UNLOAD", "BACKBLAST", "NEVER_JAMS", "TRADER_AVOID" ],
"skill": "launcher",
"ammo": "66mm",
- "weight": 700,
+ "weight": "700 g",
"volume": "2500 ml",
"bashing": 6,
"to_hit": -3,
@@ -176,7 +176,7 @@
"material": "steel",
"skill": "launcher",
"ammo": "120mm",
- "weight": 2500,
+ "weight": "2500 g",
"volume": "2500 ml",
"bashing": 6,
"to_hit": -3,
@@ -200,7 +200,7 @@
"ammo_effects": [ "PLASMA", "EXPLOSIVE_SMALL", "FLAME" ],
"skill": "rifle",
"ammo": "plasma",
- "weight": 4535,
+ "weight": "4535 g",
"volume": "3750 ml",
"bashing": 12,
"to_hit": -1,
@@ -237,7 +237,7 @@
"ups_charges": 100,
"skill": "rifle",
"ammo": "plasma",
- "weight": 10500,
+ "weight": "10500 g",
"volume": "4L",
"bashing": 12,
"to_hit": -2,
@@ -268,13 +268,12 @@
"name": "pipe combination gun",
"description": "A home-made triple-barreled firearm, one barrel chambered in .30-06 and two other for shotgun shells. It is made from pipes and parts cannibalized from a double barrel shotgun.",
"price": 40000,
- "//": "Part of price shifted to integral mod.",
+ "//": "Attached mod will now have weight.",
"material": [ "steel", "wood" ],
"flags": [ "NEVER_JAMS", "RELOAD_EJECT" ],
"skill": "shotgun",
"ammo": "3006",
- "weight": 2267,
- "//": "Attached mod will now have weight.",
+ "weight": "2267 g",
"volume": "2 L",
"bashing": 12,
"to_hit": -1,
@@ -307,7 +306,7 @@
"flags": [ "STR_RELOAD", "RELOAD_ONE" ],
"skill": "rifle",
"ammo": "pebble",
- "weight": 4211,
+ "weight": "4211 g",
"volume": "2750 ml",
"bashing": 8,
"to_hit": -1,
@@ -343,7 +342,7 @@
"flags": [ "RELOAD_ONE", "STR_RELOAD" ],
"skill": "rifle",
"ammo": "bolt",
- "weight": 3110,
+ "weight": "3110 g",
"volume": "3 L",
"bashing": 12,
"to_hit": -1,
@@ -379,7 +378,7 @@
"flags": [ "RELOAD_ONE", "STR_RELOAD" ],
"skill": "shotgun",
"ammo": "shotcanister",
- "weight": 3410,
+ "weight": "3410 g",
"volume": "2500 ml",
"bashing": 8,
"to_hit": -1,
@@ -415,7 +414,7 @@
"flags": [ "STR_RELOAD", "NEVER_JAMS" ],
"skill": "launcher",
"ammo": "mininuke_mod",
- "weight": 11260,
+ "weight": "11260 g",
"volume": "2750 ml",
"bashing": 12,
"to_hit": -1,
@@ -426,40 +425,6 @@
"reload": 800,
"valid_mod_locations": [ [ "sling", 1 ], [ "grip mount", 1 ], [ "rail mount", 1 ], [ "sights mount", 1 ], [ "underbarrel mount", 1 ] ]
},
- {
- "id": "m202_flash",
- "type": "GUN",
- "reload_noise_volume": 10,
- "symbol": "(",
- "color": "dark_gray",
- "name": "M202 FLASH",
- "name_plural": "M202 FLASH",
- "description": "A massive and deadly four shot 66 millimeter man-portable, reusable, thermobaric rocket launcher.",
- "price": 2900000,
- "material": "steel",
- "flags": [ "MODE_BURST", "BACKBLAST", "NEVER_JAMS" ],
- "skill": "launcher",
- "ammo": "m235",
- "weight": 5220,
- "volume": "6 L",
- "bashing": 12,
- "to_hit": -3,
- "dispersion": 300,
- "durability": 7,
- "burst": 4,
- "clip_size": 4,
- "reload": 600,
- "loudness": 200,
- "valid_mod_locations": [
- [ "accessories", 4 ],
- [ "grip", 1 ],
- [ "mechanism", 4 ],
- [ "sights", 1 ],
- [ "sling", 1 ],
- [ "rail mount", 1 ],
- [ "underbarrel mount", 1 ]
- ]
- },
{
"id": "RPG",
"type": "GUN",
@@ -475,7 +440,7 @@
"flags": [ "BACKBLAST", "NEVER_JAMS" ],
"skill": "launcher",
"ammo": "RPG-7",
- "weight": 7000,
+ "weight": "7000 g",
"volume": "4500 ml",
"bashing": 10,
"to_hit": -3,
@@ -506,7 +471,7 @@
"flags": [ "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS" ],
"skill": "rifle",
"ammo": "fishspear",
- "weight": 2100,
+ "weight": "2100 g",
"volume": "1750 ml",
"bashing": 7,
"to_hit": -2,
@@ -539,7 +504,7 @@
"flags": [ "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS" ],
"skill": "pistol",
"ammo": "fishspear",
- "weight": 840,
+ "weight": "840 g",
"volume": "1 L",
"bashing": 7,
"to_hit": -2,
@@ -569,7 +534,7 @@
"flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN", "NEVER_JAMS" ],
"skill": "rifle",
"ammo": "fishspear",
- "weight": 3060,
+ "weight": "3060 g",
"volume": "2 L",
"bashing": 8,
"to_hit": -2,
@@ -602,7 +567,7 @@
"flags": [ "RELOAD_ONE", "STR_RELOAD", "WATERPROOF_GUN", "UNDERWATER_GUN" ],
"skill": "rifle",
"ammo": "fishspear",
- "weight": 3460,
+ "weight": "3460 g",
"volume": "2 L",
"bashing": 8,
"to_hit": -2,
@@ -636,7 +601,7 @@
"flags": [ "NEVER_JAMS", "RELOAD_EJECT" ],
"skill": "rifle",
"ammo": "3006",
- "weight": 4200,
+ "weight": "4200 g",
"volume": "3 L",
"bashing": 12,
"to_hit": -1,
@@ -672,7 +637,7 @@
"flags": [ "MODE_BURST" ],
"skill": "launcher",
"ammo": "homebrew_rocket",
- "weight": 7430,
+ "weight": "7430 g",
"volume": "5 L",
"bashing": 10,
"to_hit": -3,
@@ -697,7 +662,7 @@
"ammo_effects": [ "JET", "BEANBAG", "NEVER_MISFIRES", "RECOVER_10" ],
"skill": "launcher",
"ammo": "water",
- "weight": 24500,
+ "weight": "24500 g",
"volume": "12500 ml",
"bashing": 10,
"to_hit": -5,
diff --git a/data/json/items/resources/alien.json b/data/json/items/resources/alien.json
index 23c75bfaa42b0..68884634fddbc 100644
--- a/data/json/items/resources/alien.json
+++ b/data/json/items/resources/alien.json
@@ -5,7 +5,7 @@
"category": "spare_parts",
"name": "alien resin chunk",
"description": "This is a shattered fragment of alien resin. It looks a bit like a large piece of sea glass, frosted and gritty with the edges rounded off. It is somewhat warm to the touch.",
- "weight": 70,
+ "weight": "70 g",
"volume": "250 ml",
"price": 0,
"material": "alien_resin",
@@ -19,7 +19,7 @@
"category": "spare_parts",
"name": "alien resin pod",
"description": "This is a large pod, the size of a keg, filled with gooey alien resin. Squeezing it firmly causes resin to squirt from the broken stalk at the end, hardening within a few seconds of being exposed to the air.",
- "weight": 70000,
+ "weight": "70000 g",
"volume": "22000 ml",
"price": 10000,
"material": "alien_resin",
diff --git a/data/json/items/resources/glass.json b/data/json/items/resources/glass.json
index f3e9a0e31f4ba..141cc6fdf9d40 100644
--- a/data/json/items/resources/glass.json
+++ b/data/json/items/resources/glass.json
@@ -8,7 +8,7 @@
"category": "other",
"description": "A broken shard of glass covered in sharp edges. You could use it as a weapon, but you might want to wear gloves.",
"material": "glass",
- "weight": 75,
+ "weight": "75 g",
"volume": "30 ml",
"cutting": 6,
"use_action": {
@@ -32,7 +32,7 @@
"category": "spare_parts",
"price": 5000,
"material": "glass",
- "weight": 24176,
+ "weight": "24176 g",
"volume": "12500 ml",
"bashing": 4,
"to_hit": -5,
@@ -55,7 +55,7 @@
"category": "spare_parts",
"price": 10000,
"material": [ "glass", "steel" ],
- "weight": 40123,
+ "weight": "40123 g",
"volume": "12500 ml",
"bashing": 6,
"to_hit": -6
@@ -71,7 +71,7 @@
"category": "spare_parts",
"price": 5000,
"material": [ "glass", "steel" ],
- "weight": 10040,
+ "weight": "10040 g",
"volume": "3 L",
"bashing": 4,
"to_hit": -2
diff --git a/data/json/items/resources/home_improvement.json b/data/json/items/resources/home_improvement.json
index 4727c0087044e..fa83df19b998a 100644
--- a/data/json/items/resources/home_improvement.json
+++ b/data/json/items/resources/home_improvement.json
@@ -11,7 +11,7 @@
"description": "A can of red paint.",
"material": "steel",
"volume": "1250 ml",
- "weight": 10,
+ "weight": "10 g",
"ammo_type": "NULL",
"count": 100
},
@@ -27,7 +27,7 @@
"description": "A can of blue paint.",
"material": "steel",
"volume": "1250 ml",
- "weight": 10,
+ "weight": "10 g",
"ammo_type": "NULL",
"count": 100
},
@@ -43,7 +43,7 @@
"description": "A can of white paint.",
"material": "steel",
"volume": "1250 ml",
- "weight": 10,
+ "weight": "10 g",
"ammo_type": "NULL",
"count": 100
},
@@ -59,7 +59,7 @@
"description": "A can of green paint.",
"material": "steel",
"volume": "1250 ml",
- "weight": 10,
+ "weight": "10 g",
"ammo_type": "NULL",
"count": 100
},
@@ -75,7 +75,7 @@
"description": "A can of purple paint.",
"material": "steel",
"volume": "1250 ml",
- "weight": 10,
+ "weight": "10 g",
"ammo_type": "NULL",
"count": 100
},
@@ -91,7 +91,7 @@
"description": "A can of yellow paint.",
"material": "steel",
"volume": "1250 ml",
- "weight": 10,
+ "weight": "10 g",
"ammo_type": "NULL",
"count": 100
},
@@ -106,7 +106,7 @@
"description": "A roll of red carpet.",
"material": "cotton",
"volume": "1750 ml",
- "weight": 45,
+ "weight": "45 g",
"ammo_type": "NULL",
"count": 5
},
@@ -121,7 +121,7 @@
"description": "A roll of green carpet.",
"material": "cotton",
"volume": "1750 ml",
- "weight": 45,
+ "weight": "45 g",
"ammo_type": "NULL",
"count": 5
},
@@ -136,7 +136,7 @@
"description": "A roll of yellow carpet.",
"material": "cotton",
"volume": "1750 ml",
- "weight": 45,
+ "weight": "45 g",
"ammo_type": "NULL",
"count": 5
},
@@ -151,7 +151,7 @@
"description": "A roll of purple carpet.",
"material": "cotton",
"volume": "1750 ml",
- "weight": 45,
+ "weight": "45 g",
"ammo_type": "NULL",
"count": 5
},
@@ -165,7 +165,7 @@
"description": "A metal cylinder with a small lens inside intended to be installed on a door.",
"price": 12000,
"material": [ "aluminum", "glass" ],
- "weight": 5,
+ "weight": "5 g",
"volume": "250 ml",
"to_hit": -3
}
diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json
index 748541181be65..8af51e1262ec1 100644
--- a/data/json/items/resources/metal.json
+++ b/data/json/items/resources/metal.json
@@ -5,7 +5,7 @@
"name": "pipe",
"description": "A steel pipe, makes a good melee weapon. Useful in a few crafting recipes.",
"category": "spare_parts",
- "weight": 1250,
+ "weight": "1250 g",
"to_hit": 1,
"color": "dark_gray",
"symbol": "/",
@@ -23,7 +23,7 @@
"category": "spare_parts",
"name": "scrap metal",
"description": "A bulky assortment of small bits of scrap steel useful in all kinds of crafting.",
- "weight": 50,
+ "weight": "50 g",
"volume": "250 ml",
"price": 500,
"count": 2,
@@ -40,7 +40,7 @@
"name": "spike",
"description": "A large and slightly misshapen spike, could do some damage mounted on a vehicle.",
"category": "spare_parts",
- "weight": 550,
+ "weight": "550 g",
"to_hit": -2,
"color": "light_gray",
"symbol": ";",
@@ -58,7 +58,7 @@
"name": "copper tubing",
"description": "A copper tube, too thin to be much use as a melee weapon, but will do if nothing else is available. Useful in a few crafting recipes.",
"category": "spare_parts",
- "weight": 345,
+ "weight": "345 g",
"to_hit": -1,
"color": "light_red",
"symbol": "/",
@@ -75,7 +75,7 @@
"category": "spare_parts",
"name": "aluminum ingot",
"description": "A small aluminum ingot, standardized for further processing. Light but durable, this could be cast into various shapes for construction or ground down to a powder, for more... high-profile applications.",
- "weight": 675,
+ "weight": "675 g",
"//": "Density 2.70g/cm³ = 675g/250ml",
"volume": "250 ml",
"price": 500,
@@ -92,7 +92,7 @@
"name": "bismuth",
"name_plural": "bismuth",
"description": "A dense but brittle metal often used as an alternative to lead.",
- "weight": 2,
+ "weight": "2 g",
"//": "Density 9.78g/cm³ ~ 2.4kg/250ml @ stack 1000 = 2g/unit",
"volume": "50ml",
"price": 6500,
@@ -110,7 +110,7 @@
"name": "gold",
"name_plural": "gold",
"description": "A soft shiny metal. Before the apocalypse this would've been worth a small fortune but now its value is greatly diminished.",
- "weight": 5,
+ "weight": "5 g",
"//": "Density 19.32g/cm³ ~ 4.8kg/250ml @ stack 1000 = 5g/unit",
"volume": "50ml",
"price": 100000,
@@ -129,7 +129,7 @@
"name": "platinum",
"name_plural": "platinum",
"description": "A soft shiny metal. Before the apocalypse this would've been worth a small fortune but now its value is greatly diminished.",
- "weight": 5,
+ "weight": "5 g",
"//": "Density 21.45g/cm³ ~ 5.4kg/250ml @ stack 1000 = 5g/unit",
"volume": "50ml",
"price": 100000,
@@ -141,6 +141,24 @@
"color": "light_gray",
"ammo_type": "components"
},
+ {
+ "id": "zinc_metal",
+ "type": "AMMO",
+ "category": "spare_parts",
+ "name": "zinc",
+ "name_plural": "zinc",
+ "description": "A slightly brittle metal. Apart from being an essential mineral that the body needs, it reacts readily with acids, alkalis and other non-metals. It can be crushed to make zinc powder, used in the production of batteries, among other things.",
+ "weight": 7,
+ "volume": "50ml",
+ "price": 3000,
+ "price_postapoc": 75,
+ "count": 100,
+ "stack_size": 200,
+ "material": [ "zinc" ],
+ "symbol": "/",
+ "color": "blue",
+ "ammo_type": "components"
+ },
{
"id": "lead",
"type": "AMMO",
@@ -148,7 +166,7 @@
"name": "lead",
"name_plural": "lead",
"description": "A soft dull metal known since ancient times. Due to its malleability it has a wide variety of uses including the manufacture of ammunition.",
- "weight": 3,
+ "weight": "3 g",
"//": "Density 11.34g/cm³ ~ 2.8kg/250ml @ stack 1000 = 3g/unit",
"volume": "50ml",
"price": 5000,
@@ -166,8 +184,8 @@
"name": "magnesium powder",
"name_plural": "magnesium powder",
"description": "A gray powder composed of the highly flammable alkaline earth metal magnesium. Useful for constructing flares and similar items.",
- "weight": 1.1,
- "//": "Weight should be 1.1g because: density 1.74g/cm³ ~ 0.44kg/250ml and density of aluminium 2.70g/cm³ = 675g/250ml => magnesium is 64% the weight of aluminium and at 250ml aluminium powder has a weight of ~0.176kg at 250ml, assuming same particle size => magnesium powder has a weight of ~0.112kg at 250ml => 1.1g per magnesium powder unit",
+ "weight": "1120 mg",
+ "//": "Weight should be 1.1g because: density 1.74g/cm³ ~ 0.44kg/250ml and density of aluminium 2.70g/cm³ = 675g/250ml => magnesium is 64% the weight of aluminium and at 250ml aluminium powder has a weight of ~0.176kg at 250ml, assuming same particle size => magnesium powder has a weight of ~0.112kg at 250ml => 1.12g per magnesium powder unit",
"volume": "250 ml",
"price": 5000,
"count": 100,
@@ -185,7 +203,7 @@
"name": "silver",
"name_plural": "silver",
"description": "A soft shiny metal. Before the cataclysm it was worth quite a bit but its value is now greatly diminished.",
- "weight": 3,
+ "weight": "3 g",
"//": "Density 10.40g/cm³ ~ 2.6kg/250ml @ stack 1000 = 3g/unit",
"volume": "50ml",
"price": 100000,
@@ -203,7 +221,7 @@
"category": "spare_parts",
"name": "small metal sheet",
"description": "A small sheet of metal.",
- "weight": 250,
+ "weight": "250 g",
"volume": "250 ml",
"price": 2000,
"bashing": 5,
@@ -221,7 +239,7 @@
"category": "spare_parts",
"name": "chunk of steel",
"description": "A misshapen chunk of steel. Makes a decent weapon in a pinch, and is also useful for some crafting recipes.",
- "weight": 250,
+ "weight": "250 g",
"volume": "250 ml",
"price": 1000,
"bashing": 8,
@@ -240,7 +258,7 @@
"category": "spare_parts",
"name": "lump of steel",
"description": "A heavy formed piece of steel. Useful for some crafting recipes.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "250 ml",
"price": 2000,
"bashing": 12,
@@ -259,7 +277,7 @@
"category": "spare_parts",
"name": "door hinge",
"description": "A small metal hinge with two metal plates with screw holes. Useful for making doors.",
- "weight": 300,
+ "weight": "300 g",
"volume": "250 ml",
"price": 3000,
"bashing": 5,
@@ -298,7 +316,7 @@
"description": "A small chunk of copper, usable for crafting or repairs.",
"price": 1000,
"material": "copper",
- "weight": 200,
+ "weight": "200 g",
"volume": "250 ml",
"bashing": 1,
"to_hit": -2
@@ -314,7 +332,7 @@
"description": "A fine gray powder composed of tin, usable for making solder and lining containers to prevent corrosion.",
"material": "tin",
"volume": "50ml",
- "weight": 2,
+ "weight": "2 g",
"//": "Density 7.28g/cm³ ~ 1820kg/250ml @ stack 1000 = 2g/unit",
"ammo_type": "components",
"count": 100,
@@ -331,7 +349,7 @@
"description": "A small spool of solder, able to be used in ammunition and electronics.",
"material": "steel",
"volume": "50ml",
- "weight": 2,
+ "weight": "2 g",
"//": "Density ~ 8g/cm³ ~ 2000kg/250ml @ stack 1000 = 2g/unit",
"ammo_type": "components",
"count": 200
diff --git a/data/json/items/resources/misc.json b/data/json/items/resources/misc.json
index f0a76f7c19c1f..f1cced464589e 100644
--- a/data/json/items/resources/misc.json
+++ b/data/json/items/resources/misc.json
@@ -6,7 +6,7 @@
"name": "incendiary",
"name_plural": "incendiaries",
"description": "Material from an incendiary round, useful in constructing incendiary ammunition.",
- "weight": 2,
+ "weight": "2 g",
"volume": "500 ml",
"price": 10000,
"container": "bag_plastic",
@@ -24,7 +24,7 @@
"name": "mattress",
"name_plural": "mattresses",
"description": "This is a single, or twin, sized mattress.",
- "weight": 20000,
+ "weight": "20000 g",
"volume": "300000 ml",
"price": 1000,
"material": [ "cotton", "steel" ],
diff --git a/data/json/items/resources/plastic.json b/data/json/items/resources/plastic.json
index 867e80025cc11..baea60252b7ab 100644
--- a/data/json/items/resources/plastic.json
+++ b/data/json/items/resources/plastic.json
@@ -5,7 +5,7 @@
"category": "spare_parts",
"name": "plastic chunk",
"description": "This is a piece of plastic. It could be used to fabricate, repair, or reinforce plastic items.",
- "weight": 70,
+ "weight": "70 g",
"volume": "250 ml",
"price": 0,
"material": "plastic",
@@ -19,7 +19,7 @@
"category": "spare_parts",
"name": "plastic sheet",
"description": "This is a large sheet of heavy flexible plastic, the sort that might have been used for commercial wrapping or for weather-sealing a home.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "2 L",
"price": 0,
"material": "plastic",
diff --git a/data/json/items/resources/wood.json b/data/json/items/resources/wood.json
index 5d3cde15568f2..a787914ec3e2a 100644
--- a/data/json/items/resources/wood.json
+++ b/data/json/items/resources/wood.json
@@ -10,7 +10,7 @@
"price": 10000,
"price_postapoc": 100,
"material": "wood",
- "weight": 9071,
+ "weight": "9071 g",
"volume": "10 L",
"bashing": 10,
"to_hit": -10,
@@ -25,7 +25,7 @@
"description": "A splintered piece of wood, could be used as a skewer or for kindling.",
"category": "other",
"material": "wood",
- "weight": 453,
+ "weight": "453 g",
"volume": "250 ml",
"bashing": 4,
"to_hit": 1,
@@ -42,7 +42,7 @@
"material": "wood",
"techniques": [ "WBLOCK_1" ],
"flags": [ "TRADER_AVOID", "FIREWOOD" ],
- "weight": 1700,
+ "weight": "1700 g",
"volume": "1250 ml",
"bashing": 14,
"to_hit": -2,
@@ -58,7 +58,7 @@
"material": "wood",
"techniques": [ "WBLOCK_1" ],
"flags": [ "TRADER_AVOID", "FIREWOOD" ],
- "weight": 3400,
+ "weight": "3400 g",
"volume": "2500 ml",
"bashing": 18,
"to_hit": -1,
@@ -76,7 +76,7 @@
"symbol": "/",
"material": [ "wood" ],
"techniques": "WBLOCK_1",
- "weight": 2250,
+ "weight": "2250 g",
"volume": "3750 ml",
"bashing": 25,
"flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE" ],
@@ -90,7 +90,7 @@
"name": "plank",
"description": "A narrow, thick plank of wood, like a 2 by 4 or similar piece of dimensional lumber. Makes a decent melee weapon, and can be used for all kinds construction.",
"category": "spare_parts",
- "weight": 1391,
+ "weight": "1391 g",
"to_hit": 1,
"color": "brown",
"symbol": "/",
@@ -108,7 +108,7 @@
"name": "heavy wooden beam",
"description": "An enormous beam of solid wood, very heavy and hard to lug around, but also very sturdy for construction. You could saw or chop it into smaller pieces, like planks or panels.",
"category": "spare_parts",
- "weight": 36000,
+ "weight": "36000 g",
"volume": "60000 ml",
"//": "weight for a roughly 6x6x8 wooden beam. Probably a bit small tbh.",
"to_hit": -2,
@@ -127,7 +127,7 @@
"description": "A wide, thin wooden board - plywood, OSB, MDF, tongue-in-groove boards, or similar, already cut to shape. These large flat boards are good for all kinds of construction, but for really big projects you'd need a proper sheet of uncut plywood or the like.",
"//": "Weight and volume assumes 18 square feet of 1/2 inch plywood. The actual size of the panel likely varies wildly and the item entry may represent several smaller pieces.",
"category": "spare_parts",
- "weight": 15000,
+ "weight": "15000 g",
"to_hit": 1,
"color": "brown",
"symbol": "H",
@@ -146,7 +146,7 @@
"description": "A standard 4x8 sheet of flat wood - usually plywood, OSB, or MDF. Heavy and bulky, this is extremely useful for all manner of construction, but you might have to cut it to size before doing smaller projects.",
"//": "Weight and volume assumes 32 square feet of 1/2 inch plywood. Due to its enormously bulky shape, volume is higher than actual displacement volume",
"category": "spare_parts",
- "weight": 20000,
+ "weight": "20000 g",
"to_hit": 1,
"color": "brown",
"symbol": "H",
diff --git a/data/json/items/robot_parts.json b/data/json/items/robot_parts.json
index 3af2fd8bac002..3a2c2fea147e3 100644
--- a/data/json/items/robot_parts.json
+++ b/data/json/items/robot_parts.json
@@ -7,7 +7,7 @@
"symbol": "%",
"color": "cyan",
"material": [ "plastic", "steel" ],
- "weight": 250,
+ "weight": "250 g",
"volume": "500 ml",
"price": 32000,
"category": "spare_parts"
@@ -66,7 +66,7 @@
"id": "ai_module_basic",
"name": "basic AI core",
"description": "A very basic AI core with minimal cognitive abilities.",
- "weight": 125,
+ "weight": "125 g",
"copy-from": "ai_module"
},
{
@@ -91,7 +91,7 @@
"description": "A set of big pointy legs, like the ones found under a tripod.",
"symbol": "W",
"color": "light_gray",
- "weight": 40000,
+ "weight": "40000 g",
"volume": "20 L",
"price": 200000,
"material": "steel",
@@ -105,7 +105,7 @@
"description": "A set of tiny pointy legs, like the ones found under a skitterbot.",
"symbol": "w",
"color": "light_gray",
- "weight": 200,
+ "weight": "200 g",
"volume": "500 ml",
"price": 50000,
"material": "steel",
@@ -119,7 +119,7 @@
"description": "A set of reverse-jointed legs, like the ones found under a chicken walker.",
"symbol": "k",
"color": "light_gray",
- "weight": 60000,
+ "weight": "60000 g",
"volume": "20 L",
"price": 500000,
"material": "steel",
@@ -133,7 +133,7 @@
"description": "A set of omni wheels, like the ones found under a police bot.",
"symbol": "o",
"color": "light_gray",
- "weight": 10000,
+ "weight": "10000 g",
"volume": "10 L",
"price": 100000,
"material": "steel",
@@ -147,7 +147,7 @@
"description": "A set of rotors able to lift a small drone.",
"symbol": "#",
"color": "light_gray",
- "weight": 130,
+ "weight": "130 g",
"volume": "500 ml",
"price": 40000,
"material": [ "steel", "plastic" ],
@@ -161,7 +161,7 @@
"description": "A set of human-like legs.",
"symbol": "M",
"color": "light_gray",
- "weight": 10000,
+ "weight": "10000 g",
"volume": "10 L",
"price": 100000,
"material": [ "steel", "plastic" ],
@@ -175,7 +175,7 @@
"description": "A set of human-like arms.",
"symbol": "m",
"color": "light_gray",
- "weight": 5000,
+ "weight": "5000 g",
"volume": "5 L",
"price": 100000,
"material": [ "steel", "plastic" ],
@@ -189,7 +189,7 @@
"description": "A set of small tank tread, like the one used by the \"Beagle\" mini-tank.",
"symbol": "=",
"color": "light_gray",
- "weight": 60000,
+ "weight": "60000 g",
"volume": "30 L",
"price": 600000,
"material": [ "steel", "plastic" ],
@@ -203,7 +203,7 @@
"description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of a turret.",
"symbol": "c",
"color": "light_gray",
- "weight": 10000,
+ "weight": "10000 g",
"volume": "10 L",
"price": 100000,
"material": [ "steel", "plastic" ],
@@ -217,7 +217,7 @@
"description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the tripod.",
"symbol": "c",
"color": "light_gray",
- "weight": 40000,
+ "weight": "40000 g",
"volume": "70000 ml",
"price": 200000,
"material": [ "steel" ],
@@ -231,7 +231,7 @@
"description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the chicken walker.",
"symbol": "c",
"color": "light_gray",
- "weight": 60000,
+ "weight": "60000 g",
"volume": "80000 ml",
"price": 300000,
"material": [ "steel" ],
@@ -245,7 +245,7 @@
"description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the police bot.",
"symbol": "c",
"color": "light_gray",
- "weight": 20000,
+ "weight": "20000 g",
"volume": "40000 ml",
"price": 100000,
"material": [ "steel" ],
@@ -258,7 +258,7 @@
"description": "What's left when you strip an android body from its components.",
"symbol": "c",
"color": "light_gray",
- "weight": 20000,
+ "weight": "20000 g",
"volume": "40000 ml",
"price": 100000,
"material": [ "steel", "plastic" ],
@@ -272,7 +272,7 @@
"description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the Beagle tank.",
"symbol": "c",
"color": "light_gray",
- "weight": 150000,
+ "weight": "150000 g",
"volume": "575000 ml",
"price": 1000000,
"material": [ "steel" ],
diff --git a/data/json/items/software.json b/data/json/items/software.json
index e6c99b46c3322..7a5a97ebd0d66 100644
--- a/data/json/items/software.json
+++ b/data/json/items/software.json
@@ -80,5 +80,14 @@
"container": "data_card",
"description": "Data stolen from a dead scientist memory banks. Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n\nWhatever the case, the idea of perpetually keeping a part of you within a metallic pill makes you feel uncomfortable.",
"flags": [ "NO_DROP" ]
+ },
+ {
+ "id": "software_electronics_reference",
+ "copy-from": "software",
+ "type": "GENERIC",
+ "name": "integrated circuit datasheet archives",
+ "name_plural": "misc software",
+ "description": "Huge archives of numerous IC circuit datasheets from several major manufacturers. Probably valuable to the right person, as it would be hard to salvage and reuse these components without them.",
+ "price": 40000
}
]
diff --git a/data/json/items/tool/container.json b/data/json/items/tool/container.json
index 17b0ea5e9d004..f1e16010db225 100644
--- a/data/json/items/tool/container.json
+++ b/data/json/items/tool/container.json
@@ -5,7 +5,7 @@
"category": "other",
"name": "steel bottle",
"description": "A stainless steel water bottle, holds 750ml of liquid.",
- "weight": 200,
+ "weight": "200 g",
"volume": "750 ml",
"price": 0,
"to_hit": 1,
@@ -24,7 +24,7 @@
"category": "other",
"name": "foldable plastic bottle",
"description": "A non-rigid plastic bottle for easy storage, holds 500 ml of liquid.",
- "weight": 13,
+ "weight": "13 g",
"volume": 0,
"price": 0,
"to_hit": 1,
diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json
index 645ed03760621..94f6fcefb2d0c 100644
--- a/data/json/items/tool/cooking.json
+++ b/data/json/items/tool/cooking.json
@@ -4,7 +4,7 @@
"type": "TOOL",
"name": "hexamine stove",
"description": "Known as an Esbit stove, this is a lightweight, folding stove designed to use small hexamine tablets for cooking.",
- "weight": 180,
+ "weight": "180 g",
"volume": "750 ml",
"price": 2000,
"to_hit": -1,
@@ -25,7 +25,7 @@
"category": "tools",
"name": "mess tin",
"description": "A compact military-style pan and tray, designed for heating food over a fire or portable stove. It is shallower than a proper pot or pan, and lacks the integrated heating elements modern mess kits have.",
- "weight": 450,
+ "weight": "450 g",
"volume": "750 ml",
"price": 2000,
"to_hit": 2,
diff --git a/data/json/items/tool/deployable.json b/data/json/items/tool/deployable.json
index 0415a75894d8b..1ca2ac8a313e1 100644
--- a/data/json/items/tool/deployable.json
+++ b/data/json/items/tool/deployable.json
@@ -4,7 +4,7 @@
"type": "TOOL",
"name": "brazier",
"description": "A large metal stand used to contain a fire. Fires set in a brazier will not spread to surrounding flammable objects.",
- "weight": 5000,
+ "weight": "5000 g",
"volume": "2500 ml",
"price": 5000,
"to_hit": -4,
@@ -21,7 +21,7 @@
"name": "fire barrel (200L)",
"name_plural": "fire barrels (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.",
- "weight": 20000,
+ "weight": "20000 g",
"volume": "200 L",
"price": 10000,
"to_hit": -5,
@@ -38,7 +38,7 @@
"name": "fire barrel (100L)",
"name_plural": "fire barrels (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.",
- "weight": 12000,
+ "weight": "12000 g",
"volume": "100 L",
"price": 5000,
"to_hit": -4,
@@ -54,7 +54,7 @@
"type": "TOOL",
"name": "camp chair",
"description": "Folded camp chair, deploy to sit down.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "2500 ml",
"price": 5000,
"to_hit": -4,
@@ -70,7 +70,7 @@
"type": "TOOL",
"name": "metal butchering rack",
"description": "Metal butchering rack designed to hang a carcass in the air. It is folded for easy transportation.",
- "weight": 5000,
+ "weight": "5000 g",
"volume": "10 L",
"price": 5000,
"to_hit": -4,
@@ -89,7 +89,7 @@
"description": "This rubber rowboat (oars included) is deflated for storage. Activate it (having an air pump in inventory) to inflate and launch.",
"price": 350000,
"material": "plastic",
- "weight": 9071,
+ "weight": "9071 g",
"volume": "21500 ml",
"bashing": 10,
"to_hit": -5,
@@ -106,7 +106,7 @@
"type": "TOOL",
"name": "metal smoking rack",
"description": "A metal rack designed to smoke food for better preservation and taste. It is folded for easy transportation.",
- "weight": 5000,
+ "weight": "5000 g",
"volume": "25 L",
"price": 5000,
"to_hit": -4,
@@ -121,7 +121,7 @@
"type": "TOOL",
"name": "tourist table",
"description": "Metal tourist table for off-road trips. It is folded for easy transportation.",
- "weight": 6000,
+ "weight": "6000 g",
"volume": "25 L",
"price": 5000,
"to_hit": -3,
@@ -136,7 +136,7 @@
"type": "TOOL",
"name": "leather tarp",
"description": "A large sheet of sewn leather that can be deployed instead of a picnic blanket, but it's more valuable as a butchery appliance as it does not soak in blood. It's rolled and ready for carrying.",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "2500 ml",
"price": 5000,
"to_hit": -3,
@@ -151,7 +151,7 @@
"type": "TOOL",
"name": "fiber mat",
"description": "A large mat woven from fibrous material that can be used instead of a picnic blanket, but it's more valuable as a butchery appliance. Too thin to be used as a comfortable sleeping place. It's rolled and ready for carrying.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "2500 ml",
"price": 1000,
"to_hit": -3,
diff --git a/data/json/items/tool/fire.json b/data/json/items/tool/fire.json
index f254c1b9340f8..2a5a6689c45de 100644
--- a/data/json/items/tool/fire.json
+++ b/data/json/items/tool/fire.json
@@ -5,7 +5,7 @@
"name": "flint and steel",
"name_plural": "sets of flint and steel",
"description": "This is a magnesium bar and a carbon steel striker. Use it to spark a flame.",
- "weight": 400,
+ "weight": "400 g",
"volume": "250 ml",
"price": 300,
"to_hit": -1,
diff --git a/data/json/items/tool/handloading.json b/data/json/items/tool/handloading.json
new file mode 100644
index 0000000000000..0ddb9a3d90fc5
--- /dev/null
+++ b/data/json/items/tool/handloading.json
@@ -0,0 +1,45 @@
+[
+ {
+ "id": "press",
+ "type": "TOOL",
+ "name": "hand press",
+ "description": "This is a small hand press for hand loading firearm ammunition. It comes with everything you need to start hand loading your own munitions.",
+ "weight": 6350,
+ "volume": "500 ml",
+ "price": 10000,
+ "to_hit": -2,
+ "bashing": 6,
+ "material": [ "steel", "plastic" ],
+ "symbol": ";",
+ "color": "dark_gray"
+ },
+ {
+ "id": "press_dowel",
+ "type": "TOOL",
+ "name": "makeshift shotshell 'press'",
+ "description": "This is a collection of items improvised for field reloading of shotshells. A plank with a hole cut in the center, a medium sized nail, and a whittled dowel are used to seat wads, decap primers, and reprime (carefully!) hulls. Powder and shot are measured with a cut down fired shotshell. The opposite side of the plank has been shaped to allow for roll crimping of the plastic hulls. There's no provision for resizing, so reloaded hulls will fire best in the firearm they were fired from.",
+ "weight": 348,
+ "volume": "250 ml",
+ "price": 600,
+ "to_hit": -2,
+ "bashing": 2,
+ "material": [ "wood", "plastic", "brass" ],
+ "symbol": ";",
+ "color": "dark_gray",
+ "flags": [ "TRADER_AVOID" ]
+ },
+ {
+ "id": "puller",
+ "type": "TOOL",
+ "name": "kinetic bullet puller",
+ "description": "This is a tool used for properly disassembling firearm ammunition.",
+ "weight": 489,
+ "volume": "250 ml",
+ "price": 1000,
+ "bashing": 5,
+ "material": "plastic",
+ "symbol": ";",
+ "color": "green",
+ "qualities": [ [ "PULL", 2 ] ]
+ }
+]
diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json
index 52baa5297144f..5f7b8aeab9df2 100644
--- a/data/json/items/tool/lighting.json
+++ b/data/json/items/tool/lighting.json
@@ -5,7 +5,7 @@
"name": "electric lantern (off)",
"name_plural": "electric lanterns (off)",
"description": "This is a battery-powered lamp. It does not provide much light, but it lasts a long time. Use it to turn it on.",
- "weight": 980,
+ "weight": "980 g",
"volume": "1 L",
"price": 1000,
"bashing": 1,
@@ -52,7 +52,7 @@
"material": [ "plastic", "aluminum" ],
"symbol": ";",
"color": "blue",
- "weight": 400,
+ "weight": "400 g",
"volume": "500 ml",
"price": 500,
"charges_per_use": 1,
@@ -69,13 +69,13 @@
[
"battery",
[
+ "light_disposable_cell",
+ "light_minus_disposable_cell",
"light_battery_cell",
"light_plus_battery_cell",
"light_minus_battery_cell",
"light_atomic_battery_cell",
- "light_minus_atomic_battery_cell",
- "light_minus_disposable_cell",
- "light_disposable_cell"
+ "light_minus_atomic_battery_cell"
]
]
],
@@ -100,7 +100,7 @@
"material": [ "plastic", "powder" ],
"symbol": ";",
"color": "light_red",
- "weight": 128,
+ "weight": "128 g",
"volume": "250 ml",
"price": 400,
"max_charges": 300,
@@ -120,7 +120,7 @@
"name": "active flare",
"description": "This burning magnesium flare is producing light. It will last for about a half hour before burning out.",
"color": "white",
- "turns_per_charge": 1,
+ "turns_per_charge": 6,
"revert_to": "handflare_dead",
"revert_msg": "The flare sputters out",
"use_action": { "type": "firestarter", "moves": 50 },
@@ -132,7 +132,7 @@
"name": "heavy duty flashlight (off)",
"name_plural": "heavy duty flashlights (off)",
"description": "This is a heavy duty tubular aluminum LED flashlight as often used by security guards. Makes for a passable melee weapon. Using this flashlight will turn it on and provide light, assuming it is charged with batteries.",
- "weight": 650,
+ "weight": "650 g",
"volume": "750 ml",
"price": 950,
"bashing": 8,
@@ -154,13 +154,13 @@
[
"battery",
[
+ "light_disposable_cell",
+ "light_minus_disposable_cell",
"light_plus_battery_cell",
"light_battery_cell",
"light_minus_battery_cell",
"light_atomic_battery_cell",
- "light_minus_atomic_battery_cell",
- "light_minus_disposable_cell",
- "light_disposable_cell"
+ "light_minus_atomic_battery_cell"
]
]
],
@@ -188,7 +188,7 @@
"name": "acetylene lamp (off)",
"name_plural": "acetylene lamps (off)",
"description": "An antique brass lamp designed to run from a pressurized cylinder of acetylene. It is an efficient, if not somewhat dangerous light source.",
- "weight": 800,
+ "weight": "800 g",
"volume": "500 ml",
"price": 6500,
"symbol": ";",
diff --git a/data/json/items/tool/med.json b/data/json/items/tool/med.json
index 06231913eaaca..8d6333bafb099 100644
--- a/data/json/items/tool/med.json
+++ b/data/json/items/tool/med.json
@@ -5,7 +5,7 @@
"category": "drugs",
"name": "inhaler",
"description": "Albuterol inhaler. Used in the treatment of bronchospasm, it is a lifeline for people with asthma. A mild stimulant, it may cause nervousness or tremors.",
- "weight": 85,
+ "weight": "85 g",
"volume": "250 ml",
"price": 5000,
"material": "plastic",
diff --git a/data/json/items/tool/radio_tools.json b/data/json/items/tool/radio_tools.json
index d8d26ecdcf0a5..e55094ce8b951 100644
--- a/data/json/items/tool/radio_tools.json
+++ b/data/json/items/tool/radio_tools.json
@@ -6,7 +6,7 @@
"name": "radio car box",
"name_plural": "radio car boxes",
"description": "A RC car, with radio-control and batteries included! Disassemble to unpack and enjoy.",
- "weight": 3200,
+ "weight": "3200 g",
"volume": "2 L",
"price": 30000,
"to_hit": -1,
@@ -30,13 +30,13 @@
[
"battery",
[
+ "light_disposable_cell",
+ "light_minus_disposable_cell",
"light_battery_cell",
"light_plus_battery_cell",
"light_minus_battery_cell",
"light_atomic_battery_cell",
- "light_minus_atomic_battery_cell",
- "light_minus_disposable_cell",
- "light_disposable_cell"
+ "light_minus_atomic_battery_cell"
]
]
],
@@ -54,7 +54,7 @@
"proportional": { "weight": 0.73, "volume": 0.75, "price": 0.8 },
"use_action": "RADIOCAR",
"flags": [ "RADIO_CONTAINER" ],
- "magazines": [ [ "battery", [ "light_minus_battery_cell", "light_minus_atomic_battery_cell", "light_minus_disposable_cell" ] ] ],
+ "magazines": [ [ "battery", [ "light_minus_disposable_cell", "light_minus_battery_cell", "light_minus_atomic_battery_cell" ] ] ],
"magazine_well": 0
},
{
@@ -74,7 +74,7 @@
"category": "spare_parts",
"name": "radio activation mod",
"description": "This small piece of electronics can be attached to certain items and activate them after receiving a radio signal.",
- "weight": 142,
+ "weight": "142 g",
"volume": "250 ml",
"price": 5000,
"to_hit": -2,
@@ -89,7 +89,7 @@
"name": "radio (off)",
"name_plural": "radios (off)",
"description": "This is a portable radio. Using this radio turns it on. It will pick up any nearby signals being broadcast and play them audibly.",
- "weight": 295,
+ "weight": "295 g",
"volume": "1 L",
"price": 1000,
"to_hit": -1,
@@ -103,13 +103,13 @@
[
"battery",
[
+ "light_disposable_cell",
+ "light_minus_disposable_cell",
"light_battery_cell",
"light_plus_battery_cell",
"light_minus_battery_cell",
"light_atomic_battery_cell",
- "light_minus_atomic_battery_cell",
- "light_minus_disposable_cell",
- "light_disposable_cell"
+ "light_minus_atomic_battery_cell"
]
]
],
@@ -133,7 +133,7 @@
"type": "TOOL",
"name": "two-way radio",
"description": "This is a radio with a transmitting unit. You could use it to contact someone who also has one. Unfortunately no one seems to use those nowadays...",
- "weight": 431,
+ "weight": "431 g",
"volume": "500 ml",
"price": 2000,
"bashing": 6,
@@ -146,13 +146,13 @@
[
"battery",
[
+ "light_disposable_cell",
+ "light_minus_disposable_cell",
"light_battery_cell",
"light_plus_battery_cell",
"light_minus_battery_cell",
"light_atomic_battery_cell",
- "light_minus_atomic_battery_cell",
- "light_minus_disposable_cell",
- "light_disposable_cell"
+ "light_minus_atomic_battery_cell"
]
]
],
@@ -163,7 +163,7 @@
"type": "TOOL",
"name": "remote vehicle controller",
"description": "A remote controller for real cars. Can turn onboard devices on and off. Some cars can be driven remotely.",
- "weight": 907,
+ "weight": "907 g",
"volume": "1 L",
"price": 2000,
"to_hit": -1,
diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json
index be9c52c58ec3b..14d107da55f11 100644
--- a/data/json/items/tool/science.json
+++ b/data/json/items/tool/science.json
@@ -4,7 +4,7 @@
"type": "TOOL",
"name": "chemistry set",
"description": "This is a chemistry set stored in a box. The contents include glass containers, hoses, metal wire, a hotplate, and safety glasses. It might be used to craft some chemistry projects if you're so inclined.",
- "weight": 5200,
+ "weight": "5200 g",
"volume": "4500 ml",
"price": 20000,
"to_hit": -5,
@@ -30,7 +30,7 @@
"category": "tools",
"name": "basic chemistry set",
"description": "This is a basic chemistry set which includes glass containers, hoses and safety glasses. It might be used to craft some chemistry projects if you're so inclined, but you'll need a source of heat.",
- "weight": 1884,
+ "weight": "1884 g",
"volume": "2750 ml",
"price": 3200,
"to_hit": -5,
@@ -45,7 +45,7 @@
"category": "tools",
"name": "basic laboratory analysis kit",
"description": "This hefty kit contains some basic things you should probably not try to do precise chemistry without: namely, a small balance scale, a spectrophotometer, a melting point apparatus, a pH meter, and a set of paper for thin layer chromatography. This makes it a lot easier to feel confident that the chemical you've made is what you think you've made.",
- "weight": 12500,
+ "weight": "12500 g",
"volume": "5 L",
"price": 25000,
"ammo": "battery",
@@ -68,7 +68,7 @@
"category": "tools",
"name": "small weight scale",
"description": "This is a simple scale that uses a set of steel weights on sliding bars to measure a sample's mass quite accurately.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "2 L",
"price": 1600,
"to_hit": -5,
@@ -82,7 +82,7 @@
"category": "tools",
"name": "spectrophotometer",
"description": "This ubiquitous analytical chemistry tool measures the light absorption of a liquid sample in a special tube called a cuvette.",
- "weight": 5000,
+ "weight": "5000 g",
"volume": "2 L",
"price": 8000,
"ammo": "battery",
@@ -100,7 +100,7 @@
"name": "set of spectrometry cuvettes",
"name_plural": "sets of spectrometry cuvettes",
"description": "This is a small box filled with precisely calibrated square plastic tubes for laboratory spectrometer use.",
- "weight": 500,
+ "weight": "500 g",
"volume": "250 ml",
"price": 1200,
"to_hit": -5,
@@ -114,7 +114,7 @@
"category": "tools",
"name": "pH meter",
"description": "This is basically a pair of glass probes on a voltmeter. By putting one probe into a calibration solution (conveniently included) and the other in a substance, you can calculate the acidity.",
- "weight": 3000,
+ "weight": "3000 g",
"volume": "1500 ml",
"price": 6000,
"ammo": "battery",
@@ -144,7 +144,7 @@
"category": "tools",
"name": "voltmeter",
"description": "This device has two probes that let you measure the electrical potential between two points.",
- "weight": 3000,
+ "weight": "3000 g",
"volume": "1500 ml",
"price": 6000,
"ammo": "battery",
@@ -175,7 +175,7 @@
"name": "melting point apparatus",
"name_plural": "units of melting point apparatus",
"description": "This is basically a hot plate, with a metal housing attached. The metal housing has a magnification viewport and a slot into which a capillary tube containing a crystallized sample is inserted. The device lets you precisely measure the melting point of a crystal, a property very useful in identifying what it is and how pure it is.",
- "weight": 5000,
+ "weight": "5000 g",
"volume": "1500 ml",
"price": 6000,
"ammo": "battery",
@@ -205,7 +205,7 @@
"category": "tools",
"name": "vortex device",
"description": "This is a small, hefty, boring looking machine. Its weighted trapezoidal frame has a single on-off switch and a speed dial, and on top of it sits a rubber receptacle. Pressing a test tube into the receptacle would, with power, rapidly shake and mix the contents of the test tube. It's surprisingly fun to use.",
- "weight": 3500,
+ "weight": "3500 g",
"volume": "750 ml",
"price": 1000,
"to_hit": -5,
@@ -219,7 +219,7 @@
"category": "spare_parts",
"name": "light detector",
"description": "This is a photodiode on a chip, designed to convert incoming light to electrical energy for quantification.",
- "weight": 50,
+ "weight": "50 g",
"volume": "250 ml",
"price": 400,
"to_hit": -5,
@@ -234,7 +234,7 @@
"category": "spare_parts",
"name": "glass prism",
"description": "This is a high quality crystal glass prism for separating and redirecting light.",
- "weight": 50,
+ "weight": "50 g",
"volume": "250 ml",
"price": 50,
"to_hit": -5,
@@ -248,7 +248,7 @@
"category": "spare_parts",
"name": "small glass tube",
"description": "This is a small glass tube. What more could you possibly want to know about it?",
- "weight": 1,
+ "weight": "1 g",
"volume": 0.1,
"price": 10,
"to_hit": -5,
@@ -262,7 +262,7 @@
"category": "tools",
"name": "microscope",
"description": "A classic tool for the ages! This hefty, durable piece of lab equipment makes small things look bigger. Without electricity the light doesn't work, but the rest of it is surprisingly functional. Unfortunately it's not useful for very much at the moment.",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "3800ml",
"price": 3000,
"to_hit": -5,
@@ -276,7 +276,7 @@
"category": "tools",
"name": "dissecting microscope",
"description": "This microscope has less magnification than a standard one. It's also stereoscopic and produces a neat 3d image of the surface. It was typically used for doing dissections and other fine detail work on small creatures. It still works pretty well with an added light source, but what would you do with it?",
- "weight": 2200,
+ "weight": "2200 g",
"volume": "4000ml",
"price": 3000,
"to_hit": -5,
@@ -290,7 +290,7 @@
"category": "tools",
"name": "separation funnel",
"description": "This thing doesn't look much like a funnel. It's a teardrop shaped piece of glass with a stopper at the wide end and a valve at the other. It can be used to wash one liquid with another, like water and an oil, and then draw off whichever of the two liquids contains a higher amount of whatever compound you're trying to isolate. With a high level of skill it can also be used to make juvenile farting noises.",
- "weight": 200,
+ "weight": "200 g",
"volume": "700ml",
"price": 100,
"to_hit": -5,
@@ -306,7 +306,7 @@
"category": "tools",
"name": "burette",
"description": "A tall glass column with a stopcock at the end. If you're serious about chemistry, you probably have a tattoo of one of these somewhere.",
- "weight": 300,
+ "weight": "300 g",
"volume": "1000ml",
"price": 1000,
"to_hit": -4,
@@ -321,7 +321,7 @@
"category": "tools",
"name": "rotary evapourator",
"description": "Just looking at this thing makes you feel like a proper mad scientist. It's a series of glass tubes and round flasks, connected to a central motor and a heating element. The heating element warms one flask, kept rotating by the motor, evapourating the contents. The vapour is then condensed in the tubes and collected in another flask, in case you wanted to save it for later.",
- "weight": 18000,
+ "weight": "18000 g",
"volume": "60000ml",
"price": 8000,
"to_hit": -5,
@@ -337,7 +337,7 @@
"name": "fractional distillation apparatus",
"name_plural": "fractional distillation apparati",
"description": "One of the classic pieces of mad science glassware, this is basically a small volume still that passes the vapour through a fractional distillation column and then condenses the distillate in a cooled collection column. A grad student or a robot (is there really any difference?) collects the distillate in fractions so that specific contents can be analyzed. Going a few milliliters at a time, it would not be very effective to try to distill whiskey in this thing.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "5000ml",
"price": 2000,
"to_hit": -5,
@@ -353,7 +353,7 @@
"category": "tools",
"name": "electrophoresis tray",
"description": "This is a set of plastic trays, electrodes, and a power supply designed to create an electric voltage gradient through a liquid solution containing a solid gel. Stuff like proteins and DNA would then get separated on the gel according to electrical charge and size. Pretty useless now, for anything but salvage.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "5000ml",
"price": 500,
"to_hit": -5,
@@ -368,7 +368,7 @@
"category": "tools",
"name": "microcentrifuge",
"description": "This is a smaller, benchtop version of the larger furniture-sized centrifuge. Don't be fooled by its portable scale; it's still a very powerful piece of equipment that can spin stuff really quickly. It's not a toy!",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "1500ml",
"price": 1000,
"to_hit": -5,
@@ -400,7 +400,7 @@
"category": "spare_parts",
"name": "plastic stopcock",
"description": "Stop giggling. This is a tiny plastic valve, get your mind out of the gutter.",
- "weight": 5,
+ "weight": "5 g",
"volume": "1ml",
"price": 5,
"to_hit": -5,
@@ -415,7 +415,7 @@
"category": "spare_parts",
"name": "test tube rack",
"description": "A plastic box with holes in it. Not that exciting, unless you're desperate for a place to store a test tube. Then it's great.",
- "weight": 90,
+ "weight": "90 g",
"volume": "250ml",
"price": 25,
"to_hit": -1,
@@ -430,7 +430,7 @@
"category": "spare_parts",
"name": "microcentrifuge tube tray",
"description": "A plastic tray riddled with small holes, for storing microcentrifuge tubes.",
- "weight": 70,
+ "weight": "70 g",
"volume": "150ml",
"price": 25,
"to_hit": -1,
@@ -445,7 +445,7 @@
"category": "spare_parts",
"name": "ring stand",
"description": "This is a heavy metal plate and a sturdy rod, for clamping lab stuff to.",
- "weight": 900,
+ "weight": "900 g",
"volume": "550ml",
"price": 75,
"to_hit": -1,
@@ -461,7 +461,7 @@
"name": "set of ring stand clamps",
"name_plural": "sets of ring stand clamps",
"description": "This is a small box with a jumbled assortment of clamps for mounting on ring stands. There seems to be some sort of rule that all of them are missing at least one wing nut for tightening them; it looks like judicious use of twist ties, duct tape, and other random stuff has been used to compensate.",
- "weight": 300,
+ "weight": "300 g",
"volume": "450ml",
"price": 75,
"to_hit": -1,
diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json
index cec9ba4407aee..0a057518f3f48 100644
--- a/data/json/items/tool/workshop.json
+++ b/data/json/items/tool/workshop.json
@@ -7,7 +7,7 @@
"material": "steel",
"symbol": ";",
"color": "light_gray",
- "weight": 7000,
+ "weight": "7000 g",
"volume": "1500 ml",
"price": 18000,
"bashing": 8,
@@ -22,7 +22,7 @@
"material": "steel",
"symbol": ";",
"color": "light_gray",
- "weight": 1800,
+ "weight": "1800 g",
"volume": "1 L",
"price": 800,
"bashing": 4,
@@ -37,7 +37,7 @@
"material": "steel",
"symbol": ";",
"color": "light_gray",
- "weight": 3000,
+ "weight": "3000 g",
"volume": "750 ml",
"price": 5000,
"bashing": 4,
@@ -50,7 +50,7 @@
"name": "acetylene torch",
"name_plural": "acetylene torches",
"description": "A compact tool kit intended for welding and cutting metal, this portable oxyacetylene torch includes a torch handle and cutting attachment in an easy-to-carry tote. It requires connecting to pressurized cylinders of an appropriate welding gas before use. In addition to its metalworking uses, you can activate it in order to destroy metal barriers.",
- "weight": 1600,
+ "weight": "1600 g",
"volume": "1 L",
"price": 20000,
"material": [ "steel", "plastic" ],
diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json
index 40358da333c4e..e41dba12f74fd 100644
--- a/data/json/items/tool_armor.json
+++ b/data/json/items/tool_armor.json
@@ -10,7 +10,7 @@
"flags": [ "WATERPROOF" ],
"price": 12500,
"material": [ "plastic" ],
- "weight": 1196,
+ "weight": "1196 g",
"volume": "3 L",
"bashing": 6,
"charges_per_use": 1,
@@ -60,6 +60,80 @@
"techniques": [ "WBLOCK_1" ],
"magazine_well": 1
},
+ {
+ "id": "welding_mask",
+ "type": "ARMOR",
+ "name": "welding mask",
+ "description": "A plastic mask with a very dark visor, meant to protect the entire face while welding. It also serves as somewhat good armor, but makes it hard to see. Activate it to push it up your head.",
+ "weight": 4000,
+ "volume": "4 L",
+ "price": 1400,
+ "to_hit": -3,
+ "use_action": { "type": "transform", "msg": "You push your %s up your head.", "target": "welding_mask_raised", "menu_text": "Raise" },
+ "material": [ "plastic" ],
+ "symbol": "[",
+ "color": "dark_gray",
+ "covers": [ "HEAD", "MOUTH", "EYES" ],
+ "coverage": 90,
+ "warmth": 5,
+ "encumbrance": 60,
+ "material_thickness": 3,
+ "qualities": [ [ "GLARE", 3 ] ],
+ "flags": [ "SUN_GLASSES", "FLASH_PROTECTION", "BLIND" ]
+ },
+ {
+ "id": "welding_mask_crude",
+ "copy-from": "welding_mask",
+ "type": "ARMOR",
+ "name": "crude welding mask",
+ "description": "A crude welding mask made from shaped steel. It's less dark than a proper welding mask, and therefore less difficult to see in, but also less protective when welding. Activate it to push it up your head.",
+ "price": 1000,
+ "use_action": {
+ "type": "transform",
+ "msg": "You push your %s up your head.",
+ "target": "welding_mask_crude_raised",
+ "menu_text": "Raise"
+ },
+ "material": [ "steel" ],
+ "material_thickness": 2,
+ "delete": { "qualities": [ [ "GLARE", 3 ] ], "flags": [ "BLIND" ] },
+ "extend": { "qualities": [ [ "GLARE", 2 ] ] }
+ },
+ {
+ "id": "welding_mask_crude_raised",
+ "copy-from": "welding_mask_crude",
+ "type": "ARMOR",
+ "name": "crude welding mask (raised)",
+ "name_plural": "crude welding masks (raised)",
+ "description": "A crude welding mask made from shaped steel. It's less dark than a proper welding mask, and therefore less difficult to see in, but also less protective when welding. Activate it to lower it over your face.",
+ "price": 1000,
+ "use_action": {
+ "type": "transform",
+ "msg": "You lower your crude welding mask over your face.",
+ "target": "welding_mask_crude",
+ "menu_text": "Lower"
+ },
+ "covers": [ "HEAD" ],
+ "delete": { "flags": [ "SUN_GLASSES", "FLASH_PROTECTION" ] },
+ "coverage": 30
+ },
+ {
+ "id": "welding_mask_raised",
+ "copy-from": "welding_mask",
+ "type": "ARMOR",
+ "name": "welding mask (raised)",
+ "name_plural": "welding masks (raised)",
+ "description": "A plastic mask with a very dark visor, meant to protect the entire face while welding. It also serves as somewhat good armor, but makes it hard to see. Activate it to lower it over your face.",
+ "use_action": {
+ "type": "transform",
+ "msg": "You lower your welding mask over your face.",
+ "target": "welding_mask",
+ "menu_text": "Lower"
+ },
+ "covers": [ "HEAD" ],
+ "delete": { "flags": [ "SUN_GLASSES", "FLASH_PROTECTION", "BLIND" ] },
+ "coverage": 30
+ },
{
"type": "TOOL_ARMOR",
"id": "game_watch",
@@ -68,7 +142,7 @@
"category": "clothing",
"volume": "250 ml",
"description": "A waterproof digital watch with a built-in electronic game system, powered by standard batteries. Activate to play.",
- "weight": 112,
+ "weight": "112 g",
"to_hit": -1,
"color": "light_gray",
"covers": [ "HAND_EITHER" ],
@@ -79,14 +153,14 @@
"symbol": "[",
"ammo": "battery",
"use_action": "PORTABLE_GAME",
- "magazines": [ [ "battery", [ "light_minus_battery_cell", "light_minus_atomic_battery_cell", "light_minus_disposable_cell" ] ] ]
+ "magazines": [ [ "battery", [ "light_minus_battery_cell", "light_minus_atomic_battery_cell" ] ] ]
},
{
"id": "holo_cloak",
"type": "TOOL_ARMOR",
"name": "hologram cloak",
"description": "A cloak woven with metallic fibers and covered with hexagonal sheets of reflective carbide. When activated, it will create an holographic decoy of its wearer.",
- "weight": 1552,
+ "weight": "1552 g",
"volume": "3500 ml",
"price": 5500000,
"to_hit": -1,
@@ -111,7 +185,7 @@
"category": "clothing",
"id": "fedora",
"name": "fedora",
- "weight": 350,
+ "weight": "350 g",
"color": "brown",
"covers": [ "HEAD" ],
"use_action": { "menu_text": "Tip", "type": "transform", "target": "fedora", "msg": "You tip your %s." },
@@ -139,7 +213,7 @@
"flags": [ "VARSIZE", "SKINTIGHT" ],
"price": 5000,
"material": [ "cotton" ],
- "weight": 182,
+ "weight": "182 g",
"volume": "750 ml",
"charges_per_use": 1,
"ammo": "battery",
@@ -196,7 +270,7 @@
"flags": [ "VARSIZE", "SKINTIGHT" ],
"price": 15000,
"material": [ "cotton" ],
- "weight": 864,
+ "weight": "864 g",
"volume": "2 L",
"charges_per_use": 1,
"ammo": "battery",
@@ -254,7 +328,7 @@
"flags": [ "VARSIZE", "SKINTIGHT" ],
"price": 5000,
"material": [ "cotton" ],
- "weight": 210,
+ "weight": "210 g",
"volume": "750 ml",
"charges_per_use": 1,
"ammo": "battery",
@@ -311,7 +385,7 @@
"flags": [ "VARSIZE", "SKINTIGHT" ],
"price": 5000,
"material": [ "cotton" ],
- "weight": 196,
+ "weight": "196 g",
"volume": "1 L",
"charges_per_use": 1,
"ammo": "battery",
@@ -369,7 +443,7 @@
"price": 30000,
"material": [ "plastic", "glass" ],
"flags": [ "ZOOM", "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS", "FIRESTARTER" ],
- "weight": 708,
+ "weight": "708 g",
"volume": "500 ml",
"bashing": 4,
"to_hit": -1,
@@ -390,7 +464,7 @@
"price": 4000,
"material": [ "plastic", "aluminum" ],
"flags": [ "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS" ],
- "weight": 520,
+ "weight": "520 g",
"volume": "500 ml",
"bashing": 1,
"charges_per_use": 1,
@@ -447,7 +521,7 @@
"price": 6500,
"material": [ "plastic", "aluminum" ],
"flags": [ "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS" ],
- "weight": 620,
+ "weight": "620 g",
"volume": "500 ml",
"bashing": 1,
"charges_per_use": 1,
@@ -504,7 +578,7 @@
"flags": [ "VARSIZE", "STURDY", "WATERPROOF", "RAINPROOF", "WATCH", "ALARMCLOCK", "SWIM_GOGGLES", "SUN_GLASSES", "RAD_RESIST" ],
"price": 50000000,
"material": [ "ceramic", "kevlar" ],
- "weight": 6820,
+ "weight": "6820 g",
"volume": "9 L",
"to_hit": -3,
"max_charges": 5000,
@@ -540,7 +614,7 @@
"TRADER_AVOID",
"CLIMATE_CONTROL"
],
- "turns_per_charge": 3,
+ "turns_per_charge": 18,
"revert_to": "rm13_armor",
"use_action": "RM13ARMOR_ON",
"environmental_protection": 40,
@@ -559,7 +633,7 @@
"flags": [ "WATER_FRIENDLY" ],
"price": 25000,
"material": [ "plastic", "aluminum" ],
- "weight": 720,
+ "weight": "720 g",
"volume": "500 ml",
"to_hit": -3,
"max_charges": 60,
@@ -589,7 +663,7 @@
"name_plural": "rebreather masks (on)",
"description": "A mask worn over your mouth which, when loaded with the proper filters, recycles your exhaled breath for rebreathing while underwater. It is turned on, and continually consuming its filter. Use it to turn it off.",
"flags": [ "WATER_FRIENDLY", "REBREATHER", "TRADER_AVOID" ],
- "turns_per_charge": 10,
+ "turns_per_charge": 30,
"revert_to": "rebreather",
"use_action": { "type": "transform", "menu_text": "Turn off", "msg": "Your %s deactivates.", "target": "rebreather" },
"environmental_protection": 15,
@@ -606,7 +680,7 @@
"flags": [ "WATER_FRIENDLY", "OVERSIZE" ],
"price": 25000,
"material": [ "plastic", "aluminum" ],
- "weight": 960,
+ "weight": "960 g",
"volume": "1250 ml",
"to_hit": -3,
"max_charges": 60,
@@ -636,7 +710,7 @@
"name_plural": "XL rebreather masks (on)",
"description": "A mask worn over your mouth which, when loaded with the proper filters, recycles your exhaled breath for rebreathing while underwater. This model has been expanded substantially and can accommodate exotic anatomy. It is turned on, and continually consuming its filter. Use it to turn it off.",
"flags": [ "WATER_FRIENDLY", "REBREATHER", "OVERSIZE", "TRADER_AVOID" ],
- "turns_per_charge": 10,
+ "turns_per_charge": 30,
"revert_to": "rebreather_xl",
"use_action": { "type": "transform", "menu_text": "Turn off", "msg": "Your %s deactivates.", "target": "rebreather_xl" },
"covers": [ "MOUTH" ],
@@ -648,7 +722,7 @@
"type": "TOOL_ARMOR",
"name": "filter mask",
"description": "A mask that straps over your mouth and nose and filters air. Protects from smoke, dust, and other contaminants quite well. It must be prepared before use.",
- "weight": 260,
+ "weight": "260 g",
"volume": "500 ml",
"price": 3500,
"to_hit": 1,
@@ -673,7 +747,7 @@
"name": "gas mask",
"category": "clothing",
"description": "A full gas mask that covers the face and eyes. Provides excellent protection from smoke, teargas, and other contaminants. It must be prepared before use.",
- "weight": 897,
+ "weight": "897 g",
"volume": "1 L",
"price": 4900,
"to_hit": -3,
@@ -698,7 +772,7 @@
"name": "XL gas mask",
"category": "clothing",
"description": "A rather roomy mask with filters attached, designed to accommodate exotic anatomy. Provides excellent protection from smoke, teargas, and other contaminants. It must be prepared before use.",
- "weight": 1397,
+ "weight": "1397 g",
"volume": "1500 ml",
"price": 25000,
"to_hit": -3,
@@ -724,7 +798,7 @@
"category": "armor",
"name": "survivor firemask",
"description": "A custom-built, Nomex-insulated gas mask that covers the face and eyes. It provides excellent protection from heat, smoke, teargas, and shrapnel. It must be prepared before use.",
- "weight": 708,
+ "weight": "708 g",
"volume": "1250 ml",
"price": 24000,
"to_hit": -3,
@@ -751,7 +825,7 @@
"category": "armor",
"name": "XL survivor firemask",
"description": "A custom-built, Nomex-insulated gas mask that covers the face and eyes regardless of your state of mutation. It provides excellent protection from heat, smoke, teargas, and shrapnel. It must be prepared before use.",
- "weight": 1108,
+ "weight": "1108 g",
"volume": "1250 ml",
"price": 24000,
"to_hit": -3,
@@ -783,7 +857,7 @@
"flags": [ "VARSIZE", "WATERPROOF", "STURDY", "SUN_GLASSES" ],
"price": 100000,
"material": [ "plastic", "nomex" ],
- "weight": 1260,
+ "weight": "1260 g",
"volume": "1500 ml",
"to_hit": -3,
"max_charges": 100,
@@ -805,7 +879,7 @@
"category": "armor",
"name": "heavy survivor mask",
"description": "A custom-built, steel reinforced gas mask that covers the face and eyes. Provides excellent protection from smoke, teargas, and shrapnel. It must be prepared before use.",
- "weight": 858,
+ "weight": "858 g",
"volume": "1250 ml",
"price": 24000,
"to_hit": -3,
@@ -832,7 +906,7 @@
"category": "armor",
"name": "light survivor mask",
"description": "A custom-built, reinforced gas mask that covers the face and eyes. Provides excellent protection from smoke, teargas, and shrapnel. It must be prepared before use.",
- "weight": 466,
+ "weight": "466 g",
"volume": "1250 ml",
"price": 24000,
"to_hit": -3,
@@ -860,7 +934,7 @@
"category": "armor",
"name": "survivor mask",
"description": "A custom-built, leather reinforced gas mask that covers the face and eyes. Provides excellent protection from smoke, teargas, and shrapnel. It must be prepared before use.",
- "weight": 682,
+ "weight": "682 g",
"volume": "1250 ml",
"price": 24000,
"to_hit": -3,
@@ -887,7 +961,7 @@
"category": "armor",
"name": "XL survivor mask",
"description": "A custom-built, reinforced gas mask that covers the face and eyes regardless of your state of mutation. Provides excellent protection from smoke, teargas, and shrapnel. It must be prepared before use.",
- "weight": 982,
+ "weight": "982 g",
"volume": "1250 ml",
"price": 24000,
"to_hit": -3,
@@ -914,7 +988,7 @@
"category": "armor",
"name": "winter survivor mask",
"description": "A custom-built, fur-trimmed gas mask that covers the face and eyes. Quite warm, it still provides excellent protection from smoke, teargas, and shrapnel. It must be prepared before use.",
- "weight": 682,
+ "weight": "682 g",
"volume": "1250 ml",
"price": 24000,
"to_hit": -3,
@@ -941,7 +1015,7 @@
"category": "armor",
"name": "XL winter survivor mask",
"description": "A custom-built, fur-trimmed gas mask that covers the face and eyes regardless of your state of mutation. Quite warm, it still provides excellent protection from smoke, teargas, and shrapnel. It must be prepared before use.",
- "weight": 1062,
+ "weight": "1062 g",
"volume": "1250 ml",
"price": 24000,
"to_hit": -3,
@@ -974,7 +1048,7 @@
"flags": [ "FRAGILE" ],
"price": 92000,
"material": [ "plastic", "steel" ],
- "weight": 1020,
+ "weight": "1020 g",
"volume": "1 L",
"to_hit": -3,
"charges_per_use": 1,
@@ -1037,7 +1111,7 @@
"flags": [ "FRAGILE" ],
"price": 92000,
"material": [ "plastic", "steel" ],
- "weight": 1240,
+ "weight": "1240 g",
"volume": "1 L",
"to_hit": -3,
"charges_per_use": 1,
@@ -1099,7 +1173,7 @@
"price": 40000,
"material": [ "ceramic", "superalloy" ],
"flags": [ "OVERSIZE" ],
- "weight": 364,
+ "weight": "364 g",
"volume": "750 ml",
"max_charges": 2,
"charges_per_use": 1,
@@ -1119,7 +1193,7 @@
"price": 40000,
"material": [ "superalloy", "kevlar" ],
"flags": [ "OVERSIZE" ],
- "weight": 212,
+ "weight": "212 g",
"volume": "750 ml",
"max_charges": 5,
"initial_charges": 5,
@@ -1139,7 +1213,7 @@
"flags": [ "VARSIZE", "STURDY", "WATER_FRIENDLY", "SWIM_GOGGLES" ],
"price": 40000,
"material": [ "kevlar", "plastic" ],
- "weight": 982,
+ "weight": "982 g",
"volume": "1500 ml",
"to_hit": -3,
"max_charges": 120,
@@ -1168,7 +1242,7 @@
"name_plural": "survivor divemasks (on)",
"description": "A custom-built, armored rebreather mask that covers the face and eyes. It provides excellent protection from harm as well providing breathing gas while underwater. It is turned on, and continually consuming its filter. Use it to turn it off.",
"flags": [ "VARSIZE", "STURDY", "WATER_FRIENDLY", "REBREATHER", "SWIM_GOGGLES" ],
- "turns_per_charge": 10,
+ "turns_per_charge": 30,
"revert_to": "mask_h20survivor",
"use_action": { "type": "transform", "menu_text": "Turn off", "msg": "Your %s deactivates.", "target": "mask_h20survivor" },
"covers": [ "MOUTH", "EYES" ],
@@ -1185,7 +1259,7 @@
"flags": [ "VARSIZE", "STURDY", "WATER_FRIENDLY", "SWIM_GOGGLES", "OVERSIZE" ],
"price": 40000,
"material": [ "kevlar", "plastic" ],
- "weight": 1302,
+ "weight": "1302 g",
"volume": "2 L",
"to_hit": -3,
"max_charges": 120,
@@ -1214,7 +1288,7 @@
"name_plural": "XL survivor divemasks (on)",
"description": "A custom-built, armored rebreather mask that covers the face and eyes regardless of your state of mutation. It provides excellent protection from harm as well providing breathing gas while underwater. It is turned on, and continually consuming its filter. Use it to turn it off.",
"flags": [ "VARSIZE", "STURDY", "WATER_FRIENDLY", "REBREATHER", "SWIM_GOGGLES", "OVERSIZE", "TRADER_AVOID" ],
- "turns_per_charge": 10,
+ "turns_per_charge": 30,
"revert_to": "mask_h20survivorxl",
"use_action": { "type": "transform", "menu_text": "Turn off", "msg": "Your %s deactivates.", "target": "mask_h20survivorxl" },
"covers": [ "MOUTH", "EYES" ],
@@ -1229,7 +1303,7 @@
"description": "A folded lightweight plastic rain poncho with a hood. Use it to unfold for use.",
"price": 5000,
"material": "plastic",
- "weight": 280,
+ "weight": "280 g",
"volume": "250 ml",
"use_action": "UNPACK_ITEM"
},
@@ -1243,7 +1317,7 @@
"description": "A lightweight plastic rain poncho with a hood. Use it to fold for storage.",
"price": 5000,
"material": "plastic",
- "weight": 280,
+ "weight": "280 g",
"volume": "1500 ml",
"to_hit": -3,
"revert_to": "folding_poncho",
@@ -1263,7 +1337,7 @@
"description": "A folded blanket made of space-age materials that covers your most important body parts. Use it to unfold for use.",
"price": 425,
"material": "plastic",
- "weight": 622,
+ "weight": "622 g",
"volume": "500 ml",
"use_action": "UNPACK_ITEM"
},
@@ -1277,7 +1351,7 @@
"description": "A blanket made of space-age material that covers your most important body parts. Use it to fold for storage.",
"price": 425,
"material": "plastic",
- "weight": 622,
+ "weight": "622 g",
"volume": "2500 ml",
"to_hit": -3,
"revert_to": "emer_blanket",
@@ -1300,7 +1374,7 @@
"description": "A small battery-powered biometric safety device worn on the wrist. Activate to check your current level of radiation exposure.",
"price": 60000,
"material": [ "plastic", "aluminum" ],
- "weight": 68,
+ "weight": "68 g",
"volume": "250 ml",
"to_hit": -1,
"charges_per_use": 1,
@@ -1310,13 +1384,13 @@
"coverage": 5,
"material_thickness": 1,
"flags": [ "BELTED", "FRAGILE", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY", "OVERSIZE" ],
- "magazines": [ [ "battery", [ "light_minus_battery_cell", "light_minus_atomic_battery_cell", "light_minus_disposable_cell" ] ] ]
+ "magazines": [ [ "battery", [ "light_minus_battery_cell", "light_minus_atomic_battery_cell" ] ] ]
},
{
"type": "ARMOR",
"id": "survivor_belt",
"name": "survivor utility belt",
- "weight": 3390,
+ "weight": "3390 g",
"color": "brown",
"covers": [ "TORSO" ],
"storage": "500 ml",
@@ -1365,7 +1439,7 @@
"description": "A plain hairpin to keep your hair in place.",
"price": 50,
"material": [ "iron" ],
- "weight": 2,
+ "weight": "2 g",
"use_action": { "type": "picklock", "pick_quality": 3 }
},
{
@@ -1378,7 +1452,7 @@
"description": "A pink hairpin with cute flower textures.",
"price": 1000,
"material": [ "plastic" ],
- "weight": 4,
+ "weight": "4 g",
"use_action": { "type": "picklock", "pick_quality": 1 },
"flags": [ "FANCY" ]
},
@@ -1392,7 +1466,7 @@
"price": 4500,
"material": "cotton",
"covers": [ "TORSO", "LEGS" ],
- "weight": 370,
+ "weight": "370 g",
"volume": "500 ml",
"to_hit": -1,
"use_action": "TOWEL",
@@ -1410,7 +1484,7 @@
"price": 2000,
"material": "cotton",
"covers": [ "TORSO", "LEGS" ],
- "weight": 400,
+ "weight": "400 g",
"volume": "500 ml",
"to_hit": -1,
"revert_to": "towel",
@@ -1429,7 +1503,7 @@
"price": 2000,
"material": "cotton",
"covers": [ "TORSO", "LEGS" ],
- "weight": 400,
+ "weight": "400 g",
"volume": "500 ml",
"to_hit": -1,
"revert_to": "towel",
@@ -1443,7 +1517,7 @@
"id": "straw_fedora",
"category": "clothing",
"name": "straw fedora",
- "weight": 300,
+ "weight": "300 g",
"color": "light_gray",
"covers": [ "HEAD" ],
"use_action": { "menu_text": "Tip", "type": "transform", "target": "straw_fedora", "msg": "You tip your %s." },
@@ -1470,7 +1544,7 @@
"description": "A simple and light cloth scarf, worn over the mouth for warmth. Use it to loosen it if you get too warm.",
"price": 1000,
"material": [ "cotton" ],
- "weight": 60,
+ "weight": "60 g",
"volume": "500 ml",
"to_hit": -3,
"use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "patchwork_scarf_loose", "menu_text": "Loosen" },
@@ -1493,7 +1567,7 @@
"description": "A simple and light cloth scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.",
"price": 1000,
"material": [ "cotton" ],
- "weight": 60,
+ "weight": "60 g",
"volume": "500 ml",
"to_hit": -3,
"revert_to": "patchwork_scarf",
@@ -1517,7 +1591,7 @@
"description": "A very long light cloth scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to loosen it if you get too warm.",
"price": 1500,
"material": [ "cotton" ],
- "weight": 120,
+ "weight": "120 g",
"volume": "1 L",
"to_hit": -3,
"use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "long_patchwork_scarf_loose", "menu_text": "Loosen" },
@@ -1540,7 +1614,7 @@
"description": "A very long light cloth scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.",
"price": 1500,
"material": [ "cotton" ],
- "weight": 120,
+ "weight": "120 g",
"volume": "1 L",
"to_hit": -3,
"use_action": {
@@ -1569,7 +1643,7 @@
"description": "A long knitted cotton scarf, worn over the mouth for warmth. Use it to loosen it if you get too warm.",
"price": 2000,
"material": [ "cotton" ],
- "weight": 96,
+ "weight": "96 g",
"volume": "750 ml",
"to_hit": -3,
"use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "knit_scarf_loose", "menu_text": "Loosen" },
@@ -1592,7 +1666,7 @@
"description": "A long knitted cotton scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.",
"price": 2000,
"material": [ "cotton" ],
- "weight": 96,
+ "weight": "96 g",
"volume": "750 ml",
"to_hit": -3,
"revert_to": "knit_scarf",
@@ -1616,7 +1690,7 @@
"description": "A really long knitted cotton scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to loosen it if you get too warm.",
"price": 3000,
"material": [ "cotton" ],
- "weight": 192,
+ "weight": "192 g",
"volume": "1250 ml",
"to_hit": -3,
"use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "long_knit_scarf_loose", "menu_text": "Loosen" },
@@ -1639,7 +1713,7 @@
"description": "A really long knitted cotton scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.",
"price": 3000,
"material": [ "cotton" ],
- "weight": 192,
+ "weight": "192 g",
"volume": "1250 ml",
"to_hit": -3,
"use_action": { "type": "transform", "msg": "You wrap your scarf tighter.", "target": "long_knit_scarf", "menu_text": "Wrap tighter" },
@@ -1663,7 +1737,7 @@
"description": "A long wool scarf, worn over the mouth for warmth. Use it to loosen it if you get too warm.",
"price": 3800,
"material": [ "wool" ],
- "weight": 80,
+ "weight": "80 g",
"volume": "750 ml",
"to_hit": -3,
"use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "scarf_loose", "menu_text": "Loosen" },
@@ -1686,7 +1760,7 @@
"description": "A long wool scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.",
"price": 3800,
"material": [ "wool" ],
- "weight": 80,
+ "weight": "80 g",
"volume": "750 ml",
"to_hit": -3,
"revert_to": "scarf",
@@ -1710,7 +1784,7 @@
"description": "A really long wool scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to loosen it if you get too warm.",
"price": 4500,
"material": [ "wool" ],
- "weight": 160,
+ "weight": "160 g",
"volume": "1250 ml",
"to_hit": -3,
"use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "scarf_long_loose", "menu_text": "Loosen" },
@@ -1733,7 +1807,7 @@
"description": "A really long wool scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.",
"price": 4500,
"material": [ "wool" ],
- "weight": 160,
+ "weight": "160 g",
"volume": "1250 ml",
"to_hit": -3,
"use_action": { "type": "transform", "msg": "You wrap your scarf tighter.", "target": "scarf_long", "menu_text": "Wrap tighter" },
@@ -1757,7 +1831,7 @@
"description": "A long fur scarf, worn over the mouth for warmth. Use it to loosen it if you get too warm.",
"price": 9000,
"material": [ "fur" ],
- "weight": 140,
+ "weight": "140 g",
"volume": "1 L",
"to_hit": -3,
"use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "scarf_fur_loose", "menu_text": "Loosen" },
@@ -1780,7 +1854,7 @@
"description": "A long fur scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.",
"price": 9000,
"material": [ "fur" ],
- "weight": 140,
+ "weight": "140 g",
"volume": "1 L",
"to_hit": -3,
"revert_to": "scarf_fur",
@@ -1804,7 +1878,7 @@
"description": "A really long fur scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to loosen it if you get too warm.",
"price": 17700,
"material": [ "fur" ],
- "weight": 280,
+ "weight": "280 g",
"volume": "2 L",
"to_hit": -3,
"use_action": { "type": "transform", "msg": "You loosen your %s.", "target": "scarf_fur_long_loose", "menu_text": "Loosen" },
@@ -1827,7 +1901,7 @@
"description": "A really long fur scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.",
"price": 17700,
"material": [ "fur" ],
- "weight": 280,
+ "weight": "280 g",
"volume": "2 L",
"to_hit": -3,
"use_action": { "type": "transform", "msg": "You wrap your scarf tighter.", "target": "scarf_fur_long", "menu_text": "Wrap tighter" },
@@ -1851,7 +1925,7 @@
"flags": [ "VARSIZE", "SKINTIGHT" ],
"price": 30000,
"material": [ "cotton" ],
- "weight": 1452,
+ "weight": "1452 g",
"volume": "4500 ml",
"charges_per_use": 1,
"ammo": "battery",
@@ -1895,7 +1969,7 @@
"id": "mask_ski",
"name": "ski mask",
"category": "clothing",
- "weight": 86,
+ "weight": "86 g",
"color": "dark_gray",
"covers": [ "HEAD", "MOUTH" ],
"use_action": {
@@ -1921,7 +1995,7 @@
"name": "ski mask (open)",
"name_plural": "ski masks (open)",
"category": "clothing",
- "weight": 86,
+ "weight": "86 g",
"color": "dark_gray",
"covers": [ "HEAD", "MOUTH" ],
"use_action": {
@@ -1948,7 +2022,7 @@
"name": "whistle",
"volume": "250 ml",
"description": "A simple metal whistle, with a cord to wear it around your neck.",
- "weight": 25,
+ "weight": "25 g",
"to_hit": -1,
"color": "light_gray",
"price": 200,
@@ -1974,7 +2048,7 @@
"name": "harmonica with a holder",
"name_plural": "harmonicas with holders",
"category": "tools",
- "weight": 200,
+ "weight": "200 g",
"color": "brown",
"covers": [ "HEAD" ],
"max_charges": 1,
@@ -2003,7 +2077,7 @@
"name": "acoustic guitar",
"name_plural": "acoustic guitars",
"category": "tools",
- "weight": 2500,
+ "weight": "2500 g",
"color": "brown",
"covers": [ "TORSO" ],
"to_hit": 2,
@@ -2040,7 +2114,7 @@
"id": "guitar_electric",
"name": "electric guitar",
"category": "tools",
- "weight": 2250,
+ "weight": "2250 g",
"color": "red",
"covers": [ "TORSO" ],
"to_hit": 2,
@@ -2084,7 +2158,7 @@
"name": "bagpipes",
"name_plural": "bagpipes",
"category": "tools",
- "weight": 2300,
+ "weight": "2300 g",
"color": "green",
"covers": [ "TORSO" ],
"to_hit": -2,
@@ -2125,7 +2199,7 @@
"name": "tuba",
"name_plural": "tubas",
"category": "tools",
- "weight": 10000,
+ "weight": "10000 g",
"color": "yellow",
"covers": [ "TORSO" ],
"flags": [ "BELTED" ],
@@ -2159,7 +2233,7 @@
"name": "saxophone",
"name_plural": "saxophones",
"category": "tools",
- "weight": 2000,
+ "weight": "2000 g",
"color": "yellow",
"covers": [ "TORSO" ],
"flags": [ "BELTED" ],
@@ -2206,7 +2280,7 @@
"flags": [ "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS" ],
"price": 12500,
"material": [ "plastic" ],
- "weight": 179,
+ "weight": "179 g",
"volume": "1 L",
"charges_per_use": 1,
"ammo": "battery",
@@ -2251,7 +2325,7 @@
"flags": [ "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS", "PARTIAL_DEAF" ],
"price": 12500,
"material": [ "plastic" ],
- "weight": 179,
+ "weight": "179 g",
"volume": "1 L",
"//": "3M Peltors claim to go 100 hours on 2 AAs",
"power_draw": 60,
@@ -2274,7 +2348,7 @@
"description": "This is a medical listening tool. Use it to listen to things. Closely.",
"price": 4000,
"material": [ "plastic", "aluminum" ],
- "weight": 150,
+ "weight": "150 g",
"volume": "250 ml",
"covers": [ "TORSO" ],
"encumbrance": 1,
@@ -2287,7 +2361,7 @@
"name": "solar backpack (folded)",
"name_plural": "solar backpacks (folded)",
"description": "Personal portable charging system consisting of an array of solar panels neatly folded in a form of a large backpack. It can be worn as one, and has an integrated cable to plug it into a cable charger system.",
- "weight": 7500,
+ "weight": "7500 g",
"volume": "5 L",
"price": 500000,
"bashing": 10,
@@ -2308,7 +2382,7 @@
"name": "solar backpack (unfolded)",
"name_plural": "solar backpacks (unfolded)",
"description": "Unfolded array of portable solar panels ready to push some power into an active cable charger system.",
- "weight": 7500,
+ "weight": "7500 g",
"volume": "15 L",
"price": 500000,
"bashing": 4,
@@ -2329,7 +2403,7 @@
"name": "quantum solar backpack (folded)",
"name_plural": "quantum solar backpacks (folded)",
"description": "Personal portable charging system consisting of an array of quantum solar panels neatly folded in a form of a large backpack. It can be worn as one, and has an integrated cable to plug it into a cable charger system. Cutting edge technology.",
- "weight": 7500,
+ "weight": "7500 g",
"volume": "5 L",
"price": 1500000,
"bashing": 10,
@@ -2350,7 +2424,7 @@
"name": "quantum solar backpack (unfolded)",
"name_plural": "quantum solar backpacks (unfolded)",
"description": "Unfolded array of portable quantum solar panels ready to push some power into an active cable charger system.",
- "weight": 7500,
+ "weight": "7500 g",
"volume": "15 L",
"price": 1500000,
"bashing": 4,
@@ -2372,7 +2446,7 @@
"name": "riot helmet",
"description": "A helmet with a plastic shield that covers your entire face. Activate to raise the face shield.",
"use_action": { "type": "transform", "target": "helmet_riot_raised", "msg": "You raise your visor." },
- "weight": 2260,
+ "weight": "2260 g",
"volume": "2250 ml",
"price": 22000,
"to_hit": -1,
@@ -2397,7 +2471,7 @@
"name_plural": "riot helmets (raised visor)",
"description": "A riot helmet with a plastic face shield which is raised up. Activate to lower the shield.",
"use_action": { "type": "transform", "target": "helmet_riot", "msg": "You put down your visor." },
- "weight": 2260,
+ "weight": "2260 g",
"volume": "2250 ml",
"price": 22000,
"to_hit": -1,
@@ -2421,7 +2495,7 @@
"name": "scuba tank",
"looks_like": "oxygen_tank",
"description": "This is a high-pressure 232 bar diving tank that can contain up to 12L of compressed mixture of oxygen and nitrogen. It is equipped with a on-demand regulator and a mouthpiece designed mostly for underwater use.",
- "weight": 16000,
+ "weight": "16000 g",
"volume": "12 L",
"price": 6000,
"to_hit": -4,
@@ -2448,7 +2522,7 @@
"name": "scuba tank (on)",
"description": "This is a high-pressure 232 bar diving tank that can contain up to 12L of compressed mixture of oxygen and nitrogen. It is equipped with a on-demand regulator and a mouthpiece designed mostly for underwater use.",
"looks_like": "oxygen_tank",
- "weight": 16000,
+ "weight": "16000 g",
"volume": "12 L",
"price": 6000,
"to_hit": -4,
@@ -2458,7 +2532,7 @@
"color": "light_gray",
"max_charges": 60,
"charges_per_use": 1,
- "turns_per_charge": 10,
+ "turns_per_charge": 60,
"ammo": "nitrox",
"covers": [ "TORSO", "MOUTH" ],
"flags": [ "WATER_FRIENDLY", "BELTED", "ONLY_ONE", "STURDY" ],
@@ -2476,7 +2550,7 @@
"name": "small scuba tank",
"description": "This is a small high-pressure 200 bar backup diving tank, that can contain 4L of compressed mixture of oxygen and nitrogen. It is equipped with a on-demand regulator and a mouthpiece designed mostly for underwater use.",
"looks_like": "smoxygen_tank",
- "weight": 7000,
+ "weight": "7000 g",
"volume": "4 L",
"price": 4000,
"to_hit": -3,
@@ -2503,7 +2577,7 @@
"name": "small scuba tank (on)",
"description": "This is a small high-pressure 200 bar backup diving tank, that can contain 4L of compressed mixture of oxygen and nitrogen. It is equipped with a on-demand regulator and a mouthpiece designed mostly for underwater use.",
"looks_like": "smoxygen_tank",
- "weight": 7000,
+ "weight": "7000 g",
"volume": "4 L",
"price": 4000,
"to_hit": -3,
@@ -2513,7 +2587,7 @@
"color": "light_gray",
"max_charges": 20,
"charges_per_use": 1,
- "turns_per_charge": 10,
+ "turns_per_charge": 60,
"ammo": "nitrox",
"covers": [ "TORSO", "MOUTH" ],
"flags": [ "WATER_FRIENDLY", "BELTED", "ONLY_ONE", "STURDY" ],
@@ -2529,7 +2603,7 @@
"type": "TOOL_ARMOR",
"name": "electric blanket",
"description": "A heated blanket made of polyester. The most comfortable thing on Earth. Its cost is usually negligible, but with the power out, it chews through batteries insanely quickly.",
- "weight": 1123,
+ "weight": "1123 g",
"volume": "2500 ml",
"price": 5500,
"to_hit": -1,
@@ -2578,7 +2652,7 @@
"type": "TOOL_ARMOR",
"name": "Foodperson mask",
"description": "Foodperson, the mascot your stomach deserves!",
- "weight": 1500,
+ "weight": "1500 g",
"volume": "16L",
"price": 1500,
"to_hit": -3,
diff --git a/data/json/items/toolmod.json b/data/json/items/toolmod.json
index 0201913c5d9c3..4d6ddd988ef96 100644
--- a/data/json/items/toolmod.json
+++ b/data/json/items/toolmod.json
@@ -3,7 +3,7 @@
"abstract": "mod_battery",
"type": "TOOLMOD",
"name": "base toolmod",
- "weight": 142,
+ "weight": "142 g",
"volume": "250 ml",
"material": [ "plastic", "ceramic" ],
"symbol": ";",
@@ -25,7 +25,7 @@
"category": "spare_parts",
"name": "reactor core expansion device",
"description": "This is an expansion device for use on plutonium-powered equipment. With enough electronics skill, you could attach this to an atomic tool to double the amount of plutonium it can hold. Note that this device is incompatible with the atomic battery mod.",
- "weight": 694,
+ "weight": "694 g",
"volume": "750 ml",
"price": 10000,
"material": [ "superalloy", "plastic" ],
diff --git a/data/json/items/tools.json b/data/json/items/tools.json
index 5c4c128424388..78a755a9972cb 100644
--- a/data/json/items/tools.json
+++ b/data/json/items/tools.json
@@ -5,7 +5,7 @@
"category": "weapons",
"name": "EMP grenade",
"description": "This is a grenade that generates a electromagnetic pulse with a low-inductance capacitor bank discharged into a single-loop antenna. Use this item to pull the pin and light the fuse, turning it into an active EMP grenade. You will then have three turns before it detonates, creating an EMP field that damages robots and drains bionic energy.",
- "weight": 400,
+ "weight": "400 g",
"volume": "250 ml",
"price": 6000,
"to_hit": -1,
@@ -28,7 +28,7 @@
"type": "TOOL",
"name": "riding saddle",
"description": "A saddle that can be placed on a tamed animal that is capable of being ridden.",
- "weight": 800,
+ "weight": "800 g",
"volume": "2 L",
"price": 0,
"to_hit": -1,
@@ -43,7 +43,7 @@
"category": "weapons",
"name": "active EMP grenade",
"description": "This EMP grenade is active, and will shortly detonate, creating a large EMP field that damages robots and drains bionic energy. You may not want to be holding it much longer.",
- "weight": 400,
+ "weight": "400 g",
"volume": "250 ml",
"price": 0,
"to_hit": -1,
@@ -72,7 +72,7 @@
"name": "packed M72 LAW",
"name_plural": "packed M72 LAWs",
"description": "This is a M72 LAW, packed in its storage form. Use it to pop it out and make it ready to fire. Once it is activated, it cannot be repacked.",
- "weight": 2500,
+ "weight": "2500 g",
"volume": "1500 ml",
"price": 200000,
"bashing": 6,
@@ -97,7 +97,7 @@
"description": "This pump is suitable for pumping air into inflatable objects.",
"price": 400,
"material": [ "aluminum", "plastic" ],
- "weight": 113,
+ "weight": "113 g",
"volume": "500 ml",
"bashing": 4,
"to_hit": -1,
@@ -108,8 +108,8 @@
"type": "TOOL",
"name": "UPS",
"name_plural": "UPS's",
- "description": "This is a unified power supply, or UPS. It is a device developed jointly by military and scientific interests for use in combat and the field. The UPS is designed to power armor and some guns, but drains batteries quickly.",
- "weight": 680,
+ "description": "This is a unified power supply, or UPS. It is a device developed jointly by military and scientific interests for use in combat and the field. The UPS is designed to power bionics, armor and some guns, but drains batteries quickly.",
+ "weight": "680 g",
"volume": "2500 ml",
"price": 280000,
"to_hit": -1,
@@ -121,7 +121,8 @@
"magazines": [
[ "battery", [ "heavy_plus_battery_cell", "heavy_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ]
],
- "magazine_well": 4
+ "magazine_well": 4,
+ "flags": [ "IS_UPS" ]
},
{
"id": "acidbomb",
@@ -129,7 +130,7 @@
"category": "weapons",
"name": "acid bomb",
"description": "This is a fragile container filled with acid. Throw it to spill out a pool of potent acid.",
- "weight": 650,
+ "weight": "650 g",
"volume": "500 ml",
"price": 5000,
"to_hit": -1,
@@ -146,7 +147,7 @@
"name": "advanced UPS",
"name_plural": "advanced UPS's",
"description": "This is an advanced version of the unified power supply, or UPS. This device has been significantly redesigned to provide better efficiency as well as to consume plutonium fuel cells rather than batteries. Sadly, its plutonium reactor can't be charged in UPS charging station.",
- "weight": 453,
+ "weight": "453 g",
"volume": "2 L",
"price": 560000,
"to_hit": -1,
@@ -155,7 +156,8 @@
"symbol": ";",
"color": "light_green",
"ammo": "plutonium",
- "max_charges": 2500
+ "max_charges": 2500,
+ "flags": [ "IS_UPS" ]
},
{
"id": "advanced_ecig",
@@ -163,7 +165,7 @@
"name": "advanced electronic cigarette",
"description": "An advanced version of the electronic cigarette. A less harmful way to get your nicotine fix than regular cigarettes, but still addictive. It needs batteries and nicotine liquid to function.",
"category": "drugs",
- "weight": 200,
+ "weight": "200 g",
"volume": "250 ml",
"price": 5000,
"to_hit": -1,
@@ -195,7 +197,7 @@
"type": "TOOL",
"name": "compressed air horn",
"description": "This is a small can of compressed air attached to a plastic horn. Pressing the button on top causes it to emit a loud honking sound.",
- "weight": 467,
+ "weight": "467 g",
"volume": "250 ml",
"price": 500,
"to_hit": -4,
@@ -223,7 +225,7 @@
"type": "TOOL",
"name": "alarm clock",
"description": "A wind-up alarm clock. Though the noise it makes is unpleasant to wake up to, it's always good to get an early start to your day. Can also be disassembled into some useful parts.",
- "weight": 562,
+ "weight": "562 g",
"volume": "250 ml",
"price": 5000,
"price_postapoc": 100,
@@ -239,7 +241,7 @@
"type": "TOOL",
"name": "anvil",
"description": "This is an enormously heavy block of oddly shaped steel with a chisel-like projection set into the corner. It's used in most metalworking fabrication recipes.",
- "weight": 54000,
+ "weight": "54000 g",
"volume": "4 L",
"price": 100000,
"to_hit": -5,
@@ -255,7 +257,7 @@
"type": "TOOL",
"name": "water mill",
"description": "A small water-powered mill that can convert starchy products into flour. Can be placed via the construction menu.",
- "weight": 120000,
+ "weight": "120000 g",
"volume": "22500 ml",
"price": 100000,
"to_hit": -5,
@@ -270,7 +272,7 @@
"type": "TOOL",
"name": "wind mill",
"description": "A small wind-powered mill that can convert starchy products into flour. Can be placed via the construction menu.",
- "weight": 120000,
+ "weight": "120000 g",
"volume": "22500 ml",
"price": 100000,
"to_hit": -5,
@@ -286,7 +288,7 @@
"category": "tools",
"name": "atomic coffee maker",
"description": "This is a Curie-G coffeemaker, by CuppaTech. It famously uses a radioactive generator to heat water for coffee. Normally the water is heated using energy stored in a capacitor, and makes ordinary coffee. However, as a special feature, water from the RTG containment area can be used, giving the coffee a very special kick. The Curie-G is illegal in most countries.",
- "weight": 6102,
+ "weight": "6102 g",
"volume": "1000 ml",
"price": 100000,
"to_hit": -2,
@@ -304,7 +306,7 @@
"category": "tools",
"name": "atomic lamp",
"description": "Powered by the magic of nuclear decay and low-energy LEDs, this very expensive lamp will emit a small amount of light for at least a decade. Before the Cataclysm, it was mostly an expensive way to show off your preparedness. Now, it's actually pretty cool. Use it to close the cover and hide the light.",
- "weight": 1438,
+ "weight": "1438 g",
"volume": "1 L",
"price": 175000,
"to_hit": -2,
@@ -322,7 +324,7 @@
"name": "atomic lamp (covered)",
"name_plural": "atomic lamps (covered)",
"description": "Powered by the magic of nuclear decay and low-energy LEDs, this very expensive lamp will emit a small amount of light for at least a decade. Before the Cataclysm, it was mostly an expensive way to show off your preparedness. Now, it's actually pretty cool. The cover is closed. Use it to open the cover and show the light.",
- "weight": 1438,
+ "weight": "1438 g",
"volume": "1 L",
"price": 175000,
"to_hit": -2,
@@ -339,7 +341,7 @@
"category": "tools",
"name": "atomic reading light",
"description": "Powered by the magic of nuclear decay and low-energy LEDs, this extremely expensive little light will provide just enough light to read by for at least a decade. It is also available with a cute cartoon bear cover to turn it into a nightlight for a very wealthy child with a fear of the dark. Use it to close the cover and hide the light.",
- "weight": 214,
+ "weight": "214 g",
"volume": "250 ml",
"price": 125000,
"to_hit": -2,
@@ -362,7 +364,7 @@
"name": "atomic reading light (covered)",
"name_plural": "atomic reading lights (covered)",
"description": "Powered by the magic of nuclear decay and low-energy LEDs, this extremely expensive little light will provide just enough light to read by for at least a decade. It is also available with a cute cartoon bear cover to turn it into a nightlight for a very wealthy child with a fear of the dark. The cover is closed. Use it to open the cover and show the light.",
- "weight": 214,
+ "weight": "214 g",
"volume": "250 ml",
"price": 125000,
"to_hit": -2,
@@ -384,7 +386,7 @@
"price": 12500,
"use_action": "MIND_SPLICER",
"volume": "1 L",
- "weight": 600,
+ "weight": "600 g",
"flags": [ "TRADER_AVOID" ]
},
{
@@ -394,7 +396,7 @@
"name": "banjo",
"name_plural": "banjos",
"description": "A standard factory-made banjo. Looks to be in working condition.",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "3 L",
"price": 7500,
"to_hit": 2,
@@ -425,7 +427,7 @@
"name": "barometer",
"name_plural": "barometers",
"description": "A plastic barometer that can read the atmospheric pressure.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 100,
"to_hit": -3,
@@ -440,7 +442,7 @@
"type": "TOOL",
"name": "bear trap",
"description": "This is a spring-loaded pair of steel jaws connected to a sensitive pressure plate. Use it to set it on the ground, creating a trap that will ensnare and damage anything that steps on it. If you are carrying a shovel, you will have the option of burying it.",
- "weight": 11793,
+ "weight": "11793 g",
"volume": "1500 ml",
"price": 6000,
"to_hit": -2,
@@ -465,7 +467,7 @@
"type": "TOOL",
"name": "blade trap",
"description": "This is a machete attached laterally to a motor, with a tripwire controlling its throttle. When the tripwire is pulled, the blade is swung around with great force. The trap forms a 3x3 area of effect.",
- "weight": 2381,
+ "weight": "2381 g",
"volume": "4500 ml",
"price": 5000,
"to_hit": -4,
@@ -488,7 +490,7 @@
"type": "TOOL",
"name": "nailboard trap",
"description": "These are several pieces of wood nailed together, with some nails sticking straight up. If an unsuspecting victim steps on it, they'll get nails through the foot.",
- "weight": 2041,
+ "weight": "2041 g",
"volume": "1500 ml",
"price": 0,
"to_hit": -3,
@@ -512,7 +514,7 @@
"name": "pair of bolt cutters",
"name_plural": "pairs of bolt cutters",
"description": "This is a large pair of bolt cutters. You could use them to cut padlocks or heavy gauge wire.",
- "weight": 1224,
+ "weight": "1224 g",
"volume": "750 ml",
"price": 3000,
"to_hit": -1,
@@ -531,7 +533,7 @@
"name": "bone flute",
"name_plural": "bone flutes",
"description": "A polished bone flute with five finger holes.",
- "weight": 250,
+ "weight": "250 g",
"volume": "500 ml",
"price": 5000,
"bashing": 2,
@@ -560,7 +562,7 @@
"type": "TOOL",
"name": "booby trap",
"description": "This is a crude explosive device triggered by a piece of string. Use it to setup and watch some poor bastard trigger it.",
- "weight": 586,
+ "weight": "586 g",
"volume": "750 ml",
"price": 5000,
"to_hit": -4,
@@ -580,7 +582,7 @@
"type": "TOOL",
"name": "brick kiln",
"description": "This is a portable charcoal-fired kiln. It is designed for firing bricks, but you could use it to fire anything made of clay.",
- "weight": 9600,
+ "weight": "9600 g",
"volume": "9 L",
"price": 25000,
"to_hit": -3,
@@ -597,7 +599,7 @@
"type": "TOOL",
"name": "electric kiln",
"description": "This is a portable electric kiln, powered by batteries. It is designed for firing bricks, but you could use it to fire anything made of clay. With a little mechanical know-how, you could probably even convert it to run directly off a vehicle's power system.",
- "weight": 12000,
+ "weight": "12000 g",
"volume": "7500 ml",
"price": 50000,
"to_hit": -3,
@@ -617,7 +619,7 @@
"type": "TOOL",
"name": "bubble wrap",
"description": "This is a sheet of plastic covered with air-filled bubbles. Use it to set it on the ground, creating a trap that will warn you with noise when something steps on it.",
- "weight": 6,
+ "weight": "6 g",
"volume": "250 ml",
"price": 50,
"material": "plastic",
@@ -638,7 +640,7 @@
"category": "weapons",
"name": "C-4 explosive",
"description": "This is military grade RDX composition explosive. A label reads: \"Highly explosive, use with extreme caution!\" It comes with a small timer.",
- "weight": 1570,
+ "weight": "1570 g",
"volume": "1 L",
"price": 9000,
"to_hit": -4,
@@ -654,7 +656,7 @@
"name": "C-4 explosive (armed)",
"name_plural": "C-4 explosives (armed)",
"description": "This is military grade RDX composition explosive. A label reads: \"Highly explosive, use with extreme caution!\" It comes with a small timer, which is currently ticking down.",
- "weight": 1570,
+ "weight": "1570 g",
"volume": "1 L",
"price": 0,
"to_hit": -4,
@@ -679,7 +681,7 @@
"name": "loose caltrops",
"name_plural": "loose caltrops",
"description": "These are small metal objects covered with many sharp points. If an unsuspecting victim steps on one, they'll get a spine through the foot.",
- "weight": 264,
+ "weight": "264 g",
"volume": "250 ml",
"price": 900,
"to_hit": -4,
@@ -702,7 +704,7 @@
"name": "loose glass caltrops",
"name_plural": "loose glass caltrops",
"description": "These are glass shards glued together to expose their sharp edges. If an unsuspecting victim steps on one, they'll get cut.",
- "weight": 264,
+ "weight": "264 g",
"volume": "500 ml",
"price": 100,
"to_hit": -4,
@@ -723,7 +725,7 @@
"type": "TOOL",
"name": "camera",
"description": "A point-and-shoot digital camera, with digital viewfinder, a backup 'iron-sight', and flash. You can look at your photos on the digital screen, or transfer them with a memory card. Takes conventional batteries.",
- "weight": 907,
+ "weight": "907 g",
"volume": "250 ml",
"price": 20000,
"bashing": 1,
@@ -755,7 +757,7 @@
"type": "TOOL",
"name": "camera pro",
"description": "A 35mm digital SLR (single-lens reflex) camera, with optical and digital viewfinders, zoom lens with auto-focus and stabilizer, and flash. You can view your photos on it or transfer them with a memory card; it runs on conventional batteries. Before the cataclysm, you could have taken professional-grade photos using this.",
- "weight": 2268,
+ "weight": "2268 g",
"volume": "1250 ml",
"price": 800000,
"bashing": 1,
@@ -789,7 +791,7 @@
"category": "tools",
"name": "can sealer",
"description": "A hand crank powered cast steel machine designed to automatically seal tin cans.",
- "weight": 9800,
+ "weight": "9800 g",
"volume": "5 L",
"price": 52500,
"to_hit": -2,
@@ -803,7 +805,7 @@
"type": "TOOL",
"name": "candle",
"description": "This is a thick candle. It doesn't provide very much light, but it can burn for quite a long time. You'll need a lighter or matches to light it.",
- "weight": 100,
+ "weight": "100 g",
"volume": "250 ml",
"price": 100,
"to_hit": -2,
@@ -829,7 +831,7 @@
"name": "candle",
"name_plural": "candles",
"description": "This is a thick candle. It doesn't provide very much light, but it can burn for quite a long time. This candle is lit.",
- "weight": 100,
+ "weight": "100 g",
"volume": "250 ml",
"price": 0,
"to_hit": -2,
@@ -839,7 +841,7 @@
"initial_charges": 100,
"max_charges": 100,
"charges_per_use": 1,
- "turns_per_charge": 50,
+ "turns_per_charge": 1350,
"use_action": { "target": "candle", "msg": "The candle winks out.", "menu_text": "Extinguish", "type": "transform" },
"flags": [ "LIGHT_8", "WATER_EXTINGUISH", "TRADER_AVOID", "WIND_EXTINGUISH" ]
},
@@ -848,7 +850,7 @@
"type": "TOOL",
"name": "goo canister",
"description": "There is a label on this canister: \"Warning: contains highly toxic and corrosive materials. Contents may be sentient. Open at your own risk.\" You think you can feel something moving inside it.",
- "weight": 1596,
+ "weight": "1596 g",
"volume": "500 ml",
"price": 35000,
"to_hit": 1,
@@ -882,7 +884,7 @@
"name": "carding paddles",
"name_plural": "pairs of carding paddles",
"description": "A pair of toothy wooden paddles used to clean fibers for use in textile production.",
- "weight": 360,
+ "weight": "360 g",
"volume": "500 ml",
"price": 3000,
"to_hit": 1,
@@ -897,7 +899,7 @@
"name": "electric carver (off)",
"name_plural": "electric carvers (off)",
"description": "An electric meat carver powered by batteries. Two serrated blades that vibrate together to slice just about anything from turkey to ham... even zombies!",
- "weight": 1106,
+ "weight": "1106 g",
"volume": "1500 ml",
"price": 2000,
"bashing": 2,
@@ -937,7 +939,7 @@
"name": "cat food",
"name_plural": "cat food",
"description": "This is food for cats. It smells strange, but cats seem to love it.",
- "weight": 223,
+ "weight": "223 g",
"volume": "250 ml",
"price": 300,
"to_hit": -5,
@@ -952,7 +954,7 @@
"name": "cellphone",
"name_plural": "cellphones",
"description": "This is a cellphone, an older cousin of a smartphone but still popular in certain circles due to its reliability, sturdiness and the ability to run on common batteries. Using this cellphone will turn it on and provide light, assuming it is sufficiently charged. It also has a clock app that includes an alarm.",
- "weight": 226,
+ "weight": "226 g",
"volume": "100 ml",
"price": 9000,
"price_postapoc": 2000,
@@ -978,9 +980,7 @@
"light_minus_battery_cell",
"light_battery_cell",
"light_atomic_battery_cell",
- "light_minus_atomic_battery_cell",
- "light_minus_disposable_cell",
- "light_disposable_cell"
+ "light_minus_atomic_battery_cell"
]
]
],
@@ -992,7 +992,7 @@
"type": "TOOL",
"name": "cellphone - Flashlight",
"name_plural": "cellphones - Flashlight",
- "turns_per_charge": 30,
+ "power_draw": 500,
"revert_to": "cell_phone",
"use_action": { "target": "cell_phone", "msg": "You stop lighting up the screen.", "menu_text": "Turn off", "type": "transform" },
"flags": [ "LIGHT_15", "CHARGEDIM", "TRADER_AVOID" ]
@@ -1003,7 +1003,7 @@
"name": "smartphone",
"name_plural": "smartphones",
"description": "A popular, fancy smartphone. Capable of making photos due to integrated camera and illuminating an area as per flashlight app, assuming it has enough charge. The smartphone also has a clock app that includes an alarm. Runs on a small, rechargeable power cell compatible with Unified Power Supply.",
- "weight": 230,
+ "weight": "230 g",
"volume": "100 ml",
"price": 20000,
"price_postapoc": 1900,
@@ -1036,7 +1036,7 @@
"name": "smartphone - music",
"name_plural": "smartphones - music",
"description": "This phone is playing music, steadily raising your morale. You can't hear anything else while you're listening.",
- "turns_per_charge": 150,
+ "power_draw": 300,
"revert_to": "smart_phone",
"use_action": "MP3_ON",
"flags": [ "TRADER_AVOID" ],
@@ -1048,8 +1048,7 @@
"type": "TOOL",
"name": "smartphone - Flashlight",
"name_plural": "smartphones - Flashlight",
- "power_draw": 3000,
- "turns_per_charge": 50,
+ "power_draw": 500,
"revert_to": "smart_phone",
"use_action": {
"target": "smart_phone",
@@ -1065,7 +1064,7 @@
"name": "chainsaw (off)",
"name_plural": "chainsaws (off)",
"description": "This is a lumbering tool moonlighting as weapon of opportunity. If loaded with gas, using this item will cause it to turn on, turning it into a very powerful but unwieldy melee weapon.",
- "weight": 6577,
+ "weight": "6577 g",
"volume": "2500 ml",
"price": 8000,
"to_hit": -4,
@@ -1074,7 +1073,7 @@
"symbol": "/",
"color": "red",
"ammo": "gasoline",
- "max_charges": 400,
+ "max_charges": 450,
"techniques": "SWEEP",
"use_action": "CHAINSAW_OFF",
"flags": [ "NONCONDUCTIVE" ]
@@ -1089,7 +1088,7 @@
"to_hit": -5,
"bashing": 4,
"cutting": 70,
- "power_draw": 150000,
+ "turns_per_charge": 4,
"revert_to": "chainsaw_off",
"techniques": "SWEEP",
"qualities": [ [ "AXE", 4 ], [ "BUTCHER", -100 ] ],
@@ -1101,7 +1100,7 @@
"type": "TOOL",
"name": "charcoal forge",
"description": "This is a portable, charcoal fired, metalworking forge. If combined with the right tools, you could use this for metalworking.",
- "weight": 8600,
+ "weight": "8600 g",
"volume": "8 L",
"price": 20000,
"to_hit": -2,
@@ -1120,7 +1119,7 @@
"category": "tools",
"name": "charcoal kiln",
"description": "A stout metal box used for producing charcoal via pyrolysis; the incomplete burning of organic materials in the absence of oxygen.",
- "weight": 6400,
+ "weight": "6400 g",
"volume": "7500 ml",
"price": 16000,
"to_hit": -2,
@@ -1135,7 +1134,7 @@
"type": "TOOL",
"name": "charcoal water purifier",
"description": "Using this item on a container full of water will purify the water using layered charcoal. Once the charcoal has purified enough water, it will become unusable and can be disassembled and recycled. Water taken from uncertain sources like a river may be dirty.",
- "weight": 1820,
+ "weight": "1820 g",
"volume": "3750 ml",
"price": 4000,
"to_hit": -3,
@@ -1154,7 +1153,7 @@
"type": "TOOL",
"name": "charcoal smoker",
"description": "This is a portable charcoal smoker. Good for weekend barbecuing and preserving meat with smoke.",
- "weight": 2600,
+ "weight": "2600 g",
"volume": "5 L",
"price": 10000,
"to_hit": -2,
@@ -1171,7 +1170,7 @@
"type": "TOOL",
"name": "charcoal cooker",
"description": "This is a little metal tank for holding charcoal with a pilot light attached. You could use it for cooking food.",
- "weight": 405,
+ "weight": "405 g",
"volume": "1250 ml",
"price": 5000,
"to_hit": -1,
@@ -1191,7 +1190,7 @@
"type": "TOOL",
"name": "paint chipper",
"description": "A tool similar to a chisel, designed to remove paint.",
- "weight": 60,
+ "weight": "60 g",
"volume": "500 ml",
"price": 7000,
"to_hit": 1,
@@ -1206,7 +1205,7 @@
"type": "TOOL",
"name": "metalworking chisel",
"description": "This is a short, stout metalworking chisel. It's used in some metalworking fabrication recipes.",
- "weight": 660,
+ "weight": "660 g",
"volume": "250 ml",
"price": 1600,
"to_hit": 2,
@@ -1224,7 +1223,7 @@
"name": "circular saw (off)",
"name_plural": "circular saws (off)",
"description": "A lightweight handheld cordless circular saw. Spins a circular blade fast enough to cut wood, zombies, or in an emergency, pizza. The blade, while effective in combat, is hard to hit with due to its small size.",
- "weight": 2940,
+ "weight": "2940 g",
"volume": "750 ml",
"price": 5000,
"to_hit": -3,
@@ -1268,7 +1267,7 @@
"name": "clarinet",
"name_plural": "clarinets",
"description": "An ornate clarinet made from wood.",
- "weight": 550,
+ "weight": "550 g",
"volume": "1500 ml",
"price": 5500,
"to_hit": 1,
@@ -1298,7 +1297,7 @@
"category": "tools",
"name": "clay pot",
"description": "A crude clay pot with lid used for cooking.",
- "weight": 480,
+ "weight": "480 g",
"volume": "2 L",
"price": 2500,
"bashing": 1,
@@ -1316,7 +1315,7 @@
"category": "tools",
"name": "clay quern",
"description": "This is a simple hand-powered clay quern for grinding grain.",
- "weight": 2264,
+ "weight": "2264 g",
"volume": "1500 ml",
"price": 3000,
"material": "clay",
@@ -1329,7 +1328,7 @@
"category": "tools",
"name": "clay teapot",
"description": "A clay teapot. Now all you need is tea and water.",
- "weight": 429,
+ "weight": "429 g",
"volume": "750 ml",
"price": 2000,
"to_hit": 1,
@@ -1345,7 +1344,7 @@
"type": "TOOL",
"name": "coffeemaker",
"description": "This is a heating element with pot and frame for holding coffee or other powders. It's got a battery compartment for use when the power goes out. You can use it to make coffee, or other drinks if you so choose.",
- "weight": 3100,
+ "weight": "3100 g",
"volume": "750 ml",
"price": 2000,
"to_hit": -5,
@@ -1370,7 +1369,7 @@
"type": "TOOL",
"name": "concrete mixer",
"description": "A portable concrete mixer. It is still large and heavy, but it can be operated solo, and runs on batteries. It also has a heater built in.",
- "weight": 9071,
+ "weight": "9071 g",
"volume": "5 L",
"price": 50000,
"to_hit": -6,
@@ -1395,7 +1394,7 @@
"type": "TOOL",
"name": "control laptop",
"description": "A modified laptop, now capable of transmitting in the ultra high frequencies utilized by robots. Activate it to command robots from afar.",
- "weight": 2721,
+ "weight": "2721 g",
"volume": "1 L",
"price": 10000,
"material": [ "plastic", "aluminum" ],
@@ -1404,12 +1403,7 @@
"ammo": "battery",
"charges_per_use": 2,
"use_action": "ROBOTCONTROL",
- "magazines": [
- [
- "battery",
- [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ]
- ]
- ],
+ "magazines": [ [ "battery", [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell" ] ] ],
"magazine_well": 2
},
{
@@ -1417,7 +1411,7 @@
"type": "TOOL",
"name": "copper axe",
"description": "This is a decent-sized chunk of worked copper affixed to a wooden shaft, to make a crude yet effective axe.",
- "weight": 3700,
+ "weight": "3700 g",
"volume": "3500 ml",
"price": 5500,
"bashing": 18,
@@ -1435,7 +1429,7 @@
"name": "copper knife",
"name_plural": "copper knives",
"description": "A knife consisting of crudely-worked copper, and a simple handle. Primitive, but a step above stone-age.",
- "weight": 650,
+ "weight": "650 g",
"volume": "250 ml",
"price": 3000,
"bashing": 2,
@@ -1451,7 +1445,7 @@
"type": "TOOL",
"name": "cordless drill",
"description": "This is a cordless battery-powered drill with a selection of drill bits.",
- "weight": 2721,
+ "weight": "2721 g",
"volume": "750 ml",
"price": 2000,
"to_hit": -1,
@@ -1475,7 +1469,7 @@
"type": "TOOL",
"name": "cot",
"description": "This is a military style fold up cot. While it may not be quite as comfortable as a bed, it's better than slumming it on the ground.",
- "weight": 6164,
+ "weight": "6164 g",
"volume": "2 L",
"price": 7500,
"to_hit": -1,
@@ -1497,7 +1491,7 @@
"type": "TOOL",
"name": "cow bell",
"description": "A brass cow bell. Potentially useful in so many ways.",
- "weight": 566,
+ "weight": "566 g",
"volume": "1 L",
"price": 700,
"to_hit": 1,
@@ -1512,7 +1506,7 @@
"type": "TOOL",
"name": "crack pipe",
"description": "This is a fine glass tube with a bulb with a bowl on one end. It's used to partake of certain illicit substances.",
- "weight": 242,
+ "weight": "242 g",
"volume": "250 ml",
"price": 0,
"to_hit": -10,
@@ -1534,7 +1528,7 @@
"price_postapoc": 5000,
"material": [ "steel" ],
"techniques": [ "WBLOCK_1" ],
- "weight": 907,
+ "weight": "907 g",
"volume": "1 L",
"bashing": 13,
"cutting": 7,
@@ -1547,7 +1541,7 @@
"type": "TOOL",
"name": "crossbow trap",
"description": "This is a simple tripwire, which is attached to the trigger of a loaded crossbow. When pulled, the crossbow fires. Only a single round can be used, after which the trap is disabled.",
- "weight": 1772,
+ "weight": "1772 g",
"volume": "1750 ml",
"price": 6000,
"to_hit": -2,
@@ -1568,7 +1562,7 @@
"type": "TOOL",
"name": "crowbar",
"description": "This is a hefty prying tool. Use it to open locked doors without destroying them or to lift manhole covers. You could also wield it to bash some heads in.",
- "weight": 500,
+ "weight": "500 g",
"volume": "1 L",
"price": 1300,
"to_hit": 2,
@@ -1587,7 +1581,7 @@
"type": "TOOL",
"name": "crucible",
"description": "This is a small metalworking crucible. It's used in some metalworking fabrication recipes.",
- "weight": 14000,
+ "weight": "14000 g",
"volume": "2 L",
"price": 100000,
"to_hit": -2,
@@ -1602,7 +1596,7 @@
"type": "TOOL",
"name": "clay crucible",
"description": "This is a primitive metalworking crucible made of clay. You could use it for metalworking.",
- "weight": 16422,
+ "weight": "16422 g",
"volume": "2500 ml",
"price": 60000,
"to_hit": -2,
@@ -1617,7 +1611,7 @@
"type": "TOOL",
"name": "electric firestarter",
"description": "This is a crudely made electric firestarter, which can function as an inefficient lighter.",
- "weight": 14,
+ "weight": "14 g",
"volume": "250 ml",
"price": 100,
"material": "steel",
@@ -1648,7 +1642,7 @@
"type": "TOOL",
"name": "improvised lockpick",
"description": "This is an improvised set of picks and torsion wrenches made from scrap metal. You need MacGyver-like skills to open locks with these as they are brittle, but they lower the chances of alarms being set off.",
- "weight": 23,
+ "weight": "23 g",
"volume": 0,
"price": 0,
"material": "steel",
@@ -1661,7 +1655,7 @@
"type": "TOOL",
"name": "damaged shelter kit",
"description": "This is a small shelter, made of sticks and skins. Use it to place. This shelter has been damaged, and needs repairs.",
- "weight": 1360,
+ "weight": "1360 g",
"volume": "7500 ml",
"price": 2000,
"to_hit": -3,
@@ -1675,7 +1669,7 @@
"type": "TOOL",
"name": "food dehydrator",
"description": "This is a portable electric food dehydrator. It's powered by batteries, and could be invaluable in preserving food.",
- "weight": 4200,
+ "weight": "4200 g",
"volume": "4500 ml",
"price": 6000,
"to_hit": -2,
@@ -1699,7 +1693,7 @@
"name": "digging stick",
"category": "tools",
"description": "This is a large stick, with the end carved into a broad blade for digging. It could be used to dig shallow pits, but not deep ones.",
- "weight": 1133,
+ "weight": "1133 g",
"volume": "1500 ml",
"price": 0,
"bashing": 8,
@@ -1714,7 +1708,7 @@
"type": "TOOL",
"name": "directional antenna",
"description": "This is an antenna designed to pick up signals better when pointed at the source. You could use this with a radio to receive faint signals.",
- "weight": 454,
+ "weight": "454 g",
"volume": "500 ml",
"price": 800,
"to_hit": 1,
@@ -1730,7 +1724,7 @@
"name": "distaff and spindle",
"name_plural": "distaves and spindles",
"description": "A pair of specialized wooden rods used to spin fibers into thread and yarn.",
- "weight": 612,
+ "weight": "612 g",
"volume": "1500 ml",
"price": 7000,
"to_hit": 1,
@@ -1748,7 +1742,7 @@
"name_plural": "dive knives",
"//": "Too small to be effectively used for butchering, still not bad at it due to serrated edge.",
"description": "This is a short, sturdy knife with a serrated edge for cutting lines and straps, and a blunt tip for prying. Used primarily by divers, it is very light and takes up virtually no space in one's pockets.",
- "weight": 226,
+ "weight": "226 g",
"volume": 0,
"price": 14000,
"cutting": 12,
@@ -1764,7 +1758,7 @@
"type": "TOOL",
"name": "dog whistle",
"description": "This is a small whistle. When used, it produces a high tone that causes nearby friendly dogs to either follow you closely and stop attacking, or start attacking enemies if they are currently docile.",
- "weight": 22,
+ "weight": "22 g",
"volume": 0,
"price": 1000,
"material": "aluminum",
@@ -1778,7 +1772,7 @@
"category": "tools",
"name": "whistle multitool",
"description": "A cheap gadget combining a whistle, thermometer, magnifying glass, and compass.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 200,
"to_hit": -3,
@@ -1808,7 +1802,7 @@
"category": "weapons",
"name": "dynamite",
"description": "These are several sticks of explosives with a fuse attached. Use this item to light the fuse. You will, of course, need a lighter or matches in your inventory to do this. Shortly after lighting the fuse, this item will explode, so get away!",
- "weight": 1133,
+ "weight": "1133 g",
"volume": "750 ml",
"price": 6000,
"to_hit": -3,
@@ -1836,7 +1830,7 @@
"name": "dynamite (lit)",
"name_plural": "dynamites (lit)",
"description": "The fuse on this dynamite is lit and hissing. It'll explode any moment now.",
- "weight": 1133,
+ "weight": "1133 g",
"volume": "750 ml",
"price": 0,
"to_hit": -3,
@@ -1862,7 +1856,7 @@
"name": "electronic handcuffs",
"name_plural": "electronic handcuffs",
"description": "A pair of electronic handcuffs, used by police and riot bots to detain captives. Their continuous siren clearly identifies the wearer as an arrested criminal and alerts human police. Wait for their arrival, don't try to escape or to remove the cuffs - they will administer an electric shock.\nHowever, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative...",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "250 ml",
"price": 0,
"to_hit": -8,
@@ -1881,7 +1875,7 @@
"type": "TOOL",
"name": "entrenching tool",
"description": "This is a stout collapsible spade. It's commonly used by military forces and favored by hikers for digging.",
- "weight": 628,
+ "weight": "628 g",
"volume": "1 L",
"price": 4000,
"to_hit": 1,
@@ -1899,7 +1893,7 @@
"category": "food",
"name": "fermenting eggs jar",
"description": "This jar contains a batch of eggs in a pickling solution. You can seal up the jar once the process is completed.",
- "weight": 52,
+ "weight": "52 g",
"volume": "250 ml",
"price": 10,
"bashing": 8,
@@ -1920,7 +1914,7 @@
"type": "TOOL",
"name": "e-ink tablet PC",
"description": "A tablet PC using an efficient color e-ink display. Before the cataclysm, these were nifty gadgets; now, it's an almost priceless resource. Runs on conventional batteries.",
- "weight": 250,
+ "weight": "250 g",
"volume": "250 ml",
"price": 20000,
"to_hit": -1,
@@ -1940,9 +1934,7 @@
"light_battery_cell",
"light_minus_battery_cell",
"light_atomic_battery_cell",
- "light_minus_atomic_battery_cell",
- "light_minus_disposable_cell",
- "light_disposable_cell"
+ "light_minus_atomic_battery_cell"
]
]
],
@@ -1954,7 +1946,7 @@
"name": "electric chainsaw (off)",
"name_plural": "electric chainsaws (off)",
"description": "This is a lumbering tool moonlighting as weapon of opportunity. If loaded with batteries, using this item will cause it to turn on, turning it into a very powerful but unwieldy melee weapon.",
- "weight": 6577,
+ "weight": "6577 g",
"volume": "2500 ml",
"price": 8000,
"to_hit": -4,
@@ -1996,7 +1988,7 @@
"type": "TOOL",
"name": "electric hair trimmer",
"description": "This is a pocket-sized electric trimmer made for cutting hair. You can use it to cut your hair if it's supplied with batteries. It requires 10 batteries per use.",
- "weight": 138,
+ "weight": "138 g",
"volume": "250 ml",
"price": 3000,
"to_hit": -1,
@@ -2015,7 +2007,7 @@
"type": "TOOL",
"name": "electric jackhammer",
"description": "This is a construction tool for drilling through hard rock or other surfaces. It runs on a cell compatible with UPS. Use it to blast a hole in adjacent solid terrain.",
- "weight": 40000,
+ "weight": "40000 g",
"volume": "5 L",
"price": 40000,
"to_hit": -8,
@@ -2037,7 +2029,7 @@
"category": "tools",
"name": "electrohack",
"description": "This device has many ports attached, allowing it to connect to almost any control panel or other electronic machine (but not computers). With a little skill, it can be used to crack passwords and more. It requires 25 charges of battery power per use.",
- "weight": 114,
+ "weight": "114 g",
"volume": "500 ml",
"price": 40000,
"to_hit": 1,
@@ -2067,7 +2059,7 @@
"type": "TOOL",
"name": "etched human skull",
"description": "This is a human skull with strange etchings covering it.",
- "weight": 311,
+ "weight": "311 g",
"volume": "750 ml",
"price": 300000,
"bashing": 6,
@@ -2080,7 +2072,7 @@
"type": "TOOL",
"name": "large fire extinguisher",
"description": "This is an emergency fire extinguisher containing three gallons of fire retardant foam. It would be useful for putting out adjacent fires.",
- "weight": 9071,
+ "weight": "9071 g",
"volume": "11500 ml",
"price": 5000,
"to_hit": -4,
@@ -2099,7 +2091,7 @@
"category": "weapons",
"name": "fertilizer bomb",
"description": "This is a volatile homemade explosive. Use this item to light the fuse. You will, of course, need a lighter or matches in your inventory to do this. Shortly after lighting the fuse, this item will explode, so get away!",
- "weight": 1133,
+ "weight": "1133 g",
"volume": "750 ml",
"price": 0,
"to_hit": -3,
@@ -2126,7 +2118,7 @@
"name": "fertilizer bomb (lit)",
"name_plural": "fertilizer bombs (lit)",
"description": "The fuse on this fertilizer bomb is lit and hissing. It'll explode any moment now.",
- "weight": 1133,
+ "weight": "1133 g",
"volume": "750 ml",
"price": 0,
"to_hit": -3,
@@ -2153,7 +2145,7 @@
"type": "TOOL",
"name": "fire axe",
"description": "This is a large, two-handed pickhead axe normally used by firefighters. It makes a powerful melee weapon, but is a bit slow to recover between swings.",
- "weight": 2520,
+ "weight": "2520 g",
"volume": "2 L",
"price": 20000,
"to_hit": 1,
@@ -2172,7 +2164,7 @@
"type": "TOOL",
"name": "fire drill",
"description": "This fire drill is a simple item for starting fires; it is made from two pieces of wood and some string. Since it is constructed out of simple materials, it's slow and rather difficult to get a fire started using this tool.",
- "weight": 240,
+ "weight": "240 g",
"volume": "250 ml",
"price": 0,
"material": "wood",
@@ -2189,7 +2181,7 @@
"type": "TOOL",
"name": "camp fire drill",
"description": "This stout fire drill is a simple item for starting fires; it is made from two pieces of wood and some string. Since it is constructed out of simple materials, it's slow and rather difficult to get a fire started using this tool.",
- "weight": 1280,
+ "weight": "1280 g",
"volume": "1250 ml",
"price": 0,
"material": [ "wood", "stone" ],
@@ -2206,7 +2198,7 @@
"type": "TOOL",
"name": "firecracker",
"description": "A solitary firecracker with a short fuse. Use this item to light the fuse. Of course, you will need a lighter or some matches to do so. Shortly after you light the fuse it will explode, so throw it quickly!",
- "weight": 3,
+ "weight": "3 g",
"volume": 0,
"price": 4,
"to_hit": -3,
@@ -2222,7 +2214,7 @@
"name": "firecracker (lit)",
"name_plural": "firecrackers (lit)",
"description": "A firecracker that has been lit; the fuse is hissing. Throw it quickly before it explodes.",
- "weight": 3,
+ "weight": "3 g",
"volume": 0,
"price": 0,
"to_hit": -3,
@@ -2240,7 +2232,7 @@
"name": "pack of firecrackers",
"name_plural": "packs of firecrackers",
"description": "This is a pack of 25 firecrackers with a starter fuse. Use this item to light the fuse. Of course, you will need a lighter or some matches to do so. Shortly after you light the fuse they will begin to explode, so throw them quickly!",
- "weight": 75,
+ "weight": "75 g",
"volume": 0,
"price": 100,
"to_hit": -3,
@@ -2259,7 +2251,7 @@
"name": "pack of firecrackers (lit)",
"name_plural": "packs of firecrackers (lit)",
"description": "A pack of 25 firecrackers that has been lit; the fuse is hissing. Throw them quickly before the start to explode.",
- "weight": 75,
+ "weight": "75 g",
"volume": 0,
"price": 0,
"to_hit": -3,
@@ -2275,7 +2267,7 @@
"type": "TOOL",
"name": "plastic fish trap",
"description": "This is a makeshift fish trap made from plastic bottles. It's simple, even primitive, but easy to use. The principle of action: the fish swims inside for bait, but can't get out. Not humane, prohibited by law, but there are no cops left to care.",
- "weight": 85,
+ "weight": "85 g",
"volume": "2 L",
"price": 500,
"to_hit": -2,
@@ -2292,7 +2284,7 @@
"type": "GENERIC",
"name": "fishing hook",
"description": "A simple fishing hook.",
- "weight": 1,
+ "weight": "1 g",
"volume": 0,
"price": 25,
"cutting": 3,
@@ -2305,7 +2297,7 @@
"type": "GENERIC",
"name": "improvised fishing hook",
"description": "An improvised fishing hook carved from wood or bone.",
- "weight": 1,
+ "weight": "1 g",
"volume": 0,
"price": 25,
"cutting": 3,
@@ -2318,7 +2310,7 @@
"type": "TOOL",
"name": "basic fishing rod",
"description": "'Fishing rod' might be a bit too charitable of a description. In truth, this is a stick with a piece of string and a hook.",
- "weight": 1700,
+ "weight": "1700 g",
"volume": "1250 ml",
"price": 0,
"to_hit": 1,
@@ -2327,6 +2319,7 @@
"symbol": "/",
"color": "brown",
"use_action": "FISH_ROD",
+ "qualities": [ [ "FISHING", 1 ] ],
"flags": [ "FISH_POOR" ]
},
{
@@ -2334,7 +2327,7 @@
"type": "TOOL",
"name": "pro fishing rod",
"description": "A professional fishing rod with a matching set of weights. With this you should be able to catch 'em all.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "1250 ml",
"price": 20000,
"to_hit": 1,
@@ -2343,6 +2336,7 @@
"symbol": "/",
"color": "brown",
"use_action": "FISH_ROD",
+ "qualities": [ [ "FISHING", 1 ] ],
"flags": [ "FISH_GOOD" ]
},
{
@@ -2351,7 +2345,7 @@
"category": "ammo",
"name": "flammable arrow",
"description": "This arrow has a rag soaked in a flammable liquid wrapped around the shaft near the head. You need to light it before shooting.",
- "weight": 150,
+ "weight": "150 g",
"volume": "250 ml",
"price": 3500,
"bashing": 2,
@@ -2369,7 +2363,7 @@
"category": "weapons",
"name": "flashbang",
"description": "This is a military police style flashbang. Use this item to pull the pin and light the fuse. You will then have five turns before it detonates with intense light and sound, blinding, deafening and disorienting anyone nearby.",
- "weight": 236,
+ "weight": "236 g",
"volume": "250 ml",
"price": 2000,
"to_hit": -1,
@@ -2393,7 +2387,7 @@
"category": "weapons",
"name": "active flashbang",
"description": "This flashbang is active, and will soon detonate with intense light and sound, blinding, deafening and disorienting anyone nearby. It may be a good idea to throw it!",
- "weight": 236,
+ "weight": "236 g",
"volume": "250 ml",
"price": 0,
"to_hit": -1,
@@ -2460,7 +2454,7 @@
"category": "food",
"name": "sealed yeast culture",
"description": "A sealed flask holding sanitized yeast wort. You may harvest the yeast inside when it's done culturing.",
- "weight": 52,
+ "weight": "52 g",
"volume": "250 ml",
"price": 10,
"bashing": 8,
@@ -2487,7 +2481,7 @@
"name": "flute",
"name_plural": "flutes",
"description": "A simple silver-plated flute.",
- "weight": 250,
+ "weight": "250 g",
"volume": "500 ml",
"price": 5000,
"bashing": 2,
@@ -2515,7 +2509,7 @@
"type": "TOOL",
"name": "folding bicycle",
"description": "This is a bicycle folded into a relatively portable package.",
- "weight": 9071,
+ "weight": "9071 g",
"volume": "21500 ml",
"price": 35000,
"to_hit": -5,
@@ -2535,7 +2529,7 @@
"type": "TOOL",
"name": "electric forge",
"description": "This is a portable electric metalworking forge, powered by batteries. Combined with the right tools, you could use this for metalworking. With a little mechanical know-how, you could probably even convert it to run directly off a vehicle's power system.",
- "weight": 10000,
+ "weight": "10000 g",
"volume": "6 L",
"price": 40000,
"to_hit": -2,
@@ -2555,7 +2549,7 @@
"type": "TOOL",
"name": "funnel",
"description": "This is a funnel used to collect rainwater. Use it outside and place a container beneath it to collect water when it rains.",
- "weight": 606,
+ "weight": "606 g",
"volume": "500 ml",
"price": 500,
"to_hit": 1,
@@ -2577,7 +2571,7 @@
"type": "TOOL",
"name": "fur rollmat",
"description": "This is a bedroll made of pelts which can be rolled up for transport. It insulates you from the floor, making it easier to sleep. Use it to unroll and place on the ground.",
- "weight": 1800,
+ "weight": "1800 g",
"volume": "3 L",
"price": 4000,
"to_hit": -1,
@@ -2598,7 +2592,7 @@
"type": "TOOL",
"name": "trowel",
"description": "A small, sharp gardening shovel, perfect for digging up grubs and worms.",
- "weight": 280,
+ "weight": "280 g",
"volume": "500 ml",
"price": 20,
"to_hit": 1,
@@ -2615,7 +2609,7 @@
"category": "weapons",
"name": "makeshift gas canister",
"description": "This is a crude gasbomb using household chemicals. Use this item to arm it. In three turns it will begin to expel a highly toxic gas for a short time. This gas poisons those exposed to it, in addition to obscuring vision and scent.",
- "weight": 1264,
+ "weight": "1264 g",
"volume": "250 ml",
"price": 500,
"to_hit": -1,
@@ -2639,7 +2633,7 @@
"category": "weapons",
"name": "active makeshift gas grenade",
"description": "This homemade canister of poison gas has been unsealed, and is (or will shortly be) expelling highly toxic gas. You should consider getting rid of it soon.",
- "weight": 1264,
+ "weight": "1264 g",
"volume": "250 ml",
"price": 0,
"to_hit": -1,
@@ -2668,7 +2662,7 @@
"type": "TOOL",
"name": "gasoline cooker",
"description": "This is a simple heater powered by gasoline. It is designed for cooking food.",
- "weight": 1944,
+ "weight": "1944 g",
"volume": "1250 ml",
"price": 5000,
"to_hit": -1,
@@ -2689,7 +2683,7 @@
"name": "gasoline lantern (off)",
"name_plural": "gasoline lanterns (off)",
"description": "This is a small gasoline powered lantern. It does not provide much light, but it lasts a long time. Use it to turn it on.",
- "weight": 1400,
+ "weight": "1400 g",
"volume": "750 ml",
"price": 3000,
"to_hit": 2,
@@ -2719,7 +2713,7 @@
"name": "gasoline lantern (on)",
"name_plural": "gasoline lanterns (on)",
"description": "This is a small gasoline powered lantern. It does not provide much light, but it lasts a long time. It is turned on. Use it to turn it off.",
- "turns_per_charge": 20,
+ "turns_per_charge": 60,
"revert_to": "gasoline_lantern",
"use_action": { "target": "gasoline_lantern", "msg": "The lantern is extinguished.", "menu_text": "Turn off", "type": "transform" },
"flags": [ "LIGHT_15", "TRADER_AVOID", "ALLOWS_REMOTE_USE" ]
@@ -2730,7 +2724,7 @@
"name": "geiger counter (off)",
"name_plural": "geiger counters (off)",
"description": "This is a tool for measuring radiation. Using it will prompt you to choose whether to scan yourself or the terrain, or to turn it on, which will provide continuous feedback on ambient radiation. It is currently off.",
- "weight": 225,
+ "weight": "225 g",
"volume": "500 ml",
"price": 15000,
"bashing": 2,
@@ -2763,7 +2757,7 @@
"name": "geiger counter (on)",
"name_plural": "geiger counters (on)",
"description": "This is a tool for measuring radiation. It is in continuous scan mode, and will produce quiet clicking sounds in the presence of ambient radiation. Using it allows you to turn it off, or scan yourself or the ground. It is currently on.",
- "turns_per_charge": 10,
+ "power_draw": 200,
"revert_to": "geiger_off",
"use_action": "GEIGER",
"flags": [ "TRADER_AVOID" ],
@@ -2785,7 +2779,7 @@
"type": "TOOL",
"name": "glowstick",
"description": "This is a small blue light glowstick. Use it to bend the plastic and break the glass cylinder inside to start the reaction. It will produce a small amount of light.",
- "weight": 29,
+ "weight": "29 g",
"volume": "250 ml",
"price": 100,
"to_hit": -1,
@@ -2808,7 +2802,7 @@
"category": "other",
"name": "dead glowstick",
"description": "This is a spent glowstick. It is essentially trash.",
- "weight": 29,
+ "weight": "29 g",
"volume": "250 ml",
"price": 0,
"to_hit": -1,
@@ -2823,7 +2817,7 @@
"type": "TOOL",
"name": "active glowstick",
"description": "This is an active glowstick and is producing light. It will last for a few hours before burning out.",
- "weight": 29,
+ "weight": "29 g",
"volume": "250 ml",
"to_hit": -1,
"material": "plastic",
@@ -2831,7 +2825,7 @@
"color": "light_blue",
"initial_charges": 1400,
"max_charges": 1400,
- "turns_per_charge": 2,
+ "turns_per_charge": 30,
"revert_to": "glowstick_dead",
"revert_msg": "The glowstick fades out.",
"flags": [ "LIGHT_8", "TRADER_AVOID" ]
@@ -2842,7 +2836,7 @@
"category": "tools",
"name": "grappling hook",
"description": "A folding grappling hook attached to a stout 30-foot long piece of lightweight cord. Useful for keeping yourself safe from falls. Can be used in place of a long rope for butchering, in a pinch.",
- "weight": 760,
+ "weight": "760 g",
"volume": "750 ml",
"price": 25000,
"to_hit": -2,
@@ -2860,7 +2854,7 @@
"type": "TOOL",
"name": "hacksaw",
"description": "This is a sturdy saw, useful for cutting through metal objects.",
- "weight": 952,
+ "weight": "952 g",
"volume": "1 L",
"price": 2500,
"to_hit": -1,
@@ -2877,7 +2871,7 @@
"type": "TOOL",
"name": "Halligan bar",
"description": "This is a heavy multiple-use tool commonly carried by firefighters, law enforcement, and military rescue units. Use it to open locked doors without destroying them or to lift manhole covers. You could also wield it to bash some heads in.",
- "weight": 3600,
+ "weight": "3600 g",
"volume": "1250 ml",
"price": 7500,
"to_hit": 2,
@@ -2896,7 +2890,7 @@
"type": "TOOL",
"name": "hammer",
"description": "This is a demagnetized steel claw hammer with a wooden grip. With a hammer, nails, and two by fours in your inventory, you could board up adjacent doors and windows. It has myriad other uses as well.",
- "weight": 566,
+ "weight": "566 g",
"volume": "500 ml",
"price": 700,
"to_hit": 1,
@@ -2913,7 +2907,7 @@
"type": "TOOL",
"name": "claw bar",
"description": "This is a small prying tool with a clawed bend at one end for pulling spikes. Use it to open locked doors without destroying them or to lift manhole covers. You could also wield it to bash some heads in.",
- "weight": 340,
+ "weight": "340 g",
"volume": "375 ml",
"price": 1000,
"to_hit": 1,
@@ -2931,7 +2925,7 @@
"type": "TOOL",
"name": "hand drill",
"description": "A primitive manual drill with a single drill bit. It is slow and it will exhaust you quickly.",
- "weight": 907,
+ "weight": "907 g",
"volume": "250 ml",
"price": 500,
"to_hit": -1,
@@ -2940,14 +2934,14 @@
"material": [ "wood", "steel" ],
"symbol": ";",
"color": "light_gray",
- "qualities": [ [ "DRILL", 1 ] ]
+ "qualities": [ [ "DRILL", 2 ] ]
},
{
"id": "heatpack",
"type": "TOOL",
"name": "heat pack",
"description": "This is a chemical heat pack. It's used to treat sports injuries and heat food. It is usable only once.",
- "weight": 226,
+ "weight": "226 g",
"volume": 0,
"price": 100,
"to_hit": 1,
@@ -2964,7 +2958,7 @@
"category": "other",
"name": "used heat pack",
"description": "This is a chemical heat pack. It's used to treat sports injuries and heat food. This one has been used and is chemically inert, rendering it useless.",
- "weight": 226,
+ "weight": "226 g",
"volume": 0,
"price": 0,
"to_hit": 1,
@@ -2979,7 +2973,7 @@
"type": "TOOL",
"name": "hoe",
"description": "This is a farming implement. You can use it to turn tillable land into a slow-to-cross pile of dirt, or dig a shallow pit.",
- "weight": 1088,
+ "weight": "1088 g",
"volume": "3500 ml",
"price": 2000,
"to_hit": 3,
@@ -2997,7 +2991,7 @@
"type": "TOOL",
"name": "honey scraper",
"description": "A sharp, knife-like tool used in harvesting honey from beehives. Makes a passable melee weapon.",
- "weight": 580,
+ "weight": "580 g",
"volume": "250 ml",
"price": 1000,
"bashing": 1,
@@ -3014,7 +3008,7 @@
"category": "veh_parts",
"name": "bicycle horn",
"description": "This is a simple bulb horn, found on many bicycles. Use to honk. Honk honk.",
- "weight": 170,
+ "weight": "170 g",
"volume": "500 ml",
"price": 400,
"to_hit": -1,
@@ -3040,7 +3034,7 @@
"category": "veh_parts",
"name": "truck horn",
"description": "This is a very loud horn, usually found on large trucks like semis.",
- "weight": 310,
+ "weight": "310 g",
"volume": "1500 ml",
"price": 12000,
"to_hit": -1,
@@ -3055,7 +3049,7 @@
"category": "veh_parts",
"name": "car horn",
"description": "This is a car horn meant to be attached to a car's electrical system.",
- "weight": 270,
+ "weight": "270 g",
"volume": "500 ml",
"price": 9000,
"to_hit": -1,
@@ -3069,7 +3063,7 @@
"type": "TOOL",
"name": "rubber hose",
"description": "This is a flexible rubber hose. It could be used for crafting, or siphoning fuel from a vehicle.",
- "weight": 544,
+ "weight": "544 g",
"volume": "500 ml",
"price": 200,
"to_hit": 3,
@@ -3084,7 +3078,7 @@
"type": "TOOL",
"name": "hotplate",
"description": "This is a small heating element on a stand, powered by batteries. It is indispensable for cooking and chemistry. Try not to burn yourself.",
- "weight": 2835,
+ "weight": "2835 g",
"volume": "1250 ml",
"price": 2500,
"to_hit": -1,
@@ -3110,7 +3104,7 @@
"name": "hygrometer",
"name_plural": "hygrometers",
"description": "A plastic hygrometer that can read the relative humidity in the air.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 100,
"to_hit": -3,
@@ -3125,7 +3119,7 @@
"type": "TOOL",
"name": "ice axe",
"description": "This is an ice axe with hammer on its head, a multi-purpose hiking and climbing tool used by mountaineers. It is sturdy enough to pry open closed doors or lift manhole covers.",
- "weight": 500,
+ "weight": "500 g",
"volume": "750 ml",
"price": 5000,
"to_hit": 2,
@@ -3144,7 +3138,7 @@
"type": "TOOL",
"name": "jackhammer",
"description": "This is a construction tool for drilling through hard rock or other surfaces. It runs on gasoline. Use it (if loaded) to blast a hole in adjacent solid terrain.",
- "weight": 15875,
+ "weight": "15875 g",
"volume": "5 L",
"price": 40000,
"to_hit": -8,
@@ -3166,7 +3160,7 @@
"name": "sealed jar of pickles",
"name_plural": "sealed jars of pickles",
"description": "This is a sealed glass jar containing pickles. Use to open and eat to enjoy.",
- "weight": 1750,
+ "weight": "1750 g",
"volume": "500 ml",
"price": 650,
"bashing": 4,
@@ -3189,7 +3183,7 @@
"name": "sealed jar of sauerkraut",
"name_plural": "sealed jars of sauerkraut",
"description": "This is a sealed glass jar containing sauerkraut. Use to open and eat to enjoy.",
- "weight": 1750,
+ "weight": "1750 g",
"volume": "500 ml",
"price": 650,
"bashing": 4,
@@ -3212,7 +3206,7 @@
"name": "sealed jar of eggs",
"name_plural": "sealed jars of eggs",
"description": "This is a sealed glass jar containing pickled eggs. Use to open and eat to enjoy.",
- "weight": 1750,
+ "weight": "1750 g",
"volume": "500 ml",
"price": 650,
"bashing": 4,
@@ -3234,7 +3228,7 @@
"category": "spare_parts",
"name": "Kevlar plate",
"description": "This is a plate of reinforced Kevlar. It could be used to repair items made of Kevlar.",
- "weight": 360,
+ "weight": "360 g",
"volume": "250 ml",
"price": 1000,
"material": "kevlar",
@@ -3248,7 +3242,7 @@
"category": "tools",
"name": "finished charcoal kiln",
"description": "A charcoal kiln that has finished burning. Disassemble it to retrieve the charcoal and kiln.",
- "weight": 8142,
+ "weight": "8142 g",
"volume": "10 L",
"price": 100,
"to_hit": -2,
@@ -3262,7 +3256,7 @@
"category": "tools",
"name": "filled charcoal kiln",
"description": "A kiln filled with wood which will become charcoal after a slow period of burning.",
- "weight": 15142,
+ "weight": "15142 g",
"volume": "10 L",
"price": 100,
"to_hit": -2,
@@ -3285,7 +3279,7 @@
"category": "tools",
"name": "lit charcoal kiln",
"description": "A kiln full of wood that has been lit; better drop it!",
- "weight": 15142,
+ "weight": "15142 g",
"volume": "10 L",
"price": 100,
"to_hit": -2,
@@ -3309,7 +3303,7 @@
"name": "knitting needles",
"name_plural": "pairs of knitting needles",
"description": "A pair of stout wooden needles with round ends used to turn thread and yarn into cloth.",
- "weight": 56,
+ "weight": "56 g",
"volume": 0,
"price": 600,
"cutting": 1,
@@ -3324,7 +3318,7 @@
"type": "TOOL",
"name": "land mine",
"description": "This is an military anti-personnel mine that is triggered when stepped upon.",
- "weight": 2360,
+ "weight": "2360 g",
"volume": "500 ml",
"price": 5000,
"to_hit": -1,
@@ -3347,7 +3341,7 @@
"type": "TOOL",
"name": "gunsmith repair kit",
"description": "This is a complete toolkit made to repair damaged firearms. Powered by standard batteries, it is a vital tool for long-term firearms maintenance. It requires 25 charges of battery power per use.",
- "weight": 9860,
+ "weight": "9860 g",
"volume": "2500 ml",
"price": 5000,
"to_hit": -2,
@@ -3384,7 +3378,7 @@
"type": "TOOL",
"name": "large tent",
"description": "This is a family sized tent. It provides a large amount of space, but is very bulky.",
- "weight": 2266,
+ "weight": "2266 g",
"volume": "10 L",
"price": 50000,
"to_hit": -3,
@@ -3408,7 +3402,7 @@
"type": "TOOL",
"name": "leather funnel",
"description": "This is a small, leather funnel used to collect rainwater. Use it outside and place a container beneath it to collect water when it rains.",
- "weight": 4,
+ "weight": "4 g",
"volume": "250 ml",
"price": 0,
"to_hit": 1,
@@ -3429,7 +3423,7 @@
"type": "TOOL",
"name": "birchbark funnel",
"description": "This is a small birchbark funnel. Place it above an outdoor container to collect rainwater.",
- "weight": 3,
+ "weight": "3 g",
"volume": "250ml",
"price": 0,
"to_hit": 1,
@@ -3450,7 +3444,7 @@
"type": "TOOL",
"name": "lighter",
"description": "This is a disposable plastic lighter. A lighter must be carried to use various drugs, like cigarettes, or to light things like Molotov cocktails. You can also use a lighter to light nearby items on fire.",
- "weight": 14,
+ "weight": "14 g",
"volume": "14 ml",
"price": 100,
"material": [ "plastic", "aluminum" ],
@@ -3466,7 +3460,7 @@
"abstract": "lightstrip_base",
"type": "TOOL",
"name": "lightstrip_base",
- "weight": 27,
+ "weight": "27 g",
"volume": "250 ml",
"price": 500,
"to_hit": 2,
@@ -3526,7 +3520,7 @@
"name": "magnifying glass",
"name_plural": "magnifying glasses",
"description": "This is a magnifying glass. May be useful for starting fires during sunny skies.",
- "weight": 400,
+ "weight": "400 g",
"volume": "250 ml",
"price": 600,
"to_hit": -1,
@@ -3541,7 +3535,7 @@
"type": "TOOL",
"name": "makeshift crowbar",
"description": "This is a pipe whose ends have been bent and hammered flat to resemble a crowbar. Use it to open locked doors without destroying them, or to lift manhole covers. You could also wield it to fight with, in a pinch.",
- "weight": 762,
+ "weight": "762 g",
"volume": "1500 ml",
"price": 0,
"to_hit": 2,
@@ -3560,7 +3554,7 @@
"type": "TOOL",
"name": "makeshift funnel",
"description": "This is a small, makeshift funnel used to collect rainwater. Use it outside and place a container beneath it to collect water when it rains.",
- "weight": 4,
+ "weight": "4 g",
"volume": "250 ml",
"price": 0,
"to_hit": 1,
@@ -3582,7 +3576,7 @@
"name": "makeshift glaive",
"//": "Name changed to glaive, but changing the id would break e.g. tilesets.",
"description": "This is a large blade attached to a long stick. It could do a considerable amount of damage.",
- "weight": 1800,
+ "weight": "1800 g",
"volume": "3 L",
"price": 5000,
"to_hit": 2,
@@ -3600,7 +3594,7 @@
"type": "TOOL",
"name": "makeshift hammer",
"description": "This is a crude hammer make from a piece of metal affixed to a stick. It functions adequately as a hammer, but really can't compare to a proper one.",
- "weight": 1020,
+ "weight": "1020 g",
"volume": "500 ml",
"price": 0,
"bashing": 9,
@@ -3616,7 +3610,7 @@
"type": "TOOL",
"name": "makeshift vacuum sealer",
"description": "This is a homemade heat sealer unit with an air pump. It's used for vacuum packing food to preserve it.",
- "weight": 3218,
+ "weight": "3218 g",
"volume": "2 L",
"price": 1000,
"to_hit": -1,
@@ -3639,7 +3633,7 @@
"category": "weapons",
"name": "match head bomb",
"description": "This is a homemade bomb consisting of a bottle filled with match heads and equipped with a fuse. Use this item to light the fuse; you will, of course, need a lighter in your inventory to do this.",
- "weight": 412,
+ "weight": "412 g",
"volume": "500 ml",
"price": 0,
"to_hit": 1,
@@ -3666,7 +3660,7 @@
"name": "match head bomb (lit)",
"name_plural": "match head bombs (lit)",
"description": "This is a bottle filled with match heads and equipped with a fuse. This one has been lit, and its fuse is rapidly burning down. You may not want to hold onto it much longer.",
- "weight": 412,
+ "weight": "412 g",
"volume": "500 ml",
"price": 0,
"to_hit": 1,
@@ -3693,7 +3687,7 @@
"type": "TOOL",
"name": "matchbook",
"description": "This is a small book of matches with a coarse strike surface on the outside flap. Matches must be carried to use various drugs like cigarettes, or to light things like Molotov cocktails. You can also use matches to light nearby items on fire.",
- "weight": 10,
+ "weight": "10 g",
"volume": 0,
"price": 10,
"material": "paper",
@@ -3710,7 +3704,7 @@
"type": "TOOL",
"name": "mess kit",
"description": "A self-contained camping mess kit, containing everything you might need for wilderness cooking. This model relies on a battery-operated hotplate, rather than the more commonplace chemical-fueled Esbit stove.",
- "weight": 1500,
+ "weight": "1500 g",
"volume": "1 L",
"price": 5000,
"to_hit": -1,
@@ -3736,7 +3730,7 @@
"type": "TOOL",
"name": "metal funnel",
"description": "This is a large metal funnel used to collect rainwater. Less portable than plastic funnels, but collects more water. Use it outside and place a container beneath it to collect water when it rains.",
- "weight": 4017,
+ "weight": "4017 g",
"volume": "4 L",
"price": 1500,
"to_hit": 1,
@@ -3758,7 +3752,7 @@
"type": "TOOL",
"name": "tarp raincatcher",
"description": "Some sticks and string with a tarpaulin to set up an improvised raincatcher.",
- "weight": 3980,
+ "weight": "3980 g",
"volume": "4 L",
"price": 6000,
"material": [ "wood", "plastic" ],
@@ -3778,7 +3772,7 @@
"type": "TOOL",
"name": "metallic smoother",
"description": "This metallic tool is most often used to smooth concrete, or mortar, in construction projects.",
- "weight": 362,
+ "weight": "362 g",
"volume": "500 ml",
"price": 1000,
"bashing": 4,
@@ -3792,7 +3786,7 @@
"type": "TOOL",
"name": "military mess kit",
"description": "Military mess kit designed for long-range reconnaissance patrols deployed behind enemy lines. All parts are made from thin sheet of aluminum / superalloy composite and are insulated with ceramic coating. Relies on a battery-operated hotplate, rather than the smoke-producing chemical-fueled Esbit stove. Compact, durable and lightweight.",
- "weight": 900,
+ "weight": "900 g",
"volume": "1 L",
"price": 6000,
"to_hit": -1,
@@ -3820,7 +3814,7 @@
"name": "mininuke",
"//": "This is based on the Davy Crockett nuclear artillery shell, all other man-portable nuclear weapons have far too high a yield.",
"description": "This is an extremely powerful weapon, a portable nuclear bomb. Use it to activate the timer. You guess that the explosion would be large enough to take out a small house.",
- "weight": 23000,
+ "weight": "23000 g",
"volume": "16 L",
"price": 180000,
"to_hit": -2,
@@ -3839,7 +3833,7 @@
"name_plural": "mininukes",
"//": "This is based on the Davy Crockett nuclear artillery shell, all other man-portable nuclear weapons have far too high a yield.",
"description": "This miniature nuclear bomb has a light blinking on the side, showing that it will soon explode. You should probably get far, far away from it.",
- "weight": 23000,
+ "weight": "23000 g",
"volume": "16 L",
"price": 0,
"to_hit": -2,
@@ -3866,7 +3860,7 @@
"type": "TOOL",
"name": "basic repair kit",
"description": "This is a portable toolkit. When supplied with duct tape, it serves as a vital tool for fixing items made of wood, paper, bone, or chitin. It requires 50 units of duct tape per use.",
- "weight": 1040,
+ "weight": "1040 g",
"volume": "1 L",
"price": 1000,
"to_hit": -1,
@@ -3886,7 +3880,7 @@
"type": "TOOL",
"name": "plastic mold",
"description": "This is a plastic mold. It could be shaped and used to craft items made of plastic.",
- "weight": 320,
+ "weight": "320 g",
"volume": "2500 ml",
"price": 1000,
"to_hit": 1,
@@ -3902,7 +3896,7 @@
"category": "weapons",
"name": "Molotov cocktail",
"description": "A bottle of flammable liquid with a rag inserted. Use this item to light the rag. You will, of course, need a lighter or matches in your inventory to do this. After lighting it, throw it to cause fires.",
- "weight": 742,
+ "weight": "742 g",
"volume": "750 ml",
"price": 500,
"to_hit": 1,
@@ -3931,7 +3925,7 @@
"name": "Molotov cocktail",
"name_plural": "Molotov cocktails",
"description": "A bottle of flammable liquid with a flaming rag stoppered in its neck. Throwing it will shatter the bottle on impact and ignite a fireball. Dropping it will set you on fire, so don't do that unless you want to burn to death.",
- "weight": 742,
+ "weight": "742 g",
"volume": "750 ml",
"price": 0,
"to_hit": 1,
@@ -3950,7 +3944,7 @@
"type": "TOOL",
"name": "mop",
"description": "This is an unwieldy mop. Good for cleaning up spills. Use to mop up any 'mess' you may have made.",
- "weight": 929,
+ "weight": "929 g",
"volume": "1750 ml",
"price": 1000,
"to_hit": -1,
@@ -3966,7 +3960,7 @@
"type": "TOOL",
"name": "scrub brush",
"description": "This is a simple scrub brush.",
- "weight": 70,
+ "weight": "70 g",
"volume": "250 ml",
"price": 200,
"to_hit": -1,
@@ -3981,7 +3975,7 @@
"name": "mortar and pestle",
"name_plural": "sets of mortar and pestle",
"description": "This is a simple combination of a small grindstone and a bowl-shaped stone. Used for grinding grain, but time-consuming compared to more complex methods.",
- "weight": 1632,
+ "weight": "1632 g",
"volume": "1 L",
"price": 0,
"to_hit": -4,
@@ -3997,7 +3991,7 @@
"name": "mp3 player (off)",
"name_plural": "mp3 players (off)",
"description": "This battery-powered device is loaded up with someone's music collection. Fortunately, there's lots of songs you like, and listening to it will raise your morale slightly. Use it to turn it on.",
- "weight": 140,
+ "weight": "140 g",
"volume": "50 ml",
"price": 3000,
"material": [ "aluminum", "plastic" ],
@@ -4014,9 +4008,7 @@
"light_plus_battery_cell",
"light_minus_battery_cell",
"light_atomic_battery_cell",
- "light_minus_atomic_battery_cell",
- "light_minus_disposable_cell",
- "light_disposable_cell"
+ "light_minus_atomic_battery_cell"
]
]
],
@@ -4040,7 +4032,7 @@
"type": "TOOL",
"name": "multi cooker",
"description": "A professional-grade multi-cooker, with a battery slot for camping trips or tailgating. Its multitude of settings and features promise to handle any sort of cooking, from parboiling potatoes to cooking curry to popping popcorn. There's no manual, but you're sure you can work it out.",
- "weight": 11339,
+ "weight": "11339 g",
"volume": "3750 ml",
"price": 20000,
"to_hit": -3,
@@ -4066,7 +4058,7 @@
"name": "multi-tool",
"//": "The multi-tool is a bit more of a toolkit than a knife.",
"description": "A cleverly designed all-in-one tool which combines several smaller tools into the handles of a pair of pliers.",
- "weight": 494,
+ "weight": "494 g",
"volume": "250 ml",
"price": 3000,
"to_hit": -4,
@@ -4083,7 +4075,7 @@
"type": "TOOL",
"name": "bone needle",
"description": "This is sharp needle made from a bone. It would be useful for making rough clothing and items. Its low quality makes it rather unsuitable for anything requiring speed or precision.",
- "weight": 85,
+ "weight": "85 g",
"volume": "250 ml",
"price": 0,
"material": "bone",
@@ -4110,7 +4102,7 @@
"type": "TOOL",
"name": "curved needle",
"description": "A curved sharp needle made of steel. Its rounded shape allows it to make stitches that only pierce one side of the material. While unsuitable for most tailoring projects, it's a necessity for stitching neoprene.",
- "weight": 85,
+ "weight": "85 g",
"volume": "250 ml",
"price": 0,
"material": "steel",
@@ -4137,7 +4129,7 @@
"type": "TOOL",
"name": "wooden needle",
"description": "This is a wooden needle whittled down to a sharp point. It has a narrow hole carved into the head for threading. Its low quality makes it rather unsuitable for anything requiring speed or precision.",
- "weight": 85,
+ "weight": "85 g",
"volume": "250 ml",
"price": 0,
"material": "wood",
@@ -4165,7 +4157,7 @@
"name": "noise emitter (off)",
"name_plural": "noise emitters (off)",
"description": "This device was constructed by 'enhancing' a speaker ripped off from some electronic device with some amplifier circuits. It has now no other use beside emitting loud cracling static noise, that could distract zombies.",
- "weight": 340,
+ "weight": "340 g",
"volume": "1 L",
"price": 0,
"to_hit": -1,
@@ -4199,7 +4191,7 @@
"name": "noise emitter (on)",
"name_plural": "noise emitters (on)",
"description": "This device has been turned on and is emitting horrible crackles, pops and other static sounds. Quick, get away from it before it draws zombies to you!",
- "turns_per_charge": 5,
+ "power_draw": 10000,
"revert_to": "noise_emitter",
"use_action": "NOISE_EMITTER_ON",
"flags": [ "RADIO_MODABLE", "TRADER_AVOID" ]
@@ -4209,7 +4201,7 @@
"type": "TOOL",
"name": "lamp oil cooker",
"description": "This is a simple heater powered by lamp oil. It is designed for cooking food.",
- "weight": 2264,
+ "weight": "2264 g",
"volume": "1250 ml",
"price": 5000,
"to_hit": -1,
@@ -4230,7 +4222,7 @@
"name": "oil lamp (off)",
"name_plural": "oil lamps (off)",
"description": "This is an oil fueled lamp. It does not provide much light, but it lasts a long time. Use it to turn it on.",
- "weight": 1720,
+ "weight": "1720 g",
"volume": "1 L",
"price": 1000,
"to_hit": 2,
@@ -4239,8 +4231,8 @@
"symbol": ";",
"color": "yellow",
"ammo": "lamp_oil",
- "initial_charges": 800,
- "max_charges": 800,
+ "initial_charges": 750,
+ "max_charges": 750,
"charges_per_use": 1,
"use_action": {
"target": "oil_lamp_on",
@@ -4260,7 +4252,7 @@
"name": "oil lamp",
"name_plural": "oil lamps",
"description": "This is an oil fueled lamp. It does not provide much light, but it lasts a long time. It is turned on. Use it to turn it off.",
- "turns_per_charge": 20,
+ "turns_per_charge": 240,
"revert_to": "oil_lamp",
"use_action": { "target": "oil_lamp", "msg": "The lantern is extinguished.", "menu_text": "Turn off", "type": "transform" },
"flags": [ "LIGHT_10", "TRADER_AVOID", "FIRE", "ALLOWS_REMOTE_USE", "WATER_EXTINGUISH" ]
@@ -4270,7 +4262,7 @@
"type": "TOOL",
"name": "oxygen tank",
"description": "This is tank of compressed medical oxygen with a regulator and mask. Commonly used in emergency situations, it provides immediate relief for asthma attacks or smoke inhalation, and can provide a brief burst of energy.",
- "weight": 2268,
+ "weight": "2268 g",
"volume": "1500 ml",
"price": 6000,
"to_hit": -4,
@@ -4288,7 +4280,7 @@
"type": "TOOL",
"name": "nitrogen tank",
"description": "This is a tank of compressed nitrogen gas. Nitrogen is useful for its lack of reactivity. Don't try to breathe it.",
- "weight": 2268,
+ "weight": "2268 g",
"volume": "1500 ml",
"price": 1000,
"to_hit": -4,
@@ -4306,7 +4298,7 @@
"type": "TOOL",
"name": "hydrogen tank",
"description": "This is a tank of compressed hydrogen gas. If you need to make water from scratch, or lift a zeppelin, it could come in handy.",
- "weight": 2268,
+ "weight": "2268 g",
"volume": "1500 ml",
"price": 1000,
"to_hit": -4,
@@ -4325,7 +4317,7 @@
"name": "paint brush",
"name_plural": "paint brushes",
"description": "A wide brush, suitable for painting walls.",
- "weight": 60,
+ "weight": "60 g",
"volume": "500 ml",
"price": 7000,
"to_hit": 1,
@@ -4340,7 +4332,7 @@
"category": "tools",
"name": "pasta extruder",
"description": "A pasta extruder run by a hand-crank. Useful in making pasta. It comes with various heads to make various kinds of pasta.",
- "weight": 2628,
+ "weight": "2628 g",
"volume": "1 L",
"price": 2000,
"to_hit": 2,
@@ -4354,7 +4346,7 @@
"type": "TOOL",
"name": "permanent marker",
"description": "This is a King Size(tm) industrial strength permanent marker, about halfway between a typical marker and a can of spray paint in size. Use it to write something down. However, writing \"Elbereth\" probably won't help you.",
- "weight": 113,
+ "weight": "113 g",
"volume": 0,
"price": 500,
"material": "plastic",
@@ -4371,7 +4363,7 @@
"type": "TOOL",
"name": "pet carrier",
"description": "A plastic container meant to hold pets for transport. Use it on a suitable animal to capture, use it on an empty tile to release.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "5 L",
"price": 1000,
"bashing": 1,
@@ -4389,7 +4381,7 @@
"type": "TOOL",
"name": "wooden pet carrier",
"description": "A wooden container meant to hold pets for transport. Use it on a suitable animal to capture, use it on an empty tile to release.",
- "weight": 1500,
+ "weight": "1500 g",
"volume": "6250 ml",
"price": 800,
"material": [ "wood" ],
@@ -4402,7 +4394,7 @@
"type": "TOOL",
"name": "chicken cage",
"description": "A wire container made for transporting chickens, but you can use it to hold any tiny animal. Use it on a suitable animal to capture, use it on an empty tile to release.",
- "weight": 250,
+ "weight": "250 g",
"volume": "2500 ml",
"price": 100,
"bashing": 1,
@@ -4419,7 +4411,7 @@
"type": "TOOL",
"name": "zombie pheromone",
"description": "This is a disgusting ball of rotting meat of zombie origin. Squeezing this gland causes a small cloud of pheromones to spray into the air. Apparently the foul secretion can change zombies' attitude towards you, and they may ignore you for a short period of time. Perhaps they briefly consider you as one of them.",
- "weight": 238,
+ "weight": "238 g",
"volume": "250 ml",
"price": 4000,
"to_hit": -1,
@@ -4436,7 +4428,7 @@
"type": "TOOL",
"name": "pickaxe",
"description": "This is a large steel pickaxe, suitable for breaking up hard things or (with enough skill) hard targets. Strike the earth!",
- "weight": 4535,
+ "weight": "4535 g",
"volume": "3 L",
"price": 16000,
"to_hit": -3,
@@ -4454,7 +4446,7 @@
"type": "TOOL",
"name": "locksmith kit",
"description": "This is a locksmith's set of sturdy steel lock picks and torsion wrenches. It is essential for silently and quickly opening locks, provided you have some mechanical skill.",
- "weight": 544,
+ "weight": "544 g",
"volume": 0,
"price": 20000,
"material": "steel",
@@ -4468,7 +4460,7 @@
"category": "food",
"name": "fermenting pickle jar",
"description": "This jar contains a batch of pickles set to ferment. You can seal up the jar once the process is completed.",
- "weight": 52,
+ "weight": "52 g",
"volume": "250 ml",
"price": 10,
"bashing": 8,
@@ -4490,7 +4482,7 @@
"type": "TOOL",
"name": "glass pipe",
"description": "This is a hand-blown glass pipe. It's of the type most commonly used to smoke recreational substances.",
- "weight": 442,
+ "weight": "442 g",
"volume": "250 ml",
"price": 2000,
"to_hit": -10,
@@ -4505,7 +4497,7 @@
"type": "TOOL",
"name": "tobacco pipe",
"description": "This is a hand-carved wooden smoking pipe. It's designed to facilitate consumption of fire cured tobacco leaves.",
- "weight": 372,
+ "weight": "372 g",
"volume": "250 ml",
"price": 3000,
"to_hit": -10,
@@ -4521,7 +4513,7 @@
"category": "weapons",
"name": "pipe bomb",
"description": "This is a section of a pipe filled with explosive materials. Use this item to light the fuse, which gives you five turns to get away from it before it detonates. You'll need a lighter or some matches to use it.",
- "weight": 1298,
+ "weight": "1298 g",
"volume": "500 ml",
"price": 1500,
"to_hit": 1,
@@ -4546,7 +4538,7 @@
"category": "weapons",
"name": "active pipe bomb",
"description": "This pipe bomb's fuse is lit, and it will explode any second now. Throw it immediately!",
- "weight": 1298,
+ "weight": "1298 g",
"volume": "500 ml",
"price": 0,
"to_hit": 1,
@@ -4572,7 +4564,7 @@
"name": "pliers",
"name_plural": "pliers",
"description": "This is a basic pair of slip-joint pliers, able to handle basic mechanical work. Anything too complex will require a wrench.",
- "weight": 807,
+ "weight": "807 g",
"volume": "250 ml",
"price": 800,
"bashing": 3,
@@ -4588,7 +4580,7 @@
"name": "pocket watch",
"name_plural": "pocket watches",
"description": "An old fashioned pocket watch. This one tells you the time and looks good doing it. Can also be disassembled into some useful parts.",
- "weight": 65,
+ "weight": "65 g",
"volume": 0,
"price": 25000,
"price_postapoc": 1000,
@@ -4604,7 +4596,7 @@
"name": "pocket knife",
"name_plural": "pocket knives",
"description": "This is a small pocket knife. It isn't great for combat, but it's better than nothing. It's sharp enough to butcher with.",
- "weight": 141,
+ "weight": "141 g",
"volume": 0,
"price": 1000,
"to_hit": -2,
@@ -4620,7 +4612,7 @@
"type": "TOOL",
"name": "electric polisher",
"description": "An electric polisher which can be used to buff metal surfaces until they are reflective like a mirror.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "3500 ml",
"price": 35000,
"to_hit": -2,
@@ -4653,7 +4645,7 @@
"name": "soda can stove kit",
"//": "Should be 20 but currently recipes do not utilize this value",
"description": "This is an ultra-light alcohol-burning stove with simmer ring, crafted by hand from a couple of aluminum soda cans. It comes with a 500 ml plastic bottle to hold concentrated alcohol fuel.",
- "weight": 45,
+ "weight": "45 g",
"volume": "750 ml",
"price": 250,
"bashing": 1,
@@ -4672,7 +4664,7 @@
"type": "TOOL",
"name": "handheld game system",
"description": "This is a portable games console in working condition, with a backlit screen allowing you to play in the dark. You can use it to play it for a little while, but this requires batteries.",
- "weight": 200,
+ "weight": "200 g",
"volume": "500 ml",
"price": 12000,
"material": [ "plastic" ],
@@ -4684,13 +4676,13 @@
[
"battery",
[
+ "light_disposable_cell",
+ "light_minus_disposable_cell",
"light_battery_cell",
"light_plus_battery_cell",
"light_minus_battery_cell",
"light_atomic_battery_cell",
- "light_minus_atomic_battery_cell",
- "light_minus_disposable_cell",
- "light_disposable_cell"
+ "light_minus_atomic_battery_cell"
]
]
],
@@ -4701,7 +4693,7 @@
"type": "TOOL",
"name": "portal generator",
"description": "This is a rare, bizarre, and arcane device of an otherworldly nature. It's giving you a headache just looking at it. It is covered in alien markings.",
- "weight": 1133,
+ "weight": "1133 g",
"volume": "500 ml",
"price": 660000,
"to_hit": -1,
@@ -4714,26 +4706,12 @@
"charges_per_use": 5,
"use_action": "PORTAL"
},
- {
- "id": "press",
- "type": "TOOL",
- "name": "hand press & die set",
- "description": "This is a small hand press for hand loading firearm ammunition. It comes with everything you need to start hand loading your own munitions.",
- "weight": 6350,
- "volume": "500 ml",
- "price": 10000,
- "to_hit": -2,
- "bashing": 6,
- "material": [ "steel", "plastic" ],
- "symbol": ";",
- "color": "dark_gray"
- },
{
"id": "primitive_adze",
"type": "TOOL",
"name": "stone adze",
"description": "This is a stone adze, somewhat useful for cutting through wood objects.",
- "weight": 1300,
+ "weight": "1300 g",
"volume": "1 L",
"price": 1000,
"bashing": 8,
@@ -4749,7 +4727,7 @@
"type": "TOOL",
"name": "stone axe",
"description": "This is a sharpened stone affixed to a stick. It works passably well as an axe but really can't compare to a proper axe.",
- "weight": 3154,
+ "weight": "3154 g",
"volume": "3500 ml",
"price": 0,
"bashing": 11,
@@ -4765,7 +4743,7 @@
"type": "TOOL",
"name": "stone hammer",
"description": "This is a rock affixed to a stick, in the crude facsimile of a hammer. It functions adequately as a hammer, but really can't compare to a proper one.",
- "weight": 1020,
+ "weight": "1020 g",
"volume": "500 ml",
"price": 0,
"bashing": 9,
@@ -4782,7 +4760,7 @@
"name": "stone knife",
"name_plural": "stone knives",
"description": "This is a sharpened stone set into a hollowed handle. Not nearly as usable as a proper knife, but it's better than nothing.",
- "weight": 453,
+ "weight": "453 g",
"volume": "250 ml",
"price": 0,
"to_hit": -1,
@@ -4799,7 +4777,7 @@
"type": "TOOL",
"name": "stone shovel",
"description": "This is a flattened stone affixed to a stick. It works passably well as a shovel but really can't compare to a real shovel.",
- "weight": 1581,
+ "weight": "1581 g",
"volume": "4 L",
"price": 0,
"bashing": 15,
@@ -4823,27 +4801,13 @@
"charges_per_use": 1,
"use_action": { "type": "picklock", "pick_quality": 40 }
},
- {
- "id": "puller",
- "type": "TOOL",
- "name": "kinetic bullet puller",
- "description": "This is a tool used for properly disassembling firearm ammunition.",
- "weight": 489,
- "volume": "250 ml",
- "price": 1000,
- "bashing": 5,
- "material": "plastic",
- "symbol": ";",
- "color": "green",
- "qualities": [ [ "PULL", 1 ] ]
- },
{
"id": "rag",
"type": "TOOL",
"category": "spare_parts",
"name": "rag",
"description": "This is a largish piece of cloth, useful in crafting and possibly for staunching bleeding.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 0,
"material": "cotton",
@@ -4857,7 +4821,7 @@
"type": "TOOL",
"name": "sponge",
"description": "A sponge is a tool or cleaning aid made of soft, porous material. Typically used for cleaning impervious surfaces.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 0,
"material": "plastic",
@@ -4871,7 +4835,7 @@
"type": "TOOL",
"name": "washing kit",
"description": "A combination kit of a washboard and a sponge. Everything you need to clean items after the apocalypse.",
- "weight": 80,
+ "weight": "80 g",
"volume": "250 ml",
"price": 0,
"material": "plastic",
@@ -4886,7 +4850,7 @@
"name": "reading light",
"name_plural": "reading lights",
"description": "A little clip-on LED light, meant for reading books in the dark.",
- "weight": 90,
+ "weight": "90 g",
"volume": 0,
"price": 100,
"material": [ "plastic", "aluminum" ],
@@ -4906,13 +4870,13 @@
[
"battery",
[
+ "light_disposable_cell",
+ "light_minus_disposable_cell",
"light_battery_cell",
"light_plus_battery_cell",
"light_minus_battery_cell",
"light_atomic_battery_cell",
- "light_minus_atomic_battery_cell",
- "light_minus_disposable_cell",
- "light_disposable_cell"
+ "light_minus_atomic_battery_cell"
]
]
],
@@ -4935,7 +4899,7 @@
"type": "TOOL",
"name": "refillable lighter",
"description": "This is a lighter featuring a flip top cover and refuelable tank. A lighter must be carried to use various drugs, like cigarettes, or to light things like Molotov cocktails. You can also use a lighter to light nearby items on fire.",
- "weight": 20,
+ "weight": "20 g",
"volume": "31 ml",
"price": 3000,
"material": "aluminum",
@@ -4965,7 +4929,7 @@
"name": "refillable lighter",
"name_plural": "refillable lighters",
"description": "This is a lighter featuring a flip top cover and refuelable tank. It is lit.",
- "weight": 20,
+ "weight": "20 g",
"volume": "31 ml",
"price": 3000,
"material": "aluminum",
@@ -4975,7 +4939,7 @@
"initial_charges": 25,
"max_charges": 50,
"charges_per_use": 1,
- "turns_per_charge": 10,
+ "turns_per_charge": 20,
"revert_to": "ref_lighter",
"use_action": [
{ "type": "firestarter", "moves": 40, "moves_slow": 500 },
@@ -4995,7 +4959,7 @@
"category": "tools",
"name": "stone pot",
"description": "A large stone, roughly hollowed out into a pot.",
- "weight": 1500,
+ "weight": "1500 g",
"volume": "2 L",
"price": 0,
"to_hit": -1,
@@ -5013,7 +4977,7 @@
"type": "TOOL",
"name": "quern",
"description": "This is a simple hand-powered stone quern for grinding grain.",
- "weight": 3264,
+ "weight": "3264 g",
"volume": "2 L",
"price": 0,
"to_hit": -4,
@@ -5027,7 +4991,7 @@
"type": "TOOL",
"name": "rollmat",
"description": "This is a sheet of foam which can be rolled tightly for storage. It insulates you from the floor, making it easier to sleep. Use it to unroll and place on the ground.",
- "weight": 250,
+ "weight": "250 g",
"volume": "1 L",
"price": 4000,
"to_hit": -1,
@@ -5048,7 +5012,7 @@
"type": "TOOL",
"name": "RX12 jet injector",
"description": "The Rivtech RX12 jet injector is a small pistol-shaped device used to inject advanced fast-healing chemicals through the skin without using a needle. A label on the side warns against using more than two doses per hour.",
- "weight": 316,
+ "weight": "316 g",
"volume": "500 ml",
"price": 100000,
"material": [ "ceramic", "superalloy" ],
@@ -5067,7 +5031,7 @@
"name": "safe deposit box",
"name_plural": "safe deposit boxes",
"description": "This is a secure combination lock box. Sadly, you don't know the combination. Breaking inside it would destroy anything of value.",
- "weight": 2267,
+ "weight": "2267 g",
"volume": "3750 ml",
"price": 8000,
"to_hit": -2,
@@ -5083,7 +5047,7 @@
"type": "TOOL",
"name": "sarcophagus access code",
"description": "This printout is a string of numbers to access the elevator in the hazardous waste sarcophagus.",
- "weight": 5,
+ "weight": "5 g",
"volume": 0,
"price": 0,
"to_hit": -1,
@@ -5098,7 +5062,7 @@
"category": "food",
"name": "fermenting sauerkraut jar",
"description": "This jar contains a batch of sauerkraut set to ferment. You can seal up the jar once the process is completed.",
- "weight": 1750,
+ "weight": "1750 g",
"volume": "500 ml",
"price": 10,
"bashing": 4,
@@ -5120,7 +5084,7 @@
"type": "TOOL",
"name": "wood saw",
"description": "This is a thin saw, useful for cutting through wood objects.",
- "weight": 283,
+ "weight": "283 g",
"volume": "1 L",
"price": 3000,
"to_hit": -2,
@@ -5136,7 +5100,7 @@
"type": "TOOL",
"name": "scalpel",
"description": "This is a very sharp knife designed for surgical cutting. Its small, sharp blade allows for precision strikes in the hands of the skilled.",
- "weight": 23,
+ "weight": "23 g",
"volume": "15 ml",
"price": 1000,
"to_hit": -3,
@@ -5154,7 +5118,7 @@
"name": "pair of scissors",
"name_plural": "pairs of scissors",
"description": "These are a long pair of heavy duty scissors. Use scissors to cut items made from cotton (like clothing) into rags.",
- "weight": 113,
+ "weight": "113 g",
"volume": "250 ml",
"price": 400,
"to_hit": -1,
@@ -5170,7 +5134,7 @@
"type": "TOOL",
"name": "screwdriver",
"description": "This is a Philips-head screwdriver. It is important for almost all electronics crafting, most mechanics crafting, and has many more uses.",
- "weight": 170,
+ "weight": "170 g",
"volume": "250 ml",
"price": 450,
"to_hit": -1,
@@ -5187,7 +5151,7 @@
"type": "TOOL",
"name": "screwdriver set",
"description": "This is a set of screwdrivers in several sizes and blade types. Guaranteed to have the right tools for more precise work.",
- "weight": 340,
+ "weight": "340 g",
"volume": "500 ml",
"price": 2000,
"to_hit": -1,
@@ -5204,7 +5168,7 @@
"type": "TOOL",
"name": "scythe",
"description": "This is an old-fashioned farming tool used to cut tall grass. While it may be a giant blade on the end of a stick, it is incredibly awkward to use for anything but its intended purpose.",
- "weight": 3013,
+ "weight": "3013 g",
"volume": "3250 ml",
"price": 8000,
"to_hit": -6,
@@ -5222,7 +5186,7 @@
"type": "TOOL",
"name": "sewing kit",
"description": "This is a plastic kit with a variety of needles, some plastic spools for thread, and a few other useful textile tools. Use a sewing kit on an article of clothing to attempt to repair or reinforce that clothing. This uses your tailoring skill.",
- "weight": 85,
+ "weight": "85 g",
"volume": "250 ml",
"price": 1000,
"to_hit": -1,
@@ -5250,7 +5214,7 @@
"type": "TOOL",
"name": "anesthesia kit",
"description": "A kit for inducing anesthesia for surgery, containing specialized canisters with a variety of powerful hypnotic, analgetic, and stimulative drugs. It's intended for use in specialized medical equipment, and can't be administered manually.",
- "weight": 100,
+ "weight": "100 g",
"volume": "3250 ml",
"price": 1000,
"to_hit": -1,
@@ -5267,7 +5231,7 @@
"type": "TOOL",
"name": "shaving kit",
"description": "This is a compact and lightweight shaving kit made for travelers. You can use it to shave if it's supplied with soap. It requires 1 unit of soap per use.",
- "weight": 90,
+ "weight": "90 g",
"volume": "250 ml",
"price": 1000,
"to_hit": -1,
@@ -5285,7 +5249,7 @@
"type": "TOOL",
"name": "shelter kit",
"description": "This is a small shelter, made of sticks and skins. Use it to place.",
- "weight": 1360,
+ "weight": "1360 g",
"volume": "7500 ml",
"price": 6500,
"to_hit": -3,
@@ -5310,7 +5274,7 @@
"name": "shishkebab (off)",
"name_plural": "shishkebabs (off)",
"description": "This is a large blade with a fuel pipe on the side, and a small tank and igniter built into the insulated hilt. When filled with gasoline, the blade can be made scorching hot to singe enemies and light your way. Use to ignite.",
- "weight": 1701,
+ "weight": "1701 g",
"volume": "2500 ml",
"price": 10000,
"bashing": 4,
@@ -5364,7 +5328,7 @@
"type": "TOOL",
"name": "shotgun trap",
"description": "This is a simple tripwire is attached to the trigger of a loaded double-barreled shotgun. When pulled, the shotgun fires. Two shells are loaded; the first time the trigger is pulled, one or both shells may be discharged.",
- "weight": 2922,
+ "weight": "2922 g",
"volume": "1750 ml",
"price": 25000,
"to_hit": -2,
@@ -5385,7 +5349,7 @@
"type": "TOOL",
"name": "shovel",
"description": "This is a digging tool. Use it to dig pits adjacent to your location.",
- "weight": 1315,
+ "weight": "1315 g",
"volume": "3500 ml",
"price": 2000,
"to_hit": 3,
@@ -5403,7 +5367,7 @@
"type": "TOOL",
"name": "sickle",
"description": "This is an old-fashioned farming tool used to cut tall grass. While it may be a massive curved blade on a handle, it is incredibly awkward to use for anything but its intended purpose.",
- "weight": 1432,
+ "weight": "1432 g",
"volume": "1250 ml",
"price": 3800,
"to_hit": -6,
@@ -5421,7 +5385,7 @@
"type": "TOOL",
"name": "small fire extinguisher",
"description": "This is a hand held fire extinguisher containing a liter of highly compressed CO2 gas. It would be useful for putting out adjacent fires.",
- "weight": 2267,
+ "weight": "2267 g",
"volume": "1500 ml",
"price": 4000,
"to_hit": -1,
@@ -5439,7 +5403,7 @@
"type": "TOOL",
"name": "firearm repair kit",
"description": "This is a portable toolkit made to repair damaged firearms. Powered by standard batteries, it is a vital tool for long-term firearms maintenance. It requires 100 charges of battery power per use.",
- "weight": 2420,
+ "weight": "2420 g",
"volume": "1500 ml",
"price": 1500,
"to_hit": -1,
@@ -5478,7 +5442,7 @@
"name": "smart lamp (off)",
"name_plural": "smart lamps (off)",
"description": "This is a smart lamp, it can be activated remotely.",
- "weight": 400,
+ "weight": "400 g",
"volume": "500 ml",
"price": 500,
"to_hit": -1,
@@ -5531,7 +5495,7 @@
"type": "TOOL",
"name": "emergency oxygen pack",
"description": "This is a small tank of compressed medical oxygen with a folding regulator and mask. Commonly used in emergency situations, it provides immediate relief for asthma attacks or smoke inhalation, and can provide a brief burst of energy.",
- "weight": 1134,
+ "weight": "1134 g",
"volume": "750 ml",
"price": 4000,
"to_hit": -3,
@@ -5549,7 +5513,7 @@
"type": "TOOL",
"name": "soldering iron",
"description": "This is a device with a metal tip that can get very hot. It is necessary for advanced electronics crafting. You could also use it to cauterize wounds, if you had to.",
- "weight": 181,
+ "weight": "181 g",
"volume": "500 ml",
"price": 1000,
"bashing": 2,
@@ -5563,7 +5527,7 @@
{
"type": "repair_item",
"item_action_type": "repair_metal",
- "materials": [ "kevlar", "plastic", "iron", "steel", "hardsteel", "aluminum", "copper" ],
+ "materials": [ "plastic", "lead", "tin" ],
"skill": "mechanics",
"cost_scaling": 0.1,
"move_cost": 1500
@@ -5592,7 +5556,7 @@
"type": "TOOL",
"name": "spray can",
"description": "This is a spray can, filled with paint. Use this tool to make graffiti on the floor.",
- "weight": 340,
+ "weight": "340 g",
"volume": "250 ml",
"price": 500,
"material": "aluminum",
@@ -5609,7 +5573,7 @@
"type": "TOOL",
"name": "stepladder",
"description": "This is a wooden stepladder. Use it to set it down.",
- "weight": 20000,
+ "weight": "20000 g",
"volume": "50 L",
"price": 2000,
"to_hit": -3,
@@ -5624,7 +5588,7 @@
"type": "TOOL",
"name": "still",
"description": "This is a still. It's useful for creating distillation of alcohol and other, more curious substances.",
- "weight": 10000,
+ "weight": "10000 g",
"volume": "10 L",
"price": 30000,
"to_hit": -6,
@@ -5639,7 +5603,7 @@
"type": "TOOL",
"name": "autoclave",
"description": "This is an autoclave. It's useful for sterilizing things like CBMs. It requires a massive amount of power, so standard batteries will not power it sufficiently.",
- "weight": 34500,
+ "weight": "34500 g",
"volume": "76 L",
"price": 162654,
"to_hit": -6,
@@ -5664,7 +5628,7 @@
"type": "TOOL",
"name": "survival marker",
"description": "This is a sharpened piece of charcoal that is almost guaranteed to make your hands all covered in charcoal. Use it to write something down.",
- "weight": 113,
+ "weight": "113 g",
"volume": 0,
"price": 0,
"material": "plastic",
@@ -5681,7 +5645,7 @@
"type": "TOOL",
"name": "makeshift haircut kit",
"description": "This is a kit with tools for cutting hair.",
- "weight": 642,
+ "weight": "642 g",
"volume": "1 L",
"price": 1000,
"to_hit": -1,
@@ -5696,7 +5660,7 @@
"type": "TOOL",
"name": "survivor mess kit",
"description": "A homemade mess kit, containing everything you might need for creating post-apocalyptic cuisine. Powered by a lamp oil burner, it is composed of simple yet durable tools and materials.",
- "weight": 2160,
+ "weight": "2160 g",
"volume": "2500 ml",
"price": 2000,
"to_hit": -1,
@@ -5717,7 +5681,7 @@
"name": "survivor telescope",
"name_plural": "survivor telescopes",
"description": "A homemade collapsible telescope. Too large and inaccurate to use as a weapon scope, but carrying this item in your inventory will double the distance that is mapped around you during your travels.",
- "weight": 500,
+ "weight": "500 g",
"volume": "250 ml",
"price": 600,
"to_hit": -1,
@@ -5732,7 +5696,7 @@
"type": "TOOL",
"name": "makeshift shaving kit",
"description": "This is a makeshift shaving kit. You can use it to shave if it's supplied with soap. It requires 1 unit of soap per use.",
- "weight": 540,
+ "weight": "540 g",
"volume": "750 ml",
"price": 1000,
"to_hit": -1,
@@ -5750,7 +5714,7 @@
"type": "TOOL",
"name": "swage and die set",
"description": "These are a set of swages and dies for metalsmithing. These loops and metal blocks are used in some metalworking fabrication recipes.",
- "weight": 2620,
+ "weight": "2620 g",
"volume": "2 L",
"price": 16000,
"to_hit": 1,
@@ -5765,7 +5729,7 @@
"type": "TOOL",
"name": "syringe",
"description": "A medical syringe. Used for administering intravenous drugs.",
- "weight": 10,
+ "weight": "10 g",
"volume": "10ml",
"price": 2500,
"material": "plastic",
@@ -5777,7 +5741,7 @@
"type": "TOOL",
"name": "tailor's kit",
"description": "This is a high quality, plastic kit with a variety of needles, some plastic spools for thread, some small scissors, even a small heating element for melting and joining plastic. Use a tailor's kit to customize your clothing and armor. This uses your tailoring skill.",
- "weight": 100,
+ "weight": "100 g",
"volume": "500 ml",
"price": 1000,
"to_hit": -2,
@@ -5815,7 +5779,7 @@
"category": "spare_parts",
"name": "tanning leather hide",
"description": "A treated animal hide which is undergoing the chemical processes required to become leather. You will be able to activate it to unroll and make use of it when it is done.",
- "weight": 400,
+ "weight": "400 g",
"volume": "1 L",
"price": 0,
"to_hit": -2,
@@ -5839,7 +5803,7 @@
"category": "spare_parts",
"name": "tanning fur pelt",
"description": "A treated animal pelt which is undergoing the chemical processes required to become fur. You will be able to activate it to unroll and make use of it when it is done.",
- "weight": 400,
+ "weight": "400 g",
"volume": "1 L",
"price": 0,
"to_hit": -2,
@@ -5863,7 +5827,7 @@
"category": "tools",
"name": "teapot",
"description": "A small metal teapot. Teatime wouldn't be complete without one.",
- "weight": 229,
+ "weight": "229 g",
"volume": "500 ml",
"price": 1000,
"to_hit": 2,
@@ -5879,7 +5843,7 @@
"type": "TOOL",
"name": "teleport pad",
"description": "This is a kit for a teleporter trap consisting of a teleporter and a solar cell that is triggered when stepped upon.",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "1 L",
"price": 700000,
"to_hit": -4,
@@ -5895,7 +5859,7 @@
"type": "TOOL",
"name": "teleporter",
"description": "This is an experimental device that will teleport you a short distance when activated.",
- "weight": 1360,
+ "weight": "1360 g",
"volume": "2 L",
"price": 600000,
"to_hit": -1,
@@ -5914,7 +5878,7 @@
"category": "tools",
"name": "telescoping umbrella",
"description": "A telescoping umbrella which collapses down for easy storage, useful for keeping dry when wielded.",
- "weight": 118,
+ "weight": "118 g",
"volume": "500 ml",
"price": 12000,
"to_hit": 1,
@@ -5930,7 +5894,7 @@
"type": "TOOL",
"name": "tent",
"description": "This is a small personal tent, it's just big enough to fit you comfortably.",
- "weight": 1133,
+ "weight": "1133 g",
"volume": "2500 ml",
"price": 15000,
"to_hit": -3,
@@ -5954,7 +5918,7 @@
"name": "Flaming Chunk of Steel +2",
"name_plural": "Flaming Chunks of Steel +2",
"description": "HOLY SHIT THIS THING IS ON FIRE",
- "weight": 64,
+ "weight": "64 g",
"volume": "250 ml",
"price": 98000,
"to_hit": 100,
@@ -5973,7 +5937,7 @@
"name": "thermometer",
"name_plural": "thermometers",
"description": "A plastic thermometer that can read the air temperature.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 100,
"to_hit": -3,
@@ -5989,7 +5953,7 @@
"category": "tools",
"name": "throwable fire extinguisher",
"description": "This is a fire extinguisher in grenade form. While not as effective as a regular fire extinguisher, you can use it from a distance. It is activated by heat, so just throw it into the flames.",
- "weight": 630,
+ "weight": "630 g",
"volume": "250 ml",
"price": 3000,
"to_hit": -1,
@@ -6006,7 +5970,7 @@
"name": "pair of metal tongs",
"name_plural": "pairs of metal tongs",
"description": "These are long, metal tongs. They are commonly used for cooking or in metalworking fabrication recipes.",
- "weight": 540,
+ "weight": "540 g",
"volume": "500 ml",
"price": 1600,
"to_hit": 1,
@@ -6023,7 +5987,7 @@
"type": "TOOL",
"name": "small space heater",
"description": "A portable electric heater that steadily emits warm air. Raises temperature about 10 degrees C.",
- "weight": 6000,
+ "weight": "6000 g",
"volume": "3750 ml",
"price": 5000,
"to_hit": -3,
@@ -6069,7 +6033,7 @@
"type": "TOOL",
"name": "large space heater",
"description": "A portable electric heater that steadily emits warm air. Raises temperature about 10 degrees C and fills a larger volume of air than the smaller version.",
- "weight": 12000,
+ "weight": "12000 g",
"volume": "7500 ml",
"price": 20000,
"to_hit": -3,
@@ -6113,7 +6077,7 @@
"category": "weapons",
"name": "ANFO charge",
"description": "This is a large metal keg filled with ANFO pellets and equipped with a dynamite primer. Use this item to light the fuse. You will then have twenty turns before it explodes and creates a large fireball.",
- "weight": 77800,
+ "weight": "77800 g",
"volume": "50 L",
"price": 75000,
"to_hit": -5,
@@ -6144,7 +6108,7 @@
"category": "weapons",
"name": "active ANFO charge",
"description": "This is a large metal keg filled with ANFO pellets and equipped with a dynamite primer. The fuse has been lit - better run like hell!",
- "weight": 77800,
+ "weight": "77800 g",
"volume": "50 L",
"price": 0,
"to_hit": -5,
@@ -6177,7 +6141,7 @@
"name": "black gunpowder bomb",
"description": "This is a tin can filled to the brim with black gunpowder and with a bit of fuse sticking out of it.",
"//": "40g of tin can and 250ml/412g of gunpowder",
- "weight": 452,
+ "weight": "452 g",
"volume": "250 ml",
"price": 2500,
"to_hit": -2,
@@ -6203,7 +6167,7 @@
"category": "weapons",
"name": "active black gunpowder bomb",
"description": "This is a tin can filled to the brim with black gunpowder and with a lit fuse stuck inside of it.",
- "weight": 452,
+ "weight": "452 g",
"volume": "500 ml",
"price": 0,
"to_hit": -2,
@@ -6230,7 +6194,7 @@
"category": "weapons",
"name": "black gunpowder charge",
"description": "This is a home-made explosive device, consisting of a large plastic jug filled with black gunpowder and scrap metal, equipped with a long fuse. Use this item to light the fuse. Should explode in a few minutes...",
- "weight": 5000,
+ "weight": "5000 g",
"volume": "4 L",
"price": 20000,
"to_hit": -2,
@@ -6255,7 +6219,7 @@
"category": "weapons",
"name": "active black gunpowder charge",
"description": "This is a home-made explosive device, consisting of a large plastic jug filled with black gunpowder and scrap metal, whose fuse has been lit, its final countdown starting.",
- "weight": 5000,
+ "weight": "5000 g",
"volume": "4 L",
"price": 0,
"to_hit": -2,
@@ -6282,7 +6246,7 @@
"category": "weapons",
"name": "RDX charge",
"description": "This is an metal keg, filled with 50 liters worth of RDX and scrap metal. Contains a core of primary explosive to ensure that the charge detonates completely and delivers its entire destructive power to everything in sight.",
- "weight": 106600,
+ "weight": "106600 g",
"volume": "50 L",
"price": 90000,
"to_hit": -5,
@@ -6312,7 +6276,7 @@
"category": "weapons",
"name": "active RDX charge",
"description": "This is an metal keg, filled with 50 liters worth of RDX and scrap metal. The fuse has been lit and once it ignites the primary explosive, the charge will detonate and rain fire and steel on everything in sight.",
- "weight": 106600,
+ "weight": "106600 g",
"volume": "50 L",
"price": 0,
"to_hit": -5,
@@ -6344,7 +6308,7 @@
"category": "weapons",
"name": "RDX sand bomb",
"description": "This is a steel pipe, containing a mixture of RDX and sand, the former propelling the latter into a deadly mist of vicious shrapnel. Use this item to light the fuse.",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "500 ml",
"price": 1000,
"to_hit": -2,
@@ -6375,7 +6339,7 @@
"category": "weapons",
"name": "active RDX sand bomb",
"description": "This is a steel pipe, containing a mixture of RDX and sand, the former propelling the latter into a deadly mist of vicious shrapnel. The fuse has been lit, so why are you still holding it?",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "500 ml",
"price": 0,
"to_hit": -2,
@@ -6406,7 +6370,7 @@
"category": "weapons",
"name": "rocket candy",
"description": "A pear-shaped chunk of rocket candy obtained by heating saltpeter with sugar and casting the obtained liquid. Can serve as a rocket fuel, but also as a smokescreen - if you lit the narrow end, you should be able to throw it before the flame reaches the broad end.",
- "weight": 250,
+ "weight": "250 g",
"volume": "250 ml",
"price": 100,
"to_hit": -2,
@@ -6430,7 +6394,7 @@
"category": "weapons",
"name": "burning rocket candy",
"description": "This is a chunk of rocket candy that has been lit on fire and burns with a loud hiss, spewing forth large amounts of smoke.",
- "weight": 250,
+ "weight": "250 g",
"volume": "250 ml",
"price": 0,
"to_hit": -2,
@@ -6460,7 +6424,7 @@
"name": "toolbox",
"name_plural": "toolboxes",
"description": "This is a stout metal box containing a complete tool kit suitable for most household maintenance and construction activities.",
- "weight": 3522,
+ "weight": "3522 g",
"volume": "2500 ml",
"price": 12999,
"to_hit": -2,
@@ -6495,7 +6459,7 @@
"description": "Your toolset, protruding from your hands. It can slice, dice, and make everything nice.",
"symbol": "#",
"color": "white",
- "weight": 226,
+ "weight": "226 g",
"bashing": 3,
"cutting": 5,
"flags": [ "NO_UNWIELD", "UNBREAKABLE_MELEE", "TRADER_AVOID", "USES_BIONIC_POWER" ],
@@ -6539,7 +6503,7 @@
"name": "torch",
"name_plural": "torches",
"description": "This is a large stick, wrapped in rags that are soaked with a flammable material. When lit, produces a fair amount of light. You'll need a lighter or matches to light it.",
- "weight": 831,
+ "weight": "831 g",
"volume": "750 ml",
"price": 0,
"to_hit": 1,
@@ -6566,7 +6530,7 @@
"name": "torch",
"name_plural": "torches",
"description": "This is a large stick, wrapped in rags that are soaked with a flammable material. It is burning, producing plenty of light.",
- "weight": 831,
+ "weight": "831 g",
"volume": "750 ml",
"price": 0,
"to_hit": 1,
@@ -6576,7 +6540,7 @@
"color": "brown",
"initial_charges": 75,
"max_charges": 75,
- "turns_per_charge": 20,
+ "turns_per_charge": 40,
"revert_to": "torch_done",
"use_action": [
{ "type": "firestarter", "moves": 30 },
@@ -6597,7 +6561,7 @@
"name": "hedge trimmer (off)",
"name_plural": "hedge trimmers (off)",
"description": "A cordless, double-sided, gasoline-powered hedge trimmer. A long line of sharp-edged teeth extends from the engine; turning the trimmer on will make them rapidly vibrate. The poor man's chainsaw as far as the zombies are concerned.",
- "weight": 4500,
+ "weight": "4500 g",
"volume": "2500 ml",
"price": 4000,
"to_hit": -1,
@@ -6630,7 +6594,7 @@
"type": "TOOL",
"name": "tripwire trap",
"description": "This is some thin strong cable with some affixing tools on either end. A tripwire trap must be placed across a doorway or other thin passage. Its purpose is to trip up bypassers, causing them to stumble and possibly hurt themselves slightly.",
- "weight": 40,
+ "weight": "40 g",
"volume": "250 ml",
"price": 300,
"to_hit": -1,
@@ -6653,7 +6617,7 @@
"name": "trumpet",
"name_plural": "trumpets",
"description": "A brass trumpet with only a few dents here and there.",
- "weight": 1500,
+ "weight": "1500 g",
"volume": "2500 ml",
"price": 7500,
"to_hit": 1,
@@ -6684,7 +6648,7 @@
"name": "ukulele",
"name_plural": "ukuleles",
"description": "A small factory made ukulele. Looks to be in working condition.",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "2500 ml",
"price": 7500,
"to_hit": 2,
@@ -6714,7 +6678,7 @@
"category": "tools",
"name": "umbrella",
"description": "An umbrella with a pointy end, useful for keeping dry when wielded.",
- "weight": 141,
+ "weight": "141 g",
"volume": "1500 ml",
"price": 2400,
"to_hit": 1,
@@ -6731,7 +6695,7 @@
"type": "TOOL",
"name": "vacuum sealer",
"description": "This is a portable heat sealer unit with an air pump. It's used for vacuum packing food to preserve it.",
- "weight": 2449,
+ "weight": "2449 g",
"volume": "1250 ml",
"price": 2500,
"to_hit": -1,
@@ -6755,7 +6719,7 @@
"category": "tools",
"name": "blood draw kit",
"description": "This is a kit for drawing blood, including a test tube for holding the sample. Use this tool to draw blood, either from yourself or from a corpse you are standing on.",
- "weight": 13,
+ "weight": "13 g",
"volume": "250 ml",
"price": 3000,
"to_hit": -3,
@@ -6775,7 +6739,7 @@
"category": "tools",
"name": "hand-crank charger",
"description": "This is a hand-powered battery charger. It has an adjustable receptacle designed to accept a wide variety of rechargeable battery cells.",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "500 ml",
"price": 1000,
"material": "plastic",
@@ -6804,7 +6768,7 @@
"name": "vibrator",
"name_plural": "vibrators",
"description": "This battery-devouring device is just the thing to knead the tension out and help you relax. Use it to take a break and unwind.",
- "weight": 453,
+ "weight": "453 g",
"volume": "500 ml",
"price": 5500,
"material": [ "aluminum", "plastic" ],
@@ -6836,7 +6800,7 @@
"name": "violin",
"name_plural": "violins",
"description": "A cheap, factory-made violin with a built-in holder for a bow. Still produces a nice sound.",
- "weight": 1300,
+ "weight": "1300 g",
"volume": "2500 ml",
"price": 7500,
"to_hit": 2,
@@ -6867,7 +6831,7 @@
"name": "golden fiddle",
"name_plural": "golden fiddles",
"description": "A shiny golden fiddle, with a strange aura around it. You feel like it once belonged to the best there's ever been.",
- "weight": 13000,
+ "weight": "13000 g",
"volume": "2500 ml",
"price": 1000000,
"to_hit": 2,
@@ -6896,7 +6860,7 @@
"type": "TOOL",
"name": "vortex stone",
"description": "This is a stone with spirals all over it, and holes around its perimeter. Though it is fairly large, it weighs next to nothing. Air seems to gather around it.",
- "weight": 1,
+ "weight": "1 g",
"volume": "250 ml",
"price": 300000,
"bashing": 6,
@@ -6914,7 +6878,7 @@
"category": "tools",
"name": "waffle iron",
"description": "A waffle iron. For making waffles.",
- "weight": 2628,
+ "weight": "2628 g",
"volume": "1 L",
"price": 2000,
"to_hit": 2,
@@ -6929,7 +6893,7 @@
"type": "TOOL",
"name": "washboard",
"description": "This is a wooden washboard. You can use it to wash filthy clothing if it's supplied with cleansing agent.",
- "weight": 90,
+ "weight": "90 g",
"volume": "250 ml",
"price": 1000,
"to_hit": -1,
@@ -6944,7 +6908,7 @@
"type": "TOOL",
"name": "water purifier",
"description": "This is a battery-powered device designed to purify drinking water. Using this item on a container full of water will purify the contents. It could be useful for water taken from uncertain sources like a river, as it may be non-potable.",
- "weight": 1360,
+ "weight": "1360 g",
"volume": "3 L",
"price": 10000,
"to_hit": -3,
@@ -6978,7 +6942,7 @@
"category": "tools",
"name": "Doppler Radar Turbo 2000",
"description": "A briefcase with built-in laptop that looks like it's from the 80s. Its vintage monochrome monitor displays a plethora of meteorological data. No sign of the FLDSMDFR, however.",
- "weight": 10,
+ "weight": "10 g",
"volume": "2500 ml",
"price": 200,
"to_hit": -1,
@@ -6998,9 +6962,7 @@
"light_plus_battery_cell",
"light_minus_battery_cell",
"light_atomic_battery_cell",
- "light_minus_atomic_battery_cell",
- "light_minus_disposable_cell",
- "light_disposable_cell"
+ "light_minus_atomic_battery_cell"
]
]
],
@@ -7011,7 +6973,7 @@
"type": "TOOL",
"name": "welder",
"description": "This is a battery powered tool for welding metal pieces together. It is an indispensable tool for construction or repair.",
- "weight": 4200,
+ "weight": "4200 g",
"volume": "2500 ml",
"price": 9000,
"to_hit": -1,
@@ -7048,7 +7010,7 @@
"type": "TOOL",
"name": "makeshift welder",
"description": "This crude welder has been fashioned from a bundle of copper wire, scrap metal, and complete disregard for personal safety. While it's not as efficient as a factory welder, it will serve in a pinch.",
- "weight": 7250,
+ "weight": "7250 g",
"volume": "3500 ml",
"price": 5000,
"to_hit": -2,
@@ -7084,7 +7046,7 @@
"type": "TOOL",
"name": "wooden smoother",
"description": "This large makeshift tool is used in smoothing concrete or mortar in construction projects. You could also use it as an improvised head-basher.",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "3500 ml",
"price": 2000,
"to_hit": -3,
@@ -7100,7 +7062,7 @@
"category": "spare_parts",
"name": "wool staple",
"description": "The natural cluster of wool fibers. Could be processed to the felt patches or yarns.",
- "weight": 200,
+ "weight": "200 g",
"volume": "500 ml",
"price": 0,
"to_hit": -4,
@@ -7114,7 +7076,7 @@
"type": "TOOL",
"name": "wrapped radiation badge",
"description": "This is a badge that detects radiation dosage sealed in a radiation-blocking bag. Use it to remove it from the bag.",
- "weight": 20,
+ "weight": "20 g",
"volume": 0,
"price": 1000,
"material": [ "plastic" ],
@@ -7133,7 +7095,7 @@
"name": "wrench",
"name_plural": "wrenches",
"description": "This is an adjustable crescent wrench. It could be a decent melee weapon, and is used in many mechanics crafting recipes.",
- "weight": 907,
+ "weight": "907 g",
"volume": "500 ml",
"price": 1200,
"to_hit": 1,
@@ -7150,7 +7112,7 @@
"name": "X-Acto knife",
"name_plural": "X-Acto knives",
"description": "This is a small, sharp knife, designed for making precise cuts for textiles or crafts. It could cause decent damage, but is difficult to hit things with it. Its small, sharp blade allows for precision strikes in the hands of the skilled. It is too small to butcher corpses with.",
- "weight": 23,
+ "weight": "23 g",
"volume": "250 ml",
"price": 400,
"to_hit": -3,
@@ -7172,7 +7134,7 @@
"price": 600,
"price_postapoc": 100,
"material": "steel",
- "weight": 10,
+ "weight": "10 g",
"cutting": 1
},
{
@@ -7181,7 +7143,7 @@
"category": "tools",
"name": "food processor",
"description": "This is a kitchen appliance capable of slicing, chopping, shredding, grinding, pureeing and mixing.",
- "weight": 3000,
+ "weight": "3000 g",
"volume": "2 L",
"price": 50,
"to_hit": -1,
@@ -7205,7 +7167,7 @@
"category": "spare_parts",
"name": "chainmail sheet",
"description": "This is a sheet of riveted chainmail. With some skill, several of these sheets could be connected to make effective armor.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "500 ml",
"price": 1000,
"material": "iron",
@@ -7218,7 +7180,7 @@
"type": "TOOL",
"name": "electrolysis kit",
"description": "A set of wiring and electrodes for applying a direct current, usually to a liquid. Useful for crafting. Load with a storage battery or 12V vehicle battery to use.",
- "weight": 250,
+ "weight": "250 g",
"volume": "250 ml",
"price": 1000,
"material": [ "steel", "copper", "plastic" ],
@@ -7237,7 +7199,7 @@
"type": "TOOL",
"name": "platinum grille",
"description": "This is a metal grille with a layer of platinum plating, suitable for use as a catalyst for some chemical reactions.",
- "weight": 660,
+ "weight": "660 g",
"volume": "250 ml",
"price": 3000,
"to_hit": 1,
@@ -7254,7 +7216,7 @@
"category": "tools",
"name": "pressure cooker",
"description": "Useful for boiling water when cooking spaghetti and more. This sealed pot is designed to cook food at higher pressures and temperatures. Can also be used for pressure sensitive chemical reactions.",
- "weight": 2200,
+ "weight": "2200 g",
"volume": "2500 ml",
"price": 6500,
"to_hit": 1,
@@ -7273,7 +7235,7 @@
"type": "TOOL",
"name": "hobo stove",
"description": "This is a small improvised wood stove, made from a metal can or similar container of the right size. Useful for defrosting and reheating food, uses simple tinder.",
- "weight": 500,
+ "weight": "500 g",
"volume": "250 ml",
"price": 0,
"to_hit": -1,
@@ -7302,7 +7264,7 @@
"name": "hobo stove (lit)",
"name_plural": "hobo stoves (lit)",
"description": "This is a small improvised wood stove, made from a metal can or similar container of the right size. Useful for defrosting and reheating food, uses simple tinder.",
- "weight": 500,
+ "weight": "500 g",
"volume": "250 ml",
"price": 0,
"to_hit": -1,
@@ -7332,7 +7294,7 @@
"type": "TOOL",
"name": "ember carrier",
"description": "This is a small container for holding tinder, with holes punched in it to provide a controlled airflow. It can nurture a smoldering ember for a long time, to start fires without modern tools.",
- "weight": 500,
+ "weight": "500 g",
"volume": "500 ml",
"price": 1000,
"material": "steel",
@@ -7355,7 +7317,7 @@
"name": "ember carrier (lit)",
"name_plural": "ember carriers (lit)",
"description": "This is a small container for holding tinder, with holes punched in it to provide a controlled airflow. An ember is smoldering inside it, and can be used to start a campfire.",
- "weight": 500,
+ "weight": "500 g",
"volume": "500 ml",
"price": 1000,
"material": "steel",
@@ -7383,7 +7345,7 @@
"name": "pallet of wet adobe bricks",
"name_plural": "pallets of wet adobe bricks",
"description": "A pallet full of heavy mud bricks which need to dry slowly to be usable.",
- "weight": 35000,
+ "weight": "35000 g",
"volume": "12500 ml",
"price": 100,
"to_hit": -2,
@@ -7409,7 +7371,7 @@
"name": "pallet of dry adobe bricks",
"name_plural": "pallets of dry adobe bricks",
"description": "A pallet of humble mud bricks that have dried for a week, while you were out risking your life. Disassemble it to retrieve your frame and building supplies.",
- "weight": 30000,
+ "weight": "30000 g",
"volume": "12500 ml",
"price": 40000,
"to_hit": -3,
@@ -7424,7 +7386,7 @@
"type": "TOOL",
"name": "bronze anvil",
"description": "This is a block of oddly shaped bronze with a chisel-like projection set into the corner. It's used in most metalworking fabrication recipes.",
- "weight": 2180,
+ "weight": "2180 g",
"volume": "2500 ml",
"price": 60000,
"to_hit": -5,
@@ -7440,7 +7402,7 @@
"type": "TOOL",
"name": "stone hand axe",
"description": "This is a broad piece of sharpened stone, with enough left untouched to hold safely. The Swiss Army knife of the lower paleolithic.",
- "weight": 453,
+ "weight": "453 g",
"volume": "500 ml",
"price": 0,
"to_hit": -1,
@@ -7464,7 +7426,7 @@
"type": "TOOL",
"name": "pin reamer",
"description": "Handheld pin reamers of this kind are used to enlarge existing holes, or remove any burs and such from them.",
- "weight": 76,
+ "weight": "76 g",
"volume": "250 ml",
"price": 300,
"to_hit": -2,
@@ -7480,7 +7442,7 @@
"type": "TOOL",
"name": "metal fileset",
"description": "These tools are commonly used to remove small amounts of materials from the surface of metal objects.",
- "weight": 76,
+ "weight": "76 g",
"volume": "250 ml",
"price": 300,
"to_hit": -2,
@@ -7496,7 +7458,7 @@
"type": "TOOL",
"name": "angular grinder",
"description": "This widespread powertool is often used for removing excess material or polishing surfaces.",
- "weight": 2780,
+ "weight": "2780 g",
"volume": "1750 ml",
"price": 5000,
"to_hit": -3,
@@ -7508,7 +7470,7 @@
"qualities": [ [ "GRIND", 2 ] ],
"ammo": "battery",
"charges_per_use": 1,
- "turns_per_charge": 20,
+ "power_draw": 800000,
"flags": [ "NONCONDUCTIVE" ],
"magazines": [
[
@@ -7523,7 +7485,7 @@
"type": "TOOL",
"name": "hand vice",
"description": "This small handheld metal vice is useful for keeping things still.",
- "weight": 320,
+ "weight": "320 g",
"volume": "500 ml",
"price": 500,
"to_hit": -2,
@@ -7540,7 +7502,7 @@
"id": "grip_hook",
"name": "grip hook",
"description": "A simple steel meathook with a circular steel handle. Makes a passable melee weapon.",
- "weight": 900,
+ "weight": "900 g",
"to_hit": 1,
"color": "light_gray",
"symbol": "?",
@@ -7560,9 +7522,9 @@
"symbol": "■",
"color": "light_gray",
"description": "This is a small bathroom scale, meant to weigh a person while naked.",
- "weight": 1200,
+ "weight": "1200 g",
"volume": "1 L",
- "price": "500",
+ "price": 500,
"to_hit": -2,
"bashing": 6,
"material": "steel",
@@ -7575,9 +7537,9 @@
"symbol": "&",
"color": "light_gray",
"description": "This bulky device takes water and calcium carbide and yields unpressurised acetylene.",
- "weight": 8000,
+ "weight": "8000 g",
"volume": "3 L",
- "price": "3200",
+ "price": 3200,
"to_hit": -4,
"bashing": 12,
"material": "steel"
diff --git a/data/json/items/vehicle/alternator.json b/data/json/items/vehicle/alternator.json
index 4157f801e7b0b..bca17a784e593 100644
--- a/data/json/items/vehicle/alternator.json
+++ b/data/json/items/vehicle/alternator.json
@@ -14,7 +14,7 @@
"type": "GENERIC",
"name": "car alternator",
"description": "A standard alternator used to power vehicle electrical systems.",
- "weight": 4000,
+ "weight": "4000 g",
"volume": "2500 ml",
"price": 9000
},
@@ -24,7 +24,7 @@
"type": "GENERIC",
"name": "motorbike alternator",
"description": "A compact lightweight alternator used to power small vehicle electrical systems.",
- "weight": 1100,
+ "weight": "1100 g",
"volume": "1 L",
"price": 8000
},
@@ -34,7 +34,7 @@
"type": "GENERIC",
"name": "bicycle alternator",
"description": "A very lightweight alternator used to power a bicycle's headlights.",
- "weight": 1100,
+ "weight": "1100 g",
"volume": "1 L",
"price": 8000
},
@@ -44,7 +44,7 @@
"type": "GENERIC",
"name": "truck alternator",
"description": "A larger and more powerful alternator used to power vehicle electrical systems.",
- "weight": 5800,
+ "weight": "5800 g",
"volume": "3 L",
"price": 12000
},
@@ -54,7 +54,7 @@
"type": "GENERIC",
"name": "7.5kW generator",
"description": "A bulky but efficient electrical generator designed to be attached to an engine.",
- "weight": 48000,
+ "weight": "48000 g",
"volume": "7500 ml",
"price": 30000
}
diff --git a/data/json/items/vehicle/armor.json b/data/json/items/vehicle/armor.json
index 1dff7fcc6db37..ccb9b760c27b4 100644
--- a/data/json/items/vehicle/armor.json
+++ b/data/json/items/vehicle/armor.json
@@ -5,7 +5,7 @@
"category": "veh_parts",
"name": "rebar grate",
"description": "Interlocked sections of rebar that allows for light and effective reinforcement of vehicle sections.",
- "weight": 2200,
+ "weight": "2200 g",
"volume": "3 L",
"price": 750,
"to_hit": -1,
@@ -20,7 +20,7 @@
"category": "veh_parts",
"name": "shock absorber",
"description": "This makeshift combination of springs and scrap, when attached to a vehicle section, protects that section from impacts. The springs can absorb a surprising amount of damage.",
- "weight": 22540,
+ "weight": "22540 g",
"volume": "3 L",
"price": 1300,
"to_hit": -1,
diff --git a/data/json/items/vehicle/battery.json b/data/json/items/vehicle/battery.json
index b0115e0758345..7d768c047c106 100644
--- a/data/json/items/vehicle/battery.json
+++ b/data/json/items/vehicle/battery.json
@@ -6,7 +6,7 @@
"name": "car battery",
"name_plural": "car batteries",
"description": "A 12v lead-acid battery used to power car electrical systems.",
- "weight": 18000,
+ "weight": "18000 g",
"volume": "6250 ml",
"price": 4000,
"material": [ "plastic" ],
@@ -24,7 +24,7 @@
"name": "motorbike battery",
"name_plural": "motorbike batteries",
"description": "A 12v lead-acid battery used to power smaller vehicles' electrical systems.",
- "weight": 4000,
+ "weight": "4000 g",
"volume": "1250 ml",
"price": 2000,
"capacity": 500,
@@ -37,12 +37,26 @@
"name": "small motorbike battery",
"name_plural": "small motorbike batteries",
"description": "A miniature 12v lead-acid battery used to power smaller vehicles' electrical systems.",
- "weight": 1500,
+ "weight": "1500 g",
"volume": "750 ml",
"price": 20000,
"capacity": 150,
"//": "~2.4Ah @ 12VDC. Could supply ~140 watts 10 minutes or so"
},
+ {
+ "id": "large_storage_battery",
+ "copy-from": "storage_battery",
+ "type": "MAGAZINE",
+ "name": "large storage battery",
+ "name_plural": "large storage batteries",
+ "description": "A huge storage battery containing many lithium ion cells. Holds a tremendous amount of energy. Could be installed into a storage battery case for easy removal from a vehicle, or just welded straight in.",
+ "weight": 400000,
+ "volume": "50 L",
+ "price": 400000,
+ "price_postapoc": 50000,
+ "bashing": 40,
+ "capacity": 80000
+ },
{
"id": "medium_storage_battery",
"copy-from": "storage_battery",
@@ -50,7 +64,7 @@
"name": "medium storage battery",
"name_plural": "medium storage batteries",
"description": "A medium storage battery containing multiple lithium ion cells.",
- "weight": 35000,
+ "weight": "35000 g",
"volume": "6250 ml",
"price": 50000,
"price_postapoc": 8000,
@@ -64,7 +78,7 @@
"name": "small storage battery",
"name_plural": "small storage batteries",
"description": "A small storage battery created with pre-Cataclysm lithium ion technology. Useful for crafting.",
- "weight": 2500,
+ "weight": "2500 g",
"volume": "500 ml",
"price": 5000,
"price_postapoc": 1000,
@@ -78,7 +92,7 @@
"name": "storage battery",
"name_plural": "storage batteries",
"description": "A large storage battery containing many lithium ion cells. Could be installed into a storage battery case for easy removal from a vehicle, or just welded straight in.",
- "weight": 200000,
+ "weight": "200000 g",
"volume": "25 L",
"price": 200000,
"price_postapoc": 24000,
diff --git a/data/json/items/vehicle/boat.json b/data/json/items/vehicle/boat.json
index ce390f3cfda43..4b28c5ddeac49 100644
--- a/data/json/items/vehicle/boat.json
+++ b/data/json/items/vehicle/boat.json
@@ -9,7 +9,7 @@
"description": "A wooden board that keeps the boat afloat. Add boat hulls to a vehicle until it floats. Then attach oars or a motor to get the boat to move.",
"price": 8000,
"material": [ "wood" ],
- "weight": 3000,
+ "weight": "3000 g",
"volume": "12500 ml",
"bashing": 8,
"to_hit": -1,
@@ -26,7 +26,7 @@
"price": 16000,
"price_postapoc": 8000,
"material": [ "plastic" ],
- "weight": 1500,
+ "weight": "1500 g",
"volume": "12500 ml",
"bashing": 8,
"to_hit": -1,
@@ -43,7 +43,7 @@
"price": 40000,
"price_postapoc": 8000,
"material": [ "kevlar" ],
- "weight": 500,
+ "weight": "500 g",
"volume": "12500 ml",
"bashing": 8,
"to_hit": -1,
@@ -55,7 +55,7 @@
"name": "oars",
"name_plural": "oars",
"description": "Oars for a boat.",
- "weight": 816,
+ "weight": "816 g",
"to_hit": -1,
"color": "light_gray",
"symbol": ":",
@@ -71,7 +71,7 @@
"name": "sail",
"name_plural": "sails",
"description": "Sails for a boat.",
- "weight": 945,
+ "weight": "945 g",
"to_hit": -1,
"color": "light_gray",
"symbol": ":",
@@ -91,7 +91,7 @@
"description": "An inflatable boat section.",
"price": 8000,
"material": [ "plastic" ],
- "weight": 3000,
+ "weight": "3000 g",
"volume": "12500 ml",
"bashing": 8,
"to_hit": -1,
@@ -107,7 +107,7 @@
"description": "An inflatable airbag.",
"price": 8000,
"material": [ "plastic" ],
- "weight": 3000,
+ "weight": "3000 g",
"volume": "12500 ml",
"bashing": 8,
"to_hit": -1,
diff --git a/data/json/items/vehicle/cables.json b/data/json/items/vehicle/cables.json
index 258fb9cde7389..dfc1f6a836a33 100644
--- a/data/json/items/vehicle/cables.json
+++ b/data/json/items/vehicle/cables.json
@@ -3,13 +3,13 @@
"type": "TOOL",
"id": "jumper_cable",
"name": "jumper cable",
- "description": "A jumper cable, like you've seen many times before: it's a short multi-stranded copper cable with power leads on either end, whose purpose is to share power between vehicles.",
+ "description": "A jumper cable, like you've seen many times before: it's a short multi-stranded copper cable with power leads on either end, whose main purpose is to share power between vehicles, but can also link other electrical systems.",
"to_hit": 1,
"color": "light_blue",
"symbol": "&",
"material": [ "steel", "plastic" ],
"volume": "500 ml",
- "weight": 75,
+ "weight": "75 g",
"bashing": 2,
"category": "tools",
"price": 1,
@@ -22,9 +22,9 @@
"type": "TOOL",
"id": "jumper_cable_heavy",
"name": "heavy-duty cable",
- "description": "A long, thick, heavy-duty cable with power leads on either end. It looks like you could use it to hook up two vehicles to each other, though you expect the power loss would be noticeable.",
+ "description": "A long, thick, heavy-duty cable with power leads on either end. It looks like you could use it to hook up two vehicles to each other, though you expect the power loss would be noticeable. Can also link other electrical systems.",
"volume": "1500 ml",
- "weight": 750,
+ "weight": "750 g",
"max_charges": 20,
"initial_charges": 20,
"copy-from": "jumper_cable"
@@ -34,7 +34,7 @@
"id": "jumper_cable_debug",
"name": "shiny cable",
"description": "This is the cable of the gods: 50 meters long, no power loss, light as a feather and fits in a matchbook. You're sure this wasn't supposed to exist, and the way it shimmers makes you uneasy.",
- "weight": 1,
+ "weight": "1 g",
"volume": 0,
"max_charges": 50,
"initial_charges": 50,
diff --git a/data/json/items/vehicle/cargo.json b/data/json/items/vehicle/cargo.json
index 3f92e96b81104..a25af0aaac2a7 100644
--- a/data/json/items/vehicle/cargo.json
+++ b/data/json/items/vehicle/cargo.json
@@ -4,7 +4,7 @@
"id": "basket",
"name": "wire basket",
"description": "A large wire basket from a shopping cart.",
- "weight": 6000,
+ "weight": "6000 g",
"to_hit": -5,
"color": "cyan",
"symbol": "]",
@@ -21,7 +21,7 @@
"id": "folding_basket",
"name": "folding wire basket",
"description": "A large wire basket from a shopping cart, modified to be foldable.",
- "weight": 7000,
+ "weight": "7000 g",
"copy-from": "basket"
},
{
@@ -29,7 +29,7 @@
"id": "bike_basket",
"name": "bike basket",
"description": "A simple bike basket. It is small and foldable.",
- "weight": 1200,
+ "weight": "1200 g",
"volume": "5 L",
"price": 3500,
"copy-from": "basket"
@@ -39,7 +39,7 @@
"id": "cargo_rack",
"name": "cargo carrier",
"description": "A heavy frame outfitted with tie-downs and attachment points for carrying cargo.",
- "weight": 80000,
+ "weight": "80000 g",
"to_hit": -4,
"color": "cyan",
"symbol": "]",
@@ -54,7 +54,7 @@
"type": "GENERIC",
"name": "floor trunk",
"description": "A section of flooring with a cargo-space beneath, and a hinged door for access.",
- "weight": 18000,
+ "weight": "18000 g",
"color": "cyan",
"symbol": "]",
"volume": "50 L",
@@ -68,7 +68,7 @@
"type": "GENERIC",
"name": "livestock carrier",
"description": "A heavy frame outfitted with tie-downs and attachment points for carrying cargo, with additional railings to keep a large animal in place. It is meant to hold large animals for transport. Use it on a suitable animal to capture, use it on an empty tile to release.",
- "weight": 96000,
+ "weight": "96000 g",
"volume": "62500 ml",
"price": 48000,
"category": "veh_parts",
@@ -86,7 +86,7 @@
"copy-from": "livestock_carrier",
"name": "animal locker",
"description": "A locker used to contain animals safely during transportation if installed properly. There is room for animal food and other animal care goods. It is meant to hold medium or smaller animals for transport. Use it on a suitable animal to capture, use it on an empty tile to release.",
- "weight": 10000,
+ "weight": "10000 g",
"volume": "31250 ml"
}
]
diff --git a/data/json/items/vehicle/controls.json b/data/json/items/vehicle/controls.json
index f0a3c92845c2d..3dda828dde67f 100644
--- a/data/json/items/vehicle/controls.json
+++ b/data/json/items/vehicle/controls.json
@@ -5,7 +5,7 @@
"name": "vehicle controls",
"name_plural": "sets of vehicle controls",
"description": "A set of various vehicle controls. Useful for crafting.",
- "weight": 6000,
+ "weight": "6000 g",
"to_hit": -4,
"color": "light_cyan",
"symbol": "$",
@@ -20,7 +20,7 @@
"id": "vehicle_dashboard",
"name": "dashboard",
"description": "A vehicle instrument panel with various gauges and switches. Useful for crafting.",
- "weight": 2721,
+ "weight": "2721 g",
"to_hit": -2,
"color": "cyan",
"symbol": "$",
@@ -36,7 +36,7 @@
"copy-from": "vehicle_dashboard",
"name": "electronics control unit",
"description": "A vehicle instrument panel with various gauges and switches. Useful for crafting.",
- "weight": 1311,
+ "weight": "1311 g",
"to_hit": -4,
"material": [ "plastic" ],
"volume": "1500 ml",
@@ -48,7 +48,7 @@
"name": "drive by wire controls",
"name_plural": "sets of drive by wire controls",
"description": "Fully electronic vehicle control system. You could control it remotely if you had proper tools.",
- "weight": 3000,
+ "weight": "3000 g",
"color": "red",
"volume": "3750 ml",
"bashing": 1,
@@ -61,7 +61,7 @@
"name": "robot driving unit",
"name_plural": "robot driving units",
"description": "A set of servos, microcontrollers and other devices, together capable of driving an unmanned vehicle. Its AI is not functional, but it should still have some sort of maintenance mode.",
- "weight": 2000,
+ "weight": "2000 g",
"color": "white",
"symbol": "&",
"volume": "5 L",
diff --git a/data/json/items/vehicle/engine.json b/data/json/items/vehicle/engine.json
index 8832adf99109a..33b39e63d92d6 100644
--- a/data/json/items/vehicle/engine.json
+++ b/data/json/items/vehicle/engine.json
@@ -53,7 +53,7 @@
"type": "ENGINE",
"name": "1-cylinder engine",
"description": "A single-cylinder 4-stroke combustion engine.",
- "weight": 20000,
+ "weight": "20000 g",
"volume": "1500 ml",
"price": 10000,
"displacement": 40,
@@ -65,7 +65,7 @@
"type": "ENGINE",
"name": "large 1-cylinder engine",
"description": "A powerful high-compression single-cylinder 4-stroke combustion engine.",
- "weight": 40000,
+ "weight": "40000 g",
"volume": "2 L",
"price": 10000,
"displacement": 55,
@@ -77,7 +77,7 @@
"type": "ENGINE",
"name": "small 1-cylinder engine",
"description": "A small single-cylinder 2-stroke combustion engine.",
- "weight": 10000,
+ "weight": "10000 g",
"volume": "750 ml",
"price": 6000,
"displacement": 20,
@@ -89,7 +89,7 @@
"type": "ENGINE",
"name": "Inline-4 engine",
"description": "A small, yet powerful 4-cylinder combustion engine.",
- "weight": 130000,
+ "weight": "130000 g",
"volume": "3500 ml",
"price": 15000,
"displacement": 160
@@ -100,7 +100,7 @@
"type": "ENGINE",
"name": "I6 diesel engine",
"description": "A powerful straight-6 diesel engine.",
- "weight": 185000,
+ "weight": "185000 g",
"volume": "7 L",
"price": 27000,
"displacement": 600
@@ -111,7 +111,7 @@
"type": "ENGINE",
"name": "V-twin engine",
"description": "A 2-cylinder 4-stroke combustion engine.",
- "weight": 45000,
+ "weight": "45000 g",
"volume": "2 L",
"price": 10000,
"displacement": 100
@@ -122,7 +122,7 @@
"type": "ENGINE",
"name": "V6 engine",
"description": "A powerful 6-cylinder combustion engine.",
- "weight": 180000,
+ "weight": "180000 g",
"volume": "4750 ml",
"price": 18000,
"displacement": 280
@@ -133,7 +133,7 @@
"type": "ENGINE",
"name": "V6 diesel engine",
"description": "A powerful 6-cylinder diesel engine.",
- "weight": 190000,
+ "weight": "190000 g",
"volume": "5 L",
"price": 20000,
"displacement": 280
@@ -144,7 +144,7 @@
"type": "ENGINE",
"name": "V8 engine",
"description": "A large and very powerful 8-cylinder combustion engine.",
- "weight": 250000,
+ "weight": "250000 g",
"volume": "7500 ml",
"price": 25000,
"displacement": 450
@@ -155,7 +155,7 @@
"type": "ENGINE",
"name": "V8 diesel engine",
"description": "A powerful 8-cylinder diesel engine.",
- "weight": 255000,
+ "weight": "255000 g",
"volume": "8 L",
"price": 26500,
"displacement": 450
@@ -166,7 +166,7 @@
"type": "ENGINE",
"name": "V12 engine",
"description": "A massive and extremely powerful V12 engine, usually built into high end sports cars.",
- "weight": 300000,
+ "weight": "300000 g",
"volume": "14500 ml",
"price": 36000,
"displacement": 700
@@ -177,7 +177,7 @@
"type": "ENGINE",
"name": "V12 diesel engine",
"description": "A massive and extremely powerful V12 engine, usually built into heavy trucks.",
- "weight": 310000,
+ "weight": "310000 g",
"volume": "15 L",
"price": 32000,
"displacement": 700
@@ -188,7 +188,7 @@
"type": "ENGINE",
"name": "makeshift steam engine",
"description": "A small, primitive, steam engine. An integrated boiler burns coal to heat water into steam, driving a reciprocating shaft. A condenser recaptures the water, making this a closed cycle system.",
- "weight": 225000,
+ "weight": "225000 g",
"volume": "62500 ml",
"price": 225000,
"price_postapoc": 300000
@@ -199,7 +199,7 @@
"type": "ENGINE",
"name": "small steam engine",
"description": "A small steam engine. An integrated boiler burns coal to heat water into steam, driving a reciprocating shaft. A condenser recaptures the water, making this a closed cycle system.",
- "weight": 180000,
+ "weight": "180000 g",
"volume": "37500 ml",
"price": 555000,
"price_postapoc": 1110000
@@ -210,7 +210,7 @@
"type": "ENGINE",
"name": "medium steam engine",
"description": "A medium sized steam engine. An integrated boiler burns coal to heat water into steam, driving a reciprocating shaft. A condenser recaptures the water, making this a closed cycle system.",
- "weight": 280000,
+ "weight": "280000 g",
"volume": "57500 ml",
"price": 870000,
"price_postapoc": 1740000
@@ -222,7 +222,7 @@
"name": "massive engine block",
"description": "The beginnings of a massive gas or diesel engine. It's not good for much of anything on its own.",
"material": "iron",
- "weight": 280000,
+ "weight": "280000 g",
"volume": "6250 ml",
"price": 30000
},
@@ -233,7 +233,7 @@
"name": "large engine block",
"description": "The beginnings of a large gas or diesel engine. It's not good for much of anything on its own.",
"material": "iron",
- "weight": 190000,
+ "weight": "190000 g",
"volume": "5 L",
"price": 20000
},
@@ -244,7 +244,7 @@
"name": "medium engine block",
"description": "The beginnings of a medium gas or diesel engine. It's not good for much of anything on its own.",
"material": "iron",
- "weight": 90000,
+ "weight": "90000 g",
"volume": "2500 ml",
"price": 10000
},
@@ -255,7 +255,7 @@
"name": "small engine block",
"description": "The beginnings of a small gas or diesel engine. It's not good for much of anything on its own.",
"material": "iron",
- "weight": 40000,
+ "weight": "40000 g",
"volume": "1250 ml",
"price": 5000
},
@@ -266,7 +266,7 @@
"name": "tiny engine block",
"description": "The beginnings of a tiny gas or diesel engine. It's not good for much of anything on its own.",
"material": "iron",
- "weight": 8000,
+ "weight": "8000 g",
"volume": "500 ml",
"price": 3500
},
@@ -276,7 +276,7 @@
"type": "ENGINE",
"name": "1350 hp gas turbine engine",
"description": "A gas turbine engine, usually used for military vehicles. Known for its high rate of fuel consumption.",
- "weight": 1130000,
+ "weight": "1130000 g",
"volume": "45 L",
"price": 96000,
"displacement": 2700
@@ -287,7 +287,7 @@
"type": "ENGINE",
"name": "1900 hp gas turbine engine",
"description": "A large gas turbine engine, usually used for military helicopters. Known for its high rate of fuel consumption.",
- "weight": 1582000,
+ "weight": "1582000 g",
"volume": "63 L",
"price": 192000,
"displacement": 3800
@@ -298,7 +298,7 @@
"type": "ENGINE",
"name": "6000 hp gas turbine engine",
"description": "A massive gas turbine engine, used to power the V-22 Osprey. Known for its high rate of fuel consumption.",
- "weight": 3164000,
+ "weight": "3164000 g",
"volume": "95 L",
"price": 960000,
"displacement": 11995
diff --git a/data/json/items/vehicle/engineering.json b/data/json/items/vehicle/engineering.json
index 3a37132d509c7..c2de120e0f29f 100644
--- a/data/json/items/vehicle/engineering.json
+++ b/data/json/items/vehicle/engineering.json
@@ -6,7 +6,7 @@
"name": "steel boom",
"description": "A large rigid steel boom. If attached to a frame it could be used to lift up to 20 metric tonnes.",
"price": 23400,
- "weight": 31600,
+ "weight": "31600 g",
"volume": "12500 ml",
"material": "steel",
"symbol": "&",
@@ -19,7 +19,7 @@
"name": "telescopic cantilever",
"description": "A small steel telescoping cantilever. If attached to a frame it could be used to lift up to 3.5 metric tonnes.",
"price": 7900,
- "weight": 12000,
+ "weight": "12000 g",
"volume": "3 L",
"material": "steel",
"symbol": "&",
@@ -32,7 +32,7 @@
"name": "pallet lifter",
"description": "A makeshift pallet lifter. If attached to a frame it could be used to lift up to 0.5 metric tonnes.",
"price": 7900,
- "weight": 12000,
+ "weight": "12000 g",
"volume": "3 L",
"material": "steel",
"symbol": "&",
@@ -45,7 +45,7 @@
"name": "rockwheel",
"color": "dark_gray",
"description": "A large and heavy jagged metal disc to dig trenches.",
- "weight": 62000,
+ "weight": "62000 g",
"material": "steel",
"category": "veh_parts",
"price": 8500,
@@ -58,7 +58,7 @@
"name": "airjack",
"color": "dark_gray",
"description": "An extendable metal pylon used to replace a portable jack. If mounted to a vehicle, it could be used to lift it up.",
- "weight": 21000,
+ "weight": "21000 g",
"material": "steel",
"category": "veh_parts",
"price": 8500,
@@ -72,7 +72,7 @@
"name": "motorcycle kickstand",
"color": "dark_gray",
"description": "A kickstand to keep the bike from falling over. You could use this to lean it forward or backward to change a tire.",
- "weight": 500,
+ "weight": "500 g",
"material": "steel",
"category": "veh_parts",
"price": 500,
diff --git a/data/json/items/vehicle/farming.json b/data/json/items/vehicle/farming.json
index 37fe4425138b4..4a7f66cd3e4de 100644
--- a/data/json/items/vehicle/farming.json
+++ b/data/json/items/vehicle/farming.json
@@ -7,7 +7,7 @@
"color": "light_gray",
"name_plural": "vehicle scoops",
"description": "An assembly of motors and sheet metal that allows a vehicle to clean the road surface by removing debris and contaminants.",
- "weight": 22666,
+ "weight": "22666 g",
"bashing": 1,
"material": "steel",
"category": "veh_parts",
@@ -41,7 +41,7 @@
"name": "advanced reaper",
"name_plural": "advanced reapers",
"description": "An advanced electronic device used to cut down, collect and store crops.",
- "weight": 25000,
+ "weight": "25000 g",
"material": [ "steel", "plastic" ],
"price": 50000,
"volume": "9 L",
@@ -55,7 +55,7 @@
"name_plural": "advanced seed drills",
"color": "dark_gray",
"description": "An assembly of tubes, spikes, and wheels, that when dragged along the ground, allows a vehicle to plant seeds automatically in suitably tilled land. This one is equipped with an electronic control system and will avoid damaging itself when used on untilled land.",
- "weight": 32666,
+ "weight": "32666 g",
"material": [ "steel", "plastic" ],
"price": 50000,
"volume": "7250 ml",
@@ -69,7 +69,7 @@
"name_plural": "plows",
"color": "dark_gray",
"description": "A heavy assembly of wheels and steel blades that turn up the ground.",
- "weight": 32666,
+ "weight": "32666 g",
"material": [ "steel", "plastic" ],
"volume": "7250 ml",
"copy-from": "v_scoop_item"
diff --git a/data/json/items/vehicle/frames.json b/data/json/items/vehicle/frames.json
index 3ac7fe0fe8d09..643845334f24b 100644
--- a/data/json/items/vehicle/frames.json
+++ b/data/json/items/vehicle/frames.json
@@ -4,7 +4,7 @@
"id": "foldframe",
"name": "foldable-light frame",
"description": "A small foldable lightweight frame made from pipework.",
- "weight": 5000,
+ "weight": "5000 g",
"to_hit": -3,
"color": "light_gray",
"symbol": "]",
@@ -28,7 +28,7 @@
"id": "frame",
"name": "steel frame",
"description": "A large frame made of steel. Useful for crafting.",
- "weight": 20000,
+ "weight": "20000 g",
"to_hit": -5,
"color": "cyan",
"volume": "15 L",
@@ -41,7 +41,7 @@
"id": "hdframe",
"name": "heavy duty frame",
"description": "A large, reinforced steel frame, used in military vehicle construction.",
- "weight": 100000,
+ "weight": "100000 g",
"to_hit": -6,
"color": "green",
"material": [ "hardsteel", "steel" ],
@@ -56,7 +56,7 @@
"id": "frame_wood",
"name": "wooden frame",
"description": "A large frame made of wood. Useful for crafting.",
- "weight": 8000,
+ "weight": "8000 g",
"to_hit": -5,
"color": "brown",
"material": [ "wood" ],
@@ -71,7 +71,7 @@
"id": "foldwoodframe",
"name": "foldable wooden frame",
"description": "A small foldable frame made from scrap wood.",
- "weight": 4000,
+ "weight": "4000 g",
"color": "brown",
"material": [ "wood" ],
"volume": "12500 ml",
@@ -82,7 +82,7 @@
"id": "frame_wood_light",
"name": "light wooden frame",
"description": "A small frame made of few pieces of wood, held together by rope. Useful for crafting.",
- "weight": 4000,
+ "weight": "4000 g",
"to_hit": -5,
"color": "brown",
"material": [ "wood" ],
diff --git a/data/json/items/vehicle/lights.json b/data/json/items/vehicle/lights.json
index 6d53f39137f78..5ebd6fe306491 100644
--- a/data/json/items/vehicle/lights.json
+++ b/data/json/items/vehicle/lights.json
@@ -8,7 +8,7 @@
"color": "white",
"material": "plastic",
"category": "veh_parts",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "1 L",
"price": 3000
},
@@ -17,7 +17,7 @@
"type": "GENERIC",
"name": "motorcycle headlight",
"description": "A motorcycle headlight to light up the way.",
- "weight": 500,
+ "weight": "500 g",
"volume": "250 ml",
"price": 5000,
"copy-from": "car_headlight"
@@ -28,7 +28,7 @@
"name": "wide-angle car headlight",
"description": "A wide-angle vehicle headlight to light up the way.",
"looks_like": "car_headlight",
- "weight": 2000,
+ "weight": "2000 g",
"volume": "1250 ml",
"price": 4000,
"copy-from": "car_headlight"
@@ -38,7 +38,7 @@
"id": "headlight_reinforced",
"name": "reinforced headlight",
"description": "A vehicle headlight with a cage built around it to protect it from damage without reducing its effectiveness.",
- "weight": 1200,
+ "weight": "1200 g",
"to_hit": -2,
"color": "light_cyan",
"symbol": ",",
@@ -52,7 +52,7 @@
"id": "wide_headlight_reinforced",
"name": "reinforced wide-angle headlight",
"description": "A wide-angle vehicle headlight with a cage built around it to protect it from damage without reducing its effectiveness.",
- "weight": 1400,
+ "weight": "1400 g",
"volume": "1250 ml",
"copy-from": "headlight_reinforced"
},
@@ -62,7 +62,7 @@
"name": "emergency vehicle light (red)",
"name_plural": "emergency vehicle lights (red)",
"description": "One of the red-colored lights from the top of an emergency services vehicle. When turned on, the lights rotate to shine in all directions.",
- "weight": 500,
+ "weight": "500 g",
"to_hit": 1,
"color": "red",
"material": [ "plastic", "steel" ],
@@ -84,7 +84,7 @@
"id": "floodlight",
"name": "floodlight",
"description": "A large and heavy light designed to illuminate wide areas.",
- "weight": 2500,
+ "weight": "2500 g",
"to_hit": 1,
"material": [ "plastic", "steel" ],
"volume": "2 L",
diff --git a/data/json/items/vehicle/manual.json b/data/json/items/vehicle/manual.json
index 9a7ba0b2f9aeb..16e141603e83d 100644
--- a/data/json/items/vehicle/manual.json
+++ b/data/json/items/vehicle/manual.json
@@ -5,7 +5,7 @@
"name": "set of hand rims",
"name_plural": "sets of hand rims",
"description": "Hand rims for use on a wheelchair.",
- "weight": 816,
+ "weight": "816 g",
"to_hit": -1,
"color": "light_gray",
"symbol": ":",
diff --git a/data/json/items/vehicle/mills.json b/data/json/items/vehicle/mills.json
index 36aa42371f929..3ca035a0026ee 100644
--- a/data/json/items/vehicle/mills.json
+++ b/data/json/items/vehicle/mills.json
@@ -4,7 +4,7 @@
"id": "wind_turbine",
"name": "wind turbine",
"description": "A small turbine that can convert wind into electric power.",
- "weight": 50000,
+ "weight": "50000 g",
"to_hit": -4,
"color": "yellow",
"symbol": "T",
@@ -19,7 +19,7 @@
"id": "xl_wind_turbine",
"name": "large wind turbine",
"description": "A large turbine that can convert wind into electric power.",
- "weight": 150000,
+ "weight": "150000 g",
"to_hit": -7,
"symbol": "Y",
"volume": "60 L",
@@ -31,7 +31,7 @@
"id": "water_wheel",
"name": "water wheel",
"description": "A water wheel. Will slowly recharge the vehicle's electrical power when built over shallow moving water.",
- "weight": 300000,
+ "weight": "300000 g",
"to_hit": -5,
"symbol": "*",
"material": [ "wood" ],
@@ -45,7 +45,7 @@
"id": "xl_water_wheel",
"name": "large water wheel",
"description": "A large water wheel with wooden supports. Will recharge the vehicle's electrical power when built over shallow moving water.",
- "weight": 600000,
+ "weight": "600000 g",
"symbol": "o",
"volume": "60 L",
"price": 200000,
diff --git a/data/json/items/vehicle/motors.json b/data/json/items/vehicle/motors.json
index 0c978c83b0928..1ab79453459a2 100644
--- a/data/json/items/vehicle/motors.json
+++ b/data/json/items/vehicle/motors.json
@@ -4,7 +4,7 @@
"id": "motor",
"name": "electric motor",
"description": "A powerful electric motor. Useful for crafting.",
- "weight": 27200,
+ "weight": "27200 g",
"color": "light_cyan",
"symbol": ",",
"material": [ "steel" ],
@@ -18,7 +18,7 @@
"id": "motor_enhanced",
"name": "enhanced electric motor",
"description": "A very powerful and yet lightweight electric motor. Useful for crafting.",
- "weight": 81600,
+ "weight": "81600 g",
"material": [ "superalloy" ],
"volume": "2650 ml",
"price": 68000,
@@ -29,7 +29,7 @@
"id": "motor_super",
"name": "super electric motor",
"description": "The most powerfull electric motor on the market. Useful for crafting.",
- "weight": 133800,
+ "weight": "133800 g",
"volume": "111 L",
"price": 80000,
"copy-from": "motor"
@@ -39,7 +39,7 @@
"id": "motor_large",
"name": "large electric motor",
"description": "A large and very powerful electric motor. Useful for crafting.",
- "weight": 68000,
+ "weight": "68000 g",
"to_hit": -3,
"symbol": ":",
"volume": "1740 ml",
@@ -52,7 +52,7 @@
"id": "motor_small",
"name": "small electric motor",
"description": "A small electric motor. Useful for crafting.",
- "weight": 7500,
+ "weight": "7500 g",
"volume": "5 L",
"bashing": 1,
"price": 2000,
@@ -63,7 +63,7 @@
"id": "motor_tiny",
"name": "tiny electric motor",
"description": "A tiny electric motor. Useful for crafting.",
- "weight": 5800,
+ "weight": "5800 g",
"color": "light_cyan",
"symbol": ",",
"material": [ "steel", "plastic" ],
diff --git a/data/json/items/vehicle/noise.json b/data/json/items/vehicle/noise.json
index 561513eaed358..30a9cc08ecc54 100644
--- a/data/json/items/vehicle/noise.json
+++ b/data/json/items/vehicle/noise.json
@@ -4,7 +4,7 @@
"id": "muffler",
"name": "muffler",
"description": "A muffler from a car. Very unwieldy as a weapon. Useful in a few crafting recipes.",
- "weight": 9525,
+ "weight": "9525 g",
"to_hit": -10,
"color": "light_gray",
"symbol": "/",
@@ -21,7 +21,7 @@
"id": "beeper",
"name": "back-up beeper",
"description": "This is a safety device intended to warn passersby of a vehicle moving in reverse, but the usage of it now seems terribly unwise.",
- "weight": 360,
+ "weight": "360 g",
"symbol": ";",
"color": "light_gray",
"material": [ "plastic", "aluminum" ],
@@ -36,7 +36,7 @@
"id": "stereo",
"name": "stereo system",
"description": "A stereo system with speakers. It is capable of being hooked up to a vehicle.",
- "weight": 800,
+ "weight": "800 g",
"to_hit": -2,
"color": "red",
"symbol": "&",
@@ -51,7 +51,7 @@
"name": "chime loudspeakers",
"name_plural": "chime loudspeakers",
"description": "A stereo system with loudspeakers and a built-in set of simple melodies that it will play. Commonly used by ice cream trucks to draw the attention of children in the days when children wanted ice cream more than brains.",
- "weight": 2600,
+ "weight": "2600 g",
"to_hit": -2,
"color": "blue",
"symbol": "&",
diff --git a/data/json/items/vehicle/plating.json b/data/json/items/vehicle/plating.json
index 38bfa93b1bda4..6c8c77a911e72 100644
--- a/data/json/items/vehicle/plating.json
+++ b/data/json/items/vehicle/plating.json
@@ -5,7 +5,7 @@
"name": "sheet metal",
"description": "A thin sheet of metal.",
"//": "Roughly in the 70cm×70cm×1.5mm to 1m×1m×0.75mm range. Has to be folded / rolled up when in inventory, so 75% density compared to solid block.",
- "weight": 6000,
+ "weight": "6000 g",
"to_hit": -2,
"color": "light_cyan",
"symbol": "]",
@@ -21,7 +21,7 @@
"id": "sheet_metal_lit",
"name": "wired sheet metal",
"description": "Sheet metal that has had light housing wired into it.",
- "weight": 6200,
+ "weight": "6200 g",
"to_hit": -2,
"color": "light_cyan",
"symbol": "]",
@@ -36,7 +36,7 @@
"id": "wood_plate",
"name": "wooden armor kit",
"description": "A bundle of two by fours prepared to be used as vehicle armor.",
- "weight": 5600,
+ "weight": "5600 g",
"to_hit": -8,
"color": "brown",
"symbol": "]",
@@ -51,7 +51,7 @@
"id": "steel_plate",
"name": "steel plating",
"description": "A piece of armor plating made of steel.",
- "weight": 12880,
+ "weight": "12880 g",
"to_hit": -1,
"color": "light_cyan",
"symbol": "]",
@@ -67,7 +67,7 @@
"id": "alloy_plate",
"name": "superalloy plating",
"description": "A piece of armor plating made of sturdy superalloy.",
- "weight": 10800,
+ "weight": "10800 g",
"to_hit": -1,
"color": "light_cyan",
"symbol": "]",
@@ -83,7 +83,7 @@
"id": "alloy_sheet",
"name": "superalloy sheet",
"description": "A sheet of sturdy superalloy, incredibly hard, yet incredibly malleable.",
- "weight": 900,
+ "weight": "900 g",
"to_hit": -2,
"color": "light_cyan",
"symbol": ",",
@@ -98,7 +98,7 @@
"id": "spiked_plate",
"name": "spiked plating",
"description": "A piece of armor plating made of steel. It is covered with menacing spikes.",
- "weight": 12240,
+ "weight": "12240 g",
"to_hit": -1,
"color": "light_cyan",
"symbol": "]",
@@ -116,7 +116,7 @@
"id": "hard_plate",
"name": "hard plating",
"description": "A piece of very thick armor plating made of steel.",
- "weight": 32640,
+ "weight": "32640 g",
"to_hit": -1,
"color": "light_cyan",
"symbol": "]",
@@ -132,7 +132,7 @@
"id": "mil_plate",
"name": "military composite plating",
"description": "A thick sheet of military grade armor, best bullet stopper you can stick on a vehicle.",
- "weight": 16500,
+ "weight": "16500 g",
"to_hit": -1,
"color": "green",
"symbol": "]",
@@ -152,7 +152,7 @@
"description": "Light chitin plating made for a vehicle.",
"price": 1200,
"material": [ "chitin" ],
- "weight": 2000,
+ "weight": "2000 g",
"volume": "5500 ml",
"bashing": 8,
"to_hit": -4,
@@ -176,7 +176,7 @@
"description": "Bone plating made for a vehicle.",
"price": 1200,
"material": [ "bone" ],
- "weight": 4000,
+ "weight": "4000 g",
"volume": "9500 ml",
"bashing": 8,
"to_hit": -4,
diff --git a/data/json/items/vehicle/rams.json b/data/json/items/vehicle/rams.json
index acf12533f6693..116d29fdf1581 100644
--- a/data/json/items/vehicle/rams.json
+++ b/data/json/items/vehicle/rams.json
@@ -5,7 +5,7 @@
"category": "veh_parts",
"name": "shredder",
"description": "This menacing looking attachment is meant to be powered by a vehicle's engine. Upon doing so, the circular blades of this device will rotate rapidly; anything in front of it is likely to be ripped to shreds. It is sturdy enough to withstand multiple impacts, and is designed to detach if it would take a hit that would break it.",
- "weight": 29955,
+ "weight": "29955 g",
"volume": "7500 ml",
"price": 10500,
"to_hit": -1,
diff --git a/data/json/items/vehicle/rigs.json b/data/json/items/vehicle/rigs.json
index e9bf974b7221b..eab7396b8b93d 100644
--- a/data/json/items/vehicle/rigs.json
+++ b/data/json/items/vehicle/rigs.json
@@ -4,7 +4,7 @@
"type": "GENERIC",
"category": "veh_parts",
"name": "vehicle crafting rig",
- "weight": 40000,
+ "weight": "40000 g",
"volume": "20 L",
"price": 40000,
"material": "steel",
diff --git a/data/json/items/vehicle/seating.json b/data/json/items/vehicle/seating.json
index c68e2771733a9..2f915d01ba93b 100644
--- a/data/json/items/vehicle/seating.json
+++ b/data/json/items/vehicle/seating.json
@@ -4,7 +4,7 @@
"id": "seat",
"name": "seat",
"description": "A soft car seat covered with leather.",
- "weight": 9071,
+ "weight": "9071 g",
"to_hit": -4,
"color": "red",
"symbol": "0",
@@ -19,7 +19,7 @@
"id": "saddle",
"name": "saddle",
"description": "A leather-covered seat designed to be straddled.",
- "weight": 300,
+ "weight": "300 g",
"material": [ "plastic", "aluminum" ],
"volume": "1250 ml",
"bashing": 2,
diff --git a/data/json/items/vehicle/solar.json b/data/json/items/vehicle/solar.json
index a71101d319fb9..925119485e0e5 100644
--- a/data/json/items/vehicle/solar.json
+++ b/data/json/items/vehicle/solar.json
@@ -4,7 +4,7 @@
"id": "solar_panel",
"name": "solar panel",
"description": "Electronic device that can convert solar radiation into electric power. Useful for a vehicle.",
- "weight": 14000,
+ "weight": "14000 g",
"to_hit": -4,
"color": "yellow",
"symbol": "]",
@@ -19,7 +19,7 @@
"id": "reinforced_solar_panel",
"name": "reinforced solar panel",
"description": "A solar panel that has been covered with a pane of reinforced glass to protect the delicate solar cells from zombies or errant baseballs. The glass causes this panel to produce slightly less power than a normal panel. Useful for a vehicle.",
- "weight": 24153,
+ "weight": "24153 g",
"color": "light_blue",
"material": [ "glass", "steel" ],
"volume": "6500 ml",
@@ -31,7 +31,7 @@
"id": "solar_panel_v2",
"name": "upgraded solar panel",
"description": "Electronic device that can convert solar radiation into electric power. This panel has been upgraded to convert more sunlight into power. Useful for a vehicle.",
- "weight": 18494,
+ "weight": "18494 g",
"volume": "4500 ml",
"price": 190000,
"copy-from": "solar_panel"
@@ -41,7 +41,7 @@
"id": "reinforced_solar_panel_v2",
"name": "upgraded reinforced solar panel",
"description": "An upgraded solar panel that has been covered with a pane of reinforced glass to protect the delicate solar cells from zombies or errant baseballs. The glass causes this panel to produce slightly less power than a normal upgraded panel. Useful for a vehicle.",
- "weight": 29062,
+ "weight": "29062 g",
"to_hit": -5,
"volume": "7500 ml",
"price": 240000,
@@ -63,7 +63,7 @@
"id": "solar_cell",
"name": "solar cell",
"description": "A small electronic device that can convert solar radiation into electric power. Useful for crafting.",
- "weight": 500,
+ "weight": "500 g",
"symbol": ";",
"volume": "250 ml",
"category": "spare_parts",
diff --git a/data/json/items/vehicle/tables.json b/data/json/items/vehicle/tables.json
index 86409ed2ee387..97b028be904e5 100644
--- a/data/json/items/vehicle/tables.json
+++ b/data/json/items/vehicle/tables.json
@@ -4,7 +4,7 @@
"id": "v_table",
"name": "fancy table",
"description": "A very fancy table from a very fancy RV. If times were better it might be useful for something more than firewood.",
- "weight": 9071,
+ "weight": "9071 g",
"to_hit": -8,
"color": "red",
"symbol": "0",
@@ -20,7 +20,7 @@
"id": "w_table",
"name": "wooden table",
"description": "A crude wooden table.",
- "weight": 10071,
+ "weight": "10071 g",
"copy-from": "v_table"
},
{
@@ -28,7 +28,7 @@
"id": "workbench",
"name": "workbench",
"description": "A sturdy workbench built out of metal. It is perfect for crafting large and heavy things.",
- "weight": 23000,
+ "weight": "23000 g",
"material": [ "steel" ],
"bashing": 8,
"price": 40000,
diff --git a/data/json/items/vehicle/utilities.json b/data/json/items/vehicle/utilities.json
index 3a40faf4ca632..a94d4656f20dd 100644
--- a/data/json/items/vehicle/utilities.json
+++ b/data/json/items/vehicle/utilities.json
@@ -4,7 +4,7 @@
"id": "washing_machine",
"name": "washing machine",
"description": "A very small washing machine designed for use in vehicles.",
- "weight": 31752,
+ "weight": "31752 g",
"to_hit": -8,
"color": "light_blue",
"symbol": "]",
@@ -22,7 +22,7 @@
"price": 162654,
"symbol": "A",
"color": "yellow",
- "weight": 34500,
+ "weight": "34500 g",
"volume": "76 L",
"copy-from": "washing_machine"
},
diff --git a/data/json/items/vehicle/wheel.json b/data/json/items/vehicle/wheel.json
index e221c6c398620..6120e11bb050d 100644
--- a/data/json/items/vehicle/wheel.json
+++ b/data/json/items/vehicle/wheel.json
@@ -1,11 +1,54 @@
[
+ {
+ "id": "wheel_mount_light",
+ "type": "GENERIC",
+ "category": "veh_parts",
+ "name": "light wheel mount",
+ "description": "A piece of metal with holes suitable for a bike or motorbike wheel.",
+ "weight": 150,
+ "volume": "250 ml",
+ "price": 10,
+ "material": [ "steel" ],
+ "symbol": ";",
+ "color": "dark_gray"
+ },
+ {
+ "id": "wheel_mount_medium",
+ "type": "GENERIC",
+ "category": "veh_parts",
+ "name": "medium hub assembly",
+ "description": "A metal assembly that allows bolting a wheel on a car. Fit for a car wheel.",
+ "weight": 5000,
+ "volume": "6 L",
+ "price": 3000,
+ "bashing": 14,
+ "to_hit": -2,
+ "material": [ "steel" ],
+ "symbol": ";",
+ "color": "dark_gray"
+ },
+ {
+ "id": "wheel_mount_heavy",
+ "type": "GENERIC",
+ "category": "veh_parts",
+ "name": "heavy hub assembly",
+ "description": "A heavy metal assembly that allows bolting a wheel on a car. Fit for a large car wheel.",
+ "weight": 6000,
+ "volume": "7 L",
+ "price": 5000,
+ "bashing": 14,
+ "to_hit": -2,
+ "material": [ "steel" ],
+ "symbol": ";",
+ "color": "dark_gray"
+ },
{
"id": "wheel",
"type": "WHEEL",
"category": "veh_parts",
"name": "wheel",
"description": "A car wheel.",
- "weight": 8845,
+ "weight": "8845 g",
"volume": "10 L",
"price": 10000,
"bashing": 12,
@@ -22,7 +65,7 @@
"category": "veh_parts",
"name": "racing wheel",
"description": "A wide, smooth wheel intended for racing. The slick surface provides better speed on pavement but penalizes off-road speed.",
- "weight": 12600,
+ "weight": "12600 g",
"volume": "13750 ml",
"price": 24000,
"bashing": 14,
@@ -39,7 +82,7 @@
"category": "veh_parts",
"name": "armored wheel",
"description": "A wide military grade wheel.",
- "weight": 24500,
+ "weight": "24500 g",
"volume": "17500 ml",
"price": 34000,
"bashing": 17,
@@ -56,7 +99,7 @@
"category": "veh_parts",
"name": "wheelbarrow wheel",
"description": "A small wheel from a common garden wheelbarrow.",
- "weight": 2722,
+ "weight": "2722 g",
"volume": "2250 ml",
"price": 2000,
"bashing": 10,
@@ -73,7 +116,7 @@
"category": "veh_parts",
"name": "bicycle wheel",
"description": "A bicycle wheel.",
- "weight": 1500,
+ "weight": "1500 g",
"volume": "7 L",
"price": 4000,
"bashing": 8,
@@ -98,7 +141,7 @@
"name": "set of casters",
"name_plural": "sets of casters",
"description": "A set of casters, like on a shopping cart.",
- "weight": 1500,
+ "weight": "1500 g",
"volume": "1250 ml",
"price": 14000,
"bashing": 6,
@@ -115,7 +158,7 @@
"type": "WHEEL",
"name": "metal wheel",
"description": "A simple metal wheel.",
- "weight": 18239,
+ "weight": "18239 g",
"volume": "8750 ml",
"price": 1200,
"bashing": 8,
@@ -132,7 +175,7 @@
"type": "WHEEL",
"name": "rail wheel",
"description": "A strong rail wheel. A flange helps keep it on a rail, but makes it perform terribly when not on a rail.",
- "weight": 18239,
+ "weight": "18239 g",
"volume": "8750 ml",
"price": 1200,
"bashing": 8,
@@ -149,7 +192,7 @@
"category": "veh_parts",
"name": "motorbike wheel",
"description": "A motorbike wheel.",
- "weight": 5443,
+ "weight": "5443 g",
"volume": "8250 ml",
"price": 14000,
"bashing": 10,
@@ -174,7 +217,7 @@
"category": "veh_parts",
"name": "large steel drum",
"description": "A large cylinder fashioned out of thick plates of hardened steel, that is normally found on road rollers. Numerous massive spokes, attached to a central axis, reinforce its structure even further, making it an unstoppable force once it starts rolling.",
- "weight": 750000,
+ "weight": "750000 g",
"volume": "200 L",
"price": 50000,
"bashing": 60,
@@ -191,7 +234,7 @@
"category": "veh_parts",
"name": "small wheel",
"description": "A pretty small wheel. Probably from one of those Segway things. It is not very menacing.",
- "weight": 2722,
+ "weight": "2722 g",
"volume": "2250 ml",
"price": 14000,
"bashing": 10,
@@ -209,7 +252,7 @@
"name": "set of tricycle wheels",
"name_plural": "sets of tricycle wheels",
"description": "A set of hard plastic wheels with one larger than the other two. Proudly made in the USA by Double Dango Productions.",
- "weight": 750,
+ "weight": "750 g",
"volume": "750 ml",
"price": 7000,
"bashing": 3,
@@ -227,7 +270,7 @@
"name": "pair of wheelchair wheels",
"name_plural": "pairs of wheelchair wheels",
"description": "A pair of wheels for a wheelchair.",
- "weight": 3000,
+ "weight": "3000 g",
"volume": "12500 ml",
"price": 8000,
"bashing": 8,
@@ -244,7 +287,7 @@
"category": "veh_parts",
"name": "wide wheel",
"description": "A wide wheel. \\o/ This wide.",
- "weight": 22600,
+ "weight": "22600 g",
"volume": "17500 ml",
"price": 34000,
"bashing": 17,
@@ -268,7 +311,7 @@
"category": "veh_parts",
"name": "wooden cart wheel",
"description": "A wooden cart wheel, hand made.",
- "weight": 4500,
+ "weight": "4500 g",
"volume": "8750 ml",
"price": 1200,
"bashing": 8,
diff --git a/data/json/items/vehicle_parts.json b/data/json/items/vehicle_parts.json
index ebebcafdacfe5..60fd123b72f37 100644
--- a/data/json/items/vehicle_parts.json
+++ b/data/json/items/vehicle_parts.json
@@ -5,7 +5,7 @@
"name": "storage battery case",
"name_plural": "storage battery cases",
"description": "An empty case that can hold a storage battery. Complete with charging controller chip and connecting wires.",
- "weight": 1231,
+ "weight": "1231 g",
"to_hit": -3,
"color": "light_gray",
"symbol": ":",
@@ -22,7 +22,7 @@
"name": "military black box",
"name_plural": "military black boxes",
"description": "This is a black box, seemingly pulled from some sort of military vehicle wreckage. If you can find a system to analyze this you may find something of interest.",
- "weight": 4535,
+ "weight": "4535 g",
"volume": "2 L",
"price": 0,
"to_hit": -1,
@@ -36,7 +36,7 @@
"id": "minireactor",
"name": "minireactor",
"description": "A small portable plutonium reactor. Handle with great care!",
- "weight": 27215,
+ "weight": "27215 g",
"to_hit": -4,
"color": "light_cyan",
"symbol": ":",
@@ -53,7 +53,7 @@
"id": "water_faucet",
"name": "water faucet",
"description": "A metal faucet that can be attached to a water tank for easy access.",
- "weight": 900,
+ "weight": "900 g",
"to_hit": -1,
"color": "light_gray",
"symbol": ";",
@@ -68,7 +68,7 @@
"id": "towel_hanger",
"name": "towel hanger",
"description": "A towel hanger with towels.",
- "weight": 2000,
+ "weight": "2000 g",
"to_hit": -1,
"color": "brown",
"symbol": "-",
@@ -83,7 +83,7 @@
"id": "veh_tracker",
"name": "vehicle tracking device",
"description": "A vehicle tracking device. When installed on a vehicle it allows you track the vehicle.",
- "weight": 400,
+ "weight": "400 g",
"color": "red",
"symbol": ";",
"material": [ "plastic", "aluminum" ],
@@ -98,7 +98,7 @@
"name": "yoke and harness",
"category": "veh_parts",
"description": "A bar and harness to attach a creature to a wheeled vehicle, they then should be able to pull it.",
- "weight": 1000,
+ "weight": "1000 g",
"volume": "3750 ml",
"price": 48000,
"bashing": 3,
@@ -115,7 +115,7 @@
"type": "GENERIC",
"name": "bike rack",
"description": "A collection of pipes, cams, and straps, mounted on the edge of a vehicle and used to support another vehicle for transport. It must be mounted on a vehicle to be used.",
- "weight": 4000,
+ "weight": "4000 g",
"volume": "6250 ml",
"price": 16000,
"category": "veh_parts",
@@ -130,7 +130,7 @@
"id": "recharge_station",
"name": "recharging station",
"description": "A universal recharging station designed to operate on vehicle power. While on it will steadily charge all rechargeable batteries (battery cells, lead-acid batteries, etc) placed directly within its storage space. The system can only be installed onto existing storage compartments, and is controlled from a dashboard or electronics control unit.",
- "weight": 10000,
+ "weight": "10000 g",
"to_hit": 1,
"color": "light_blue",
"symbol": "-",
@@ -146,7 +146,7 @@
"name": "vehicle heater",
"name_plural": "vehicle heaters",
"description": "A vehicle-mounted area heater.",
- "weight": 12500,
+ "weight": "12500 g",
"to_hit": -4,
"color": "red",
"symbol": ";",
@@ -162,7 +162,7 @@
"name": "vehicle cooler",
"name_plural": "vehicle coolers",
"description": "A vehicle-mounted area cooler.",
- "weight": 12500,
+ "weight": "12500 g",
"to_hit": -4,
"color": "light_cyan",
"symbol": "C",
@@ -177,7 +177,7 @@
"id": "camera_control",
"name": "camera display",
"description": "A set of small monitors. Required to view cameras' output.",
- "weight": 11234,
+ "weight": "11234 g",
"to_hit": -3,
"color": "light_blue",
"symbol": "#",
@@ -191,7 +191,7 @@
"id": "omnicamera",
"name": "security camera",
"description": "A security camera you could connect to a display. Image quality is quite low, but the field of vision is great.",
- "weight": 1100,
+ "weight": "1100 g",
"to_hit": -3,
"color": "light_blue",
"symbol": "+",
@@ -209,7 +209,7 @@
"color": "dark_gray",
"material": "steel",
"category": "veh_parts",
- "weight": 500,
+ "weight": "500 g",
"volume": "250 ml",
"price": 800
},
@@ -222,7 +222,7 @@
"symbol": "X",
"material": "steel",
"category": "veh_parts",
- "weight": 10000,
+ "weight": "10000 g",
"volume": "2500 ml",
"price": 5500
},
@@ -236,7 +236,7 @@
"looks_like": "cargo_rack",
"material": "steel",
"category": "veh_parts",
- "weight": 22000,
+ "weight": "22000 g",
"volume": "55 L",
"capacity": 2000,
"reliability": 10,
@@ -253,7 +253,7 @@
"color": "dark_gray",
"material": "steel",
"category": "veh_parts",
- "weight": 27600,
+ "weight": "27600 g",
"volume": "18750 ml",
"price": 37500
}
diff --git a/data/json/legacy_artifact_passive.json b/data/json/legacy_artifact_passive.json
new file mode 100644
index 0000000000000..3cc9ab9ca6169
--- /dev/null
+++ b/data/json/legacy_artifact_passive.json
@@ -0,0 +1,47 @@
+[
+ {
+ "type": "enchantment",
+ "id": "AEP_STR_UP",
+ "values": [ { "value": "STRENGTH", "add": 4 } ],
+ "has": "WIELD"
+ },
+ {
+ "type": "enchantment",
+ "id": "AEP_DEX_UP",
+ "values": [ { "value": "DEXTERITY", "add": 4 } ],
+ "has": "WIELD"
+ },
+ {
+ "type": "enchantment",
+ "id": "AEP_PER_UP",
+ "values": [ { "value": "PERCEPTION", "add": 4 } ],
+ "has": "WIELD"
+ },
+ {
+ "type": "enchantment",
+ "id": "AEP_INT_UP",
+ "values": [ { "value": "INTELLIGENCE", "add": 4 } ],
+ "has": "WIELD"
+ },
+ {
+ "type": "enchantment",
+ "id": "AEP_ALL_UP",
+ "values": [
+ { "value": "STRENGTH", "add": 2 },
+ { "value": "DEXTERITY", "add": 2 },
+ { "value": "PERCEPTION", "add": 2 },
+ { "value": "INTELLIGENCE", "add": 2 }
+ ],
+ "has": "WIELD"
+ },
+ {
+ "type": "enchantment",
+ "id": "AEP_SPEED_UP",
+ "values": [ { "value": "SPEED", "add": 20 } ]
+ },
+ {
+ "type": "enchantment",
+ "id": "AEP_SPEED_DOWN",
+ "values": [ { "value": "SPEED", "add": -20 } ]
+ }
+]
diff --git a/data/json/mapgen/abandoned01.json b/data/json/mapgen/abandoned01.json
index eab9ad3554ec2..7437d3fef4641 100644
--- a/data/json/mapgen/abandoned01.json
+++ b/data/json/mapgen/abandoned01.json
@@ -37,7 +37,7 @@
"type": "item_group",
"subtype": "distribution",
"items": [
- [ "chestrig", 20 ],
+ [ "tacvest", 20 ],
[ "jacket_light", 30 ],
[ "jacket_leather", 30 ],
[ "jacket_evac", 30 ],
diff --git a/data/json/mapgen/basement/basement_lab_stairs.json b/data/json/mapgen/basement/basement_lab_stairs.json
index 2d3c3fe499d48..6928cd23ff0cd 100644
--- a/data/json/mapgen/basement/basement_lab_stairs.json
+++ b/data/json/mapgen/basement/basement_lab_stairs.json
@@ -44,7 +44,7 @@
">": "t_stairs_down"
},
"mapping": { "c": { "items": { "item": "chem_lab", "chance": 30 } }, "d": { "items": { "item": "office", "chance": 30 } } },
- "monster": { "7": { "monster": "mon_turret" } },
+ "monster": { "7": { "monster": "mon_turret_rifle" } },
"place_nested": [
{ "chunks": [ "lab_spawn_7x7_crossdoors" ], "x": 3, "y": 1 },
{ "chunks": [ "lab_spawn_7x7_crossdoors" ], "x": 14, "y": 1 }
@@ -109,7 +109,7 @@
}
},
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 23 ], "y": [ 6, 20 ], "chance": 2 } ],
- "monster": { "7": { "monster": "mon_turret" } }
+ "monster": { "7": { "monster": "mon_turret_rifle" } }
}
}
]
diff --git a/data/json/mapgen/bunker.json b/data/json/mapgen/bunker.json
index e234efbf8e0d6..d5bef129b7673 100644
--- a/data/json/mapgen/bunker.json
+++ b/data/json/mapgen/bunker.json
@@ -338,8 +338,8 @@
"items": [
{ "item": "m1911", "charges": 6, "ammo-item": "45_acp" },
{ "item": "45_casing", "charges-min": 1, "charges-max": 1 },
- { "item": "corpse" },
- { "group": "underwear" }
+ { "group": "underwear" },
+ { "item": "corpse" }
]
},
{
diff --git a/data/json/mapgen/farm_dairy.json b/data/json/mapgen/farm_dairy.json
index 3685b4d5b37d0..5cd2f64210209 100644
--- a/data/json/mapgen/farm_dairy.json
+++ b/data/json/mapgen/farm_dairy.json
@@ -129,9 +129,9 @@
{ "item": "bed", "x": 11, "y": 17, "chance": 90 },
{ "item": "bed", "x": 13, "y": 16, "chance": 60 },
{ "item": "drugs_heal_simple", "x": 7, "y": 16, "chance": 90 },
- { "item": "homebooks", "x": 8, "y": 10, "chance": 80 },
- { "item": "homebooks", "x": 10, "y": 15, "chance": 80 },
- { "item": "homebooks", "x": 11, "y": 16, "chance": 80 },
+ { "item": "ranch_homebooks", "x": 8, "y": 10, "chance": 80 },
+ { "item": "ranch_homebooks", "x": 10, "y": 15, "chance": 80 },
+ { "item": "ranch_homebooks", "x": 11, "y": 16, "chance": 80 },
{ "item": "clothing_outdoor_set", "x": 9, "y": 16, "chance": 90 },
{ "item": "fridge", "x": 15, "y": 17, "chance": 90 },
{ "item": "fridge", "x": 15, "y": 17, "chance": 90 },
diff --git a/data/json/mapgen/farm_horse.json b/data/json/mapgen/farm_horse.json
index 36445eb5d969f..8e0f767864d3d 100644
--- a/data/json/mapgen/farm_horse.json
+++ b/data/json/mapgen/farm_horse.json
@@ -116,7 +116,7 @@
"k": { "item": "office", "chance": 30 },
"f": { "item": "fridge", "chance": 30 },
"o": { "item": "oven", "chance": 30 },
- "8": { "item": "homebooks", "chance": 30 },
+ "8": { "item": "ranch_homebooks", "chance": 30 },
"r": { "item": "restaur_kitchen", "chance": 30 },
"c": { "item": "kitchen_counters", "chance": 30 },
"D": { "item": "trash", "chance": 20, "repeat": [ 2, 4 ] },
@@ -375,7 +375,7 @@
"D": { "item": "trash_cart", "chance": 50 },
"B": { "item": "shower", "chance": 40, "repeat": [ 2, 4 ] },
"d": { "item": "dresser", "chance": 70, "repeat": [ 2, 4 ] },
- "8": { "item": "homebooks", "chance": 70, "repeat": [ 2, 4 ] },
+ "8": { "item": "ranch_homebooks", "chance": 70, "repeat": [ 2, 4 ] },
"k": { "item": "bedroom", "chance": 60, "repeat": [ 2, 4 ] },
"S": { "item": "softdrugs", "chance": 60, "repeat": [ 2, 4 ] }
}
diff --git a/data/json/mapgen/irradiator_1.json b/data/json/mapgen/irradiator_1.json
index f006889b5781c..11c75244dbe7d 100644
--- a/data/json/mapgen/irradiator_1.json
+++ b/data/json/mapgen/irradiator_1.json
@@ -327,7 +327,7 @@
],
"liquids": { "T": { "liquid": "water_clean", "amount": [ 200, 600 ] } },
"fields": { "U": { "field": "fd_nuke_gas", "intensity": 3, "age": 990, "chance": 100 }, "/": { "field": "fd_shock_vent" } },
- "monster": { "(": { "monster": "mon_turret" }, "!": { "monster": "mon_hazmatbot", "chance": 5 } },
+ "monster": { "(": { "monster": "mon_turret_rifle" }, "!": { "monster": "mon_hazmatbot", "chance": 5 } },
"monsters": {
"h": { "monster": "GROUP_ZOMBIE", "chance": 50 },
"o": { "monster": "GROUP_ZOMBIE", "chance": 50 },
diff --git a/data/json/mapgen/isherwood_farms/dairy_farm_isherwood.json b/data/json/mapgen/isherwood_farms/dairy_farm_isherwood.json
index 08f98010e2327..ce2725c706942 100644
--- a/data/json/mapgen/isherwood_farms/dairy_farm_isherwood.json
+++ b/data/json/mapgen/isherwood_farms/dairy_farm_isherwood.json
@@ -87,7 +87,7 @@
"items": {
"Y": { "item": "coat_rack", "chance": 35, "repeat": [ 1, 4 ] },
"d": { "item": "office", "chance": 30 },
- "{": [ { "item": "homebooks", "chance": 30 }, { "item": "book_survival", "chance": 30 } ],
+ "{": [ { "item": "ranch_homebooks", "chance": 30 }, { "item": "book_survival", "chance": 30 } ],
"^": { "item": "bed", "chance": 30 },
"o": { "item": "oven", "chance": 30, "repeat": [ 1, 2 ] },
"T": { "item": "everyday_gear", "chance": 30, "repeat": [ 1, 2 ] },
diff --git a/data/json/mapgen/isherwood_farms/farm_horse_isherwood.json b/data/json/mapgen/isherwood_farms/farm_horse_isherwood.json
index 16ac29f20618c..52e46e0d7f033 100644
--- a/data/json/mapgen/isherwood_farms/farm_horse_isherwood.json
+++ b/data/json/mapgen/isherwood_farms/farm_horse_isherwood.json
@@ -149,7 +149,7 @@
"k": { "item": "office", "chance": 30 },
"f": { "item": "fridge", "chance": 30 },
"o": { "item": "oven", "chance": 30 },
- "8": { "item": "homebooks", "chance": 30 },
+ "8": { "item": "ranch_homebooks", "chance": 30 },
"r": { "item": "restaur_kitchen", "chance": 30 },
"c": { "item": "kitchen_counters", "chance": 30 },
"D": { "item": "trash", "chance": 20, "repeat": [ 2, 4 ] },
diff --git a/data/json/mapgen/lab/lab_floorplan_cross.json b/data/json/mapgen/lab/lab_floorplan_cross.json
index 42354228302f9..eb8c6b00d463c 100644
--- a/data/json/mapgen/lab/lab_floorplan_cross.json
+++ b/data/json/mapgen/lab/lab_floorplan_cross.json
@@ -659,7 +659,7 @@
" "
],
"palettes": [ "lab_palette", "lab_loot_bionic_vault" ],
- "place_monster": [ { "monster": "mon_turret", "x": [ 11, 12 ], "y": [ 2, 5 ], "chance": 25 } ]
+ "place_monster": [ { "monster": "mon_turret_rifle", "x": [ 11, 12 ], "y": [ 2, 5 ], "chance": 25 } ]
}
},
{
@@ -695,7 +695,7 @@
" "
],
"palettes": [ "lab_palette", "lab_loot_serum_vault" ],
- "place_monster": [ { "monster": "mon_turret", "x": [ 11, 12 ], "y": [ 2, 5 ], "chance": 10 } ]
+ "place_monster": [ { "monster": "mon_turret_rifle", "x": [ 11, 12 ], "y": [ 2, 5 ], "chance": 10 } ]
}
},
{
@@ -731,7 +731,7 @@
" "
],
"palettes": [ "lab_palette", "lab_loot_bionic_vault" ],
- "place_monster": [ { "monster": "mon_turret", "x": [ 2, 5 ], "y": [ 11, 12 ], "chance": 25 } ]
+ "place_monster": [ { "monster": "mon_turret_rifle", "x": [ 2, 5 ], "y": [ 11, 12 ], "chance": 25 } ]
}
},
{
@@ -767,7 +767,7 @@
" "
],
"palettes": [ "lab_palette", "lab_loot_serum_vault" ],
- "place_monster": [ { "monster": "mon_turret", "x": [ 2, 5 ], "y": [ 11, 12 ], "chance": 10 } ]
+ "place_monster": [ { "monster": "mon_turret_rifle", "x": [ 2, 5 ], "y": [ 11, 12 ], "chance": 10 } ]
}
},
{
@@ -803,7 +803,7 @@
"####################### "
],
"palettes": [ "lab_palette", "lab_loot_bionic_vault" ],
- "place_monster": [ { "monster": "mon_turret", "x": [ 11, 12 ], "y": [ 18, 21 ], "chance": 25 } ]
+ "place_monster": [ { "monster": "mon_turret_rifle", "x": [ 11, 12 ], "y": [ 18, 21 ], "chance": 25 } ]
}
},
{
@@ -839,7 +839,7 @@
"####################### "
],
"palettes": [ "lab_palette", "lab_loot_serum_vault" ],
- "place_monster": [ { "monster": "mon_turret", "x": [ 11, 12 ], "y": [ 18, 21 ], "chance": 10 } ]
+ "place_monster": [ { "monster": "mon_turret_rifle", "x": [ 11, 12 ], "y": [ 18, 21 ], "chance": 10 } ]
}
},
{
@@ -875,7 +875,7 @@
" "
],
"palettes": [ "lab_palette", "lab_loot_bionic_vault" ],
- "place_monster": [ { "monster": "mon_turret", "x": [ 18, 21 ], "y": [ 11, 12 ], "chance": 25 } ]
+ "place_monster": [ { "monster": "mon_turret_rifle", "x": [ 18, 21 ], "y": [ 11, 12 ], "chance": 25 } ]
}
},
{
@@ -911,7 +911,7 @@
" "
],
"palettes": [ "lab_palette", "lab_loot_serum_vault" ],
- "place_monster": [ { "monster": "mon_turret", "x": [ 18, 21 ], "y": [ 11, 12 ], "chance": 10 } ]
+ "place_monster": [ { "monster": "mon_turret_rifle", "x": [ 18, 21 ], "y": [ 11, 12 ], "chance": 10 } ]
}
}
]
diff --git a/data/json/mapgen/lab/lab_floorplans.json b/data/json/mapgen/lab/lab_floorplans.json
index 4477f3c5202b1..df170ba3e4030 100644
--- a/data/json/mapgen/lab/lab_floorplans.json
+++ b/data/json/mapgen/lab/lab_floorplans.json
@@ -488,7 +488,7 @@
"r": { "items": [ { "item": "mine_equipment", "chance": 30 } ] },
"c": { "items": [ { "item": "chem_lab", "chance": 30 } ] }
},
- "place_monster": [ { "monster": "mon_turret", "x": 11, "y": 9, "chance": 20 } ],
+ "place_monster": [ { "monster": "mon_turret_rifle", "x": 11, "y": 9, "chance": 20 } ],
"place_nested": [
{ "chunks": [ "lab_spawn_9x9_crossdoors" ], "x": 6, "y": 11 },
{ "chunks": [ "lab_spawn_7x7_wall_nw" ], "x": 12, "y": 2 },
diff --git a/data/json/mapgen/lab/lab_floorplans_1side.json b/data/json/mapgen/lab/lab_floorplans_1side.json
index 91dcc09561af6..361515eb3e588 100644
--- a/data/json/mapgen/lab/lab_floorplans_1side.json
+++ b/data/json/mapgen/lab/lab_floorplans_1side.json
@@ -210,7 +210,7 @@
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "lab_barracks_turret",
- "object": { "mapgensize": [ 24, 24 ], "place_monster": [ { "monster": "mon_turret", "x": [ 10, 13 ], "y": [ 15, 22 ] } ] }
+ "object": { "mapgensize": [ 24, 24 ], "place_monster": [ { "monster": "mon_turret_rifle", "x": [ 10, 13 ], "y": [ 15, 22 ] } ] }
},
{
"//": "prisoner containment",
diff --git a/data/json/mapgen/lab/lab_floorplans_finale1level.json b/data/json/mapgen/lab/lab_floorplans_finale1level.json
index 96c2653f16b6d..b6baa4f37dc2a 100644
--- a/data/json/mapgen/lab/lab_floorplans_finale1level.json
+++ b/data/json/mapgen/lab/lab_floorplans_finale1level.json
@@ -363,7 +363,7 @@
"-----------MM----------|"
],
"palettes": [ "lab_palette" ],
- "monster": { "7": { "monster": "mon_turret" } },
+ "monster": { "7": { "monster": "mon_turret_rifle" } },
"place_monster": [
{ "monster": "mon_secubot", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 75, "repeat": 2 },
{ "monster": "mon_mech_combat", "x": 2, "y": 2, "chance": 33 }
diff --git a/data/json/mapgen/lab/lab_rooms.json b/data/json/mapgen/lab/lab_rooms.json
index 6107d86a73b2c..796bcad8509fb 100644
--- a/data/json/mapgen/lab/lab_rooms.json
+++ b/data/json/mapgen/lab/lab_rooms.json
@@ -131,7 +131,7 @@
],
"palettes": [ "lab_palette", "lab_palette_map_computer" ],
"terrain": { "c": [ "t_thconc_floor" ] },
- "place_monster": [ { "monster": "mon_turret", "x": [ 2, 3 ], "y": [ 3, 3 ] } ]
+ "place_monster": [ { "monster": "mon_turret_rifle", "x": [ 2, 3 ], "y": [ 3, 3 ] } ]
}
},
{
@@ -154,7 +154,7 @@
],
"palettes": [ "lab_palette", "lab_palette_map_computer" ],
"terrain": { "c": [ "t_thconc_floor" ] },
- "place_monster": [ { "monster": "mon_turret", "x": [ 4, 4 ], "y": [ 1, 4 ] } ]
+ "place_monster": [ { "monster": "mon_turret_rifle", "x": [ 4, 4 ], "y": [ 1, 4 ] } ]
}
},
{
diff --git a/data/json/mapgen/lab/lab_rooms_wall.json b/data/json/mapgen/lab/lab_rooms_wall.json
index c12ca20f92748..247602b4d2259 100644
--- a/data/json/mapgen/lab/lab_rooms_wall.json
+++ b/data/json/mapgen/lab/lab_rooms_wall.json
@@ -190,7 +190,7 @@
],
"palettes": [ "lab_palette", "lab_loot_bionic_vault" ],
"terrain": { "M": "t_wall_metal" },
- "place_monster": [ { "monster": "mon_turret", "x": 5, "y": 3, "chance": 25 } ]
+ "place_monster": [ { "monster": "mon_turret_rifle", "x": 5, "y": 3, "chance": 25 } ]
}
},
{
@@ -212,7 +212,7 @@
],
"palettes": [ "lab_palette", "lab_loot_serum_vault" ],
"terrain": { "M": "t_wall_metal" },
- "place_monster": [ { "monster": "mon_turret", "x": 5, "y": 3, "chance": 10 } ]
+ "place_monster": [ { "monster": "mon_turret_rifle", "x": 5, "y": 3, "chance": 10 } ]
}
},
{
@@ -443,7 +443,7 @@
"|x,,,x,,,x"
],
"palettes": [ "lab_palette" ],
- "monster": { "7": { "monster": "mon_turret" } },
+ "monster": { "7": { "monster": "mon_turret_rifle" } },
"terrain": { "g": "t_wall_glass", "G": "t_door_glass_lab_c", "7": "t_thconc_floor" }
}
},
diff --git a/data/json/mapgen/mi-go/mi-go_nested.json b/data/json/mapgen/mi-go/mi-go_nested.json
index 2107dce47805c..cc92dfa710bee 100644
--- a/data/json/mapgen/mi-go/mi-go_nested.json
+++ b/data/json/mapgen/mi-go/mi-go_nested.json
@@ -464,7 +464,6 @@
"2": { "class": "mi-go_prisoner", "chance": 20 },
"3": { "class": "mi-go_prisoner", "chance": 20 },
"4": { "class": "mi-go_prisoner", "chance": 20 },
- "5": { "class": "mi-go_prisoner", "chance": 20 },
"6": { "class": "mi-go_prisoner", "chance": 20 },
"7": { "class": "mi-go_prisoner", "chance": 20 }
}
diff --git a/data/json/mapgen/microlab/microlab_connector.json b/data/json/mapgen/microlab/microlab_connector.json
new file mode 100644
index 0000000000000..816b7828222ce
--- /dev/null
+++ b/data/json/mapgen/microlab/microlab_connector.json
@@ -0,0 +1,274 @@
+[
+ {
+ "type": "mapgen",
+ "method": "json",
+ "om_terrain": [ "microlab_sub_connector" ],
+ "weight": 1000,
+ "object": {
+ "fill_ter": "t_concrete",
+ "rows": [
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################"
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "method": "json",
+ "om_terrain": [ "microlab_rock_border" ],
+ "weight": 1000,
+ "object": {
+ "fill_ter": "t_concrete",
+ "rows": [
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################",
+ "########################"
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "method": "json",
+ "om_terrain": [ "microlab_sub_station" ],
+ "weight": 1000,
+ "object": {
+ "fill_ter": "t_concrete",
+ "rows": [
+ "##| |##",
+ "##|^ |##",
+ "##|^ hhhh YY hhhh |##",
+ "##|^ |##",
+ "##|^ hhhh hhhh |##",
+ "##|^ |##",
+ "##|^ |^^^^^^|##",
+ "##||(((((| ||||||||##",
+ "###|l h ( YY |#########",
+ "###|l ( YY |#########",
+ "###|l ( |#########",
+ "###||2|||| |#########",
+ "###| | |#########",
+ "###| hd|G55||#########",
+ "###| ddd| ^|#########",
+ "###||5(((| ^|||||||###",
+ "###|B VV ^^|###",
+ "###|B YY ?|###",
+ "###|B dddd YY t ?|###",
+ "###|B d hd ?|###",
+ "###|B t? ^^|###",
+ "###|||||||| ||||||||###",
+ "##########|22|##########",
+ "##########| |##########"
+ ],
+ "palettes": [ "microlab" ],
+ "terrain": { "G": "t_card_science" },
+ "items": {
+ "l": [ { "item": "guns_milspec", "chance": 10 }, { "item": "ammo_milspec", "chance": 70 } ],
+ "t": { "item": "magazines", "chance": 90 }
+ }
+ }
+ },
+ {
+ "type": "mapgen",
+ "method": "json",
+ "om_terrain": [ "microlab_generic_sub_entry" ],
+ "weight": 1000,
+ "object": {
+ "fill_ter": "t_concrete",
+ "rows": [
+ "||||||||||| |||||||||||",
+ " cc c | |^BBB| ",
+ " cc c c| | h|r i ",
+ " c| | dd|r c ",
+ " FFFFccccc| | h|r c ",
+ "|||||||||||YY|[===|| ",
+ " FF c|^???^ v| c ",
+ " c|? V| c ",
+ " c|? tt | i ",
+ " c| | ",
+ "|5|||| dddd |==2|",
+ " Y2 d hd 2Y ",
+ " Y2 ^^^^ 2Y ",
+ "|2|||| |||| ^|((2|",
+ " r| ^| ",
+ "cc r|n^^^ ^|^ ",
+ "cc hc||||||YY|[====| h ",
+ " c|FFFF| | h ^B|6tt ",
+ "|||||||22||22|dd B|||||",
+ " | |h nB|FFF ",
+ " c6 6c | ||||||| ",
+ " cc cc | |6h ",
+ " cc cc 2 |c ccccc ",
+ " | | "
+ ],
+ "palettes": [ "microlab" ],
+ "terrain": { "G": "t_card_science" },
+ "items": {
+ "l": [ { "item": "guns_milspec", "chance": 10 }, { "item": "ammo_milspec", "chance": 70 } ],
+ "t": { "item": "magazines", "chance": 90 }
+ }
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic_surface_connector" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_concrete",
+ "rows": [
+ " | | |cccc| ",
+ " |=[==| |||||| ",
+ " ((2| | 2 2 i ",
+ " ( | cci| 2 2 c ",
+ " (@@| | |||||| c ",
+ "|||||| cci| |rrrr| ",
+ " F|F ( | | 2 c ",
+ " F|F ( cci| |||||| c ",
+ " F|F 2 | |rrrr| i ",
+ " |F |rrrr| | 2 ",
+ "|5|||||||||22|||||||||||",
+ " 2 YY 5TYY ",
+ " 2 YY 5 YY ",
+ "|2||||^??? yyyyy|(((|",
+ " r|t y 5 dd|",
+ "cc r|V tt yyyyy| hl|",
+ "cc hc|t y |||||",
+ " c|^??? yyyyy|###|",
+ "||||||||||| ^|((22|||#|",
+ " rrcc| hd^= ^|eeeeee|#|",
+ " c| dd = ^|eeeeee|#|",
+ " c6 6|B = ^|EeeeeE|#|",
+ " cc r|B [ ^|eeeeee|#|",
+ " | |22|||||||||||"
+ ],
+ "palettes": [ "microlab" ],
+ "terrain": { "e": "t_elevator", "E": "t_elevator_control" },
+ "items": {
+ "l": [ { "item": "guns_milspec", "chance": 10 }, { "item": "ammo_milspec", "chance": 70 } ],
+ "t": { "item": "magazines", "chance": 90 }
+ }
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic_surface" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_concrete",
+ "rows": [
+ " yyyyyyyyyyyyyyyyyyyyyy ",
+ " yyyyyyyyyyyyyyyyyyyyyy ",
+ " y____________________y ",
+ " y____________________y ",
+ " y____________________y ",
+ " ||||||||||22|yyyyyyyyy ",
+ " | SS|________y ",
+ " | SS|________y ",
+ " | SS|________y ",
+ " | SS|________y ",
+ " | |((((|22||555555|y ",
+ " | |........|yyyyyy|. ",
+ " | |..dddd..|......|. ",
+ " | |^.d.hd..5yyyyyy| ",
+ " | |||||||..5......| ",
+ " | (V.??....Gyyyyyy| ",
+ " | (t.......|......| ",
+ " | (^???....|yyyyyy| ",
+ " | ||||||..^|yyyyyy| ",
+ " | |.hd^=..^|eeeeee| ",
+ " | |.dd.=..^|eeeeee| ",
+ " | |B...=..^|EeeeeE| ",
+ " | |B...[..^|eeeeee| ",
+ " ||||||||||||||||||||| "
+ ],
+ "palettes": [ "microlab" ],
+ "terrain": {
+ "e": "t_elevator",
+ "E": "t_elevator_control",
+ " ": "t_grass",
+ "_": "t_pavement",
+ ".": "t_thconc_floor",
+ "G": "t_card_science"
+ }
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic_surface_roof" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_concrete",
+ "rows": [
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ................. ",
+ " ................. ",
+ " ................. ",
+ " ................. ",
+ " ................. ",
+ " ................. ",
+ " ................. ",
+ " ................. ",
+ " ................. ",
+ " ................. ",
+ " ................. ",
+ " ................. ",
+ " ................. ",
+ " ................. "
+ ],
+ "terrain": { " ": "t_open_air", ".": "t_concrete" }
+ }
+ }
+]
diff --git a/data/json/mapgen/microlab/microlab_generic.json b/data/json/mapgen/microlab/microlab_generic.json
new file mode 100644
index 0000000000000..cd651cb2b5868
--- /dev/null
+++ b/data/json/mapgen/microlab/microlab_generic.json
@@ -0,0 +1,497 @@
+[
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " cc | 2 |rrrr| ",
+ " cc ==[==| |||||| ",
+ " = | |i l|r i ",
+ " [ |22|i l|r c ",
+ " FFFF= | |i l|r c ",
+ "||||||||||| ||2|||| ",
+ " F|F |####| | c ",
+ " F|F |||||| | c ",
+ " F|F |???? | i ",
+ " | | Y",
+ "|5|||| dddddd |2|||",
+ " 2 Y dh^ d | ",
+ " 2 Y d ^hd | ",
+ "|2|||| dddddd |(((|",
+ " r| 2 ",
+ "cc r|???? |^ ",
+ "cc hc|||||| | h ",
+ " c|FFFF| | |6tt ",
+ "|||||||22|| ||((22|||||",
+ " | | |FF| ",
+ " c6 6c | |c | | ",
+ " cc cc | |6h ",
+ " cc cc | |c ccccc ",
+ " |22| "
+ ],
+ "palettes": [ "microlab" ],
+ "items": { "l": { "item": "cleaning", "chance": 50, "repeat": [ 1, 3 ] } }
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " cc | | |FFFF|6 ",
+ " cc F| ||||||6 h ",
+ " F| 2 |^ ",
+ "c= dd ||||||||r |6h ",
+ "c= dh |;|;| ;|r |6 ",
+ "|||22||||2|2|2||r |||||2",
+ " F| |##| |F =FFFF ",
+ " F| |||||| |F = ",
+ " F| |ll|i |F 2 cc ",
+ " 2 |i |i |F = cc ",
+ "||| ||2||||||2||||22|||",
+ " 2 Y ",
+ " 2 Y ",
+ "||2||||2||||||2| |||",
+ " r|i |iiiY | |c ",
+ "cc r|ll| | =[==c ",
+ "cc hc|||| | = =c ",
+ " c|@@|2|2|2|| = [ ",
+ "||2||| |;|;| ;| =[==||",
+ " =[=|||||||| | c c ",
+ " c Y 6| | c c ",
+ " iccc 6| | i i ",
+ " c 6| |||2|| ",
+ " c c|c |22| | c c "
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " cc | c| |c c| c ",
+ " cc | c| |||||| c ",
+ " | h 6| c| ",
+ " dd |==||||||| ?|6h ",
+ " hd |tt|^ = ?|6 ",
+ "|||=[|||| hth =Y ?||||||",
+ " c| |##| hth =Y V|h = ",
+ " c| |##| hth = c|dd = ",
+ " c|=[|##| hth = a| ] ",
+ " | |##|^ [ | = ",
+ "||| |||||||||| |=[=||",
+ " 2 ",
+ " 2 ",
+ "||2||||||======[[=| ||2",
+ " r|##|^ ^| |r ",
+ "cc r|##| htth hh| |r ",
+ "cc h6|||| htth tt| |r ",
+ " c| 2 tt| |r ",
+ "||||||;i|foee hh| |||",
+ " |||||||||||||| |c ",
+ " c 6| |c ",
+ " iccc 6| 2 ",
+ " c 6| ||||||||| ",
+ " c c|c |22|6hh6|cc "
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " cc c|c | |r F| ",
+ " cc | |r F| c ",
+ " FF| 2 F| c ",
+ " dd |||22|||||| ",
+ " hd rrr| 2 2 ",
+ "|||22|||| |||||||||||",
+ " c| |l 2 2 2 d^= ",
+ " c| |||| | | d = ",
+ " c| 2 | cc | ] ",
+ " 2 2 | cc | = ",
+ "|||||||||||22|||||||||||",
+ " |FFccFF| c | ",
+ " |F F| T | ",
+ "||2|| || c | |||",
+ " | c | 2 ",
+ "cc cc cc| 6 | 2 ",
+ "cc cc cc| | | ",
+ " h | | | ",
+ "||||||6tcc|^ ^| |2|",
+ " ||||||22|||||| | ",
+ " c 2 | c",
+ " iccc 2 | c",
+ " c || ||||||||| ",
+ " c c|c | |6hh6|cFc "
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " cc c|c | |c F|c ",
+ " cc | |c F|c c ",
+ " | | 2 c ",
+ " dd |||22|||||| ",
+ " hd FFF|hd c| ",
+ "|||5||||| d iccc|2===|",
+ " c| c| dh= ",
+ " c|cci cic iccc| d = ",
+ " c| c| ] ",
+ " |cci |FFF|66cccc| = ",
+ "2|||||||||||||||||||||||",
+ " ",
+ " ",
+ "||22((((((|||||22|||||||",
+ " |^hd rrr| ",
+ "cc cc cc| d r| ",
+ "cc cc cc| rrr| ",
+ " YY |W W| ",
+ "|| |6tcc||555||555||2|",
+ " |||||| | | ",
+ " c ccccc| X X|X X X| c",
+ " i c|XXXX|X X X| c",
+ " c c|||||||||||| ",
+ " c|c |^^|6hh6|cFc "
+ ],
+ "palettes": [ "microlab" ],
+ "furniture": { "X": "f_crate_c" },
+ "terrain": { "W": "t_gates_mech_control_lab" },
+ "items": { "X": { "item": "tools_science", "repeat": [ 2, 6 ] } }
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " cc c|r r| | c|c ",
+ " |||||||||| | ccc|c c ",
+ " |Y ||||||c c ",
+ " | 2 2 ",
+ " | ||||||| ||||||| ",
+ "|| |l+ +l|2||||",
+ " | ||| ||||||| ||| ccc ",
+ " 2 |;+ i|i +;| ",
+ " | ||| i|i ||| ",
+ " | |;+ i|i +;|FFrr ",
+ "|| ||||||||||||||||||||",
+ " ",
+ " ",
+ "||||||||||||||||||||||||",
+ " |ll| ( c| ",
+ " 2 dh 2 tt c| ",
+ " 2 d cccc ( c| ",
+ " | ||||||||| ",
+ "|| cccc ccc |rrr|F F|2|",
+ "F| h h 2 |F F| ",
+ " |FFccc ccrr|rrr|F F| c",
+ " ||||||||||||||||||2|| c",
+ " cFFc|cccc|^^|cccc| ",
+ " 2 | 2 | "
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " cc c|c c| | cc | ",
+ " |||||||||| | cc | c c ",
+ " |Y 2 | c c ",
+ " | |ccrr| c c ",
+ " | ||||||||||||||| ",
+ "|| |OO |2||||",
+ " | |O RRRRRRRR | ccc ",
+ " 2 ||| | ",
+ " | |th RRRRRRRR | ",
+ " | |tt |FFrr ",
+ "|| |((| RRRRRRRR ||||||",
+ " 2 2 Y 6|^ ",
+ " 2 2 Y 6|^ ",
+ "|| |((| RRRRRR66 R||2",
+ " | |O O|c ",
+ " 2 |O RRRRRRRR |||c ",
+ " 2 |O h6|c ",
+ " | |O RR6RRRRR 6|c ",
+ "|| ||||||||||||||||||||",
+ "F| |rcc|FF|ccr",
+ "c|Y | ",
+ "||2((|||||| | cci icc ",
+ " c|cccc| | ccc ccc ",
+ " c| | | "
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " cc c| | | cc | ",
+ " ||||||22|| | cc | c c ",
+ " 2 | 2 c c ",
+ " ( |ccrr| c c ",
+ " | ||||||||||||||| ",
+ "|| 2 2 6||||||",
+ " | 2 2 tt6RRRt O| ccc ",
+ " 2 |(( O| ",
+ " | |th 6RRRttt R| ",
+ " | |tt 6|FFrr ",
+ "|| ||||(((((((((|||||||",
+ " 2 2 ",
+ " 2 2 ",
+ "||22|||||||||||||||||||2",
+ " | |???^ dd^dd6ddd6d|c ",
+ "c| | 6h d hd hd|c ",
+ "c| 2 dd 2 ",
+ " | 2 2 ",
+ "||22||||||||||||||22||||",
+ "F| |ccc| |ccr",
+ "c|Y | ",
+ "||2((|||||| | ccc ",
+ " |cccc| | ccc ccc ",
+ " | | | "
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " cc c|cccc| | cc | ",
+ " |||||||||| | cc c c c ",
+ " F|UUUUUU| | cc c c c ",
+ " F| | | cc c c c ",
+ " F| cc | 2 ",
+ "|||| cc | | |2||||",
+ " cc | |c c| ccc ",
+ " cc | |t ht| ",
+ " | |ch c| ",
+ " |FFFFF|22|c66c|FFrr ",
+ "||22||||||| |||||||||||",
+ " 2 Y 2 ",
+ " 2 Y 2 ",
+ "||22||||||| a ?|||",
+ " ( |F U| tt ?|c ",
+ " ( |F U| a tt ?|c ",
+ " 2 |F U| ?|c ",
+ " | |F U| ^???tV??|c ",
+ "|| |||2((| |||||||||||",
+ " | |22|UUU|FF|ccr",
+ " | | | ",
+ " |2((|2(((| | cci icc ",
+ " c| ccc| | ccc ccc ",
+ " c| | | "
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " | | | cc | ",
+ " | cc | | cc | c c ",
+ " cc | cc 2 2 | c c ",
+ " cc | cc | | h h| c c ",
+ " | | |6666| ",
+ "||22||||||| ||||||2||||",
+ "c| |htth | ccc ",
+ " | |htth | ",
+ " | | ",
+ "c| |FFrr ",
+ "|| dddd ||||||",
+ "2 Y d hd 2 ",
+ "2 Y d d 2 ",
+ "|| dddd ||||2|",
+ "F| |ccr ",
+ "F| B|c ",
+ "F| |htth htth B|c ",
+ "F| |htth htth B|cc ",
+ "||22||||||||||||||||||2|",
+ "F| |ccc YY( UUU|ccc ",
+ "c|Y |c 2 |c ",
+ " |c |22| |F cc ",
+ " |ccc | |2(((|F cc ",
+ " cc| | | | "
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " | | | cc | ",
+ " cc | cc | | cc | c c ",
+ " c6 2 cc 2 2 | c c ",
+ " cc | | | h h| c c ",
+ " |FFFF| |6666| ",
+ "|||||||||||22|||||||2|||",
+ " t c|Y Y| |c ",
+ " t c| | Y|c ",
+ " || | Y|c ",
+ " i| | |c ",
+ "2|||| ddd ^|22||2||2",
+ " 2 d | 2 ",
+ " 2 6h | 2 ",
+ "2|||| ddd ^|22||||||",
+ " th6| |ccr ",
+ " t c| |c ",
+ " c| |c ",
+ " th6|Y Y|cc ",
+ "|||||||||||22|||||||||2|",
+ " |ccc | ( |ccc ",
+ " ccc |c | 2 Y |c ",
+ " c6c |ccc | ( |F cc ",
+ " ccc |c 2 |2(((|F cc ",
+ " |c | | | "
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " | | | cc | ",
+ " cc | cc | |||||| c c ",
+ " c6 2 cc 2 2 | c c ",
+ " cc | YY | | h h| c c ",
+ " |FFFF| |6666| ",
+ "|||||||||||22||||||2||||",
+ " t c| c| |B 6d |c ",
+ " t c| cc 6| |B hd Y|c ",
+ " || cc 6| |B d Y|c ",
+ " i| cc r| |B 2 ",
+ "2|||| cc r| |||||||||||",
+ " 2 2 | 2 Y 5 T ",
+ " ( ( Y | 2 Y 5 ",
+ "2||||c c c| |((((G |||",
+ " th6|c c 6| |dddd| |cc",
+ " t c|c c c| |Mh | | ",
+ " c|c c| | |2|| 2 ",
+ " th6|FFFFF| | | l|^^| ",
+ "||||||||||| |2|||||||2|",
+ " |ccc | |#####| ",
+ " ccc |c | |#####| ",
+ " c6c |ccc |YY|||||||||c ",
+ " ccc |c 2 |FFcc|F cc ",
+ " |c | | | "
+ ],
+ "palettes": [ "microlab" ],
+ "monster": { "T": { "monster": "mon_turret_rifle" }, "M": { "monster": "mon_zombie_bio_op" } }
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " | | | | ",
+ " 2 c| |cccc| cc ",
+ " c((2| cc| |||||| cc ",
+ " c( 2 6| |l l| ",
+ "cc( ( cc| |l l|FFc6 ",
+ "|||(2|||||| |||2||||||2",
+ " F| tttt( ^| ",
+ " c|r t( ^|c ",
+ " c|r t( |((((2((|c ",
+ " F| tttt( | Y 2 ",
+ "2|||2|||||| | RRR |||||",
+ " YY| | ",
+ " YY| RRR | ",
+ "||||||||||| |ORRRO| ||",
+ " |R66RRRR ( ||||||| |c",
+ " |R 2 |#| | ",
+ " || RRRR ( |#| | ",
+ "c|l ( |#| |||||c",
+ "||| RRRR ( |#| |FFF||",
+ " 2 2 |#| 2 ",
+ " |R66ROOOO( |#| | ccc ",
+ " |||||||||| |||22| ",
+ " cccc|cccc| | | ccc ",
+ " c|c 2 5 2 "
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " |c c| | | ",
+ " cccc|c c| | | c c ",
+ " c|||||22|| ||22|| c c ",
+ " 6| |t | ",
+ "cc| |t | ccc ",
+ "||| |||||||||t ||||||",
+ "rr| | R c RRR|FF",
+ " 2 | R c 6| ",
+ " 2 | 6| ",
+ "FF| |yyy RRR66RRRRR|FF",
+ "||| | y R||||||",
+ " |6 y RRRRR R| ",
+ " | y O| ",
+ "|2||||yyy RRRRR O| |||",
+ " |l o| |c ",
+ " c|l |R ttttt R| |c ",
+ " c|l |R R| | ",
+ " c|l RRR66RRR| | ",
+ "|||||||22||||||||||22|2|",
+ " 66 |l l| 2 | ",
+ " 66 |l l| 2 | ",
+ " 66 ||22|| ||||||||| ",
+ " 66 | | |c66c|ccc ",
+ " | | | | "
+ ],
+ "palettes": [ "microlab" ]
+ }
+ }
+]
diff --git a/data/json/mapgen/microlab/microlab_generic_edge.json b/data/json/mapgen/microlab/microlab_generic_edge.json
new file mode 100644
index 0000000000000..13cdfd99ece20
--- /dev/null
+++ b/data/json/mapgen/microlab/microlab_generic_edge.json
@@ -0,0 +1,512 @@
+[
+ {
+ "type": "mapgen",
+ "method": "json",
+ "nested_mapgen_id": "concrete_wall_ew",
+ "object": {
+ "mapgensize": [ 24, 24 ],
+ "set": [ { "line": "terrain", "id": "t_concrete_wall", "x": 0, "y": 0, "x2": 23, "y2": 0 } ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "method": "json",
+ "nested_mapgen_id": "concrete_wall_ns",
+ "object": {
+ "mapgensize": [ 24, 24 ],
+ "set": [ { "line": "terrain", "id": "t_concrete_wall", "x": 0, "y": 0, "x2": 0, "y2": 23 } ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic_edge" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " | | | ",
+ " cc c 2 2 2 ",
+ " cc c c| | cc |r i ",
+ " c| | |r c ",
+ " FFFFccccc| |cccc|r c ",
+ "||||||||||| ||||||| ",
+ " FF c|h ^| ??? t| c ",
+ " c|dd | V| c ",
+ " c|h = V| i ",
+ " c| = ??? t| ",
+ "|5||||===[= |==2|",
+ " YY 2 ",
+ " YY 2 ",
+ "|2|||| |((2|",
+ " r| | ",
+ " c r| |^ ",
+ " c hc|||||| ||((22| h ",
+ " c|FFFF| | |6tt ",
+ "|||||||22||22||((22|||||",
+ " | | |FFF ",
+ " c6 6c | |c | ",
+ " cc cc | |6h ",
+ " cc cc 2 |c ccccc ",
+ " | | "
+ ],
+ "place_nested": [
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic_edge" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " | | | ",
+ " cc c 2 2 2 ",
+ " cc c c| | 66 |r i ",
+ " c| 2 2 c ",
+ " F Fccccc| |6666|r c ",
+ "||22||||||| ||||||| ",
+ " |yyyy( | c ",
+ " 2yyyy( 6 | c ",
+ " 2yyyy( 6h | i ",
+ " |yyyy( 6 | ",
+ "|5||||((((( |==2|",
+ " 2 YY 2 ",
+ " 2 YY 2 ",
+ "|2|||| 6h |((2|",
+ " r| 6 | ",
+ "cc r|^^^^ |^ ",
+ "cc hc|||||| ||((22| h ",
+ " c2 2 | |6tt ",
+ "|||||| | ||((22|||||",
+ " | | |FFF ",
+ " c6 6c |22|c | ",
+ " cc cc | |6h ",
+ " cc cc | |c ccccc ",
+ " | 5 "
+ ],
+ "place_nested": [
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic_edge_edge" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ "||||||||||| | | ",
+ "|#########| 2 2 ",
+ "|##|||||||| |||||||| ",
+ "|##| hth VV |6 ",
+ "|##| ^ |dh ",
+ "|||| hth ^ hth |d ",
+ " FF| ^ hth || ",
+ " | hth hth |d ",
+ " ||=====| |====||dh ",
+ " |^?? ^ ^ ?? ^|6 ",
+ "|5|| |||2|",
+ " YY ",
+ " YY ",
+ "|2||||||||| |22||||((2|",
+ " r|D | | D| ",
+ " c r|@@ | | @@| ",
+ " c hc|D | | D| ",
+ " c|@@ | | @@| ",
+ "||2|||D |22| D|((2|",
+ " 6|@@ | | @@| ",
+ " 6|D 2 | D|c ",
+ " c|@@ 2 | @@|c ",
+ " c| ll| |ll |c ",
+ " |||||| ||||||| "
+ ],
+ "place_nested": [
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic_edge" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ "||||||||||| | | ",
+ "|tRt yyyy| 2 2 ",
+ "| y y| |||||||| ",
+ "|tRt y y| |UUUUU|6 ",
+ "| y y| | |dh ",
+ "|RRR yyyy| | ccc ||| ",
+ "| 66 | 2 |UU ",
+ "|RRR | 2 |d ",
+ "| | |F6ccF|dh ",
+ "|OOOO | |||||||6 ",
+ "||||||||22| ^^^|||2|",
+ " ",
+ " ",
+ "|2||||||||| |||||||((2|",
+ " 6|hdh 2 2 hdh|U ",
+ " t t| dh = = hd |U ",
+ " t t|^ = = ^|cc ",
+ " t|||||| |||||||c ",
+ "||2|||^ 2 2 ^|((2|",
+ " 6|^hd = = d B|c ",
+ " c 6|^ dh= = hdhB|c ",
+ " c c|||||| |||||||c ",
+ " c c| 2 2 FF|UU ",
+ " | | | | "
+ ],
+ "place_nested": [
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic_edge" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ "||||||||||| | | ",
+ "|OOOOOOOOO| 2 2 ",
+ "|O O| |||||||| ",
+ "|O RRR 5 |66666|6 ",
+ "|OOOOOOOOO| 2 |dh ",
+ "||||||||||| |(((((||| |",
+ " ttRRRttO| ^|6 ",
+ " hO| V|6 ",
+ " h | ^|6 ",
+ " tRRt | V|6 ",
+ "||||||||22| ^|||2|",
+ " ",
+ " ",
+ "|2||||||||| |||||||((2|",
+ " 6|hdh 2 2 hdh|c ",
+ " t t| dh = = hd |c ",
+ " t t|^ = = ^|cc ",
+ " t|||||| |||||||c ",
+ "||2|||^ 2 2 ^|((2|",
+ " 6|^hd = = d B|c ",
+ " c 6|^ dh= = hdhB|c ",
+ " c c|||||| |||||||c ",
+ " c c| 2 2 F|c ",
+ " | | | | "
+ ],
+ "place_nested": [
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic_edge" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " | | | | ",
+ " U|||||||| |tt 2 ",
+ " U|D@D@D@| |||||||||||",
+ " U| @ @ @| htth ^V |",
+ " U| | htth ^ |",
+ "|||| 2 |",
+ " FF| 2 htth ^ |",
+ " U| | htth ^ |",
+ " U| @ @ @| |",
+ " U|D@D@D@| htth ^ |",
+ "|5||||||||| htth ^ |",
+ " YY ",
+ " YY ",
+ "|2||||||||| |22(((|((2|",
+ " |D@D@D@| | ^| ",
+ " c | @ @ @| | hh|cc ",
+ " c | | | tt|cc ",
+ " | @ @ 2 | hh| ",
+ "||2| @ @ | | |((2|",
+ " | | |||2|||U ",
+ " U| @ @ @| | |U ",
+ " U|D@D@D@| |@ h|U ",
+ " U|||||||| |@D t|U ",
+ " | | ||||||| "
+ ],
+ "place_nested": [
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic_edge" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " | | | ",
+ " cccc U| |c hc|UUU ",
+ " cUUc U| |c c||||||",
+ " c c 2 |6h lll|",
+ " 2 |6h |",
+ "||||((((((( |||||||((2|",
+ " ( ( nn^^^^( |",
+ " 2 RR ( YY( |",
+ " 2 ( YY( |",
+ " ( 6666 ( ( |",
+ "|5||||||||| ||||((2|",
+ " ",
+ " ",
+ "||||| || |22(((|((2|",
+ " | | | ^| ",
+ " U | | | hh|cc ",
+ " U | | | tt|cc ",
+ " | | | hh| ",
+ "||2|||22||| | |((2|",
+ " Uc UU( |||2|||U ",
+ " c ( | |U ",
+ " ch h h( |@ h|U ",
+ " c UUUcc| |@D t|U ",
+ " |||||||| ||||||| "
+ ],
+ "place_nested": [
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic_edge" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " | | | ",
+ " U h U| |U U|U ",
+ " U ccc U| |U U|U |",
+ " ||||||||22|U |",
+ " 2 2 |6h UU |",
+ "||||((((((( |||||||((2|",
+ " ( cc ( nn^^^^( |",
+ " 2 2 YY( |",
+ " 2 2 YY( |",
+ " ( cc ( ( |",
+ "|5||((((((| ^^||||((2|",
+ " ",
+ " ",
+ "||||====[|| |22(((|((2|",
+ " |dddd B| | R| ",
+ " U | h B| | hR|hc ",
+ " U | B| |O 6|cc ",
+ " |^^ B| |O 6| ",
+ "||2|||22||| | hR|((2|",
+ " Uc UU( | R|U ",
+ " c 2 |yyyyy|U ",
+ " c ( | |U ",
+ " c |c cc c| | |U ",
+ " | | ||||||| "
+ ],
+ "place_nested": [
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic_edge" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " | cc | | | ",
+ " 6|||||||| |U U|c hc ",
+ " 6| iii 2 |U U|c hc ",
+ " 6| | |((((|h ",
+ " 66||+|+|+| | ",
+ "||||& |&|&| |UUUUUU ||",
+ " FF|||||||| |||||||22| ",
+ " c|^^^ | ",
+ " 6| | ",
+ " 6| | ",
+ "|5|| |||||||||||||| ||",
+ " YY ",
+ " YY ",
+ "|2|| ||||||||22(((|((2|",
+ " | | h 2 6| ",
+ " c | |ccc|U cc h6|cc ",
+ " c | |ccc|U cc 6|cc ",
+ " | | h 2 h6| ",
+ "||2| |||||||| 6|((2|",
+ " U | |22(((|U ",
+ " c | | cc6|U ",
+ " c |||||2|| | h |U ",
+ " 2 c|U U| |FFFFF|U ",
+ " | | ||||||| "
+ ],
+ "place_nested": [
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic_edge" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " | cc | | | ",
+ " 6|||||||| |U U|c hc ",
+ " 6| iii 2YY|U U|c hc ",
+ " 6| | |(22(|h ",
+ " 66||+|+|+| | YY ",
+ "||||& |&|&| |UUUUUU ||",
+ " FF||||||||22|||||||22| ",
+ " c|B^^ [ 2 F| | ",
+ " 6|B hd= |c F| | ",
+ " 6|B dd6= |ccc | | ",
+ "|5||=[===== |||(((| ||",
+ " 2YY YY 2YY ",
+ " 2YY YY 2YY ",
+ "|2|| ||||| |22(((|((2|",
+ " c| ( h 2 ( 6| ",
+ " c| (ccc( (ccYh6|cc ",
+ " c| (ccc( (ccY 6|cc ",
+ " c| ( h 2 ( h6| ",
+ "|2|| ||||| | 6|((2|",
+ " U| YY|22(((|U ",
+ " U| YY| cc6|U ",
+ " U|2|||2||22| h |U ",
+ " | c|U U| |FFFFF|U ",
+ " | | ||||||| "
+ ],
+ "place_nested": [
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic_edge" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " | cc | | | ",
+ " 6|||||||| |U U|c hc ",
+ " 6|U 2YY|U U|c hc ",
+ " 6|U ccci| |(22(|h ",
+ " 66|U | | YY ",
+ "||||U ccci| |UUUUUU ||",
+ " FF||2|||||22|||||||22| ",
+ " c| |U | 2 F| | ",
+ " 6| |U | |c F| | ",
+ " 6| |ch | |ccc | | ",
+ "|5|| |c | |||(((| ||",
+ " 2YY|ch | 2YY ",
+ " 2YY|cc | 2YY ",
+ "|2|| |||2| |22(((|((2|",
+ " c| ( h ( ( 6|h ",
+ " c| (cc ( (ccYh6|66 ",
+ " c| (cc ( (ccY 6|66 ",
+ " c| ( h ( ( h6|h ",
+ "|2|| |||2| | 6|((2|",
+ " U| YY|22(((|6 ",
+ " U| YY| 666|c ",
+ " U|2|||2||22| h |c ",
+ " | c|U U| |^BBB^|U ",
+ " | | ||||||| "
+ ],
+ "place_nested": [
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }
+ ],
+ "palettes": [ "microlab" ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic_edge" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " | cc | | | ",
+ " 6|||||||| |U U|c hc ",
+ " 6|U 2YY|U U|c hc ",
+ " 6|U ccci| |(22(|h ",
+ " 66|U | | YY ",
+ "||||U ccci| |UUUUUU ||",
+ " FF||2|||||2||||||||||| ",
+ " c| 2 FUUU ",
+ " 6|^ hhh ^|c FU U ",
+ " 6|^ ttt ^|ccc ",
+ "|5|| hh h|||(((|||||",
+ " 2Y YY ",
+ " 2Y YY ",
+ "|2||=======[=|22(((|((2|",
+ " c|? t ? Y6| c ",
+ " c|? t ? Y^| cc ",
+ " c|? t ? ^| cc c ",
+ " c|^ ^| c ",
+ "|2||v ^| |((2|",
+ " U| Y^|22(((|6 ",
+ " U| ^^ Y^| 666|c ",
+ " U|2|||2||2|| h |c ",
+ " U |UU U| |^BBB^|U ",
+ " | | ||||||| "
+ ],
+ "place_nested": [
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
+ { "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } }
+ ],
+ "palettes": [ "microlab" ]
+ }
+ }
+]
diff --git a/data/json/mapgen/microlab/microlab_special_tiles.json b/data/json/mapgen/microlab/microlab_special_tiles.json
new file mode 100644
index 0000000000000..3cb252a95d5eb
--- /dev/null
+++ b/data/json/mapgen/microlab/microlab_special_tiles.json
@@ -0,0 +1,176 @@
+[
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " cc | c| |c c|r ",
+ " cc | c| |c c|r c ",
+ " | h 6| 2 2 c ",
+ " dd |==|||22||||||6h ",
+ " hd |tt|-- -----|6 ",
+ "|||22||||- -fYf-||||||",
+ " c| |##|-dd -f f-|hd^= ",
+ " c| ||||-h -f f-| d = ",
+ " c| c|-G55-f f-| ] ",
+ " 2 c|- --2--| = ",
+ "||| c|- -||||||",
+ " ?|-Y cc c-| ",
+ " ?|- cc c-| ",
+ "||2||||||-h c-| |||",
+ " r|-tt- c-| |r ",
+ "cc c r||((- Y-| |r ",
+ "cc c rr|-@;-5- h-| |r ",
+ " r|-@M5 -dd-| |r ",
+ "||||||rr|---------| |||",
+ " |||||||||||||| |c ",
+ " c 6| |c ",
+ " iccc 6| 2 ",
+ " c 6| ||22||||| ",
+ " c c|c |22| |cc "
+ ],
+ "palettes": [ "microlab" ],
+ "terrain": { "G": "t_card_science" },
+ "items": { "f": { "item": "mutagens", "chance": 60, "repeat": [ 1, 4 ] } },
+ "monster": { "M": { "monster": "mon_mutant_experimental" } },
+ "place_monsters": [ { "monster": "GROUP_LAB", "chance": 2, "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 1, 5 ] } ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " | cc | | cc | ",
+ " 2 2 2 | c c ",
+ " F||||||| |||||||c c ",
+ " F|m 5 |22|0c7c0|c c ",
+ " F|((( ( | | ",
+ "|||||m 5 ( |((2((| ||",
+ " 66|((( ( c| ",
+ " |m 5 ( 6| c ",
+ " cc|||| |(((( c| c ",
+ " | 2 5 ( | ",
+ "2((||2||((| m( ||2||",
+ " 2 ((((( 2 ",
+ " 2 2 ",
+ "2((|| ||2||",
+ " c| d6d |c ",
+ " c c| d6d h d6d|c c ",
+ " c c| h h |c c ",
+ " c| |F ",
+ "||||| |||2|",
+ "c66c|FFFFFF |ccccc|cc ",
+ " c c|||||||22||||||| ",
+ " c cc(ccc | |FFFF| cc ",
+ " c 2 ||22|| cc ",
+ " ( | | | "
+ ],
+ "palettes": [ "microlab" ],
+ "terrain": { "0": "t_vat" },
+ "monster": { "T": { "monster": "mon_mutant_experimental" } },
+ "place_items": [ ],
+ "place_monsters": [ { "monster": "GROUP_LAB", "chance": 2, "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 1, 5 ] } ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ " | cc 2 2 cc | ",
+ " | |^^| |cccc ",
+ " ||||||||||||||||||||c ",
+ " |------------------|6 ",
+ " |-F cccccc -lll -|r ",
+ "|||-F 2 c-||2",
+ " |--- cc cc - h6-| ",
+ " |-F cc cc - h c-|c ",
+ " |-F cc cc -cccc-|c ",
+ " |--- -((((-| ",
+ "2|G 2 7-|||",
+ " 5 T----22---- @@-| ",
+ " 5 T-h 5 7-| ",
+ "||-lll-66 5 -|||",
+ " |-----(((222---------|c",
+ " |-0 0 0 0 0 0 0 0 -| ",
+ " |-0 0 0 0 0 0 0 0 -| ",
+ "c|- -|c",
+ "||-0 0 0 0 0 0 0 0 0 -||",
+ "c|-0 0 0 0 0 0 0 0 0 -|F",
+ " |--------------------|F",
+ " |||||||||||||||||||||||",
+ " cccc|c |^^| | cc ",
+ " c|c 2 2 | "
+ ],
+ "palettes": [ "microlab" ],
+ "terrain": { "0": "t_vat", "G": "t_card_science" },
+ "monster": { "T": { "monster": "mon_turret_rifle" } },
+ "place_monsters": [ { "monster": "GROUP_LAB", "chance": 2, "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 1, 5 ] } ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "microlab_generic" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_strconc_floor",
+ "rows": [
+ "^|FFF|c c| |c c| ",
+ " |||||||||| |||||||||| ",
+ " |D D| |^^^^|ccc| ",
+ " |@@ @@| 2 2 ",
+ "^|D T D| | | ",
+ "||@@ @@| |2(((||||||",
+ "r| 2 | O| ",
+ "r|||||2|||| | RR O| ",
+ "r|l | | l| | RR O| ",
+ " |l | 2 l| | O| ",
+ "2||||||||||22| |-tt-|||",
+ " YY| |-((--|^",
+ " YY| |-@Ti-|^",
+ "|||||2||||||||5G|-@ ;-||",
+ " | |---5----2--| ",
+ " | cc cc |-p Y p-| ",
+ " | cc cc |-p 7 p-|t",
+ " | cc |-p / T p-|t",
+ "|| cc |- -||",
+ " |2||| |-(- -(- -| ",
+ " | |dh d|-T-6-T-ppp-| ",
+ " 2 |dddd|-----------| ",
+ " |||||||||||||||||||||| ",
+ " |ttt |^^| cc | "
+ ],
+ "palettes": [ "microlab" ],
+ "terrain": { "G": "t_card_science" },
+ "furniture": { "7": "f_autodoc", "/": "f_autodoc_couch", "T": "f_counter", "p": "f_counter" },
+ "items": {
+ "p": { "item": "bionics", "chance": 20 },
+ "T": [
+ { "item": "bionics_sci", "chance": 100, "repeat": [ 1, 2 ] },
+ { "item": "bionics", "chance": 100, "repeat": [ 1, 3 ] }
+ ]
+ },
+ "place_loot": [ { "item": "anesthetic_kit", "x": 20, "y": 15 } ],
+ "place_monsters": [ { "monster": "GROUP_LAB", "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 1, 5 ] } ],
+ "monster": { "T": { "monster": "mon_prototype_cyborg" } },
+ "computers": {
+ "6": {
+ "name": "Surgery room computer",
+ "security": 3,
+ "options": [
+ { "name": "Open Storage Chambers", "security": 5, "action": "release_bionics" },
+ { "name": "Manifest", "action": "list_bionics" }
+ ],
+ "failures": [ { "action": "manhacks" }, { "action": "secubots" } ]
+ }
+ }
+ }
+ }
+]
diff --git a/data/json/mapgen/missile_silo.json b/data/json/mapgen/missile_silo.json
new file mode 100644
index 0000000000000..4496142a7ab8a
--- /dev/null
+++ b/data/json/mapgen/missile_silo.json
@@ -0,0 +1,509 @@
+[
+ {
+ "type": "mapgen",
+ "method": "json",
+ "om_terrain": [ "silo" ],
+ "weight": 400,
+ "object": {
+ "rows": [
+ " .................... ",
+ " .................... ",
+ " .................... ",
+ " ....................s ",
+ " |-------------|-+-|--| ",
+ " | |...| | ",
+ " | v |-+-| | ",
+ " | ... | ",
+ " | ... | ",
+ " | ... | ",
+ " | ... | ",
+ " | ***** ... | ",
+ " | ******* ... | ",
+ " | ********* ... | ",
+ " | ********* ... | ",
+ " | ********* ... | ",
+ " | ********* ... | ",
+ " | ********* !x#!! | ",
+ " | ******* !,,^! | ",
+ " | ***** !,!$! | ",
+ " | !>!$! | ",
+ " | !!!!! | ",
+ " |--------------------| ",
+ " "
+ ],
+ "terrain": {
+ " ": [
+ [ "t_grass", 20 ],
+ [ "t_grass_dead", 3 ],
+ [ "t_grass_tall", 5 ],
+ [ "t_grass_long", 3 ],
+ [ "t_dirt", 5 ],
+ [ "t_shrub", 2 ],
+ [ "t_tree", 1 ]
+ ],
+ ".": "t_pavement",
+ ",": "t_floor",
+ "^": "t_elevator_control_off",
+ "$": "t_elevator",
+ "-": "t_chainfence",
+ "|": "t_chainfence",
+ "+": "t_chaingate_c",
+ "*": "t_metal_floor",
+ "!": "t_wall_metal",
+ ">": "t_stairs_down",
+ "x": "t_card_military",
+ "#": "t_door_metal_locked",
+ "s": "t_pavement",
+ "v": "t_dirt"
+ },
+ "furniture": { "s": "f_sign_warning", "v": "f_vent_pipe" },
+ "signs": { "s": { "signage": "Restricted area! Violators will be shot!" } }
+ }
+ },
+ {
+ "type": "mapgen",
+ "method": "json",
+ "om_terrain": [ "silo_1" ],
+ "weight": 400,
+ "object": {
+ "fill_ter": "t_rock",
+ "rows": [
+ " ",
+ " ",
+ " ......W tc...W ",
+ " .cTTc..X tc...s & 6",
+ " .cTTc..+... e....s r..",
+ " .cTTc.. . f...ba S.a",
+ " ....... . +X = ",
+ " CCCrxxa ............ ",
+ " a. 1 . ",
+ " ~~~~~~~~~ . . ",
+ " ~~|-----|~~ . . ",
+ " ~~|-`````-|~~ . . ",
+ " ~|-`*****`-|~ . X+ ",
+ " ~|`*******`|~ . B...a",
+ " ~|`*******`|~ . l...W",
+ " ~|`*******`|~?. B...l",
+ " ~|`*******`|~ . l...B",
+ " ~|`*******`|~ . B...l",
+ " ~|-`*****`-|~ . l...B",
+ " ~~|-`````-|~~ . ",
+ " ~~|-----|~~ . < ^ ",
+ " ~~~~~~~~~ ....?..$ ",
+ " > $ ",
+ " "
+ ],
+ "terrain": {
+ "*": "t_missile",
+ "`": "t_hole",
+ "|": "t_metal_railing",
+ "-": "t_metal_railing",
+ "~": "t_metal_floor",
+ ".": "t_floor",
+ "&": "t_floor",
+ "1": "t_floor",
+ "a": "t_floor",
+ "b": "t_floor",
+ "B": "t_floor",
+ "c": "t_floor",
+ "l": "t_floor",
+ "r": "t_floor",
+ "f": "t_floor",
+ "e": "t_floor",
+ "s": "t_floor",
+ "S": "t_floor",
+ "t": "t_floor",
+ "T": "t_floor",
+ "W": "t_water_dispenser",
+ "C": "t_floor",
+ "6": "t_floor",
+ "=": "t_door_locked",
+ "+": "t_door_metal_locked",
+ "?": "t_door_metal_c_peep",
+ "^": "t_elevator_control_off",
+ "$": "t_elevator",
+ ">": "t_stairs_down",
+ "<": "t_stairs_up",
+ "X": "t_card_military",
+ "x": "t_console_broken"
+ },
+ "furniture": {
+ "d": "f_desk",
+ "c": "f_chair",
+ "a": "f_air_conditioner",
+ "r": "f_trashcan",
+ "C": "f_filing_cabinet",
+ "B": "f_bed",
+ "t": "f_table",
+ "T": "f_table",
+ "f": "f_fridge",
+ "e": "f_counter",
+ "l": "f_locker",
+ "s": "f_sofa",
+ "S": "f_sink",
+ "6": "f_shower",
+ "b": "f_bookcase",
+ "1": "f_speaker_cabinet"
+ },
+ "items": {
+ "r": { "item": "trash_cart", "chance": 50, "repeat": 2 },
+ "l": { "item": "lab_dorm", "chance": 70, "repeat": 2 },
+ "B": { "item": "bed", "chance": 60 },
+ "f": { "item": "fridge", "chance": 70, "repeat": 3 },
+ "C": { "item": "office_supplies", "chance": 60 },
+ "t": { "item": "dining", "chance": 45 },
+ "b": { "item": "bunker_basement_books", "chance": 70, "repeat": 2 }
+ },
+ "item": { "e": { "item": "microwave", "chance": 70 }, "T": { "item": "militarymap", "chance": 30 } },
+ "toilets": { "&": { } }
+ }
+ },
+ {
+ "type": "mapgen",
+ "method": "json",
+ "om_terrain": [ "silo_2" ],
+ "weight": 400,
+ "object": {
+ "fill_ter": "t_rock",
+ "rows": [
+ " b..t 1..cd b.....s ",
+ " b..s dc..d b..T9.s ",
+ " b..s d...1 a.....t ",
+ " . ...X +X ",
+ " C. 222 ...+.... &. ",
+ " C........3 . r.a",
+ " C.c....c. . S. ",
+ " a%%%rxxd1 .a = ",
+ " 000 ........ ",
+ " ~~~~~~~~~ .4 ",
+ " ~~|-----|~~ . ",
+ " ~~|-`````-|~~ . X555555",
+ " ~|-`*****`-|~ ..+.....a",
+ " ~|`*******`|~ . 666666",
+ " ~|`*******`|~ . ",
+ " ~|`*******`|~?. ",
+ " ~|`*******`|~ . 777777",
+ " ~|`*******`|~ ..+.....a",
+ " ~|-`*****`-|~ . X888888",
+ " ~~|-`````-|~~ . ",
+ " ~~|-----|~~ . < ^ ",
+ " ~~~~~~~~~ ...?..$ ",
+ " > $ ",
+ " "
+ ],
+ "terrain": {
+ "*": "t_missile",
+ "`": "t_hole",
+ "|": "t_metal_railing",
+ "-": "t_metal_railing",
+ "~": "t_metal_floor",
+ ".": "t_floor",
+ "&": "t_floor",
+ "1": "t_floor",
+ "2": "t_floor",
+ "3": "t_floor",
+ "4": "t_floor",
+ "5": "t_floor",
+ "6": "t_floor",
+ "7": "t_floor",
+ "8": "t_floor",
+ "9": "t_floor",
+ "a": "t_floor",
+ "b": "t_floor",
+ "c": "t_floor",
+ "d": "t_floor",
+ "r": "t_floor",
+ "s": "t_floor",
+ "S": "t_floor",
+ "t": "t_floor",
+ "T": "t_floor",
+ "W": "t_water_dispenser",
+ "C": "t_floor",
+ "0": "t_reinforced_glass_shutter",
+ "^": "t_elevator_control_off",
+ "$": "t_elevator",
+ "x": "t_console_broken",
+ "+": "t_door_metal_locked",
+ "?": "t_door_metal_c_peep",
+ "=": "t_door_locked",
+ ">": "t_stairs_down",
+ "<": "t_stairs_up",
+ "%": "t_machinery_electronic",
+ "X": "t_card_military"
+ },
+ "furniture": {
+ "d": "f_desk",
+ "c": "f_chair",
+ "a": "f_air_conditioner",
+ "r": "f_trashcan",
+ "C": "f_filing_cabinet",
+ "s": "f_sofa",
+ "b": "f_bookcase",
+ "t": "f_table",
+ "T": "f_table",
+ "S": "f_sink",
+ "1": "f_shredder",
+ "2": "f_server",
+ "3": "f_rack_coat",
+ "4": "f_speaker_cabinet",
+ "5": "f_utility_shelf",
+ "6": "f_utility_shelf",
+ "7": "f_utility_shelf",
+ "8": "f_utility_shelf",
+ "9": "f_armchair"
+ },
+ "items": {
+ "r": { "item": "trash_cart", "chance": 50 },
+ "C": { "item": "office_supplies", "chance": 60 },
+ "d": { "item": "office", "chance": 50 },
+ "b": { "item": "lab_bookshelves", "chance": 60, "repeat": 2 },
+ "5": { "item": "supplies_electronics", "chance": 60, "repeat": 2 },
+ "6": { "item": "plumbing_bulk", "chance": 60, "repeat": 2 },
+ "7": { "item": "bunker_basement_food", "chance": 60, "repeat": 2 }
+ },
+ "item": {
+ "3": { "item": "coat_lab", "chance": 50, "repeat": 2 },
+ "8": { "item": "water_clean", "chance": 70, "repeat": [ 1, 2 ] },
+ "c": { "item": "coat_lab", "chance": 50 },
+ "T": [ { "item": "glass" }, { "item": "whiskey" }, { "item": "death_note" } ]
+ },
+ "place_loot": [ { "group": "bunker_basement_suicide", "x": 19, "y": 1 } ],
+ "place_fields": [ { "field": "fd_blood", "x": 18, "y": 1 }, { "field": "fd_blood", "x": 19, "y": 1 } ],
+ "toilets": { "&": { } }
+ }
+ },
+ {
+ "type": "mapgen",
+ "method": "json",
+ "om_terrain": [ "silo_3" ],
+ "weight": 400,
+ "object": {
+ "fill_ter": "t_rock",
+ "rows": [
+ " x akk.i",
+ " ,,,,,,,,,,,X,,,,g",
+ " ,Y 4, .jj.h",
+ " + , ",
+ " %,,,a , ",
+ " %,,,% ,a a5555",
+ " %,,,% ,,,+,,,,,",
+ " %,,,% , x .6666",
+ " 000 , ",
+ " ~~~~~~~~~ , `",
+ " ~~|-----|~~ , ```",
+ " ~~|-`````-|~~ , `````` ",
+ " ~|-`*****`-|~````` ",
+ " ~|`*******`````` ",
+ " ~|`*******`|~ , ",
+ " ~|`*******`|~?, ",
+ " ~|`*******`|~ , ",
+ " ~|`*******`|~ , ",
+ " ~|-`*****`-|~ , ",
+ " ~~|-`````-|~~ , ",
+ " ~~|-----|~~ , < ^ ",
+ " ~~~~~~~~~ ,+....$ ",
+ " Y > $ ",
+ " "
+ ],
+ "terrain": {
+ "*": "t_missile",
+ "`": "t_hole",
+ "|": "t_metal_railing",
+ "-": "t_metal_railing",
+ "~": "t_metal_floor",
+ ".": "t_floor",
+ ",": "t_floor",
+ "4": "t_floor",
+ "5": "t_floor",
+ "6": "t_floor",
+ "a": "t_floor",
+ "g": "t_generator_broken",
+ "h": "t_switchgear_s",
+ "i": "t_station_disc",
+ "j": "t_current_trans",
+ "k": "t_potential_trans",
+ "0": "t_reinforced_glass_shutter_open",
+ "^": "t_elevator_control_off",
+ "$": "t_elevator",
+ "x": "t_console_broken",
+ "+": "t_door_metal_locked",
+ "?": "t_door_metal_c_peep",
+ "%": "t_machinery_electronic",
+ ">": "t_stairs_down",
+ "<": "t_stairs_up",
+ "X": "t_mdoor_frame",
+ "Y": "t_card_military"
+ },
+ "furniture": { "a": "f_air_conditioner", "5": "f_utility_shelf", "6": "f_locker", "4": "f_speaker_cabinet" },
+ "items": { "5": { "item": "radiation_meds", "chance": 60, "repeat": 2 }, "6": { "item": "radiation_equipment", "chance": 60 } },
+ "place_graffiti": [
+ {
+ "text": "Entrance is restricted to authorized environmental-protected personnel with clearance level 4 or above only!",
+ "x": 17,
+ "y": 20
+ }
+ ],
+ "set": [ { "square": "radiation", "amount": [ 100, 120 ], "x": 0, "y": 0, "x2": 23, "y2": 23 } ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "method": "json",
+ "om_terrain": [ "silo_4" ],
+ "weight": 400,
+ "object": {
+ "fill_ter": "t_rock",
+ "rows": [
+ " ~~~~~~~~~?a.BB.&& ",
+ " ~ %....&& ",
+ " ~ ? ",
+ " ~ alblblb . ",
+ " ~ ....... a.4 sta",
+ " ~ .......+.......=...",
+ " ~ ....... Y . @ S",
+ " ~ Wlblblb . ",
+ " ? . Y LLLL ",
+ " ~~~~~~~~~~ ...+....a",
+ " ~~|-----|~~ . rrrr ",
+ " ~~|-`````-|~~ . ",
+ " ~|-`*****`-|~ . ",
+ " ~|`*******`|~ . ",
+ " ~|`*******`|~ . ",
+ " ~|`*******`|~?. ",
+ " ~|`*******`|~ . ",
+ " ~|`*******`|~ . ",
+ " ~|-`*****`-|~ . ",
+ " ~~|-`````-|~~ . ",
+ " ~~|-----|~~ . < ^ ",
+ " ~~~~~~~~~ .+....$ ",
+ " Y > $ ",
+ " "
+ ],
+ "terrain": {
+ "*": "t_missile",
+ "`": "t_hole",
+ "|": "t_metal_railing",
+ "-": "t_metal_railing",
+ "~": "t_metal_floor",
+ ".": "t_floor",
+ "4": "t_floor",
+ "a": "t_floor",
+ "b": "t_floor",
+ "B": "t_floor",
+ "l": "t_floor",
+ "L": "t_floor",
+ "r": "t_floor",
+ "s": "t_floor",
+ "S": "t_floor",
+ "t": "t_floor",
+ "%": "t_floor",
+ "&": "t_floor",
+ "@": "t_floor",
+ "+": "t_door_metal_locked",
+ "?": "t_door_metal_c_peep",
+ "=": "t_door_locked",
+ ">": "t_stairs_down",
+ "<": "t_stairs_up",
+ "Y": "t_card_military",
+ "^": "t_elevator_control_off",
+ "$": "t_elevator",
+ "W": "t_water_dispenser"
+ },
+ "furniture": {
+ "4": "f_speaker_cabinet",
+ "a": "f_air_conditioner",
+ "%": "f_floor_canvas",
+ "&": "f_tatami",
+ "b": "f_bed",
+ "B": "f_bench",
+ "l": "f_locker",
+ "L": "f_locker",
+ "r": "f_rack",
+ "s": "f_shower",
+ "S": "f_sink",
+ "t": "f_trashcan"
+ },
+ "toilets": { "@": { } },
+ "items": {
+ "b": { "item": "army_bed", "chance": 60 },
+ "t": { "item": "trash_cart", "chance": 60 },
+ "l": { "item": "bunker_basement_clothing", "chance": 50 },
+ "L": [
+ { "item": "guns_rifle_milspec", "chance": 40, "repeat": [ 1, 2 ] },
+ { "item": "mags_milspec", "chance": 40, "repeat": [ 1, 2 ] },
+ { "item": "ammo_milspec", "chance": 40, "repeat": [ 1, 2 ] }
+ ],
+ "r": [
+ { "item": "grenades", "chance": 65, "repeat": [ 1, 2 ] },
+ { "item": "mil_armor", "chance": 65, "repeat": [ 1, 2 ] },
+ { "item": "gear_soldier_sidearm", "chance": 70, "repeat": [ 1, 2 ] }
+ ]
+ },
+ "place_graffiti": [ { "text": "Warning! Automatic security measures engaged due to the lockdown order!", "x": 17, "y": 20 } ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "method": "json",
+ "om_terrain": [ "silo_finale" ],
+ "weight": 400,
+ "object": {
+ "fill_ter": "t_rock",
+ "rows": [
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ",
+ " ~~~~~~~~~ ",
+ " ~~~~~~~~~~~ Y 4 a ",
+ " ~~~~~~~~~~~~~+........ ",
+ " ~~~~~~~~~~~~~|. . ",
+ " ~~~~~~~~~~~~~|.|x..a . ",
+ " ~~~~~~~~~~~~~|.|x... . ",
+ " ~~~~~~~~~~~~~|.|6c..+. ",
+ " ~~~~~~~~~~~~~|.|%... Y ",
+ " ~~~~~~~~~~~~~|.|%... ",
+ " ~~~~~~~~~~~~~|. ",
+ " ~~~~~~~~~~~~~|. ",
+ " ~~~~~~~~~~~ . < ^ ",
+ " ~~~~~~~~~ .+....$ ",
+ " Y > $ ",
+ " "
+ ],
+ "terrain": {
+ "~": "t_metal_floor",
+ "|": "t_reinforced_glass_shutter_open",
+ ".": "t_rock_floor",
+ "1": "t_rock_floor",
+ "4": "t_rock_floor",
+ "a": "t_rock_floor",
+ "c": "t_rock_floor",
+ "?": "t_door_metal_c_peep",
+ "+": "t_door_metal_locked",
+ ">": "t_stairs_down",
+ "<": "t_stairs_up",
+ "Y": "t_card_military",
+ "^": "t_elevator_control_off",
+ "$": "t_elevator",
+ "x": "t_console_broken",
+ "%": "t_machinery_electronic"
+ },
+ "furniture": { "1": "f_speaker_cabinet", "4": "f_speaker_cabinet", "a": "f_air_conditioner", "c": "f_chair" },
+ "computers": {
+ "6": {
+ "name": "Missile Controls",
+ "security": 10,
+ "failures": [ { "action": "alarm" }, { "action": "damage" }, { "action": "secubots" } ],
+ "options": [ { "name": "Launch Missile", "action": "miss_launch" }, { "name": "Disarm Missile", "action": "miss_disarm" } ]
+ }
+ },
+ "place_graffiti": [ { "text": "Warning! Automatic security measures engaged due to the lockdown order!", "x": 17, "y": 20 } ],
+ "place_monster": [ { "monster": "mon_zombie_hazmat", "x": 8, "y": 15 } ]
+ }
+ }
+]
diff --git a/data/json/mapgen/office_tower_2.json b/data/json/mapgen/office_tower_2.json
index 4aa919c8d8f82..d06a6ad041629 100644
--- a/data/json/mapgen/office_tower_2.json
+++ b/data/json/mapgen/office_tower_2.json
@@ -229,7 +229,7 @@
],
"place_monsters": [ { "monster": "GROUP_OFFICE_TOWER_2", "x": [ 7, 21 ], "y": [ 13, 21 ], "chance": 2, "repeat": [ 1 ] } ],
"place_monster": [ { "monster": "mon_zombie_scientist", "x": [ 7, 21 ], "y": [ 4, 10 ], "repeat": [ 1, 3 ] } ],
- "monster": { "7": { "monster": "mon_turret" } }
+ "monster": { "7": { "monster": "mon_turret_rifle" } }
}
},
{
diff --git a/data/json/mapgen/outpost.json b/data/json/mapgen/outpost.json
index 4e945795d7679..ae17fbd1b4646 100644
--- a/data/json/mapgen/outpost.json
+++ b/data/json/mapgen/outpost.json
@@ -94,13 +94,13 @@
"place_fields": [ { "field": "fd_blood", "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 1, 12 ] } ],
"toilets": { "&": { } },
"place_monster": [
- { "monster": "mon_turret_rifle", "x": 10, "y": 1 },
+ { "monster": "mon_crows_m240", "x": 10, "y": 1 },
{ "monster": "mon_laserturret", "x": 13, "y": 1 },
- { "monster": "mon_turret_rifle", "x": 1, "y": 10 },
+ { "monster": "mon_crows_m240", "x": 1, "y": 10 },
{ "monster": "mon_laserturret", "x": 1, "y": 13 },
- { "monster": "mon_turret_rifle", "x": 22, "y": 10 },
+ { "monster": "mon_crows_m240", "x": 22, "y": 10 },
{ "monster": "mon_laserturret", "x": 22, "y": 13 },
- { "monster": "mon_turret_rifle", "x": 10, "y": 22 },
+ { "monster": "mon_crows_m240", "x": 10, "y": 22 },
{ "monster": "mon_laserturret", "x": 13, "y": 22 },
{ "monster": "mon_turret_searchlight", "x": 1, "y": 1 },
{ "monster": "mon_turret_searchlight", "x": 22, "y": 22 },
@@ -113,6 +113,7 @@
{ "monster": "mon_zombie_bio_op", "chance": 1 },
{ "monster": "mon_dispatch", "chance": 1 },
{ "monster": "mon_dispatch_military", "chance": 1 },
+ { "monster": "mon_talon_m202a1", "chance": 1 },
{ "monster": "mon_zombie_flamer", "chance": 1 }
]
}
@@ -219,13 +220,13 @@
"place_fields": [ { "field": "fd_blood", "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 1, 12 ] } ],
"toilets": { "&": { } },
"place_monster": [
- { "monster": "mon_turret_rifle", "x": 10, "y": 1 },
+ { "monster": "mon_crows_m240", "x": 10, "y": 1 },
{ "monster": "mon_laserturret", "x": 13, "y": 1 },
- { "monster": "mon_turret_rifle", "x": 1, "y": 10 },
+ { "monster": "mon_crows_m240", "x": 1, "y": 10 },
{ "monster": "mon_laserturret", "x": 1, "y": 13 },
- { "monster": "mon_turret_rifle", "x": 22, "y": 10 },
+ { "monster": "mon_crows_m240", "x": 22, "y": 10 },
{ "monster": "mon_laserturret", "x": 22, "y": 13 },
- { "monster": "mon_turret_rifle", "x": 10, "y": 22 },
+ { "monster": "mon_crows_m240", "x": 10, "y": 22 },
{ "monster": "mon_laserturret", "x": 13, "y": 22 },
{ "monster": "mon_turret_searchlight", "x": 1, "y": 1 },
{ "monster": "mon_turret_searchlight", "x": 22, "y": 22 },
@@ -238,6 +239,7 @@
{ "monster": "mon_zombie_bio_op", "chance": 1 },
{ "monster": "mon_dispatch", "chance": 1 },
{ "monster": "mon_dispatch_military", "chance": 1 },
+ { "monster": "mon_talon_m202a1", "chance": 1 },
{ "monster": "mon_zombie_flamer", "chance": 1 }
]
}
diff --git a/data/json/mapgen/prison_1.json b/data/json/mapgen/prison_1.json
index 63fc011ffaab5..12ed915baa824 100644
--- a/data/json/mapgen/prison_1.json
+++ b/data/json/mapgen/prison_1.json
@@ -252,7 +252,11 @@
]
},
"place_monsters": [ { "monster": "GROUP_ZOMBIE_COP", "x": [ 35, 38 ], "y": [ 2, 7 ], "density": 0.2 } ],
- "monster": { "7": { "monster": "mon_turret" }, "Z": { "monster": "mon_zombie_prisoner" }, "C": { "monster": "mon_broken_cyborg" } }
+ "monster": {
+ "7": { "monster": "mon_turret_rifle" },
+ "Z": { "monster": "mon_zombie_prisoner" },
+ "C": { "monster": "mon_broken_cyborg" }
+ }
}
},
{
diff --git a/data/json/mapgen/refugee_center/refugee_center.json b/data/json/mapgen/refugee_center/refugee_center.json
index 97e19f20d757a..29c3b74219080 100644
--- a/data/json/mapgen/refugee_center/refugee_center.json
+++ b/data/json/mapgen/refugee_center/refugee_center.json
@@ -166,10 +166,10 @@
],
"fill_ter": "t_floor",
"rows": [
- "......_______,,________sss.........##### c# ###########+#+###########LL#c #####..........sss________,,_______......",
- "......__________________sss.........##t+ 2 S# #2 2#bh#S 2 +t##..........sss__________________......",
- "......_______,,__________ssssssss...#### c# # bTTb bTTb bTTb bTTb #hz#c ####...sssssssss__________,,_______......",
- "......_______,,___________ssssssss..##t+ D S# # bTTb bTTb bTTb bTTb #zz#S D +t##..sssssssss___________,,_______......",
+ "......_______,,________sss.........##### c# ###########+#+########### #c #####..........sss________,,_______......",
+ "......__________________sss.........##t+ 2 S# #2 2#b #S 2 +t##..........sss__________________......",
+ "......_______,,__________ssssssss...#### c# # bTTb bTTb bTTb bTTb #b #c ####...sssssssss__________,,_______......",
+ "......_______,,___________ssssssss..##t+ D S# # bTTb bTTb bTTb bTTb # #S D +t##..sssssssss___________,,_______......",
"......_______,,________________sss..######+## # bTTb bTTb bTTb bTTb # ##+######..sss_________________,,_______......",
"......_________________,________ss..##~#~# r# # # #r #~#~##..ss_________,_________________......",
"......_______,,________,________ss..## # # bTTb bTTb bTTb bTTb # # ##..ss_________,________,,_______......",
diff --git a/data/json/mapgen/robofachq_static.json b/data/json/mapgen/robofachq_static.json
index 0c2c655f7b192..5b7e602ba833a 100644
--- a/data/json/mapgen/robofachq_static.json
+++ b/data/json/mapgen/robofachq_static.json
@@ -44,30 +44,30 @@
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
- ",,,,,,,,,,,,,,__________,ss,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,___________,,,,,,,,,,,,,,,,,,,,,,,,,,,,",
- ",,,,,,,,,,,,,,__________|ss|((|,,,,,,,,,,,,,,,,,,,,,,,,,,___________,,,,,,,,,,,,,,,,,,,,,,,,,,,,",
- ",,||||||||||||__________|ss(dh|||||||||||||||||||||||||||___________||||||||||||||||||||||||||,,",
- ",,|,55555555555_________|s,(d 2s,,,,,,,,,,,_____________5555555555555U,,,,,,,,,,,,,,,,,,,,,,,|,,",
- ",,|,,,,,,,,,,,__________|22||||s,,,,,,,,,,,,,,,,,,,,,,,,,___________,U,,,,,,,,,,,,,,,,,,,,,,,|,,",
- ",,|,yyyyyyyyy___________sssssssssssssssssssssssssssssssss___________,U,,,,,,,,,,,,,,,,,,,,,,,|,,",
- ",,|,y_y_y_y_y___________sssssssssssssssssssssssssssssssss___________,U,,,,,,,,,,,,,,,,,,,,,,,|,,",
- ",,|,yyyyyyyyy___________ss,,,,,,,,ss,,,,,,,,,,,,,,,,,,,,,___________,U,,,,,,,,,,,,,,,,,,,,,,,|,,",
+ ",,,,yyyyyyyyyyyyyyyysssssssssss,,,,,,,,,,,,,,,,,,,,,,______yyyyyyyyy,,,,,,,,,,,,,,,,,,,,,,,,,,,,",
+ ",,,,________________ssss|ss|((|,,,,,,,,,,,,,,,,,,,,,,_______________,,,,,,,,,,,,,,,,,,,,,,,,,,,,",
+ ",,||___________555555555|ss(dh|||||||||||||||||||||||||||___________||||||||||||||||||||||||||,,",
+ ",,|,_________555555555__|s,(d 2s,,,,,,,,,,,_____________5555555555555U,,,,,,,,,,,,,,,,,,,,,,,|,,",
+ ",,|,____________________|22||||s,,,,,,,,,,,,,,,,,,,,,,,,,___________,U,,,,,,,,,,,,,,,,,,,,,,,|,,",
+ ",,|,____________________sssssssssssssssssssssssssssssssss___________,U,,,,,,,,,,,,,,,,,,,,,,,|,,",
+ ",,|,____________________sssssssssssssssssssssssssssssssss___________,U,,,,,,,,,,,,,,,,,,,,,,,|,,",
+ ",,|,____________________ss,,,,,,,,ss,,,,,,,,,,,,,,,,,,,,,___________,U,,,,,,,,,,,,,,,,,,,,,,,|,,",
",,|,____________________ss,|((((||22||||||||||||(((((||||___________|||,,,,,,,,,,,,,,,,,,,,,,|,,",
",,|,____________________ss,| |d h |;i| B||||___________|||,,,,,,,,,,,,,,,,,,,,,,|,,",
",,|,____________________ss,|? (dh | | dh B||||55555555555|||,,,,,,,,,,,,,,,,,,,,,,|,,",
",,|,____________________ss,|? t (dd66d ||2|hd | |,,,,,,,,,,,,,,,,,,,,,,|,,",
- ",,|,yyyyyyyyy___________ss,|? t ||((((22| |(((([| |,,,,,,,,,,,,,,,,,,,,,,|,,",
+ ",,|,__________yyyyyyyyyyss,|? t ||((((22| |(((([| |,,,,,,,,,,,,,,,,,,,,,,|,,",
",,|,____________________ss,|? 2 YY 5 |,,,,,,,,,,,,,,,,,,,,,,|,,",
",,|,____________________ss,|^a a 2 5 |,,,,,,,,,,,,,,,,,,,,,,|,,",
",,|,____________________ss,|||||||||||||55GI||||55|||| |,,,,,,,,,,,,,,,,,,,,,,|,,",
",,|,____________________ss,|hhhhhhhhh| | | |; | |,,,,,,,,,,,,,,,,,,,,,,|,,",
- ",,|,yyyyyyyyy___________ss,| 2 | | 2 i| |,,,,,,,,,,,,,,,,,,,,,,|,,",
+ ",,|,__________yyyyyyyyyyss,| 2 | | 2 i| |,,,,,,,,,,,,,,,,,,,,,,|,,",
",,|,____________________ss,| lllllll | ||||55|||| |,,,,,,,,,,,,,,,,,,,,,,|,,",
",,|,____________________ss,|2|||||||2|eeeeee(d d( |,,,,,,,,,,,,,,,,,,,,,,|,,",
",,|,____________________ss,| 2~|~2 |eeeeee(6h 66 h6( |,,,,,,,,,,,,,,,,,,,,,,|,,",
",,|,____________________ss,|i ||||| i|Eeeeee(d 66 d( |,,,,,,,,,,,,,,,,,,,,,,|,,",
- ",,|,yyyyyyyyy___________ss,|i 2~|~2 i|eeeeee| | |,,,,,,,,,,,,,,,,,,,,,,|,,",
- ",,|,,,,,,,,,,___________ss,||||||||||||||||||||||||||||||||||||||||||||,,,,,,,,,,,,,,,,,,,,,,|,,",
+ ",,|,__________yyyyyyyyyyss,|i 2~|~2 i|eeeeee| | |,,,,,,,,,,,,,,,,,,,,,,|,,",
+ ",,|,__________ssssssssssss,||||||||||||||||||||||||||||||||||||||||||||,,,,,,,,,,,,,,,,,,,,,,|,,",
",,|,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,|,,",
",,|,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,|,,",
",,|,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,|,,",
@@ -195,6 +195,48 @@
"npcs": { "G": { "class": "hub_security" }, "Q": { "class": "hub_security_head" } }
}
},
+ {
+ "type": "mapgen",
+ "om_terrain": [ [ "robofachq_sub_a0", "robofachq_sub_a1", "robofachq_sub_a2", "robofachq_sub_a3" ] ],
+ "method": "json",
+ "object": {
+ "fill_ter": "t_thconc_floor",
+ "rows": [
+ "#######################| |##############################",
+ "#######################| |##############################",
+ "#######################| bb bbb bb bb |##############################",
+ "#######################| |##############################",
+ "#######################|Y Y|##############################",
+ "#######################|||||||||||||||||||||||| |(((((|||||||##############################",
+ "##############################################||2222||ttttt|####################################",
+ "#####################################||||||||||^ ^| hY |####################################",
+ "#####################################|rrrrrrrr|^ ^| |####################################",
+ "#####################################|r r|| ||||2|||####################################",
+ "#####################################|r YY 2 (t G|####################################",
+ "#####################################|||||||||| YY (thY G|####################################",
+ "#####################################|bbbbbbbb| YY (t Y G|####################################",
+ "#####################################|Y Y2 ( G|####################################",
+ "#####################################| llllll ||2222||||2|||####################################",
+ "#####################################|2||||||2|^ Y^|####################################",
+ "#####################################| ~| |~ |^ Y^|####################################",
+ "#####################################| i| |i |^ Y^|####################################",
+ "#####################################||||||||||| ||||||||####################################",
+ "#####################################|eeeeee5 ^|##########################################",
+ "#####################################|eeeeee5 YY ^|##########################################",
+ "#####################################|Eeeeee5 YY ^|##########################################",
+ "#####################################|eeeeee5 ^|##########################################",
+ "#####################################|||||||||||||||||##########################################"
+ ],
+ "palettes": [ "robofachq" ],
+ "terrain": { "-": "t_wall_metal", "e": "t_elevator", "E": "t_elevator_control", "Y": "t_utility_light", "I": "t_intercom" },
+ "items": {
+ "l": [ { "item": "NC_ROBOFAC_FIELD_RESEARCHER_worn", "chance": 50 }, { "item": "NC_ROBOFAC_SCIENTIST_worn", "chance": 50 } ],
+ "i": { "item": "cleaning", "chance": 50 },
+ "B": [ { "item": "textbooks", "chance": 50 }, { "item": "manuals", "chance": 50 } ]
+ },
+ "place_npcs": [ { "class": "robofac_intercom", "x": 46, "y": 17 } ]
+ }
+ },
{
"type": "mapgen",
"om_terrain": [
diff --git a/data/json/mapgen/robofaq_locs/robofac_hq_chunks.json b/data/json/mapgen/robofaq_locs/robofac_hq_chunks.json
index a374616d96f6f..16ffd2dcfca51 100644
--- a/data/json/mapgen/robofaq_locs/robofac_hq_chunks.json
+++ b/data/json/mapgen/robofaq_locs/robofac_hq_chunks.json
@@ -1,49 +1,66 @@
-{
- "type": "mapgen",
- "method": "json",
- "nested_mapgen_id": "robofac_hq_surface_freemerchant_camp",
- "object": {
- "faction_owner": [ { "id": "free_merchants", "x": [ 0, 14 ], "y": [ 0, 14 ] } ],
- "mapgensize": [ 15, 15 ],
- "rows": [
- " ...... ",
- " ###### ...... ",
- " #x.rrrr.......",
- " #t.rrrr.......",
- " #x.rrrr...F...",
- " #+++##..h.....",
- " #c.t#v........",
- " #####v........",
- " #+# #+# ",
- " #c# #c# ",
- " ### ### ",
- " ",
- " ",
- " ",
- " "
- ],
- "terrain": {
- ".": "t_dirt",
- "r": "t_carpet_yellow",
- "M": "t_pavement",
- "#": "t_dirt",
- "x": "t_dirt",
- "c": "t_dirt",
- "F": "t_pit_shallow"
- },
- "furniture": { "#": "f_skin_wall", "+": "f_skin_door", "x": "f_crate_c", "t": "f_table", "h": "f_chair", "F": "f_firering" },
- "traps": { "c": "tr_fur_rollmat", "v": "tr_funnel" },
- "place_npcs": [
- { "class": "roabofac_free_merchant", "x": 5, "y": 3 },
- { "class": "guard", "x": 7, "y": 7 },
- { "class": "guard", "x": 10, "y": 4 }
- ],
- "items": { "c": { "item": "bed", "chance": 100 } },
- "item": {
- "r": { "item": "pillow", "chance": 33 },
- "F": { "item": "pot", "chance": 100 },
- "v": { "item": "jug_plastic", "chance": 100 }
- },
- "place_loot": [ { "group": "NC_ROBOFAC_INTERCOM_trade", "chance": 100, "x": 2, "y": [ 2, 4 ], "repeat": [ 9, 15 ] } ]
+[
+ {
+ "type": "mapgen",
+ "method": "json",
+ "nested_mapgen_id": "robofac_hq_surface_freemerchant_camp",
+ "object": {
+ "faction_owner": [ { "id": "free_merchants", "x": [ 0, 14 ], "y": [ 0, 14 ] } ],
+ "mapgensize": [ 15, 15 ],
+ "rows": [
+ " ...... ",
+ " ###### ...... ",
+ " #x.rrrr.......",
+ " #t.rrrr.......",
+ " #x.rrrr...F...",
+ " #+++##..h.....",
+ " #c.t#v........",
+ " #####v........",
+ " #+# #+# ",
+ " #c# #c# ",
+ " ### ### ",
+ " ",
+ " ",
+ " ",
+ " "
+ ],
+ "terrain": {
+ ".": "t_dirt",
+ "r": "t_carpet_yellow",
+ "M": "t_pavement",
+ "#": "t_dirt",
+ "x": "t_dirt",
+ "c": "t_dirt",
+ "F": "t_pit_shallow"
+ },
+ "furniture": { "#": "f_skin_wall", "+": "f_skin_door", "x": "f_crate_c", "t": "f_table", "h": "f_chair", "F": "f_firering" },
+ "traps": { "c": "tr_fur_rollmat", "v": "tr_funnel" },
+ "place_npcs": [
+ { "class": "roabofac_free_merchant", "x": 5, "y": 3 },
+ { "class": "guard", "x": 7, "y": 7 },
+ { "class": "guard", "x": 10, "y": 4 }
+ ],
+ "items": { "c": { "item": "bed", "chance": 100 } },
+ "item": {
+ "r": { "item": "pillow", "chance": 33 },
+ "F": { "item": "pot", "chance": 100 },
+ "v": { "item": "jug_plastic", "chance": 100 }
+ },
+ "place_loot": [ { "group": "NC_ROBOFAC_INTERCOM_trade", "chance": 100, "x": 2, "y": [ 2, 4 ], "repeat": [ 9, 15 ] } ]
+ }
+ },
+ {
+ "type": "mapgen",
+ "method": "json",
+ "nested_mapgen_id": "robofac_hq_surface_merc_1",
+ "object": {
+ "faction_owner": [ { "id": "robofac_auxiliaries", "x": [ 0, 4 ], "y": [ 0, 4 ] } ],
+ "mapgensize": [ 2, 2 ],
+ "rows": [
+ " ",
+ " ."
+ ],
+ "terrain": { ".": "t_thconc_floor" },
+ "place_npcs": [ { "class": "robofac_merc_1", "x": 1, "y": 1 } ]
+ }
}
-}
+]
diff --git a/data/json/mapgen/sub_station.json b/data/json/mapgen/sub_station.json
index e4bc37aa7ebec..5881e8d04d858 100644
--- a/data/json/mapgen/sub_station.json
+++ b/data/json/mapgen/sub_station.json
@@ -7,30 +7,30 @@
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
- " SSSSSSSSSSSSSSSSSSSSSS ",
- " SSSSSSSSSSSSSSSSSSSS ",
- " * SSSSSSSSSSSSSSSSSS * ",
- "*** SSSSSSSSSSSSSSSS ***",
- "*** SSSSSSSSSSSSSSSS ***",
- " * SS|--;;;;;;;;--|SS * ",
- " SS||1..........1||SS ",
- " SS||F............F||SS ",
- "SS||D&............&D||SS",
- "SS-1................1-SS",
- "SS-..................-SS",
- "SS;..................;SS",
- "SS;........>>........;SS",
- "SS;........>>........;SS",
- "SS;..................;SS",
- "SS-..................-SS",
- "SS-1................1-SS",
- "SS||D&............&D||SS",
- " SS||F............F||SS ",
- " SS||2bbbbbbbbbb2||SS ",
- " * SS||||||||||||||SS * ",
- "*** SSSSSSSSSSSS4SSS ***",
- "*** SSSSSSSSSSSS ***",
- " * * "
+ "SSSSSSSSSSSSSSSSSSSSSSSS",
+ "SSSSSSSSSSSSSSSSSSSSSSSS",
+ "SS||-;;-||-;;-||-;;-||SS",
+ "SS| | | |SS",
+ "SS| |SS",
+ "SS|b b|SS",
+ "SS|b b|SS",
+ "SS|b bb bb b|SS",
+ "SS|D bM Mb F|SS",
+ "SS|D bM Mb F|SS",
+ "SS|D bM Mb F|SS",
+ "SS|b bb bb b|SS",
+ "SS|b b|SS",
+ "SS|b b|SS",
+ "SS| |SS",
+ "SS| |SS",
+ "SS| |SS",
+ "SS| |SS",
+ "SS|| ||SS",
+ "SSS|| ||SSS",
+ "SSSS||>>> >>>||SSSS",
+ "SSSSS||||||||||||||SSSSS",
+ "SSSSSSSSSSSSSSSS4SSSSSSS",
+ "SSSSSSSSSSSSSSSSSSSSSSSS"
],
"palettes": [ "subway" ],
"vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } }
@@ -45,27 +45,27 @@
"rows": [
" ",
" ",
- " ",
- " ",
- " ",
- " |2222222222223 ",
- " ||............33 ",
- " ||..............33 ",
- " ||................33 ",
+ " |2222222222222222223 ",
" |..................3 ",
" |..................3 ",
- " |.......oooo.......3 ",
- " |.......oooo.......3 ",
- " |.......oooo.......3 ",
- " |.......oooo.......3 ",
+ " |.oooo........oooo.3 ",
+ " |.oooo........oooo.3 ",
+ " |.oooo........oooo.3 ",
+ " |.oooo........oooo.3 ",
+ " |.oooo........oooo.3 ",
+ " |.oooo........oooo.3 ",
+ " |.oooo........oooo.3 ",
+ " |.oooo........oooo.3 ",
+ " |.oooo........oooo.3 ",
" |..................3 ",
" |..................3 ",
- " ||................33 ",
+ " |...oooooooooooo...3 ",
+ " |...oooooooooooo...3 ",
+ " ||..oooooooooooo..33 ",
" ||..............33 ",
" ||............33 ",
" |----------5-3 ",
" ",
- " ",
" "
],
"palettes": [ "roof_palette" ]
@@ -81,32 +81,32 @@
"rows": [
"########################",
"########################",
- "########################",
- "########################",
- "########################",
- "########################",
- "########################",
- "##########BGGB##########",
- "#########R____R#########",
- "########R______R########",
- "#######R________R#######",
- "######B__________B######",
- "######G____>>____G######",
- "######G____<<____G######",
- "######B__________B######",
- "#######R________R#######",
- "########R______R########",
- "#########R____R#########",
- "##########BGGB##########",
- "########################",
- "########################",
- "########################",
- "########################",
- "########################",
+ "#####IIIIIIIIIIIIII#####",
+ "#####IbbCI>>>>IJbbI#####",
+ "IIIIII I#####",
+ "INNNNI I#####",
+ "IN I I#####",
+ "IN I I#####",
+ "IIII+I III###",
+ "##II II##",
+ "##I I+I~~I I##",
+ "##I ~ ~ I##",
+ "##IsZzzZsIQc IsZzzZsI##",
+ "##I ~QQQ + I##",
+ "##IM ~~~~~I MI##",
+ "##IT TI##",
+ "##IIAT TAII##",
+ "###III III###",
+ "#####I I#####",
+ "#####I I#####",
+ "#####I<<": "t_stairs_down",
+ "Y": "t_utility_light",
+ "#": "t_rock"
+ },
+ "furniture": {
+ "&": "f_toilet",
+ "~": "f_shower",
+ "@": "f_bed",
+ "a": "f_armchair",
+ "k": "f_cupboard",
+ "D": "f_dresser",
+ "h": "f_chair",
+ "b": "f_bench",
+ "B": "f_bookcase",
+ "c": "f_counter",
+ "l": "f_locker",
+ "n": "f_trashcan",
+ "d": "f_desk",
+ "f": "f_fridge",
+ "F": "f_glass_fridge",
+ "o": "f_oven",
+ "O": "f_utility_shelf",
+ "U": "f_utility_shelf",
+ "i": "f_sink",
+ "r": "f_rack",
+ "?": "f_sofa",
+ "t": "f_table",
+ "R": "f_table",
+ "^": "f_indoor_plant",
+ "x": "f_safe_l"
+ },
+ "toilets": { ";": { } },
+ "items": {
+ "d": { "item": "office", "chance": 70, "repeat": [ 1, 3 ] },
+ "B": [ { "item": "textbooks", "chance": 50 }, { "item": "manuals", "chance": 50 } ],
+ "F": [
+ { "item": "supplies_reagents_lab", "chance": 70, "repeat": [ 2, 5 ] },
+ { "item": "supplies_samples_lab", "chance": 40, "repeat": [ 1, 3 ] }
+ ],
+ "U": [
+ { "item": "tools_science", "chance": 30, "repeat": [ 1, 3 ] },
+ { "item": "supplies_reagents_lab", "chance": 70, "repeat": [ 1, 3 ] },
+ { "item": "supplies_samples_lab", "chance": 10, "repeat": [ 1, 2 ] }
+ ],
+ "c": [
+ { "item": "tools_science", "chance": 30, "repeat": [ 1, 3 ] },
+ { "item": "supplies_reagents_lab", "chance": 70, "repeat": [ 1, 3 ] },
+ { "item": "supplies_samples_lab", "chance": 10, "repeat": [ 1, 2 ] }
+ ],
+ "R": [
+ { "item": "tools_robotics", "chance": 20, "repeat": [ 1, 3 ] },
+ { "item": "robots", "chance": 40, "repeat": [ 1, 3 ] },
+ { "item": "supplies_electronics", "chance": 40, "repeat": [ 1, 3 ] }
+ ],
+ "O": [ { "item": "tools_robotics", "chance": 40, "repeat": [ 1, 3 ] }, { "item": "schematics", "chance": 2 } ],
+ "i": { "item": "cleaning", "chance": 20 }
+ },
+ "vendingmachines": { "V": { } }
+ }
+]
diff --git a/data/json/mapgen_palettes/subway.json b/data/json/mapgen_palettes/subway.json
index a4af753887d58..baad4edf035d5 100644
--- a/data/json/mapgen_palettes/subway.json
+++ b/data/json/mapgen_palettes/subway.json
@@ -3,18 +3,18 @@
"type": "palette",
"id": "subway",
"terrain": {
- " ": [ "t_dirt", "t_dirt", "t_grass" ],
- "|": "t_wall_w",
+ ".": [ "t_dirt", "t_dirt", "t_grass" ],
+ "|": "t_brick_wall",
"-": "t_wall_glass",
";": "t_door_glass_c",
- ".": "t_thconc_floor",
"S": "t_sidewalk",
"*": "t_shrub",
">": "t_stairs_down",
"<": "t_stairs_up",
"4": "t_gutter_downspout"
},
- "furniture": { "&": "f_trashcan", "b": "f_bench", "1": "f_indoor_plant", "2": "f_indoor_plant_y" }
+ "furniture": { "&": "f_trashcan", "b": "f_bench", "1": "f_indoor_plant", "2": "f_indoor_plant_y" },
+ "signs": { "M": { "signage": "Subway Map: stop" } }
},
{
"type": "palette",
@@ -43,8 +43,21 @@
"h": "t_railroad_track_h_on_tie",
"v": "t_railroad_track_v_on_tie",
"d": "t_railroad_track_d_on_tie",
- "S": "t_buffer_stop"
+ "S": "t_buffer_stop",
+ "I": "t_brick_wall",
+ "+": "t_door_metal_c",
+ "~": "t_laminated_glass",
+ "z": "t_fence_metal",
+ "Z": "t_gate_metal_c",
+ "A": "t_atm",
+ "T": "t_ticket_vendor",
+ "s": "t_ticket_machine"
},
- "furniture": { "&": "f_trashcan", "b": "f_bench" }
+ "furniture": { "&": "f_trashcan", "b": "f_bench", "Q": "f_desk", "c": "f_chair", "N": "f_rack" },
+ "signs": { "M": { "signage": "Subway Map: stop" } },
+ "items": {
+ "N": { "item": "tools_construction", "chance": 90, "repeat": 3 },
+ "Q": { "item": "office_paper", "chance": 90, "repeat": 5 }
+ }
}
]
diff --git a/data/json/martialarts.json b/data/json/martialarts.json
index bd9748a9bf36a..7a7f5350fbef6 100644
--- a/data/json/martialarts.json
+++ b/data/json/martialarts.json
@@ -547,6 +547,145 @@
],
"techniques": [ "tec_karate_rapid", "tec_karate_precise", "tec_karate_roundhouse", "tec_karate_counter" ]
},
+ {
+ "type": "martial_art",
+ "id": "style_krav_maga",
+ "name": "Krav Maga",
+ "description": "Originating in Israel, Krav Maga is based on taking down an enemy quickly and effectively. It focuses on applicable attacks rather than showy or complex moves. Popular among police and armed forces everywhere.",
+ "initiate": [ "You assume a practical combat stance.", "%s assumes a practical combat stance." ],
+ "learn_difficulty": 6,
+ "arm_block": 2,
+ "leg_block": 4,
+ "static_buffs": [
+ {
+ "id": "buff_krav_maga_static1",
+ "name": "Krav Maga Stance",
+ "description": "Your training makes it easier to land hits and fight multiple opponents.\n\n+1 Accuracy, +1 Block attempts.",
+ "min_unarmed": 0,
+ "melee_allowed": true,
+ "unarmed_allowed": true,
+ "bonus_blocks": 1,
+ "flat_bonuses": [ [ "hit", 1.0 ] ]
+ }
+ ],
+ "techniques": [
+ "tec_krav_maga_rapid",
+ "tec_krav_maga_crit",
+ "tec_krav_maga_takedown",
+ "tec_krav_maga_disarm",
+ "tec_krav_maga_break",
+ "tec_krav_maga_counter"
+ ],
+ "weapons": [
+ "baton-extended",
+ "copper_knife",
+ "cudgel",
+ "diveknife",
+ "honey_scraper",
+ "knife_combat",
+ "knife_hunting",
+ "knife_rambo",
+ "knife_rm42",
+ "knife_trench",
+ "makeshift_knife",
+ "PR24-extended",
+ "shocktonfa_off",
+ "shocktonfa_on",
+ "switchblade",
+ "tonfa",
+ "tonfa_wood",
+ "fn1910",
+ "fn57",
+ "glock_17",
+ "glock_18c",
+ "glock_19",
+ "glock_22",
+ "glock_31",
+ "l_lookout_9mm",
+ "l_mp_9mm",
+ "l_sp_9mm",
+ "m17",
+ "m1911",
+ "m1911a1_38super",
+ "needlepistol",
+ "sw_22",
+ "p226_357sig",
+ "p320_357sig",
+ "sig_40",
+ "sig_p230",
+ "sig_mosquito",
+ "tokarev",
+ "usp_45",
+ "usp_9mm",
+ "walther_ppk",
+ "ar10",
+ "ar15",
+ "ar15_retool_300blk",
+ "fn_fal",
+ "scar_l",
+ "hk_g3",
+ "hk_g36",
+ "l_car_223",
+ "l_dsr_223",
+ "l_lmg_223",
+ "l_mbr_223",
+ "m14ebr",
+ "M24",
+ "m27iar",
+ "rm51_assault_rifle",
+ "rm88_battle_rifle",
+ "sig552",
+ "sks",
+ "steyr_aug"
+ ]
+ },
+ {
+ "type": "martial_art",
+ "id": "style_leopard",
+ "name": "Leopard Kung Fu",
+ "description": "One of the five Shaolin animal styles. The Leopard focuses on rapid, strategically planned strikes. Perception improves your accuracy instead of Dexterity. Moving increases dodge skill and accuracy further. Attacking after moving increases damage.",
+ "initiate": [ "You prepare to pounce like a lepoard.", "%s assumes a leopard-like stance." ],
+ "static_buffs": [
+ {
+ "id": "buff_leopard_static1",
+ "name": "Leopard's Strategy",
+ "description": "You fight by overwhelming your opponents with speedy strikes that are much harder to defend against.\nDexterity increases melee damage instead of Strength.\n\nBash damage increased by 75%% of Dexterity but decreased by 75%% of Strength.",
+ "min_unarmed": 0,
+ "unarmed_allowed": true,
+ "flat_bonuses": [ [ "damage", "bash", "dex", 0.75 ], [ "damage", "bash", "str", -0.75 ] ]
+ },
+ {
+ "id": "buff_leopard_static2",
+ "name": "Leopard's Agility",
+ "description": "Just like a cat, you are quick, agile, and hard to pin down.\n\n+1.0 Dodge skill.",
+ "min_unarmed": 1,
+ "unarmed_allowed": true,
+ "flat_bonuses": [ [ "dodge", 1.0 ] ]
+ }
+ ],
+ "onmove_buffs": [
+ {
+ "id": "buff_leopard_onmove1",
+ "name": "Leopard's Stalk",
+ "description": "You proudly stalk the shadows and preparing to pouce with unrelenting fury.\n\n+2 Accuracy.\nEnables \"Leopard's Pounce\" buff.\nLasts 1 turn.",
+ "min_unarmed": 1,
+ "unarmed_allowed": true,
+ "buff_duration": 1,
+ "flat_bonuses": [ [ "hit", 2.0 ] ]
+ },
+ {
+ "id": "buff_leopard_onmove2",
+ "name": "Leopard's Pounce",
+ "description": "You are ready. Attack and claim your prey!\n\n+25% bonus to all damage.\nLasts 1 turn.",
+ "min_unarmed": 3,
+ "unarmed_allowed": true,
+ "req_buffs": [ "buff_leopard_onmove1" ],
+ "buff_duration": 1,
+ "flat_bonuses": [ [ "damage", "bash", 1.25 ], [ "damage", "cut", 1.25 ], [ "damage", "stab", 1.25 ] ]
+ }
+ ],
+ "techniques": [ "tec_leopard_rapid", "tec_leopard_feint", "tec_leopard_counter", "tec_leopard_precise" ]
+ },
{
"type": "martial_art",
"id": "style_tai_chi",
@@ -570,43 +709,6 @@
],
"techniques": [ "tec_taichi_disarm", "tec_taichi_precise" ]
},
- {
- "type": "martial_art",
- "id": "style_krav_maga",
- "name": "Krav Maga",
- "description": "Originating in Israel, Krav Maga is based on taking down an enemy quickly and effectively. It focuses on applicable attacks rather than showy or complex moves. Popular among police and armed forces everywhere.",
- "initiate": [ "You prepare for simultaneous attack and defense.", "%s prepares for simultaneous attack and defense." ],
- "learn_difficulty": 6,
- "arm_block": 2,
- "leg_block": 4,
- "static_buffs": [
- {
- "id": "krav_maga_static",
- "name": "Krav Maga Hand-to-Hand",
- "unarmed_allowed": true,
- "min_unarmed": 0,
- "flat_bonuses": [ [ "damage", "bash", "str", 0.2 ] ],
- "description": "Increased unarmed power."
- },
- {
- "id": "krav_maga_static_edged",
- "name": "Krav Maga Edged",
- "melee_allowed": true,
- "min_unarmed": 0,
- "mult_bonuses": [ [ "damage", "stab", 1.2 ] ],
- "description": "Increased stabbing damage."
- }
- ],
- "techniques": [
- "tec_krav_maga_rapid",
- "tec_krav_maga_feint",
- "tec_krav_maga_precise",
- "tec_krav_maga_disarm",
- "tec_krav_maga_grab",
- "tec_krav_maga_break"
- ],
- "weapons": [ "PR24-extended", "tonfa", "tonfa_wood", "shocktonfa_off", "shocktonfa_on" ]
- },
{
"type": "martial_art",
"id": "style_muay_thai",
@@ -944,37 +1046,6 @@
"nodachi_fake"
]
},
- {
- "type": "martial_art",
- "id": "style_leopard",
- "name": "Leopard Kung Fu",
- "description": "One of the five Shaolin animal styles. The Leopard focuses on rapid, strategically planned strikes. Perception and Intelligence both boost dodging, and moving boosts your accuracy.",
- "initiate": [ "You prepare to pounce like a lepoard.", "%s assumes a leopard-like stance." ],
- "learn_difficulty": 10,
- "arm_block": 99,
- "leg_block": 99,
- "static_buffs": [
- {
- "id": "leopard_static",
- "name": "Leopard Strategy",
- "description": "Perception and intelligence provide a bonus to dodge.",
- "unarmed_allowed": true,
- "flat_bonuses": [ [ "dodge", "per", 0.15 ], [ "dodge", "int", 0.15 ] ]
- }
- ],
- "onmove_buffs": [
- {
- "id": "leopard_move_buff",
- "name": "Leopard's Stalk",
- "description": "+2 Accuracy",
- "unarmed_allowed": true,
- "min_unarmed": 2,
- "buff_duration": 2,
- "flat_bonuses": [ [ "hit", 2.0 ] ]
- }
- ],
- "techniques": [ "tec_leopard_rapid", "tec_leopard_counter", "tec_leopard_precise" ]
- },
{
"type": "martial_art",
"id": "style_tiger",
diff --git a/data/json/monster_special_attacks/spells.json b/data/json/monster_special_attacks/spells.json
index 5344c40daab26..2dc8e2e316ab8 100644
--- a/data/json/monster_special_attacks/spells.json
+++ b/data/json/monster_special_attacks/spells.json
@@ -29,6 +29,36 @@
"effect": "recover_energy",
"effect_str": "STAMINA"
},
+ {
+ "id": "stamina_damage_mi-go_slaver_beam",
+ "type": "SPELL",
+ "name": "Tired",
+ "description": "decreases stamina. Designed for mi-go slaver beam",
+ "valid_targets": [ "hostile" ],
+ "flags": [ "SILENT" ],
+ "//": "Listed as a recover energy effect with a negative modifier that decreases with each level of the spell, which makes it cause damage instead.",
+ "min_damage": -500,
+ "max_damage": -5500,
+ "damage_increment": -500,
+ "max_level": 10,
+ "effect": "recover_energy",
+ "effect_str": "STAMINA"
+ },
+ {
+ "id": "pain_damage_mi-go_slaver_beam",
+ "type": "SPELL",
+ "name": "Pain",
+ "description": "Increases pain. Designed for mi-go slaver beam",
+ "valid_targets": [ "hostile" ],
+ "flags": [ "SILENT" ],
+ "//": "Listed as a recover energy effect with a negative modifier that decreases with each level of the spell, which makes it cause damage instead.",
+ "min_damage": -8,
+ "max_damage": -148,
+ "damage_increment": -14,
+ "max_level": 10,
+ "effect": "recover_energy",
+ "effect_str": "PAIN"
+ },
{
"id": "mi-go_slaver_beam",
"type": "SPELL",
@@ -37,15 +67,15 @@
"valid_targets": [ "hostile" ],
"effect": "projectile_attack",
"effect_str": "dazed",
- "extra_effects": [ { "id": "pain_damage" }, { "id": "stamina_damage" } ],
+ "extra_effects": [ { "id": "pain_damage_mi-go_slaver_beam" }, { "id": "stamina_damage_mi-go_slaver_beam" } ],
"base_casting_time": 100,
"max_level": 5,
"min_range": 1,
"max_range": 25,
"range_increment": 5,
- "min_duration": 1000,
- "max_duration": 10000,
- "duration_increment": 2000
+ "min_duration": 100,
+ "max_duration": 1000,
+ "duration_increment": 200
},
{
"type": "SPELL",
diff --git a/data/json/monsterdrops/monster_drops.json b/data/json/monsterdrops/monster_drops.json
index 0d847af6f8471..7727230845da8 100644
--- a/data/json/monsterdrops/monster_drops.json
+++ b/data/json/monsterdrops/monster_drops.json
@@ -202,7 +202,7 @@
"subtype": "collection",
"id": "mon_zombie_grenadier",
"entries": [
- { "item": "chestrig", "damage": [ 1, 4 ] },
+ { "item": "tacvest", "damage": [ 1, 4 ] },
{ "item": "bot_grenade_hack", "count": [ 0, 3 ] },
{ "item": "bot_flashbang_hack", "prob": 50 },
{ "item": "bot_gasbomb_hack", "prob": 50 }
@@ -213,7 +213,7 @@
"subtype": "collection",
"id": "mon_zombie_grenadier_elite",
"entries": [
- { "item": "chestrig", "damage": [ 1, 4 ] },
+ { "item": "tacvest", "damage": [ 1, 4 ] },
{ "item": "molle_pack", "damage": [ 1, 4 ] },
{ "item": "bot_grenade_hack", "count": [ 0, 4 ] },
{ "item": "bot_flashbang_hack", "count": [ 1, 2 ], "prob": 50 },
@@ -402,7 +402,7 @@
"id": "mon_zombie_flamer",
"ammo": 50,
"magazine": 100,
- "entries": [ { "item": "flamethrower", "charges-min": 100, "charges-max": 1500 } ]
+ "entries": [ { "item": "flamethrower", "charges-min": 0, "charges-max": 500 } ]
},
{
"type": "item_group",
diff --git a/data/json/monsterdrops/zombie_cop.json b/data/json/monsterdrops/zombie_cop.json
index 65dd7d43343a0..19bd98445ce59 100644
--- a/data/json/monsterdrops/zombie_cop.json
+++ b/data/json/monsterdrops/zombie_cop.json
@@ -31,7 +31,7 @@
[ "armor_riot", 20 ],
[ "airhorn", 5 ],
[ "bandages", 20 ],
- [ "chestrig", 5 ],
+ [ "tacvest", 5 ],
[ "heavy_flashlight", 35 ],
[ "holster", 25 ],
[ "kevlar", 35 ],
diff --git a/data/json/monstergroups/lab.json b/data/json/monstergroups/lab.json
index 7f50e81061b6b..358db3ec75eed 100644
--- a/data/json/monstergroups/lab.json
+++ b/data/json/monstergroups/lab.json
@@ -74,8 +74,9 @@
{ "monster": "mon_skitterbot", "freq": 85, "cost_multiplier": 0 },
{ "monster": "mon_skitterbot", "freq": 85, "cost_multiplier": 0, "pack_size": [ 2, 3 ] },
{ "monster": "mon_skitterbot", "freq": 1, "cost_multiplier": 0, "pack_size": [ 8, 12 ] },
- { "monster": "mon_turret", "freq": 85, "cost_multiplier": 0 },
+ { "monster": "mon_turret_rifle", "freq": 85, "cost_multiplier": 0 },
{ "monster": "mon_secubot", "freq": 1, "cost_multiplier": 10 },
+ { "monster": "mon_talon_m202a1", "freq": 1, "cost_multiplier": 15 },
{ "monster": "mon_zombie_bio_op", "freq": 50, "cost_multiplier": 5 },
{ "monster": "mon_zombie_armored", "freq": 5, "cost_multiplier": 8 },
{ "monster": "mon_zombie_electric", "freq": 50, "cost_multiplier": 3 },
@@ -107,5 +108,31 @@
"name": "GROUP_LAB_CYBORG",
"default": "mon_broken_cyborg",
"monsters": [ { "monster": "mon_prototype_cyborg", "freq": 400, "cost_multiplier": 0 } ]
+ },
+ {
+ "type": "monstergroup",
+ "name": "GROUP_MICROLAB",
+ "default": "mon_zombie_scientist",
+ "monsters": [
+ { "monster": "mon_blob_small", "freq": 40, "cost_multiplier": 0, "pack_size": [ 3, 6 ] },
+ { "monster": "mon_zombie_scientist", "freq": 40, "cost_multiplier": 0, "pack_size": [ 1, 5 ] },
+ { "monster": "mon_science_bot", "freq": 40, "cost_multiplier": 2 },
+ { "monster": "mon_zombie_labsecurity", "freq": 40, "cost_multiplier": 0, "pack_size": [ 2, 3 ] },
+ { "monster": "mon_zombie_hazmat", "freq": 40, "cost_multiplier": 1, "pack_size": [ 1, 3 ] },
+ { "monster": "mon_manhack", "freq": 20, "cost_multiplier": 1, "pack_size": [ 3, 12 ] },
+ { "monster": "mon_mutant_experimental", "freq": 10, "cost_multiplier": 0, "pack_size": [ 1, 3 ] },
+ { "monster": "mon_skitterbot", "freq": 10, "cost_multiplier": 0, "pack_size": [ 2, 3 ] },
+ { "monster": "mon_secubot", "freq": 2, "cost_multiplier": 5 },
+ { "monster": "mon_zombie_bio_op", "freq": 10, "cost_multiplier": 3 },
+ { "monster": "mon_zombie", "freq": 40, "cost_multiplier": 1, "pack_size": [ 2, 7 ] },
+ { "monster": "mon_zombie_fat", "freq": 40, "cost_multiplier": 1, "pack_size": [ 2, 4 ] },
+ { "monster": "mon_zombie_tough", "freq": 20, "cost_multiplier": 2, "pack_size": [ 2, 4 ] },
+ { "monster": "mon_zombie_crawler", "freq": 10, "cost_multiplier": 1 },
+ { "monster": "mon_zombie_technician", "freq": 10, "cost_multiplier": 2 },
+ { "monster": "mon_zombie_armored", "freq": 1, "cost_multiplier": 5 },
+ { "monster": "mon_zombie_electric", "freq": 10, "cost_multiplier": 3 },
+ { "monster": "mon_zombie_necro", "freq": 1, "cost_multiplier": 15 },
+ { "monster": "mon_zombie_brute_shocker", "freq": 1, "cost_multiplier": 5 }
+ ]
}
]
diff --git a/data/json/monstergroups/military.json b/data/json/monstergroups/military.json
index 1975ea6932f8c..17f0c8858554b 100644
--- a/data/json/monstergroups/military.json
+++ b/data/json/monstergroups/military.json
@@ -21,10 +21,5 @@
{ "monster": "mon_zombie_bio_op", "freq": 50, "cost_multiplier": 5 },
{ "monster": "mon_zombie_armored", "freq": 10, "cost_multiplier": 5 }
]
- },
- {
- "name": "GROUP_TURRET_SMG",
- "type": "monstergroup",
- "default": "mon_turret"
}
]
diff --git a/data/json/monstergroups/monstergroups.json b/data/json/monstergroups/monstergroups.json
index 284038c412131..db8e012897491 100644
--- a/data/json/monstergroups/monstergroups.json
+++ b/data/json/monstergroups/monstergroups.json
@@ -4254,6 +4254,7 @@
{ "monster": "mon_skitterbot", "freq": 145, "cost_multiplier": 0, "pack_size": [ 2, 3 ] },
{ "monster": "mon_skitterbot", "freq": 1, "cost_multiplier": 0, "pack_size": [ 8, 12 ] },
{ "monster": "mon_secubot", "freq": 5, "cost_multiplier": 10 },
+ { "monster": "mon_talon_m202a1", "freq": 3, "cost_multiplier": 10 },
{ "monster": "mon_zombie_hazmat", "freq": 100, "cost_multiplier": 0 },
{ "monster": "mon_zombie_bio_op", "freq": 50, "cost_multiplier": 5 },
{ "monster": "mon_zombie_armored", "freq": 5, "cost_multiplier": 5 },
@@ -4357,6 +4358,7 @@
"monsters": [
{ "monster": "mon_skitterbot", "freq": 220, "cost_multiplier": 0 },
{ "monster": "mon_secubot", "freq": 150, "cost_multiplier": 0 },
+ { "monster": "mon_talon_m202a1", "freq": 75, "cost_multiplier": 0 },
{ "monster": "mon_copbot", "freq": 0, "cost_multiplier": 0 },
{ "monster": "mon_molebot", "freq": 40, "cost_multiplier": 0 },
{ "monster": "mon_tripod", "freq": 110, "cost_multiplier": 0 },
@@ -4367,11 +4369,8 @@
{
"type": "monstergroup",
"name": "GROUP_TURRET",
- "default": "mon_turret",
- "monsters": [
- { "monster": "mon_turret_rifle", "freq": 300, "cost_multiplier": 1 },
- { "monster": "mon_turret_bmg", "freq": 50, "cost_multiplier": 2 }
- ]
+ "default": "mon_turret_rifle",
+ "monsters": [ { "monster": "mon_turret_bmg", "freq": 50, "cost_multiplier": 2 } ]
},
{
"type": "monstergroup",
@@ -4502,6 +4501,7 @@
{ "monster": "mon_zombie_soldier", "freq": 35, "cost_multiplier": 1 },
{ "monster": "mon_dispatch", "freq": 10, "cost_multiplier": 50 },
{ "monster": "mon_dispatch_military", "freq": 5, "cost_multiplier": 80 },
+ { "monster": "mon_talon_m202a1", "freq": 15, "cost_multiplier": 50 },
{ "monster": "mon_zombie_flamer", "freq": 10, "cost_multiplier": 50 },
{ "monster": "mon_zombie_military_pilot", "freq": 0, "cost_multiplier": 1 }
]
@@ -5295,5 +5295,36 @@
"type": "monstergroup",
"default": "mon_hazmatbot",
"monsters": [ { "monster": "mon_hazmatbot", "freq": 40, "cost_multiplier": 1 } ]
+ },
+ {
+ "name": "GROUP_STRAY_DOGS",
+ "type": "monstergroup",
+ "default": "mon_dog",
+ "monsters": [
+ { "monster": "mon_dog", "freq": 50, "cost_multiplier": 0 },
+ { "monster": "mon_dog_pup", "freq": 5, "cost_multiplier": 0 },
+ { "monster": "mon_dog_bull", "freq": 50, "cost_multiplier": 0 },
+ { "monster": "mon_dog_bull_pup", "freq": 5, "cost_multiplier": 0 },
+ { "monster": "mon_dog_pitbullmix", "freq": 50, "cost_multiplier": 0 },
+ { "monster": "mon_dog_pitbullmix_pup", "freq": 5, "cost_multiplier": 0 },
+ { "monster": "mon_dog_beagle", "freq": 50, "cost_multiplier": 0 },
+ { "monster": "mon_dog_beagle_pup", "freq": 5, "cost_multiplier": 0 },
+ { "monster": "mon_dog_bcollie", "freq": 50, "cost_multiplier": 0 },
+ { "monster": "mon_dog_bcollie_pup", "freq": 5, "cost_multiplier": 0 },
+ { "monster": "mon_dog_boxer", "freq": 50, "cost_multiplier": 0 },
+ { "monster": "mon_dog_boxer_pup", "freq": 5, "cost_multiplier": 0 },
+ { "monster": "mon_dog_chihuahua", "freq": 50, "cost_multiplier": 0 },
+ { "monster": "mon_dog_chihuahua_pup", "freq": 5, "cost_multiplier": 0 },
+ { "monster": "mon_dog_dachshund", "freq": 50, "cost_multiplier": 0 },
+ { "monster": "mon_dog_dachshund_pup", "freq": 5, "cost_multiplier": 0 },
+ { "monster": "mon_dog_gshepherd", "freq": 50, "cost_multiplier": 0 },
+ { "monster": "mon_dog_gshepherd_pup", "freq": 5, "cost_multiplier": 0 },
+ { "monster": "mon_dog_gpyrenees", "freq": 50, "cost_multiplier": 0 },
+ { "monster": "mon_dog_gpyrenees_pup", "freq": 5, "cost_multiplier": 0 },
+ { "monster": "mon_dog_rottweiler", "freq": 50, "cost_multiplier": 0 },
+ { "monster": "mon_dog_rottweiler_pup", "freq": 5, "cost_multiplier": 0 },
+ { "monster": "mon_dog_auscattle", "freq": 50, "cost_multiplier": 0 },
+ { "monster": "mon_dog_auscattle_pup", "freq": 5, "cost_multiplier": 0 }
+ ]
}
]
diff --git a/data/json/monsters/defense_bot.json b/data/json/monsters/defense_bot.json
index fb06540a1f133..4ca2d9755af12 100644
--- a/data/json/monsters/defense_bot.json
+++ b/data/json/monsters/defense_bot.json
@@ -2,15 +2,15 @@
{
"id": "mon_secubot",
"type": "MONSTER",
- "name": "security bot",
- "description": "The Northrop Watchman X-1 is a production series of heavily armored combat robots. Initially designed for military patrol and escort service, it rolls on a set of hydraulic treads and is armed with a 9x19mm SMG.",
+ "name": "M16A4 autonomous TALON UGV",
+ "description": "A TALON unmanned ground vehicle equipped with an M16A4. It is a small tracked UGV with an array of motors and sensors covering its weapon mount.",
"default_faction": "defense_bot",
"species": [ "ROBOT" ],
"diff": 10,
- "volume": "30000 ml",
+ "volume": "150000 ml",
"weight": 40750,
"hp": 80,
- "speed": 70,
+ "speed": 40,
"material": [ "steel" ],
"symbol": "R",
"color": "dark_gray",
@@ -20,41 +20,76 @@
"armor_cut": 14,
"vision_day": 50,
"revert_to_itype": "bot_secubot",
- "starting_ammo": { "9mm": 100 },
- "special_attacks": [ { "type": "gun", "cooldown": 2, "gun_type": "hk_mp5", "ranges": [ [ 0, 6, "AUTO" ], [ 7, 12, "DEFAULT" ] ] } ],
+ "starting_ammo": { "223": 30 },
+ "special_attacks": [
+ {
+ "type": "gun",
+ "cooldown": 1,
+ "move_cost": 150,
+ "gun_type": "m16a4",
+ "ammo_type": "556",
+ "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ],
+ "fake_dex": 12,
+ "ranges": [ [ 0, 30, "DEFAULT" ] ],
+ "require_targeting_npc": true,
+ "require_targeting_monster": true,
+ "laser_lock": false,
+ "targeting_cost": 200,
+ "targeting_timeout_extend": -10,
+ "targeting_sound": "\"Hostile detected.\"",
+ "targeting_volume": 50,
+ "no_ammo_sound": "a chk!"
+ }
+ ],
"death_drops": { },
"death_function": [ "BROKEN" ],
- "flags": [ "SEES", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE", "PATH_AVOID_DANGER_1", "LOUDMOVES", "DROPS_AMMO" ]
+ "flags": [ "SEES", "HEARS", "ELECTRONIC", "NO_BREATHE", "PATH_AVOID_DANGER_1", "LOUDMOVES", "DROPS_AMMO" ]
},
{
- "id": "mon_turret",
+ "id": "mon_talon_m202a1",
"type": "MONSTER",
- "name": "turret",
- "description": "The General Atomics TX-1 Guardian, a small, pill-shaped automated gun turret using state of the art ATR systems to dynamically reorient itself to new friends and enemies alike. The two SMG barrels can swivel a full 360 degrees.",
+ "name": "M202A1 autonomous TALON UGV",
+ "description": "A TALON unmanned ground vehicle equipped with an M202A1 FLASH. It is a small tracked UGV with an array of motors and sensors covering its weapon mount.",
"default_faction": "defense_bot",
"species": [ "ROBOT" ],
"diff": 10,
- "volume": "30000 ml",
+ "volume": "150000 ml",
"weight": 40750,
- "hp": 30,
- "speed": 100,
+ "hp": 80,
+ "speed": 40,
"material": [ "steel" ],
- "symbol": "2",
- "color": "light_gray",
+ "symbol": "R",
+ "color": "dark_gray",
"aggression": 100,
"morale": 100,
"armor_bash": 14,
- "armor_cut": 16,
- "vision_night": 3,
- "revert_to_itype": "bot_turret",
- "starting_ammo": { "9mm": 100 },
+ "armor_cut": 14,
+ "vision_day": 50,
+ "revert_to_itype": "bot_talon_m202a1",
+ "starting_ammo": { "m235tpa": 4 },
"special_attacks": [
- { "type": "gun", "cooldown": 1, "gun_type": "hk_mp5", "ranges": [ [ 0, 6, "AUTO" ], [ 7, 14, "DEFAULT" ] ] },
- [ "PARROT", 40 ]
+ {
+ "type": "gun",
+ "cooldown": 1,
+ "move_cost": 150,
+ "gun_type": "m202_flash",
+ "ammo_type": "m235tpa",
+ "fake_skills": [ [ "gun", 8 ], [ "launcher", 8 ] ],
+ "fake_dex": 12,
+ "ranges": [ [ 0, 20, "DEFAULT" ] ],
+ "require_targeting_npc": true,
+ "require_targeting_monster": true,
+ "laser_lock": false,
+ "targeting_cost": 200,
+ "targeting_timeout_extend": -10,
+ "targeting_sound": "\"Hostile detected.\"",
+ "targeting_volume": 50,
+ "no_ammo_sound": "a chk!"
+ }
],
"death_drops": { },
"death_function": [ "BROKEN" ],
- "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ]
+ "flags": [ "SEES", "HEARS", "ELECTRONIC", "NO_BREATHE", "PATH_AVOID_DANGER_1", "LOUDMOVES", "DROPS_AMMO" ]
},
{
"id": "mon_skitterbot",
diff --git a/data/json/monsters/mi-go.json b/data/json/monsters/mi-go.json
index 92e91617674ce..cd51de980b57d 100644
--- a/data/json/monsters/mi-go.json
+++ b/data/json/monsters/mi-go.json
@@ -77,7 +77,7 @@
"special_attacks": [
[ "PARROT", 0 ],
{ "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 23, "armor_multiplier": 0.8 } ] },
- { "type": "spell", "spell_id": "mi-go_slaver_beam", "spell_level": 3, "cooldown": 10 }
+ { "type": "spell", "spell_id": "mi-go_slaver_beam", "spell_level": 3, "cooldown": 100 }
],
"death_function": [ "NORMAL" ],
"flags": [
@@ -175,7 +175,7 @@
[ "SHRIEK_STUN", 4 ],
[ "TAZER", 5 ],
{ "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 35, "armor_multiplier": 0.7 } ] },
- { "type": "spell", "spell_id": "mi-go_slaver_beam", "spell_level": 1, "cooldown": 20 }
+ { "type": "spell", "spell_id": "mi-go_slaver_beam", "spell_level": 1, "cooldown": 100 }
],
"death_function": [ "NORMAL" ],
"flags": [
@@ -225,7 +225,7 @@
[ "LONGSWIPE", 12 ],
[ "STRETCH_ATTACK", 20 ],
{ "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 30, "armor_multiplier": 0.7 } ] },
- { "type": "spell", "spell_id": "mi-go_slaver_beam", "spell_level": 2, "cooldown": 20 }
+ { "type": "spell", "spell_id": "mi-go_slaver_beam", "spell_level": 2, "cooldown": 100 }
],
"death_function": [ "NORMAL" ],
"flags": [
diff --git a/data/json/monsters/military.json b/data/json/monsters/military.json
deleted file mode 100644
index a55dfa1bce70c..0000000000000
--- a/data/json/monsters/military.json
+++ /dev/null
@@ -1,121 +0,0 @@
-[
- {
- "id": "mon_laserturret",
- "type": "MONSTER",
- "name": "laser turret",
- "description": "The TX-5LR Cerberus is an upgrade to its predecessors. It features a state of the art revolving laser cannon system with three barrels that charge from solar cells embedded in its hull.",
- "default_faction": "military",
- "species": [ "ROBOT" ],
- "diff": 20,
- "volume": "30000 ml",
- "weight": 40750,
- "hp": 30,
- "speed": 100,
- "material": [ "steel" ],
- "symbol": "2",
- "color": "white",
- "aggression": 100,
- "morale": 100,
- "armor_bash": 14,
- "armor_cut": 16,
- "revert_to_itype": "bot_laserturret",
- "special_attacks": [
- {
- "type": "gun",
- "cooldown": 1,
- "gun_type": "laser_cannon",
- "fake_skills": [ [ "gun", 4 ], [ "rifle", 8 ] ],
- "range": 18,
- "ranges": [ [ 0, 30, "DEFAULT" ] ],
- "require_sunlight": true
- }
- ],
- "death_drops": { },
- "death_function": [ "BROKEN" ],
- "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE" ]
- },
- {
- "id": "mon_turret_bmg",
- "type": "MONSTER",
- "name": "antimateriel turret",
- "description": "Leadworks LLC's T-107A1 Interdictor, an automated .50BMG antimateriel rifle. Credited with forestalling countless car-bombing attempts, it has always been kept under extremely tight control, so as to itself maintain extremely tight control of its area. And then the Cataclysm struck.",
- "default_faction": "military",
- "species": [ "ROBOT" ],
- "diff": 30,
- "volume": "62500 ml",
- "weight": 81500,
- "hp": 40,
- "speed": 100,
- "material": [ "steel" ],
- "symbol": "2",
- "color": "green",
- "aggression": 100,
- "morale": 100,
- "armor_bash": 14,
- "armor_cut": 16,
- "vision_night": 3,
- "revert_to_itype": "bot_antimateriel",
- "starting_ammo": { "50bmg": 100 },
- "special_attacks": [
- {
- "type": "gun",
- "cooldown": 1,
- "move_cost": 150,
- "gun_type": "m107a1",
- "ammo_type": "50bmg",
- "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ],
- "fake_dex": 12,
- "ranges": [ [ 0, 40, "DEFAULT" ] ],
- "require_targeting_npc": true,
- "require_targeting_monster": true,
- "laser_lock": true,
- "targeting_cost": 200,
- "targeting_timeout_extend": -10,
- "targeting_sound": "\"Hostile detected.\"",
- "targeting_volume": 10,
- "no_ammo_sound": "a chk!"
- }
- ],
- "death_drops": { },
- "death_function": [ "BROKEN" ],
- "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ]
- },
- {
- "id": "mon_turret_rifle",
- "type": "MONSTER",
- "name": "milspec turret",
- "description": "Leadworks LLC's T-4A1 Sentry. It features improved firmware over General Atomics' TX-1 9x19mm model and an automated 5.56mm carbine.",
- "default_faction": "military",
- "species": [ "ROBOT" ],
- "diff": 20,
- "volume": "30000 ml",
- "weight": 40750,
- "hp": 40,
- "speed": 100,
- "material": [ "steel" ],
- "symbol": "2",
- "color": "green",
- "aggression": 100,
- "morale": 100,
- "armor_bash": 14,
- "armor_cut": 16,
- "vision_night": 3,
- "revert_to_itype": "bot_rifleturret",
- "starting_ammo": { "556": 100 },
- "special_attacks": [
- {
- "type": "gun",
- "cooldown": 1,
- "gun_type": "m4a1",
- "ammo_type": "556",
- "fake_skills": [ [ "gun", 6 ], [ "rifle", 8 ] ],
- "fake_dex": 10,
- "range": 18,
- "ranges": [ [ 0, 10, "AUTO" ], [ 11, 30, "DEFAULT" ] ]
- }
- ],
- "death_drops": { },
- "death_function": [ "BROKEN" ],
- "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ]
- }
-]
diff --git a/data/json/monsters/turrets.json b/data/json/monsters/turrets.json
new file mode 100644
index 0000000000000..f07ffd7af98ac
--- /dev/null
+++ b/data/json/monsters/turrets.json
@@ -0,0 +1,221 @@
+[
+ {
+ "id": "mon_turret",
+ "type": "MONSTER",
+ "name": "improvised MP5 turret",
+ "description": "An MP5 attached to a motorized chassis with basic autonomous software control. There is no mechanism to reload the weapon when its magazine is empty and the fire control system is only designed for semi automatic fire.",
+ "default_faction": "defense_bot",
+ "species": [ "ROBOT" ],
+ "diff": 20,
+ "volume": "30000 ml",
+ "weight": 40750,
+ "hp": 30,
+ "speed": 100,
+ "material": [ "steel" ],
+ "symbol": "2",
+ "color": "light_gray",
+ "aggression": 100,
+ "morale": 100,
+ "armor_bash": 14,
+ "armor_cut": 16,
+ "vision_night": 3,
+ "revert_to_itype": "bot_turret",
+ "starting_ammo": { "9mm": 30 },
+ "special_attacks": [
+ {
+ "type": "gun",
+ "cooldown": 1,
+ "move_cost": 150,
+ "gun_type": "hk_mp5",
+ "ammo_type": "9mm",
+ "fake_skills": [ [ "gun", 5 ], [ "smg", 5 ] ],
+ "fake_dex": 12,
+ "ranges": [ [ 0, 14, "DEFAULT" ] ],
+ "require_targeting_npc": true,
+ "require_targeting_monster": true,
+ "laser_lock": false,
+ "targeting_cost": 400,
+ "targeting_timeout_extend": -10,
+ "targeting_sound": "\"Hostile detected.\"",
+ "targeting_volume": 20,
+ "no_ammo_sound": "a chk!"
+ }
+ ],
+ "death_drops": { },
+ "death_function": [ "BROKEN" ],
+ "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ]
+ },
+ {
+ "id": "mon_laserturret",
+ "type": "MONSTER",
+ "name": "laser turret",
+ "description": "The TX-5LR Cerberus is an upgrade to its predecessors. It features a state of the art revolving laser cannon system with three barrels that charge from solar cells embedded in its hull.",
+ "default_faction": "military",
+ "species": [ "ROBOT" ],
+ "diff": 20,
+ "volume": "30000 ml",
+ "weight": 40750,
+ "hp": 30,
+ "speed": 100,
+ "material": [ "steel" ],
+ "symbol": "2",
+ "color": "white",
+ "aggression": 100,
+ "morale": 100,
+ "armor_bash": 14,
+ "armor_cut": 16,
+ "revert_to_itype": "bot_laserturret",
+ "special_attacks": [
+ {
+ "type": "gun",
+ "cooldown": 1,
+ "gun_type": "laser_cannon",
+ "fake_skills": [ [ "gun", 4 ], [ "rifle", 8 ] ],
+ "range": 18,
+ "ranges": [ [ 0, 30, "DEFAULT" ] ],
+ "require_sunlight": true
+ }
+ ],
+ "death_drops": { },
+ "death_function": [ "BROKEN" ],
+ "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE" ]
+ },
+ {
+ "id": "mon_turret_bmg",
+ "type": "MONSTER",
+ "name": "M2HB autonomous CROWS II",
+ "description": "A remote weapon system derived from the M153 CROWS II and enhanced with autonomous operation software. Thousands of these were deployed by the US military before the cataclysm and they were valued for their use in engaging anything up to light vehicles at long range without exposing the operator. This one is fitted with a M2HB.",
+ "default_faction": "military",
+ "species": [ "ROBOT" ],
+ "diff": 40,
+ "volume": "62500 ml",
+ "weight": 172000,
+ "hp": 40,
+ "speed": 100,
+ "material": [ "steel" ],
+ "symbol": "2",
+ "color": "green",
+ "aggression": 100,
+ "morale": 100,
+ "armor_bash": 14,
+ "armor_cut": 16,
+ "vision_night": 3,
+ "revert_to_itype": "bot_antimateriel",
+ "starting_ammo": { "50bmg": 400 },
+ "special_attacks": [
+ {
+ "type": "gun",
+ "cooldown": 1,
+ "move_cost": 150,
+ "gun_type": "m2browning",
+ "ammo_type": "50bmg",
+ "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ],
+ "fake_dex": 12,
+ "ranges": [ [ 0, 10, "AUTO" ], [ 11, 40, "DEFAULT" ] ],
+ "require_targeting_npc": true,
+ "require_targeting_monster": true,
+ "laser_lock": false,
+ "targeting_cost": 200,
+ "targeting_timeout_extend": -10,
+ "targeting_sound": "\"Hostile detected.\"",
+ "targeting_volume": 50,
+ "no_ammo_sound": "a chk!"
+ }
+ ],
+ "death_drops": { },
+ "death_function": [ "BROKEN" ],
+ "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ]
+ },
+ {
+ "id": "mon_turret_rifle",
+ "type": "MONSTER",
+ "name": "M249 autonomous CROWS II",
+ "description": "A remote weapon system derived from the M153 CROWS II and enhanced with autonomous operation software. Thousands of these were deployed by the US military before the cataclysm and they were valued for their use in engaging infantry without exposing the operator. This one is fitted with a M249.",
+ "default_faction": "military",
+ "species": [ "ROBOT" ],
+ "diff": 30,
+ "volume": "60000 ml",
+ "weight": 172000,
+ "hp": 40,
+ "speed": 100,
+ "material": [ "steel" ],
+ "symbol": "2",
+ "color": "green",
+ "aggression": 100,
+ "morale": 100,
+ "armor_bash": 14,
+ "armor_cut": 16,
+ "vision_night": 3,
+ "revert_to_itype": "bot_rifleturret",
+ "starting_ammo": { "556": 1600 },
+ "special_attacks": [
+ {
+ "type": "gun",
+ "cooldown": 1,
+ "move_cost": 150,
+ "gun_type": "m249",
+ "ammo_type": "556",
+ "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ],
+ "fake_dex": 12,
+ "ranges": [ [ 0, 30, "DEFAULT" ] ],
+ "require_targeting_npc": true,
+ "require_targeting_monster": true,
+ "laser_lock": false,
+ "targeting_cost": 200,
+ "targeting_timeout_extend": -10,
+ "targeting_sound": "\"Hostile detected.\"",
+ "targeting_volume": 50,
+ "no_ammo_sound": "a chk!"
+ }
+ ],
+ "death_drops": { },
+ "death_function": [ "BROKEN" ],
+ "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ]
+ },
+ {
+ "id": "mon_crows_m240",
+ "type": "MONSTER",
+ "name": "M240 autonomous CROWS II",
+ "description": "A remote weapon system derived from the M153 CROWS II and enhanced with autonomous operation software. Thousands of these were deployed by the US military before the cataclysm and they were valued for their use in engaging infantry without exposing the operator. This one is fitted with a M240.",
+ "default_faction": "military",
+ "species": [ "ROBOT" ],
+ "diff": 35,
+ "volume": "60000 ml",
+ "weight": 172000,
+ "hp": 40,
+ "speed": 100,
+ "material": [ "steel" ],
+ "symbol": "2",
+ "color": "green",
+ "aggression": 100,
+ "morale": 100,
+ "armor_bash": 14,
+ "armor_cut": 16,
+ "vision_night": 3,
+ "revert_to_itype": "bot_crows_m240",
+ "starting_ammo": { "762_51": 1000 },
+ "special_attacks": [
+ {
+ "type": "gun",
+ "cooldown": 1,
+ "move_cost": 150,
+ "gun_type": "m240",
+ "ammo_type": "762_51",
+ "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ],
+ "fake_dex": 12,
+ "ranges": [ [ 0, 30, "DEFAULT" ] ],
+ "require_targeting_npc": true,
+ "require_targeting_monster": true,
+ "laser_lock": false,
+ "targeting_cost": 200,
+ "targeting_timeout_extend": -10,
+ "targeting_sound": "\"Hostile detected.\"",
+ "targeting_volume": 50,
+ "no_ammo_sound": "a chk!"
+ }
+ ],
+ "death_drops": { },
+ "death_function": [ "BROKEN" ],
+ "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "IMMOBILE", "NO_BREATHE", "DROPS_AMMO" ]
+ }
+]
diff --git a/data/json/monsters/zed_soldiers.json b/data/json/monsters/zed_soldiers.json
index 762244449eba5..d71abfe89005a 100644
--- a/data/json/monsters/zed_soldiers.json
+++ b/data/json/monsters/zed_soldiers.json
@@ -192,7 +192,6 @@
"looks_like": "mon_zombie_brute",
"default_faction": "zombie",
"bodytype": "human",
- "categories": [ "CLASSIC" ],
"species": [ "ZOMBIE", "HUMAN" ],
"volume": "72500 ml",
"weight": 85500,
@@ -244,7 +243,6 @@
"looks_like": "mon_zombie_hulk",
"default_faction": "zombie",
"bodytype": "human",
- "categories": [ "CLASSIC" ],
"species": [ "ZOMBIE", "HUMAN" ],
"volume": "625000 ml",
"weight": 200000,
@@ -364,6 +362,7 @@
"vision_night": 3,
"luminance": 8,
"harvest": "zombie",
+ "starting_ammo": { "pressurized_tank": 1000 },
"death_drops": { "subtype": "collection", "groups": [ [ "mon_zombie_soldier_death_drops", 100 ], [ "mon_zombie_flamer", 100 ] ] },
"death_function": [ "FIREBALL" ],
"burn_into": "mon_zombie_scorched",
diff --git a/data/json/npcs/NC_BOUNTY_HUNTER.json b/data/json/npcs/NC_BOUNTY_HUNTER.json
index 4494da0624a82..20668d9ec7244 100644
--- a/data/json/npcs/NC_BOUNTY_HUNTER.json
+++ b/data/json/npcs/NC_BOUNTY_HUNTER.json
@@ -25,7 +25,7 @@
{
"type": "item_group",
"id": "NC_BOUNTY_HUNTER_vest",
- "items": [ [ "null", 20 ], [ "kevlar", 80 ], [ "chestrig", 40 ] ]
+ "items": [ [ "null", 20 ], [ "kevlar", 80 ], [ "tacvest", 40 ] ]
},
{
"type": "item_group",
diff --git a/data/json/npcs/NC_JUNK_SHOPKEEP.json b/data/json/npcs/NC_JUNK_SHOPKEEP.json
index a94745e0dbb6a..fc14afa5a7f06 100644
--- a/data/json/npcs/NC_JUNK_SHOPKEEP.json
+++ b/data/json/npcs/NC_JUNK_SHOPKEEP.json
@@ -67,7 +67,7 @@
[ "sunglasses", 15 ],
[ "glasses_safety", 15 ],
[ "goggles_ski", 5 ],
- [ "chestrig", 20 ],
+ [ "tacvest", 20 ],
[ "legrig", 15 ],
[ "tool_belt", 15 ],
[ "fanny", 5 ],
diff --git a/data/json/npcs/NC_SOLDIER.json b/data/json/npcs/NC_SOLDIER.json
index 0f05ac11b9f4f..c03d624bd841b 100644
--- a/data/json/npcs/NC_SOLDIER.json
+++ b/data/json/npcs/NC_SOLDIER.json
@@ -103,7 +103,7 @@
[ "optical_cloak", 1 ],
[ "UPS_off", 5 ],
[ "adv_UPS_off", 3 ],
- [ "chestrig", 10 ],
+ [ "tacvest", 10 ],
[ "backpack", 8 ],
[ "dump_pouch", 20 ],
[ "legrig", 10 ],
diff --git a/data/json/npcs/TALK_ALLY_TUTORIAL.json b/data/json/npcs/TALK_ALLY_TUTORIAL.json
index eea9b89e43350..4c3e35cc2a92d 100644
--- a/data/json/npcs/TALK_ALLY_TUTORIAL.json
+++ b/data/json/npcs/TALK_ALLY_TUTORIAL.json
@@ -2,7 +2,7 @@
{
"id": "TALK_ALLY_TUTORIAL",
"type": "talk_topic",
- "dynamic_line": "I'm my own person, but I'm willing to follow your lead. I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background. You can give me instructions in conversation or by radio or shout commands at me.\n What do you want to know more about?",
+ "dynamic_line": "I'm my own person, but I'm willing to follow your lead. I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activites, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background. You can give me instructions in conversation or by radio or shout commands at me.\n What do you want to know more about?",
"responses": [
{ "text": "Forget I asked.", "topic": "TALK_FRIEND" },
{ "text": "Skip it, let's get going.", "topic": "TALK_DONE" },
@@ -14,6 +14,11 @@
{ "text": "Tell me about you carrying stuff.", "topic": "TALK_ALLY_TUTORIAL_MULE" },
{ "text": "You can perform first aid?", "topic": "TALK_ALLY_TUTORIAL_MEDIC" },
{ "text": "Tell me about faction camps.", "topic": "TALK_CAMP_TUTORIAL_INTRO" },
+ {
+ "text": "What's that about activities? Like what, you can farm for me?",
+ "topic": "TALK_ALLY_TUTORIAL_ACTIVITIES"
+ },
+ { "text": "You can ride horses?", "topic": "TALK_ALLY_TUTORIAL_HORSES" },
{ "text": "What do you mean, you can go places?", "topic": "TALK_ALLY_TUTORIAL_MOVEMENT" },
{ "text": "What do you do as a guard?", "topic": "TALK_ALLY_TUTORIAL_GUARD" },
{ "text": "You can use bionics? How does that work?", "topic": "TALK_ALLY_TUTORIAL_CBMS" },
@@ -92,16 +97,33 @@
},
"responses": [ { "text": "Tell me how I give you medical supplies.", "topic": "TALK_ALLY_TUTORIAL_MULE" } ]
},
+ {
+ "id": "TALK_ALLY_TUTORIAL_ACTIVITIES",
+ "type": "talk_topic",
+ "dynamic_line": "I can help with some tasks if you show me where to work.\n Use the zone manager (keybind 'Y') to set up sorting zones for your loot, or to draw blueprints for a building, or to define where you want to plant some crops, or where you'd like some trees cut down, or where you want a vehicle dismantled. Then tell me to sort stuff, or build stuff, or cut down trees, or dismantle a vehicle or do farmwork, and I'll go off and do my best to get what you want done. If I need tools, you should leave them pretty close to where you want me to work - axes for logging, shovels and seeds and fertilizer for farming, wrenches and hacksaws or a toolbox to take apart a vehicle. I can pretty much sort out our stuff without needing tools, but keep the piles of unsorted and sorted stuff kind of close together because I don't want to walk back and forth carrying junk too much.",
+ "responses": [
+ { "text": "Good to know. Can you perform first aid?", "topic": "TALK_ALLY_TUTORIAL_MEDIC" },
+ { "text": "What about carrying stuff in general?", "topic": "TALK_ALLY_TUTORIAL_MULE" },
+ { "text": "What if I want you to build an organized camp?", "topic": "TALK_CAMP_TUTORIAL_INTRO" }
+ ]
+ },
{
"id": "TALK_ALLY_TUTORIAL_MOVEMENT",
"type": "talk_topic",
- "dynamic_line": "If you call me by radio, you can tell me to come to you. If you've got some basecamps set up, you can tell me to go to one of them. I'll start walking, and when I get to where I'm going, I'll guard it.\n Now depending on where I am and where I'm going, it may take me a while to get there. I'll dodge any dangers on the way, don't worry about that, but if you're way the heck away from me and tell me to come, it may be a while until I get to you.",
+ "dynamic_line": "If you call me by radio, you can tell me to come to you. If you've got some basecamps set up, you can tell me to go to one of them. I'll start walking, and when I get to where I'm going, I'll guard it.\n Now depending on where I am and where I'm going, it may take me a while to get there. I'll dodge any dangers on the way, don't worry about that, but if you're way the heck away from me and tell me to come, it may be a while until I get to you.\n I'll move faster if I'm horseback.",
"responses": [
{ "text": "We can talk with radios?", "topic": "TALK_ALLY_TUTORIAL_RADIO" },
{ "text": "What do you do as a guard?", "topic": "TALK_ALLY_TUTORIAL_GUARD" },
- { "text": "Tell me about faction camps.", "topic": "TALK_CAMP_TUTORIAL_INTRO" }
+ { "text": "Tell me about faction camps.", "topic": "TALK_CAMP_TUTORIAL_INTRO" },
+ { "text": "You can ride a horse?", "topic": "TALK_ALLY_TUTORIAL_HORSES" }
]
},
+ {
+ "id": "TALK_ALLY_TUTORIAL_HORSES",
+ "type": "talk_topic",
+ "dynamic_line": "If there's a friendly horse with a saddle nearby, you tell me to mount up, I'll go over and get on it. You may need to feed a feral horse some cattlefodder to get it act tame and friendly, and e'x'amine it while you have a saddle in your inventory in order to put the saddle on. You can also ride yourself, if you know how how.\n You want me to get off a horse, you just tell me. You can get off a horse with the vehicle control key (keybind '^').\n While we're on horses, we'll just move normally, but a lot faster. It's a good way to get places more quickly than we could on our own two feet.",
+ "responses": [ { "text": "You said something about being to go places.", "topic": "TALK_ALLY_TUTORIAL_MOVEMENT" } ]
+ },
{
"id": "TALK_ALLY_TUTORIAL_GUARD",
"type": "talk_topic",
@@ -142,8 +164,12 @@
{
"id": "TALK_ALLY_TUTORIAL_CHANGES",
"type": "talk_topic",
- "dynamic_line": "Well, this conversation is pretty new! But there's been some other changes.\n I've been able to install CBMs on you, and have passive bionics installed in me, for a while. But now I can use some active bionics, and I can explain some details on how I use bionics.",
- "responses": [ { "text": "You can use bionics? How does that work?", "topic": "TALK_ALLY_TUTORIAL_CBMS" } ]
+ "dynamic_line": "Well, this conversation is pretty new! But there's been some other changes.\n I've been able to install CBMs on you, and have passive bionics installed in me, for a while. But now I can use some active bionics, and I can explain some details on how I use bionics.\n I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint.",
+ "responses": [
+ { "text": "You can use bionics? How does that work?", "topic": "TALK_ALLY_TUTORIAL_CBMS" },
+ { "text": "You can ride horses? Can I ride horses?", "topic": "TALK_ALLY_TUTORIAL_HORSES" },
+ { "text": "Tell me more about the activities you can do now.", "topic": "TALK_ALLY_TUTORIAL_ACTIVITIES" }
+ ]
},
{
"id": [
@@ -153,6 +179,8 @@
"TALK_ALLY_TUTORIAL_COMBAT",
"TALK_ALLY_TUTORIAL_TRAINING",
"TALK_ALLY_TUTORIAL_MULE",
+ "TALK_ALLY_TUTORIAL_ACTIVITIES",
+ "TALK_ALLY_TUTORIAL_HORSES",
"TALK_ALLY_TUTORIAL_MEDIC",
"TALK_ALLY_TUTORIAL_MOVEMENT",
"TALK_ALLY_TUTORIAL_GUARD",
diff --git a/data/json/npcs/TALK_COMMON_ALLY.json b/data/json/npcs/TALK_COMMON_ALLY.json
index c30c304f43435..3f2865337ce71 100644
--- a/data/json/npcs/TALK_COMMON_ALLY.json
+++ b/data/json/npcs/TALK_COMMON_ALLY.json
@@ -35,7 +35,8 @@
"no": { "has_reason": { "use_reason": true }, "no": "What is it, friend?" }
},
"responses": [
- { "text": "Combat commands...", "topic": "TALK_COMBAT_COMMANDS" },
+ { "text": "I want to give you some commands for combat.", "topic": "TALK_COMBAT_COMMANDS" },
+ { "text": "I want to set some miscellaneous rules.", "topic": "TALK_MISC_RULES" },
{ "text": "Can I do anything for you?", "topic": "TALK_MISSION_LIST" },
{
"text": "Can you teach me anything?",
@@ -71,33 +72,48 @@
"switch": true,
"default": true
},
- {
- "text": "Guard this position.",
- "condition": { "not": "is_by_radio" },
- "topic": "TALK_FRIEND_GUARD",
- "effect": "assign_guard"
- },
- { "text": "I'd like to know a bit more about you...", "topic": "TALK_FRIEND", "effect": "reveal_stats" },
{
"text": "I want you to use this item.",
"condition": { "not": "is_by_radio" },
"topic": "TALK_FRIEND",
"effect": "npc_gets_item_to_use"
},
- { "text": "Let's talk about your current activity.", "topic": "TALK_ACTIVITIES" },
{
"text": "Hold on to this item.",
"condition": { "not": "is_by_radio" },
"topic": "TALK_FRIEND",
"effect": "npc_gets_item"
},
- { "text": "Miscellaneous rules...", "topic": "TALK_MISC_RULES" },
- { "text": "I'm going to go my own way for a while.", "topic": "TALK_LEAVE" },
- { "text": "Let's go.", "topic": "TALK_DONE" },
{
- "text": "Let's just chitchat for a while...",
- "topic": "TALK_FRIEND_CHAT",
- "condition": { "not": { "npc_has_effect": "asked_to_socialize" } }
+ "text": "Guard this position.",
+ "condition": { "not": "is_by_radio" },
+ "topic": "TALK_FRIEND_GUARD",
+ "effect": "assign_guard"
+ },
+ { "text": "Let's talk about your current activity.", "topic": "TALK_ACTIVITIES" },
+ { "text": "Let's talk about faction camps.", "topic": "TALK_CAMP_GENERAL" },
+ {
+ "text": "Find a horse and mount up!",
+ "condition": { "not": "npc_is_riding" },
+ "topic": "TALK_DONE",
+ "effect": "find_mount"
+ },
+ {
+ "text": "Get off your mount, please.",
+ "condition": "npc_is_riding",
+ "topic": "TALK_DONE",
+ "effect": "dismount"
+ },
+ {
+ "text": "Please go to this location.",
+ "topic": "TALK_GOTO_LOCATION",
+ "condition": { "or": [ "is_by_radio", "u_has_camp" ] },
+ "effect": "goto_location"
+ },
+ {
+ "text": "I'd like to know a bit more about your abilities.",
+ "topic": "TALK_FRIEND",
+ "effect": "reveal_stats"
},
{
"text": "Any hints about the world we now live in?",
@@ -118,13 +134,36 @@
"failure": { "topic": "TALK_SHELTER_ADVICE", "effect": { "npc_add_effect": "asked_to_hint", "duration": 300 } }
},
{
- "text": "Please go to this location...",
- "topic": "TALK_GOTO_LOCATION",
- "condition": { "or": [ "is_by_radio", "u_has_camp" ] },
- "effect": "goto_location"
+ "text": "Mind if we just chat for a bit about your history?",
+ "topic": "TALK_FRIEND_CONVERSATION",
+ "condition": {
+ "and": [ "at_safe_space", { "or": [ { "npc_has_trait_flag": "BG_SURVIVAL_STORY" }, { "npc_has_trait": "NPC_STATIC_NPC" } ] } ]
+ },
+ "//": "If the NPC already has a BG story, or started out as a static NPC (and so probably doesn't need a random bg story), then go on.",
+ "switch": true
},
- { "text": "Tell me about giving you orders.", "topic": "TALK_ALLY_TUTORIAL" },
- { "text": "Let's talk about faction camps.", "topic": "TALK_CAMP_GENERAL" }
+ {
+ "text": "Mind if we just chat for a bit about your history?",
+ "topic": "TALK_FRIEND_CONVERSATION",
+ "condition": "at_safe_space",
+ "switch": true,
+ "effect": { "npc_add_trait": "BGSS_Confused_1" },
+ "//": "If the NPC doesn't have a BG survival story flagged trait, and didn't start the game as a static NPC, give them a BG story.",
+ "//": "This is a stand-in for some kind of better system to add a random trait."
+ },
+ {
+ "text": "Mind if we just chat for a bit about your history?",
+ "topic": "TALK_CONVERSATION_DANGER",
+ "condition": { "not": "at_safe_space" }
+ },
+ {
+ "text": "Let's just chitchat for a while, I could use some relaxation.",
+ "topic": "TALK_FRIEND_CHAT",
+ "condition": { "not": { "npc_has_effect": "asked_to_socialize" } }
+ },
+ { "text": "Tell me about giving you orders (NPC TUTORIAL).", "topic": "TALK_ALLY_TUTORIAL" },
+ { "text": "I'm going to go my own way for a while.", "topic": "TALK_LEAVE" },
+ { "text": "Let's go.", "topic": "TALK_DONE" }
]
},
{
@@ -141,9 +180,13 @@
"no": {
"npc_engagement_rule": "ENGAGE_HIT",
"no": {
- "npc_engagement_rule": "ENGAGE_NO_MOVE",
- "no": "*will engage all enemies.",
- "yes": "*will engage enemies close enough to attack without moving."
+ "npc_engagement_rule": "ENGAGE_FREE_FIRE",
+ "no": {
+ "npc_engagement_rule": "ENGAGE_NO_MOVE",
+ "no": "*will engage all enemies.",
+ "yes": "*will engage enemies close enough to attack without moving."
+ },
+ "yes": "*will engage distant enemies without moving."
},
"yes": "*will engage enemies you attack."
},
@@ -310,9 +353,13 @@
"no": {
"npc_engagement_rule": "ENGAGE_HIT",
"no": {
- "npc_engagement_rule": "ENGAGE_NO_MOVE",
- "no": "*will engage all enemies.",
- "yes": "*will engage enemies close enough to attack without moving."
+ "npc_engagement_rule": "ENGAGE_FREE_FIRE",
+ "no": {
+ "npc_engagement_rule": "ENGAGE_NO_MOVE",
+ "no": "*will engage all enemies.",
+ "yes": "*will engage enemies close enough to attack without moving."
+ },
+ "yes": "*will engage distant enemies without moving."
},
"yes": "*will engage enemies you attack."
},
@@ -356,6 +403,12 @@
"condition": { "not": { "npc_engagement_rule": "ENGAGE_NO_MOVE" } },
"effect": { "set_npc_engagement_rule": "ENGAGE_NO_MOVE" }
},
+ {
+ "text": "Attack any enemy within range of your ranged weapon, but don't move.",
+ "topic": "TALK_NONE",
+ "condition": { "not": { "npc_engagement_rule": "ENGAGE_FREE_FIRE" } },
+ "effect": { "set_npc_engagement_rule": "ENGAGE_FREE_FIRE" }
+ },
{
"text": "Attack anything you want.",
"topic": "TALK_NONE",
@@ -746,6 +799,36 @@
"condition": { "not": "npc_has_activity" },
"effect": "do_construction"
},
+ {
+ "text": "Please start deconstructing any vehicles in a deconstruction zone.",
+ "topic": "TALK_DONE",
+ "condition": { "not": "npc_has_activity" },
+ "effect": "do_vehicle_deconstruct"
+ },
+ {
+ "text": "Please chop logs into planks.",
+ "topic": "TALK_DONE",
+ "condition": { "not": "npc_has_activity" },
+ "effect": "do_chop_plank"
+ },
+ {
+ "text": "Please butcher any corpses that you can.",
+ "topic": "TALK_DONE",
+ "condition": { "not": "npc_has_activity" },
+ "effect": "do_butcher"
+ },
+ {
+ "text": "Please chop any trees in the designated areas.",
+ "topic": "TALK_DONE",
+ "condition": { "not": "npc_has_activity" },
+ "effect": "do_chop_trees"
+ },
+ {
+ "text": "Please go catch some fish.",
+ "topic": "TALK_DONE",
+ "condition": { "not": "npc_has_activity" },
+ "effect": "do_fishing"
+ },
{
"text": "Please do some farming work.",
"topic": "TALK_DONE",
diff --git a/data/json/npcs/TALK_COMMON_MISSION.json b/data/json/npcs/TALK_COMMON_MISSION.json
index 158df14ec1635..2a62a819b14ef 100644
--- a/data/json/npcs/TALK_COMMON_MISSION.json
+++ b/data/json/npcs/TALK_COMMON_MISSION.json
@@ -273,6 +273,7 @@
{
"text": "Glad to help. I need no payment.",
"topic": "TALK_NONE",
+ "condition": "mission_has_generic_rewards",
"effect": "clear_mission",
"mission_opinion": { "trust": 4, "value": 3 },
"opinion": { "fear": -1, "anger": -1 }
@@ -280,17 +281,34 @@
{
"text": "How about some items as payment?",
"topic": "TALK_MISSION_REWARD",
- "condition": { "not": "npc_friend" },
+ "condition": { "and": [ "mission_has_generic_rewards", { "not": "npc_friend" } ] },
"effect": "mission_reward"
},
{
"text": "Maybe you can teach me something as payment?",
"topic": "TALK_TRAIN",
- "condition": { "or": [ "npc_train_skills", "npc_train_styles" ] }
+ "condition": { "and": [ "mission_has_generic_rewards", { "or": [ "npc_train_skills", "npc_train_styles" ] } ] }
},
{
"text": "Glad to help. I need no payment. Bye!",
"topic": "TALK_DONE",
+ "condition": "mission_has_generic_rewards",
+ "effect": "clear_mission",
+ "mission_opinion": { "trust": 4, "value": 3 },
+ "opinion": { "fear": -1, "anger": -1 }
+ },
+ {
+ "text": "Glad to help.",
+ "topic": "TALK_NONE",
+ "condition": { "not": "mission_has_generic_rewards" },
+ "effect": "clear_mission",
+ "mission_opinion": { "trust": 4, "value": 3 },
+ "opinion": { "fear": -1, "anger": -1 }
+ },
+ {
+ "text": "Glad to help. Bye!",
+ "topic": "TALK_DONE",
+ "condition": { "not": "mission_has_generic_rewards" },
"effect": "clear_mission",
"mission_opinion": { "trust": 4, "value": 3 },
"opinion": { "fear": -1, "anger": -1 }
diff --git a/data/json/npcs/TALK_CYBORG_1.json b/data/json/npcs/TALK_CYBORG_1.json
index a37bd4b39a156..1cdf5099dcab2 100644
--- a/data/json/npcs/TALK_CYBORG_1.json
+++ b/data/json/npcs/TALK_CYBORG_1.json
@@ -10,10 +10,7 @@
"no": "I... I'm free. *Zzzt* I'm actually free! *bzzz* Look, you're the first person I've seen in a long time.",
"yes": "Hey again. *kzzz*"
},
- "speaker_effect": {
- "effect": { "npc_add_var": "cyborg_has_talked", "type": "dialogue", "context": "cyborg", "value": "yes" },
- "sentinel": "cyborg_has_talked"
- },
+ "speaker_effect": { "effect": { "npc_add_var": "cyborg_has_talked", "type": "dialogue", "context": "cyborg", "value": "yes" } },
"responses": [
{
"switch": true,
diff --git a/data/json/npcs/TALK_FRIEND_CONVERSATION.json b/data/json/npcs/TALK_FRIEND_CONVERSATION.json
index d15345075457e..28e7aaf2694bc 100644
--- a/data/json/npcs/TALK_FRIEND_CONVERSATION.json
+++ b/data/json/npcs/TALK_FRIEND_CONVERSATION.json
@@ -1,33 +1,4 @@
[
- {
- "id": "TALK_FRIEND",
- "type": "talk_topic",
- "responses": [
- {
- "text": "Mind if we just chat for a bit?",
- "topic": "TALK_FRIEND_CONVERSATION",
- "condition": {
- "and": [ "at_safe_space", { "or": [ { "npc_has_trait_flag": "BG_SURVIVAL_STORY" }, { "npc_has_trait": "NPC_STATIC_NPC" } ] } ]
- },
- "//": "If the NPC already has a BG story, or started out as a static NPC (and so probably doesn't need a random bg story), then go on.",
- "switch": true
- },
- {
- "text": "Mind if we just chat for a bit?",
- "topic": "TALK_FRIEND_CONVERSATION",
- "condition": "at_safe_space",
- "switch": true,
- "effect": { "npc_add_trait": "BGSS_Confused_1" },
- "//": "If the NPC doesn't have a BG survival story flagged trait, and didn't start the game as a static NPC, give them a BG story.",
- "//": "This is a stand-in for some kind of better system to add a random trait."
- },
- {
- "text": "Mind if we just chat for a bit?",
- "topic": "TALK_CONVERSATION_DANGER",
- "condition": { "not": "at_safe_space" }
- }
- ]
- },
{
"id": "TALK_CONVERSATION_DANGER",
"type": "talk_topic",
diff --git a/data/json/npcs/TALK_TEST.json b/data/json/npcs/TALK_TEST.json
index 48b46c280f819..7175dbe6bfaf8 100644
--- a/data/json/npcs/TALK_TEST.json
+++ b/data/json/npcs/TALK_TEST.json
@@ -601,6 +601,94 @@
}
]
},
+ {
+ "type": "talk_topic",
+ "id": "TALK_TEST_ADJUST_VARS",
+ "dynamic_line": "This is a test conversation that shouldn't appear in the game.",
+ "responses": [
+ { "text": "This is a basic test response.", "topic": "TALK_DONE" },
+ {
+ "text": "This is a u_adjust_var test response that increments by 1.",
+ "topic": "TALK_DONE",
+ "effect": { "u_adjust_var": "test", "type": "test", "context": "var_adjust_test", "adjustment": 1 }
+ },
+ {
+ "text": "This is a u_adjust_var test response that decrements by 1.",
+ "topic": "TALK_DONE",
+ "effect": { "u_adjust_var": "test", "type": "test", "context": "var_adjust_test", "adjustment": -1 }
+ },
+ {
+ "text": "This is a npc_adjust_var test response that increments by 1.",
+ "topic": "TALK_DONE",
+ "effect": { "npc_adjust_var": "test", "type": "test", "context": "var_adjust_test", "adjustment": 1 }
+ },
+ {
+ "text": "This is a npc_adjust_var test response that decrements by 1.",
+ "topic": "TALK_DONE",
+ "effect": { "npc_adjust_var": "test", "type": "test", "context": "var_adjust_test", "adjustment": -1 }
+ },
+ {
+ "text": "This is a u_compare_var test response for == 0.",
+ "topic": "TALK_DONE",
+ "condition": { "u_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": "==", "value": 0 }
+ },
+ {
+ "text": "This is a u_compare_var test response for != 0.",
+ "topic": "TALK_DONE",
+ "condition": { "u_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": "!=", "value": 0 }
+ },
+ {
+ "text": "This is a u_compare_var test response for <= 0.",
+ "topic": "TALK_DONE",
+ "condition": { "u_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": "<=", "value": 0 }
+ },
+ {
+ "text": "This is a u_compare_var test response for >= 0.",
+ "topic": "TALK_DONE",
+ "condition": { "u_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": ">=", "value": 0 }
+ },
+ {
+ "text": "This is a u_compare_var test response for < 0.",
+ "topic": "TALK_DONE",
+ "condition": { "u_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": "<", "value": 0 }
+ },
+ {
+ "text": "This is a u_compare_var test response for > 0.",
+ "topic": "TALK_DONE",
+ "condition": { "u_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": ">", "value": 0 }
+ },
+ {
+ "text": "This is a npc_compare_var test response for == 0.",
+ "topic": "TALK_DONE",
+ "condition": { "npc_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": "==", "value": 0 }
+ },
+ {
+ "text": "This is a npc_compare_var test response for != 0.",
+ "topic": "TALK_DONE",
+ "condition": { "npc_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": "!=", "value": 0 }
+ },
+ {
+ "text": "This is a npc_compare_var test response for <= 0.",
+ "topic": "TALK_DONE",
+ "condition": { "npc_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": "<=", "value": 0 }
+ },
+ {
+ "text": "This is a npc_compare_var test response for >= 0.",
+ "topic": "TALK_DONE",
+ "condition": { "npc_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": ">=", "value": 0 }
+ },
+ {
+ "text": "This is a npc_compare_var test response for < 0.",
+ "topic": "TALK_DONE",
+ "condition": { "npc_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": "<", "value": 0 }
+ },
+ {
+ "text": "This is a npc_compare_var test response for > 0.",
+ "topic": "TALK_DONE",
+ "condition": { "npc_compare_var": "test", "type": "test", "context": "var_adjust_test", "op": ">", "value": 0 }
+ }
+ ]
+ },
{
"type": "talk_topic",
"id": "TALK_TEST_BIONICS",
diff --git a/data/json/npcs/factions.json b/data/json/npcs/factions.json
index 8be7ad872f387..0284b0b4a65d0 100644
--- a/data/json/npcs/factions.json
+++ b/data/json/npcs/factions.json
@@ -50,6 +50,32 @@
},
"description": "The surviving staff of Hub 01, a pre-cataclysm research lab. They rarely leave their lab, if at all, and rely on their robots and advanced technology to survive."
},
+ {
+ "type": "faction",
+ "id": "robofac_auxiliaries",
+ "name": "Hub 01 Ancillia",
+ "likes_u": 15,
+ "respects_u": 15,
+ "known_by_u": false,
+ "size": 70,
+ "power": 100,
+ "food_supply": 115200,
+ "wealth": 75000,
+ "currency": "RobofacCoin",
+ "relations": {
+ "robofac": {
+ "kill on sight": false,
+ "watch your back": true,
+ "share my stuff": true,
+ "guard your stuff": true,
+ "lets you in": true,
+ "defends your space": true,
+ "knows your voice": true
+ },
+ "marloss": { "kill on sight": true }
+ },
+ "description": "A loose association of skilled wastelanders, traders, mercenaries and scouts. All working on behalf of Hub 01, for their own reasons."
+ },
{
"type": "faction",
"id": "old_guard",
@@ -142,6 +168,15 @@
"defends your space": false,
"knows your voice": true
},
+ "no_faction": {
+ "kill on sight": false,
+ "watch your back": false,
+ "share my stuff": false,
+ "guard your stuff": false,
+ "lets you in": false,
+ "defends your space": false,
+ "knows your voice": true
+ },
"hells_raiders": { "kill on sight": true }
},
"description": "A conglomeration of entrepreneurs and businessmen that stand together to hammer-out an existence through trade and industry."
@@ -185,6 +220,15 @@
"defends your space": false,
"knows your voice": true
},
+ "no_faction": {
+ "kill on sight": false,
+ "watch your back": false,
+ "share my stuff": false,
+ "guard your stuff": false,
+ "lets you in": false,
+ "defends your space": false,
+ "knows your voice": true
+ },
"wasteland_scavengers": {
"kill on sight": false,
"watch your back": false,
@@ -246,6 +290,26 @@
},
"description": "Diverse bands, congregations and organizations with the common goal of preaching human survival through symbiosis with fungaloids."
},
+ {
+ "type": "faction",
+ "id": "no_faction",
+ "name": "No Faction",
+ "likes_u": 0,
+ "respects_u": 0,
+ "known_by_u": false,
+ "size": 100,
+ "power": 100,
+ "food_supply": 172800,
+ "wealth": 2500000,
+ "relations": {
+ "lobby_beggars": { "knows your voice": true },
+ "free_merchants": { "knows your voice": true },
+ "old_guard": { "knows your voice": true },
+ "wasteland_scavengers": { "knows your voice": true },
+ "no_faction": { "knows your voice": true }
+ },
+ "description": "A lone wolf, not aligned with any faction."
+ },
{
"type": "faction",
"id": "wasteland_scavengers",
@@ -261,7 +325,8 @@
"lobby_beggars": { "knows your voice": true },
"free_merchants": { "knows your voice": true },
"old_guard": { "knows your voice": true },
- "wasteland_scavengers": { "share my stuff": true, "guard your stuff": true, "knows your voice": true }
+ "wasteland_scavengers": { "share my stuff": true, "guard your stuff": true, "knows your voice": true },
+ "no_faction": { "knows your voice": true }
},
"description": "Autonomous bands or individuals who make their living raiding the ruins of the old-world for gear and provisions."
},
@@ -366,6 +431,15 @@
"lets you in": false,
"defends your space": false
},
+ "no_faction": {
+ "kill on sight": false,
+ "watch your back": false,
+ "share my stuff": false,
+ "guard your stuff": false,
+ "lets you in": false,
+ "defends your space": false,
+ "knows your voice": true
+ },
"wasteland_scavengers": {
"kill on sight": false,
"watch your back": true,
diff --git a/data/json/npcs/holdouts/rural.json b/data/json/npcs/holdouts/rural.json
index 35d58d37d4ca1..577f95f24a9c4 100644
--- a/data/json/npcs/holdouts/rural.json
+++ b/data/json/npcs/holdouts/rural.json
@@ -8,6 +8,6 @@
"name_suffix": "Survivor",
"mission": 7,
"chat": "TALK_STRANGER_NEUTRAL",
- "faction": "wasteland_scavengers"
+ "faction": "no_faction"
}
]
diff --git a/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json
new file mode 100644
index 0000000000000..16dfc41b806ae
--- /dev/null
+++ b/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json
@@ -0,0 +1,104 @@
+[
+ {
+ "type": "npc",
+ "id": "isherwood_barry",
+ "//": "A naked prisoner, from the isherwood faction trapped in a horrifing cage, watching horrible things happen.",
+ "class": "NC_ISHERWOOD_BARRY",
+ "name_unique": "Barry Isherwood",
+ "attitude": 0,
+ "mission": 7,
+ "chat": "TALK_ISHERWOOD_BARRY",
+ "mission_offered": "MISSION_ISHERWOOD_BARRY_1",
+ "faction": "isherwood_family"
+ },
+ {
+ "type": "npc_class",
+ "id": "NC_ISHERWOOD_BARRY",
+ "name": "Barry Isherwood",
+ "job_description": "Missing member of the Isherwood family.",
+ "traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
+ "common": false,
+ "bonus_per": { "one_in": 4 },
+ "skills": [
+ {
+ "skill": "ALL",
+ "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -2 }, { "one_in": 4 } ] } ] }
+ },
+ { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } },
+ { "skill": "survival", "bonus": { "rng": [ 7, 10 ] } },
+ { "skill": "gun", "bonus": { "rng": [ 4, 8 ] } },
+ { "skill": "rifle", "bonus": { "rng": [ 7, 10 ] } },
+ { "skill": "archery", "bonus": { "rng": [ 8, 10 ] } }
+ ],
+ "worn_override": "naked_prisoner",
+ "carry_override": "naked_prisoner",
+ "weapon_override": "naked_prisoner"
+ },
+ {
+ "type": "talk_topic",
+ "id": "TALK_ISHERWOOD_BARRY",
+ "dynamic_line": {
+ "u_has_var": "u_saved_barry",
+ "type": "general",
+ "context": "meeting",
+ "value": "yes",
+ "no": "I can't believe my eyes. Please get my outta here...",
+ "yes": "Hey, ."
+ },
+ "responses": [
+ {
+ "text": "I've come to take you home, lets go.",
+ "condition": { "not": { "u_has_var": "u_saved_barry", "type": "general", "context": "meeting", "value": "yes" } },
+ "topic": "TALK_MISSION_OFFER",
+ "effect": "follow",
+ "assign_mission": "MISSION_ISHERWOOD_BARRY_1"
+ },
+ {
+ "text": "Hey buddy, feel like talking about what you saw in that tower?",
+ "topic": "TALK_ISHERWOOD_BARRY_TOWER",
+ "condition": { "u_has_var": "u_saved_barry", "type": "general", "context": "meeting", "value": "yes" }
+ },
+ { "text": "I'd better get going.", "topic": "TALK_DONE" }
+ ]
+ },
+ {
+ "type": "talk_topic",
+ "id": "TALK_ISHERWOOD_BARRY_TOWER",
+ "condition": { "u_has_var": "u_saved_barry", "type": "general", "context": "meeting", "value": "yes" },
+ "dynamic_line": [ "Yeah, I think we need to talk about it, but I'm not ready yet. Let me reclaim my life for a while. " ],
+ "responses": [ { "text": "Sounds good, Barry.", "topic": "TALK_DONE" } ]
+ },
+ {
+ "id": "MISSION_ISHERWOOD_BARRY_1",
+ "type": "mission_definition",
+ "name": "Return Barry to Eddie at the dairy.",
+ "goal": "MGOAL_GO_TO",
+ "difficulty": 3,
+ "value": 20000,
+ "destination": "dairy_farm_isherwood_W",
+ "start": {
+ "effect": [ { "u_add_var": "u_have_barry_escape", "type": "general", "context": "meeting", "value": "yes" } ],
+ "assign_mission_target": { "om_terrain": "dairy_farm_isherwood_W", "om_special": "Isherwood Farms", "reveal_radius": 3 }
+ },
+ "end": {
+ "opinion": { "trust": 5, "value": 5 },
+ "effect": [
+ "leave",
+ { "u_add_var": "u_saved_barry", "type": "general", "context": "meeting", "value": "yes" },
+ { "u_buy_item": "hsurvivor_suit", "count": 1 }
+ ]
+ },
+ "origins": [ "ORIGIN_SECONDARY" ],
+ "dialogue": {
+ "describe": "I just want to go home.",
+ "offer": "I can't believe you are here, please take me back to the ranch.",
+ "accepted": "Thank you, I thought I was dead.",
+ "rejected": "Please god no!",
+ "advice": "We shouldn't stay here too long, more might show up.",
+ "inquire": "How much further?",
+ "success": "Thanks, we'll never be able to repay you, Here's a token of my gratitude, I made these suits for my family and always keep a few extra around.",
+ "success_lie": "I don't feel saved...",
+ "failure": "Tell my family that I love them..."
+ }
+ }
+]
diff --git a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json
index 3caed2926dce9..9b4553a146676 100644
--- a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json
+++ b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json
@@ -92,7 +92,7 @@
"responses": [
{ "text": "What do you need?", "topic": "TALK_MISSION_LIST" },
{
- "text": "I heard about Barry, can you tell me what killed him?",
+ "text": "I heard about Barry, can you tell me what captured him?",
"topic": "TALK_CARLOS_BARRY",
"condition": {
"and": [
@@ -101,14 +101,24 @@
]
}
},
- { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_carlos_TOPICS" },
+ { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
]
},
{
"type": "talk_topic",
"id": "TALK_CARLOS_BARRY",
- "dynamic_line": "It was pink and really fast, it had lots of limbs, definitly not human. It easily kept up with us when we tried to escape, horrifying stuff. We burned the corpse to be safe.",
+ "dynamic_line": "It was pink and really fast, it had lots of limbs, definitly not human. It easily kept up with us when we tried to escape, horrifying stuff. Barry just dropped to the ground, and the thing swept him away.",
+ "responses": [
+ { "text": "You all just gonna leave him out there to his fate?", "topic": "TALK_CARLOS_BARRY2" },
+ { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
+ { "text": "I'd better get going.", "topic": "TALK_DONE" }
+ ]
+ },
+ {
+ "type": "talk_topic",
+ "id": "TALK_CARLOS_BARRY2",
+ "dynamic_line": "We tracked it for a while, but lost the trail. Right now we don't have the resources to try to rescue him. Chris has been trying to pick up the trail again and figure out a rescue plan.",
"responses": [
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
@@ -143,6 +153,16 @@
"id": "TALK_ISHERWOOD_CARLOS_TOPICS",
"dynamic_line": "Go on...",
"responses": [
+ {
+ "text": "I heard about Barry, can you tell me what captured him?",
+ "topic": "TALK_CARLOS_BARRY",
+ "condition": {
+ "and": [
+ { "u_has_var": "u_learned_about_barry", "type": "general", "context": "meeting", "value": "yes" },
+ { "not": { "u_is_wearing": "badge_marshal" } }
+ ]
+ }
+ },
{ "text": "Is your forge operational?", "topic": "TALK_CARLOS_FORGE" },
{ "text": "Where can I find Chris?", "topic": "TALK_CARLOS_CHRIS" },
{ "text": "Can I do anything for you?", "topic": "TALK_MISSION_LIST" },
@@ -159,6 +179,7 @@
"item": "anvil",
"count": 1,
"origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
"followup": "MISSION_ISHERWOOD_CARLOS_2",
"dialogue": {
"describe": "I need an anvil to do advanced metal work.",
@@ -167,16 +188,13 @@
"rejected": "Thanks anyway, we'll find the time to make it ourselves.",
"advice": "If you can't find one, maybe you can make one for me.",
"inquire": "Do you have the anvil?",
- "success": "I appreciate it, this will really make a difference, here's some horse armor I've been working on, eventually I'll have the whole herd outfitted.",
+ "success": "I appreciate it, this will really make a difference, here's some horse armor I've been working on. Eventually I'll have the whole herd outfitted.",
"success_lie": "What good does this do me?",
"failure": "It was a lost cause anyways..."
},
"end": {
"opinion": { "trust": 1, "value": 1 },
- "effect": [
- { "u_buy_item": "chainmail_armor_horse", "count": 1 },
- { "u_add_var": "u_did_carlos_missions", "type": "general", "context": "recruit", "value": "yes" }
- ],
+ "effect": [ { "u_buy_item": "leather_armor_horse", "count": 1 } ],
"update_mapgen": [
{
"om_terrain": "horse_farm_isherwood_4",
@@ -197,15 +215,23 @@
"assign_mission_target": { "om_terrain": "cabin_isherwood", "reveal_radius": 1, "random": true, "search_range": 20, "min_distance": 8 },
"update_mapgen": { "place_npcs": [ { "class": "isherwood_chris", "x": 8, "y": 17, "target": true } ] }
},
+ "end": {
+ "opinion": { "trust": 1, "value": 1 },
+ "effect": [
+ { "u_buy_item": "chainmail_armor_horse", "count": 1 },
+ { "u_add_var": "u_did_carlos_missions", "type": "general", "context": "recruit", "value": "yes" }
+ ]
+ },
"origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
"dialogue": {
- "describe": "Our son still isn't back, I'm getting concerned.",
+ "describe": "Chris hasn't come back from his latest search for Barry, I'm getting concerned.",
"offer": "Can you go find my son and tell him to check in with us.",
"accepted": "Thank you.",
"rejected": "Oh well. I hope he turns up soon.",
- "advice": "He should be on the property somewhere, maybe by that old cabin near the entrance, sometimes he camps there.",
+ "advice": "He might be on the property somewhere, maybe by that old cabin near the entrance, sometimes he camps there.",
"inquire": "How is the search going?",
- "success": "Thanks, I was getting ready to go look myself.",
+ "success": "Thanks, I was getting ready to go look myself. Now that I have the anvil, I've been working on new armor for the horses, take this prototype I made.",
"success_lie": "What good does this do us?",
"failure": "I hope he didn't meet Barry's fate..."
}
diff --git a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json
index 5076381beda13..6de2d3f80616a 100644
--- a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json
+++ b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json
@@ -52,12 +52,12 @@
"condition": { "u_is_wearing": "badge_marshal" }
},
{
- "text": "Hi, Your dad asked me to come find you.",
+ "text": "Hi, Your dad asked me to come find you, said you've been looking for your Uncle.",
"topic": "TALK_ISHERWOOD_CHRIS_TALK1",
"effect": { "u_add_var": "u_met_chris_isherwood", "type": "general", "context": "meeting", "value": "yes" }
},
{
- "text": "I was talking to Luke earlier, said you had some interesting ideas about the world ending.",
+ "text": "I was talking to Luke earlier, said you had some interesting ideas about the world ending. Is it tied to Barry's abduction?",
"topic": "TALK_CHRIS_THEORIES",
"condition": {
"and": [
@@ -106,7 +106,7 @@
{
"type": "talk_topic",
"id": "TALK_CHRIS_THEORIES",
- "dynamic_line": "In one of my longer trips I saw something out in a field, I didn't get close but I swear unbelievable monsters were coming out of it. It kinda shimmered, almost like it wasn't quite there. I followed the monsters for a while...",
+ "dynamic_line": "In one of my longer trips looking for Barry, I saw something out in a field. I didn't get close but I swear unbelievable monsters were coming out of it. It kinda shimmered, almost like it wasn't quite there. I've been tracking those monsters for a while...",
"responses": [
{ "text": "What did you find?", "topic": "TALK_ISHERWOOD_CHRIS_MIGO_BASE" },
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CHRIS_TOPICS" },
@@ -116,19 +116,13 @@
{
"type": "talk_topic",
"id": "TALK_ISHERWOOD_CHRIS_MIGO_BASE",
- "dynamic_line": "They made their way to this weird structure, I've never seen anything like it, it glistened in the sun like something organic...",
- "responses": [
- { "text": "If you join up with me, we can go check it out.", "topic": "TALK_SUGGEST_GO_CHRIS" },
- { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CHRIS_TOPICS" },
- { "text": "I'd better get going.", "topic": "TALK_DONE" }
- ]
- },
- {
- "type": "talk_topic",
- "id": "TALK_SUGGEST_GO_CHRIS",
- "dynamic_line": "Yeah, I'll join with you, I hope we can come back and check on my family some occasionally. Getting some information is more important now though.",
+ "dynamic_line": "They made their way to this weird spire like structure, I've never seen anything like it, it glistened in the sun like something organic. I think they could be holding Barry there, I've seen them arrive and leave with other humans.",
"responses": [
- { "text": "What is this place we are going to?", "topic": "TALK_MISSION_LIST" },
+ {
+ "text": "If you join up with me, we can go check it out, I want to see what they are doing.",
+ "topic": "TALK_MISSION_OFFER",
+ "assign_mission": "MISSION_ISHERWOOD_CHRIS_1"
+ },
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CHRIS_TOPICS" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
]
@@ -153,7 +147,10 @@
"id": "TALK_ISHERWOOD_CHRIS_TOPICS",
"dynamic_line": "Go on...",
"responses": [
- { "text": "Your dad asked me to come find you.", "topic": "TALK_ISHERWOOD_CHRIS_TALK1" },
+ {
+ "text": "Your dad asked me to come find you, said you've been looking for your Uncle.",
+ "topic": "TALK_ISHERWOOD_CHRIS_TALK1"
+ },
{
"text": "I was talking to Luke earlier, he said you had some interesting ideas about the world ending.",
"topic": "TALK_CHRIS_THEORIES"
@@ -165,24 +162,26 @@
{
"id": "MISSION_ISHERWOOD_CHRIS_1",
"type": "mission_definition",
- "name": "Find mysterious structure",
- "goal": "MGOAL_GO_TO_TYPE",
+ "name": "Free Barry from the mysterious structure",
+ "goal": "MGOAL_TALK_TO_NPC",
"difficulty": 5,
"value": 50000,
"start": {
"effect": "follow",
- "assign_mission_target": { "om_terrain": "mi-go_camp2", "om_special": "Mi-Go Encampment", "reveal_radius": 3 }
+ "assign_mission_target": { "om_terrain": "mi-go_scout_tower_3", "om_special": "Mi-Go Scout Tower", "reveal_radius": 3 },
+ "update_mapgen": { "place_npcs": [ { "class": "isherwood_barry", "x": 18, "y": 15, "target": true } ] }
},
"origins": [ "ORIGIN_SECONDARY" ],
- "destination": "mi-go_camp2",
+ "has_generic_rewards": false,
+ "destination": "mi-go_scout_tower_3",
"dialogue": {
- "describe": "We need to investigate the alien encampment.",
- "offer": "I can take you to the structure those things were building.",
+ "describe": "We need to investigate the alien encampment and try to find out what happened to Barry.",
+ "offer": "I can take you to the structure, I tracked them to it.",
"accepted": "Awesome, I want some answers!",
- "rejected": "Thanks anyway, I'll keep my eye on it.",
+ "rejected": "Thanks anyway, I'll keep my eye on it, maybe I'll find a way one day.",
"advice": "I feel like we are underprepared if they see us, I marked the location for you.",
"inquire": "You ready?",
- "success": "It's even bigger then I remember, we should explore some. I left a note for my family before we left. If we survive, the cabin should be fixed up and ready for you to move in if you want to stay.",
+ "success": "It's taller then I remember, we should look for prisoners. I left a note for my family before we left. If we survive, the cabin should be fixed up and ready for you to move in if you want to stay.",
"success_lie": "Well it was here...",
"failure": "It was a lost cause anyways..."
},
diff --git a/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json
index afffc773f8a80..d130fa040ebe5 100644
--- a/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json
+++ b/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json
@@ -188,10 +188,17 @@
"type": "talk_topic",
"id": "TALK_BARRY",
"dynamic_line": "Some of their cows were killed before we realized what was happening, Barry and Carlos went into the forest to find the predator but it was like nothing they'd ever seen. Carlos may be willing to tell you more.",
- "effect": { "u_add_var": "u_learned_about_barry", "type": "general", "context": "meeting", "value": "yes" },
"responses": [
- { "text": "I'd like to ask you something else...", "topic": "TALK_ISHERWOOD_CLAIRE_TOPICS" },
- { "text": "I'd better get going.", "topic": "TALK_DONE" }
+ {
+ "text": "I'd like to ask you something else...",
+ "topic": "TALK_ISHERWOOD_CLAIRE_TOPICS",
+ "effect": { "u_add_var": "u_learned_about_barry", "type": "general", "context": "meeting", "value": "yes" }
+ },
+ {
+ "text": "I'd better get going.",
+ "topic": "TALK_DONE",
+ "effect": { "u_add_var": "u_learned_about_barry", "type": "general", "context": "meeting", "value": "yes" }
+ }
]
},
{
@@ -261,6 +268,7 @@
"item": "raw_dandelion",
"count": 50,
"origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
"followup": "MISSION_ISHERWOOD_CLAIRE_2",
"end": {
"opinion": { "trust": 1, "value": 1 },
@@ -300,6 +308,7 @@
]
},
"origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
"dialogue": {
"describe": "I could use some seeds from the forest.",
"offer": "We could use some seeds for the next planting season. Can you bring me 20 bee balm seeds?",
@@ -320,6 +329,7 @@
"difficulty": 4,
"value": 100000,
"origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
"start": {
"assign_mission_target": { "om_terrain": "cabin_isherwood", "reveal_radius": 1, "random": true, "search_range": 20, "min_distance": 8 },
"update_mapgen": { "place_monster": [ { "monster": "mon_cat", "pack_size": [ 3, 6 ], "x": 20, "y": 22, "target": true } ] },
diff --git a/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json
index 17547df614130..ea6ef6380bd04 100644
--- a/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json
+++ b/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json
@@ -126,7 +126,7 @@
{
"type": "talk_topic",
"id": "TALK_ISHERWOOD_EDDIE2",
- "dynamic_line": "Barry and Carlos went to hunt down something that killed our livestock, they tracked it into the forest. It tore Barry apart, Carlos might be willing to tell you the story, he survived it.",
+ "dynamic_line": "Barry and Carlos went to hunt down something that killed our livestock, they tracked it into the forest. It grabbed Barry and ran off, Carlos might be willing to tell you the story, he managed to allude it.",
"responses": [
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_EDDIE_TOPICS" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
@@ -200,6 +200,7 @@
"item": "rock",
"count": 120,
"origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
"followup": "MISSION_ISHERWOOD_EDDIE_2",
"dialogue": {
"describe": "We need to build some kilns.",
@@ -247,6 +248,7 @@
"effect": [ { "u_buy_item": "butter", "count": 6 }, { "u_buy_item": "milk", "container": "jar_3l_glass_sealed", "count": 12 } ]
},
"origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
"dialogue": {
"describe": "I do have some resource gathering I could use help with.",
"offer": "Now that the forge is set up, we could use 2000 units of sand to get production going.",
@@ -278,6 +280,7 @@
]
},
"origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
"dialogue": {
"describe": "I do have some resource gathering I could use help if you have time.",
"offer": "Now that the clay kiln is set up, we could use 1000 units of clay to get production going.",
diff --git a/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json
index f415b0bd9ed21..eafa4216183c2 100644
--- a/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json
+++ b/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json
@@ -240,7 +240,7 @@
{
"type": "talk_topic",
"id": "TALK_JACK_BROTHER",
- "dynamic_line": "Eddie's dairy is at the end of the road. It's just him and his son since Barry died to that thing in the woods, we tracked it down and burned the corpse.",
+ "dynamic_line": "Eddie's dairy is at the end of the road. It's just him and his son since Barry was taken by that thing in the woods.",
"effect": { "u_add_var": "u_learned_about_eddie", "type": "general", "context": "meeting", "value": "yes" },
"responses": [
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_JACK_TOPICS" },
@@ -312,6 +312,7 @@
"item": "jar_3l_glass",
"count": 20,
"origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
"followup": "MISSION_ISHERWOOD_JACK_2",
"end": {
"opinion": { "trust": 1, "value": 1 },
@@ -348,6 +349,7 @@
]
},
"origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
"dialogue": {
"describe": "I do have some more scavenging for you.",
"offer": "We could use some seeds for the next planting season. Can you bring me 100 wheat seeds? I'll give you some fresh produce.",
diff --git a/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json
index f0cb20d1a709e..a183501dd61da 100644
--- a/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json
+++ b/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json
@@ -130,7 +130,7 @@
"topic": "TALK_JESSE_CHRIS"
},
{ "text": "What needs killing?", "topic": "TALK_MISSION_LIST" },
- { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_Jesse_TOPICS" },
+ { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_JESSE_TOPICS" },
{ "text": "I'm not interested right now, I'd better get going.", "topic": "TALK_DONE" }
]
},
@@ -193,7 +193,34 @@
"assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "search_range": 20, "min_distance": 8 },
"update_mapgen": { "place_monster": [ { "monster": "mon_wolf", "pack_size": [ 4, 8 ], "x": 3, "y": 9, "target": true } ] }
},
- "origins": [ "ORIGIN_ANY_NPC" ],
+ "origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
+ "dialogue": {
+ "describe": "We could use some help killing some wolves.",
+ "offer": "There's been some wolves that keep scaring our chickens and horses, I'd be grateful if you can kill them.",
+ "accepted": "Wonderful, let me know when it is done.",
+ "rejected": "Thanks anyway, we will try some traps.",
+ "advice": "A gun will probably help.",
+ "inquire": "Did you kill it?",
+ "success": "I appreciate it, I've got this old saddle I want you to have. I'll be happy to put a horse under it if you want to do some more heroics.",
+ "success_lie": "Show me the bodies.",
+ "failure": "It was a lost cause anyways..."
+ },
+ "end": { "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "riding_saddle", "count": 1 } ] }
+ },
+ {
+ "id": "MISSION_ISHERWOOD_JESSE_2",
+ "type": "mission_definition",
+ "name": "Kill monster",
+ "goal": "MGOAL_KILL_MONSTER",
+ "difficulty": 8,
+ "value": 80000,
+ "start": {
+ "assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "search_range": 20, "min_distance": 15 },
+ "update_mapgen": { "place_monster": [ { "monster": "mon_flying_polyp", "pack_size": [ 3, 6 ], "x": 11, "y": 11, "target": true } ] }
+ },
+ "origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
"dialogue": {
"describe": "We could use some help killing some wolves.",
"offer": "There's been some wolves that keep scaring our chickens and horses, I'd be grateful if you can kill them.",
@@ -219,6 +246,7 @@
"update_mapgen": { "place_monster": [ { "monster": "mon_flying_polyp", "pack_size": [ 3, 6 ], "x": 11, "y": 11, "target": true } ] }
},
"origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
"dialogue": {
"describe": "We could use some help killing some monsters.",
"offer": "We could use some help killing a pack of monsters. I don't know what they are, but they're very fast, I'm willing to outfit you with a horse if you succeed.",
diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json
index 81318d3526e39..ca1ea92930f74 100644
--- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json
+++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json
@@ -108,7 +108,7 @@
{
"type": "talk_topic",
"id": "TALK_LUKE_EDDIE",
- "dynamic_line": "Things have been tough for my dad since the hunting incident. He works till he falls asleep most nights..",
+ "dynamic_line": "Things have been tough for my dad since Barry was captured. He works till he falls asleep most nights..",
"condition": {
"and": [
{ "not": { "u_is_wearing": "badge_marshal" } },
@@ -184,7 +184,7 @@
{
"id": "MISSION_ISHERWOOD_LUKE_2",
"type": "mission_definition",
- "name": "Find a cooy of DIY Compendium",
+ "name": "Find a copy of DIY Compendium",
"goal": "MGOAL_FIND_ITEM",
"difficulty": 3,
"value": 20000,
diff --git a/data/json/npcs/missiondef.json b/data/json/npcs/missiondef.json
index ccd30f67a9885..299b6133f5435 100644
--- a/data/json/npcs/missiondef.json
+++ b/data/json/npcs/missiondef.json
@@ -698,7 +698,7 @@
"difficulty": 2,
"value": 800,
"item": "family_photo",
- "origins": [ "ORIGIN_ANY_NPC" ],
+ "origins": [ "ORIGIN_SECONDARY" ],
"dialogue": {
"describe": "I need you to get my family photo from the armory safe.",
"offer": "I left the only photo I have from my family in the armory. I don't have the code, can you get in?",
@@ -787,6 +787,7 @@
},
"difficulty": 1,
"value": 0,
+ "has_generic_rewards": false,
"origins": [ "ORIGIN_OPENER_NPC", "ORIGIN_ANY_NPC" ],
"start": {
"effect": [ { "u_buy_item": "duffelbag" } ],
diff --git a/data/json/npcs/npc.json b/data/json/npcs/npc.json
index 219d3dc195796..8be2d3fd8fec7 100644
--- a/data/json/npcs/npc.json
+++ b/data/json/npcs/npc.json
@@ -53,7 +53,7 @@
"attitude": 8,
"mission": 0,
"chat": "TALK_DONE",
- "faction": "wasteland_scavengers"
+ "faction": "no_faction"
},
{
"type": "npc",
@@ -64,7 +64,7 @@
"attitude": 0,
"mission": 7,
"chat": "TALK_NC_SURVIVOR_CHEF",
- "faction": "wasteland_scavengers"
+ "faction": "no_faction"
},
{
"type": "npc",
@@ -76,7 +76,7 @@
"mission": 7,
"chat": "TALK_TRUE_FOODPERSON",
"mission_offered": "MISSION_PROVE_YOUR_WORTH",
- "faction": "wasteland_scavengers"
+ "faction": "no_faction"
},
{
"type": "npc",
@@ -87,7 +87,7 @@
"attitude": 1,
"mission": 0,
"chat": "TALK_CYBORG_1",
- "faction": "wasteland_scavengers"
+ "faction": "no_faction"
},
{
"type": "npc",
@@ -99,7 +99,7 @@
"mission": 7,
"mission_offered": "MISSION_GET_CITY_COP_MOMENTO",
"chat": "TALK_CITY_COP",
- "faction": "wasteland_scavengers"
+ "faction": "no_faction"
},
{
"type": "npc",
@@ -109,6 +109,7 @@
"attitude": 1,
"mission": 3,
"mission_offered": "MISSION_JOIN_TRACKER",
- "chat": "TALK_STRANGER_FRIENDLY"
+ "chat": "TALK_STRANGER_FRIENDLY",
+ "faction": "no_faction"
}
]
diff --git a/data/json/npc_behavior.json b/data/json/npcs/npc_behavior.json
similarity index 100%
rename from data/json/npc_behavior.json
rename to data/json/npcs/npc_behavior.json
diff --git a/data/json/npcs/prisoners/mi-go_prisoners.json b/data/json/npcs/prisoners/mi-go_prisoners.json
index 1f10124f9b9f8..0009c8f07ea95 100644
--- a/data/json/npcs/prisoners/mi-go_prisoners.json
+++ b/data/json/npcs/prisoners/mi-go_prisoners.json
@@ -8,12 +8,13 @@
"attitude": 0,
"mission": 7,
"chat": "TALK_MI-GO_PRISONER1",
- "faction": "wasteland_scavengers"
+ "faction": "no_faction"
},
{
"type": "npc_class",
"id": "NC_PRISONER",
"name": "Prisoner",
+ "common": false,
"job_description": "I'm just trying to survive.",
"traits": [ { "group": "BG_survival_story_EVACUEE" }, { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
"skills": [ { "skill": "ALL", "level": { "sum": [ { "dice": [ 3, 3 ] }, { "constant": -5 } ] } } ],
diff --git a/data/json/npcs/refugee_center/beggars/BEGGAR_1_Reena_Sandhu.json b/data/json/npcs/refugee_center/beggars/BEGGAR_1_Reena_Sandhu.json
index 73661b31ca868..1dab7ecbb330b 100644
--- a/data/json/npcs/refugee_center/beggars/BEGGAR_1_Reena_Sandhu.json
+++ b/data/json/npcs/refugee_center/beggars/BEGGAR_1_Reena_Sandhu.json
@@ -136,16 +136,8 @@
"id": "TALK_REFUGEE_BEGGAR_1_GIVE_FOOD",
"dynamic_line": "Thank you so much.",
"responses": [
- {
- "text": "Can I ask you something else first?",
- "topic": "TALK_NONE",
- "opinion": { "trust": [ -1, 0 ], "value": [ -1, 0 ] }
- },
- {
- "text": "I'm sorry, I was wrong. I can't help you.",
- "topic": "TALK_DONE",
- "opinion": { "trust": [ -1, 0 ], "value": [ -1, 0 ] }
- }
+ { "text": "Can I ask you something else first?", "topic": "TALK_NONE" },
+ { "text": "I'm sorry, I was wrong. I can't help you.", "topic": "TALK_DONE" }
],
"repeat_responses": [
{
@@ -153,7 +145,7 @@
"response": {
"text": "Here, you can have this .",
"topic": "TALK_REFUGEE_BEGGAR_1_GAVE_FOOD",
- "opinion": { "trust": [ 0, 2 ], "value": [ 0, 2 ], "fear": [ -1, 0 ], "anger": [ -1, 0 ], "owed": 1 }
+ "opinion": { "trust": 1, "value": 1, "fear": -1, "anger": -1, "owed": 1 }
}
}
]
diff --git a/data/json/npcs/refugee_center/beggars/BEGGAR_3_Luo_Meizhen.json b/data/json/npcs/refugee_center/beggars/BEGGAR_3_Luo_Meizhen.json
index 5846fb07aaccf..c31c0a42d5ba3 100644
--- a/data/json/npcs/refugee_center/beggars/BEGGAR_3_Luo_Meizhen.json
+++ b/data/json/npcs/refugee_center/beggars/BEGGAR_3_Luo_Meizhen.json
@@ -162,16 +162,8 @@
"id": "TALK_REFUGEE_BEGGAR_3_GIVE_FOOD",
"dynamic_line": "Actually yeah, I'm always hungry these days. I don't like taking handouts, but I wouldn't say no.",
"responses": [
- {
- "text": "Actually can I ask you something else?",
- "topic": "TALK_NONE",
- "opinion": { "trust": [ -1, 0 ], "value": [ -1, 0 ] }
- },
- {
- "text": "I'm sorry, I was wrong. I can't help you.",
- "topic": "TALK_DONE",
- "opinion": { "trust": [ -1, 0 ], "value": [ -1, 0 ] }
- }
+ { "text": "Actually can I ask you something else?", "topic": "TALK_NONE" },
+ { "text": "I'm sorry, I was wrong. I can't help you.", "topic": "TALK_DONE" }
],
"repeat_responses": [
{
@@ -179,7 +171,7 @@
"response": {
"text": "Here, you can have this .",
"topic": "TALK_REFUGEE_BEGGAR_3_GAVE_FOOD",
- "opinion": { "trust": [ 0, 1 ], "value": [ 0, 2 ], "fear": [ -1, 0 ], "anger": [ -1, 0 ], "owed": 1 }
+ "opinion": { "trust": 1, "value": 1, "fear": -1, "anger": -1, "owed": 1 }
}
}
]
diff --git a/data/json/npcs/refugee_center/beggars/BEGGAR_4_Brandon_Garder.json b/data/json/npcs/refugee_center/beggars/BEGGAR_4_Brandon_Garder.json
index 2a2d9c4013052..81e40213b77bc 100644
--- a/data/json/npcs/refugee_center/beggars/BEGGAR_4_Brandon_Garder.json
+++ b/data/json/npcs/refugee_center/beggars/BEGGAR_4_Brandon_Garder.json
@@ -131,7 +131,7 @@
"response": {
"text": "Here, you can have this .",
"topic": "TALK_REFUGEE_BEGGAR_4_GAVE_FOOD",
- "opinion": { "trust": [ 0, 1 ], "value": [ 0, 2 ], "fear": [ -1, 0 ], "anger": [ -1, 0 ], "owed": 2 }
+ "opinion": { "trust": 1, "value": 1, "fear": -1, "anger": -1, "owed": 2 }
}
}
]
diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json
index 9e208a04cbe61..5e5374585e1d9 100644
--- a/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json
+++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json
@@ -184,6 +184,12 @@
{ "text": "I'll leave you to it then.", "topic": "TALK_DONE" }
]
},
+ {
+ "type": "talk_topic",
+ "id": "TALK_REFUGEE_Alonso_CalledOut3",
+ "dynamic_line": "Fine. As a favor to you, I'll be a guy from Brooklyn.",
+ "responses": [ { "text": "Thanks. I'd better get going.", "topic": "TALK_DONE" } ]
+ },
{
"type": "talk_topic",
"id": "TALK_REFUGEE_Alonso_Background",
diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Mandeep_Singh.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Mandeep_Singh.json
index 072cfb78572e0..9a627e5bd66fc 100644
--- a/data/json/npcs/refugee_center/surface_refugees/NPC_Mandeep_Singh.json
+++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Mandeep_Singh.json
@@ -114,7 +114,7 @@
"id": "TALK_REFUGEE_Mandeep_1_firstmeet",
"dynamic_line": "It is nice to meet you as well. Can I help you with something?",
"responses": [
- { "text": "I just had some questions.", "topic": "TALK_REFUGEE_Mandeep_2_stub" },
+ { "text": "I just had some questions.", "topic": "TALK_REFUGEE_Mandeep_2" },
{ "text": "Actually I'm just heading out.", "topic": "TALK_DONE" }
]
},
diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json
index ff4fa0e4abf44..1d84a93b2f264 100644
--- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json
+++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json
@@ -125,7 +125,7 @@
[ "sunglasses", 15 ],
[ "glasses_safety", 15 ],
[ "goggles_ski", 5 ],
- [ "chestrig", 20 ],
+ [ "tacvest", 20 ],
[ "legrig", 15 ],
[ "tool_belt", 15 ],
[ "fanny", 5 ],
@@ -424,7 +424,12 @@
"effect": [
{ "u_buy_item": "FMCNote", "count": 25 },
{ "u_add_var": "FMShopkeep_Mission1", "type": "mission", "context": "flag", "value": "yes" }
- ]
+ ],
+ "update_mapgen": {
+ "om_terrain": "evac_center_9",
+ "om_special": "evac_center",
+ "set": [ { "square": "terrain", "id": "t_floor", "x": 0, "y": 23, "x2": 1, "y2": 23 } ]
+ }
},
"origins": [ "ORIGIN_SECONDARY" ],
"followup": "MISSION_FREE_MERCHANTS_EVAC_2",
@@ -549,7 +554,15 @@
"effect": [
{ "u_buy_item": "FMCNote", "count": 50 },
{ "u_add_var": "FMShopkeep_Mission3", "type": "mission", "context": "flag", "value": "yes" }
- ]
+ ],
+ "update_mapgen": {
+ "om_terrain": "evac_center_8",
+ "om_special": "evac_center",
+ "set": [
+ { "point": "terrain", "id": "t_gates_mech_control_lab", "x": 17, "y": 1 },
+ { "point": "terrain", "id": "t_gates_mech_control_lab", "x": 17, "y": 3 }
+ ]
+ }
},
"origins": [ "ORIGIN_SECONDARY" ],
"followup": "MISSION_FREE_MERCHANTS_EVAC_4",
@@ -560,7 +573,7 @@
"rejected": "Come back when you get a chance, we really need to start reclaiming the region.",
"advice": "Just follow your map.",
"inquire": "Do you have the prospectus?",
- "success": "With this we'll be able to convince others to invest in the commune. Thank you, here's your money.",
+ "success": "With this we'll be able to convince others to invest in the commune. Thank you, here's your money. We also managed to get a manual crank hooked up to the garage in the back, so feel free to make use of that - you've been a great help to us.",
"success_lie": "What good does this do us?",
"failure": "It was a lost cause anyways..."
}
diff --git a/data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json b/data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json
index 7ea0a69fbb363..a56a7ee4d40a3 100644
--- a/data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json
+++ b/data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json
@@ -9,7 +9,7 @@
{ "item": "robofac_enviro_suit" },
{ "item": "mask_gas" },
{ "collection": [ { "group": "guns_pistol_milspec" }, { "item": "holster" } ], "prob": 50 },
- { "item": "chestrig" }
+ { "item": "tacvest" }
]
}
]
diff --git a/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json b/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json
index 5895e05190356..f1a0f211bc322 100644
--- a/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json
+++ b/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json
@@ -90,6 +90,7 @@
]
},
"origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
"followup": "MISSION_ROBOFAC_INTERCOM_2",
"dialogue": {
"describe": "No, I said ... [*You hear a short, muffled conversation from across the intercom*]/nWell, it seems we do have a use for you. It's dangerous and you are likely to die, but if you complete it we will allow you limited access to our resources.",
@@ -123,11 +124,17 @@
"om_terrain": "robofachq_surface_b0",
"om_special": "hub_01",
"place_nested": [ { "chunks": [ "robofac_hq_surface_freemerchant_camp" ], "x": 4, "y": 0 } ]
+ },
+ {
+ "om_terrain": "robofachq_surface_entrance",
+ "om_special": "hub_01",
+ "place_nested": [ { "chunks": [ "robofac_hq_surface_merc_1" ], "x": 3, "y": 10 } ]
}
],
"effect": [ { "u_buy_item": "RobofacCoin", "count": 2 } ]
},
"origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
"followup": "MISSION_ROBOFAC_INTERCOM_3",
"dialogue": {
"describe": "...",
@@ -163,6 +170,7 @@
},
"end": { "effect": [ { "u_buy_item": "RobofacCoin", "count": 4 } ] },
"origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
"dialogue": {
"describe": "...",
"offer": "Our facility once sourced advanced photonic circuitry from a nearby robotics manufacturer. Their building suffered major damage during the portal storms, and collapsed almost entirely. However, preliminary scouting reveals that the basement prototyping lab likely remains intact.\n\nthe intercom: We ask you to investigate the ruins, and if possible, retrieve a template for the fabrication of said photonic circuitry.",
@@ -302,7 +310,7 @@
"dynamic_line": "Given the current context, we are willing to sell you a set of our protective gear: gas mask, suit and gear, at a considerable discount. We will sell it for two of our coins.\n\nthe intercom: Hmm wait, we might not have your size...",
"responses": [
{
- "text": "[ 2 Hub 01 Gold Coins ] Deal!",
+ "text": "[ 2 HGC ] Deal!",
"condition": { "u_has_item": "RobofacCoin" },
"effect": [
{ "u_sell_item": "RobofacCoin", "count": 2 },
diff --git a/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json b/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json
new file mode 100644
index 0000000000000..ce9dfa840a4b7
--- /dev/null
+++ b/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json
@@ -0,0 +1,224 @@
+[
+ {
+ "type": "npc",
+ "id": "robofac_merc_1",
+ "//": "Appears in the the surface of Hub 01, an external mercenary.",
+ "name_suffix": "Hub Mercenary",
+ "class": "NC_ROBOFAC_MERC_1",
+ "attitude": 0,
+ "mission": 7,
+ "chat": "TALK_ROBOFAC_MERC_1",
+ "faction": "robofac_auxiliaries"
+ },
+ {
+ "type": "npc_class",
+ "id": "NC_ROBOFAC_MERC_1",
+ "name": "Hub Mercenary",
+ "job_description": "Fighting for the all-mighty dollar.",
+ "common": false,
+ "traits": [ { "trait": "TOUGH" }, { "trait": "QUICK" }, { "group": "Appearance_demographics" } ],
+ "bonus_str": { "rng": [ 1, 3 ] },
+ "bonus_dex": { "rng": [ -1, 2 ] },
+ "bonus_int": { "rng": [ -1, 1 ] },
+ "bonus_per": { "rng": [ 0, 1 ] },
+ "worn_override": "NC_ROBOFAC_MERC_1_worn",
+ "carry_override": "NC_ROBOFAC_MERC_1_carry",
+ "weapon_override": "NC_ROBOFAC_MERC_1_wield",
+ "skills": [
+ { "skill": "ALL", "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "rng": [ 0, -4 ] } ] } ] } },
+ { "skill": "gun", "bonus": { "rng": [ 2, 5 ] } },
+ { "skill": "melee", "bonus": { "rng": [ 2, 5 ] } },
+ { "skill": "cutting", "bonus": { "rng": [ 2, 5 ] } },
+ { "skill": "rifle", "bonus": { "rng": [ 3, 6 ] } }
+ ]
+ },
+ {
+ "type": "item_group",
+ "id": "NC_ROBOFAC_MERC_1_worn",
+ "subtype": "collection",
+ "items": [
+ { "item": "modularvestkevlar", "contents-group": "army_mags_m4" },
+ { "item": "chestrig", "contents-group": "army_mags_m4" },
+ { "item": "under_armor" },
+ { "item": "under_armor_shorts" },
+ { "item": "robofac_enviro_suit" },
+ { "item": "slingpack" },
+ { "item": "armguard_hard" },
+ { "item": "legguard_hard" },
+ { "item": "knife_combat", "container-item": "bootsheath" }
+ ]
+ },
+ {
+ "type": "item_group",
+ "id": "NC_ROBOFAC_MERC_1_carry",
+ "subtype": "collection",
+ "items": [
+ { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
+ { "item": "stanag30", "ammo-item": "556", "charges": 30 },
+ { "item": "EMPbomb" },
+ { "item": "bot_grenade_hack", "count": 2 }
+ ]
+ },
+ {
+ "type": "item_group",
+ "id": "NC_ROBOFAC_MERC_1_wield",
+ "subtype": "collection",
+ "items": [
+ { "item": "acr", "ammo-item": "556", "charges": 30, "contents-item": [ "shoulder_strap", "holo_sight", "suppressor" ] }
+ ]
+ },
+ {
+ "id": "TALK_ROBOFAC_MERC_1",
+ "type": "talk_topic",
+ "dynamic_line": [ "Something to say?", "I charge hourly, so be quick...", "Hey.", "...", "Yes?", "What's up?", "Good to see you." ],
+ "responses": [
+ {
+ "text": "Who are you?",
+ "condition": { "not": { "u_has_var": "robofac_merc_1_stay", "type": "dialogue", "context": "robofac_merc_1", "value": "yes" } },
+ "topic": "TALK_ROBOFAC_MERC_1_WHO"
+ },
+ {
+ "text": "Good to see you around.",
+ "condition": { "u_has_var": "robofac_merc_1_stay", "type": "dialogue", "context": "robofac_merc_1", "value": "yes" },
+ "topic": "TALK_ROBOFAC_MERC_1_MAIN"
+ },
+ {
+ "text": "Want help with something else?",
+ "condition": { "u_has_var": "gold_mission_complete", "type": "general", "context": "robofac_merc_1", "value": "yes" },
+ "topic": "TALK_MISSION_LIST"
+ },
+ { "text": "Never mind, I was about to leave.", "topic": "TALK_DONE" }
+ ]
+ },
+ {
+ "id": "TALK_ROBOFAC_MERC_1_WHO",
+ "type": "talk_topic",
+ "dynamic_line": "Same as you. Some nobody doing dirty work for scraps, I mean, no offense.",
+ "responses": [
+ { "text": "I guess that makes two of us.", "topic": "TALK_ROBOFAC_MERC_1_TWO_OF_US" },
+ { "text": "Well, never mind.", "topic": "TALK_DONE" }
+ ]
+ },
+ {
+ "id": "TALK_ROBOFAC_MERC_1_TWO_OF_US",
+ "type": "talk_topic",
+ "dynamic_line": "Good. I could do with some company between jobs. Feel free to stay around, if you want.",
+ "speaker_effect": {
+ "effect": { "u_add_var": "robofac_merc_1_stay", "type": "dialogue", "context": "robofac_merc_1", "value": "yes" },
+ "sentinel": "robofac_merc_1_stay"
+ },
+ "responses": [
+ { "text": "Alright.", "topic": "TALK_ROBOFAC_MERC_1_MAIN" },
+ { "text": "Guess I could stay for a while", "topic": "TALK_ROBOFAC_MERC_1_MAIN" },
+ { "text": "Actually, I have some places to be right now.", "topic": "TALK_DONE" }
+ ]
+ },
+ {
+ "id": "TALK_ROBOFAC_MERC_1_MAIN",
+ "type": "talk_topic",
+ "dynamic_line": [
+ "Rough out there isn't it?",
+ "Well?",
+ "Good to have some company, I guess.",
+ "Have something to say?",
+ "...",
+ "Didn't you want something?",
+ "..."
+ ],
+ "responses": [
+ { "text": "Anything interesting going on?", "topic": "TALK_ROBOFAC_MERC_1_GOING_ON" },
+ {
+ "text": "Anything on your mind?",
+ "condition": {
+ "and": [
+ { "not": { "u_has_var": "gold_mission_complete", "type": "general", "context": "robofac_merc_1", "value": "yes" } },
+ { "not": { "u_has_mission": "MISSION_ROBOFAC_MERC_1_GOLD" } }
+ ]
+ },
+ "topic": "TALK_ROBOFAC_MERC_1_COINS"
+ },
+ {
+ "text": "Anything on your mind?",
+ "condition": { "u_has_var": "gold_mission_complete", "type": "general", "context": "robofac_merc_1", "value": "yes" },
+ "topic": "TALK_ROBOFAC_MERC_1_RANDOM_THOUGHTS"
+ },
+ { "text": "What do you know about our employers?", "topic": "TALK_ROBOFAC_MERC_1_ASK_HUB" },
+ { "text": "Well, I should get going.", "topic": "TALK_DONE" }
+ ]
+ },
+ {
+ "id": "TALK_ROBOFAC_MERC_1_ASK_HUB",
+ "type": "talk_topic",
+ "dynamic_line": "Not much really. They made me track and destroy some government documents a while back, of course I gave them a read first but there wasn't much.\n\n As far as I know, this place held some experimental computer network before everything went to shit. What's going on now is anybody's guess.",
+ "responses": [ { "text": "Well, I was hoping for more.", "topic": "TALK_ROBOFAC_MERC_1_MAIN" } ]
+ },
+ {
+ "id": "TALK_ROBOFAC_MERC_1_GOING_ON",
+ "type": "talk_topic",
+ "dynamic_line": [ "Just came back from a job. Trying to rest for a short while." ],
+ "responses": [ { "text": "...", "topic": "TALK_ROBOFAC_MERC_1_MAIN" } ]
+ },
+ {
+ "id": "TALK_ROBOFAC_MERC_1_COINS",
+ "type": "talk_topic",
+ "dynamic_line": "Have you noticed they pay us in tiny little gold coins, it's bizarre I say. One would think they have a gold mine in there, but no, they don't, so they make me cross the damned world grabbing gold bars. ",
+ "responses": [
+ { "text": "I guess I could help with that...", "topic": "TALK_ROBOFAC_MERC_1_GOLD_MISSION" },
+ { "text": "Now that you mention it, it does seem rather strange.", "topic": "TALK_ROBOFAC_MERC_1_MAIN" }
+ ]
+ },
+ {
+ "id": "TALK_ROBOFAC_MERC_1_RANDOM_THOUGHTS",
+ "type": "talk_topic",
+ "dynamic_line": [
+ "Thinking I should go hunt something soon...",
+ "Wondering if things will get better someday...",
+ "Hmm? Nothing, I guess I just like resting in this place.",
+ "Have you ever noticed how... wait no, never mind.",
+ "I heard some strange dimensional resonance caused all this, do you think it has happened to other places?",
+ "You noticed this place has working WI-FI? Well not the rest of the net works anyways."
+ ],
+ "responses": [ { "text": "...", "topic": "TALK_ROBOFAC_MERC_1_MAIN" } ]
+ },
+ {
+ "id": "TALK_ROBOFAC_MERC_1_GOLD_MISSION",
+ "type": "talk_topic",
+ "dynamic_line": "I can offer you the whole of my payment for every bar or equivalent you bring. But keep silent about this, it's supposed to be my job.",
+ "responses": [
+ { "text": "We have a deal then.", "effect": { "add_mission": "MISSION_ROBOFAC_MERC_1_GOLD" }, "topic": "TALK_DONE" },
+ { "text": "Actually, I don't think I have time for that, sorry.", "topic": "TALK_ROBOFAC_MERC_1_MAIN" }
+ ]
+ },
+ {
+ "id": "MISSION_ROBOFAC_MERC_1_GOLD",
+ "type": "mission_definition",
+ "name": "Retrieve chunks of gold",
+ "description": "Find 200 units of gold.",
+ "goal": "MGOAL_FIND_ITEM",
+ "difficulty": 5,
+ "followup": "MISSION_ROBOFAC_MERC_1_GOLD",
+ "value": 50000,
+ "item": "gold_small",
+ "count": 200,
+ "origins": [ "ORIGIN_SECONDARY" ],
+ "has_generic_rewards": false,
+ "dialogue": {
+ "describe": "I could do with some help...",
+ "offer": "I'm still supposed to scavenge for gold, I can offer you the same deal as last time.",
+ "accepted": "Wonderful.",
+ "rejected": "Well I'll look for the gold myself.",
+ "advice": "Try searching banks and security vans.",
+ "inquire": "You got that gold yet?",
+ "success": "I appreciate it, here's your pay.",
+ "success_lie": "Yeah, sure.",
+ "failure": "Well I'll have to scavenge the gold myself, thanks for nothing."
+ },
+ "end": {
+ "opinion": { "trust": 1, "value": 1 },
+ "effect": [
+ { "u_buy_item": "RobofacCoin", "count": 8 },
+ { "u_add_var": "gold_mission_complete", "type": "general", "context": "robofac_merc_1", "value": "yes" }
+ ]
+ }
+ }
+]
diff --git a/data/json/npcs/robofac/NPC_Ulysses_Rourke.json b/data/json/npcs/robofac/NPC_Ulysses_Rourke.json
index d5a1e6632fb3c..4025aaba8923a 100644
--- a/data/json/npcs/robofac/NPC_Ulysses_Rourke.json
+++ b/data/json/npcs/robofac/NPC_Ulysses_Rourke.json
@@ -62,7 +62,7 @@
{ "item": "rm13_armor" },
{ "item": "goggles_nv" },
{ "item": "holster", "prob": 50 },
- { "item": "chestrig" }
+ { "item": "tacvest" }
]
},
{
@@ -71,11 +71,12 @@
"subtype": "collection",
"entries": [
{ "item": "EMPbomb" },
- { "item": "needlegun" },
+ { "item": "needlegun", "charges": 100, "ammo-item": "5x50heavy" },
{ "item": "goggles_nv" },
{ "item": "flashbang", "count": 2 },
{ "item": "plut_cell", "count": 5 },
- { "item": "5x50heavy", "count": 10 }
+ { "item": "5x50_100_mag", "count": 2, "charges": 100, "ammo-item": "5x50heavy" },
+ { "item": "5x50heavy", "count": 8 }
]
}
]
diff --git a/data/json/npcs/robofac/NPC_robofac_generic_security.json b/data/json/npcs/robofac/NPC_robofac_generic_security.json
index ea2eccde9383d..399d9c21176c3 100644
--- a/data/json/npcs/robofac/NPC_robofac_generic_security.json
+++ b/data/json/npcs/robofac/NPC_robofac_generic_security.json
@@ -43,7 +43,7 @@
{ "item": "glasses_bal", "prob": 33 },
{ "item": "boots_combat" },
{ "item": "holster", "prob": 50 },
- { "item": "chestrig" }
+ { "item": "tacvest" }
]
},
{
@@ -55,7 +55,8 @@
{ "item": "grenade", "prob": 2 },
{ "item": "PR24-extended" },
{ "item": "flashlight" },
- { "item": "l_mp_9mm" },
+ { "item": "l_mp_9mm", "charges": 21, "ammo-item": "9mmP" },
+ { "item": "lw21mag", "charges": 21, "ammo-item": "9mmP" },
{ "item": "9mmP", "count": 6 }
]
},
diff --git a/data/json/npcs/talk_tags.json b/data/json/npcs/talk_tags.json
index ecb8ac3326ab3..2679d6b05eb9c 100644
--- a/data/json/npcs/talk_tags.json
+++ b/data/json/npcs/talk_tags.json
@@ -2,54 +2,65 @@
{
"type": "snippet",
"category": "",
+ "//": "Hallucinatory NPCs say these things to discourage the avatar from taking thorazine and ending the hallucination.",
"text": [
"I hate thorazine!",
"Arg thorazine, don't touch it!",
"Thorazine is bad for you, you know.",
"Thorazine is poison.",
"You don't need thorazine, it's limiting you.",
- "Thorazine... That's what 'they' use to keep you tame."
+ "Thorazine... That's what 'they' use to keep you tame.",
+ "Don't. This thorazine seriously clouds your mind. You need to stay sharp."
]
},
{
"type": "snippet",
"category": "",
+ "//": "Hallucinatry NPCs say these things to encourage the avatar to extend the hallucination",
"text": [
"Pink tablets! I love those!",
"Hey there's some pink tablets, take some!",
"Look, some LSD, let's play cataclysm: fun times ahead!",
"Say yes to LSD, say yes to Fun!",
"Perfect, those pink tablets will keep us going, take some!",
- "You know what would make all this more bearable? Pink Tablets!"
+ "You know what would make all this more bearable? Pink Tablets!",
+ "An odd pink tablet from the ground? I don't see why not!",
+ "Finally, something to take the edge off."
]
},
{
"type": "snippet",
"category": "",
+ "//": "Hallucinations can't trade, obviously.",
"text": [
"No thanks, I'm good.",
"I don't want to trade with you.",
"I have the best stuff. And I'm keeping it!",
"No trading, that's my rule.",
"I'm not interested.",
- "How about no?"
+ "How about no?",
+ "I'm sorry . I'm afraid I can't do that.",
+ "Wish I could, ."
]
},
{
"type": "snippet",
"category": "",
+ "//": "Hallucinations can't build basecamps.",
"text": [
"No thanks, I really don't feel like it.",
"Well, I would, but I don't want to right now.",
"I have better things to do.",
"I'll pass, it's too much work.",
"Who put you in charge of what I do?",
- "Great idea! Call me when you find SOMEONE ELSE to do it."
+ "Great idea! Call me when you find SOMEONE ELSE to do it.",
+ "Not exactly the settlin' type."
]
},
{
"type": "snippet",
"category": "",
+ "//": "generic negative/hostile pronouns",
"text": [
" ",
"asshat",
@@ -98,12 +109,18 @@
"fuckwad",
"jerk",
"motherfucker",
- "shithead"
+ "shithead",
+ "fuck-trumpet",
+ "pillock",
+ "bellend",
+ "-looking ",
+ "oxygen-wasting "
]
},
{
"type": "snippet",
"category": "",
+ "//": "NPC complaint when thirsty",
"text": [
" if I won't get some water soon.",
"Can you get me some water, ?",
@@ -120,21 +137,26 @@
"I need to get some water.",
" if I don't drink something.",
"Water... Is there an oasis nearby?",
- "Did you know that lack of water kills faster than lack of rest?"
+ "Did you know that lack of water kills faster than lack of rest?",
+ "I'd kill for a sip of water right now."
]
},
{
"type": "snippet",
"category": "",
+ "//": "Used when chit-chatting while the avatar has a beer",
"text": [
"Yeah sure, can't help but notice you got beer with you! Let's crack a cold one and chat, , how goes it?",
"Oh definitely, how about one of those beers I see on you? What's up anyway?",
- "Yeah you share those beers I see you hoarding and then we chat all you like! Only joking, what's up ?"
+ "Yeah you share those beers I see you hoarding and then we chat all you like! Only joking, what's up ?",
+ "Hey , I bet a chat would be all the sweeter with a nice, cold beer in hand. How's it going?",
+ "While we chat, what say you we open a beer and just... pretend the world isn't ending, just for a while?"
]
},
{
"type": "snippet",
"category": "",
+ "//": "General chit chat messages",
"text": [
"Hey, sure thing, , I need a break anyway, how are you?",
"Yeah OK, , how's it going?",
@@ -146,12 +168,16 @@
"Alright, you got something to get off your chest?",
"Always ready for a good chat! But why, you OK?",
"OK , we should get to know each other, how are you coping?",
- "Definitely, I'm game. How you holding up?"
+ "Definitely, I'm game. How you holding up?",
+ "Good idea . Let's forget the world for a while. How you doin'?",
+ "Ah, what the heck. How's life been treating you?",
+ "Sure. So, how about that weather ey?"
]
},
{
"type": "snippet",
"category": "",
+ "//": "Swears and curses used to emphasize unpleasant events",
"text": [
"darn",
"fuck",
@@ -166,17 +192,36 @@
" ",
" ",
"son of an ass",
- "Oh sugar!"
+ "Oh sugar!",
+ "bloody hell",
+ "fuck's sake",
+ "bollocks",
+ "goodness"
]
},
{
"type": "snippet",
"category": "",
- "text": [ "sad", "bummed", "depressed", "pissed", "unhappy", " ", "dejected", "down", "glum" ]
+ "//": "Generic terms for being sad.",
+ "text": [
+ "sad",
+ "bummed",
+ "depressed",
+ "unhappy",
+ " ",
+ "dejected",
+ "down",
+ "glum",
+ "blue",
+ "dismal",
+ "sorrowful",
+ "despondent"
+ ]
},
{
"type": "snippet",
"category": "",
+ "//": "Friendly or neutral greetings.",
"text": [
"Hey .",
"Greetings .",
@@ -187,12 +232,16 @@
"What's up, ?",
"You okay, ?",
"Hello, .",
- "Hi "
+ "Hi ",
+ "Well met!",
+ "Howdy.",
+ "."
]
},
{
"type": "snippet",
"category": "",
+ "//": "Generally emphatic negative responses to a request or command",
"text": [
"never",
"no",
@@ -209,24 +258,31 @@
"no way in hell",
"nuh uh",
"nope",
- "fat chance"
+ "fat chance",
+ "bananope",
+ "when hell freezes over"
]
},
{
"type": "snippet",
"category": "",
+ "//": "The NPC says these things when leaving the avatar's faction, generally because the NPC no longer likes the avatar.",
"text": [
"Goodbye, !",
"I'm leaving.",
"So long, !",
"Hasta luego, !",
"I'm outta here!",
- "Bye bye, !"
+ "Bye bye, !",
+ "See you later, alligator.",
+ "Our paths must part, for now at least.",
+ "There's something I gotta do on my own. Sorry."
]
},
{
"type": "snippet",
"category": "",
+ "//": "The NPC is announcing a target, and all the phrases are followed by an NPC or monsters' name.",
"text": [
"consider yourself dead",
"I'll destroy you",
@@ -242,12 +298,21 @@
"you're a dead man",
"you'll taste my ",
"you're dead",
- ", "
+ ", ",
+ "only one of us is leaving here alive,",
+ "prepare thyself for punishment,",
+ "make peace with your gods,",
+ "if you worship any gods, now is a good time to start praying",
+ "your life is now forfeit,",
+ "when I'm through with you, there won't be enough left to identify",
+ "I'm gonna beat you so bad, even the people who look like you will hurt",
+ "come closer, I can't beat the shit out of you from a distance"
]
},
{
"type": "snippet",
"category": "",
+ "//": "A snippet use in the context of another complaint, like \"I'll die without your help\"",
"text": [
"I'm not gonna last much longer",
"I'll be dead soon",
@@ -259,12 +324,17 @@
"I'm done for",
"I won't last much longer",
"my days are numbered",
- ", I'm sorry"
+ ", I'm sorry",
+ "didn't think it would end like this.",
+ "so, this is how it ends, huh?",
+ "I don't wanna go",
+ "bury me somewhere nice, if I don't make it"
]
},
{
"type": "snippet",
"category": "",
+ "//": "The NPC says these things when the player has moved out of sight and the NPCs wants to catch up.",
"text": [
"Can you wait?",
"Hey, where are you?",
@@ -277,12 +347,14 @@
", where are you?",
"Hey Wait for me!",
"Where are you?!",
- "Hey, I'm over here!"
+ "Hey, I'm over here!",
+ "Hold up a second, will ya?"
]
},
{
"type": "snippet",
"category": "",
+ "//": "These would be used if we had a way to ask NPCs what there faction was, and the NPC didn't have one.",
"text": [
"I'm unaffiliated.",
"I don't run with a crew.",
@@ -293,36 +365,37 @@
"I'm a free agent, more money that way.",
"I prefer to work uninhibited by that kind of connection.",
"I haven't found one that's good enough for me.",
- "I don't belong to a faction, ."
+ "I don't belong to a faction, .",
+ "I'm currently not under any contract. Why, you hiring?"
]
},
{
"type": "snippet",
"category": "",
+ "//": "Friendly name pro-nouns and references",
"text": [
"amigo",
"comrade",
- "fellow",
+ "my good fellow",
"lad",
"mate",
- "nomad",
+ "my fellow nomad",
"partner",
- "stranger",
- "survivor",
+ "fellow survivor",
"friend",
- "pilgrim",
- "traveler",
+ "fellow traveler",
"pal",
"fella",
- "you",
- "dude",
+ "my dude",
"buddy",
- "man"
+ "chum",
+ "bruv"
]
},
{
"type": "snippet",
"category": "",
+ "//": "Said when the NPC is leading and the player has lagged by more than 12 tiles for more than 10 turns.",
"text": [
"Catch up!",
"Get over here!",
@@ -348,6 +421,7 @@
{
"type": "snippet",
"category": "",
+ "//": "Complaint when the NPC wants to sleep but overrides or rules prevent them from sleeping.",
"text": [
"I can barely keep my eyes open.",
"When we sleepin'?",
@@ -360,24 +434,30 @@
"I need to rest.",
" if we don't stop for a moment.",
"Did you know that lack of rest kills faster than lack of food?",
- "I'll just go to sleep, ?"
+ "I'll just go to sleep, ?",
+ "I just...gotta close my eyes for a bit, okay?",
+ "Can't remember the last time I had a proper kip.",
+ "I can't keep going for long . I need some rest, bad."
]
},
{
"type": "snippet",
"category": "",
+ "//": "Complaint when the NPC is actually going off to bed.",
"text": [
"I'm going to sleep now.",
"I'm off to bed. Wake me if you need me.",
"I'm going to sleep over there.",
"Time for bed! See you in the morning.",
"There's a bed calling my name, and I'm going to it.",
- "Good night! Wake me if you need me."
+ "Good night! Wake me if you need me.",
+ "Calling it a night for now. You get some rest too, okay?"
]
},
{
"type": "snippet",
"category": "",
+ "//": "Generic terms of emphasis",
"text": [
"extremely",
"greatly",
@@ -394,42 +474,27 @@
"uber",
"ultra",
"so ",
- " "
+ " ",
+ "severely",
+ "extraordinarily",
+ "unusually",
+ "tremendously",
+ "vastly",
+ "palpably",
+ "inordinately",
+ "staggeringly"
]
},
{
"type": "snippet",
"category": "",
- "text": [ "fine", "okay", "get it", "you dig", "dig", "got it", "you see", "see, ", "alright", "that clear" ]
- },
- {
- "type": "snippet",
- "category": "",
- "text": [
- "Catch up!",
- "Get over here!",
- "Get over here, !",
- "Keep close, !",
- "Keep it moving, !",
- "Keep up, !",
- "Let's keep going, !",
- "Over here!",
- "Over here, !",
- "Stay close, !",
- "Stay with me, !",
- "Catch up, !",
- "Keep up!",
- "Come on, !",
- "Keep it moving!",
- "Stay with me!",
- "Keep close!",
- "Stay close!",
- "Let's keep going!"
- ]
+ "//": "General terms of acknowledgement for an order",
+ "text": [ "fine", "okay", "get it", "you dig", "dig", "got it", "you see", "see, ", "alright", "that clear", "capiche" ]
},
{
"type": "snippet",
"category": "",
+ "//": "Generic terms of emphasis",
"text": [
"really",
"seriously",
@@ -447,6 +512,7 @@
{
"type": "snippet",
"category": "",
+ "//": "Said when an NPC needs to move past another character",
"text": [
"Excuse me, let me pass.",
"Hey , can I get through?",
@@ -458,12 +524,14 @@
"Move your ass, !",
"Out of my way, !",
"Move it, !",
- "You need to move, , ?"
+ "You need to move, , ?",
+ "Coming through!"
]
},
{
"type": "snippet",
"category": "",
+ "//": "Said when a hostile NPC completes mugging the player",
"text": [
"Thanks for the cash, !",
"So long, !",
@@ -474,12 +542,16 @@
"Hasta luego, !",
"I'm outta here! ",
"Bye bye, !",
- "Thanks, !"
+ "Thanks, !",
+ "Pleasure doing business with you.",
+ "Now beat it, you .",
+ "Good haul. See you around"
]
},
{
"type": "snippet",
"category": "",
+ "//": "Warning from non-hostile NPCs when the player steals something.",
"text": [
"Hey! I saw you take that ! Drop it. Now.",
"You best be dropping what you just picked up right now .",
@@ -489,7 +561,10 @@
"I saw that! Drop what you just stole!",
"Thieves will not last long around me , please drop that.",
"Consider this a warning , thieves will not be tolerated, drop it.",
- "You think I'm blind ? Don't touch our stuff."
+ "You think I'm blind ? Don't touch our stuff.",
+ "You have one chance to put it back.",
+ "Return the stolen goods. You have to the count of three to comply.",
+ "You're not leaving here with stolen goods, ."
]
},
{
@@ -507,12 +582,15 @@
" ",
"tickled pink",
"delighted",
- "pumped"
+ "pumped",
+ "joyful",
+ "merry"
]
},
{
"type": "snippet",
"category": "",
+ "//": "General warning to put a weapon down, either in preparation for a mugging or by an scared NPC as part of a request to establish trust with the avatar.",
"text": [
"Drop your weapon!",
"Okay , drop your weapon!",
@@ -523,17 +601,33 @@
"Put down the !",
"Drop your weapon, !",
"Put down your !",
- "Alright, drop the !"
+ "Alright, drop the !",
+ "Please put down your weapon. I'll give you to the count of three. One...",
+ "Let's take it easy now, okay? Put the weapon down."
]
},
{
"type": "snippet",
"category": "",
- "text": [ "fucking", "goddamn", "motherfucking", "freaking", "damn", " ", "fuckin'", "god damn", "mafuckin'" ]
+ "text": [
+ "fucking",
+ "goddamn",
+ "motherfucking",
+ "freaking",
+ "damn",
+ " ",
+ "fuckin'",
+ "god damn",
+ "mafuckin'",
+ "bloody",
+ "god-forsaken",
+ "cursed"
+ ]
},
{
"type": "snippet",
"category": "",
+ "//": "NPCs shout these things while approaching the avatar for the first time",
"text": [
"Wait up, let's talk!",
"Hey, I want to talk to you!",
@@ -544,12 +638,14 @@
"! Wait up!",
"Wait up, ?",
"Let's talk, !",
- "Look, let's talk!"
+ "Look, let's talk!",
+ "Hey, what's the rush? Let's chat a tad."
]
},
{
"type": "snippet",
"category": "",
+ "//": "Mostly hostile NPCs say these things in preparation for mugging an unarmed avatar.",
"text": [
"Put your hands up!",
"Put your hands up, !",
@@ -560,12 +656,16 @@
"Hands where I can see them!",
"Okay , hands up!",
"Okay hands up!",
- "Hands in the air, !"
+ "Hands in the air, !",
+ "Hands up, no sudden movements and we're gravy, okay?",
+ "Take it easy and put your hands up now, .",
+ "Why don't you put your hands up for me ."
]
},
{
"type": "snippet",
"category": "",
+ "//": "Generic orders to move,mostly used as part of firing warnings.",
"text": [
"Move",
"Move your ass",
@@ -576,12 +676,14 @@
"Move your ass",
"Get out of my way, ,",
"Move to the side",
- "Get out of my line of fire"
+ "Get out of my line of fire",
+ "Move, move, move"
]
},
{
"type": "snippet",
"category": "",
+ "//": "Complaint when the NPC is hungry and wants food.",
"text": [
"I almost want to eat my now.",
"When we eatin'?",
@@ -594,12 +696,15 @@
"I need to eat something.",
" if I don't get some food.",
"Consider this idea: you give me food and I eat it.",
- "Did you know that lack of food kills faster than chain smoking?"
+ "Did you know that lack of food kills faster than chain smoking?",
+ "Can't remember the last time I got a proper meal.",
+ "I could eat a horse."
]
},
{
"type": "snippet",
"category": "",
+ "//": "Extremely negative response to a request or command.",
"text": [
"fuck you",
"fuck off",
@@ -607,12 +712,18 @@
", ",
", ",
"",
- " "
+ " ",
+ "you can fuck right off, you ",
+ "I've had enough of you, begone.",
+ "you're a poster child for abortions",
+ "how the fuck you've survived this far is beyond me, you ",
+ "you're the reason the gene pool needs a lifeguard"
]
},
{
"type": "snippet",
"category": "",
+ "//": "NPC complaint if a HUGE NPC is taking pain from being inside a vehicle. Key points are that the NPC is HUGE and they're in a confined vehicle, along with some hints on how to resolve it.",
"text": [
"Can I get out and walk? This vehicle is too small.",
"How about we make the next vehicle a convertible?",
@@ -620,28 +731,33 @@
"I'm not a contortionist!",
"I can't fit in your tiny human vehicle.",
"This sucks. I'm too big.",
- "I don't like being a mutant crammed into your tiny little vehicle."
+ "I don't like being a mutant crammed into your tiny little vehicle.",
+ "Getting awfully cramped in here.",
+ "I don't think this vehicle was designed for someone like me."
]
},
{
"type": "snippet",
"category": "",
+ "//": "Hostile NPC warning about a live explosive in the vicinity.",
"text": [
" Fire in the hole!",
" Get cover!",
- "Marines! We are leaving!",
"Hit the dirt!",
"This shit is gonna blow!",
"I'm standing way too close to this firecracker.",
"I need to get some distance.",
"I need to get some distance.",
" I'm getting my ass out of here!",
- "Fire in the hole, motherfuckers!"
+ "Fire in the hole, motherfuckers!",
+ "Heads up, .",
+ "Watch out for shrapnel!"
]
},
{
"type": "snippet",
"category": "",
+ "//": "Friendly NPC warning about a live explosive in the vicinity.",
"text": [
"Fire in the hole!",
"Get cover!",
@@ -650,26 +766,33 @@
"This shit is gonna blow!",
"I'm standing way too close to this firecracker.",
"I need to get some distance.",
- "I'm getting my ass out of here! You'd better do the same, !",
- "Fire in the hole, motherfuckers!"
+ "Fire in the hole, motherfuckers!",
+ "Bombs away!",
+ "Shrapnel, incoming! Watch it!",
+ "Making some noise!",
+ "Hit the deck!"
]
},
{
"type": "snippet",
"category": "",
- "//": "Hostile NPCs are foul-mouthed",
+ "//": "Hostile NPCs are foul-mouthed. This is a warning about a dangerous monster, and the code always follows it with the name of the monster.",
"text": [
"Fuck me! A ",
"Watch out for that",
"Watch out! I see a",
", a",
", I'm doomed! There's a ",
- ", here comes a "
+ ", here comes a ",
+ "Incoming!",
+ "Prepare yourself! We have a",
+ ""
]
},
{
"type": "snippet",
"category": "",
+ "//": "This is a warning about a dangerous monster, and the code always follows it with the name of the monster.",
"text": [
"Look out for that",
"Hey! Over there! I see a",
@@ -680,12 +803,14 @@
"Hey, ! ",
", a",
"Look out! A",
- ", here comes a "
+ ", here comes a ",
+ "Keep an eye on that"
]
},
{
"type": "snippet",
"category": "",
+ "//": "NPC complaint when the threat level increases from very low to dangerous.",
"text": [
"Look sharp! Things are heating up.",
"Hostiles inbound.",
@@ -696,13 +821,17 @@
"Who's there?",
"Hello?",
"Look alive!",
- ""
+ "",
+ "Fight or flight?",
+ "Weapons hot!",
+ "Lock and load!",
+ "We've got incoming!"
]
},
{
"type": "snippet",
"category": "",
- "//": "Some lines deliberately copied from mi-go text",
+ "//": "Hostile, swear-filled NPC complaint when the threat level increases from very low to dangerous. Some lines deliberately copied from mi-go text.",
"text": [
" look sharp! Things are heating up.",
" Hostiles inbound.",
@@ -730,6 +859,7 @@
{
"type": "snippet",
"category": "",
+ "//": "NPC complaint when the danger level drops from significant to very low, so things are 'safe'",
"text": [
"Looks like that's over.",
", ",
@@ -743,12 +873,20 @@
"How do we get out of here?",
"Is that the last of them?",
"I'd kill for a coke.",
- ""
+ "Weapons check everyone. There may be more.",
+ "That's that, then.",
+ "That's the last of them for now.",
+ "Clearing the world, one at a time",
+ "Well, that got the blood pumping.",
+ "We're clear, but stay frosty.",
+ " beautiful work.",
+ "Getting really good at this."
]
},
{
"type": "snippet",
"category": "