From 337a929cc3ad2501dc2011d1a3ea1ca7c125c73b Mon Sep 17 00:00:00 2001 From: jacob1 Date: Sat, 11 Jun 2016 11:00:06 -0400 Subject: [PATCH] A few description updates from boxmein. Closes #282 I don't think we need to add the element name for elements like ACID in the description when it is already obvious --- src/simulation/elements/BTRY.cpp | 2 +- src/simulation/elements/CLNE.cpp | 2 +- src/simulation/elements/CONV.cpp | 2 +- src/simulation/elements/GAS.cpp | 2 +- src/simulation/elements/PLUT.cpp | 2 +- src/simulation/elements/STOR.cpp | 2 +- src/simulation/elements/URAN.cpp | 2 +- src/simulation/elements/WATR.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/simulation/elements/BTRY.cpp b/src/simulation/elements/BTRY.cpp index be3b115c15..a0928de7cc 100644 --- a/src/simulation/elements/BTRY.cpp +++ b/src/simulation/elements/BTRY.cpp @@ -28,7 +28,7 @@ Element_BTRY::Element_BTRY() Temperature = R_TEMP+0.0f +273.15f; HeatConduct = 251; - Description = "Generates infinite electricity."; + Description = "Battery. Generates infinite electricity."; Properties = TYPE_SOLID; diff --git a/src/simulation/elements/CLNE.cpp b/src/simulation/elements/CLNE.cpp index c98fdeef4e..e86410959a 100644 --- a/src/simulation/elements/CLNE.cpp +++ b/src/simulation/elements/CLNE.cpp @@ -28,7 +28,7 @@ Element_CLNE::Element_CLNE() Temperature = R_TEMP+0.0f +273.15f; HeatConduct = 251; - Description = "Solid. Duplicates any particles it touches."; + Description = "Clone. Duplicates any particles it touches."; Properties = TYPE_SOLID|PROP_DRAWONCTYPE|PROP_NOCTYPEDRAW; diff --git a/src/simulation/elements/CONV.cpp b/src/simulation/elements/CONV.cpp index 3fbe1493c4..712fd0c46a 100644 --- a/src/simulation/elements/CONV.cpp +++ b/src/simulation/elements/CONV.cpp @@ -28,7 +28,7 @@ Element_CONV::Element_CONV() Temperature = R_TEMP+0.0f +273.15f; HeatConduct = 251; - Description = "Solid. Converts everything into whatever it first touches."; + Description = "Converter. Converts everything into whatever it first touches."; Properties = TYPE_SOLID|PROP_DRAWONCTYPE|PROP_NOCTYPEDRAW; diff --git a/src/simulation/elements/GAS.cpp b/src/simulation/elements/GAS.cpp index e84c4918a8..01a039455f 100644 --- a/src/simulation/elements/GAS.cpp +++ b/src/simulation/elements/GAS.cpp @@ -28,7 +28,7 @@ Element_GAS::Element_GAS() Temperature = R_TEMP+2.0f +273.15f; HeatConduct = 42; - Description = "Diffuses quickly and flammable. Liquefies into OIL under pressure."; + Description = "Diffuses quickly and is flammable. Liquefies into OIL under pressure."; Properties = TYPE_GAS | PROP_NEUTPASS; diff --git a/src/simulation/elements/PLUT.cpp b/src/simulation/elements/PLUT.cpp index 2505cc40d6..69a2758b38 100644 --- a/src/simulation/elements/PLUT.cpp +++ b/src/simulation/elements/PLUT.cpp @@ -28,7 +28,7 @@ Element_PLUT::Element_PLUT() Temperature = R_TEMP+4.0f +273.15f; HeatConduct = 251; - Description = "Heavy particles. Fissile. Generates neutrons under pressure."; + Description = "Plutonium. Heavy, fissle particles. Generates neutrons under pressure."; Properties = TYPE_PART|PROP_NEUTPASS|PROP_RADIOACTIVE; diff --git a/src/simulation/elements/STOR.cpp b/src/simulation/elements/STOR.cpp index ff07e93982..08e0252733 100644 --- a/src/simulation/elements/STOR.cpp +++ b/src/simulation/elements/STOR.cpp @@ -28,7 +28,7 @@ Element_STOR::Element_STOR() Temperature = R_TEMP+0.0f +273.15f; HeatConduct = 0; - Description = "Captures and stores a single particle. releases when charged with PSCN, also passes to PIPE."; + Description = "Storage. Captures and stores a single particle. Releases when charged with PSCN, also passes to PIPE."; Properties = TYPE_SOLID|PROP_NOCTYPEDRAW; diff --git a/src/simulation/elements/URAN.cpp b/src/simulation/elements/URAN.cpp index a42030fc3e..176e9bd607 100644 --- a/src/simulation/elements/URAN.cpp +++ b/src/simulation/elements/URAN.cpp @@ -28,7 +28,7 @@ Element_URAN::Element_URAN() Temperature = R_TEMP+30.0f+273.15f; HeatConduct = 251; - Description = "Heavy particles. Generates heat under pressure."; + Description = "Uranium. Heavy particles. Generates heat under pressure."; Properties = TYPE_PART | PROP_RADIOACTIVE; diff --git a/src/simulation/elements/WATR.cpp b/src/simulation/elements/WATR.cpp index e7ac6a9b0c..7324a8bda0 100644 --- a/src/simulation/elements/WATR.cpp +++ b/src/simulation/elements/WATR.cpp @@ -28,7 +28,7 @@ Element_WATR::Element_WATR() Temperature = R_TEMP-2.0f +273.15f; HeatConduct = 29; - Description = "Conducts electricity, freezes, and extinguishes fires."; + Description = "Water. Conducts electricity, freezes, and extinguishes fires."; Properties = TYPE_LIQUID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_NEUTPASS;