From 76a172d2eb77c2a55e6c0556ae9512616cfb7afe Mon Sep 17 00:00:00 2001 From: Valuial Date: Thu, 2 Jun 2016 13:45:56 +0200 Subject: [PATCH 001/110] astyle player.cpp up to about line 2050 Affected functions: bool player::is_immune_effect( const efftype_id &eff ) const int player::stability_roll() const bool player::is_immune_damage( const damage_type dt ) const void player::set_underwater( bool u ) nc_color player::basic_symbol_color() const void player::load_info( std::string data ) void player::memorial( std::ostream &memorial_file, std::string epitaph ) void player::add_memorial_log( const char *male_msg, const char *female_msg, ... ) void player::load_memorial_file( std::istream &fin ) std::string player::dump_memorial() const stats *player::lifetime_stats() --- src/player.cpp | 350 +++++++++++++++++++++++++------------------------ 1 file changed, 179 insertions(+), 171 deletions(-) diff --git a/src/player.cpp b/src/player.cpp index 3002f734cba9c..e9735f6d413f0 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -1817,11 +1817,11 @@ bool player::is_elec_immune() const bool player::is_immune_effect( const efftype_id &eff ) const { if( eff == effect_downed ) { - return is_throw_immune() || ( has_trait("LEG_TENT_BRACE") && footwear_factor() == 0 ); + return is_throw_immune() || ( has_trait( "LEG_TENT_BRACE" ) && footwear_factor() == 0 ); } else if( eff == effect_onfire ) { return is_immune_damage( DT_HEAT ); } else if( eff == effect_deaf ) { - return worn_with_flag("DEAF") || has_bionic("bio_ears") || is_wearing("rm13_armor_on"); + return worn_with_flag( "DEAF" ) || has_bionic( "bio_ears" ) || is_wearing( "rm13_armor_on" ); } else if( eff == effect_corroding ) { return is_immune_damage( DT_ACID ) || has_trait( "SLIMY" ) || has_trait( "VISCOUS" ); } else if( eff == effect_nausea ) { @@ -1840,37 +1840,37 @@ int player::stability_roll() const ///\EFFECT_DEX slightly improves player stability roll ///\EFFECT_MELEE improves player stability roll - int stability = (get_melee()) + get_str() + (get_per() / 3) + (get_dex() / 4); - return stability; + int stability = ( get_melee() ) + get_str() + ( get_per() / 3 ) + ( get_dex() / 4 ); + return stability; } bool player::is_immune_damage( const damage_type dt ) const { switch( dt ) { - case DT_NULL: - return true; - case DT_TRUE: - return false; - case DT_BIOLOGICAL: - return false; - case DT_BASH: - return false; - case DT_CUT: - return false; - case DT_ACID: - return has_trait( "ACIDPROOF" ); - case DT_STAB: - return false; - case DT_HEAT: - return has_trait("M_SKIN2"); - case DT_COLD: - return false; - case DT_ELECTRIC: - return has_active_bionic( "bio_faraday" ) || - worn_with_flag( "ELECTRIC_IMMUNE" ) || - has_artifact_with( AEP_RESIST_ELECTRICITY ); - default: - return true; + case DT_NULL: + return true; + case DT_TRUE: + return false; + case DT_BIOLOGICAL: + return false; + case DT_BASH: + return false; + case DT_CUT: + return false; + case DT_ACID: + return has_trait( "ACIDPROOF" ); + case DT_STAB: + return false; + case DT_HEAT: + return has_trait( "M_SKIN2" ); + case DT_COLD: + return false; + case DT_ELECTRIC: + return has_active_bionic( "bio_faraday" ) || + worn_with_flag( "ELECTRIC_IMMUNE" ) || + has_artifact_with( AEP_RESIST_ELECTRICITY ); + default: + return true; } } @@ -1884,9 +1884,9 @@ bool player::is_hallucination() const return false; } -void player::set_underwater(bool u) +void player::set_underwater( bool u ) { - if (underwater != u) { + if( underwater != u ) { underwater = u; recalc_sight_limits(); } @@ -1904,29 +1904,29 @@ nc_color player::basic_symbol_color() const if( has_effect( effect_boomered ) ) { return c_pink; } - if (has_active_mutation("SHELL2")) { + if( has_active_mutation( "SHELL2" ) ) { return c_magenta; } - if (underwater) { + if( underwater ) { return c_blue; } - if (has_active_bionic("bio_cloak") || has_artifact_with(AEP_INVISIBLE) || - has_active_optcloak() || has_trait("DEBUG_CLOAK")) { + if( has_active_bionic( "bio_cloak" ) || has_artifact_with( AEP_INVISIBLE ) || + has_active_optcloak() || has_trait( "DEBUG_CLOAK" ) ) { return c_dkgray; } return c_white; } -void player::load_info(std::string data) +void player::load_info( std::string data ) { std::stringstream dump; dump << data; - JsonIn jsin(dump); + JsonIn jsin( dump ); try { - deserialize(jsin); + deserialize( jsin ); } catch( const JsonError &jsonerr ) { - debugmsg("Bad player json\n%s", jsonerr.c_str() ); + debugmsg( "Bad player json\n%s", jsonerr.c_str() ); } } @@ -1944,18 +1944,18 @@ void player::memorial( std::ostream &memorial_file, std::string epitaph ) //Size of indents in the memorial file const std::string indent = " "; - const std::string pronoun = male ? _("He") : _("She"); + const std::string pronoun = male ? _( "He" ) : _( "She" ); //Avoid saying "a male unemployed" or similar std::string profession_name; - if(prof == prof->generic()) { - if (male) { - profession_name = _("an unemployed male"); + if( prof == prof->generic() ) { + if( male ) { + profession_name = _( "an unemployed male" ); } else { - profession_name = _("an unemployed female"); + profession_name = _( "an unemployed female" ); } } else { - profession_name = string_format(_("a %s"), prof->gender_appropriate_name(male).c_str()); + profession_name = string_format( _( "a %s" ), prof->gender_appropriate_name( male ).c_str() ); } //Figure out the location @@ -1968,96 +1968,104 @@ void player::memorial( std::ostream &memorial_file, std::string epitaph ) std::string kill_place; if( !closest_city ) { //~ First parameter is a pronoun ("He"/"She"), second parameter is a terrain name. - kill_place = string_format(_("%1$s was killed in a %2$s in the middle of nowhere."), - pronoun.c_str(), tername.c_str()); + kill_place = string_format( _( "%1$s was killed in a %2$s in the middle of nowhere." ), + pronoun.c_str(), tername.c_str() ); } else { const auto &nearest_city = *closest_city.city; //Give slightly different messages based on how far we are from the middle const int distance_from_city = closest_city.distance - nearest_city.s; - if(distance_from_city > nearest_city.s + 4) { + if( distance_from_city > nearest_city.s + 4 ) { //~ First parameter is a pronoun ("He"/"She"), second parameter is a terrain name. - kill_place = string_format(_("%1$s was killed in a %2$s in the wilderness."), - pronoun.c_str(), tername.c_str()); + kill_place = string_format( _( "%1$s was killed in a %2$s in the wilderness." ), + pronoun.c_str(), tername.c_str() ); - } else if(distance_from_city >= nearest_city.s) { + } else if( distance_from_city >= nearest_city.s ) { //~ First parameter is a pronoun ("He"/"She"), second parameter is a terrain name, third parameter is a city name. - kill_place = string_format(_("%1$s was killed in a %2$s on the outskirts of %3$s."), - pronoun.c_str(), tername.c_str(), nearest_city.name.c_str()); + kill_place = string_format( _( "%1$s was killed in a %2$s on the outskirts of %3$s." ), + pronoun.c_str(), tername.c_str(), nearest_city.name.c_str() ); } else { //~ First parameter is a pronoun ("He"/"She"), second parameter is a terrain name, third parameter is a city name. - kill_place = string_format(_("%1$s was killed in a %2$s in %3$s."), - pronoun.c_str(), tername.c_str(), nearest_city.name.c_str()); + kill_place = string_format( _( "%1$s was killed in a %2$s in %3$s." ), + pronoun.c_str(), tername.c_str(), nearest_city.name.c_str() ); } } //Header - std::string version = string_format("%s", getVersionString()); - memorial_file << string_format(_("Cataclysm - Dark Days Ahead version %s memorial file"), version.c_str()) << "\n"; + std::string version = string_format( "%s", getVersionString() ); + memorial_file << string_format( _( "Cataclysm - Dark Days Ahead version %s memorial file" ), + version.c_str() ) << "\n"; memorial_file << "\n"; - memorial_file << string_format(_("In memory of: %s"), name.c_str()) << "\n"; - if(epitaph.length() > 0) { //Don't record empty epitaphs + memorial_file << string_format( _( "In memory of: %s" ), name.c_str() ) << "\n"; + if( epitaph.length() > 0 ) { //Don't record empty epitaphs //~ The "%s" will be replaced by an epitaph as displyed in the memorial files. Replace the quotation marks as appropriate for your language. - memorial_file << string_format(pgettext("epitaph","\"%s\""), epitaph.c_str()) << "\n\n"; + memorial_file << string_format( pgettext( "epitaph", "\"%s\"" ), epitaph.c_str() ) << "\n\n"; } //~ First parameter: Pronoun, second parameter: a profession name (with article) - memorial_file << string_format(_("%1$s was %2$s when the apocalypse began."), - pronoun.c_str(), profession_name.c_str()) << "\n"; - memorial_file << string_format(_("%1$s died on %2$s of year %3$d, day %4$d, at %5$s."), - pronoun.c_str(), season_name_upper(calendar::turn.get_season()).c_str(), (calendar::turn.years() + 1), - (calendar::turn.days() + 1), calendar::turn.print_time().c_str()) << "\n"; + memorial_file << string_format( _( "%1$s was %2$s when the apocalypse began." ), + pronoun.c_str(), profession_name.c_str() ) << "\n"; + memorial_file << string_format( _( "%1$s died on %2$s of year %3$d, day %4$d, at %5$s." ), + pronoun.c_str(), season_name_upper( calendar::turn.get_season() ).c_str(), + ( calendar::turn.years() + 1 ), + ( calendar::turn.days() + 1 ), calendar::turn.print_time().c_str() ) << "\n"; memorial_file << kill_place << "\n"; memorial_file << "\n"; //Misc - memorial_file << string_format(_("Cash on hand: $%d"), cash) << "\n"; + memorial_file << string_format( _( "Cash on hand: $%d" ), cash ) << "\n"; memorial_file << "\n"; //HP - memorial_file << _("Final HP:") << "\n"; - memorial_file << indent << string_format(_(" Head: %d/%d"), hp_cur[hp_head], hp_max[hp_head] ) << "\n"; - memorial_file << indent << string_format(_("Torso: %d/%d"), hp_cur[hp_torso], hp_max[hp_torso]) << "\n"; - memorial_file << indent << string_format(_("L Arm: %d/%d"), hp_cur[hp_arm_l], hp_max[hp_arm_l]) << "\n"; - memorial_file << indent << string_format(_("R Arm: %d/%d"), hp_cur[hp_arm_r], hp_max[hp_arm_r]) << "\n"; - memorial_file << indent << string_format(_("L Leg: %d/%d"), hp_cur[hp_leg_l], hp_max[hp_leg_l]) << "\n"; - memorial_file << indent << string_format(_("R Leg: %d/%d"), hp_cur[hp_leg_r], hp_max[hp_leg_r]) << "\n"; + memorial_file << _( "Final HP:" ) << "\n"; + memorial_file << indent << string_format( _( " Head: %d/%d" ), hp_cur[hp_head], + hp_max[hp_head] ) << "\n"; + memorial_file << indent << string_format( _( "Torso: %d/%d" ), hp_cur[hp_torso], + hp_max[hp_torso] ) << "\n"; + memorial_file << indent << string_format( _( "L Arm: %d/%d" ), hp_cur[hp_arm_l], + hp_max[hp_arm_l] ) << "\n"; + memorial_file << indent << string_format( _( "R Arm: %d/%d" ), hp_cur[hp_arm_r], + hp_max[hp_arm_r] ) << "\n"; + memorial_file << indent << string_format( _( "L Leg: %d/%d" ), hp_cur[hp_leg_l], + hp_max[hp_leg_l] ) << "\n"; + memorial_file << indent << string_format( _( "R Leg: %d/%d" ), hp_cur[hp_leg_r], + hp_max[hp_leg_r] ) << "\n"; memorial_file << "\n"; //Stats - memorial_file << _("Final Stats:") << "\n"; - memorial_file << indent << string_format(_("Str %d"), str_cur) - << indent << string_format(_("Dex %d"), dex_cur) - << indent << string_format(_("Int %d"), int_cur) - << indent << string_format(_("Per %d"), per_cur) << "\n"; - memorial_file << _("Base Stats:") << "\n"; - memorial_file << indent << string_format(_("Str %d"), str_max) - << indent << string_format(_("Dex %d"), dex_max) - << indent << string_format(_("Int %d"), int_max) - << indent << string_format(_("Per %d"), per_max) << "\n"; + memorial_file << _( "Final Stats:" ) << "\n"; + memorial_file << indent << string_format( _( "Str %d" ), str_cur ) + << indent << string_format( _( "Dex %d" ), dex_cur ) + << indent << string_format( _( "Int %d" ), int_cur ) + << indent << string_format( _( "Per %d" ), per_cur ) << "\n"; + memorial_file << _( "Base Stats:" ) << "\n"; + memorial_file << indent << string_format( _( "Str %d" ), str_max ) + << indent << string_format( _( "Dex %d" ), dex_max ) + << indent << string_format( _( "Int %d" ), int_max ) + << indent << string_format( _( "Per %d" ), per_max ) << "\n"; memorial_file << "\n"; //Last 20 messages - memorial_file << _("Final Messages:") << "\n"; - std::vector > recent_messages = Messages::recent_messages(20); + memorial_file << _( "Final Messages:" ) << "\n"; + std::vector > recent_messages = Messages::recent_messages( 20 ); for( auto &recent_message : recent_messages ) { memorial_file << indent << recent_message.first << " " << recent_message.second; - memorial_file << "\n"; + memorial_file << "\n"; } memorial_file << "\n"; //Kill list - memorial_file << _("Kills:") << "\n"; + memorial_file << _( "Kills:" ) << "\n"; int total_kills = 0; - std::map,int> kill_counts; + std::map, int> kill_counts; // map to kill count for( const auto &type : MonsterGenerator::generator().get_all_mtypes() ) { if( g->kill_count( type.id ) > 0 ) { - kill_counts[std::tuple( - type.nname(), - type.sym - )] += g->kill_count( type.id ); + kill_counts[std::tuple( + type.nname(), + type.sym + )] += g->kill_count( type.id ); total_kills += g->kill_count( type.id ); } } @@ -2069,9 +2077,9 @@ void player::memorial( std::ostream &memorial_file, std::string epitaph ) } if( total_kills == 0 ) { - memorial_file << indent << _( "No monsters were killed." ) << "\n"; + memorial_file << indent << _( "No monsters were killed." ) << "\n"; } else { - memorial_file << string_format( _( "Total kills: %d" ), total_kills ) << "\n"; + memorial_file << string_format( _( "Total kills: %d" ), total_kills ) << "\n"; } memorial_file << "\n"; @@ -2085,74 +2093,74 @@ void player::memorial( std::ostream &memorial_file, std::string epitaph ) memorial_file << "\n"; //Traits - memorial_file << _("Traits:") << "\n"; + memorial_file << _( "Traits:" ) << "\n"; for( auto &iter : my_mutations ) { memorial_file << indent << mutation_branch::get_name( iter.first ) << "\n"; } if( !my_mutations.empty() ) { - memorial_file << indent << _("(None)") << "\n"; + memorial_file << indent << _( "(None)" ) << "\n"; } memorial_file << "\n"; //Effects (illnesses) - memorial_file << _("Ongoing Effects:") << "\n"; + memorial_file << _( "Ongoing Effects:" ) << "\n"; bool had_effect = false; if( get_morale_level() >= 100 ) { - had_effect = true; - memorial_file << indent << _("Elated") << "\n"; + had_effect = true; + memorial_file << indent << _( "Elated" ) << "\n"; } if( get_morale_level() <= -100 ) { - had_effect = true; - memorial_file << indent << _("Depressed") << "\n"; - } - if(get_perceived_pain() > 0) { - had_effect = true; - memorial_file << indent << _("Pain") << " (" << get_perceived_pain() << ")"; - } - if(stim > 0) { - had_effect = true; - int dexbonus = stim / 10; - if (abs(stim) >= 30) { - dexbonus -= abs(stim - 15) / 8; - } - if(dexbonus < 0) { - memorial_file << indent << _("Stimulant Overdose") << "\n"; - } else { - memorial_file << indent << _("Stimulant") << "\n"; - } - } else if(stim < 0) { - had_effect = true; - memorial_file << indent << _("Depressants") << "\n"; - } - if(!had_effect) { - memorial_file << indent << _("(None)") << "\n"; + had_effect = true; + memorial_file << indent << _( "Depressed" ) << "\n"; + } + if( get_perceived_pain() > 0 ) { + had_effect = true; + memorial_file << indent << _( "Pain" ) << " (" << get_perceived_pain() << ")"; + } + if( stim > 0 ) { + had_effect = true; + int dexbonus = stim / 10; + if( abs( stim ) >= 30 ) { + dexbonus -= abs( stim - 15 ) / 8; + } + if( dexbonus < 0 ) { + memorial_file << indent << _( "Stimulant Overdose" ) << "\n"; + } else { + memorial_file << indent << _( "Stimulant" ) << "\n"; + } + } else if( stim < 0 ) { + had_effect = true; + memorial_file << indent << _( "Depressants" ) << "\n"; + } + if( !had_effect ) { + memorial_file << indent << _( "(None)" ) << "\n"; } memorial_file << "\n"; //Bionics - memorial_file << _("Bionics:") << "\n"; + memorial_file << _( "Bionics:" ) << "\n"; int total_bionics = 0; for( size_t i = 0; i < my_bionics.size(); ++i ) { - memorial_file << indent << (i+1) << ": " << bionic_info(my_bionics[i].id).name << "\n"; - total_bionics++; + memorial_file << indent << ( i + 1 ) << ": " << bionic_info( my_bionics[i].id ).name << "\n"; + total_bionics++; } - if(total_bionics == 0) { - memorial_file << indent << _("No bionics were installed.") << "\n"; + if( total_bionics == 0 ) { + memorial_file << indent << _( "No bionics were installed." ) << "\n"; } else { - memorial_file << string_format(_("Total bionics: %d"), total_bionics) << "\n"; + memorial_file << string_format( _( "Total bionics: %d" ), total_bionics ) << "\n"; } - memorial_file << string_format(_("Power: %d/%d"), power_level, max_power_level) << "\n"; + memorial_file << string_format( _( "Power: %d/%d" ), power_level, max_power_level ) << "\n"; memorial_file << "\n"; //Equipment - memorial_file << _("Weapon:") << "\n"; - memorial_file << indent << weapon.invlet << " - " << weapon.tname(1, false) << "\n"; + memorial_file << _( "Weapon:" ) << "\n"; + memorial_file << indent << weapon.invlet << " - " << weapon.tname( 1, false ) << "\n"; memorial_file << "\n"; - memorial_file << _("Equipment:") << "\n"; + memorial_file << _( "Equipment:" ) << "\n"; for( auto &elem : worn ) { item next_item = elem; - memorial_file << indent << next_item.invlet << " - " << next_item.tname(1, false); + memorial_file << indent << next_item.invlet << " - " << next_item.tname( 1, false ); if( next_item.charges > 0 ) { memorial_file << " (" << next_item.charges << ")"; } else if( next_item.contents.size() == 1 && next_item.contents.front().charges > 0 ) { @@ -2163,14 +2171,14 @@ void player::memorial( std::ostream &memorial_file, std::string epitaph ) memorial_file << "\n"; //Inventory - memorial_file << _("Inventory:") << "\n"; - inv.restack(this); + memorial_file << _( "Inventory:" ) << "\n"; + inv.restack( this ); inv.sort(); invslice slice = inv.slice(); for( auto &elem : slice ) { item &next_item = elem->front(); memorial_file << indent << next_item.invlet << " - " << - next_item.tname(unsigned(elem->size()), false); + next_item.tname( unsigned( elem->size() ), false ); if( elem->size() > 1 ) { memorial_file << " [" << elem->size() << "]"; } @@ -2184,19 +2192,19 @@ void player::memorial( std::ostream &memorial_file, std::string epitaph ) memorial_file << "\n"; //Lifetime stats - memorial_file << _("Lifetime Stats") << "\n"; - memorial_file << indent << string_format(_("Distance walked: %d squares"), - player_stats.squares_walked) << "\n"; - memorial_file << indent << string_format(_("Damage taken: %d damage"), - player_stats.damage_taken) << "\n"; - memorial_file << indent << string_format(_("Damage healed: %d damage"), - player_stats.damage_healed) << "\n"; - memorial_file << indent << string_format(_("Headshots: %d"), - player_stats.headshots) << "\n"; + memorial_file << _( "Lifetime Stats" ) << "\n"; + memorial_file << indent << string_format( _( "Distance walked: %d squares" ), + player_stats.squares_walked ) << "\n"; + memorial_file << indent << string_format( _( "Damage taken: %d damage" ), + player_stats.damage_taken ) << "\n"; + memorial_file << indent << string_format( _( "Damage healed: %d damage" ), + player_stats.damage_healed ) << "\n"; + memorial_file << indent << string_format( _( "Headshots: %d" ), + player_stats.headshots ) << "\n"; memorial_file << "\n"; //History - memorial_file << _("Game History") << "\n"; + memorial_file << _( "Game History" ) << "\n"; memorial_file << dump_memorial(); } @@ -2206,30 +2214,30 @@ void player::memorial( std::ostream &memorial_file, std::string epitaph ) * the character dies. The message should contain only the informational string, * as the timestamp and location will be automatically prepended. */ -void player::add_memorial_log(const char* male_msg, const char* female_msg, ...) +void player::add_memorial_log( const char *male_msg, const char *female_msg, ... ) { va_list ap; - va_start(ap, female_msg); + va_start( ap, female_msg ); std::string msg; - if(this->male) { - msg = vstring_format(male_msg, ap); + if( this->male ) { + msg = vstring_format( male_msg, ap ); } else { - msg = vstring_format(female_msg, ap); + msg = vstring_format( female_msg, ap ); } - va_end(ap); + va_end( ap ); - if(msg.empty()) { + if( msg.empty() ) { return; } std::stringstream timestamp; //~ A timestamp. Parameters from left to right: Year, season, day, time - timestamp << string_format(_("Year %1$d, %2$s %3$d, %4$s"), calendar::turn.years() + 1, - season_name_upper(calendar::turn.get_season()).c_str(), - calendar::turn.days() + 1, calendar::turn.print_time().c_str() - ); + timestamp << string_format( _( "Year %1$d, %2$s %3$d, %4$s" ), calendar::turn.years() + 1, + season_name_upper( calendar::turn.get_season() ).c_str(), + calendar::turn.days() + 1, calendar::turn.print_time().c_str() + ); const oter_id &cur_ter = overmap_buffer.ter( global_omt_location() ); std::string location = otermap[cur_ter].name; @@ -2237,7 +2245,7 @@ void player::add_memorial_log(const char* male_msg, const char* female_msg, ...) std::stringstream log_message; log_message << "| " << timestamp.str() << " | " << location.c_str() << " | " << msg; - memorial_log.push_back(log_message.str()); + memorial_log.push_back( log_message.str() ); } @@ -2246,14 +2254,14 @@ void player::add_memorial_log(const char* male_msg, const char* female_msg, ...) * entry lines begin with a pipe (|). * @param fin The ifstream to read the memorial entries from. */ -void player::load_memorial_file(std::istream &fin) +void player::load_memorial_file( std::istream &fin ) { - std::string entry; - memorial_log.clear(); - while(fin.peek() == '|') { - getline(fin, entry); - memorial_log.push_back(entry); - } + std::string entry; + memorial_log.clear(); + while( fin.peek() == '|' ) { + getline( fin, entry ); + memorial_log.push_back( entry ); + } } /** @@ -2264,13 +2272,13 @@ void player::load_memorial_file(std::istream &fin) std::string player::dump_memorial() const { - std::stringstream output; + std::stringstream output; - for( auto &elem : memorial_log ) { - output << elem << "\n"; - } + for( auto &elem : memorial_log ) { + output << elem << "\n"; + } - return output.str(); + return output.str(); } @@ -2282,7 +2290,7 @@ std::string player::dump_memorial() const * @return A pointer to the stats struct being used to track this player's * lifetime stats. */ -stats* player::lifetime_stats() +stats *player::lifetime_stats() { return &player_stats; } From 1b72f6601a4cb5cb7bd2d1ac4fe5e41e851acf17 Mon Sep 17 00:00:00 2001 From: Valuial Date: Fri, 3 Jun 2016 00:24:39 +0200 Subject: [PATCH 002/110] refactor for better readability first attempt at lambda functions by me, solution suggested by Coolthulhu. --- src/player.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/player.cpp b/src/player.cpp index e9735f6d413f0..90635f85961d0 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -2015,19 +2015,18 @@ void player::memorial( std::ostream &memorial_file, std::string epitaph ) memorial_file << "\n"; //HP + + const auto limb_hp = [this, &memorial_file, &indent]( const std::string &desc, const body_part bp ) { + memorial_file << indent << string_format( desc, hp_cur[bp], hp_max[bp] ) << "\n"; + }; + memorial_file << _( "Final HP:" ) << "\n"; - memorial_file << indent << string_format( _( " Head: %d/%d" ), hp_cur[hp_head], - hp_max[hp_head] ) << "\n"; - memorial_file << indent << string_format( _( "Torso: %d/%d" ), hp_cur[hp_torso], - hp_max[hp_torso] ) << "\n"; - memorial_file << indent << string_format( _( "L Arm: %d/%d" ), hp_cur[hp_arm_l], - hp_max[hp_arm_l] ) << "\n"; - memorial_file << indent << string_format( _( "R Arm: %d/%d" ), hp_cur[hp_arm_r], - hp_max[hp_arm_r] ) << "\n"; - memorial_file << indent << string_format( _( "L Leg: %d/%d" ), hp_cur[hp_leg_l], - hp_max[hp_leg_l] ) << "\n"; - memorial_file << indent << string_format( _( "R Leg: %d/%d" ), hp_cur[hp_leg_r], - hp_max[hp_leg_r] ) << "\n"; + limb_hp( _( " Head: %d/%d" ), bp_head ); + limb_hp( _( "Torso: %d/%d" ), bp_torso ); + limb_hp( _( "L Arm: %d/%d" ), bp_arm_l ); + limb_hp( _( "R Arm: %d/%d" ), bp_arm_r ); + limb_hp( _( "L Leg: %d/%d" ), bp_leg_l ); + limb_hp( _( "R Leg: %d/%d" ), bp_leg_r ); memorial_file << "\n"; //Stats From cfb422364456e3e3415d6bf7a55457c3f2381129 Mon Sep 17 00:00:00 2001 From: Valuial Date: Fri, 3 Jun 2016 00:34:28 +0200 Subject: [PATCH 003/110] astyle the refactor --- src/player.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/player.cpp b/src/player.cpp index 90635f85961d0..16955cca0b68a 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -2016,7 +2016,8 @@ void player::memorial( std::ostream &memorial_file, std::string epitaph ) //HP - const auto limb_hp = [this, &memorial_file, &indent]( const std::string &desc, const body_part bp ) { + const auto limb_hp = [this, &memorial_file, &indent]( const std::string & desc, + const body_part bp ) { memorial_file << indent << string_format( desc, hp_cur[bp], hp_max[bp] ) << "\n"; }; From 34e1158aa97d52b54726cb5bc172bdbd12d7df9f Mon Sep 17 00:00:00 2001 From: Valuial Date: Sat, 4 Jun 2016 18:47:07 +0200 Subject: [PATCH 004/110] prettify astyled code --- src/player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/player.cpp b/src/player.cpp index 16955cca0b68a..5e655f138f7f3 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -2017,7 +2017,7 @@ void player::memorial( std::ostream &memorial_file, std::string epitaph ) //HP const auto limb_hp = [this, &memorial_file, &indent]( const std::string & desc, - const body_part bp ) { + const body_part bp ) { memorial_file << indent << string_format( desc, hp_cur[bp], hp_max[bp] ) << "\n"; }; From c7f150a043b1529fdd09cd42d680b0af547dd17c Mon Sep 17 00:00:00 2001 From: Christian Buskirk Date: Sun, 5 Jun 2016 16:16:00 -0700 Subject: [PATCH 005/110] Rebalance repair nanobots --- data/json/bionics.json | 5 ++++- src/bionics.cpp | 19 ++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/data/json/bionics.json b/data/json/bionics.json index cf3b0b2ef1264..5e2990200011e 100644 --- a/data/json/bionics.json +++ b/data/json/bionics.json @@ -595,7 +595,10 @@ "occupied_bodyparts": [ [ "TORSO", 10 ] ], - "act_cost": 125, + "toggled": true, + "act_cost": 1, + "react_cost": 1, + "time": 1, "description": "Inside your body is a fleet of tiny dormant robots. Once charged from your energy banks, they will flit about your body, repairing damage and stopping bleeding." },{ "type": "bionic", diff --git a/src/bionics.cpp b/src/bionics.cpp index 1bc5d43e8031a..0d5c6db6b29fc 100644 --- a/src/bionics.cpp +++ b/src/bionics.cpp @@ -177,9 +177,6 @@ bool player::activate_bionic( int b, bool eff_only ) add_msg( m_info, _( "You change your mind and turn it off." ) ); return false; } - } else if( bio.id == "bio_nanobots" ) { - remove_effect( effect_bleed ); - healall( 4 ); } else if( bio.id == "bio_resonator" ) { //~Sound of a bionic sonic-resonator shaking the area sounds::sound( pos(), 30, _( "VRRRRMP!" ) ); @@ -723,6 +720,22 @@ void player::process_bionic( int b ) } else if (bio.id == "bio_hydraulics") { // Sound of hissing hydraulic muscle! (not quite as loud as a car horn) sounds::sound( pos(), 19, _("HISISSS!")); + } else if( bio.id == "bio_nanobots" ) { + for( int i = 0; i < num_hp_parts; i++ ) { + if( power_level >= 5 && hp_cur[i] < hp_max[i] ) { + heal((hp_part)i, 1); + charge_power(-10); + } + } + for( int i = 0; i < num_bp; i++ ) { + if( power_level >= 2 && has_effect(effect_bleed, (body_part)i)) { + remove_effect(effect_bleed); + charge_power(-2); + } + } + if( calendar::once_every( 5 ) ) { + add_msg( m_neutral, _( "You feel a slight buzzing in your extremities." ) ); + } } } From 7a76eca3fd1fc59f5fdf5362930aaa4475d2dc90 Mon Sep 17 00:00:00 2001 From: Christian Buskirk Date: Sun, 5 Jun 2016 16:17:26 -0700 Subject: [PATCH 006/110] Small astyle --- src/bionics.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/bionics.cpp b/src/bionics.cpp index 0d5c6db6b29fc..c5bc646fed2d2 100644 --- a/src/bionics.cpp +++ b/src/bionics.cpp @@ -695,7 +695,7 @@ void player::process_bionic( int b ) // We just spent our first turn of charge, so -1 here bio.charge = bionics[bio.id].charge_time - 1; } - // Some bionics are a 1-shot activation so they just deactivate at 0 charge. + // Some bionics are a 1-shot activation so they just deactivate at 0 charge. } else { bio.powered = false; add_msg( m_neutral, _( "Your %s powers down." ), bionics[bio.id].name.c_str() ); @@ -714,23 +714,23 @@ void player::process_bionic( int b ) } else if( bio.id == "bio_remote" ) { if( g->remoteveh() == nullptr && get_value( "remote_controlling" ) == "" ) { bio.powered = false; - add_msg( m_warning, _("Your %s has lost connection and is turning off."), + add_msg( m_warning, _( "Your %s has lost connection and is turning off." ), bionics[bio.id].name.c_str() ); } - } else if (bio.id == "bio_hydraulics") { + } else if( bio.id == "bio_hydraulics" ) { // Sound of hissing hydraulic muscle! (not quite as loud as a car horn) - sounds::sound( pos(), 19, _("HISISSS!")); + sounds::sound( pos(), 19, _( "HISISSS!" ) ); } else if( bio.id == "bio_nanobots" ) { for( int i = 0; i < num_hp_parts; i++ ) { if( power_level >= 5 && hp_cur[i] < hp_max[i] ) { - heal((hp_part)i, 1); - charge_power(-10); + heal( ( hp_part )i, 1 ); + charge_power( -10 ); } } for( int i = 0; i < num_bp; i++ ) { - if( power_level >= 2 && has_effect(effect_bleed, (body_part)i)) { - remove_effect(effect_bleed); - charge_power(-2); + if( power_level >= 2 && has_effect( effect_bleed, ( body_part )i ) ) { + remove_effect( effect_bleed ); + charge_power( -2 ); } } if( calendar::once_every( 5 ) ) { From 8c6d9657e9c7a824ea9924c50fb0b2765ba5d666 Mon Sep 17 00:00:00 2001 From: Christian Buskirk Date: Sun, 5 Jun 2016 16:21:00 -0700 Subject: [PATCH 007/110] Description change --- data/json/bionics.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/bionics.json b/data/json/bionics.json index 5e2990200011e..931f2af7bba56 100644 --- a/data/json/bionics.json +++ b/data/json/bionics.json @@ -599,7 +599,7 @@ "act_cost": 1, "react_cost": 1, "time": 1, - "description": "Inside your body is a fleet of tiny dormant robots. Once charged from your energy banks, they will flit about your body, repairing damage and stopping bleeding." + "description": "Inside your body is a fleet of tiny dormant robots. While activated they will flit about your body, repairing damage and stopping bleeding at the cost of additional power." },{ "type": "bionic", "id": "bio_heatsink", From 5309f9e4b15ecc140a24dd3f07ead7b688485d02 Mon Sep 17 00:00:00 2001 From: Christian Buskirk Date: Sun, 5 Jun 2016 17:34:08 -0700 Subject: [PATCH 008/110] Remove passive cost/message, alter description accordingly --- data/json/bionics.json | 5 +---- src/bionics.cpp | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/data/json/bionics.json b/data/json/bionics.json index 931f2af7bba56..3e3956824e07c 100644 --- a/data/json/bionics.json +++ b/data/json/bionics.json @@ -596,10 +596,7 @@ [ "TORSO", 10 ] ], "toggled": true, - "act_cost": 1, - "react_cost": 1, - "time": 1, - "description": "Inside your body is a fleet of tiny dormant robots. While activated they will flit about your body, repairing damage and stopping bleeding at the cost of additional power." + "description": "Inside your body is a fleet of tiny dormant robots. While activated they will flit about your body, repairing damage and stopping bleeding at the cost of power." },{ "type": "bionic", "id": "bio_heatsink", diff --git a/src/bionics.cpp b/src/bionics.cpp index c5bc646fed2d2..93267eccb36f0 100644 --- a/src/bionics.cpp +++ b/src/bionics.cpp @@ -724,7 +724,7 @@ void player::process_bionic( int b ) for( int i = 0; i < num_hp_parts; i++ ) { if( power_level >= 5 && hp_cur[i] < hp_max[i] ) { heal( ( hp_part )i, 1 ); - charge_power( -10 ); + charge_power( -5 ); } } for( int i = 0; i < num_bp; i++ ) { @@ -733,9 +733,6 @@ void player::process_bionic( int b ) charge_power( -2 ); } } - if( calendar::once_every( 5 ) ) { - add_msg( m_neutral, _( "You feel a slight buzzing in your extremities." ) ); - } } } From cc22f84fa71a31e373e0e621f741c53477d0f085 Mon Sep 17 00:00:00 2001 From: Karol Sobo Date: Mon, 6 Jun 2016 15:07:13 +0200 Subject: [PATCH 009/110] Cosmetic_changes --- data/json/recipes/recipe_deconstruction.json | 30 ++++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 8e4a98cf208b8..b185e5abe87e2 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -1137,8 +1137,9 @@ "qualities" : [ {"id":"SCREW","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} - ], "tools": [ [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ], - [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ], [ "welder_crude", 75 ] ] + ], "tools": [ + [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ], + [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ], [ "welder_crude", 75 ] ] ], "components": [ [ [ "power_supply", 4 ] ], @@ -1180,8 +1181,9 @@ "qualities" : [ {"id":"SCREW","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} - ], "tools": [ [ [ "soldering_iron", 10 ], [ "toolset", 10 ] ], - [ [ "oxy_torch", 20 ], [ "welder", 100 ], [ "toolset", 150 ], [ "welder_crude", 150 ] ] + ], "tools": [ + [ [ "soldering_iron", 10 ], [ "toolset", 10 ] ], + [ [ "oxy_torch", 20 ], [ "welder", 100 ], [ "toolset", 150 ], [ "welder_crude", 150 ] ] ], "components": [ [ [ "power_supply", 12 ] ], @@ -1206,8 +1208,9 @@ {"id":"SCREW","level":1,"amount":1}, {"id":"WRENCH","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} - ], "tools": [ [ [ "soldering_iron", 30 ], [ "toolset", 30 ] ], - [ [ "oxy_torch", 40 ], [ "welder", 200 ], [ "toolset", 300 ], [ "welder_crude", 300 ] ] + ], "tools": [ + [ [ "soldering_iron", 30 ], [ "toolset", 30 ] ], + [ [ "oxy_torch", 40 ], [ "welder", 200 ], [ "toolset", 300 ], [ "welder_crude", 300 ] ] ], "components": [ [ [ "flamethrower", 1 ] ], [ [ "tazer", 1 ] ], @@ -1276,8 +1279,9 @@ {"id":"SCREW","level":1,"amount":1}, {"id":"WRENCH","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} - ], "tools": [ [ [ "soldering_iron", 40 ], [ "toolset", 40 ] ], - [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "toolset", 45 ], [ "welder_crude", 45 ] ] + ], "tools": [ + [ [ "soldering_iron", 40 ], [ "toolset", 40 ] ], + [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "toolset", 45 ], [ "welder_crude", 45 ] ] ], "components": [ [ [ "power_supply", 2 ] ], [ [ "cable", 20 ] ], @@ -1299,8 +1303,9 @@ {"id":"SCREW","level":1,"amount":1}, {"id":"WRENCH","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} - ], "tools": [ [ [ "soldering_iron", 40 ], [ "toolset", 40 ] ], - [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "toolset", 45 ], [ "welder_crude", 45 ] ] + ], "tools": [ + [ [ "soldering_iron", 40 ], [ "toolset", 40 ] ], + [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "toolset", 45 ], [ "welder_crude", 45 ] ] ], "components": [ [ [ "amplifier", 2 ] ], [ [ "cable", 20 ] ], @@ -1321,8 +1326,9 @@ {"id":"SCREW","level":1,"amount":1}, {"id":"WRENCH","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} - ], "tools": [ [ [ "soldering_iron", 50 ], [ "toolset", 50 ] ], - [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ], [ "welder_crude", 75 ] ] + ], "tools": [ + [ [ "soldering_iron", 50 ], [ "toolset", 50 ] ], + [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ], [ "welder_crude", 75 ] ] ], "components": [ [ [ "power_supply", 2 ] ], [ [ "amplifier", 4 ] ], From 96411b3a247324a636d69295c4e6fa05b1e1961b Mon Sep 17 00:00:00 2001 From: Karol Sobo Date: Mon, 6 Jun 2016 15:39:05 +0200 Subject: [PATCH 010/110] Intends --- data/json/recipes/recipe_deconstruction.json | 29 ++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index b185e5abe87e2..d1dd0741d6aea 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -1113,8 +1113,9 @@ {"id":"SCREW","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} ], - "tools": [ [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ], - [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ], [ "welder_crude", 75 ] ] + "tools": [ + [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ], + [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ], [ "welder_crude", 75 ] ] ], "components": [ [ [ "power_supply", 4 ] ], @@ -1138,8 +1139,8 @@ {"id":"SCREW","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} ], "tools": [ - [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ], - [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ], [ "welder_crude", 75 ] ] + [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ], + [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ], [ "welder_crude", 75 ] ] ], "components": [ [ [ "power_supply", 4 ] ], @@ -1182,8 +1183,8 @@ {"id":"SCREW","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} ], "tools": [ - [ [ "soldering_iron", 10 ], [ "toolset", 10 ] ], - [ [ "oxy_torch", 20 ], [ "welder", 100 ], [ "toolset", 150 ], [ "welder_crude", 150 ] ] + [ [ "soldering_iron", 10 ], [ "toolset", 10 ] ], + [ [ "oxy_torch", 20 ], [ "welder", 100 ], [ "toolset", 150 ], [ "welder_crude", 150 ] ] ], "components": [ [ [ "power_supply", 12 ] ], @@ -1209,8 +1210,8 @@ {"id":"WRENCH","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} ], "tools": [ - [ [ "soldering_iron", 30 ], [ "toolset", 30 ] ], - [ [ "oxy_torch", 40 ], [ "welder", 200 ], [ "toolset", 300 ], [ "welder_crude", 300 ] ] + [ [ "soldering_iron", 30 ], [ "toolset", 30 ] ], + [ [ "oxy_torch", 40 ], [ "welder", 200 ], [ "toolset", 300 ], [ "welder_crude", 300 ] ] ], "components": [ [ [ "flamethrower", 1 ] ], [ [ "tazer", 1 ] ], @@ -1280,8 +1281,8 @@ {"id":"WRENCH","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} ], "tools": [ - [ [ "soldering_iron", 40 ], [ "toolset", 40 ] ], - [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "toolset", 45 ], [ "welder_crude", 45 ] ] + [ [ "soldering_iron", 40 ], [ "toolset", 40 ] ], + [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "toolset", 45 ], [ "welder_crude", 45 ] ] ], "components": [ [ [ "power_supply", 2 ] ], [ [ "cable", 20 ] ], @@ -1304,8 +1305,8 @@ {"id":"WRENCH","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} ], "tools": [ - [ [ "soldering_iron", 40 ], [ "toolset", 40 ] ], - [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "toolset", 45 ], [ "welder_crude", 45 ] ] + [ [ "soldering_iron", 40 ], [ "toolset", 40 ] ], + [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "toolset", 45 ], [ "welder_crude", 45 ] ] ], "components": [ [ [ "amplifier", 2 ] ], [ [ "cable", 20 ] ], @@ -1327,8 +1328,8 @@ {"id":"WRENCH","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} ], "tools": [ - [ [ "soldering_iron", 50 ], [ "toolset", 50 ] ], - [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ], [ "welder_crude", 75 ] ] + [ [ "soldering_iron", 50 ], [ "toolset", 50 ] ], + [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ], [ "welder_crude", 75 ] ] ], "components": [ [ [ "power_supply", 2 ] ], [ [ "amplifier", 4 ] ], From 6b1bca739d99a7cc4f85bc972f8624dfaccf3e17 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 14:18:16 -0400 Subject: [PATCH 011/110] Update pk_critter_zombie.json Adds Scorched Zombies in their various forms to the PK Rebalancing Mod. Detailed in #16822, which was closed because of the obscene amount of updating it required. --- .../mods/PKs_Rebalance/pk_critter_zombie.json | 1083 +++++++++++++---- 1 file changed, 854 insertions(+), 229 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_zombie.json b/data/mods/PKs_Rebalance/pk_critter_zombie.json index 083e1d56dbb3f..587b1162b4a15 100644 --- a/data/mods/PKs_Rebalance/pk_critter_zombie.json +++ b/data/mods/PKs_Rebalance/pk_critter_zombie.json @@ -1,17 +1,127 @@ [ { "type" : "MONSTER", + "id" : "mon_zombie_child_scorched", + "edit-mode" : "override", + "name": "zombie kinderling", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"z", + "color":"i_brown", + "size":"MEDIUM", + "material":"flesh", + "diff":15, + "aggression":100, + "morale":100, + "speed":95, + "melee_skill":2, + "melee_dice":2, + "melee_dice_sides":2, + "melee_cut":2, + "melee_damage" : [ {"damage_type" : "heat", "amount" : 1} ], + "dodge":0, + "armor_bash":3, + "armor_cut":6, + "armor_fire":15, + "armor_acid":3, + "vision_day":25, + "vision_night":3, + "hp":35, + "death_function":["NORMAL"], + "burn_into" : "mon_skeleton_scorched", + "description":"A tiny, still-smoldering body, jumping and kicking and flailing around in a mockery of playground exercise. It does not need a face for you to feel bad about killing it.", + "flags":["SEES", "HEARS", "STUMBLES", "POISON", "GRABS", "NO_BREATHE", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO", "BONES", "GUILT", "CLIMBS"] + },{ + "type" : "MONSTER", + "id" : "mon_zombie_scorched", + "edit-mode" : "override", + "name": "scorched zombie", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"Z", + "color":"i_brown", + "size":"MEDIUM", + "material":"flesh", + "diff":5, + "aggression":100, + "morale":100, + "speed":85, + "melee_skill":3, + "melee_dice":2, + "melee_dice_sides":2, + "melee_cut":4, + "dodge":0, + "armor_bash":4, + "armor_cut":10, + "armor_fire":10, + "armor_acid":3, + "vision_day":15, + "vision_night":5, + "hp":50, + "upgrades":{ + "into": "mon_zombie_scorched_pk", + "half_life": 21 + }, + "death_function":["SMOKEBURST", "NORMAL"], + "burn_into" : "mon_zombie_crawler_scorched", + "description":"Heavily burned zombie that still reeks of charred flesh. Its skin has hardened and cracked in several areas.", + "flags":["SEES", "HEARS", "STUMBLES", "POISON", "GRABS", "NO_BREATHE", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO", "BONES"] + },{ + "type" : "MONSTER", + "id" : "mon_zombie_fiend", + "edit-mode" : "override", + "name": "fiend", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"Z", + "color":"black_white", + "size":"MEDIUM", + "material":"flesh", + "diff":10, + "aggression":100, + "morale":100, + "speed":60, + "melee_skill":4, + "melee_dice":2, + "melee_dice_sides":6, + "melee_cut":6, + "dodge":0, + "armor_bash":8, + "armor_cut":14, + "armor_fire":12, + "armor_acid":4, + "vision_day":20, + "vision_night":10, + "hp":90, + "upgrades":{ + "into": "mon_zombie_fiend_pk", + "half_life": 21 + }, + "death_function":["NORMAL"], + "burn_into" : "mon_zombie_crawler_scorched", + "special_attacks":[["GRAB", 7]], + "description":"Charred zombie with bony plates, spikes and protursions. Moves stiffly about.", + "flags":["SEES", "STUMBLES", "POISON", "NO_BREATHE", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO", "BONES"] + },{ + "type" : "MONSTER", + "id" : "mon_zombie_pig", + "edit-mode" : "modify", + "burn_into" : "mon_zolf_scorched" + },{ + "type" : "MONSTER", "id" : "mon_zoose", "edit-mode" : "modify", - "melee_skill":6, + "melee_skill":4, "melee_dice":3, "melee_dice_sides":6, - "melee_cut":4, + "melee_cut":7, + "armor_acid":2, "hp":230, "special_attacks":[["SMASH", 50]], - "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "BASHES", "WARM", "FUR", "BLEED", "ATTACKMON", "BONES", "FAT", "POISON"], + "burn_into" : "mon_horse_zombie_scorched", + "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "BASHES", "WARM", "FUR", "BLEED", "ATTACKMON", "BONES", "FAT", "POISON", "NO_BREATHE", "REVIVES"], "anger_triggers":["HURT", "PLAYER_CLOSE", "FIRE", "FRIEND_ATTACKED"] - },{ + },{ "type" : "MONSTER", "id" : "mon_zolf", "edit-mode" : "modify", @@ -20,17 +130,18 @@ "melee_dice":2, "melee_dice_sides":5, "melee_cut":5, - "dodge":3, - "armor_bash":5, + "dodge":2, + "armor_bash":3, "armor_cut":1, - "hp":80, + "hp":75, "special_attacks":[ { "type" : "bite", "cooldown" : 7, "no_infection_chance" : 5, "min_mul" : 0.5, "//" : "strong jaws" - }] + }], + "burn_into" : "mon_zolf_scorched" },{ "type" : "MONSTER", "id" : "mon_zougar", @@ -46,20 +157,66 @@ "cooldown" : 12, "max_range" : 6 }, - ["LUNGE", 40]] + ["LUNGE", 40]], + "burn_into" : "mon_zolf_scorched" },{ "type" : "MONSTER", "id" : "mon_zombear", "edit-mode" : "modify", - "melee_dice":4, - "melee_dice_sides":7, - "melee_cut":5, + "melee_dice":2, + "melee_dice_sides":6, + "melee_cut":8, + "melee_damage" : [{"damage_type" : "bash", "amount" : 12}], "special_attacks":[{ - "type" : "bite", - "cooldown" : 15, - "no_infection_chance" : 5, - "min_mul" : 0.75, "//" : "strong jaws" - }] + "type" : "bite", + "cooldown" : 15, + "min_mul" : 0.8, "//" : "strong jaws" + }], + "burn_into" : "mon_bear_smoky" + },{ + "type" : "MONSTER", + "id" : "mon_bear_smoky", + "edit-mode" : "override", + "name": "Smoky bear", + "species":"ZOMBIE", + "default_faction":"bear", + "symbol":"B", + "color":"ltgray", + "size":"LARGE", + "material":"bone", + "diff":10, + "aggression":100, + "morale":100, + "speed":85, + "melee_dice":2, + "melee_dice_sides":4, + "melee_cut":12, + "melee_damage" : [{"damage_type" : "bash", "amount" : 16}], + "dodge":1, + "armor_bash":6, + "armor_cut":12, + "armor_stab":18, + "vision_day":30, + "vision_night":10, + "hp":100, + "special_attacks":[ + ["SMOKECLOUD", 1], { + "type" : "bite", + "cooldown" : 15, + "no_infection_chance" : 5, + "min_mul" : 0.75, "//" : "strong jaws" + }], + "death_function":["SMOKEBURST", "NORMAL"], + "description":"A smoking husk is all that remains of this once proud bear. Its black eyes gaze at you with malice... and hunger.", + "flags":["SEES", "HEARS", "ANIMAL", "BASHES", "ATTACKMON", "BONES", "FIREPROOF", "NO_BREATHE", "POISON", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO"], + "anger_triggers":["HURT", "PLAYER_CLOSE"], + "placate_triggers":["MEAT"], + "categories":["WILDLIFE"] + },{ + "type" : "MONSTER", + "id" : "mon_zombie_electric", + "edit-mode" : "modify", + "burn_into" : "mon_zombie_scorched_shocker" },{ "type" : "MONSTER", "id" : "mon_zombie_brute_shocker", @@ -69,33 +226,33 @@ "melee_dice_sides":8, "melee_cut":2, "dodge":1, - "armor_bash":5, + "armor_bash":6, "armor_cut":8, "hp":240, - "special_when_hit":["ZAPBACK", 75] + "special_when_hit":["ZAPBACK", 75], + "burn_into" : "mon_zombie_fiend_shocker" },{ "type" : "MONSTER", "id" : "mon_zombie", "edit-mode" : "modify", - "upgrades":{ + "upgrades":{ "into_group": "GROUP_ZOMBIE_UPGRADE", "half_life": 10 - }, - "//": "As a general note, I feel like the zombie evolutions come too slowly. I play with 28 day seasons on, and by day 14 I have decent weapon/armor/skills. That said I do like how it takes a year or more before the endstages are reached. And since I do play with increased Zed spawns and slower seasons I know that my cheese's effect on my balancing can be mitigated enough to allow other players who may not use all available means." + } },{ "type" : "MONSTER", "id" : "mon_zombie_survivor", "edit-mode" : "modify", "hp":160, - "//": "With that update on Survivors inbound I may have to tweak this guy." + "burn_into" : "mon_zombie_scorched_pk" },{ "type" : "MONSTER", "id" : "mon_zombie_child", "edit-mode" : "modify", - "upgrades":{ + "upgrades":{ "into_group": "GROUP_CHILD_ZOMBIE_UPGRADE", - "half_life": 14 - } + "half_life": 11 + } },{ "type" : "MONSTER", "id" : "mon_zombie_biter", @@ -110,92 +267,111 @@ "melee_cut":4, "dodge":3, "armor_bash":5, - "armor_cut":2, + "armor_cut":1, "vision_day":25, "vision_night":15, "death_drops": "default_zombie_death_drops", "hp":100, - "description":"A distorted human body with sleek muscles. Its jaws have elongated into a ursine-like snout, dripping with foul smelling saliva." + "description":"A distorted human body with sleek muscles. Its jaws have elongated into a ursine-like snout, dripping with foul smelling saliva.", + "burn_into" : "mon_zombie_scorched" },{ "type" : "MONSTER", "id" : "mon_zombie_swimmer", "edit-mode" : "modify", - "upgrades":{ - "into": "mon_zombie_mancroc", - "half_life": 14 - } + "upgrades":{ + "into": "mon_zombie_mancroc", + "half_life": 14 + }, + "burn_into" : "mon_zombie_scorched" },{ "type" : "MONSTER", "id" : "mon_skeleton", "edit-mode" : "modify", - "upgrades":{ - "into": "mon_skeleton_pk", - "half_life": 14 - } + "upgrades":{ + "into": "mon_skeleton_pk", + "half_life": 14 + }, + "burn_into" : "mon_skeleton_scorched", + "flags":["SEES", "HARDTOSHOOT", "REVIVES", "NO_BREATHE", "BONES", "NO_NECRO"] },{ "type" : "MONSTER", "id" : "mon_zombie_crawler", "edit-mode" : "modify", - "upgrades":{ - "into": "mon_zombie_crawler_pk", - "half_life": 14 - } + "upgrades":{ + "into": "mon_zombie_crawler_pk", + "half_life": 14 + }, + "burn_into" : "mon_zombie_crawler_scorched" },{ "type" : "MONSTER", "id" : "mon_zombie_dog", "edit-mode" : "modify", - "upgrades":{ - "into": "mon_zombie_dog_pk", - "half_life": 14 - } + "upgrades":{ + "into": "mon_zombie_dog_pk", + "half_life": 14 + }, + "burn_into" : "mon_zolf_scorched" },{ "type" : "MONSTER", "id" : "mon_dog_zombie_cop", "edit-mode" : "modify", - "upgrades":{ - "into": "mon_dog_zombie_cop_pk", - "half_life": 21 - } + "upgrades":{ + "into": "mon_dog_zombie_cop_pk", + "half_life": 21 + }, + "burn_into" : "mon_zolf_scorched" },{ "type" : "MONSTER", - "id" : "mon_zombie_tough", + "id" : "mon_dog_zombie_rot", "edit-mode" : "modify", - "upgrades":{ - "into": "mon_zombie_hollow", - "half_life": 21 - } + "upgrades":{ + "into": "mon_dog_zombie_cop_pk", + "half_life": 21 + }, + "burn_into" : "mon_zolf_scorched" },{ "type" : "MONSTER", - "id" : "mon_zombie_smoker", + "id" : "mon_zombie_tough", "edit-mode" : "modify", - "upgrades":{ - "into": "mon_zombie_gasbag_pk", - "half_life": 21 - } + "upgrades":{ + "into": "mon_zombie_hollow", + "half_life": 21 + }, + "burn_into" : "mon_zombie_smoker" },{ "type" : "MONSTER", "id" : "mon_zombie_gasbag", "edit-mode" : "modify", - "upgrades":{ - "into": "mon_zombie_gasbag_pk", - "half_life": 21 - } + "upgrades":{ + "into": "mon_zombie_gasbag_pk", + "half_life": 21 + } + },{ + "type" : "MONSTER", + "id" : "mon_zombie_smoker", + "edit-mode" : "modify", + "upgrades":{ + "into": "mon_zombie_gasbag_pk", + "half_life": 28 + }, + "burn_into" : "mon_zombie_scorched_pk" },{ "type" : "MONSTER", "id" : "mon_zombie_shady", "edit-mode" : "modify", - "upgrades":{ - "into": "mon_zombie_shady_pk", - "half_life": 28 - } + "upgrades":{ + "into": "mon_zombie_shady_pk", + "half_life": 28 + }, + "burn_into" : "mon_zombie_crawler_pk" },{ "type" : "MONSTER", "id" : "mon_dog_skeleton", "edit-mode" : "modify", - "upgrades":{ - "into": "mon_dog_skeleton_pk", - "half_life": 35 - } + "upgrades":{ + "into": "mon_dog_skeleton_pk", + "half_life": 35 + } },{ "type" : "MONSTER", "id" : "mon_zombie_hollow", @@ -206,44 +382,78 @@ "melee_dice_sides":8, "melee_cut":3, "dodge":4, - "armor_bash":8, - "armor_cut":6, + "armor_bash":7, + "armor_cut":5, "armor_stab":10, - "upgrades":{ - "into": "mon_zombie_hollow_pk", - "half_life": 35 - }, + "upgrades":{ + "into": "mon_zombie_hollow_pk", + "half_life": 35 + }, "hp":115, "death_function": "NORMAL", + "burn_into" : "mon_zombie_scorched_pk", "flags":["SEES", "HEARS", "REVIVES", "STUMBLES", "SMELLS", "WARM", "BASHES", "GRABS", "GROUP_BASH", "POISON", "NO_BREATHE"] },{ "type" : "MONSTER", "id" : "mon_zombie_master", "edit-mode" : "modify", - "upgrades":{ - "into": "mon_zombie_lord", - "half_life": 35 - }, - "death_function":["NORMAL", "BLOBSPLIT"], - "special_attacks":[["UPGRADE", 20], ["FORMBLOB", 300]] + "upgrades":{ + "into": "mon_zombie_lord", + "half_life": 35 + }, + "death_function":["NORMAL", "BLOBSPLIT"], + "burn_into" : "mon_zombie_scorched_master", + "special_attacks":[["UPGRADE", 20], ["FORMBLOB", 300]] },{ "type" : "MONSTER", "id" : "mon_zombie_necro", "edit-mode" : "modify", - "upgrades":{ - "into": "mon_zombie_lord", - "half_life": 42 - }, - "death_function":["NORMAL", "BLOBSPLIT"], - "special_attacks":[["RESURRECT", 20], ["FORMBLOB", 300]] + "upgrades":{ + "into": "mon_zombie_lord", + "half_life": 42 + }, + "death_function":["NORMAL", "BLOBSPLIT"], + "burn_into" : "mon_zombie_scorched_necro", + "special_attacks":[["RESURRECT", 20], ["FORMBLOB", 300]] },{ "type" : "MONSTER", "id" : "mon_zombie_hulk", "edit-mode" : "modify", - "upgrades":{ - "into": "mon_zombie_hulk_pk", - "half_life": 42 - } + "upgrades":{ + "into": "mon_zombie_hulk_pk", + "half_life": 49 + }, + "burn_into" : "mon_zombie_fiend_pk" + },{ + "type" : "MONSTER", + "edit-mode" : "modify", + "id" : "mon_zombie_mancroc", + "speed":100, + "melee_skill":4, + "melee_dice":3, + "melee_dice_sides":5, + "melee_cut":8, + "dodge":2, + "armor_bash":3, + "armor_cut":6, + "vision_day":25, + "vision_night":5, + "death_drops": "mon_zombie_swimmer_death_drops", + "hp":120, + "death_function":["NORMAL"], + "burn_into" : "mon_zombie_scorched_pk", + "special_attacks":[ + { + "type" : "bite", + "cooldown" : 10, + "accuracy" : 7, + "damage_max_instance" : [ + {"damage_type" : "stab", "amount" : 8, "armor_multiplier" : 0.3}, + {"damage_type" : "bash", "amount" : 18, "armor_multiplier" : 0.3} + ] + }, + ["GRAB", 20], ["GRAB_DRAG", 10] + ] },{ "type" : "MONSTER", "edit-mode" : "modify", @@ -255,13 +465,13 @@ "melee_cut":6, "dodge":4, "armor_bash":12, - "armor_cut":8, - "armor_stab":10, + "armor_cut":6, "vision_day":40, "vision_night":20, "death_drops": "default_zombie_death_drops", + "burn_into" : "mon_zombie_fiend_pk", "hp":220, - "special_attacks":[["SMASH", 40], ["STRETCH_ATTACK", 3], ["LONGSWIPE", 20]] + "special_attacks":[["SMASH", 40], ["STRETCH_ATTACK", 20], ["LONGSWIPE", 20]] },{ "type" : "MONSTER", "edit-mode" : "modify", @@ -274,10 +484,11 @@ "dodge":3, "armor_bash":10, "armor_cut":14, - "armor_stab":8, + "armor_stab":6, "vision_day":40, "vision_night":3, "death_drops": "default_zombie_death_drops", + "burn_into" : "mon_zombie_fiend_pk", "hp":280, "death_function":["NORMAL"], "special_attacks":[["SMASH", 30], ["BIO_OP_TAKEDOWN", 20], ["RANGED_PULL", 20], ["GRAB_DRAG", 10], @@ -289,6 +500,36 @@ }] },{ "type" : "MONSTER", + "id" : "mon_horse_zombie", + "name": "zombie horse", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"H", + "color":"green", + "size":"LARGE", + "material":"flesh", + "diff":16, + "aggression":70, + "morale":100, + "speed":180, + "melee_skill":5, + "melee_dice":2, + "melee_dice_sides":8, + "melee_damage" : [{"damage_type" : "stab", "amount" : 14}], + "dodge":1, + "armor_bash":4, + "armor_cut":2, + "armor_acid":2, + "vision_day":35, + "hp":140, + "death_function":"NORMAL", + "burn_into" : "mon_horse_zombie_scorched", + "description":"This horse has a brackish liquid coating its bared teeth, as well as the occasional oozing wounds breaking the otherwise glorious sheen of its hair. Its hooves are fearsome weapons.", + "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "WARM", "FUR", "BONES", "FAT", "NO_BREATHE", "POISON", "REVIVES", "PUSH_MON", "STUMBLES", "BASHES"], + "placate_triggers":["PLAYER_WEAK"], + "fear_triggers": ["FIRE"] + },{ + "type" : "MONSTER", "id" : "mon_zombie_pk", "name": "hungry zombie", "species":"ZOMBIE", @@ -306,8 +547,8 @@ "melee_dice_sides":7, "melee_cut":2, "dodge":2, - "armor_bash":4, - "armor_cut":4, + "armor_bash":3, + "armor_cut":3, "vision_day":40, "vision_night":3, "death_drops": "default_zombie_death_drops", @@ -317,6 +558,7 @@ }, "hp":100, "death_function":"NORMAL", + "burn_into" : "mon_zombie_scorched_pk", "special_attacks":[["GRAB", 7], { "type" : "bite", @@ -341,12 +583,14 @@ "speed":70, "melee_skill":5, "melee_dice":2, - "melee_dice_sides":7, - "melee_cut":4, + "melee_dice_sides":3, + "melee_cut":3, + "melee_damage" : [{"damage_type" : "stab", "amount" : 6}], "dodge":1, - "armor_bash":10, - "armor_cut":2, - "vision_day":40, + "armor_bash":8, + "armor_cut":1, + "armor_stab":6, + "vision_day":35, "vision_night":3, "death_drops": "default_zombie_death_drops", "upgrades":{ @@ -355,14 +599,15 @@ }, "hp":80, "death_function":["NORMAL"], + "burn_into" : "mon_zombie_crawler_pk", "special_attacks":[ { "type" : "bite", - "cooldown" : 10, + "cooldown" : 5, "accuracy" : 7 }, ["GRAB", 6]], "description":"A corpse that rots even as it moves to kill. Swarms of flies dart in and out of this monsters many bloated and oozing wounds..", - "flags":["SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "BLEED", "NO_BREATHE", "REVIVES", "BONES", "PUSH_MON"], + "flags":["SEES", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "BLEED", "NO_BREATHE", "REVIVES", "BONES", "PUSH_MON"], "categories":["CLASSIC"] },{ "type" : "MONSTER", @@ -380,8 +625,9 @@ "speed":95, "melee_skill":5, "melee_dice":3, - "melee_dice_sides":6, + "melee_dice_sides":3, "melee_cut":5, + "melee_damage" : [ {"damage_type" : "stab", "amount" : 8} ], "dodge":3, "armor_bash":2, "armor_cut":12, @@ -394,16 +640,17 @@ "into": "mon_skeleton_husk", "half_life": 35 }, + "burn_into" : "mon_skeleton_scorched", "hp":65, "death_function":["NORMAL"], "special_attacks":[{ "type" : "bite", "cooldown" : 10, - "no_infection_chance" : 50 + "no_infection_chance" : 20 }, ["LUNGE", 30]], "description":"Its skin stretched so tight as to have split in several places, this once-human corpse bears bones jutting out at unnatural angles.", - "flags":["SEES", "HEARS", "BLEED", "STUMBLES", "HARDTOSHOOT", "REVIVES", "NO_BREATHE"] + "flags":["SEES", "HEARS", "STUMBLES", "HARDTOSHOOT", "REVIVES", "NO_BREATHE", "BONES", "NO_NECRO"] },{ "type" : "MONSTER", "id" : "mon_skeleton_husk", @@ -420,8 +667,9 @@ "speed":110, "melee_skill":6, "melee_dice":3, - "melee_dice_sides":6, - "melee_cut":9, + "melee_dice_sides":3, + "melee_cut":7, + "melee_damage" : [ {"damage_type" : "stab", "amount" : 12} ], "dodge":5, "armor_bash":4, "armor_cut":15, @@ -434,15 +682,16 @@ "special_attacks":[{ "type" : "bite", "cooldown" : 10, - "no_infection_chance" : 50 + "no_infection_chance" : 20 }, ["LUNGE", 15], ["IMPALE",30]], - "description":"So dessicated that it makes sounds like rustling leaves as it shuffles aimlessly, this abomination is hardly more than a tanned hide pulled over a bone frame. What flesh it does have seems to be devoted to the perception of prey; at which it launches itself at with abandon.", - "flags":["SEES", "KEENNOSE", "HEARS", "GOODHEARING", "BLEED", "STUMBLES", "HARDTOSHOOT", "REVIVES", "NO_BREATHE"] + "burn_into" : "mon_skeleton_scorched", + "description":"So desiccated that it makes sounds like rustling leaves as it shuffles aimlessly, this abomination is hardly more than a tanned hide pulled over a bone frame. What flesh it does have seems to be devoted to the perception of prey; at which it launches itself at with abandon.", + "flags":["SEES", "HEARS", "STUMBLES", "HARDTOSHOOT", "REVIVES", "NO_BREATHE", "BONES", "NO_NECRO"] },{ "type" : "MONSTER", "id" : "mon_zombie_swimmer_pk", - "name": "swimming zombie", + "name": "swimmer zombie", "species":"ZOMBIE", "default_faction":"zombie", "symbol":"Z", @@ -452,18 +701,17 @@ "diff":10, "aggression":100, "morale":100, - "speed":85, + "speed":90, "melee_skill":5, "melee_dice":2, "melee_dice_sides":6, "melee_cut":3, "dodge":2, - "armor_bash":5, - "armor_cut":1, - "armor_stab":1, + "armor_bash":2, "vision_day":40, "vision_night":5, "death_drops": "mon_zombie_swimmer_death_drops", + "burn_into" : "mon_zombie_scorched", "upgrades":{ "into": "mon_zombie_scales", "half_life": 14 @@ -479,35 +727,6 @@ "flags":["SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "BLEED", "SWIMS", "REVIVES", "BONES", "PUSH_MON"] },{ "type" : "MONSTER", - "edit-mode" : "modify", - "id" : "mon_zombie_mancroc", - "speed":100, - "melee_skill":4, - "melee_dice":3, - "melee_dice_sides":5, - "melee_cut":8, - "dodge":2, - "armor_bash":8, - "armor_cut":10, - "vision_day":25, - "vision_night":5, - "death_drops": "mon_zombie_swimmer_death_drops", - "hp":120, - "death_function":["NORMAL"], - "special_attacks":[ - { - "type" : "bite", - "cooldown" : 10, - "accuracy" : 7, - "damage_max_instance" : [ - {"damage_type" : "stab", "amount" : 8, "armor_multiplier" : 0.3}, - {"damage_type" : "bash", "amount" : 18, "armor_multiplier" : 0.3} - ] - }, - ["GRAB", 20], ["GRAB_DRAG", 10] - ] - },{ - "type" : "MONSTER", "id" : "mon_zombie_scales", "name": "encrusted zombie", "species":"ZOMBIE", @@ -516,23 +735,24 @@ "color":"blue_cyan", "size":"MEDIUM", "material":"flesh", - "diff":14, + "diff":16, "aggression":100, "morale":100, - "speed":75, - "melee_skill":7, + "speed":85, + "melee_skill":5, "melee_dice":2, "melee_dice_sides":8, "melee_cut":1, "dodge":2, - "armor_bash":12, - "armor_cut":16, + "armor_bash":10, + "armor_cut":18, "armor_stab":12, - "armor_fire":5, + "armor_fire":8, "vision_day":40, "vision_night":4, "hp":120, "death_function":["NORMAL"], + "burn_into" : "mon_zombie_fiend", "death_drops": { "subtype": "collection", "groups": [ @@ -541,10 +761,9 @@ }, "special_attacks":[{ "type" : "bite", - "cooldown" : 8, - "no_infection_chance" : 2 + "cooldown" : 8 }, - ["GRAB", 5], ["GRAB_DRAG", 2]], + ["GRAB", 25], ["GRAB_DRAG", 15]], "description":"This zombie seems to be more comfortable in water than out. Its skin has hardened into a flaky chitinous layer, and its ponderous movements belie its hostility.", "flags":["CHITIN", "SEES", "HEARS", "GOODHEARING", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "BLEED", "SWIMS", "REVIVES", "BONES", "PUSH_MON"] },{ @@ -563,15 +782,15 @@ "speed":85, "melee_skill":8, "melee_dice":2, - "melee_dice_sides":14, + "melee_dice_sides":12, "melee_cut":5, - "dodge":5, - "armor_bash":14, - "armor_cut":10, + "dodge":4, + "armor_bash":10, + "armor_cut":6, "armor_acid":2, "armor_fire":2, "vision_day":45, - "vision_night":5, + "vision_night":5, "hp":140, "death_function":"NORMAL", "special_attacks":[["STRETCH_BITE", 15], ["STRETCH_ATTACK", 10]], @@ -587,31 +806,28 @@ "color":"green_yellow", "size":"MEDIUM", "material":"flesh", - "diff":24, + "diff":20, "aggression":100, "morale":100, - "speed":45, - "melee_skill":4, + "speed":85, + "melee_skill":5, "melee_dice":1, - "melee_dice_sides":13, - "melee_cut":2, - "dodge":2, - "armor_bash":5, - "armor_cut":5, - "vision_day":30, - "vision_night":3, - "death_drops": "default_zombie_death_drops", + "melee_dice_sides":10, + "melee_cut":1, + "melee_damage" : [ {"damage_type" : "acid", "amount" : 8} ], + "dodge":1, + "armor_bash":7, + "armor_cut":4, + "armor_fire":3, + "vision_day":15, + "vision_night":35, "hp":90, - "death_function":["ACID", "NORMAL"], - "special_attacks":[{ - "type" : "bite", - "cooldown" : 10 - }, - ["ACID_ACCURATE", 30], ["ACID_BARF", 30], ["GRAB", 20]], - "special_when_hit":["ACIDSPLASH", 80], - "description":"Dragging its distended belly with powerful arms, this zombie's mangled, chunky legs appear to be leaking a flim of acid. It appears to have poor sight, and might be dangerous to attack. Then again, it seems to be capable of spitting acid as well.", - "flags":["ACIDPROOF", "ACID_BLOOD", "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GRABS", "POISON", "NO_BREATHE", "REVIVES", "BONES"], - "categories":["CLASSIC"] + "death_function":["NORMAL"], + "burn_into" : "mon_zombie_crawler_scorched", + "special_when_hit":["ACIDSPLASH", 7], + "special_attacks": [["ACID_BARF", 30], ["GRAB", 60], ["FORMBLOB", 240]], + "description":"A revolting crawling monster that excretes a copious amount of some biological goo from a gaping chest cavity. Every so often a blob emerges from the charred and mangled stumps that used to be legs.", + "flags":["ACIDPROOF", "ACID_BLOOD", "SEES", "HEARS", "POISON", "NO_BREATHE", "REVIVES", "NO_NECRO", "REVIVES_HEALTHY", "PLASTIC", "SLUDGEPROOF", "SLUDGETRAIL", "FLAMMABLE", "NIGHT_INVISIBILITY", "ABSORBS", "SWIMS"] },{ "type" : "MONSTER", "id" : "mon_zombie_child_pk", @@ -631,8 +847,8 @@ "melee_dice_sides":4, "melee_cut":1, "dodge":2, - "armor_bash":4, - "armor_cut":4, + "armor_bash":1, + "armor_cut":1, "vision_day":30, "vision_night":3, "death_drops": { @@ -643,11 +859,12 @@ [ "child_items", 25 ] ]}, "upgrades":{ - "into": "mon_zombie_child_reaver", - "half_life": 28 - }, + "into": "mon_zombie_child_reaver", + "half_life": 21 + }, "hp":55, "death_function":["NORMAL"], + "burn_into" : "mon_zombie_child_scorched", "special_attacks":[{ "type" : "bite", "cooldown" : 10, @@ -669,13 +886,13 @@ "diff":16, "aggression":90, "morale":100, - "speed":110, + "speed":105, "melee_skill":6, "melee_dice":4, "melee_dice_sides":5, "melee_cut":5, - "dodge":5, - "armor_bash":10, + "dodge":4, + "armor_bash":8, "armor_cut":6, "armor_fire":4, "armor_acid":4, @@ -690,13 +907,14 @@ ]}, "hp":80, "death_function":["NORMAL"], + "burn_into" : "mon_zombie_child_scorched_pk", "special_attacks":[{ "type" : "bite", "cooldown" : 2, "min_mul" : 0.50 } ], - "description":"Its face disfigured and scabbed over, this child-sized corpse has been forged through constant combat, imbibing it with remarkable agility, speed, and savage brutality. It bears scars that indicate that this isn't the first (or second) time it has died.", + "description":"Its face disfigured and scabbed over, this foul child-sized corpse has been forged through constant combat, imbibing it with remarkable agility, speed, and savage brutality. It bears scars that indicate that this isn't the first (or second) time it has died.", "flags":["SEES", "HEARS", "SMELLS", "WARM", "BASHES", "BLEED", "POISON", "NO_BREATHE", "REVIVES", "BONES"], "categories":["CLASSIC"] },{ @@ -719,8 +937,7 @@ "melee_cut":8, "dodge":6, "armor_bash":12, - "armor_cut":12, - "armor_stab":12, + "armor_cut":8, "armor_acid":3, "armor_fire":3, "vision_day":50, @@ -728,7 +945,8 @@ "death_drops": "default_zombie_death_drops", "hp":180, "death_function":["NORMAL", "BLOBSPLIT"], - "special_attacks":[["UPGRADE", 30], ["RESURRECT", 30], ["FORMBLOB", 180], ["LONGSWIPE", 10]], + "burn_into" : "mon_zombie_scorched_necro", + "special_attacks":[["UPGRADE", 30], ["RESURRECT", 30], ["FORMBLOB", 180], ["LONGSWIPE", 15]], "description":"Standing with erect back and mocking smile, this graceful zombie appears to actually direct nearby zombies with glares and the twitching of its jagged claws. Its skin is a revolting shade of pink, and every once in a while it stops what it is doing to excrete a few gooey, animate blobs.", "flags":["SEES", "HEARS", "GOODHEARING", "SMELLS", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "BONES"], "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK"], @@ -747,15 +965,16 @@ "aggression":50, "morale":90, "speed":100, - "melee_skill":7, + "melee_skill":6, "melee_dice":3, - "melee_dice_sides":8, - "melee_cut":3, + "melee_dice_sides":6, + "melee_damage" : [ {"damage_type" : "true", "amount" : 1} ], "dodge":5, - "armor_bash":8, - "armor_cut":15, + "armor_bash":6, + "armor_cut":16, + "armor_acid":2, "armor_fire":5, - "vision_day":25, + "vision_day":10, "vision_night":50, "hp":90, "death_function":"NORMAL", @@ -764,7 +983,7 @@ "cooldown" : 5 }, ["GRAB", 4]], "description":"The permanent shadow around this gaunt figure makes it hard to make out. What you can see appears translucent and shimmering. It is disoriented in light, and actively avoids fire.", - "flags":["HARDTOSHOOT", "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "BLEED", "NO_BREATHE", "REVIVES", "BONES", "PUSH_MON", "NIGHT_INVISIBILITY", "SWIMS"], + "flags":["HARDTOSHOOT", "SEES", "HEARS", "SMELLS", "STUMBLES", "BASHES", "GROUP_BASH", "POISON", "BLEED", "NO_BREATHE", "REVIVES", "BONES", "PUSH_MON", "NIGHT_INVISIBILITY", "SWIMS", "PLASTIC"], "categories":["CLASSIC"], "anger_triggers":["PLAYER_CLOSE", "FRIEND_DIED", "STALK", "HURT"], "placate_triggers":["FIRE"] @@ -782,12 +1001,12 @@ "aggression":100, "morale":100, "speed":150, - "melee_skill":7, + "melee_skill":6, "melee_dice":2, "melee_dice_sides":20, - "melee_cut":5, + "melee_cut":4, "dodge":4, - "armor_bash":20, + "armor_bash":14, "armor_cut":20, "armor_stab":10, "armor_fire": 5, @@ -796,9 +1015,10 @@ "death_drops": "mon_zombie_hulk_death_drops", "hp":650, "death_function":["NORMAL"], + "burn_into" : "mon_zombie_fiend_pk", "special_attacks":[["SMASH", 20], ["BIO_OP_TAKEDOWN", 30]], "description":"Rumored to be the conjoining of several bodies, the massive Zombie Tank is perhaps the ultimate tool of destruction. Making up for what it lacks in skill with brutality, it is the wrecking ball of the zombie scourge.", - "flags":["SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "DESTROYS", "POISON", "ATTACKMON", "LEATHER", "NO_BREATHE", "REVIVES", "BONES", "FAT", "PUSH_MON"] + "flags":["SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "BLEED", "DESTROYS", "POISON", "ATTACKMON", "LEATHER", "NO_BREATHE", "REVIVES", "BONES", "FAT", "PUSH_MON"] },{ "type" : "MONSTER", "id" : "mon_zombie_gasbag_pk", @@ -815,24 +1035,21 @@ "speed":100, "melee_skill":7, "melee_dice":2, - "melee_dice_sides":13, - "melee_cut":0, - "dodge":3, + "melee_dice_sides":10, + "melee_damage" : [ {"damage_type" : "bash", "amount" : 7} ], + "dodge":2, "armor_bash":16, - "armor_cut":5, + "armor_cut":2, + "armor_stab":12, "armor_fire":10, "armor_acid":2, "vision_day":40, "vision_night":4, "hp":110, "death_function":["GAS", "BOOMER_GLOW"], - "special_attacks":[{ - "type" : "bite", - "cooldown" : 30 - }, - ["GRAB_DRAG", 12], ["GRAB", 8], ["STRETCH_ATTACK", 15]], + "special_attacks":[["GRAB_DRAG", 12], ["GRAB", 8], ["STRETCH_ATTACK", 15]], "description":"A fetid body with a featureless face that emits a noxious gas of unknown makeup. Its skin knots and reforms into putty-like globs as it walks and attacks, and bullets seem to pass through its morphing form. A glimmering sludge drips from its open mouth.", - "flags":["LEAKSGAS", "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "HARDTOSHOOT", "NO_BREATHE", "REVIVES", "BONES", "PUSH_MON"] + "flags":["LEAKSGAS", "SEES", "HEARS", "STUMBLES", "BASHES", "GROUP_BASH", "POISON", "HARDTOSHOOT", "NO_BREATHE", "REVIVES", "BONES", "PUSH_MON"] },{ "type" : "MONSTER", "id" : "mon_zombie_dog_pk", @@ -852,12 +1069,13 @@ "melee_dice_sides":15, "melee_cut":3, "dodge":2, - "armor_bash":4, - "armor_cut":4, + "armor_bash":1, + "armor_cut":1, "vision_day":40, "vision_night":3, "hp":55, "death_function":"NORMAL", + "burn_into" : "mon_dog_skeleton_pk", "special_attacks":[ { "type" : "bite", @@ -867,7 +1085,7 @@ ["LUNGE", 30] ], "description":"Its fur pulled taunt and dyed a faint green, this once-dog is now an accomplished pack hunter.", - "flags":["SEES", "HEARS", "SMELLS", "KEENNOSE", "STUMBLES", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "FUR", "BONES"] + "flags":["SEES", "HEARS", "SMELLS", "KEENNOSE", "STUMBLES", "BLEED", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "FUR", "BONES"] },{ "type" : "MONSTER", "id" : "mon_dog_skeleton_pk", @@ -884,13 +1102,14 @@ "speed":110, "melee_skill":9, "melee_dice":3, - "melee_dice_sides":8, + "melee_dice_sides":7, "melee_cut":7, + "melee_damage" : [ {"damage_type" : "heat", "amount" : 3} ], "dodge":4, - "armor_bash":8, + "armor_bash":4, "armor_cut":12, - "armor_stab":20, - "armor_acid":5, + "armor_stab":24, + "armor_acid":4, "armor_fire":15, "vision_day":40, "vision_night":4, @@ -905,7 +1124,7 @@ }, ["SHRIEK_ALERT", 50], ["SHRIEK_STUN", 1]], "description":"Through its smoke you can make out a lithe, tightly wound frame. From time to time it emits a coarse, rumbling howl that sounds like it came from the bowels of the Earth.", - "flags":["SEES", "HEARS", "NO_BREATHE", "HARDTOSHOOT", "REVIVES", "BASHES", "WARM"] + "flags":["SEES", "HEARS", "NO_BREATHE", "HARDTOSHOOT", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO", "BASHES", "WARM"] },{ "type" : "MONSTER", "id" : "mon_dog_zombie_cop_pk", @@ -922,12 +1141,13 @@ "speed":95, "melee_skill":7, "melee_dice":2, - "melee_dice_sides":10, + "melee_dice_sides":9, "melee_cut":2, - "dodge":3, + "melee_damage" : [ {"damage_type" : "acid", "amount" : 2} ], + "dodge":1, "armor_bash":20, - "armor_cut":6, - "armor_stab":6, + "armor_cut":1, + "armor_stab":4, "vision_day":40, "vision_night":4, "hp":50, @@ -949,8 +1169,413 @@ "max_range" : 3 }, ["LUNGE", 30], ["SUICIDE", 150]], - "description":"This engorged police dog has long since overgrown its armor and sloshes audibly as it erratically leaps after new prey. Its rubbery body appears to both slow it down some and resist blunt trauma.", + "description":"This engorged dog sloshes audibly as it erratically leaps after new prey. Its rubbery body appears to both slow it down some and resist blunt trauma.", "flags":["SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "FUR", "BONES", "PUSH_MON"], "categories":["CLASSIC"] + },{ + "type" : "MONSTER", + "id" : "mon_zombie_scorched_pk", + "name": "scorched zombie", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"Z", + "color":"i_brown", + "size":"MEDIUM", + "material":"flesh", + "diff":14, + "aggression":100, + "morale":100, + "speed":90, + "melee_skill":5, + "melee_dice":2, + "melee_dice_sides":7, + "melee_cut":4, + "dodge":0, + "armor_bash":6, + "armor_cut":14, + "armor_fire":12, + "armor_acid":4, + "vision_day":20, + "vision_night":7, + "hp":65, + "death_function":["SMOKEBURST", "NORMAL"], + "burn_into" : "mon_zombie_scorched", + "description":"Heavily burned zombie that still reeks of charred flesh. Its skin has hardened and cracked in several areas.", + "flags":["SEES", "HEARS", "STUMBLES", "POISON", "GRABS", "NO_BREATHE", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO", "BONES"] + },{ + "type" : "MONSTER", + "id" : "mon_zombie_scorched_shocker", + "name": "scorched zombie", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"Z", + "color":"i_brown", + "size":"MEDIUM", + "material":"flesh", + "diff":18, + "aggression":100, + "morale":100, + "speed":95, + "melee_skill":5, + "melee_dice":2, + "melee_dice_sides":4, + "melee_cut":4, + "melee_damage" : [ {"damage_type" : "electric", "amount" : 6} ], + "dodge":0, + "armor_bash":5, + "armor_cut":12, + "armor_fire":12, + "armor_acid":4, + "vision_day":20, + "vision_night":7, + "luminance":2, + "hp":70, + "death_function":["SMOKEBURST", "NORMAL"], + "special_when_hit":["ZAPBACK", 25], + "burn_into" : "mon_zombie_scorched_pk", + "description":"Heavily burned zombie that still reeks of charred flesh. Its skin has hardened and cracked in several areas. From various wounds a faint crackling can be seen.", + "flags":["SEES", "HEARS", "STUMBLES", "POISON", "GRABS", "NO_BREATHE", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO", "BONES", "CBM_CIV", "ELECTRIC"] + },{ + "type" : "MONSTER", + "id" : "mon_zombie_fiend_pk", + "name": "fiend", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"Z", + "color":"black_white", + "size":"MEDIUM", + "material":"flesh", + "diff":16, + "aggression":100, + "morale":100, + "speed":65, + "melee_skill":5, + "melee_dice":2, + "melee_dice_sides":8, + "melee_cut":10, + "dodge":0, + "armor_bash":10, + "armor_cut":18, + "armor_fire":15, + "armor_acid":5, + "vision_day":25, + "vision_night":12, + "hp":140, + "death_function":["NORMAL"], + "burn_into" : "mon_zombie_fiend", + "special_attacks":[["GRAB", 7], ["SMASH", 90]], + "description":"Charred zombie with bony plates, spikes and protrusions. Moves stiffly about.", + "flags":["SEES", "STUMBLES", "POISON", "NO_BREATHE", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO", "BONES"] + },{ + "type" : "MONSTER", + "id" : "mon_zombie_fiend_shocker", + "name": "fiend", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"Z", + "color":"black_white", + "size":"MEDIUM", + "material":"flesh", + "diff":20, + "aggression":100, + "morale":100, + "speed":75, + "melee_skill":5, + "melee_dice":2, + "melee_dice_sides":8, + "melee_cut":6, + "melee_damage" : [ {"damage_type" : "electric", "amount" : 8} ], + "dodge":0, + "armor_bash":8, + "armor_cut":14, + "armor_fire":14, + "armor_acid":5, + "vision_day":25, + "vision_night":10, + "luminance":6, + "hp":180, + "death_function":["NORMAL"], + "burn_into" : "mon_zombie_fiend_pk", + "special_attacks":[["GRAB", 7], ["SMASH", 90]], + "special_when_hit": ["ZAPBACK", 20], + "description":"Charred zombie with bony plates, spikes and protrusions. Moves stiffly about. Occasionally small bursts of electricity arch from its hands.", + "flags":["SEES", "STUMBLES", "POISON", "NO_BREATHE", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO", "BONES", "CBM_SUBS", "ELECTRIC"] + },{ + "type" : "MONSTER", + "id" : "mon_zombie_crawler_scorched", + "name": "gutted zombie", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"Z", + "color":"dkgray_green", + "size":"MEDIUM", + "material":"flesh", + "diff":1, + "aggression":100, + "morale":100, + "speed":35, + "melee_skill":3, + "melee_dice":1, + "melee_dice_sides":3, + "melee_cut":2, + "dodge":0, + "armor_bash":6, + "armor_cut":10, + "armor_fire":20, + "armor_acid":10, + "vision_day":10, + "vision_night":3, + "hp":35, + "death_function":["SMOKEBURST", "NORMAL", "BLOBSPLIT"], + "burn_into" : "mon_skeleton_scorched", + "description":"Burned to the point of near blob-exsanguination, this weak zombie is hardly a threat to anything.", + "flags":["SEES", "STUMBLES", "POISON", "GRABS", "NO_BREATHE", "BONES", "REVIVES", "NO_NECRO", "SWIMS"] + },{ + "type" : "MONSTER", + "id" : "mon_skeleton_scorched", + "name": "gutted zombie", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"Z", + "color":"dkgray", + "size":"MEDIUM", + "material":"flesh", + "diff":1, + "aggression":100, + "morale":100, + "speed":85, + "melee_skill":3, + "melee_dice":1, + "melee_dice_sides":3, + "melee_cut":2, + "dodge":0, + "armor_bash":2, + "armor_cut":10, + "armor_stab":18, + "armor_fire":20, + "armor_acid":10, + "vision_day":10, + "vision_night":3, + "hp":20, + "death_function":["DISINTEGRATE"], + "description":"Burned to the point of blob-exsanguination, this weak zombie is hardly a threat to anything.", + "flags":["SEES", "STUMBLES", "POISON", "GRABS", "NO_BREATHE", "BONES", "SWIMS"] + },{ + "type" : "MONSTER", + "id" : "mon_zombie_scorched_necro", + "name": "zombie abomination", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"Z", + "color":"i_magenta", + "size":"MEDIUM", + "material":"flesh", + "diff":20, + "aggression":50, + "morale":100, + "speed":5, + "melee_skill":4, + "melee_dice":2, + "melee_dice_sides":8, + "melee_cut":4, + "dodge":2, + "armor_bash":7, + "armor_cut":13, + "armor_acid":10, + "armor_fire":20, + "vision_day":22, + "vision_night":10, + "hp":120, + "death_function":["BLOBSPLIT", "BLOBSPLIT"], + "special_attacks":[["RESURRECT", 90], ["FORMBLOB", 600]], + "description":"An encrusted humanoid mass so blackened by fire only the simmering of the liquid oozing from its wounds indicate damage. Still seems capable of supporting its horde despite it weakened state.", + "flags":["SEES", "HEARS", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "BONES", "NIGHT_INVISIBILITY"], + "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK"], + "fear_triggers":["HURT"] + },{ + "type" : "MONSTER", + "id" : "mon_zombie_scorched_master", + "name": "zombie abomination", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"Z", + "color":"i_magenta", + "size":"MEDIUM", + "material":"flesh", + "diff":20, + "aggression":50, + "morale":100, + "speed":5, + "melee_skill":4, + "melee_dice":2, + "melee_dice_sides":8, + "melee_cut":4, + "dodge":2, + "armor_bash":7, + "armor_cut":13, + "armor_acid":10, + "armor_fire":20, + "vision_day":22, + "vision_night":10, + "hp":120, + "death_function":["BLOBSPLIT", "BLOBSPLIT"], + "special_attacks":[["UPGRADE", 90], ["FORMBLOB", 600]], + "description":"An encrusted humanoid mass so blackened by fire only the simmering of the liquid oozing from its wounds indicate damage. Still seems capable of controlling its horde despite it weakened state.", + "flags":["SEES", "HEARS", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "BONES", "NIGHT_INVISIBILITY"], + "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK"], + "fear_triggers":["HURT"] + },{ + "type" : "MONSTER", + "id" : "mon_zombie_child_scorched", + "edit-mode" : "override", + "name": "burned child zombie", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"z", + "color":"brown", + "size":"MEDIUM", + "material":"flesh", + "diff":15, + "aggression":100, + "morale":100, + "speed":85, + "melee_skill":2, + "melee_dice":2, + "melee_dice_sides":2, + "melee_cut":2, + "melee_damage" : [ {"damage_type" : "heat", "amount" : 1} ], + "dodge":0, + "armor_bash":3, + "armor_cut":6, + "armor_fire":15, + "armor_acid":3, + "vision_day":25, + "vision_night":3, + "hp":35, + "death_function":["NORMAL"], + "burn_into" : "mon_skeleton_scorched", + "description":"A tiny charred body, jumping and kicked and flailing around in a mockery of playground exercise. It does not need a face for you to feel bad about killing it.", + "flags":["SEES", "HEARS", "STUMBLES", "POISON", "GRABS", "NO_BREATHE", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO", "BONES", "GUILT", "CLIMBS"] + },{ + "type" : "MONSTER", + "id" : "mon_horse_zombie_scorched", + "name": "hooved horror", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"H", + "color":"i_green", + "size":"LARGE", + "material":"flesh", + "diff":16, + "aggression":80, + "morale":100, + "speed":135, + "melee_skill":4, + "melee_dice":2, + "melee_dice_sides":10, + "melee_damage" : [{"damage_type" : "stab", "amount" : 10}], + "dodge":1, + "armor_bash":10, + "armor_cut":8, + "vision_day":30, + "vision_night":15, + "hp":110, + "burn_into" : "mon_zolf_scorched", + "death_function":"NORMAL", + "special_attacks":[["SMASH", 70]], + "description":"Blackened hooves adorn the charred limbs of this monstrous being. It lumbers after prey with horrifying speed, snuffing them out with brutal force.", + "flags":["SEES", "HEARS", "WARM", "BONES", "NO_BREATHE", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO", "PUSH_MON", "STUMBLES", "BASHES"], + "anger_triggers":["FRIEND_ATTACKED"] + },{ + "type" : "MONSTER", + "id" : "mon_zolf_scorched", + "name": "torrid beast", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"o", + "color":"i_green", + "size":"MEDIUM", + "material":"flesh", + "diff":16, + "aggression":100, + "morale":100, + "speed":40, + "melee_skill":3, + "melee_dice":1, + "melee_dice_sides":6, + "melee_cut":15, + "dodge":0, + "armor_bash":8, + "armor_cut":4, + "armor_stab":16, + "armor_fire":20, + "armor_acid":2, + "vision_day":5, + "vision_night":15, + "hp":50, + "burn_into" : "mon_zanimal_scorched", + "death_function":"MELT", + "special_attacks":[["SHRIEK", 120], ["FORMBLOB", 150], ["LONGSWIPE", 50]], + "description":"A scorched, chaotic mass of flesh, squirming and writhing to slowly work its way across the ground. A couple of bony scythes have ruptured out of the pile and wave around erratically as it nears.", + "flags":["SEES", "HEARS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO", "BONES", "SWIMS", "NIGHT_INVISIBILITY"] + },{ + "type" : "MONSTER", + "id" : "mon_zanimal_scorched", + "name": "putrified pile", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"o", + "color":"i_green", + "size":"MEDIUM", + "material":"flesh", + "diff":12, + "aggression":100, + "morale":100, + "speed":70, + "melee_skill":2, + "melee_dice":1, + "melee_dice_sides":8, + "melee_damage" : [{"damage_type" : "acid", "amount" : 1}], + "melee_cut":0, + "dodge":0, + "armor_bash":10, + "armor_cut":0, + "armor_stab":8, + "armor_acid":4, + "vision_day":2, + "vision_night":5, + "hp":50, + "burn_into" : "mon_zanimal_skeleton", + "death_function": ["MELT", "BLOBSPLIT"], + "special_attacks":[["FORMBLOB", 240]], + "description":"An appaling black mass of flowing crusted flesh, the liquid of this beast seems to be more fleeing than flowing, such as rats on a sinking ship.", + "flags":["SEES", "HEARS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES", "NO_NECRO", "BONES", "SWIMS", "NIGHT_INVISIBILITY"] + },{ + "type" : "MONSTER", + "id" : "mon_zanimal_skeleton", + "name": "putrified pile", + "species":"ZOMBIE", + "default_faction":"zombie", + "symbol":"o", + "color":"i_green", + "size":"MEDIUM", + "material":"flesh", + "diff":8, + "aggression":100, + "morale":100, + "speed":70, + "melee_skill":2, + "melee_dice":1, + "melee_dice_sides":8, + "melee_cut":0, + "dodge":0, + "armor_bash":10, + "armor_cut":0, + "armor_stab":8, + "armor_acid":4, + "hp":30, + "death_function": ["MELT", "BLOBSPLIT"], + "description":"An appaling black mass of flowing crusted flesh, flailing helplessly about.", + "flags":["HEARS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "BONES", "SWIMS", "NIGHT_INVISIBILITY"] } - ] +] From 4c507af67806d2cbddbd1309ed536aa909bf3bd7 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 14:41:57 -0400 Subject: [PATCH 012/110] Update pk_critter_zombie.json I hate this. Apparently I beat my head against a rock and the change was a tangible thing I could have dumped in 35 seconds. --- data/mods/PKs_Rebalance/pk_critter_zombie.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_zombie.json b/data/mods/PKs_Rebalance/pk_critter_zombie.json index 68fbaa47d3d35..4fd427484e96a 100644 --- a/data/mods/PKs_Rebalance/pk_critter_zombie.json +++ b/data/mods/PKs_Rebalance/pk_critter_zombie.json @@ -118,12 +118,8 @@ "armor_acid":2, "hp":230, "special_attacks":[["SMASH", 50]], -<<<<<<< HEAD "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "BASHES", "WARM", "FUR", "BLEED", "ATTACKMON", "BONES", "FAT", "POISON"], -======= "burn_into" : "mon_horse_zombie_scorched", - "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "BASHES", "WARM", "FUR", "BLEED", "ATTACKMON", "BONES", "FAT", "POISON", "NO_BREATHE", "REVIVES"], ->>>>>>> refs/remotes/origin/PRM-scorched-Zeds "anger_triggers":["HURT", "PLAYER_CLOSE", "FIRE", "FRIEND_ATTACKED"] },{ "type" : "MONSTER", From 418493807cda275c57d0ee9f9a9c46ae4f9b6a19 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 14:44:37 -0400 Subject: [PATCH 013/110] Create pk_speech_fdeagle.json --- .../mods/PKs_Rebalance/pk_speech_fdeagle.json | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 data/mods/PKs_Rebalance/pk_speech_fdeagle.json diff --git a/data/mods/PKs_Rebalance/pk_speech_fdeagle.json b/data/mods/PKs_Rebalance/pk_speech_fdeagle.json new file mode 100644 index 0000000000000..50243d7876c10 --- /dev/null +++ b/data/mods/PKs_Rebalance/pk_speech_fdeagle.json @@ -0,0 +1,103 @@ +[ + { + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"An-CHORS a-WAY my boys, anchors away!\"", + "volume" : 30 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"H-Hello?\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"Hey you!\"", + "volume" : 30 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"1 shot 2 shot, this is where the fun stops\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"Shut your cumdumpster Private!\"", + "volume" : 30 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"You got an eye problem?\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"I'll dance on your grave!\"", + "volume" : 40 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"Broken Blue!\"", + "volume" : 30 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"Its just chaffing! A rash!\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"You think a 'sick pack' is going to fix this?!\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"Fuck this!\"", + "volume" : 25 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"Shine, shine, shine, spit, spit, spit\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"I had a dog and his name was BLUUE!\"", + "volume" : 40 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"This sounds highly illegal!\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"Ohh, man, did you see the chunks fly off her skull?\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"One more remark like that and I'll show you who's got the power around here, 'Sir' . . .\"", + "volume" : 10 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"aRRRGH, make the noises stop!\"", + "volume" : 30 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"aRRRGHH!\"", + "volume" : 40 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"No, I've already explained why that's bad.\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_deagle", + "sound" : "\"Oh geez, my skin looks like a moldy peach\"", + "volume" : 15 + } +] From 3e1a85b1c6c56aacf2529796d9fefe7e39294759 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 14:45:09 -0400 Subject: [PATCH 014/110] Create pk_speech_fglock.json --- data/mods/PKs_Rebalance/pk_speech_fglock.json | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 data/mods/PKs_Rebalance/pk_speech_fglock.json diff --git a/data/mods/PKs_Rebalance/pk_speech_fglock.json b/data/mods/PKs_Rebalance/pk_speech_fglock.json new file mode 100644 index 0000000000000..6317c41d80374 --- /dev/null +++ b/data/mods/PKs_Rebalance/pk_speech_fglock.json @@ -0,0 +1,113 @@ +[ + { + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"H-Hello?\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"I SEEE YOUUU\"", + "volume" : 30 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"It puts the lotion on the skin, or else it breaks the skin again.\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"Urrgh, the world is spinning.\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"Its not real, its not real, its all a bad dream.\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"Hey! Im looking for some butter. Got any?\"", + "volume" : 30 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"Selling reloaded ammo, Cheap!\"", + "volume" : 30 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"I should have never gone hunting. No money in it. Gotta shoot me some people instead.\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"No. More. Money.\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"I had no choice. Better that kid than me anyway, how would he have lived?\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"Oil Rig? Wayda think I am, stupid or somethin'?\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"My head. My pounding, aching head.\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"QUIT. YELLING!\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"Fucking trees. I ever say I hate trees, man?\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"NO! He sent you for me, didnt he?\"", + "volume" : 30 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"HELP US!! How can you act like they don't exist?\"", + "volume" : 35 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"I shot it. It died. So why do I feel like its a part of me?\"", + "volume" : 25 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"Gonna get me some heavy action when I get back. Man, they'll see.\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"I AM DODAK BEESMASHER, SLAYER OF YOUR MOM, WHO VANISHED LIKE SMOKE UNDER MY WRATH!\"", + "volume" : 45 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"The cooker, I saw it eyeing me earlier. Why doesn't it ever move?\"", + "volume" : 25 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"Libraries? Fucks wrong with you?? Get back to work smoothing the stones.\"", + "volume" : 25 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_glock", + "sound" : "\"FUCK THE FREE WORLD\"", + "volume" : 35 + } +] From f17a2eb6285cd743a6efd9e28468b398067f6652 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 14:45:33 -0400 Subject: [PATCH 015/110] Create pk_speech_fshotgun.json --- .../PKs_Rebalance/pk_speech_fshotgun.json | 128 ++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 data/mods/PKs_Rebalance/pk_speech_fshotgun.json diff --git a/data/mods/PKs_Rebalance/pk_speech_fshotgun.json b/data/mods/PKs_Rebalance/pk_speech_fshotgun.json new file mode 100644 index 0000000000000..de6afacc6dbe4 --- /dev/null +++ b/data/mods/PKs_Rebalance/pk_speech_fshotgun.json @@ -0,0 +1,128 @@ +[ + { + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"H-Hello?\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"Hey you!\"", + "volume" : 30 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\You put the lime in the coco nuts and shake your body round!\"", + "volume" : 10 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"When the fourth wall is torn down, THEN!\"", + "volume" : 30 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"when I find that little somnabitch, I'll show 'em who's boss\"", + "volume" : 10 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"IT BURNS!\"", + "volume" : 40 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"So . . . itchy\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"!!Cleanse me in flames!!\"", + "volume" : 40 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"You! Come here!\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"I'm dying for a leg of meat . . .\"", + "volume" : 10 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"They told me it was safe, why would they lie to me?\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"Gonna get me a chainsaw, strap it to my arm.\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"Shop Smart, Shop S-MART!\"", + "volume" : 40 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"THIS IS MY BOOMSTICK!!\"", + "volume" : 40 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"Groovy\"", + "volume" : 10 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"KLAATU -- BARADA -- NIKTO!\"", + "volume" : 30 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"If wanted to kill people all you idiots would be dead already!\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"Soldier Be Prepared, Prepared\"", + "volume" : 30 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"Fight for our Cause\"", + "volume" : 30 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"Die for our King!\"", + "volume" : 30 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"Be Worth of our Cause!\"", + "volume" : 30 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"This is all because those PINKOS at the megastore wouldn't sell good, honest citizens MACHINE RIFLES!\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"I just wanna go home now\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"So tired . . .\"", + "volume" : 10 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_shotgun", + "sound" : "\"Oink like a Piggy for me!\"", + "volume" : 30 + } +] From a1b8e773f27b038ecff0535bae5c10dd9e1141cd Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 14:46:00 -0400 Subject: [PATCH 016/110] Create pk_speech_fsmg.json --- data/mods/PKs_Rebalance/pk_speech_fsmg.json | 88 +++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 data/mods/PKs_Rebalance/pk_speech_fsmg.json diff --git a/data/mods/PKs_Rebalance/pk_speech_fsmg.json b/data/mods/PKs_Rebalance/pk_speech_fsmg.json new file mode 100644 index 0000000000000..e7c164c843518 --- /dev/null +++ b/data/mods/PKs_Rebalance/pk_speech_fsmg.json @@ -0,0 +1,88 @@ +[ + { + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"Paco can run his own damn meth next time. Im done.\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"Weed, Meth, Coke n' crack, my pockets flowin' over out the back.\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"Pew pew pewpewpew. kneheheh\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"Whaaaaaaarnm, Im an air-plane!\"", + "volume" : 25 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"'UZI' WHAT HAPPENS WHEN YOU MESS WITH ME?!! HEHHeeehehHEE!\"", + "volume" : 45 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"I told her I'd give it back when I was done but Noooo, we had to play it hardball.\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"Ugh, cramps, oww\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"This nature shit. Ive got deerturds on my boots!\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"You see how I lit up that zombie? So many holes I made it look like one of them fountain statues\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"Henheenugh\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"OMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM-\"", + "volume" : 25 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"Never gonna stop. Powpow\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"I've found MYCU-lling in life. Huehuehue\"", + "volume" : 25 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"I know you know I know you know I know you know I know\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"Watching the bombs was fun, but getting into the action is for me.\"", + "volume" : 15 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"Why the fuck do all this dumb insects get gianted, but here I am; little old me with my compact gun.\"", + "volume" : 20 + },{ + "type" : "speech", + "speaker" : "mon_furvivor_smg", + "sound" : "\"I saw a guy running around with 2 megaman arms. It was the trippiest shit ever.\"", + "volume" : 15 + } +] From a9ef132e4637ceed1d3ef49319142ebef686960f Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 15:02:55 -0400 Subject: [PATCH 017/110] Update pk_critter_insect.json My pretties ... all of them. --- .../mods/PKs_Rebalance/pk_critter_insect.json | 374 ++++++++++++++++++ 1 file changed, 374 insertions(+) diff --git a/data/mods/PKs_Rebalance/pk_critter_insect.json b/data/mods/PKs_Rebalance/pk_critter_insect.json index 64852adc9025f..f098306ddefc7 100644 --- a/data/mods/PKs_Rebalance/pk_critter_insect.json +++ b/data/mods/PKs_Rebalance/pk_critter_insect.json @@ -17,6 +17,10 @@ "armor_cut":8, "vision_day":5, "vision_night":7, + "upgrades":{ + "into": "mon_spider_jumping_giant_acid", + "half_life": 17 + }, "hp":70, "death_function":"NORMAL", "description":"A gigantic spider with a bulbous thorax. It digs an underground burrow that serves as a pit to trap unwary prey.", @@ -61,6 +65,10 @@ "armor_cut":6, "vision_day":5, "vision_night":5, + "upgrades":{ + "into_group": "WEB_SPIDER_UPGRADE", + "half_life": 19 + }, "hp":40, "death_function":"NORMAL", "description":"A giant mutated grass spider, it waits for prey to become ensnared in the vast webs that it weaves between the trees.", @@ -85,7 +93,373 @@ "vision_day":7, "vision_night":15, "hp":40, + "upgrades":{ + "into": "mon_spider_wolf_giant_pk", + "half_life": 29 + }, "anger_triggers":["STALK", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE"], "fear_triggers": ["FRIEND_DIED"] + },{ + "type" : "MONSTER", + "id" : "mon_spider_wolf_giant_pk", + "name": "huge wolf spider", + "species":"SPIDER", + "default_faction":"spider_wolf", + "symbol":"S", + "color":"brown", + "size":"LARGE", + "material":"iflesh", + "diff":30, + "aggression":35, + "morale":100, + "speed":145, + "melee_skill":6, + "melee_dice":2, + "melee_dice_sides":7, + "melee_cut":14, + "armor_acid":4, + "dodge":6, + "armor_bash":9, + "armor_cut":14, + "vision_day":9, + "vision_night":20, + "hp":100, + "death_function":"NORMAL", + "description":"This wolf spider has grown to truly monstrous proportions. Its venom is relatively weak compared to its assault.", + "flags":["SEES", "SMELLS", "HEARS", "VENOM", "CHITIN", "FAT", "CLIMBS"], + "anger_triggers":["STALK", "PLAYER_WEAK", "PLAYER_CLOSE"], + "fear_triggers": ["HURT", "FRIEND_DIED"] + },{ + "type" : "MONSTER", + "id" : "mon_spider_web_queen", + "name": "large egg sack", + "species":"ABERRATION", + "default_faction":"spider_web", + "symbol":"O", + "color":"i_yellow", + "size":"LARGE", + "material":"iflesh", + "diff":10, + "aggression":100, + "morale":200, + "speed":100, + "melee_skill":0, + "melee_dice":0, + "melee_dice_sides":0, + "dodge":0, + "armor_bash":2, + "armor_acid":3, + "vision_day":20, + "vision_night":20, + "hp":90, + "death_function":"DISINTEGRATE", + "death_drops": { + "subtype": "collection", + "groups": [ + [ "spider_eggs", 100 ] + ] + }, + "description":"A large egg sack with periodically hatching eggs, and a few care-tenders. This one seems somehow more important than the rest.", + "flags":["SEES", "NO_BREATHE", "IMMOBILE", "QUEEN"] + },{ + "type" : "MONSTER", + "id" : "mon_trapdoor_egg", + "name": "egg sack", + "species":"ABERRATION", + "default_faction":"spider_trapdoor", + "symbol":"O", + "color":"ltgrey", + "size":"MEDIUM", + "material":"iflesh", + "diff":10, + "aggression":100, + "morale":200, + "speed":100, + "melee_skill":0, + "melee_dice":0, + "melee_dice_sides":0, + "dodge":0, + "armor_bash":2, + "armor_acid":1, + "vision_day":20, + "vision_night":20, + "hp":40, + "death_function":"DISINTEGRATE", + "death_drops": { + "subtype": "collection", + "groups": [ + [ "spider_eggs", 100 ] + ] + }, + "description":"An egg sack with periodically hatching eggs.", + "flags":["SEES", "NO_BREATHE", "IMMOBILE"] + },{ + "type" : "MONSTER", + "id" : "mon_trapdoor_queen", + "name": "large egg sack", + "species":"ABERRATION", + "default_faction":"spider_trapdoor", + "symbol":"O", + "color":"dkgrey", + "size":"LARGE", + "material":"iflesh", + "diff":10, + "aggression":100, + "morale":200, + "speed":100, + "melee_skill":0, + "melee_dice":0, + "melee_dice_sides":0, + "dodge":0, + "armor_bash":2, + "armor_acid":3, + "vision_day":20, + "vision_night":20, + "hp":90, + "death_function":"DISINTEGRATE", + "death_drops": { + "subtype": "collection", + "groups": [ + [ "spider_eggs", 100 ] + ] + }, + "description":"A large egg sack with periodically hatching eggs, and a few care-tenders. This one seems somehow more important than the rest.", + "flags":["SEES", "NO_BREATHE", "IMMOBILE", "QUEEN"] + },{ + "type" : "MONSTER", + "id" : "mon_spider_trapdoor_giant_s", + "name": "giant immature trapdoor spider", + "species":"SPIDER", + "default_faction":"spider_trapdoor", + "symbol":"s", + "color":"ltblue", + "size":"SMALL", + "material":"iflesh", + "diff":12, + "aggression":40, + "morale":100, + "speed":70, + "melee_skill":4, + "melee_dice":1, + "melee_dice_sides":1, + "melee_cut":6, + "dodge":0, + "armor_bash":3, + "armor_cut":7, + "vision_day":5, + "vision_night":7, + "hp":30, + "death_function":"NORMAL", + "description":"A small trapdoor spider. Too small to hunt effectively on its own, the loose commune of mutated trapdoor spiders offers limited protection from predators, although it places the spider at increased risk of being cannibalized.", + "flags":["SEES", "SMELLS", "STUMBLES", "HEARS", "VENOM", "GRABS", "CAN_DIG", "WEBWALK", "CHITIN", "FAT", "CLIMBS", "PUSH_MON"] + },{ + "type" : "MONSTER", + "id" : "mon_spider_trapdoor_giant_guardian", + "name": "alpha giant trapdoor spider", + "species":"SPIDER", + "default_faction":"spider_trapdoor", + "symbol":"s", + "color":"i_blue", + "size":"LARGE", + "material":"iflesh", + "diff":20, + "aggression":80, + "morale":100, + "speed":95, + "melee_skill":6, + "melee_dice":1, + "melee_dice_sides":8, + "melee_cut":14, + "melee_damage" : [ {"damage_type" : "acid", "amount" : 6} ], + "dodge":3, + "armor_bash":9, + "armor_cut":14, + "vision_day":10, + "vision_night":13, + "hp":150, + "death_function":"NORMAL", + "description": "A large and heavily armored trapdoor spider. Primarily found at the center of larger congregations of trapdoor spiders that can keep it fed if food becomes scarce.", + "flags":["SEES", "SMELLS", "HEARS", "VENOM", "CAN_DIG", "WEBWALK", "CHITIN", "FAT", "CLIMBS", "PUSH_MON"] + },{ + "type" : "MONSTER", + "id" : "mon_spider_trapdoor_giant_pk", + "name": "giant trapdoor spider", + "species":"SPIDER", + "default_faction":"spider_trapdoor", + "symbol":"s", + "color":"blue", + "size":"MEDIUM", + "material":"iflesh", + "diff":18, + "aggression":60, + "morale":100, + "speed":110, + "melee_skill":6, + "melee_dice":2, + "melee_dice_sides":4, + "melee_cut":10, + "melee_damage" : [ {"damage_type" : "acid", "amount" : 3} ], + "dodge":3, + "armor_bash":4, + "armor_cut":8, + "vision_day":5, + "vision_night":7, + "hp":80, + "death_function":"NORMAL", + "special_attacks":[["LUNGE", 30]], + "description":"A gigantic, nimble spider with a bulbous thorax. It digs a deep underground burrow that serves as a pit from which to ambush unwary prey.", + "flags":["SEES", "SMELLS", "HEARS", "VENOM", "CAN_DIG", "WEBWALK", "CHITIN", "FAT", "CLIMBS", "PUSH_MON"] + },{ + "type" : "MONSTER", + "id" : "mon_spider_web_alpha", + "name": "giant web spider", + "species":"SPIDER", + "default_faction":"spider_web", + "symbol":"s", + "color":"yellow", + "size":"MEDIUM", + "material":"iflesh", + "diff":16, + "aggression":60, + "morale":100, + "speed":105, + "melee_skill":4, + "melee_dice":2, + "melee_dice_sides":4, + "melee_cut":8, + "melee_damage" : [ {"damage_type" : "stab", "amount" : 8} ], + "attack_effs": [ + { + "id": "spider_web_slow", + "duration": 50 + }, + { + "id": "spider_web_alpha", + "duration": 33 + } + ], + "dodge":3, + "armor_bash":4, + "armor_cut":10, + "vision_day":15, + "vision_night":10, + "hp":60, + "death_function":"NORMAL", + "description":"A larger, more aggressive ambush predator, this web spider uses force to catch its prey.", + "flags":["SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CHITIN", "CLIMBS", "PUSH_MON"] + },{ + "type" : "MONSTER", + "id" : "mon_spider_web_omega", + "name": "giant web spider", + "species":"SPIDER", + "default_faction":"spider_web", + "symbol":"s", + "color":"yellow", + "size":"MEDIUM", + "material":"iflesh", + "diff":16, + "aggression":40, + "morale":100, + "speed":115, + "melee_skill":5, + "melee_dice":2, + "melee_dice_sides":3, + "melee_cut":6, + "melee_damage" : [ {"damage_type" : "stab", "amount" : 6} ], + "attack_effs": [ + { + "id": "spider_web_slow", + "duration": 50 + }, + { + "id": "spider_web_omega", + "duration": 1 + } + ], + "dodge":5, + "armor_bash":3, + "armor_cut":8, + "vision_day":15, + "vision_night":10, + "hp":50, + "death_function":"NORMAL", + "description":"This web spider uses long-lasting toxins to incapacitate stronger foes.", + "flags":["SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CHITIN", "CLIMBS", "PUSH_MON"] + },{ + "type" : "MONSTER", + "id" : "mon_spider_web_mu", + "name": "giant web spider", + "species":"SPIDER", + "default_faction":"spider_web", + "symbol":"s", + "color":"yellow", + "size":"MEDIUM", + "material":"iflesh", + "diff":14, + "aggression":40, + "morale":100, + "speed":130, + "melee_skill":6, + "melee_dice":2, + "melee_dice_sides":3, + "melee_cut":2, + "melee_damage" : [ {"damage_type" : "stab", "amount" : 12} ], + "attack_effs": [ + { + "id": "spider_web_slow", + "duration": 50 + }, + { + "id": "spider_web_mu", + "duration": 50 + } + ], + "dodge":4, + "armor_bash":3, + "armor_cut":8, + "vision_day":20, + "vision_night":10, + "hp":50, + "death_function":"NORMAL", + "description":"This web spider seems to have specialized to take down creatures infected with fungal spores; a surely underutilized food source.", + "flags":["SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CHITIN", "CLIMBS", "PARALYZEVENOM", "HIT_AND_RUN", "PUSH_MON"] + },{ + "type" : "MONSTER", + "id" : "mon_spider_jumping_giant_acid", + "name": "medusa spider", + "species":"SPIDER", + "default_faction":"spider_jumping", + "symbol":"s", + "color":"i_white", + "size":"SMALL", + "material":"iflesh", + "diff":12, + "aggression":-5, + "morale":80, + "speed":110, + "melee_skill":6, + "melee_dice":1, + "melee_dice_sides":4, + "melee_cut":2, + "melee_damage" : [ {"damage_type" : "stab", "amount" : 10}, {"damage_type" : "acid", "amount" : 3} ], + "dodge":3, + "armor_bash":2, + "armor_cut":6, + "vision_day":20, + "vision_night":7, + "hp":45, + "death_function":"NORMAL", + "special_attacks":[["ACID_ACCURATE", 25], ["ACID_BARF", 25], + { + "type" : "leap", + "cooldown" : 2, + "max_range" : 7 + } + ], + "special_when_hit":["ACIDSPLASH", 5], + "description":"A spider the size of a large dog with slender forelegs and massive hind legs. From its maw corrosive saliva drips, and can be manipulated by its agile limbs.", + "flags":["SEES", "SMELLS", "KEENNOSE", "HEARS", "BADVENOM", "CHITIN", "CLIMBS", "ACIDPROOF", "ACID_BLOOD", "PUSH_MON"], + "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK", "FRIEND_ATTACKED", "STALK"], + "fear_triggers": ["HURT", "FIRE"] } ] From f386618d2e650faf776476e8f4ab18703bf79586 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 15:03:33 -0400 Subject: [PATCH 018/110] Create pk_mapgen_trapspider.json My pretties need a new home --- .../PKs_Rebalance/pk_mapgen_trapspider.json | 461 ++++++++++++++++++ 1 file changed, 461 insertions(+) create mode 100644 data/mods/PKs_Rebalance/pk_mapgen_trapspider.json diff --git a/data/mods/PKs_Rebalance/pk_mapgen_trapspider.json b/data/mods/PKs_Rebalance/pk_mapgen_trapspider.json new file mode 100644 index 0000000000000..5b0ff8cbe925e --- /dev/null +++ b/data/mods/PKs_Rebalance/pk_mapgen_trapspider.json @@ -0,0 +1,461 @@ +[ + { + "type": "mapgen", + "om_terrain": [ + "trapdoor_pit" + ], + "method": "json", + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + " ", + " 1 ", + " 1 1 1 ", + " 1 1 ", + " 1 ", + " 1 1 1 ", + " 11 ", + " 1 1 ", + " 1 1 1 1 ", + " 11 1 1 1 1 ", + " 1 1 1 ", + " 1 ", + " 1 1 ", + " 1 1 1 ", + " 1 1 ", + " 1 11 ", + " 1 1 1 ", + " 1 1 1 ", + " 1 1 1 ", + " 1 1 ", + " 1 1 1 ", + " 11 1 1 ", + " 111 1 1 ", + " 1 " + ], + "terrain": { + " ": ["t_dirt", "t_dirt", "t_grass", "t_grass", "t_grass"], + "7": "t_tree", + "1": ["t_underbrush", "t_shrub", "t_shrub", "t_dirt", "t_dirt", "t_dirt", "t_grass", "t_grass", "t_grass", "t_grass"], + ">": "t_open_air", + "?": ["t_rock", "t_rock", "t_rock","t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", + "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_dirt", "t_dirt", "t_dirt", "t_rock_floor"], + "#": "t_rock" + }, + "furniture": { + "^": "f_rubble_rock", + "o": ["f_boulder_small", "f_boulder_small", "f_boulder_small", "f_boulder_medium", "f_boulder_medium", "f_boulder_large"] + }, + "set": [ + { "point": "trap", "id": "tr_sinkhole", "x": [ 2, 20 ], "y": [ 2, 20 ], "repeat": [ 7, 21 ] }, + { "point": "trap", "id": "tr_sinkhole", "x": [ 2, 20 ], "y": [ 2, 20 ], "repeat": [ 7, 21 ], "chance": 4 }, + { "point": "terrain", "id": "t_dirtmound", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 2, "repeat": [ 1, 5 ] }, + { "point": "terrain", "id": "t_dirtmound", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 3, "repeat": [ 1, 5 ] } + ], + "place_loot" : [ + { "item": "bone_human", "chance": 50, "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 3 ], "count-min": 1, "count-max": 5 }, + { "item": "bone_human", "chance": 50, "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 3 ], "count-min": 1, "count-max": 5 } + ] + } + },{ + "type": "mapgen", + "om_terrain": [ + "trapdoor_pit" + ], + "method": "json", + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + " ", + " 1 1 1 ", + " 1 1 ", + " 1 1 1 1 ", + " 1 1 ", + " 1 11 ", + " 11 1 1 ", + " 1 ", + " ", + " 1 1 ", + " 1 1 ", + " 1 ", + " 1 1 ", + " 1 1 ", + " 1 ", + " 1 1 1 ", + " 1 1 ", + " 1 ", + " 1 1 ", + " 1 1 ", + " 11 1 ", + " 1 1 1 1 ", + " 1 ", + " " + ], + "terrain": { + " ": ["t_dirt", "t_dirt", "t_grass", "t_grass", "t_grass"], + "7": "t_tree", + "1": ["t_underbrush", "t_shrub", "t_shrub", "t_dirt", "t_dirt", "t_dirt", "t_grass", "t_grass", "t_grass", "t_grass"], + ">": "t_open_air", + "?": ["t_rock", "t_rock", "t_rock","t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", + "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_dirt", "t_dirt", "t_dirt", "t_rock_floor"], + "#": "t_rock" + }, + "furniture": { + "^": "f_rubble_rock", + "o": ["f_boulder_small", "f_boulder_small", "f_boulder_small", "f_boulder_medium", "f_boulder_medium", "f_boulder_large"] + }, + "set": [ + { "point": "trap", "id": "tr_sinkhole", "x": [ 2, 20 ], "y": [ 2, 20 ], "repeat": [ 7, 21 ] }, + { "point": "trap", "id": "tr_sinkhole", "x": [ 2, 20 ], "y": [ 2, 20 ], "repeat": [ 7, 21 ], "chance": 4 }, + { "point": "terrain", "id": "t_dirtmound", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 2, "repeat": [ 1, 5 ] }, + { "point": "terrain", "id": "t_dirtmound", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 3, "repeat": [ 1, 5 ] } + ], + "place_loot" : [ + { "item": "bone_human", "chance": 50, "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 3 ], "count-min": 1, "count-max": 5 }, + { "item": "bone_human", "chance": 50, "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 3 ], "count-min": 1, "count-max": 5 } + ] + } + },{ + "type": "mapgen", + "om_terrain": [ + "trapdoor_pit" + ], + "method": "json", + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + " 1", + " 1 1 1 ", + " 1 1 ", + " ", + " o 1 ", + " 1 ", + " 1 ", + " 1 1 1 ", + " 1 ", + " 1 1 ", + " 1 ", + " o ", + " 1 1 ", + " 1 1 1 ", + " 11 ", + " 1 ", + " ", + " 1 1 1 ", + " 1 ", + " 1 1 ", + " ", + " 1 1 ", + " 1 ", + " " + ], + "terrain": { + " ": ["t_dirt", "t_dirt", "t_grass", "t_grass", "t_grass"], + "7": "t_tree", + "1": ["t_underbrush", "t_shrub", "t_shrub", "t_dirt", "t_dirt", "t_dirt", "t_grass", "t_grass", "t_grass", "t_grass"], + ">": "t_open_air", + "?": ["t_rock", "t_rock", "t_rock","t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", + "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_dirt", "t_dirt", "t_dirt", "t_rock_floor"], + "#": "t_rock" + }, + "furniture": { + "^": "f_rubble_rock", + "o": ["f_boulder_small", "f_boulder_small", "f_boulder_small", "f_boulder_medium", "f_boulder_medium", "f_boulder_large"] + }, + "set": [ + { "point": "trap", "id": "tr_sinkhole", "x": [ 2, 20 ], "y": [ 2, 20 ], "repeat": [ 7, 21 ] }, + { "point": "trap", "id": "tr_sinkhole", "x": [ 2, 20 ], "y": [ 2, 20 ], "chance": 4, "repeat": [ 7, 21 ] }, + { "point": "terrain", "id": "t_dirtmound", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 2, "repeat": [ 1, 5 ] }, + { "point": "terrain", "id": "t_dirtmound", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 3, "repeat": [ 1, 5 ] } + ], + "place_loot" : [ + { "item": "bone_human", "chance": 50, "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 3 ], "count-min": 1, "count-max": 5 }, + { "item": "bone_human", "chance": 50, "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 3 ], "count-min": 1, "count-max": 5 } + ] + } + },{ + "type": "mapgen", + "om_terrain": [ + "trapdoor_pit" + ], + "method": "json", + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " o ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "terrain": { + " ": ["t_dirt", "t_dirt", "t_grass", "t_grass", "t_grass"], + "7": "t_tree", + "1": ["t_underbrush", "t_shrub", "t_shrub", "t_dirt", "t_dirt", "t_dirt", "t_grass", "t_grass", "t_grass", "t_grass"], + ">": "t_open_air", + "?": ["t_rock", "t_rock", "t_rock","t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", + "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_dirt", "t_dirt", "t_dirt", "t_rock_floor"], + "#": "t_rock" + }, + "furniture": { + "^": "f_rubble_rock", + "o": ["f_boulder_small", "f_boulder_small", "f_boulder_small", "f_boulder_medium", "f_boulder_medium", "f_boulder_large"] + }, + "set": [ + { "point": "trap", "id": "tr_sinkhole", "x": [ 2, 20 ], "y": [ 2, 20 ], "repeat": [ 7, 21 ] }, + { "point": "trap", "id": "tr_sinkhole", "x": [ 2, 20 ], "y": [ 2, 20 ], "chance": 4, "repeat": [ 7, 21 ] }, + { "point": "terrain", "id": "t_dirtmound", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 2, "repeat": [ 1, 5 ] }, + { "point": "terrain", "id": "t_dirtmound", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 3, "repeat": [ 1, 5 ] } + ], + "place_loot" : [ + { "item": "bone_human", "chance": 50, "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 3 ], "count-min": 1, "count-max": 5 }, + { "item": "bone_human", "chance": 50, "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 3 ], "count-min": 1, "count-max": 5 } + ] + } + },{ + "type": "mapgen", + "om_terrain": [ + "trapdoor_pit_loner" + ], + "method": "json", + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + " ", + " ", + " ", + " ", + " o ", + " ", + " ", + " ", + " ", + " o ", + " ", + " ", + " ", + " ", + " ", + " o ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "terrain": { + " ": ["t_dirt", "t_dirt", "t_grass", "t_grass", "t_grass"], + "7": "t_tree", + "1": ["t_underbrush", "t_shrub", "t_shrub", "t_dirt", "t_dirt", "t_dirt", "t_grass", "t_grass", "t_grass", "t_grass"], + ">": "t_open_air", + "?": ["t_rock", "t_rock", "t_rock","t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", + "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_dirt", "t_dirt", "t_dirt", "t_rock_floor"], + "#": "t_rock" + }, + "furniture": { + "^": "f_rubble_rock", + "o": ["f_boulder_small", "f_boulder_small", "f_boulder_small", "f_boulder_medium", "f_boulder_medium", "f_boulder_large"] + }, + "set": [ + { "point": "trap", "id": "tr_sinkhole", "x": [ 2, 20 ], "y": [ 2, 20 ], "repeat": [ 5, 15 ] }, + { "point": "trap", "id": "tr_sinkhole", "x": [ 2, 20 ], "y": [ 2, 20 ], "repeat": [ 5, 15 ], "chance": 4 }, + { "point": "terrain", "id": "t_dirtmound", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 2, "repeat": [ 1, 5 ] }, + { "point": "terrain", "id": "t_dirtmound", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 3, "repeat": [ 1, 5 ] } + ], + "place_loot" : [ + { "item": "bone_human", "chance": 50, "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 3 ], "count-min": 1, "count-max": 5 }, + { "item": "bone_human", "chance": 50, "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 3 ], "count-min": 1, "count-max": 5 } + ] + } + },{ + "type": "mapgen", + "om_terrain": [ + "trapdoor_pit_loner" + ], + "method": "json", + "weight": 100, + "object": { + "fill_ter": "t_dirt", + "rows": [ + " ", + " 1 1 ", + " 11 ", + " 1 ", + " 1 1 ", + " 1 1 ", + " 1 ", + " 1 1 ", + " ", + " ", + " 1 ", + " 1 ", + " ", + " 1 ", + " 1 ", + " 1 ", + " 1 1 1 ", + " 1 ", + " 1 ", + " 1 ", + " ", + " 1 1 ", + " 1 1 ", + " 1 " + ], + "terrain": { + " ": ["t_dirt", "t_dirt", "t_grass", "t_grass", "t_grass"], + "7": "t_tree", + "1": ["t_underbrush", "t_shrub", "t_shrub", "t_dirt", "t_dirt", "t_dirt", "t_grass", "t_grass", "t_grass", "t_grass"], + ">": "t_open_air", + "?": ["t_rock", "t_rock", "t_rock","t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", + "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_dirt", "t_dirt", "t_dirt", "t_rock_floor"], + "#": "t_rock" + }, + "furniture": { + "^": "f_rubble_rock", + "o": ["f_boulder_small", "f_boulder_small", "f_boulder_small", "f_boulder_medium", "f_boulder_medium", "f_boulder_large"] + }, + "set": [ + { "point": "trap", "id": "tr_sinkhole", "x": [ 2, 20 ], "y": [ 2, 20 ], "repeat": [ 5, 15 ] }, + { "point": "trap", "id": "tr_sinkhole", "x": [ 2, 20 ], "y": [ 2, 20 ], "repeat": [ 5, 15 ], "chance": 4 }, + { "point": "terrain", "id": "t_dirtmound", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 2, "repeat": [ 1, 5 ] }, + { "point": "terrain", "id": "t_dirtmound", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 3, "repeat": [ 1, 5 ] } + ], + "place_loot" : [ + { "item": "bone_human", "chance": 50, "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 3 ], "count-min": 1, "count-max": 5 }, + { "item": "bone_human", "chance": 50, "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 3 ], "count-min": 1, "count-max": 5 } + ] + } + } + + + ,{ + "type": "mapgen", + "om_terrain": [ + "trapdoor_pit_b1" + ], + "method": "json", + "weight": 100, + "object": { + "fill_ter": "t_rock", + "rows": [ + "########################", + "########################", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "########################", + "########################" + ], + "terrain": { + " ": ["t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_rock_floor", "t_rock"], + "7": "t_tree", + "1": ["t_underbrush", "t_shrub", "t_shrub", "t_dirt", "t_dirt", "t_dirt", "t_grass", "t_grass", "t_grass", "t_grass"], + ">": "t_open_air", + "?": ["t_rock", "t_rock", "t_rock","t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", + "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_dirt", "t_dirt", "t_dirt", "t_rock_floor"], + "#": "t_rock" + }, + "furniture": { + "^": "f_rubble_rock", + "o": ["f_boulder_small", "f_boulder_small", "f_boulder_small", "f_boulder_medium", "f_boulder_medium", "f_boulder_large"] + } + } + },{ + "type": "mapgen", + "om_terrain": [ + "trapdoor_pit_b1" + ], + "method": "json", + "weight": 300, + "object": { + "fill_ter": "t_rock", + "rows": [ + "########################", + "########################", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##???????? ???????????##", + "##??????? ????????????##", + "##??????? ?????????##", + "##???????? ?????????##", + "##???????? ?????????##", + "##??????? ?????????##", + "##??????????? ???????##", + "##????????? ???????##", + "##??????????? ? ????##", + "##????????? ?? ???##", + "##?????????? ???????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "##????????????????????##", + "########################", + "########################" + ], + "terrain": { + " ": ["t_dirt", "t_dirt", "t_dirt", "t_dirt", "t_rock_floor", "t_rock"], + "7": "t_tree", + "1": ["t_underbrush", "t_shrub", "t_shrub", "t_dirt", "t_dirt", "t_dirt", "t_grass", "t_grass", "t_grass", "t_grass"], + ">": "t_open_air", + "?": ["t_rock", "t_rock", "t_rock","t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", + "t_rock", "t_rock", "t_rock", "t_rock", "t_rock", "t_dirt", "t_dirt", "t_dirt", "t_rock_floor"], + "#": "t_rock" + }, + "furniture": { + "^": "f_rubble_rock", + "o": ["f_boulder_small", "f_boulder_small", "f_boulder_small", "f_boulder_medium", "f_boulder_medium", "f_boulder_large"] + }, + "place_items": [ + { "item": "spider", "chance": 55, "x": [ 10, 12 ], "y": [ 9, 12 ], "repeat": [ 1, 2 ] } + ] + } + } +] From 9d1db3ee775fdbc1aaec9c0f9ac73aad627f6269 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 15:04:20 -0400 Subject: [PATCH 019/110] Update pk_critter_mutant.json My pretties has a new home, and so need to live there. --- .../mods/PKs_Rebalance/pk_critter_mutant.json | 131 +++++++++++++++++- 1 file changed, 125 insertions(+), 6 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_mutant.json b/data/mods/PKs_Rebalance/pk_critter_mutant.json index 39d0459120e6c..8f7e37fd315f8 100644 --- a/data/mods/PKs_Rebalance/pk_critter_mutant.json +++ b/data/mods/PKs_Rebalance/pk_critter_mutant.json @@ -1,6 +1,15 @@ [ { "type" : "MONSTER", + "id" : "mon_coyote_wolf", + "edit-mode" : "modify", + "hp": 25, + "upgrades":{ + "into": "mon_coyote_wolf_zerg", + "half_life": 19 + } + },{ + "type" : "MONSTER", "id" :"mon_sewer_fish", "edit-mode" : "modify", "default_faction":"mutant_predator" @@ -55,19 +64,53 @@ "type" : "MONSTER", "id" :"mon_human_snail", "edit-mode" : "modify", - "default_faction": "mutant_omnivore" + "default_faction": "mutant_omnivore", + "aggression":0, + "morale":30, + "speed":60, + "melee_skill":4, + "melee_dice":1, + "melee_dice_sides":4, + "melee_cut":0, + "melee_damage" : [{"damage_type" : "acid", "amount" : 2}], + "dodge":0, + "armor_bash":6, + "armor_cut":12, + "hp":80, + "vision_day":5, + "vision_night":20, + "special_attacks":[["ACID", 15], ["IMPALE", 40]], + "flags":["SEES", "SMELLS", "HEARS", "POISON", "ACIDPROOF", "ACID_BLOOD", "ACIDTRAIL"], + "anger_triggers":["FRIEND_ATTACKED", "HURT", "FRIEND_DIED"] },{ "type" : "MONSTER", "id" :"mon_twisted_body", "edit-mode" : "modify", - "default_faction":"twisted_body" + "default_faction":"twisted_body", + "aggression":0, + "morale":100, + "speed": 110, + "melee_skill":4, + "melee_dice":2, + "melee_dice_sides":5, + "melee_cut":3, + "dodge":6, + "armor_bash":2, + "armor_cut":2, + "vision_day":40, + "vision_night":7, + "hp":60, + "description":"A human body, but with its limbs impossibly twisted. It clambers around swiftly, making awful rasping moans.", + "flags":["SEES", "HEARS", "GOODHEARING", "POISON", "HUMAN", "LEATHER", "CLIMBS", "SWARMS", "REGENERATES_10"], + "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK", "FRIEND_ATTACKED"] },{ "type" : "MONSTER", "id" : "mon_jabberwock", "edit-mode" : "modify", "upgrades":{ "into": "mon_jabberwock_pk", - "half_life": 28 + "half_life": 28, + "flags":["SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "DESTROYS", "ATTACKMON", "LEATHER", "BONES", "POISON", "BONES", "FAT", "REVIVES", "NO_NECRO"] } },{ "type" : "MONSTER", @@ -94,10 +137,86 @@ "vision_night":5, "hp":600, "death_function":"JABBERWOCKY", - "special_attacks":[["FLESH_GOLEM", 5], ["SMASH", 60], ["FEAR_PARALYZE", 5]], + "special_attacks":[["FLESH_GOLEM", 5], ["SMASH", 60], ["FEAR_PARALYZE", 3]], "description":"A putrid amalgamation of body parts from humans and other creatures have fused together in this aberration of flesh. The eyes of all the heads dart about rapidly and the mouths form a chorus of groaning screams. Its coming for you", - "flags":["SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "DESTROYS", - "ATTACKMON", "LEATHER", "BONES", "POISON", "BONES", "FAT"], + "flags":["SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "DESTROYS", "ATTACKMON", "LEATHER", "BONES", "POISON", "BONES", "FAT", "REVIVES", "NO_NECRO"], "//" : "zombie tank will beat this guy with about 20% health. Most because its faster and this guy cant smash as often as him. And oc the tank has more armor." + },{ + "type" : "MONSTER", + "id" : "mon_bat_vampire", + "name": "vampire bat", + "species":"ABERRATION", + "default_faction":"mutant_small", + "symbol":"w", + "color":"brown_red", + "size":"SMALL", + "material":"flesh", + "diff":12, + "aggression":-5, + "morale":20, + "speed":170, + "melee_skill":4, + "melee_dice":1, + "melee_dice_sides":2, + "melee_cut":4, + "melee_damage" : [{"damage_type" : "biological", "amount" : 1}], + "dodge":3, + "armor_bash":6, + "vision_day":10, + "vision_night":20, + "hp":25, + "death_function":"NORMAL", + "special_attacks":[["SHRIEK_ALERT", 30], ["SHRIEK_STUN", 1], + { + "type" : "bite", + "cooldown" : 3, + "no_infection_chance" : 5 + } + ], + "description":"A mutated bat with a narrow, proboscis-like snout. After its pack stuns the prey, it uses its teeth to gouge a hole into it and its slender tongue to quickly lap up the resulting blood.", + "flags":["SEES", "SMELLS", "HEARS", "GOODHEARING", "WARM", "FLIES", "ANIMAL", "BONES", "LEATHER", "HARDTOSHOOT", "SWARMS", "HIT_AND_RUN", "GROUP_MORALE"], + "anger_triggers":["PLAYER_WEAK", "FRIEND_ATTACKED", "SOUND", "FIRE"], + "fear_triggers":["PLAYER_CLOSE", "SOUND", "FRIEND_DIED"], + "categories":["WILDLIFE"] + },{ + "type" : "MONSTER", + "id" : "mon_coyote_wolf_zerg", + "name": "scythed coyote", + "species":"MAMMAL", + "default_faction":"dog", + "symbol":"d", + "color":"brown_white", + "size":"MEDIUM", + "material":"flesh", + "diff":16, + "aggression":0, + "morale":15, + "speed":145, + "melee_skill":6, + "melee_dice":2, + "melee_dice_sides":4, + "melee_cut":12, + "dodge":5, + "armor_bash":3, + "armor_cut":1, + "vision_day":40, + "vision_night":5, + "hp":45, + "death_function":"NORMAL", + "special_attacks":[["LONGSWIPE", 20], ["IMPALE", 50], + { + "type" : "leap", + "cooldown" : 20, + "max_range" : 3, + "min_consider_range" : 2, + "max_consider_range" : 7, + "allow_no_target" : false + }], + "description":"It looks like a brown coyote with black streaks along its side. Except against either haunch rests a muscular folded limb terminating in a scythe-like bony protrusion.", + "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "WARM", "FUR", "KEENNOSE", "BLEED", "BONES", "FAT", "SWARMS", "GROUP_MORALE"], + "fear_triggers":["FRIEND_DIED", "HURT"], + "anger_triggers":["FRIEND_ATTACKED", "PLAYER_WEAK", "PLAYER_CLOSE"], + "placate_triggers":["MEAT"], + "categories":["WILDLIFE"] } ] From b2857440d61ffc001b2a7e5b07aa8e3e90f11760 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 15:05:08 -0400 Subject: [PATCH 020/110] Update pk_critter_misc.json Soo many more pretties --- data/mods/PKs_Rebalance/pk_critter_misc.json | 320 +++++++++++++++++-- 1 file changed, 300 insertions(+), 20 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_misc.json b/data/mods/PKs_Rebalance/pk_critter_misc.json index a289fc7f83849..e23c15e7626d1 100644 --- a/data/mods/PKs_Rebalance/pk_critter_misc.json +++ b/data/mods/PKs_Rebalance/pk_critter_misc.json @@ -1,18 +1,93 @@ [ { "type" : "MONSTER", + "id" : "mon_black_rat", + "edit-mode" : "modify", + "diff":3, + "aggression":5, + "morale":10, + "speed":100, + "melee_skill":5, + "melee_dice":1, + "melee_dice_sides":1, + "melee_cut":1, + "attack_effs": [ + { + "id": "doom_unhealth", + "duration": 2 + } + ], + "dodge":2, + "armor_bash":0, + "armor_cut":1, + "vision_day":30, + "vision_night":12, + "hp":8, + "death_function":"NORMAL", + "flags":["SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "FUR", "BONES", "SWARMS", "GROUP_MORALE"], + "anger_triggers":["PLAYER_WEAK", "FRIEND_ATTACKED", "FRIEND_DIED", "HURT"], + "fear_triggers":["PLAYER_CLOSE"], + "categories":["WILDLIFE"] + },{ + "type" : "MONSTER", + "id" : "mon_rat_king", + "edit-mode" : "modify", + "diff":18, + "aggression":0, + "morale":100, + "speed":40, + "melee_skill":4, + "melee_dice":1, + "melee_dice_sides":3, + "melee_cut":1, + "dodge":0, + "armor_bash":2, + "armor_cut":0, + "hp":250, + "vision_day":5, + "vision_night":25, + "special_attacks":[["RATKING", 3], ["GRENADIER", 15]], + "starting_ammo": { "bot_rat": 20 }, + "flags":["SEES", "SMELLS", "WARM", "SWIMS", "BONES"], + "anger_triggers":["FRIEND_ATTACKED", "FRIEND_DIED"], + "fear_triggers":["PLAYER_CLOSE"] + },{ + "type" : "MONSTER", + "id" : "mon_horse", + "edit-mode" : "modify", + "aggression":-5, + "morale":20, + "speed":210, + "melee_skill":6, + "melee_dice":2, + "melee_dice_sides":8, + "melee_damage" : {"damage_type" : "stab", "amount" : 10}, + "melee_cut":0, + "dodge":2, + "armor_bash":4, + "armor_cut":1, + "armor_acid":2, + "vision_day":40, + "hp":110, + "anger_triggers":["FRIEND_ATTACKED", "FRIEND_DIED"], + "placate_triggers":["PLAYER_WEAK"], + "fear_triggers":["SOUND"], + "categories":["WILDLIFE"] + },{ + "type" : "MONSTER", "id" : "mon_bear", "edit-mode" : "modify", "aggression":-10, "morale":60, "speed":140, "melee_skill":6, - "melee_dice":4, - "melee_dice_sides":6, - "melee_cut":6, + "melee_dice":2, + "melee_dice_sides":8, + "melee_cut":8, + "melee_damage" : [{"damage_type" : "bash", "amount" : 8}], "dodge":3, - "armor_bash":3, - "armor_cut":1, + "armor_bash":1, + "armor_cut":3, "vision_day":30, "vision_night":15, "hp":140, @@ -27,10 +102,10 @@ "id" : "mon_cougar", "edit-mode" : "modify", "melee_dice":2, - "melee_dice_sides":5, - "melee_cut":6, + "melee_dice_sides":4, + "melee_cut":8, "dodge":6, - "hp":100, + "hp":70, "special_attacks":[ { "type" : "leap", @@ -45,7 +120,7 @@ "aggression":2, "morale":15, "speed":150, - "melee_skill":6, + "melee_skill":4, "melee_dice":2, "melee_dice_sides":3, "melee_cut":3, @@ -68,10 +143,11 @@ "melee_skill":6, "melee_dice":3, "melee_dice_sides":6, - "melee_cut":1, + "melee_cut":3, "dodge":1, "armor_bash":4, "armor_cut":1, + "armor_acid":2, "hp":170, "special_attacks":[["SMASH", 50]], "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "BASHES", "WARM", "FUR", "BLEED", "ATTACKMON", "BONES", "FAT"], @@ -87,11 +163,11 @@ "speed":165, "melee_skill":7, "melee_dice":2, - "melee_dice_sides":4, - "melee_cut":5, + "melee_dice_sides":2, + "melee_cut":3, + "melee_damage" : [ {"damage_type" : "stab", "amount" : 5} ], "dodge":4, "armor_bash":2, - "armor_cut":0, "vision_day":40, "vision_night":7, "hp":55, @@ -103,8 +179,16 @@ "min_mul" : 0.5, "//" : "strong jaws" }], "anger_triggers":["HURT", "FRIEND_DIED", "PLAYER_WEAK", "FIRE", "PLAYER_CLOSE"], - "placate_triggers":["MEAT", "FRIEND_ATTACKED"], - "//" : "Wolves should flee from fire as per their species, but the presence of fire will enrage them into tracking you from a short distance. the logic behind friend-attacked is to emulate dogs/wolves and their hesitation in the face of opposition. Besides, they'll be back for you soon anyway." + "placate_triggers":["MEAT", "FRIEND_ATTACKED"] + },{ + "type" : "MONSTER", + "id" : "mon_coyote", + "edit-mode" : "modify", + "hp": 28, + "upgrades":{ + "into": "mon_coyote_small", + "half_life": 17 + } },{ "type" : "MONSTER", "id" : "mon_tardigrade", @@ -122,7 +206,6 @@ "melee_skill":2, "melee_dice":1, "melee_dice_sides":24, - "melee_cut":1, "dodge":0, "armor_bash":30, "armor_cut":35, @@ -136,8 +219,7 @@ "description":"One of the most durable creatures in the world, the tardigrade has outlived the dinosaurs and humanity both. This is a plump and now moose-sized eight-legged critter with a creviced shell with in-laid segments. Along the length of the shell pairs of sensory tentacles can be seen waving around. Although its clawed digits seem to be for grasping the tentacles, due to their sheer size, lend themselves to flailing in defense.", "flags":["SEES", "SMELLS", "STUMBLES", "BASHES", "ARTHROPOD_BLOOD", "NO_BREATHE", "SWIMS", "ANIMAL", "FAT","CHITIN"], "anger_triggers":["HURT", "STALK", "FRIEND_DIED"], - "placate_triggers":["PLAYER_WEAK"], - "//" : "Due to the way he was designed, one concern was him getting slaughtered for the oodles of meat. The solution is to make him candig and uncommon." + "placate_triggers":["PLAYER_WEAK"] },{ "type" : "MONSTER", "id" : "mon_gator", @@ -149,7 +231,7 @@ "size":"LARGE", "material":"flesh", "diff":15, - "aggression":20, + "aggression":30, "morale":50, "speed":90, "melee_skill":4, @@ -173,11 +255,209 @@ {"damage_type" : "bash", "amount" : 27, "armor_multiplier" : 0.5} ] }, ["GRAB", 30], ["GRAB_DRAG", 10]], - "description":"In the late 20th century there was an urban legend about pet alligators getting flushed down the toilet and growing to adulthood in sewers. This large specimen doesn't look like its used to humans as anything other than a meal.", + "description":"In the late 20th century there was an urban legend about pet alligators getting flushed down the toilet and growing to adulthood in sewers. This large specimen doesn't look like it is used to humans as anything other than a meal.", "flags":["SEES", "HEARS", "GOODHEARING", "SMELLS", "KEENNOSE", "ANIMAL", "BLEED", "ATTACKMON", "BONES", "LEATHER", "SWIMS"], "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK"], "placate_triggers":["MEAT"], "fear_triggers": ["FIRE", "HURT"], "categories":["WILDLIFE"] + },{ + "type" : "MONSTER", + "id" : "mon_bear_mega", + "name": "elephant bear", + "species":"MAMMAL", + "default_faction":"bear", + "symbol":"B", + "color":"brown_white", + "size":"HUGE", + "material":"flesh", + "diff":22, + "aggression":-10, + "morale":80, + "speed":140, + "melee_skill":6, + "melee_dice":2, + "melee_dice_sides":10, + "melee_cut":6, + "melee_damage" : [{"damage_type" : "bash", "amount" : 16}], + "dodge":5, + "armor_bash":14, + "armor_cut":6, + "vision_day":35, + "vision_night":10, + "hp":320, + "death_function":"NORMAL", + "special_attacks":[["FLESH_GOLEM", 20], + { + "type" : "bite", + "cooldown" : 30, + "accuracy" : 7, + "no_infection_chance" : 3, + "armor_multiplier" : 0.5 + }], + "description":"An absolutely enormous bear-like creature, with paws larger than your head. A dedicated omnivore, it can sometimes decide to scavenge or attack smaller animals; relying upon its thick hide to keep it safe.", + "flags":["SEES", "HEARS", "SMELLS", "KEENNOSE", "ANIMAL", "WARM", "FUR", "BLEED", "BASHES", "DESTROYS", "PUSH_MON", "BONES", "FAT", "LEATHER"], + "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK", "FRIEND_ATTACKED"], + "placate_triggers":["MEAT"], + "fear_triggers": ["HURT", "FRIEND_DIED"], + "categories":["WILDLIFE"] + },{ + "type" : "MONSTER", + "id" : "mon_bear_mega_mating", + "name": "elephant bear", + "species":"MAMMAL", + "default_faction":"bear_mating", + "symbol":"B", + "color":"brown_white", + "size":"HUGE", + "material":"flesh", + "diff":22, + "aggression":-10, + "morale":120, + "speed":135, + "melee_skill":6, + "melee_dice":2, + "melee_dice_sides":18, + "melee_cut":4, + "melee_damage" : [{"damage_type" : "bash", "amount" : 8}], + "dodge":3, + "armor_bash":14, + "armor_cut":6, + "vision_day":30, + "vision_night":10, + "hp":320, + "death_function":"NORMAL", + "special_attacks":[["FLESH_GOLEM", 20], ["SMASH", 60], + { + "type" : "bite", + "cooldown" : 30, + "accuracy" : 8, + "no_infection_chance" : 3, + "armor_multiplier" : 0.5 + }], + "description":"It appears that its megabear mating season. It's probably best not to disturb them. Or get anywhere close them.", + "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "WARM", "FUR", "BLEED", "BASHES", "DESTROYS", "ATTACKMON", "BONES", "FAT", "LEATHER", "SWARMS"], + "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK", "SOUND", "STALK", "FIRE", "FRIEND_ATTACKED"], + "placate_triggers":["MEAT"], + "fear_triggers": ["HURT", "FIRE"], + "categories":["WILDLIFE"] + },{ + "type" : "MONSTER", + "id" : "mon_bear_mega_kid", + "name": "juvenile elephant bear", + "species":"MAMMAL", + "default_faction":"bear", + "symbol":"B", + "color":"brown_white", + "size":"LARGE", + "material":"flesh", + "diff":20, + "aggression":-15, + "morale":60, + "speed":120, + "melee_skill":4, + "melee_dice":2, + "melee_dice_sides":8, + "melee_cut":6, + "melee_damage" : [{"damage_type" : "bash", "amount" : 12}], + "dodge":3, + "armor_bash":10, + "armor_cut":6, + "vision_day":30, + "vision_night":7, + "hp":240, + "death_function":"NORMAL", + "special_attacks":[ + { + "type" : "bite", + "cooldown" : 20, + "accuracy" : 6, + "no_infection_chance" : 3, + "armor_multiplier" : 0.6 + }], + "description":"This young megabear hasn't yet developed the muscle or size of the adults, but it would be mistake to think it was weak. It may still be under its mother's protection.", + "flags":["SEES", "HEARS", "SMELLS", "KEENNOSE", "ANIMAL", "WARM", "FUR", "BLEED", "BASHES", "PUSH_MON", "BONES", "FAT", "LEATHER", "SWARMS", "GROUP_MORALE"], + "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK", "FRIEND_ATTACKED", "FIRE"], + "placate_triggers":["MEAT"], + "fear_triggers": ["HURT", "FRIEND_DIED", "FIRE"], + "categories":["WILDLIFE"] + },{ + "type" : "MONSTER", + "id" : "mon_bear_mega_baby", + "name": "elephant bear cub", + "species":"MAMMAL", + "default_faction":"bear", + "symbol":"B", + "color":"brown_white", + "size":"LARGE", + "material":"flesh", + "diff":20, + "aggression":-15, + "morale":60, + "speed":110, + "melee_skill":4, + "melee_dice":1, + "melee_dice_sides":16, + "melee_cut":4, + "melee_damage" : [{"damage_type" : "bash", "amount" : 6}], + "dodge":2, + "armor_bash":10, + "armor_cut":6, + "vision_day":30, + "vision_night":7, + "hp":180, + "death_function":"NORMAL", + "special_attacks":[ + { + "type" : "bite", + "cooldown" : 20, + "accuracy" : 5, + "no_infection_chance" : 3, + "armor_multiplier" : 0.6 + }], + "description":"A very young elephant bear, still too uncoordinated to walk proficently. With large eyes and bleating cries, this is the cutest car-sized thing that ever would eat you.", + "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "WARM", "FUR", "BLEED", "BASHES", "PUSH_MON", "BONES", "FAT", "LEATHER", "SWARMS", "GROUP_MORALE", "STUMBLES"], + "anger_triggers":["PLAYER_WEAK", "FRIEND_ATTACKED", "FIRE"], + "placate_triggers":["MEAT", "FRIEND_ATTACKED"], + "fear_triggers": ["HURT", "FRIEND_DIED", "FIRE", "PLAYER_CLOSE"], + "categories":["WILDLIFE"] + },{ + "type" : "MONSTER", + "id" : "mon_coyote_small", + "name": "dwarf coyote", + "species":"MAMMAL", + "default_faction":"small_animal", + "symbol":"d", + "color":"brown", + "size":"SMALL", + "material":"flesh", + "diff":12, + "aggression":0, + "morale":25, + "speed":150, + "melee_skill":6, + "melee_dice":1, + "melee_dice_sides":3, + "melee_cut":4, + "melee_damage" : [{"damage_type" : "stab", "amount" : 6}], + "dodge":6, + "armor_bash":1, + "vision_day":40, + "vision_night":5, + "hp":22, + "death_function":"NORMAL", + "special_attacks":[["GRAB", 40], + { + "type" : "bite", + "cooldown" : 30, + "accuracy" : 9, + "armor_multiplier" : 0.65 + }], + "description":"The downward pressure on the canines has produced smaller and more agile versions. These live in social communities and can be usually seen tenaciously hunting for moles; dragging them out of their tunnels with paws and elongated teeth. It has also been known to aggressively raid campgrounds.", + "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "WARM", "FUR", "HIT_AND_RUN", "KEENNOSE", "BLEED", "BONES", "SWARMS", "GROUP_MORALE"], + "anger_triggers":["FRIEND_ATTACKED", "PLAYER_WEAK", "MEAT", "FIRE", "FIRE"], + "fear_triggers": ["HURT", "PLAYER_CLOSE", "FRIEND_DIED"], + "placate_triggers":["MEAT"], + "categories":["WILDLIFE"] } ] From f5b4cccb924663716e13a768b3ac3e41f635ec9a Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 15:06:11 -0400 Subject: [PATCH 021/110] Update pk_spawn_list.json --- data/mods/PKs_Rebalance/pk_spawn_list.json | 158 ++++++++++++++++++--- 1 file changed, 136 insertions(+), 22 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_spawn_list.json b/data/mods/PKs_Rebalance/pk_spawn_list.json index 7dd43daadba20..61a5deec09bd2 100644 --- a/data/mods/PKs_Rebalance/pk_spawn_list.json +++ b/data/mods/PKs_Rebalance/pk_spawn_list.json @@ -19,9 +19,9 @@ { "monster": "mon_mancubus", "freq": 14, "cost_multiplier": 13, "pack_size" : [1,3], "starts" : 125 }, { "monster": "mon_cacodemon", "freq": 20, "cost_multiplier": 15, "pack_size" : [1,4], "starts" : 150 }, { "monster": "mon_mechaspider", "freq": 17, "cost_multiplier": 7, "starts" : 150 }, - { "monster": "mon_mechaspider", "freq": 3, "cost_multiplier": 15, "pack_size" : [2,3], "starts" : 200 }, + { "monster": "mon_mechaspider", "freq": 3, "cost_multiplier": 15, "pack_size" : [2,3], "starts" : 250 }, { "monster": "mon_cyberdemon", "freq": 1, "cost_multiplier": 25, "starts" : 500 } - ] + ] },{ "type": "monstergroup", "name": "GROUP_DOOM_INFANTRY", @@ -37,7 +37,7 @@ { "monster": "mon_hell_knight", "freq": 20, "cost_multiplier": 7, "pack_size" : [1,2] }, { "monster": "mon_cacodemon", "freq": 17, "cost_multiplier": 9, "pack_size" : [1,2], "starts" : 50 }, { "monster": "mon_mancubus", "freq": 3, "cost_multiplier": 15, "starts" : 50 } - ] + ] },{ "type": "monstergroup", "name": "GROUP_DOOM_HELP", @@ -49,7 +49,7 @@ { "monster": "mon_doom_cur", "freq": 25, "cost_multiplier": 0, "pack_size" : [1,2] }, { "monster": "mon_revenant", "freq": 5, "cost_multiplier": 3 }, { "monster": "mon_hell_knight", "freq": 20, "cost_multiplier": 5, "pack_size" : [1,2] } - ] + ] },{ "type": "monstergroup", "name": "GROUP_DOOM_PRIEST", @@ -57,7 +57,7 @@ "monsters": [ { "monster": "mon_hell_baron", "freq": 7, "cost_multiplier": 15, "pack_size" : [2,4] }, { "monster": "mon_cyberdemon", "freq": 3, "cost_multiplier": 25 } - ] + ] },{ "type":"monstergroup", "name" : "GROUP_ANT", @@ -67,6 +67,7 @@ { "monster" : "mon_ant_scrib", "freq" : 30, "cost_multiplier" : 0 }, { "monster" : "mon_ant_soldier_pk_weak", "freq" : 50, "cost_multiplier" : 5, "pack_size" : [1,3] }, { "monster" : "mon_ant_queen_young", "freq" : 15, "cost_multiplier" : 5, "conditions" : ["SPRING"], "starts": 75 }, + { "monster" : "mon_ant_male", "freq" : 30, "cost_multiplier" : 5, "conditions" : ["SPRING"], "starts": 25 }, { "monster" : "mon_ant_kwama", "freq" : 5, "cost_multiplier" : 0, "conditions" : ["SPRING"], "starts": 100 }, { "monster" : "mon_ant_kwama", "freq" : 15, "cost_multiplier" : 0, "conditions" : ["SUMMER, AUTUMN"], "starts" : 100 }, { "monster" : "mon_ant_kwama", "freq" : 25, "cost_multiplier" : 0, "conditions" : ["WINTER"], "starts": 100 }, @@ -94,6 +95,46 @@ ] },{ "type":"monstergroup", + "name" : "GROUP_SPIDER", + "default" : "mon_spider_web", + "monsters" : [ + { "monster" : "mon_null", "freq" : 1000, "cost_multiplier" : 0, "conditions" : ["WINTER"] }, + { "monster" : "mon_null", "freq" : 10, "cost_multiplier" : 0 }, + { "monster" : "mon_spider_web_queen", "freq" : 5, "cost_multiplier" : 3 }, + { "monster" : "mon_spider_web", "freq" : 20, "cost_multiplier" : 1, "pack_size" : [1,4] }, + { "monster" : "mon_spider_web_s", "freq" : 10, "cost_multiplier" : 3, "pack_size" : [4,16], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_spider_web_alpha", "freq" : 10, "cost_multiplier" : 5, "pack_size" : [1,4], "starts" : 75 }, + { "monster" : "mon_spider_web_omega", "freq" : 10, "cost_multiplier" : 5, "pack_size" : [1,4], "starts" : 50 }, + { "monster" : "mon_spider_web_mu", "freq" : 10, "cost_multiplier" : 5, "pack_size" : [2,6], "starts" : 100 } + ] + },{ + "type":"monstergroup", + "name" : "GROUP_SPIDER_TRAP", + "default" : "mon_spider_trapdoor_giant", + "monsters" : [ + { "monster" : "mon_null", "freq" : 1000, "cost_multiplier" : 0, "conditions" : ["WINTER"] }, + { "monster" : "mon_null", "freq" : 5, "cost_multiplier" : 0 }, + { "monster" : "mon_trapdoor_egg", "freq" : 10, "cost_multiplier" : 1, "starts": 5 }, + { "monster" : "mon_trapdoor_queen", "freq" : 5, "cost_multiplier" : 3 }, + { "monster" : "mon_spider_trapdoor_giant_s", "freq" : 10, "cost_multiplier" : 3, "pack_size" : [3,8], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_spider_trapdoor_giant", "freq" : 25, "cost_multiplier" : 1, "pack_size" : [1,2] }, + { "monster" : "mon_spider_trapdoor_giant_guardian", "freq" : 5, "cost_multiplier" : 0, "starts": 75 }, + { "monster" : "mon_spider_trapdoor_giant_pk", "freq" : 15, "cost_multiplier" : 0, "pack_size" : [1,2], "starts": 50 } + ] + },{ + "type":"monstergroup", + "name" : "GROUP_SPIDER_TRAP_LONER", + "default" : "mon_null", + "monsters" : [ + { "monster" : "mon_null", "freq" : 1000, "cost_multiplier" : 0, "conditions" : ["WINTER"] }, + { "monster" : "mon_trapdoor_egg", "freq" : 5, "cost_multiplier" : 1, "starts": 5 }, + { "monster" : "mon_trapdoor_queen", "freq" : 5, "cost_multiplier" : 3 }, + { "monster" : "mon_spider_trapdoor_giant", "freq" : 10, "cost_multiplier" : 1, "pack_size" : [1,4] }, + { "monster" : "mon_spider_trapdoor_giant_guardian", "freq" : 15, "cost_multiplier" : 5, "pack_size" : [1,2] , "starts": 50 }, + { "monster" : "mon_spider_trapdoor_giant_pk", "freq" : 15, "cost_multiplier" : 3, "pack_size" : [1,3], "starts": 25 } + ] + },{ + "type":"monstergroup", "name" : "GROUP_FOREST", "default" : "mon_null", "monsters" : [ @@ -125,6 +166,11 @@ { "monster" : "mon_jabberwock", "freq" : 5, "cost_multiplier" : 50, "conditions" : ["DAWN", "WINTER", "SUMMER"], "starts" : 250 }, { "monster" : "mon_ant_queen_young", "freq" : 4, "cost_multiplier" : 5, "conditions" : ["SPRING"], "starts" : 75 }, + { "monster" : "mon_spider_trapdoor_giant_pk", "freq" : 3, "cost_multiplier" : 5, "pack_size" : [1,3], "conditions" : ["DAY", "DUSK", "NIGHT", "SUMMER", "AUTUMN"], "starts" : 100 }, + + { "monster" : "mon_zolf_scorched", "freq" : 1, "cost_multiplier" : 25, "starts" : 150, "conditions" : ["NIGHT"] }, + { "monster" : "mon_horse_zombie_scorched", "freq" : 1, "cost_multiplier" : 25, "starts" : 150, "conditions" : ["DUSK", "NIGHT"] }, + { "monster" : "mon_horse_zombie_scorched", "freq" : 1, "cost_multiplier" : 35, "pack_size" : [1,2], "starts" : 300, "conditions" : ["DUSK", "NIGHT"] }, { "monster" : "mon_horse", "freq" : 2, "cost_multiplier" : 15, "pack_size" : [1,4], "ends" : 200, "conditions" : ["DAWN", "SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_horse", "freq" : 2, "cost_multiplier" : 15, "pack_size" : [1,4], "ends" : 600, "conditions" : ["DAWN", "SPRING", "SUMMER", "AUTUMN"] }, @@ -134,6 +180,15 @@ { "monster" : "mon_horse", "freq" : 1, "cost_multiplier" : 20, "pack_size" : [1,3], "ends" : 200, "conditions" : ["DAY", "WINTER"] }, { "monster" : "mon_horse", "freq" : 1, "cost_multiplier" : 20, "pack_size" : [1,3], "ends" : 600, "conditions" : ["DAY", "WINTER"] }, { "monster" : "mon_horse", "freq" : 1, "cost_multiplier" : 20, "pack_size" : [1,3], "ends" : 1000, "conditions" : ["DAY", "WINTER"] }, + + { "monster" : "mon_horse_zombie", "freq" : 2, "cost_multiplier" : 15, "starts" : 75, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_horse_zombie", "freq" : 2, "cost_multiplier" : 15, "starts" : 450, "ends" : 2000, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_horse_zombie", "freq" : 2, "cost_multiplier" : 15, "starts" : 850, "ends" : 2400, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_horse_zombie", "freq" : 1, "cost_multiplier" : 15, "starts" : 1300, "ends" : 2700, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_horse_zombie", "freq" : 1, "cost_multiplier" : 15, "starts" : 1800, "ends" : 3500, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_horse_zombie", "freq" : 1, "cost_multiplier" : 25, "pack_size" : [1,3], "starts" : 100, "ends" : 2100 }, + { "monster" : "mon_horse_zombie", "freq" : 1, "cost_multiplier" : 25, "pack_size" : [1,3], "starts" : 750, "ends" : 2700 }, + { "monster" : "mon_horse_zombie", "freq" : 1, "cost_multiplier" : 25, "pack_size" : [1,3], "starts" : 1600, "ends" : 3500 }, { "monster" : "mon_deer", "freq" : 5, "cost_multiplier" : 2, "pack_size" : [1,5] }, { "monster" : "mon_deer", "freq" : 5, "cost_multiplier" : 2, "pack_size" : [1,5], "ends" : 600, "conditions" : ["DAY"] }, @@ -141,6 +196,9 @@ { "monster" : "mon_deer", "freq" : 5, "cost_multiplier" : 2, "pack_size" : [1,5], "ends" : 1800, "conditions" : ["DAY"] }, { "monster" : "mon_bat", "freq" : 50, "cost_multiplier" : 2, "pack_size" : [3,12], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_bat_vampire", "freq" : 10, "cost_multiplier" : 10, "pack_size" : [6,18], "starts" : 350, "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_bat_vampire", "freq" : 5, "cost_multiplier" : 10, "pack_size" : [6,18], "starts" : 450, "conditions" : ["NIGHT", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_bat_vampire", "freq" : 15, "cost_multiplier" : 10, "pack_size" : [6,12], "starts" : 800, "conditions" : ["DAWN", "DUSK", "NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_bear", "freq" : 1, "cost_multiplier" : 10, "ends" : 4000, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_bear", "freq" : 1, "cost_multiplier" : 10, "ends" : 72, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, @@ -152,6 +210,18 @@ { "monster" : "mon_bear", "freq" : 1, "cost_multiplier" : 10, "ends" : 2160, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_bear", "freq" : 3, "cost_multiplier" : 10, "ends" : 2160, "conditions" : ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_bear_mega", "freq" : 1, "cost_multiplier" : 25, "starts" : 850 }, + { "monster" : "mon_bear_mega", "freq" : 5, "cost_multiplier" : 25, "starts" : 850, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_bear_mega", "freq" : 2, "cost_multiplier" : 30, "starts" : 850, "conditions" : ["DAY", "SUMMER"], "pack_size" : [1,3] }, + { "monster" : "mon_bear_mega", "freq" : 1, "cost_multiplier" : 50, "starts" : 900, "conditions" : ["DAWN", "DAY", "SPRING"] }, + + { "monster" : "mon_bear_mega_mating", "freq" : 5, "cost_multiplier" : 30, "starts" : 950, "conditions" : ["DAWN", "DAY", "DUSK", "SUMMER"], "pack_size" : [1,3] }, + { "monster" : "mon_bear_mega_baby", "freq" : 2, "cost_multiplier" : 20, "starts" : 850, "conditions" : ["DAWN", "DAY", "SPRING"], "pack_size" : [1,4] }, + { "monster" : "mon_bear_mega_baby", "freq" : 1, "cost_multiplier" : 20, "starts" : 850, "conditions" : ["DAWN", "DAY", "SUMMER"], "pack_size" : [1,3] }, + { "monster" : "mon_bear_mega_kid", "freq" : 1, "cost_multiplier" : 20, "starts" : 1050, "conditions" : ["DAWN", "DAY", "SPRING"], "pack_size" : [1,4] }, + { "monster" : "mon_bear_mega_kid", "freq" : 2, "cost_multiplier" : 25, "starts" : 1050, "conditions" : ["DAWN", "DAY", "SUMMER"], "pack_size" : [1,3] }, + { "monster" : "mon_bear_mega_kid", "freq" : 2, "cost_multiplier" : 30, "starts" : 1050, "conditions" : ["DAWN", "DAY", "DUSK", "AUTUMN"] }, + { "monster" : "mon_zombear", "freq" : 1, "cost_multiplier" : 10, "starts" : 72, "ends" : 2400 }, { "monster" : "mon_zombear", "freq" : 2, "cost_multiplier" : 10, "starts" : 168, "ends" : 2700 }, { "monster" : "mon_zombear", "freq" : 3, "cost_multiplier" : 10, "starts" : 672, "ends" : 3100 }, @@ -239,6 +309,10 @@ { "monster" : "mon_coyote", "freq" : 1, "cost_multiplier" : 2, "ends" : 2160, "pack_size" : [1,6] }, { "monster" : "mon_coyote", "freq" : 2, "cost_multiplier" : 2, "ends" : 2160, "pack_size" : [1,6], "conditions" : ["NIGHT"] }, + { "monster" : "mon_coyote_small", "freq" : 3, "cost_multiplier" : 5, "starts" : 200, "pack_size" : [3,8] }, + { "monster" : "mon_coyote_small", "freq" : 3, "cost_multiplier" : 5, "starts" : 600, "pack_size" : [10,18], "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_coyote_small", "freq" : 7, "cost_multiplier" : 5, "starts" : 800, "pack_size" : [3,8], "ends" : 1800 }, + { "monster" : "mon_coyote_wolf", "freq" : 1, "cost_multiplier" : 2, "pack_size" : [1,8] }, { "monster" : "mon_coyote_wolf", "freq" : 2, "cost_multiplier" : 2, "pack_size" : [1,8], "conditions" : ["NIGHT"] }, { "monster" : "mon_coyote_wolf", "freq" : 1, "cost_multiplier" : 2, "ends" : 72, "pack_size" : [1,8] }, @@ -250,6 +324,11 @@ { "monster" : "mon_coyote_wolf", "freq" : 1, "cost_multiplier" : 2, "ends" : 2160, "pack_size" : [1,8] }, { "monster" : "mon_coyote_wolf", "freq" : 2, "cost_multiplier" : 2, "ends" : 2160, "pack_size" : [1,8], "conditions" : ["NIGHT"] }, + { "monster" : "mon_coyote_wolf_zerg", "freq" : 2, "cost_multiplier" : 15, "starts" : 600, "pack_size" : [2,7] }, + { "monster" : "mon_coyote_wolf_zerg", "freq" : 2, "cost_multiplier" : 25, "starts" : 800, "pack_size" : [6,12], "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_coyote_wolf_zerg", "freq" : 10, "cost_multiplier" : 15, "starts" : 700, "pack_size" : [2,7], "ends" : 2100 }, + { "monster" : "mon_coyote_wolf_zerg", "freq" : 1, "cost_multiplier" : 50, "starts" : 800, "pack_size" : [20,20], "conditions" : ["DUSK", "SUMMER"] }, + { "monster" : "mon_zombie_dog", "freq" : 4, "cost_multiplier" : 2, "starts" : 72 }, { "monster" : "mon_zombie_dog", "freq" : 4, "cost_multiplier" : 2, "starts" : 336 }, { "monster" : "mon_zombie_dog", "freq" : 4, "cost_multiplier" : 2, "starts" : 504 }, @@ -369,6 +448,7 @@ { "monster" : "mon_spider_jumping_giant", "freq" : 2, "cost_multiplier" : 0, "starts" : 672, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_spider_jumping_giant", "freq" : 1, "cost_multiplier" : 0, "starts" : 792, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_spider_jumping_giant", "freq" : 2, "cost_multiplier" : 0, "starts" : 792, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_spider_jumping_giant_acid", "freq" : 1, "cost_multiplier" : 15, "starts" : 150, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_spider_wolf", "freq" : 4, "cost_multiplier" : 2, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_spider_wolf", "freq" : 24, "cost_multiplier" : 2, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, @@ -400,7 +480,6 @@ { "monster" : "mon_worm", "freq" : 1, "cost_multiplier" : 0, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_worm", "freq" : 1, "cost_multiplier" : 0, "starts" : 336, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_worm", "freq" : 1, "cost_multiplier" : 0, "starts" : 672, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bear_smoky", "freq" : 1, "cost_multiplier" : 0, "starts" : 672, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] } ] },{ @@ -438,10 +517,10 @@ { "monster" : "mon_zombie_dog", "freq" : 15, "cost_multiplier" : 2 }, { "monster" : "mon_zombie_dog", "freq" : 10, "cost_multiplier" : 8, "pack_size": [3,5]}, - { "monster" : "mon_zombie_dog", "freq" : 3, "cost_multiplier" : 14, "pack_size": [5,8]}, + { "monster" : "mon_zombie_dog", "freq" : 3, "cost_multiplier" : 14, "pack_size": [5,8], "starts" : 2 }, { "monster" : "mon_zombie_dog", "freq" : 2, "cost_multiplier" : 20, "pack_size": [8,12], "starts" : 5 }, { "monster" : "mon_dog_skeleton", "freq" : 10, "cost_multiplier" : 5 }, - { "monster" : "mon_dog_skeleton", "freq" : 3, "cost_multiplier" : 20, "pack_size": [3,5]}, + { "monster" : "mon_dog_skeleton", "freq" : 3, "cost_multiplier" : 20, "pack_size": [3,5], "starts" : 2 }, { "monster" : "mon_dog_zombie_cop", "freq" : 5, "cost_multiplier" : 4 }, { "monster" : "mon_dog_zombie_rot", "freq" : 5, "cost_multiplier" : 10, "pack_size": [1,3]}, @@ -469,14 +548,14 @@ { "monster" : "mon_zombie_gasbag", "freq" : 5, "cost_multiplier": 15, "pack_size": [3,5], "starts" : 2 }, { "monster" : "mon_zombie_smoker", "freq" : 15, "cost_multiplier" : 5 }, { "monster" : "mon_zombie_smoker", "freq" : 5, "cost_multiplier" : 10, "pack_size": [2,3], "starts" : 2 }, - + { "monster" : "mon_boomer", "freq" : 30, "cost_multiplier" : 5 }, { "monster" : "mon_boomer", "freq" : 5, "cost_multiplier" : 15, "pack_size": [2,4], "starts" : 2 }, { "monster" : "mon_boomer_huge", "freq" : 5, "cost_multiplier" : 7, "starts" : 3 }, { "monster" : "mon_zombie_shrieker", "freq" : 25, "cost_multiplier" : 5 }, { "monster" : "mon_zombie_shrieker", "freq" : 5, "cost_multiplier" : 10, "pack_size": [1,3]}, - + { "monster" : "mon_zombie_acidic", "freq" : 25, "cost_multiplier" : 3 }, { "monster" : "mon_zombie_acidic", "freq" : 5, "cost_multiplier" : 9, "pack_size": [2,5], "starts" : 3 }, { "monster" : "mon_zombie_spitter", "freq" : 15, "cost_multiplier" : 5 }, @@ -503,7 +582,16 @@ { "monster" : "mon_zombie_hollow", "freq" : 3, "cost_multiplier" : 10, "starts" : 2 }, { "monster" : "mon_beekeeper", "freq" : 1, "cost_multiplier" : 5 }, - { "monster" : "mon_zombie_technician", "freq" : 2, "cost_multiplier" : 12} + { "monster" : "mon_zombie_technician", "freq" : 2, "cost_multiplier" : 12}, + + { "monster" : "mon_zombie_scorched", "freq" : 1, "cost_multiplier" : 8, "pack_size": [1,4], "starts": 25 }, + { "monster" : "mon_zombie_fiend", "freq" : 1, "cost_multiplier" : 14, "pack_size": [1, 2], "starts": 25 }, + { "monster" : "mon_zombie_crawler_scorched", "freq" : 1, "cost_multiplier" : 2, "pack_size": [1,2], "starts": 50 }, + { "monster" : "mon_zombie_child_scorched", "freq" : 1, "cost_multiplier" : 14, "pack_size": [1, 4], "starts": 50 }, + { "monster" : "mon_zombie_fiend_shocker", "freq" : 1, "cost_multiplier" : 12, "pack_size": [1,2], "starts": 50 }, + { "monster" : "mon_zombie_scorched_necro", "freq" : 1, "cost_multiplier" : 20, "pack_size": [1, 3], "starts": 75 }, + { "monster" : "mon_zombie_scorched_master", "freq" : 1, "cost_multiplier" : 20, "pack_size": [1, 3], "starts": 75 }, + { "monster" : "mon_zolf_scorched", "freq" : 1, "cost_multiplier" : 20, "conditions" : ["WINTER"] } ], "replace_monster_group" : true, "new_monster_group_id" : "GROUP_ZOMBIE_MID", @@ -565,7 +653,7 @@ { "monster" : "mon_zombie_predator", "freq" : 3, "cost_multiplier" : 15, "pack_size": [1,2] }, { "monster" : "mon_zombie_gasbag", "freq" : 15, "cost_multiplier": 5}, - { "monster" : "mon_zombie_gasbag", "freq" : 5, "cost_multiplier": 15, "pack_size": [3,5]}, + { "monster" : "mon_zombie_gasbag", "freq" : 5, "cost_multiplier": 15, "pack_size": [3,5]}, { "monster" : "mon_zombie_smoker", "freq" : 15, "cost_multiplier" : 5 }, { "monster" : "mon_zombie_smoker", "freq" : 5, "cost_multiplier" : 10, "pack_size": [2,3]}, { "monster" : "mon_zombie_gasbag_pk", "freq" : 2, "cost_multiplier": 25}, @@ -597,7 +685,7 @@ { "monster" : "mon_zombie_necro", "freq" : 2, "cost_multiplier" : 25 }, { "monster" : "mon_zombie_necro", "freq" : 1, "cost_multiplier" : 50, "pack_size": [1,3]}, - { "monster" : "mon_zombie_survivor", "freq" : 5, "cost_multiplier" : 40, "pack_size": [1,5]}, + { "monster" : "mon_zombie_survivor", "freq" : 5, "cost_multiplier" : 40, "pack_size": [1,5]}, { "monster" : "mon_zombie_master", "freq" : 2, "cost_multiplier" : 30 }, { "monster" : "mon_zombie_master", "freq" : 1, "cost_multiplier" : 60, "pack_size": [1,3]}, @@ -609,7 +697,16 @@ { "monster" : "mon_zombie_hollow_pk", "freq" : 3, "cost_multiplier" : 30, "pack_size": [1,3]}, { "monster" : "mon_beekeeper", "freq" : 1, "cost_multiplier" : 5 }, - { "monster" : "mon_zombie_technician", "freq" : 2, "cost_multiplier" : 12} + { "monster" : "mon_zombie_technician", "freq" : 2, "cost_multiplier" : 12}, + + { "monster" : "mon_zombie_scorched", "freq" : 1, "cost_multiplier" : 8, "pack_size": [1,4], "starts": 25 }, + { "monster" : "mon_zombie_fiend", "freq" : 1, "cost_multiplier" : 14, "pack_size": [1, 2], "starts": 25 }, + { "monster" : "mon_zombie_child_scorched", "freq" : 1, "cost_multiplier" : 14, "pack_size": [2, 8], "starts": 50 }, + { "monster" : "mon_zombie_fiend_shocker", "freq" : 1, "cost_multiplier" : 12, "pack_size": [1,2], "starts": 50 }, + { "monster" : "mon_zombie_scorched_shocker", "freq" : 1, "cost_multiplier" : 10, "pack_size": [1, 3], "starts": 50 }, + { "monster" : "mon_zombie_scorched_necro", "freq" : 1, "cost_multiplier" : 18, "pack_size": [1, 3], "starts": 75 }, + { "monster" : "mon_zombie_scorched_master", "freq" : 1, "cost_multiplier" : 18, "pack_size": [1, 3], "starts": 75 }, + { "monster" : "mon_zolf_scorched", "freq" : 1, "cost_multiplier" : 25, "conditions" : ["WINTER"] } ] },{ "type":"monstergroup", @@ -722,7 +819,9 @@ { "monster" : "mon_treent_green", "freq" : 50, "cost_multiplier" : 7, "starts": 250 }, { "monster" : "mon_minecraft", "freq" : 3, "cost_multiplier" : 20, "pack_size" : [1,4], "starts" : 125 }, { "monster" : "mon_minecraft_charged", "freq" : 2, "cost_multiplier" : 25, "pack_size" : [1,4], "starts" : 200 }, - { "monster" : "mon_triffid_heart", "freq" : 0, "cost_multiplier" : 0 } + { "monster" : "mon_triffid_heart", "freq" : 0, "cost_multiplier" : 0 }, + { "monster" : "mon_spider_wolf_giant", "freq" : 4, "cost_multiplier" : 5, "pack_size" : [1,3], "starts" : 50, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_spider_wolf_giant", "freq" : 1, "cost_multiplier" : 15, "pack_size" : [2,3], "starts" : 250, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] } ] },{ "type":"monstergroup", @@ -850,12 +949,15 @@ { "monster" : "mon_ant_queen_young", "freq" : 20, "cost_multiplier" : 2, "conditions" : ["SPRING"], "starts" : 75 }, { "monster" : "mon_bat", "freq" : 600, "cost_multiplier" : 5, "pack_size" : [6,32] }, + { "monster" : "mon_bat_vampire", "freq" : 50, "cost_multiplier" : 10, "pack_size" : [12,32], "starts" : 600 }, { "monster" : "mon_bear", "freq" : 100, "cost_multiplier" : 10, "pack_size" : [1,3], "ends" : 600 }, { "monster" : "mon_bear", "freq" : 25, "cost_multiplier" : 10, "pack_size" : [1,3], "starts" : 600 }, + { "monster" : "mon_bear_mega", "freq" : 100, "cost_multiplier" : 15, "pack_size" : [1,2], "starts" : 800 }, + { "monster" : "mon_bear_mega_baby", "freq" : 50, "cost_multiplier" : 25, "pack_size" : [1,4], "starts" : 850, "conditions" : ["SPRING", "SUMMER"] }, { "monster" : "mon_cougar", "freq" : 100, "cost_multiplier" : 20, "pack_size" : [1,2] }, { "monster" : "mon_bear_smoky", "freq" : 100, "cost_multiplier" : 0, "starts" : 250 } ] - },{ + },{ "type":"monstergroup", "name" : "GROUP_SWAMP", "default" : "mon_null", @@ -875,12 +977,15 @@ { "monster" : "mon_finecraft", "freq" : 2, "cost_multiplier" : 10, "pack_size" : [1,4], "conditions" : ["DUSK", "SUMMER", "AUTUMN"], "starts" : 150 }, { "monster" : "mon_fionaea", "freq" : 1, "cost_multiplier" : 25, "conditions" : ["DUSK", "DAWN", "SUMMER"], "starts" : 200 }, { "monster" : "mon_fungus_pig", "freq" : 5, "cost_multiplier" : 15, "pack_size" : [1,5], "starts" : 75 }, - + { "monster" : "mon_tardigrade", "freq" : 3, "cost_multiplier" : 15, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"], "starts" : 150 }, { "monster" : "mon_ant_queen_young", "freq" : 4, "cost_multiplier" : 5, "conditions" : ["SPRING"], "starts" : 75 }, { "monster" : "mon_twisted_body", "freq" : 1, "cost_multiplier" : 15, "pack_size" : [ 1 , 6 ], "starts": 50, "conditions": ["DUSK", "NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_human_snail", "freq" : 5, "cost_multiplier" : 10, "pack_size" : [ 1 , 4 ], "starts": 50, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_horse_zombie", "freq" : 1, "cost_multiplier" : 15, "starts" : 150 }, + { "monster" : "mon_horse_zombie", "freq" : 1, "cost_multiplier" : 15, "starts" : 1350, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_lemming", "freq" : 50, "cost_multiplier" : 0, "pack_size" : [2,7], "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_mosquito", "freq" : 50, "cost_multiplier" : 0, "pack_size" : [1,7], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, @@ -925,6 +1030,7 @@ { "monster" : "mon_spider_jumping_giant", "freq" : 3, "cost_multiplier" : 0, "starts" : 384, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_spider_jumping_giant", "freq" : 1, "cost_multiplier" : 0, "starts" : 792, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_spider_jumping_giant", "freq" : 3, "cost_multiplier" : 0, "starts" : 792, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_spider_jumping_giant_acid", "freq" : 1, "cost_multiplier" : 15, "starts" : 250, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_spider_wolf", "freq" : 6, "cost_multiplier" : 2, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_spider_wolf", "freq" : 24, "cost_multiplier" : 2, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, @@ -990,7 +1096,6 @@ { "monster" : "mon_giant_crayfish", "freq" : 4, "cost_multiplier" : 0, "starts" : 336, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_giant_crayfish", "freq" : 1, "cost_multiplier" : 0, "starts" : 624, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_giant_crayfish", "freq" : 4, "cost_multiplier" : 0, "starts" : 624, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bear_smoky", "freq" : 1, "cost_multiplier" : 0, "starts" : 672, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] } ] },{ @@ -1008,10 +1113,9 @@ { "monster" : "mon_zombie_child", "freq" : 8, "cost_multiplier" : 0 }, { "monster" : "mon_skeleton", "freq" : 10, "cost_multiplier" : 5 }, { "monster" : "mon_zombie_shrieker", "freq" : 10, "cost_multiplier" : 5 }, - { "monster" : "mon_ant_queen_young", "freq" : 5, "cost_multiplier" : 5, "conditions" : ["SPRING"], "starts" : 75 }, {"monster" : "mon_jabberwock", "freq" : 3, "cost_multiplier" : 50, "conditions" : ["DAWN", "DAY"], "starts" : 250 } - ] + ] },{ "type":"monstergroup", "name" : "GROUP_SAFE", @@ -1056,11 +1160,17 @@ { "monster" : "mon_lemming", "freq" : 5, "cost_multiplier" : 1 }, { "monster" : "mon_slug", "freq" : 3, "cost_multiplier" : 1 } ] - },{ + },{ "type":"monstergroup", "name" : "GROUP_DOMESTIC", "default" : "mon_dog", "monsters" : [ + { "monster" : "mon_horse_zombie", "freq" : 10, "cost_multiplier" : 25, "starts" : 75, "pack_size" : [1,4] }, + { "monster" : "mon_horse_zombie", "freq" : 5, "cost_multiplier" : 25, "starts" : 600, "pack_size" : [1,4] }, + { "monster" : "mon_horse_zombie", "freq" : 10, "cost_multiplier" : 25, "starts" : 1300, "pack_size" : [1,4] }, + { "monster" : "mon_horse_zombie", "freq" : 5, "cost_multiplier" : 25, "starts" : 1600, "pack_size" : [1,4] }, + { "monster" : "mon_zolf_scorched", "freq" : 5, "cost_multiplier" : 25, "starts": 150 }, + { "monster" : "mon_cat", "freq" : 100, "cost_multiplier" : 0 }, { "monster" : "mon_cat", "freq" : 20, "cost_multiplier" : 10, "pack_size" : [2,8] }, { "monster" : "mon_dog", "freq" : 50, "cost_multiplier" : 25, "pack_size" : [1,12] }, @@ -1080,7 +1190,7 @@ { "monster" : "mon_giant_cockroach", "freq" : 12, "cost_multiplier" : 1, "pack_size" : [1,5] }, { "monster" : "mon_pregnant_giant_cockroach", "freq" : 3, "cost_multiplier" : 3, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_giant_cockroach_nymph", "freq" : 5, "cost_multiplier" : 1} - ] + ] },{ "type": "monstergroup", "name": "CAMPERS", @@ -1090,9 +1200,13 @@ { "monster": "mon_raccoon", "freq": 25, "cost_multiplier": 0, "pack_size": [1,4] }, { "monster": "mon_bear", "freq": 15, "cost_multiplier": 3 }, { "monster": "mon_dog", "freq": 15, "cost_multiplier":1, "pack_size": [2,5] }, + { "monster": "mon_coyote_wolf", "freq": 10, "cost_multiplier": 1, "pack_size": [2,4] }, { "monster": "mon_black_rat", "freq": 20, "cost_multiplier": 1, "pack_size": [4,12] }, + { "monster": "mon_bat_vampire", "freq": 10, "cost_multiplier": 0, "pack_size": [8,16], "conditions" : ["DAWN", "DUSK", "NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, { "monster": "mon_gracke", "freq": 5, "cost_multiplier": 1, "pack_size": [2,5] }, { "monster": "mon_breather_hub", "freq": 1, "cost_multiplier":3, "pack_size": [1,2] }, + { "monster": "mon_spider_wolf_giant_pk", "freq": 3, "cost_multiplier": 5 }, + { "monster": "mon_spider_jumping_giant_acid", "freq": 10, "cost_multiplier": 3 }, { "monster": "mon_feer", "freq" : 1, "cost_multiplier" : 3, "pack_size" : [1,2], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, { "monster": "mon_fant", "freq" : 1, "cost_multiplier" : 3, "conditions" : ["SUMMER", "AUTUMN"] }, From 8bcb9f98e11e239096ed584a2a07f6f46ce4b31d Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 15:08:13 -0400 Subject: [PATCH 022/110] Create pk_effects.json Adds effects files, some animal effects. --- data/mods/PKs_Rebalance/pk_effects.json | 78 +++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 data/mods/PKs_Rebalance/pk_effects.json diff --git a/data/mods/PKs_Rebalance/pk_effects.json b/data/mods/PKs_Rebalance/pk_effects.json new file mode 100644 index 0000000000000..af9fe0477f44d --- /dev/null +++ b/data/mods/PKs_Rebalance/pk_effects.json @@ -0,0 +1,78 @@ +[ + { + "type": "effect_type", + "id": "doom_unhealth", + "int_add_val": 1, + "max_intensity": 3, + "base_mods": { + "h_mod_min": [-1] + }, + "scaling_mods": { + "h_mod_min": [-1] + } + },{ + "type": "effect_type", + "id": "spider_web_slow", + "name": [ + "web spider poison" + ], + "int_add_val": 1, + "max_intensity": 10, + "resist_trait": ["POISRESIST", "EATPOISON"], + "base_mods": { + "speed_mod": [-6, -5.5], + "pain_amount": [3, 1] + }, + "scaling_mods": { + "speed_mod": [-1, -0.5], + "pain_amount": [3, 1] + } + },{ + "type": "effect_type", + "id": "spider_web_alpha", + "int_add_val": 1, + "max_intensity": 5, + "resist_trait": ["POISRESIST", "EATPOISON"], + "base_mods": { + "speed_mod": [-3, -1], + "dex_mod": [-1] + }, + "scaling_mods": { + "speed_mod": [-3, -1], + "dex_mod": [-0.5, -0.25], + "str_mod": [-0.75, -0.5] + } + },{ + "type": "effect_type", + "id": "spider_web_omega", + "int_add_val": 1, + "max_intensity": 5, + "int_decay_step": -1, + "int_decay_tick": 200, + "resist_trait": ["POISRESIST", "EATPOISON"], + "base_mods": { + "speed_mod": [-2, 0], + "dex_mod": [-1], + "sleep_chance": [100, 150], + "sleep_min": [100, 50], + "sleep_max": [300, 100] + }, + "scaling_mods": { + "speed_mod": [-2, 0], + "dex_mod": [-0.75, -0.5], + "str_mod": [-0.25, 0], + "sleep_chance": [-15], + "sleep_min": [50, 25], + "sleep_max": [100, 50] + } + },{ + "type": "effect_type", + "id": "spider_web_mu", + "resist_trait": ["POISRESIST", "EATPOISON"], + "base_mods": { + "speed_mod": [-10], + "hurt_min": [3, 2], + "hurt_chance": [20, 50] + } + } +] From e15de2b25ffd3d0c1c59ed4850cdb9f030c3f65f Mon Sep 17 00:00:00 2001 From: Xpyder Date: Mon, 16 May 2016 11:35:31 -0700 Subject: [PATCH 023/110] fixed recipe jar v8 only fixed weight recipe looked right, probably fixed by another person previously fixed recipe jar human broth fixed recipe jar human broth fixed recipe jar bone broth fixed recipe jar bone broth fixed recipe jar broth fixed recipe jar broth fixed recipe jar veg soup fixed recipe jar veg soup fixed recipe jar meat soup fixed recipe jar meat soup fixed recipe sap soup fixed recipe sap soup fixed recipe jar fish soup fixed recipe jar fish soup Also corrected some spacing problems fixed recipe jar woods soup fixed recipe jar woods soup fixed recipe pickled flesh fixed recipe pickled flesh Also fixed volume of pickled flesh to match all other human flesh fixed weight and charges Accounted for charges on item in comestibles.json fix recipe pickled fish fix recipe pickled fish fixed weight and charges accounted for charges on item in comestibles.json fixed weight and charges Given the weights, and uses in other recipes, it looks like someone tried to fix this previously by changing charges in comestibles.json, instead of the jar itself. These changes make it consistent with other food products and should be what was originally intended. fixed recipe pickled fish Given the weights, and uses in other recipes, it looks like someone tried to fix this previously by changing charges in comestibles.json, instead of the jar itself. These changes make it consistent with other food products and should be what was originally intended. fixed recipe pickled meat fixed recipe pickled meat fixed recipe pickled veg fixed recipe pickled veg fix recipe canned tomato I based the charges on the volume of canned fruit, it seems it should have been 2 all along, not 3 fixed recipe for canned fruit I based the charges on the volume of canned fruit, it seems it should have been 2 all along, not 3 fixed recipe canned veg Fixed recipe jar soylent fixed recipe Fixed recipe Fixed recipe Fix for jar of canned meat recipe Fix for recipe Weight still needs changes Fixed weight weight updated missed a comma missed a comma fixed volume Given the weights, and uses in other recipes, it looks like someone tried to fix this previously by changing charges in comestibles.json, instead of the jar itself. These changes make it consistent with other food products and should be what was originally intended. --- data/json/items/comestibles.json | 10 +- data/json/items/tools.json | 66 ++-- data/json/recipes/recipe_food.json | 604 ++++++++++++++--------------- 3 files changed, 344 insertions(+), 336 deletions(-) diff --git a/data/json/items/comestibles.json b/data/json/items/comestibles.json index b91818bb1a55e..01329999128eb 100644 --- a/data/json/items/comestibles.json +++ b/data/json/items/comestibles.json @@ -2426,8 +2426,8 @@ "description" : "This is a serving of crisply brined and canned fish. Tasty and nutritious.", "price" : 250, "//" : "Two charges per jar.", "material" : "flesh", - "volume" : 2, - "charges" : 2, + "volume" : 1, + "charges" : 1, "fun" : 7 }, { @@ -8442,7 +8442,7 @@ "description" : "Low-sodium preserved meat. It was boiled and canned. Contains most of the nutrition, but little of the savor of cooked meat.", "price" : 250, "material" : "flesh", - "volume" : 2, + "volume" : 1, "charges" : 1, "stack_size" : 2, "fun" : 2 @@ -9481,8 +9481,8 @@ "description" : "This is a serving of crisply brined and canned human flesh. Tasty and nutritious if you're into that sort of thing.", "price" : 0, "material" : "hflesh", - "volume" : 4, - "charges" : 2, + "volume" : 1, + "charges" : 1, "fun" : 6 }, { "type" : "AMMO", diff --git a/data/json/items/tools.json b/data/json/items/tools.json index bb82c11fb0fcf..24a66d43e6bee 100644 --- a/data/json/items/tools.json +++ b/data/json/items/tools.json @@ -5668,7 +5668,7 @@ "description": "This is a sealed glass jar containing some meat. Use to open and eat to enjoy.", "price": 750, "material": ["glass", "flesh"], - "weight": 567, + "weight": 984, "volume": 2, "bashing": 4, "category": "food", @@ -5676,6 +5676,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "meat_canned", + "target_charges":2, "container": "jar_glass" } }, @@ -5689,7 +5690,7 @@ "description": "This is a sealed glass jar containing some fish. Use to open and eat to enjoy.", "price": 750, "material": ["glass", "flesh"], - "weight": 512, + "weight": 874, "volume": 2, "bashing": 4, "category": "food", @@ -5697,6 +5698,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "fish_canned", + "target_charges": 2, "container": "jar_glass" } }, @@ -5732,7 +5734,7 @@ "description": "This is a sealed glass jar containing human meat. Use to open and eat to enjoy - if you really want to.", "price": 0, "material": ["glass", "hflesh"], - "weight": 565, + "weight": 980, "volume": 2, "bashing": 4, "category" : "food", @@ -5740,6 +5742,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "human_canned", + "target_charges":2, "container": "jar_glass" } }, @@ -5753,7 +5756,7 @@ "description": "This is a sealed glass jar containing mixed vegetables. Use to open and eat to enjoy.", "price": 650, "material": ["glass", "veggy"], - "weight": 500, + "weight": 850, "volume": 2, "bashing": 4, "category" : "food", @@ -5761,6 +5764,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "veggy_canned", + "target_charges": 2, "container": "jar_glass" } }, @@ -5774,7 +5778,7 @@ "description": "This is a sealed glass jar containing sliced fruits. Use to open and eat to enjoy.", "price": 500, "material": ["glass", "veggy"], - "weight": 600, + "weight": 1050, "volume": 2, "bashing": 4, "category" : "food", @@ -5782,7 +5786,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "apple_canned", - "target_charges": 3, + "target_charges": 2, "container": "jar_glass" } }, @@ -5796,7 +5800,7 @@ "description": "This is a sealed glass jar containing tomatoes. Use to open and eat to enjoy.", "price": 650, "material": ["glass", "veggy"], - "weight": 600, + "weight": 1050, "volume": 2, "bashing": 4, "category" : "food", @@ -5804,7 +5808,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "can_tomato", - "target_charges": 3, + "target_charges": 2, "container": "jar_glass" } },{ @@ -5817,7 +5821,7 @@ "description": "This is a sealed glass jar containing pickled vegetables. Use to open and eat to enjoy.", "price": 600, "material": ["glass", "veggy"], - "weight": 533, + "weight": 916, "volume": 2, "bashing": 4, "category" : "food", @@ -5825,6 +5829,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "veggy_pickled", + "target_charges": 2, "container": "jar_glass" } }, @@ -5860,7 +5865,7 @@ "description": "This is a sealed glass jar containing pickled meat. Use to open and eat to enjoy.", "price": 700, "material": ["glass", "flesh"], - "weight": 609, + "weight": 1068, "volume": 2, "bashing": 4, "category" : "food", @@ -5868,6 +5873,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "meat_pickled", + "target_charges": 2, "container": "jar_glass" } }, @@ -5881,7 +5887,7 @@ "description": "This is a sealed glass jar containing pickled fish. Use to open and eat to enjoy.", "price": 700, "material": ["glass", "flesh"], - "weight": 555, + "weight": 960, "volume": 2, "bashing": 4, "category" : "food", @@ -5889,6 +5895,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "fish_pickled", + "target_charges": 2, "container": "jar_glass" } }, @@ -5902,7 +5909,7 @@ "description": "This is sealed glass jar containing pickled human flesh. Use to open. You might even enjoy it.", "price": 0, "material": ["glass", "hflesh"], - "weight": 609, + "weight": 1068, "volume": 2, "bashing": 4, "category" : "food", @@ -5910,6 +5917,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "human_pickled", + "target_charges": 2, "container": "jar_glass" } },{ @@ -5944,7 +5952,7 @@ "description": "This is a sealed glass jar containing woods soup. Use to open and eat to enjoy.", "price": 500, "material": ["glass", "flesh", "veggy"], - "weight": 650, + "weight": 1150, "volume": 2, "bashing": 4, "category" : "food", @@ -5952,7 +5960,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "soup_woods", - "target_charges": 4, + "target_charges": 8, "container": "jar_glass" } }, @@ -5966,7 +5974,7 @@ "description": "This is a sealed glass jar containing meat soup. Use to open and eat to enjoy.", "price": 600, "material": ["glass", "flesh"], - "weight": 650, + "weight": 1150, "volume": 2, "bashing": 4, "category" : "food", @@ -5974,7 +5982,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "soup_meat", - "target_charges": 4, + "target_charges": 8, "container": "jar_glass" } }, @@ -5988,7 +5996,7 @@ "description": "This is a sealed glass jar containing fish soup. Use to open and eat to enjoy.", "price": 600, "material": ["glass", "flesh"], - "weight": 650, + "weight": 1150, "volume": 2, "bashing": 4, "category" : "food", @@ -5996,7 +6004,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "soup_fish", - "target_charges": 4, + "target_charges": 8, "container": "jar_glass" } }, @@ -6010,7 +6018,7 @@ "description": "This is a sealed glass jar containing vegetable soup. Use to open and eat to enjoy.", "price": 600, "material": ["glass", "veggy"], - "weight": 650, + "weight": 1150, "volume": 2, "bashing": 4, "category" : "food", @@ -6018,7 +6026,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "soup_veggy", - "target_charges": 4, + "target_charges": 8, "container": "jar_glass" } }, @@ -6032,7 +6040,7 @@ "description": "This is a sealed glass jar containing sap soup. Use to open and eat to enjoy.", "price": 0, "material": ["glass", "hflesh"], - "weight": 650, + "weight": 1150, "volume": 2, "bashing": 4, "category" : "food", @@ -6040,7 +6048,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "soup_human", - "target_charges": 4, + "target_charges": 8, "container": "jar_glass" } }, @@ -6054,7 +6062,7 @@ "description": "This is a sealed glass jar containing broth. Use to open and eat to enjoy.", "price": 250, "material": ["glass", "veggy"], - "weight": 400, + "weight": 650, "volume": 2, "bashing": 4, "category" : "food", @@ -6062,7 +6070,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "broth", - "target_charges": 1, + "target_charges": 2, "container": "jar_glass" } }, @@ -6076,7 +6084,7 @@ "description": "This is a sealed glass jar containing bone broth. Use to open and eat to enjoy.", "price": 200, "material": ["glass", "bone"], - "weight": 400, + "weight": 650, "volume": 2, "bashing": 4, "category" : "food", @@ -6084,7 +6092,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "broth_bone", - "target_charges": 1, + "target_charges": 2, "container": "jar_glass" } }, @@ -6098,7 +6106,7 @@ "description": "This is a sealed glass jar containing human bone broth. Use to open and eat to enjoy - if you really want to.", "price": 200, "material": ["glass", "bone"], - "weight": 400, + "weight": 650, "volume": 2, "bashing": 4, "category" : "food", @@ -6106,7 +6114,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "broth_human", - "target_charges": 1, + "target_charges": 2, "container": "jar_glass" } }, @@ -6120,7 +6128,7 @@ "description": "This is a sealed glass jar containing V8. Use to open and drink to enjoy.", "price": 120, "material": ["glass", "veggy"], - "weight": 522, + "weight": 500, "volume": 2, "bashing": 4, "category" : "food", diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 5da124b4893cd..fa38cab76d599 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -7535,7 +7535,7 @@ [ "jar_glass", 1 ] ], [ - [ "meat", 1 ] + [ "meat", 2 ] ] ] },{ @@ -7569,7 +7569,7 @@ [ "jar_glass", 1 ] ], [ - [ "fish", 1 ] + [ "fish", 2 ] ] ] },{ @@ -7604,7 +7604,7 @@ [ "jar_glass", 1 ] ], [ - [ "human_flesh", 1 ] + [ "human_flesh", 2 ] ] ] },{ @@ -7638,9 +7638,9 @@ [ "jar_glass", 1 ] ], [ - [ "mushroom", 1 ], - [ "veggy", 1 ], - [ "veggy_wild", 1 ] + [ "mushroom", 2 ], + [ "veggy", 2 ], + [ "veggy_wild", 2 ] ] ] },{ @@ -7674,51 +7674,51 @@ [ "jar_glass", 1 ] ], [ - [ "apple", 3 ], - [ "apricot", 3 ], - [ "banana", 3 ], - [ "blackberries", 3 ], - [ "blueberries", 3 ], - [ "cherries", 3 ], - [ "cranberries", 9 ], - [ "grapefruit", 3 ], - [ "grapes", 6 ], - [ "kiwi", 3 ], - [ "lemon", 3 ], - [ "mango", 3 ], - [ "melon", 6 ], - [ "orange", 3 ], - [ "papaya", 3 ], - [ "peach", 3 ], - [ "pear", 3 ], - [ "pineapple", 3 ], - [ "plums", 3 ], - [ "pomegranate", 3 ], - [ "raspberries", 3 ], - [ "strawberries", 3 ], + [ "apple", 2 ], + [ "apricot", 2 ], + [ "banana", 2 ], + [ "blackberries", 2 ], + [ "blueberries", 2 ], + [ "cherries", 2 ], + [ "cranberries", 6 ], + [ "grapefruit", 2 ], + [ "grapes", 4 ], + [ "kiwi", 2 ], + [ "lemon", 2 ], + [ "mango", 2 ], + [ "melon", 4 ], + [ "orange", 2 ], + [ "papaya", 2 ], + [ "peach", 2 ], + [ "pear", 2 ], + [ "pineapple", 2 ], + [ "plums", 2 ], + [ "pomegranate", 2 ], + [ "raspberries", 2 ], + [ "strawberries", 2 ], [ "watermelon", 2 ], - [ "irradiated_apple", 3 ], - [ "irradiated_apricot", 3 ], - [ "irradiated_banana", 3 ], - [ "irradiated_blackberries", 3 ], - [ "irradiated_blueberries", 3 ], - [ "irradiated_cherries", 3 ], - [ "irradiated_cranberries", 9 ], - [ "irradiated_grapefruit", 3 ], - [ "irradiated_grapes", 6 ], - [ "irradiated_kiwi", 3 ], - [ "irradiated_lemon", 3 ], - [ "irradiated_mango", 3 ], - [ "irradiated_melon", 6 ], - [ "irradiated_orange", 3 ], - [ "irradiated_papaya", 3 ], - [ "irradiated_peach", 3 ], - [ "irradiated_pear", 3 ], - [ "irradiated_pineapple", 3 ], - [ "irradiated_plums", 3 ], - [ "irradiated_pomegranate", 3 ], - [ "irradiated_raspberries", 3 ], - [ "irradiated_strawberries", 3 ], + [ "irradiated_apple", 2 ], + [ "irradiated_apricot", 2 ], + [ "irradiated_banana", 2 ], + [ "irradiated_blackberries", 2 ], + [ "irradiated_blueberries", 2 ], + [ "irradiated_cherries", 2 ], + [ "irradiated_cranberries", 6 ], + [ "irradiated_grapefruit", 2 ], + [ "irradiated_grapes", 4 ], + [ "irradiated_kiwi", 2 ], + [ "irradiated_lemon", 2 ], + [ "irradiated_mango", 2 ], + [ "irradiated_melon", 4 ], + [ "irradiated_orange", 2 ], + [ "irradiated_papaya", 2 ], + [ "irradiated_peach", 2 ], + [ "irradiated_pear", 2 ], + [ "irradiated_pineapple", 2 ], + [ "irradiated_plums", 2 ], + [ "irradiated_pomegranate", 2 ], + [ "irradiated_raspberries", 2 ], + [ "irradiated_strawberries", 2 ], [ "irradiated_watermelon", 2 ] ] ] @@ -7753,45 +7753,45 @@ [ "jar_glass", 1 ] ], [ - [ "broth", 1 ], - [ "broth_bone", 1 ], - [ "pine_tea", 1 ] + [ "broth", 2 ], + [ "broth_bone", 2 ], + [ "pine_tea", 2 ] ], [ - [ "meat", 1 ], - [ "meat_smoked", 1 ], - [ "dry_meat", 1 ], - [ "rehydrated_meat", 1 ], - [ "meat_canned", 1], - [ "can_chicken", 1 ], - [ "fish", 1 ], - [ "fish_smoked", 1 ], - [ "dry_fish", 1 ], - [ "rehydrated_fish", 1 ], - [ "fish_canned", 1], - [ "can_salmon", 1 ], - [ "can_tuna", 1 ], - [ "sausage", 2 ], - [ "bacon", 2 ], - [ "powder_eggs", 10 ], - [ "egg_bird", 2 ], - [ "egg_reptile", 2 ] + [ "meat", 2 ], + [ "meat_smoked", 2 ], + [ "dry_meat", 2 ], + [ "rehydrated_meat", 2 ], + [ "meat_canned", 2], + [ "can_chicken", 2 ], + [ "fish", 2 ], + [ "fish_smoked", 2 ], + [ "dry_fish", 2 ], + [ "rehydrated_fish", 2 ], + [ "fish_canned", 2], + [ "can_salmon", 2 ], + [ "can_tuna", 2 ], + [ "sausage", 4 ], + [ "bacon", 4 ], + [ "powder_eggs", 40 ], + [ "egg_bird", 4 ], + [ "egg_reptile", 4 ] ], [ - [ "veggy_wild", 1 ], - [ "veggy", 1 ], - [ "rehydrated_veggy", 1 ], - [ "dry_veggy", 1 ], - [ "dry_beans", 1 ], - [ "can_beans", 1 ], - [ "raw_beans", 1 ], - [ "beans_cooked", 1 ], - [ "dandelion_cooked", 1 ], - [ "mushroom", 1 ], - [ "dry_mushroom", 1 ], - [ "mushroom_cooked", 1 ], - [ "morel_cooked", 1 ], - [ "acorns_cooked", 1 ] + [ "veggy_wild", 2 ], + [ "veggy", 2 ], + [ "rehydrated_veggy", 2 ], + [ "dry_veggy", 2 ], + [ "dry_beans", 2 ], + [ "can_beans", 2 ], + [ "raw_beans", 2 ], + [ "beans_cooked", 2 ], + [ "dandelion_cooked", 2 ], + [ "mushroom", 2 ], + [ "dry_mushroom", 2 ], + [ "mushroom_cooked", 2 ], + [ "morel_cooked", 2 ], + [ "acorns_cooked", 2 ] ] ] },{ @@ -7825,37 +7825,37 @@ [ "jar_glass", 1 ] ], [ - [ "broth", 1 ], - [ "broth_bone", 1] + [ "broth", 2 ], + [ "broth_bone", 2] ], [ - [ "potato_irradiated", 1], - [ "potato_raw", 1 ], - [ "celery", 1 ], - [ "irradiated_celery", 1], - [ "cabbage", 1 ], - [ "irradiated_cabbage", 1 ], - [ "sauerkraut", 2 ], - [ "powder_eggs", 5 ], - [ "egg_bird", 1 ], - [ "egg_reptile", 1 ], - [ "can_beans", 1 ], - [ "beans_cooked", 1 ], - [ "spaghetti_raw", 1 ], - [ "macaroni_raw", 1], - [ "noodles_fast", 1], - [ "dry_beans", 1 ], - [ "raw_beans", 1 ], - [ "dry_rice", 1 ], - [ "dandelion_cooked", 1 ], - [ "acorns_cooked", 1 ] + [ "potato_irradiated", 2], + [ "potato_raw", 2 ], + [ "celery", 2 ], + [ "irradiated_celery", 2], + [ "cabbage", 2 ], + [ "irradiated_cabbage", 2 ], + [ "sauerkraut", 4 ], + [ "powder_eggs", 10 ], + [ "egg_bird", 2 ], + [ "egg_reptile", 2 ], + [ "can_beans", 2 ], + [ "beans_cooked", 2 ], + [ "spaghetti_raw", 2 ], + [ "macaroni_raw", 2], + [ "noodles_fast", 2], + [ "dry_beans", 2 ], + [ "raw_beans", 2 ], + [ "dry_rice", 2 ], + [ "dandelion_cooked", 2 ], + [ "acorns_cooked", 2 ] ], [ - [ "meat", 2], - [ "rehydrated_meat", 2 ], - [ "dry_meat", 2 ], - [ "meat_canned", 2 ], - [ "can_chicken", 2 ] + [ "meat", 4], + [ "rehydrated_meat", 4 ], + [ "dry_meat", 4 ], + [ "meat_canned", 4 ], + [ "can_chicken", 4 ] ] ] },{ @@ -7889,54 +7889,54 @@ [ "jar_glass", 1 ] ], [ - [ "broth", 1 ] + [ "broth", 2 ] ], [ - [ "potato_irradiated", 1], - [ "potato_raw", 1 ], - [ "celery", 1 ], - [ "irradiated_celery", 1], - [ "cabbage", 1 ], - [ "irradiated_cabbage", 1 ], - [ "sauerkraut", 2 ], - [ "powder_eggs", 5 ], - [ "egg_bird", 1 ], - [ "egg_reptile", 1 ], - [ "can_beans", 1 ], - [ "beans_cooked", 1 ], - [ "spaghetti_raw", 1 ], - [ "macaroni_raw", 1], - [ "noodles_fast", 1], - [ "dry_beans", 1 ], - [ "raw_beans", 1 ], - [ "dry_rice", 1 ], - [ "dandelion_cooked", 1 ], - [ "acorns_cooked", 1 ] - ], - [ - [ "irradiated_tomato", 2 ], - [ "can_tomato", 2 ], - [ "tomato", 2 ], - [ "pumpkin", 2 ], - [ "irradiated_pumpkin", 2 ], - [ "irradiated_broccoli", 2 ], - [ "broccoli", 2 ], - [ "irradiated_zucchini", 2 ], - [ "zucchini", 2 ], - [ "potato_raw", 2 ], [ "potato_irradiated", 2 ], - [ "onion", 2 ], - [ "irradiated_onion", 2 ], - [ "carrot", 12 ], - [ "irradiated_carrot", 12 ], - [ "veggy", 2 ], - [ "dry_veggy", 2 ], - [ "mushroom", 2 ], - [ "dry_mushroom", 2 ], - [ "mushroom_cooked", 2 ], - [ "morel_cooked", 2 ], - [ "rehydrated_veggy", 2 ], - [ "veggy_wild", 2 ] + [ "potato_raw", 2 ], + [ "celery", 2 ], + [ "irradiated_celery", 2 ], + [ "cabbage", 2 ], + [ "irradiated_cabbage", 2 ], + [ "sauerkraut", 4 ], + [ "powder_eggs", 10 ], + [ "egg_bird", 2 ], + [ "egg_reptile", 2 ], + [ "can_beans", 2 ], + [ "beans_cooked", 2 ], + [ "spaghetti_raw", 2 ], + [ "macaroni_raw", 2 ], + [ "noodles_fast", 2 ], + [ "dry_beans", 2 ], + [ "raw_beans", 2 ], + [ "dry_rice", 2 ], + [ "dandelion_cooked", 2 ], + [ "acorns_cooked", 2 ] + ], + [ + [ "irradiated_tomato", 4 ], + [ "can_tomato", 4 ], + [ "tomato", 4 ], + [ "pumpkin", 4 ], + [ "irradiated_pumpkin", 4 ], + [ "irradiated_broccoli", 4 ], + [ "broccoli", 4 ], + [ "irradiated_zucchini", 4 ], + [ "zucchini", 4 ], + [ "potato_raw", 4 ], + [ "potato_irradiated", 4 ], + [ "onion", 4 ], + [ "irradiated_onion", 4 ], + [ "carrot", 24 ], + [ "irradiated_carrot", 24 ], + [ "veggy", 4 ], + [ "dry_veggy", 4 ], + [ "mushroom", 4 ], + [ "dry_mushroom", 4 ], + [ "mushroom_cooked", 4 ], + [ "morel_cooked", 4 ], + [ "rehydrated_veggy", 4 ], + [ "veggy_wild", 4 ] ] ] },{ @@ -7970,69 +7970,69 @@ [ "jar_glass", 1 ] ], [ - [ "broth", 1 ], - [ "broth_bone", 1] + [ "broth", 2 ], + [ "broth_bone", 2 ] ], [ - [ "potato_irradiated", 1], - [ "potato_raw", 1 ], - [ "celery", 1 ], - [ "irradiated_celery", 1], - [ "cabbage", 1 ], - [ "irradiated_cabbage", 1 ], - [ "sauerkraut", 2 ], - [ "can_corn", 1 ], - [ "corn", 1 ], - [ "irradiated_corn", 1 ], - [ "irradiated_onion", 1 ], - [ "onion", 1 ], - [ "irradiated_carrot", 6 ], - [ "carrot", 6 ], - [ "pumpkin", 1 ], - [ "irradiated_pumpkin", 1 ], - [ "veggy_wild", 1 ], - [ "veggy", 1 ], - [ "dry_veggy", 1 ], - [ "powder_eggs", 5 ], - [ "egg_bird", 1 ], - [ "egg_reptile", 1 ], - [ "can_beans", 1 ], - [ "spaghetti_raw", 1 ], - [ "macaroni_raw", 1], - [ "noodles_fast", 1], - [ "con_milk", 1 ], - [ "flatbread", 1 ], - [ "tortilla_corn", 1 ], - [ "bread", 1 ], - [ "cornbread", 1 ], - [ "biscuit", 1 ], - [ "hardtack", 1 ], - [ "wastebread", 1 ], - [ "flour", 1 ], - [ "cornmeal", 1 ], - [ "milk_powder", 1 ], - [ "crackers", 2 ], - [ "dry_beans", 1 ], - [ "raw_beans", 1 ], - [ "dry_rice", 1 ], - [ "beans_cooked", 1 ], - [ "dandelion_cooked", 1 ], - [ "mushroom", 1 ], - [ "dry_mushroom", 1 ], - [ "morel_cooked", 1 ], - [ "mushroom_cooked", 1 ], - [ "acorns_cooked", 1 ] + [ "potato_irradiated", 2 ], + [ "potato_raw", 2 ], + [ "celery", 2 ], + [ "irradiated_celery", 2 ], + [ "cabbage", 2 ], + [ "irradiated_cabbage", 2 ], + [ "sauerkraut", 4 ], + [ "can_corn", 2 ], + [ "corn", 2 ], + [ "irradiated_corn", 2 ], + [ "irradiated_onion", 2 ], + [ "onion", 2 ], + [ "irradiated_carrot", 12 ], + [ "carrot", 12 ], + [ "pumpkin", 2 ], + [ "irradiated_pumpkin", 2 ], + [ "veggy_wild", 2 ], + [ "veggy", 2 ], + [ "dry_veggy", 2 ], + [ "powder_eggs", 10 ], + [ "egg_bird", 2 ], + [ "egg_reptile", 2 ], + [ "can_beans", 2 ], + [ "spaghetti_raw", 2 ], + [ "macaroni_raw", 2 ], + [ "noodles_fast", 2 ], + [ "con_milk", 2 ], + [ "flatbread", 2 ], + [ "tortilla_corn", 2 ], + [ "bread", 2 ], + [ "cornbread", 2 ], + [ "biscuit", 2 ], + [ "hardtack", 2 ], + [ "wastebread", 2 ], + [ "flour", 2 ], + [ "cornmeal", 2 ], + [ "milk_powder", 2 ], + [ "crackers", 4 ], + [ "dry_beans", 2 ], + [ "raw_beans", 2 ], + [ "dry_rice", 2 ], + [ "beans_cooked", 2 ], + [ "dandelion_cooked", 2 ], + [ "mushroom", 2 ], + [ "dry_mushroom", 2 ], + [ "morel_cooked", 2 ], + [ "mushroom_cooked", 2 ], + [ "acorns_cooked", 2 ] ], [ - [ "fish", 2 ], - [ "dry_fish", 2], + [ "fish", 4 ], + [ "dry_fish", 4 ], [ "salted_fish", 3 ], - [ "fish_smoked", 2], - [ "fish_pickled", 1 ], - [ "fish_vac", 2 ], - [ "fish_canned", 1 ], - [ "can_salmon", 1 ], - [ "can_tuna", 1 ] + [ "fish_smoked", 4 ], + [ "fish_pickled", 2 ], + [ "fish_vac", 4 ], + [ "fish_canned", 2 ], + [ "can_salmon", 2 ], + [ "can_tuna", 2 ] ] ] },{ @@ -8067,35 +8067,35 @@ [ "jar_glass", 1 ] ], [ - [ "broth", 1 ], - [ "broth_human", 1 ], + [ "broth", 2 ], + [ "broth_human", 2 ], [ "broth_bone", 1] ], [ - [ "potato_irradiated", 1], - [ "potato_raw", 1 ], - [ "celery", 1 ], - [ "irradiated_celery", 1], - [ "cabbage", 1 ], - [ "irradiated_cabbage", 1 ], - [ "sauerkraut", 2 ], - [ "powder_eggs", 5 ], - [ "egg_bird", 1 ], - [ "egg_reptile", 1 ], - [ "can_beans", 1 ], - [ "spaghetti_raw", 1 ], - [ "macaroni_raw", 1], - [ "noodles_fast", 1], - [ "dry_beans", 1 ], - [ "raw_beans", 1 ], - [ "dry_rice", 1 ], - [ "beans_cooked", 1 ], - [ "acorns_cooked", 1 ] + [ "potato_irradiated", 2 ], + [ "potato_raw", 2 ], + [ "celery", 2 ], + [ "irradiated_celery", 2 ], + [ "cabbage", 2 ], + [ "irradiated_cabbage", 2 ], + [ "sauerkraut", 4 ], + [ "powder_eggs", 10 ], + [ "egg_bird", 2 ], + [ "egg_reptile", 2 ], + [ "can_beans", 2 ], + [ "spaghetti_raw", 2 ], + [ "macaroni_raw", 2 ], + [ "noodles_fast", 2 ], + [ "dry_beans", 2 ], + [ "raw_beans", 2 ], + [ "dry_rice", 2 ], + [ "beans_cooked", 2 ], + [ "acorns_cooked", 2 ] ], [ - [ "dry_hflesh", 2 ], - [ "rehydrated_hflesh", 2 ], - [ "human_flesh", 2 ] + [ "dry_hflesh", 4 ], + [ "rehydrated_hflesh", 4 ], + [ "human_flesh", 4 ] ] ] },{ @@ -8129,41 +8129,41 @@ [ "jar_glass", 1 ] ], [ - [ "water", 1 ], - [ "water_clean", 1 ] + [ "water", 2 ], + [ "water_clean", 2 ] ], [ - [ "irradiated_broccoli", 1 ], - [ "broccoli", 1 ], - [ "irradiated_tomato", 1 ], - [ "can_tomato", 1 ], - [ "tomato", 1 ], - [ "pumpkin", 1 ], - [ "irradiated_pumpkin", 1 ], - [ "irradiated_zucchini", 1 ], - [ "zucchini", 1 ], - [ "veggy", 1 ], - [ "veggy_wild", 1 ], - [ "powder_eggs", 5 ], - [ "egg_bird", 1 ], - [ "egg_reptile", 1 ], - [ "dry_veggy", 2 ], - [ "dandelion_cooked", 2 ], - [ "mushroom_cooked", 2 ], - [ "morel_cooked", 2 ], - [ "mushroom", 2 ], - [ "dry_mushroom", 2 ] + [ "irradiated_broccoli", 2 ], + [ "broccoli", 2 ], + [ "irradiated_tomato", 2 ], + [ "can_tomato", 2 ], + [ "tomato", 2 ], + [ "pumpkin", 2 ], + [ "irradiated_pumpkin", 2 ], + [ "irradiated_zucchini", 2 ], + [ "zucchini", 2 ], + [ "veggy", 2 ], + [ "veggy_wild", 2 ], + [ "powder_eggs", 10 ], + [ "egg_bird", 2 ], + [ "egg_reptile", 2 ], + [ "dry_veggy", 4 ], + [ "dandelion_cooked", 4 ], + [ "mushroom_cooked", 4 ], + [ "morel_cooked", 4 ], + [ "mushroom", 4 ], + [ "dry_mushroom", 4 ] ], [ - [ "seasoning_italian", 15 ], - [ "wild_herbs", 15 ], - [ "seasoning_salt", 15 ], - [ "soysauce", 2 ], - [ "pepper", 20 ], - [ "seed_garlic", 6 ], - [ "garlic", 1 ], - [ "salt_water", 1 ], - [ "salt", 15 ] + [ "seasoning_italian", 30 ], + [ "wild_herbs", 30 ], + [ "seasoning_salt", 30 ], + [ "soysauce", 4 ], + [ "pepper", 40 ], + [ "seed_garlic", 12 ], + [ "garlic", 2 ], + [ "salt_water", 2 ], + [ "salt", 30 ] ] ] },{ @@ -8197,11 +8197,11 @@ [ "jar_glass", 1 ] ], [ - [ "bone", 10 ] + [ "bone", 20 ] ], [ - [ "water", 1 ], - [ "water_clean", 1 ] + [ "water", 2 ], + [ "water_clean", 2 ] ] ] },{ @@ -8236,11 +8236,11 @@ [ "jar_glass", 1 ] ], [ - [ "bone_human", 10 ] + [ "bone_human", 20 ] ], [ - [ "water", 1 ], - [ "water_clean", 1 ] + [ "water", 2 ], + [ "water_clean", 2 ] ] ] },{ @@ -10107,27 +10107,27 @@ [ "jar_glass", 1 ] ], [ - ["veggy", 1], - ["veggy_wild", 1], - ["mushroom", 1], - ["tomato", 1], - ["irradiated_tomato", 1], - ["broccoli", 1], - ["irradiated_broccoli", 1], - ["zucchini", 1], - ["irradiated_zucchini", 1], - ["cucumber", 1], - ["irradiated_cucumber", 1], - ["potato_raw", 1], - ["potato_irradiated", 1], - ["corn", 1], - ["irradiated_corn", 1], - ["onion", 1], - ["irradiated_onion", 1], - ["garlic", 1], - ["seed_garlic", 6], - ["irradiated_carrot", 6], - ["carrot", 6] + ["veggy", 2], + ["veggy_wild", 2], + ["mushroom", 2], + ["tomato", 2], + ["irradiated_tomato", 2], + ["broccoli", 2], + ["irradiated_broccoli", 2], + ["zucchini", 2], + ["irradiated_zucchini", 2], + ["cucumber", 2], + ["irradiated_cucumber", 2], + ["potato_raw", 2], + ["potato_irradiated", 2], + ["corn", 2], + ["irradiated_corn", 2], + ["onion", 2], + ["irradiated_onion", 2], + ["garlic", 2], + ["seed_garlic", 12], + ["irradiated_carrot", 12], + ["carrot", 12] ], [ [ "vinegar", 1 ] @@ -10239,7 +10239,7 @@ [ "jar_glass", 1 ] ], [ - [ "meat", 1 ] + [ "meat", 2 ] ], [ [ "vinegar", 1 ] @@ -10278,7 +10278,7 @@ [ "jar_glass", 1 ] ], [ - [ "fish", 1 ] + [ "fish", 2 ] ], [ [ "vinegar", 1 ] @@ -10318,7 +10318,7 @@ [ "jar_glass", 1 ] ], [ - [ "human_flesh", 1 ] + [ "human_flesh", 2 ] ], [ [ "vinegar", 1 ] @@ -10883,8 +10883,8 @@ [ "jar_glass", 1 ] ], [ - [ "tomato", 3 ], - [ "irradiated_tomato", 3] + [ "tomato", 2 ], + [ "irradiated_tomato", 2] ] ] },{ From 952385d6567a7fcb9625a4bee5e8fc2d9a235b17 Mon Sep 17 00:00:00 2001 From: Xpyder Date: Tue, 31 May 2016 11:41:29 -0700 Subject: [PATCH 024/110] fixed fish nutrition Fixed pickled and canned fish nutrition based on the source value --- data/json/items/comestibles.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/items/comestibles.json b/data/json/items/comestibles.json index 01329999128eb..f96591f1e8b3c 100644 --- a/data/json/items/comestibles.json +++ b/data/json/items/comestibles.json @@ -2422,7 +2422,7 @@ "symbol" : "%", "quench" : -1, "healthy" : 1, - "nutrition" : 40, + "nutrition" : 24, "description" : "This is a serving of crisply brined and canned fish. Tasty and nutritious.", "price" : 250, "//" : "Two charges per jar.", "material" : "flesh", @@ -2443,11 +2443,11 @@ "symbol" : "%", "quench" : 0, "healthy" : 1, - "nutrition" : 26, + "nutrition" : 18, "description" : "Low-sodium preserved fish. It was boiled and canned. Contains most of the nutrition, but little of the savor of cooked fish.", "price" : 250, "material" : "flesh", - "volume" : 2, + "volume" : 1, "charges" : 1, "fun" : 2 }, From 64505ee4654b49eaef2b82ce46526a4fe9360194 Mon Sep 17 00:00:00 2001 From: Xpyder Date: Tue, 31 May 2016 13:21:38 -0700 Subject: [PATCH 025/110] Stupid tabs, go away. --- data/json/items/tools.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/json/items/tools.json b/data/json/items/tools.json index 24a66d43e6bee..e82f87b9808da 100644 --- a/data/json/items/tools.json +++ b/data/json/items/tools.json @@ -5676,7 +5676,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "meat_canned", - "target_charges":2, + "target_charges":2, "container": "jar_glass" } }, @@ -5698,7 +5698,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "fish_canned", - "target_charges": 2, + "target_charges": 2, "container": "jar_glass" } }, @@ -5742,7 +5742,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "human_canned", - "target_charges":2, + "target_charges":2, "container": "jar_glass" } }, @@ -5764,7 +5764,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "veggy_canned", - "target_charges": 2, + "target_charges": 2, "container": "jar_glass" } }, @@ -5829,7 +5829,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "veggy_pickled", - "target_charges": 2, + "target_charges": 2, "container": "jar_glass" } }, @@ -5873,7 +5873,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "meat_pickled", - "target_charges": 2, + "target_charges": 2, "container": "jar_glass" } }, @@ -5895,7 +5895,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "fish_pickled", - "target_charges": 2, + "target_charges": 2, "container": "jar_glass" } }, @@ -5917,7 +5917,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "human_pickled", - "target_charges": 2, + "target_charges": 2, "container": "jar_glass" } },{ From 271ef69983617b52655aa79b68ab0a4262544335 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 15:10:13 -0400 Subject: [PATCH 026/110] Update pk_effects.json --- data/mods/PKs_Rebalance/pk_effects.json | 72 ++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/data/mods/PKs_Rebalance/pk_effects.json b/data/mods/PKs_Rebalance/pk_effects.json index af9fe0477f44d..a7a5382ff2786 100644 --- a/data/mods/PKs_Rebalance/pk_effects.json +++ b/data/mods/PKs_Rebalance/pk_effects.json @@ -1,5 +1,75 @@ [ - { + { + "type": "effect_type", + "id": "doom_stimpack", + "name": [ + "stim fatigue", + "lingering stims", + "beserked", + "Rip and Tear!" + ], + "max_intensity": 4, + "apply_message": "You see Red!", + "apply_memorial_log": "Got stimmed up for some intense action, destroying their health.", + "remove_message": "You feel unhealthier for it, but the stims are gone at least.", + "int_add_val": 1, + "int_decay_step": -1, + "int_decay_tick": 39, + "decay_messages": [["You feel the stims start to tax you as they wear off.", "bad"], ["You don't feel as badass as before.", "neutral"], ["The rush takes you, Rip and Tear!", "good"]], + "removes_effects": ["winded"], + "hurt_sizing": true, + "base_mods": { + "speed_mod": [-15], + "str_mod": [-3], + "dex_mod": [-4], + "int_mod": [-1], + "per_mod": [-3], + "pkill_amount": [5], + "fatigue_amount": [-50], + "stamina_min": [-3], + "health_min": [-1], + "health_min_val": [-100], + "h_mod_min": [-1], + "h_mod_min_val": [-50], + "hurt_min": [2], + "hurt_chance": [10], + "hurt_tick": [10] + }, + "scaling_mods": { + "speed_mod": [20], + "str_mod": [5], + "dex_mod": [4], + "int_mod": [-2], + "per_mod": [2], + "pkill_amount": [10], + "fatigue_min": [-1], + "stamina_min": [4] + } + },{ + "type": "effect_type", + "id": "stamina_regen", + "name": [ + "Stamina Tonic" + ], + "int_add_val": 1, + "max_intensity": 5, + "base_mods": { + "stamina_min": [3], + "dex_mod": [1], + "pkill_amount": [5], + "fatigue_amount": [-20], + "thirst_amount": [15] + }, + "scaling_mods": { + "stamina_min": [3], + "per_mod": [-1], + "pkill_amount": [5], + "fatigue_amount": [-10], + "thirst_amount": [15], + "vomit_chance": [66], + "vomit_tick": [12] + } + },{ "type": "effect_type", "id": "doom_unhealth", "int_add_val": 1, From b366c529227f9852108000833e8d4033d6df9eb4 Mon Sep 17 00:00:00 2001 From: Xpyder Date: Tue, 31 May 2016 15:24:58 -0700 Subject: [PATCH 027/110] charges fix per instructions removed charges:1 and added stack_size:2 --- data/json/items/comestibles.json | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/data/json/items/comestibles.json b/data/json/items/comestibles.json index f96591f1e8b3c..5906581979d0e 100644 --- a/data/json/items/comestibles.json +++ b/data/json/items/comestibles.json @@ -2427,7 +2427,7 @@ "price" : 250, "//" : "Two charges per jar.", "material" : "flesh", "volume" : 1, - "charges" : 1, + "stack_size" : 2, "fun" : 7 }, { @@ -8443,7 +8443,6 @@ "price" : 250, "material" : "flesh", "volume" : 1, - "charges" : 1, "stack_size" : 2, "fun" : 2 }, @@ -8464,8 +8463,7 @@ "description" : "This mushy pile of vegetable matter was boiled and canned in an earlier life. Better eat it before it oozes through your fingers.", "price" : 250, "material" : "veggy", - "volume" : 2, - "charges" : 1, + "volume" : 1, "stack_size" : 2, "fun" : 0 }, @@ -8486,8 +8484,7 @@ "description" : "This sodden mass of preserved fruit was boiled and canned in an earlier life. Bland, mushy and losing color.", "price" : 220, "material" : "fruit", - "volume" : 2, - "charges" : 1, + "volume" : 1, "stack_size" : 2, "fun" : 1 }, @@ -8508,8 +8505,7 @@ "description" : "Low-sodium preserved human meat. It was boiled and canned. Contains most of the nutrition, but little of the savor of cooked meat.", "price" : 0, "material" : "hflesh", - "volume" : 2, - "charges" : 1, + "volume" : 1, "stack_size" : 2, "fun" : 2 }, @@ -8873,8 +8869,7 @@ "price" : 450, "material" : "veggy", "volume" : 1, - "charges" : 1, - "stack_size" : 4, + "charges" : 2, "fun" : -2 }, { @@ -9444,7 +9439,7 @@ "price" : 250, "material" : "veggy", "volume" : 1, - "charges" : 2, + "stack_size" : 2, "fun" : 7 }, { @@ -9463,7 +9458,7 @@ "price" : 250, "material" : "flesh", "volume" : 1, - "charges" : 2, + "stack_size" : 2, "fun" : 6 }, { @@ -9482,7 +9477,7 @@ "price" : 0, "material" : "hflesh", "volume" : 1, - "charges" : 1, + "stack_size" : 2, "fun" : 6 }, { "type" : "AMMO", @@ -11485,8 +11480,7 @@ "description" : "Canned tomato. A staple in many pantries, and useful for many recipes.", "price" : 350, "material" : "veggy", - "volume" : 2, - "charges" : 1, + "volume" : 1, "stack_size" : 2, "fun" : 0 }, From e30b2998dcb7a4c948e092032b78f8b504c1965d Mon Sep 17 00:00:00 2001 From: Xpyder Date: Mon, 6 Jun 2016 12:06:10 -0700 Subject: [PATCH 028/110] fix mushroom soup + a stack size that was missed NOTE: The weights on Mushroom and Chicken soup (possibly others) are more than double that of woods soup and some of the others. I set the jars based on the existing weights, but they probably need a separate set of balance fixes. --- data/json/items/comestibles.json | 2 +- data/json/items/tools.json | 4 ++-- data/json/recipes/recipe_food.json | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/json/items/comestibles.json b/data/json/items/comestibles.json index 5906581979d0e..eafa921e03808 100644 --- a/data/json/items/comestibles.json +++ b/data/json/items/comestibles.json @@ -2448,7 +2448,7 @@ "price" : 250, "material" : "flesh", "volume" : 1, - "charges" : 1, + "stack_size" : 2, "fun" : 2 }, { diff --git a/data/json/items/tools.json b/data/json/items/tools.json index e82f87b9808da..76a79eb1ab8ff 100644 --- a/data/json/items/tools.json +++ b/data/json/items/tools.json @@ -5930,7 +5930,7 @@ "description": "This is a sealed glass jar containing mushroom soup. Use to open and eat to enjoy.", "price": 500, "material": ["glass", "veggy"], - "weight": 1302, + "weight": 2454, "volume": 2, "bashing": 4, "category" : "food", @@ -5938,7 +5938,7 @@ "type": "transform", "msg": "You open the jar, exposing it to the atmosphere.", "target": "soup_mushroom", - "target_charges": 4, + "target_charges": 8, "container": "jar_glass" } }, diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index fa38cab76d599..dcb5651ed86bd 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -3725,13 +3725,13 @@ [ "jar_glass", 1 ] ], [ - [ "broth", 1 ] + [ "broth", 2 ] ], [ - [ "mushroom", 4 ], - [ "mushroom_cooked", 4 ], - [ "dry_mushroom", 4 ], - [ "morel_cooked", 4 ] + [ "mushroom", 8 ], + [ "mushroom_cooked", 8 ], + [ "dry_mushroom", 8 ], + [ "morel_cooked", 8 ] ] ] },{ From 5f84ec635735425b1f63e83a08c6d7ce0648f5c3 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 15:14:05 -0400 Subject: [PATCH 029/110] Update pk_item_tool.json Add misc updates and (re)store proper effects --- data/mods/PKs_Rebalance/pk_item_tool.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_item_tool.json b/data/mods/PKs_Rebalance/pk_item_tool.json index b404c7b8de1e4..a5dbf893b93ef 100644 --- a/data/mods/PKs_Rebalance/pk_item_tool.json +++ b/data/mods/PKs_Rebalance/pk_item_tool.json @@ -95,7 +95,7 @@ "color" : "red", "comestible_type" : "MED", "symbol" : "+", - "description" : "A PRM brand medikit. Can be quickly applied in battlefield situations, though it is designed to quickly attach to damaged tissue, not disinfect.", + "description" : "A PRM brand medikit. Can be quickly applied in battlefield situations, though it is designed to quickly attach itself to damaged tissue, not disinfect.", "price" : 50000, "material" : "spess_plastic", "volume" : 2, @@ -109,7 +109,7 @@ "head_power" : 20, "torso_power" : 20, "bleed" : 0.98, - "bite" : 0.50, + "bite" : 0.40, "infect" : 0.20, "move_cost" : 3300, "long_action" : true, @@ -128,6 +128,7 @@ "id" : "berserker_drug", "name" : "berserker stimpack", "volume" : 2, + "material_thickness" : 0, "description" : "An iv drip in a protective case. PRM patented stimulants will push the body to its limits for a brief period, making intense combat easier.", "weight" : 360, "to_hit" : -1, @@ -152,6 +153,7 @@ "id" : "berserker_drug_act", "name" : "berserker stimpack (active)", "volume" : 2, + "material_thickness" : 0, "description" : "An iv drip in a protective case. Inside, PRM brand chemicals are surging through the needle, providing incredible strength and agility to its user.", "weight" : 360, "to_hit" : -1, @@ -163,6 +165,7 @@ "material" : ["plastic"], "flags" : ["WATER_FRIENDLY", "BELTED", "FRAGILE", "ALLOWS_NATURAL_ATTACKS", "NO_RELOAD"], "coverage" : 10, + "ammo": "NULL", "revert_to": "bag_plastic", "max_charges": 7, "initial_charges": 7, @@ -191,6 +194,7 @@ "price" : 1000000, "material" : ["glass"], "flags" : ["NO_RELOAD", "NO_UNLOAD"], + "ammo": "NULL", "revert_to": "bottle_glass", "charges": 3, "use_action" : { From 7bcc806d130efc61ee777a3ce29c5b3728f244a7 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 15:23:10 -0400 Subject: [PATCH 030/110] Update pk_critter_misc.json --- data/mods/PKs_Rebalance/pk_critter_misc.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_misc.json b/data/mods/PKs_Rebalance/pk_critter_misc.json index 80946033b26e8..9797c074e99c3 100644 --- a/data/mods/PKs_Rebalance/pk_critter_misc.json +++ b/data/mods/PKs_Rebalance/pk_critter_misc.json @@ -255,13 +255,8 @@ {"damage_type" : "bash", "amount" : 27, "armor_multiplier" : 0.5} ] }, ["GRAB", 30], ["GRAB_DRAG", 10]], -<<<<<<< HEAD - "description":"In the late 20th century there was an urban legend about pet alligators getting flushed down the toilet and growing to adulthood in sewers. This large specimen doesn't look like it is used to humans as anything other than a meal.", - "flags":["SEES", "HEARS", "GOODHEARING", "SMELLS", "KEENNOSE", "ANIMAL", "BLEED", "ATTACKMON", "BONES", "LEATHER", "SWIMS"], -======= "description":"In the late 20th century there was an urban legend about pet alligators getting flushed down the toilet and growing to adulthood in sewers. This large specimen doesn't look like its used to humans as anything other than a meal.", "flags":["SEES", "HEARS", "GOODHEARING", "SMELLS", "KEENNOSE", "ANIMAL", "PATH_AVOID_DANGER_1", "BLEED", "ATTACKMON", "BONES", "LEATHER", "SWIMS"], ->>>>>>> refs/remotes/CleverRaven/master "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK"], "placate_triggers":["MEAT"], "fear_triggers": ["FIRE", "HURT"], From bb69e061962f04f8bc48ce4192b01fb2c74dae41 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 15:27:21 -0400 Subject: [PATCH 031/110] Update pk_spawn_upgrades.json --- data/mods/PKs_Rebalance/pk_spawn_upgrades.json | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_spawn_upgrades.json b/data/mods/PKs_Rebalance/pk_spawn_upgrades.json index a8e5746ef51c6..c2f481d3860cc 100644 --- a/data/mods/PKs_Rebalance/pk_spawn_upgrades.json +++ b/data/mods/PKs_Rebalance/pk_spawn_upgrades.json @@ -200,11 +200,11 @@ "name" : "GROUP_HISSER", "default" : "mon_fungal_fighter", "monsters" : [ - { "monster" : "mon_fungal_fighter", "freq" : 70, "cost_multiplier" : 5 }, + { "monster" : "mon_fungal_fighter", "freq" : 60, "cost_multiplier" : 5 }, { "monster" : "mon_triffid_queen", "freq" : 15, "cost_multiplier" : 5 }, - { "monster" : "mon_biollante_pk", "freq" : 7, "cost_multiplier" : 10 }, - { "monster" : "mon_minecraft", "freq" : 5, "cost_multiplier" : 15 }, - { "monster" : "mon_minecraft_charged", "freq" : 3, "cost_multiplier" : 20 } + { "monster" : "mon_biollante_pk", "freq" : 10, "cost_multiplier" : 10 }, + { "monster" : "mon_minecraft", "freq" : 10, "cost_multiplier" : 15 }, + { "monster" : "mon_minecraft_charged", "freq" : 5, "cost_multiplier" : 20 } ] },{ "type":"monstergroup", @@ -225,5 +225,15 @@ { "monster" : "mon_ant_soldier_pk", "freq" : 3, "cost_multiplier" : 10 }, { "monster" : "mon_ant_kwama", "freq" : 1, "cost_multiplier" : 12 } ] + },{ + "type":"monstergroup", + "name" : "WEB_SPIDER_UPGRADE", + "default" : "mon_spider_web", + "//" : "Web spiders specialize into 1 of 3 types.", + "monsters" : [ + { "monster" : "mon_spider_web_alpha", "freq" : 10, "cost_multiplier" : 10 }, + { "monster" : "mon_spider_web_omega", "freq" : 10, "cost_multiplier" : 15 }, + { "monster" : "mon_spider_web_mu", "freq" : 10, "cost_multiplier" : 5 } + ] } ] From 41c8168b6289780b7cd0a0fcbd368756816b119e Mon Sep 17 00:00:00 2001 From: Xpyder Date: Mon, 6 Jun 2016 12:28:46 -0700 Subject: [PATCH 032/110] fixed kraut weight --- data/json/items/tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tools.json b/data/json/items/tools.json index 76a79eb1ab8ff..1a93b41713d4b 100644 --- a/data/json/items/tools.json +++ b/data/json/items/tools.json @@ -5843,7 +5843,7 @@ "description": "This is a sealed glass jar containing sauerkraut. Use to open and eat to enjoy.", "price": 650, "material": ["glass", "veggy"], - "weight": 550, + "weight": 1750, "volume": 2, "bashing": 4, "category" : "food", From 77d9887a55d09e860af4e56385b3348b20cf5f23 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 15:31:43 -0400 Subject: [PATCH 033/110] Update pk_speech_fshotgun.json --- data/mods/PKs_Rebalance/pk_speech_fshotgun.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/PKs_Rebalance/pk_speech_fshotgun.json b/data/mods/PKs_Rebalance/pk_speech_fshotgun.json index de6afacc6dbe4..03482fdf74a6a 100644 --- a/data/mods/PKs_Rebalance/pk_speech_fshotgun.json +++ b/data/mods/PKs_Rebalance/pk_speech_fshotgun.json @@ -12,7 +12,7 @@ },{ "type" : "speech", "speaker" : "mon_furvivor_shotgun", - "sound" : "\You put the lime in the coco nuts and shake your body round!\"", + "sound" : "You put the lime in the coco nuts and shake your body round!", "volume" : 10 },{ "type" : "speech", From b43b8faa07590df4bd3caa7395f19ca0a232aad2 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 15:35:38 -0400 Subject: [PATCH 034/110] Update pk_critter_factions.json Adds new factional relationship. Spiders, being carnivores, and spawning frequently in triffid roots anyway, have been made a more or less permanent ally of the triffs. They have a symbiotic nature. Male ants for mating season, and mating giant bears. --- .../PKs_Rebalance/pk_critter_factions.json | 38 ++++++++++++++++++- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_factions.json b/data/mods/PKs_Rebalance/pk_critter_factions.json index c9eec69bc2a07..8137de5c23d2c 100644 --- a/data/mods/PKs_Rebalance/pk_critter_factions.json +++ b/data/mods/PKs_Rebalance/pk_critter_factions.json @@ -13,12 +13,30 @@ "name" : "ant", "base_faction" : "insect", "neutral" : ["small_animal"], - "by_mood" : ["insect", "zombie"] + "by_mood" : ["insect", "zombie", "triffid"] + },{ + "type" : "MONSTER_FACTION", + "name" : "ant_male", + "base_faction" : "ant", + "by_mood" : ["ant_male"] + },{ + "type" : "MONSTER_FACTION", + "name" : "triffid", + "friendly" : ["spider"], + "neutral" : ["small_animal"], + "by_mood" : ["bot", "insect", "mutant_small"] + },{ + "type" : "MONSTER_FACTION", + "name" : "spider", + "base_faction" : "insect", + "friendly" : ["triffid"], + "neutral" : ["small_animal"], + "by_mood" : ["insect", "spider"] },{ "type" : "MONSTER_FACTION", "name" : "zombie", "friendly" : ["blob", "cult"], - "neutral" : ["small_animal", "insect", "rat"], + "neutral" : ["small_animal", "insect", "rat", "mutant_small"], "by_mood" : ["ant"] },{ "type" : "MONSTER_FACTION", @@ -41,6 +59,22 @@ },{ "type" : "MONSTER_FACTION", "name" : "mutant_predator", + "neutral" : ["vermin"], "by_mood" : ["mutant_omnivore"] + },{ + "type" : "MONSTER_FACTION", + "name" : "mutant_small", + "base_faction" : "mutant", + "neutral" : ["zombie", "blob", "defense_bot", "utility_bot", "mutant"] + },{ + "type" : "MONSTER_FACTION", + "name" : "bear", + "base_faction" : "mutant", + "by_mood" : ["bear_mating"] + },{ + "type" : "MONSTER_FACTION", + "name" : "bear_mating", + "base_faction" : "mutant", + "by_mood" : ["bear"] } ] From 5c4a4b3d34c3fd3c802f8212064d2c704846030c Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 15:36:53 -0400 Subject: [PATCH 035/110] Create pk_mapgen_triffid_grove.json Triffid homes for PKs Mod. i,e, a bit meaner and spite-ier. --- .../pk_mapgen_triffid_grove.json | 115 ++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 data/mods/PKs_Rebalance/pk_mapgen_triffid_grove.json diff --git a/data/mods/PKs_Rebalance/pk_mapgen_triffid_grove.json b/data/mods/PKs_Rebalance/pk_mapgen_triffid_grove.json new file mode 100644 index 0000000000000..54c691ad6e307 --- /dev/null +++ b/data/mods/PKs_Rebalance/pk_mapgen_triffid_grove.json @@ -0,0 +1,115 @@ +[ + { + "type": "mapgen", + "om_terrain": [ + "triffid_grove" + ], + "method": "json", + "weight": 400, + "object": { + "fill_ter": "t_dirt", + "rows": [ + " ", + " 44 4 66 66 4 44 ", + " 44 4 66 66 4 44 ", + " 44 4 66 66 4 44 ", + " 44 4 66 H66 4 44 ", + " 44 4 4 44 ", + " 44 4 766667 4 44 ", + " 777777 s ", + " 55 77766777 55 ", + " 55 T77 SH 77S 55 ", + " 66 777 B B 777 66 ", + " 1 >> 1 ", + " 1 >> 1 ", + " 66 777 B B 777 66 ", + " 55 S77 HS 77T 55 ", + " 55 77766777 55 ", + " 777777 ", + " 44s 4 766667 4 44 ", + " 44 4 4 44 ", + " 44 4 66 S66 4 44 ", + " 44 4 66 66 4 44 ", + " 44 4 66 66 4 44 ", + " 44 4 66 66 4 44 ", + " " + ], + "terrain": { + " ": ["t_dirt", "t_dirt", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass"], + "7": "t_tree", + "1": ["t_tree_young", "t_tree_young", "t_tree_young", "t_tree"], + "6": ["t_tree", "t_tree", "t_tree", "t_tree_apple", "t_tree_apple", "t_tree_pear", "t_tree_pear", + "t_tree_cherry", "t_tree_peach", "t_tree_apricot", "t_tree_plum"], + "5": ["t_tree", "t_tree", "t_tree", "t_tree_pine", "t_tree_pine", "t_tree_birch", "t_tree_birch", "t_tree_maple"], + "4": [ "t_tree_young", "t_tree_young", "t_tree_willow", "t_tree_hickory", "t_underbrush", "t_shrub", "t_grass"], + ">": "t_slope_down" + }, + "furniture": { + "^": "f_rubble_rock" + }, + "monster": { + "B": { "monster": "mon_biollante" }, + "T": { "monster": "mon_treent" }, + "H": { "monster": "mon_minecraft" }, + "S": { "monster": "mon_creeper_root" }, + "s": { "monster": "mon_spider_wolf_giant"} + } + } + },{ + "type": "mapgen", + "om_terrain": [ + "triffid_grove" + ], + "method": "json", + "weight": 400, + "object": { + "fill_ter": "t_dirt", + "rows": [ + " 4444 4444 4444 4444 ", + " 4444 4444 4444 4444 ", + " 4444 4444 4444H4444 ", + " ", + " ", + " 56544577544565 ", + " S16 777777 61S ", + " 116 77777777 611 ", + " 5665 77 7 T7 77 5665 ", + " 6 7 7 6 ", + " 5 77 B B 77 5 ", + " 4 77s >> H77 4 ", + " 4 77H >> s77 4 ", + " 5 77 B B 77 5 ", + " 6 7 7 6 ", + " 5665 77 7T 7 77 5665 ", + " 116 77777777 611 ", + " S16 777777 61S ", + " 56544577544565 ", + " ", + " ", + " 4444H4444 4444 4444 ", + " 4444 4444 4444 4444 ", + " 4444 4444 4444 4444 " + ], + "terrain": { + " ": ["t_dirt", "t_dirt", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass"], + "7": "t_tree", + "1": ["t_tree_young", "t_tree_young", "t_tree_young", "t_tree"], + "6": ["t_tree", "t_tree", "t_tree", "t_tree_apple", "t_tree_apple", "t_tree_pear", "t_tree_pear", + "t_tree_cherry", "t_tree_peach", "t_tree_apricot", "t_tree_plum"], + "5": ["t_tree", "t_tree", "t_tree", "t_tree_pine", "t_tree_pine", "t_tree_birch", "t_tree_birch", "t_tree_maple"], + "4": [ "t_tree_young", "t_tree_young", "t_tree_willow", "t_tree_hickory", "t_underbrush", "t_shrub", "t_grass"], + ">": "t_slope_down" + }, + "furniture": { + "^": "f_rubble_rock" + }, + "monster": { + "B": { "monster": "mon_biollante" }, + "T": { "monster": "mon_treent" }, + "H": { "monster": "mon_minecraft" }, + "S": { "monster": "mon_creeper_root" }, + "s": { "monster": "mon_spider_wolf_giant"} + } + } + } +] From d21d2e3d993db8ecae30af0943046dfc4090d608 Mon Sep 17 00:00:00 2001 From: Xpyder Date: Mon, 6 Jun 2016 12:39:44 -0700 Subject: [PATCH 036/110] matching nutrition to recent balance changes --- data/json/items/comestibles.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles.json b/data/json/items/comestibles.json index eafa921e03808..ca8d3c393a708 100644 --- a/data/json/items/comestibles.json +++ b/data/json/items/comestibles.json @@ -2422,7 +2422,7 @@ "symbol" : "%", "quench" : -1, "healthy" : 1, - "nutrition" : 24, + "nutrition" : 40, "description" : "This is a serving of crisply brined and canned fish. Tasty and nutritious.", "price" : 250, "//" : "Two charges per jar.", "material" : "flesh", @@ -8438,7 +8438,7 @@ "comestible_type" : "FOOD", "symbol" : "%", "quench" : 0, - "nutrition" : 38, + "nutrition" : 26, "description" : "Low-sodium preserved meat. It was boiled and canned. Contains most of the nutrition, but little of the savor of cooked meat.", "price" : 250, "material" : "flesh", From b5778d23ad4fffd85008c858b421b6155c336863 Mon Sep 17 00:00:00 2001 From: Xpyder Date: Mon, 6 Jun 2016 12:41:13 -0700 Subject: [PATCH 037/110] same as above --- data/json/items/comestibles.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles.json b/data/json/items/comestibles.json index ca8d3c393a708..6e93bbd7a7d78 100644 --- a/data/json/items/comestibles.json +++ b/data/json/items/comestibles.json @@ -2443,7 +2443,7 @@ "symbol" : "%", "quench" : 0, "healthy" : 1, - "nutrition" : 18, + "nutrition" : 26, "description" : "Low-sodium preserved fish. It was boiled and canned. Contains most of the nutrition, but little of the savor of cooked fish.", "price" : 250, "material" : "flesh", @@ -8438,7 +8438,7 @@ "comestible_type" : "FOOD", "symbol" : "%", "quench" : 0, - "nutrition" : 26, + "nutrition" : 38, "description" : "Low-sodium preserved meat. It was boiled and canned. Contains most of the nutrition, but little of the savor of cooked meat.", "price" : 250, "material" : "flesh", From f5782afada736f0049259357bb0b8fe8a69c13cf Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 15:51:21 -0400 Subject: [PATCH 038/110] Update pk_critter_triffid.json Triffid update --- .../PKs_Rebalance/pk_critter_triffid.json | 414 ++++++++++-------- 1 file changed, 228 insertions(+), 186 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_triffid.json b/data/mods/PKs_Rebalance/pk_critter_triffid.json index 129477ba61225..9759fa432a777 100644 --- a/data/mods/PKs_Rebalance/pk_critter_triffid.json +++ b/data/mods/PKs_Rebalance/pk_critter_triffid.json @@ -15,6 +15,12 @@ "armor_cut":4, "armor_acid":4, "death_function":["VINE_CUT", "ACID"], + "death_drops": { + "subtype": "collection", + "groups": [ + [ "biollante", 35 ] + ] + }, "hp":140, "vision_day":9, "vision_night":4, @@ -22,7 +28,7 @@ "special_when_hit":["ACIDSPLASH", 35], "description":"A thick stalk with rapidly sprouting tendrils at the base and a 'crown' of deep magenta pitchers at its head. The pitchers taper into o-rings, pointing at various angles away from the hub. From the center of the crown stems a single large, mace-like tentacle that flails around menacingly.", "flags":["NOHEAD", "IMMOBILE", "SEES"], - "//" : "When making this guy I was really unsure if it was a good idea. I love the idea of an acid spitting critter that grabs you with thousands of minions. But its the thousands of minions part that worries me. Hopefully I fixed that by catrating the life-span of the minions." + "//" : "When making this guy I was really unsure if it was a good idea. I love the idea of an acid spitting critter that grabs you with thousands of minions. But it's the thousands of minions part that worries me. Hopefully I fixed that by castrating the life-span of the minions." },{ "type" : "MONSTER", "id" : "mon_creeper_vine", @@ -43,11 +49,20 @@ "id" : "mon_biollante", "edit-mode" : "modify", "armor_acid":4, - "upgrades":{ + "upgrades":{ "into": "mon_biollante_pk", "half_life": 14 - } - },{ + }, + "death_drops": { + "subtype": "collection", + "//": "do duplicate item_groups work here?", + "groups": [ + [ "biollante", 35 ], + [ "biollante", 35 ], + [ "biollante", 35 ] + ] + } + },{ "type" : "MONSTER", "id" : "mon_triffid", "edit-mode" : "modify", @@ -63,7 +78,14 @@ "upgrades":{ "into_group": "GROUP_HISSER", "half_life": 21 - } + }, + "death_drops": { + "subtype": "collection", + "groups": [ + [ "fungal_sting", 100 ], + ["fungal_fighter_sting", 75] + ] + } },{ "type" : "MONSTER", "id" : "mon_vinebeast", @@ -90,7 +112,6 @@ "melee_skill":0, "melee_dice":0, "melee_dice_sides":0, - "melee_cut":0, "dodge":0, "armor_bash":2, "armor_cut":2, @@ -99,9 +120,11 @@ "vision_night":3, "death_drops": { "subtype": "collection", - "//": "15% chance of an item from group biollante", + "//": "do duplicate item_groups work here?", "groups": [ - [ "biollante", 20 ] + [ "biollante", 35 ], + [ "biollante", 35 ], + [ "biollante", 35 ] ] }, "hp":120, @@ -127,10 +150,8 @@ "melee_skill":0, "melee_dice":0, "melee_dice_sides":0, - "melee_cut":0, "dodge":0, "armor_bash":5, - "armor_cut":0, "hp":5, "death_function":"MELT", "special_attacks":[["VINE", 3], ["DISAPPEAR", 20]], @@ -152,11 +173,11 @@ "speed":40, "melee_skill":5, "melee_dice":1, - "melee_dice_sides":6, + "melee_dice_sides":8, "melee_cut":4, - "dodge":3, + "melee_damage" : [ {"damage_type" : "acid", "amount" : 2} ], + "dodge":1, "armor_bash":8, - "armor_cut":0, "armor_stab":8, "upgrades":{ "into_group": "GROUP_CREEPER_VINE_PK", @@ -182,18 +203,19 @@ "aggression":15, "morale":100, "speed":45, - "melee_skill":6, + "melee_skill":5, "melee_dice":1, "melee_dice_sides":12, - "melee_cut":5, - "dodge":3, + "melee_cut":4, + "melee_damage" : [ {"damage_type" : "acid", "amount" : 2} ], + "dodge":2, "armor_bash":10, "armor_cut":4, "armor_stab":10, "hp":25, "special_attacks":[["VINE", 10], ["GROW_VINE", 120]], "description":"A long thorned length of line the width of your wrist found tunneling through the shallow dirt. Acts in a chaotic manner.", - "flags":["SMELLS", "HEARS", "GOODHEARING", "DIGS", "SWIMS", "NOHEAD", "HARDTOSHOOT", "PUSH_MON", "PLASTIC", "GRABS", "BASHES", "NOGIB"], + "flags":["SMELLS", "HEARS", "GOODHEARING", "DIGS", "NOHEAD", "HARDTOSHOOT", "PUSH_MON", "PLASTIC", "GRABS", "BASHES", "NOGIB"], "anger_triggers":["SOUND", "PLAYER_WEAK", "FRIEND_ATTACKED"] },{ "type" : "MONSTER", @@ -211,8 +233,9 @@ "speed":60, "melee_skill":5, "melee_dice":3, - "melee_dice_sides":4, + "melee_dice_sides":3, "melee_cut":6, + "melee_damage" : [ {"damage_type" : "acid", "amount" : 8} ], "dodge":2, "armor_bash":8, "armor_cut":6, @@ -221,10 +244,15 @@ "hp":70, "special_attacks":[["GROW_VINE", 30], ["VINE", 5]], "death_function":"NORMAL", + "death_drops": { + "subtype": "collection", + "groups": [ + [ "biollante", 35 ] + ] + }, "description":"A twisting cluster of roots, with 3 barbed vines curled limply around a wildly cluster of smaller vines. When disturbed, it can release several of these vines.", - "flags":["DIGS", "HEARS", "GOODHEARING", "SMELLS", "BASHES", "GROUP_BASH", "SWIMS", "NOHEAD", "PUSH_MON", "PLASTIC", "VENOM"], - "anger_triggers":["SOUND", "FIRE", "STALK", "HURT", "FRIEND_ATTACKED", "PLAYER_WEAK"], - "//": "I honesty don't hate this guy, but I feel like I missing out on some potential by leaving it this way instead of adding something. . . but what?" + "flags":["DIGS", "HEARS", "GOODHEARING", "SMELLS", "PATH_AVOID_DANGER_1", "BASHES", "GROUP_BASH", "SWIMS", "NOHEAD", "PUSH_MON", "PLASTIC", "VENOM"], + "anger_triggers":["SOUND", "FIRE", "STALK", "HURT", "FRIEND_ATTACKED", "PLAYER_WEAK"] },{ "type" : "MONSTER", "id" : "mon_vinebeast_terminal", @@ -256,7 +284,7 @@ },{ "type" : "MONSTER", "id" : "mon_vinebeast_pk", - "name": "tangela", + "name": "tangala", "species":"PLANT", "default_faction":"triffid", "symbol":"V", @@ -269,8 +297,9 @@ "speed":105, "melee_skill":10, "melee_dice":6, - "melee_dice_sides":5, + "melee_dice_sides":3, "melee_cut":6, + "melee_damage" : [ {"damage_type" : "acid", "amount" : 6} ], "dodge":4, "armor_bash":16, "armor_cut":8, @@ -281,22 +310,19 @@ "death_function":"NORMAL", "death_drops": { "subtype": "collection", - "//": "5% chance of an item from group biollante", + "//": "15% chance of an item from group biollante", "groups": [ - [ "biollante", 5 ] + ["biollante", 35], + ["biollante", 35], + ["biollante", 35], + ["fungal_sting", 65] ] }, - "attack_effs": [ - { - "id": "paralyzepoison", - "duration": 33 - } - ], "special_attacks":[["GROW_VINE", 30], ["VINE", 5], ["SPIT_SAP", 15]], "description":"A walking mass of vines. Its body concealed in writhing vines, this deadly monster is a meter or so from being pocket-sized, but carries several deadly toxins within it.", - "flags":["SEES", "HEARS", "NOHEAD", "HARDTOSHOOT", "GRABS", "PUSH_MON", "VENOM", "PLASTIC", "PARALYZEVENOM"], + "flags":["SEES", "HEARS", "PATH_AVOID_DANGER_1", "PRIORITIZE_TARGETS", "NOHEAD", "HARDTOSHOOT", "GRABS", "PUSH_MON", "VENOM", "PLASTIC", "PARALYZEVENOM"], "anger_triggers":["FIRE", "HURT", "FRIEND_DIED", "PLAYER_CLOSE"], - "//": "Tangela/ala is pretty neat, but, by design, not exactly 'a thug', to borrow the term from the Dominions series of games. Hes not going to slug it out well with the big guys." + "//": "Tangela is pretty neat, but, by design, not exactly 'a thug', to borrow the term from the Dominions series of games. It's not going to slug it out well with the big guys." },{ "type" : "MONSTER", "id" : "mon_triffid_pk", @@ -314,7 +340,8 @@ "melee_skill":7, "melee_dice":2, "melee_dice_sides":8, - "melee_cut":6, + "melee_cut":4, + "melee_damage" : [ {"damage_type" : "biological", "amount" : 2} ], "dodge":3, "armor_bash":14, "armor_cut":7, @@ -325,176 +352,191 @@ "death_function":"NORMAL", "death_drops": { "subtype": "collection", - "//": "15% chance of an item from group fungal_sting", "groups": [ - [ "fungal_sting", 15 ] + ["fungal_sting", 95], + ["fungal_fighter_sting", 75] ] }, "special_attacks":[["PARA_STING", 15]], "description":"A creeping animate plant, growing as tall as a moose. It has a single bark-covered stalk supporting a flowery head with a paralyzing sting concealed within. This one looks tough.", "flags":["SEES", "SMELLS", "BASHES", "GROUP_BASH", "PUSH_MON", "NOHEAD", "PARALYZEVENOM"], - "//": "I didn't really want to add bells and whistles to these guys, but I don't think I could not have. parasting is a pretty weak attack that only functions on the player, afaik." + "//": "I didn't really want to add bells and whistles to these guys, but I don't think I could not have. parasting is a pretty weak attack that only functions on funguses or (N)PCs, afaik." },{ - "type" : "MONSTER", - "id" : "mon_treent", - "name": "blue aurora", - "species":"PLANT", - "default_faction":"triffid", - "symbol":"7", - "color":"brown_cyan", - "size":"HUGE", - "material":"veggy", - "diff":30, - "aggression":5, - "morale":200, - "speed":40, - "melee_skill":5, - "melee_dice":6, - "melee_dice_sides":6, - "melee_cut":3, - "dodge":1, - "armor_bash":16, - "armor_cut":16, - "armor_fire":5, - "armor_acid":5, - "vision_day":30, - "vision_night":25, - "hp":500, - "luminance":1, - "special_attacks":[["TRIFFID_HEARTBEAT", 50], ["PARA_STING", 10], ["SMASH", 40], ["RANGED_PULL", 15]], - "attack_effs": [ - { - "//": "applying this multiple times makes intensity go up by 3 instead of 1", - "id": "paralyzepoison", - "duration": 50 - }, + "type" : "MONSTER", + "id" : "mon_treent", + "name": "blue aurora", + "species":"PLANT", + "default_faction":"triffid", + "symbol":"7", + "color":"brown_cyan", + "size":"HUGE", + "material":"veggy", + "diff":30, + "aggression":5, + "morale":200, + "speed":40, + "melee_skill":4, + "melee_dice":6, + "melee_dice_sides":6, + "melee_cut":3, + "melee_damage" : [ {"damage_type" : "acid", "amount" : 2} ], + "dodge":1, + "armor_bash":16, + "armor_cut":16, + "armor_fire":5, + "armor_acid":5, + "vision_day":30, + "vision_night":25, + "hp":500, + "luminance":1, + "special_attacks":[["TRIFFID_HEARTBEAT", 50], ["PARA_STING", 10], ["SMASH", 40], ["RANGED_PULL", 15]], + "attack_effs": [ { + "id": "paralyzepoison", + "duration": 50 + },{ "id": "paralyzepoison", "duration": 50 - }, - { + },{ "id": "paralyzepoison", "duration": 50 } - ], - "description":"A massive slab of bark with faintly glowing flattened blue tendrils and large brown cones instead of leaves. It looks 'sort' of like a tree in that the tendrils are thickest at the base of the monster and taper into thin, densely packed slivers at the top. Its actually almost beautiful at night, where it can be seen from a distance pulsating among the tallest tree.", - "flags":["SEES", "SMELLS", "BASHES", "GROUP_BASH", "VENOM", "PARALYZEVENOM", "DESTROYS", "ATTACKMON", "PUSH_MON", "NOHEAD"], - "anger_triggers":["FIRE", "HURT", "PLAYER_CLOSE", "FRIEND_DIED"], - "//": "Intentionally keep weaker than they could be. Numbers, and perhaps an evo if its called for." + ], + "death_drops": { + "subtype": "collection", + "groups": [ + ["fungal_sting", 100], + ["fungal_fighter_sting", 75], + ["biollante", 35] + ] + }, + "description":"A massive slab of bark with faintly glowing flattened blue tendrils and large brown cones instead of leaves. It looks 'sort' of like a tree in that the tendrils are thickest at the base of the monster and taper into thin, densely packed slivers at the top. Its actually almost beautiful at night, where it can be seen from a distance pulsating among the tallest tree.", + "flags":["SEES", "SMELLS", "BASHES", "GROUP_BASH", "VENOM", "DESTROYS", "ATTACKMON", "PUSH_MON", "NOHEAD"], + "anger_triggers":["FIRE", "HURT", "PLAYER_CLOSE", "FRIEND_DIED"], + "//": "Intentionall keep weaker than they could be. Numbers, and perhaps an evo if its called for." },{ - "type" : "MONSTER", - "id" : "mon_treent_green", - "name": "treunt", - "species":"PLANT", - "default_faction":"triffid", - "symbol":"7", - "color":"ltgreen", - "size":"HUGE", - "material":"veggy", - "diff":25, - "aggression":0, - "morale":200, - "speed":45, - "melee_skill":7, - "melee_dice":5, - "melee_dice_sides":5, - "melee_cut":5, - "dodge":2, - "armor_bash":12, - "armor_cut":14, - "armor_stab":18, - "armor_fire":4, - "armor_acid":3, - "vision_day":40, - "vision_night":30, - "hp":350, - "special_attacks":[["GROWPLANTS", 50], ["SMASH", 30], ["PARA_STING", 10]], - "attack_effs": [ + "type" : "MONSTER", + "id" : "mon_treent_green", + "name": "treunt", + "species":"PLANT", + "default_faction":"triffid", + "symbol":"7", + "color":"ltgreen", + "size":"HUGE", + "material":"veggy", + "diff":25, + "aggression":0, + "morale":200, + "speed":45, + "melee_skill":7, + "melee_dice":5, + "melee_dice_sides":5, + "melee_cut":5, + "dodge":2, + "armor_bash":12, + "armor_cut":14, + "armor_stab":18, + "armor_fire":4, + "armor_acid":3, + "vision_day":40, + "vision_night":30, + "hp":350, + "special_attacks":[["GROWPLANTS", 50], ["SMASH", 30], ["PARA_STING", 10]], + "attack_effs": [ { - "id": "paralyzepoison", - "duration": 50 - }], - "description":"A monster resembling a healthy young tree. With a little effort, the triffids seem to have produced a guardian that blends into the forest. Its poisonous barbs are visible upon close examination, but otherwise its not a bad disguise.", - "flags":["SEES", "SMELLS", "BASHES", "GROUP_BASH", "PARALYZEVENOM", "DESTROYS", "PUSH_MON", "NOHEAD"], - "anger_triggers":["FIRE", "HURT", "FRIEND_DIED", "FRIEND_ATTACKED", "PLAYER_CLOSE"], - "//": "I like these guys, but feel they are outliers and out of place among the triffids. maybe add other 'alien' plants? Sounds like a job for compiling my own code." + "id": "paralyzepoison", + "duration": 50 + }], + "death_drops": { + "subtype": "collection", + "groups": [ + ["fungal_sting", 100], + ["fungal_fighter_sting", 75] + ] + }, + "description":"A monster resembling a healthy young tree. With a little effort, the triffids seem to have produced a guardian that blends into the forest. Its poisonous barbs are visible upon close examination, but otherwise its not a bad disguise.", + "flags":["SEES", "SMELLS", "BASHES", "GROUP_BASH", "DESTROYS", "PUSH_MON", "NOHEAD"], + "anger_triggers":["FIRE", "HURT", "FRIEND_DIED", "FRIEND_ATTACKED", "PLAYER_CLOSE"], + "//": "I like these guys, but feel they are outliers and out of place among the triffids. Maybe add other 'alien' plants? Sounds like a job for compiling my own code." },{ - "type" : "MONSTER", - "id" : "mon_dionaea_sprout", - "name": "dionaea sprout", - "species":"PLANT", - "default_faction":"triffid", - "symbol":"D", - "color":"ltgreen", - "size":"MEDIUM", - "material":"veggy", - "diff":10, - "aggression":25, - "morale":100, - "speed":70, - "melee_skill":4, - "melee_dice":3, - "melee_dice_sides":4, - "melee_cut":4, - "dodge":1, - "armor_bash":5, - "armor_cut":8, - "armor_fire":2, - "armor_acid":2, - "vision_day":30, - "vision_night":3, - "upgrades":{ - "into_group": "GROUP_DIONAEA", - "half_life": 14 - }, - "hp":80, - "special_attacks":[["VINE", 15], + "type" : "MONSTER", + "id" : "mon_dionaea_sprout", + "name": "dionaea sprout", + "species":"PLANT", + "default_faction":"triffid", + "symbol":"D", + "color":"ltgreen", + "size":"MEDIUM", + "material":"veggy", + "diff":10, + "aggression":25, + "morale":100, + "speed":70, + "melee_skill":4, + "melee_dice":3, + "melee_dice_sides":4, + "melee_cut":3, + "dodge":1, + "armor_bash":5, + "armor_cut":8, + "armor_fire":2, + "armor_acid":2, + "vision_day":30, + "vision_night":3, + "upgrades":{ + "into_group": "GROUP_DIONAEA", + "half_life": 14 + }, + "hp":80, + "special_attacks":[["VINE", 15], { - "type" : "bite", - "cooldown" : 20, - "no_infection_chance" : 20, - "min_mul" : 0.50, "//" : "baby dionaea bitch" - }], - "description":"An animate plant a little under 2 meters long, this juvenile still packs a wallop with its fetid mouth.", - "flags":["SEES", "HEARS", "SMELLS", "STUMBLES", "VENOM", "BASHES", "PUSH_MON", "NOHEAD"], - "anger_triggers":["HURT", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE"] + "type" : "bite", + "cooldown" : 20, + "no_infection_chance" : 20, + "min_mul" : 0.50, "//" : "baby dionaea bitch" + }], + "description":"An animate plant a little under 2 meters long, this juvenile still packs a wallop with its fetid mouth.", + "flags":["SEES", "HEARS", "SMELLS", "STUMBLES", "VENOM", "BASHES", "PUSH_MON", "NOHEAD"], + "anger_triggers":["HURT", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE"] },{ - "type" : "MONSTER", - "id" : "mon_dionaea", - "name": "dionaea", - "species":"PLANT", - "default_faction":"triffid", - "symbol":"D", - "color":"green", - "size":"LARGE", - "material":"veggy", - "diff":25, - "aggression":25, - "morale":120, - "speed":60, - "melee_skill":7, - "melee_dice":4, - "melee_dice_sides":6, - "melee_cut":4, - "dodge":2, - "armor_bash":12, - "armor_cut":16, - "armor_fire":3, - "armor_acid":3, - "vision_day":35, - "vision_night":10, - "hp":200, - "special_attacks":[ + "type" : "MONSTER", + "id" : "mon_dionaea", + "name": "dionaea", + "species":"PLANT", + "default_faction":"triffid", + "symbol":"D", + "color":"green", + "size":"LARGE", + "material":"veggy", + "diff":25, + "aggression":25, + "morale":120, + "speed":60, + "melee_skill":7, + "melee_dice":4, + "melee_dice_sides":4, + "melee_cut":5, + "melee_damage" : [ {"damage_type" : "bash", "amount" : 6} ], + "dodge":2, + "armor_bash":10, + "armor_cut":16, + "armor_fire":3, + "armor_acid":3, + "vision_day":35, + "vision_night":10, + "hp":200, + "special_attacks":[ { - "type" : "bite", - "cooldown" : 12, - "no_infection_chance" : 10, - "min_mul" : 0.80, "//" : "dionaea bitch" + "type" : "bite", + "cooldown" : 12, + "no_infection_chance" : 10, + "min_mul" : 0.85, "//" : "dionaea bitch" }, ["VINE", 15], ["RANGED_PULL", 3]], - "description":"A rotund armored 'head' with a massive maw dominates this monster's form. Its head hangs low when its not in use, saving energy for its coordinated slither along the ground.", - "flags":["SEES", "HEARS", "SMELLS", "STUMBLES", "VENOM", "BASHES", "GROUP_BASH", "PUSH_MON", "NOHEAD"], - "anger_triggers":["HURT", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE"] + "description":"A rotund armored 'head' with a massive maw dominates this monster's form. Its head hangs low when its not in use, saving energy for its coordinated slither along the ground.", + "flags":["SEES", "HEARS", "SMELLS", "STUMBLES", "VENOM", "BASHES", "GROUP_BASH", "PUSH_MON", "NOHEAD"], + "anger_triggers":["HURT", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE"], + "//": "Minor concerns about their strength, but they add real meat to the triffid front lines." },{ "type" : "MONSTER", "id" : "mon_minecraft", @@ -522,9 +564,9 @@ "starting_ammo": { "grenade": 1, "flashbang": 1}, "death_function":["EXPLODE", "ACID", "SMOKEBURST"], "description":"a dried up shrub with rustling brown leaves adept at ambushes. Highly volatile and easily excited.", - "flags":["SEES", "HEARS", "GOODHEARING", "CAN_DIG", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "NOHEAD", "BASHES"], + "flags":["SEES", "HEARS", "GOODHEARING", "PATH_AVOID_DANGER_1", "PRIORITIZE_TARGETS", "CAN_DIG", "ANIMAL", "NOHEAD", "BASHES"], "anger_triggers":["SOUND", "PLAYER_WEAK"], - "//": "I don't know if they fit in well, but they add a means for the tiffids to troll." + "//": "I don't know if they fit in well, but they add a means for the triffids to troll." },{ "type" : "MONSTER", "id" : "mon_minecraft_charged", @@ -553,7 +595,7 @@ "starting_ammo": { "c4": 1, "EMPbomb": 3}, "death_function":["EXPLODE", "ACID", "SMOKEBURST"], "description":"Somehow this dessicated plant has become charged up with some lightning? Probably not good for nearby electronic devices. . .", - "flags":["SEES", "SMELLS","KEENNOSE", "HEARS", "GOODHEARING", "CAN_DIG", "ANIMAL", "PATH_AVOID_DANGER_1", "SWIMS", "NOHEAD", "BASHES"], + "flags":["SEES", "SMELLS","KEENNOSE", "HEARS", "GOODHEARING", "PATH_AVOID_DANGER_1", "PRIORITIZE_TARGETS", "CAN_DIG", "ANIMAL", "NOHEAD", "BASHES"], "anger_triggers":["SOUND", "PLAYER_WEAK"], "//": "And these guys give them some means of taking down electronics." } From 54a145cfdbb9897ff755e21055e420a8f2941c19 Mon Sep 17 00:00:00 2001 From: Xpyder Date: Mon, 6 Jun 2016 12:54:56 -0700 Subject: [PATCH 039/110] fixed fish again I forgot that there was a discussion of fish values post my other nutrition fixes. --- data/json/items/comestibles.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles.json b/data/json/items/comestibles.json index 6e93bbd7a7d78..eafa921e03808 100644 --- a/data/json/items/comestibles.json +++ b/data/json/items/comestibles.json @@ -2422,7 +2422,7 @@ "symbol" : "%", "quench" : -1, "healthy" : 1, - "nutrition" : 40, + "nutrition" : 24, "description" : "This is a serving of crisply brined and canned fish. Tasty and nutritious.", "price" : 250, "//" : "Two charges per jar.", "material" : "flesh", @@ -2443,7 +2443,7 @@ "symbol" : "%", "quench" : 0, "healthy" : 1, - "nutrition" : 26, + "nutrition" : 18, "description" : "Low-sodium preserved fish. It was boiled and canned. Contains most of the nutrition, but little of the savor of cooked fish.", "price" : 250, "material" : "flesh", From d56e544f14a2f3b7604379d1b3acd8b238424c01 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 15:58:33 -0400 Subject: [PATCH 040/110] Update pk_item_tool.json ammo null no --- data/mods/PKs_Rebalance/pk_item_tool.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_item_tool.json b/data/mods/PKs_Rebalance/pk_item_tool.json index a5dbf893b93ef..8ba0e09bfa056 100644 --- a/data/mods/PKs_Rebalance/pk_item_tool.json +++ b/data/mods/PKs_Rebalance/pk_item_tool.json @@ -165,7 +165,6 @@ "material" : ["plastic"], "flags" : ["WATER_FRIENDLY", "BELTED", "FRAGILE", "ALLOWS_NATURAL_ATTACKS", "NO_RELOAD"], "coverage" : 10, - "ammo": "NULL", "revert_to": "bag_plastic", "max_charges": 7, "initial_charges": 7, @@ -194,7 +193,6 @@ "price" : 1000000, "material" : ["glass"], "flags" : ["NO_RELOAD", "NO_UNLOAD"], - "ammo": "NULL", "revert_to": "bottle_glass", "charges": 3, "use_action" : { From aae69997804ae8e7e743e9f89ab6760cbe20245c Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 16:03:39 -0400 Subject: [PATCH 041/110] Update pk_critter_misc.json --- data/mods/PKs_Rebalance/pk_critter_misc.json | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_misc.json b/data/mods/PKs_Rebalance/pk_critter_misc.json index 9797c074e99c3..7561bc62cc270 100644 --- a/data/mods/PKs_Rebalance/pk_critter_misc.json +++ b/data/mods/PKs_Rebalance/pk_critter_misc.json @@ -46,8 +46,7 @@ "hp":250, "vision_day":5, "vision_night":25, - "special_attacks":[["RATKING", 3], ["GRENADIER", 15]], - "starting_ammo": { "bot_rat": 20 }, + "special_attacks":[["RATKING", 3]], "flags":["SEES", "SMELLS", "WARM", "SWIMS", "BONES"], "anger_triggers":["FRIEND_ATTACKED", "FRIEND_DIED"], "fear_triggers":["PLAYER_CLOSE"] @@ -296,7 +295,7 @@ "armor_multiplier" : 0.5 }], "description":"An absolutely enormous bear-like creature, with paws larger than your head. A dedicated omnivore, it can sometimes decide to scavenge or attack smaller animals; relying upon its thick hide to keep it safe.", - "flags":["SEES", "HEARS", "SMELLS", "KEENNOSE", "ANIMAL", "WARM", "FUR", "BLEED", "BASHES", "DESTROYS", "PUSH_MON", "BONES", "FAT", "LEATHER"], + "flags":["SEES", "HEARS", "SMELLS", "KEENNOSE", "PATH_AVOID_DANGER_1", "ANIMAL", "WARM", "FUR", "BLEED", "BASHES", "DESTROYS", "PUSH_MON", "BONES", "FAT", "LEATHER"], "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK", "FRIEND_ATTACKED"], "placate_triggers":["MEAT"], "fear_triggers": ["HURT", "FRIEND_DIED"], @@ -376,7 +375,7 @@ "armor_multiplier" : 0.6 }], "description":"This young megabear hasn't yet developed the muscle or size of the adults, but it would be mistake to think it was weak. It may still be under its mother's protection.", - "flags":["SEES", "HEARS", "SMELLS", "KEENNOSE", "ANIMAL", "WARM", "FUR", "BLEED", "BASHES", "PUSH_MON", "BONES", "FAT", "LEATHER", "SWARMS", "GROUP_MORALE"], + "flags":["SEES", "HEARS", "SMELLS", "KEENNOSE", "PATH_AVOID_DANGER_1", "ANIMAL", "WARM", "FUR", "BLEED", "BASHES", "PUSH_MON", "BONES", "FAT", "LEATHER", "SWARMS", "GROUP_MORALE"], "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK", "FRIEND_ATTACKED", "FIRE"], "placate_triggers":["MEAT"], "fear_triggers": ["HURT", "FRIEND_DIED", "FIRE"], @@ -416,7 +415,7 @@ "armor_multiplier" : 0.6 }], "description":"A very young elephant bear, still too uncoordinated to walk proficently. With large eyes and bleating cries, this is the cutest car-sized thing that ever would eat you.", - "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "WARM", "FUR", "BLEED", "BASHES", "PUSH_MON", "BONES", "FAT", "LEATHER", "SWARMS", "GROUP_MORALE", "STUMBLES"], + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "ANIMAL", "WARM", "FUR", "BLEED", "BASHES", "PUSH_MON", "BONES", "FAT", "LEATHER", "SWARMS", "GROUP_MORALE", "STUMBLES"], "anger_triggers":["PLAYER_WEAK", "FRIEND_ATTACKED", "FIRE"], "placate_triggers":["MEAT", "FRIEND_ATTACKED"], "fear_triggers": ["HURT", "FRIEND_DIED", "FIRE", "PLAYER_CLOSE"], @@ -454,7 +453,7 @@ "armor_multiplier" : 0.65 }], "description":"The downward pressure on the canines has produced smaller and more agile versions. These live in social communities and can be usually seen tenaciously hunting for moles; dragging them out of their tunnels with paws and elongated teeth. It has also been known to aggressively raid campgrounds.", - "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "WARM", "FUR", "HIT_AND_RUN", "KEENNOSE", "BLEED", "BONES", "SWARMS", "GROUP_MORALE"], + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "ANIMAL", "WARM", "FUR", "HIT_AND_RUN", "KEENNOSE", "BLEED", "BONES", "SWARMS", "GROUP_MORALE"], "anger_triggers":["FRIEND_ATTACKED", "PLAYER_WEAK", "MEAT", "FIRE", "FIRE"], "fear_triggers": ["HURT", "PLAYER_CLOSE", "FRIEND_DIED"], "placate_triggers":["MEAT"], From 94eb29109b4b990bb9249ec69a1517aa441fab92 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 16:05:09 -0400 Subject: [PATCH 042/110] Update pk_critter_insect.json --- data/mods/PKs_Rebalance/pk_critter_insect.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_insect.json b/data/mods/PKs_Rebalance/pk_critter_insect.json index f098306ddefc7..17895f906fa06 100644 --- a/data/mods/PKs_Rebalance/pk_critter_insect.json +++ b/data/mods/PKs_Rebalance/pk_critter_insect.json @@ -153,12 +153,6 @@ "vision_night":20, "hp":90, "death_function":"DISINTEGRATE", - "death_drops": { - "subtype": "collection", - "groups": [ - [ "spider_eggs", 100 ] - ] - }, "description":"A large egg sack with periodically hatching eggs, and a few care-tenders. This one seems somehow more important than the rest.", "flags":["SEES", "NO_BREATHE", "IMMOBILE", "QUEEN"] },{ @@ -217,12 +211,6 @@ "vision_night":20, "hp":90, "death_function":"DISINTEGRATE", - "death_drops": { - "subtype": "collection", - "groups": [ - [ "spider_eggs", 100 ] - ] - }, "description":"A large egg sack with periodically hatching eggs, and a few care-tenders. This one seems somehow more important than the rest.", "flags":["SEES", "NO_BREATHE", "IMMOBILE", "QUEEN"] },{ From c59dc64f3bd88cc277e1524b312a13132d69f905 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 16:08:22 -0400 Subject: [PATCH 043/110] Update pk_critter_insect.json --- data/mods/PKs_Rebalance/pk_critter_insect.json | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_insect.json b/data/mods/PKs_Rebalance/pk_critter_insect.json index 17895f906fa06..face44ebfd691 100644 --- a/data/mods/PKs_Rebalance/pk_critter_insect.json +++ b/data/mods/PKs_Rebalance/pk_critter_insect.json @@ -97,6 +97,7 @@ "into": "mon_spider_wolf_giant_pk", "half_life": 29 }, + "flags":["SEES", "SMELLS", "HEARS", "VENOM", "CHITIN", "FAT", "CLIMBS", "PATH_AVOID_DANGER_1"], "anger_triggers":["STALK", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE"], "fear_triggers": ["FRIEND_DIED"] },{ @@ -126,7 +127,7 @@ "hp":100, "death_function":"NORMAL", "description":"This wolf spider has grown to truly monstrous proportions. Its venom is relatively weak compared to its assault.", - "flags":["SEES", "SMELLS", "HEARS", "VENOM", "CHITIN", "FAT", "CLIMBS"], + "flags":["SEES", "SMELLS", "HEARS", "VENOM", "CHITIN", "FAT", "CLIMBS", "PATH_AVOID_DANGER_1"], "anger_triggers":["STALK", "PLAYER_WEAK", "PLAYER_CLOSE"], "fear_triggers": ["HURT", "FRIEND_DIED"] },{ @@ -179,12 +180,6 @@ "vision_night":20, "hp":40, "death_function":"DISINTEGRATE", - "death_drops": { - "subtype": "collection", - "groups": [ - [ "spider_eggs", 100 ] - ] - }, "description":"An egg sack with periodically hatching eggs.", "flags":["SEES", "NO_BREATHE", "IMMOBILE"] },{ @@ -267,7 +262,7 @@ "hp":150, "death_function":"NORMAL", "description": "A large and heavily armored trapdoor spider. Primarily found at the center of larger congregations of trapdoor spiders that can keep it fed if food becomes scarce.", - "flags":["SEES", "SMELLS", "HEARS", "VENOM", "CAN_DIG", "WEBWALK", "CHITIN", "FAT", "CLIMBS", "PUSH_MON"] + "flags":["SEES", "SMELLS", "HEARS", "VENOM", "CAN_DIG", "WEBWALK", "CHITIN", "FAT", "CLIMBS", "PUSH_MON", "PATH_AVOID_DANGER_1"] },{ "type" : "MONSTER", "id" : "mon_spider_trapdoor_giant_pk", @@ -372,7 +367,7 @@ "hp":50, "death_function":"NORMAL", "description":"This web spider uses long-lasting toxins to incapacitate stronger foes.", - "flags":["SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CHITIN", "CLIMBS", "PUSH_MON"] + "flags":["SEES", "SMELLS", "HEARS", "VENOM", "WEBWALK", "CHITIN", "CLIMBS", "PUSH_MON", "PRIORITIZE_TARGETS"] },{ "type" : "MONSTER", "id" : "mon_spider_web_mu", From 8293f1cb727fd35207a970b97e08ab3d1bf88033 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 16:11:16 -0400 Subject: [PATCH 044/110] Update pk_critter_mutant.json Update for pathing tag --- data/mods/PKs_Rebalance/pk_critter_mutant.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_mutant.json b/data/mods/PKs_Rebalance/pk_critter_mutant.json index 8f7e37fd315f8..0d04fb0687776 100644 --- a/data/mods/PKs_Rebalance/pk_critter_mutant.json +++ b/data/mods/PKs_Rebalance/pk_critter_mutant.json @@ -80,7 +80,7 @@ "vision_day":5, "vision_night":20, "special_attacks":[["ACID", 15], ["IMPALE", 40]], - "flags":["SEES", "SMELLS", "HEARS", "POISON", "ACIDPROOF", "ACID_BLOOD", "ACIDTRAIL"], + "flags":["SEES", "SMELLS", "HEARS", "PATH_AVOID_DANGER_2", "POISON", "ACIDPROOF", "ACID_BLOOD", "ACIDTRAIL"], "anger_triggers":["FRIEND_ATTACKED", "HURT", "FRIEND_DIED"] },{ "type" : "MONSTER", @@ -174,7 +174,7 @@ } ], "description":"A mutated bat with a narrow, proboscis-like snout. After its pack stuns the prey, it uses its teeth to gouge a hole into it and its slender tongue to quickly lap up the resulting blood.", - "flags":["SEES", "SMELLS", "HEARS", "GOODHEARING", "WARM", "FLIES", "ANIMAL", "BONES", "LEATHER", "HARDTOSHOOT", "SWARMS", "HIT_AND_RUN", "GROUP_MORALE"], + "flags":["SEES", "SMELLS", "HEARS", "GOODHEARING", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "ANIMAL", "BONES", "LEATHER", "HARDTOSHOOT", "SWARMS", "HIT_AND_RUN", "GROUP_MORALE"], "anger_triggers":["PLAYER_WEAK", "FRIEND_ATTACKED", "SOUND", "FIRE"], "fear_triggers":["PLAYER_CLOSE", "SOUND", "FRIEND_DIED"], "categories":["WILDLIFE"] @@ -213,7 +213,7 @@ "allow_no_target" : false }], "description":"It looks like a brown coyote with black streaks along its side. Except against either haunch rests a muscular folded limb terminating in a scythe-like bony protrusion.", - "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "WARM", "FUR", "KEENNOSE", "BLEED", "BONES", "FAT", "SWARMS", "GROUP_MORALE"], + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "ANIMAL", "WARM", "FUR", "KEENNOSE", "BLEED", "BONES", "FAT", "SWARMS", "GROUP_MORALE"], "fear_triggers":["FRIEND_DIED", "HURT"], "anger_triggers":["FRIEND_ATTACKED", "PLAYER_WEAK", "PLAYER_CLOSE"], "placate_triggers":["MEAT"], From 05f6aa0c0270703b14a1873b26f3d7456f529776 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 16:23:02 -0400 Subject: [PATCH 045/110] Update pk_critter_zombie.json Adds the pathing tags --- .../mods/PKs_Rebalance/pk_critter_zombie.json | 55 +++++++++++++++---- 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_zombie.json b/data/mods/PKs_Rebalance/pk_critter_zombie.json index 4fd427484e96a..04afc0aef5a28 100644 --- a/data/mods/PKs_Rebalance/pk_critter_zombie.json +++ b/data/mods/PKs_Rebalance/pk_critter_zombie.json @@ -118,8 +118,8 @@ "armor_acid":2, "hp":230, "special_attacks":[["SMASH", 50]], - "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "BASHES", "WARM", "FUR", "BLEED", "ATTACKMON", "BONES", "FAT", "POISON"], "burn_into" : "mon_horse_zombie_scorched", + "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "BASHES", "WARM", "FUR", "BLEED", "ATTACKMON", "BONES", "FAT", "POISON", "NO_BREATHE", "REVIVES"], "anger_triggers":["HURT", "PLAYER_CLOSE", "FIRE", "FRIEND_ATTACKED"] },{ "type" : "MONSTER", @@ -208,7 +208,7 @@ }], "death_function":["SMOKEBURST", "NORMAL"], "description":"A smoking husk is all that remains of this once proud bear. Its black eyes gaze at you with malice... and hunger.", - "flags":["SEES", "HEARS", "ANIMAL", "BASHES", "ATTACKMON", "BONES", "FIREPROOF", "NO_BREATHE", "POISON", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO"], + "flags":["SEES", "HEARS", "PATH_AVOID_DANGER_1", "ANIMAL", "BASHES", "ATTACKMON", "BONES", "FIREPROOF", "NO_BREATHE", "POISON", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO"], "anger_triggers":["HURT", "PLAYER_CLOSE"], "placate_triggers":["MEAT"], "categories":["WILDLIFE"] @@ -525,7 +525,7 @@ "death_function":"NORMAL", "burn_into" : "mon_horse_zombie_scorched", "description":"This horse has a brackish liquid coating its bared teeth, as well as the occasional oozing wounds breaking the otherwise glorious sheen of its hair. Its hooves are fearsome weapons.", - "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "WARM", "FUR", "BONES", "FAT", "NO_BREATHE", "POISON", "REVIVES", "PUSH_MON", "STUMBLES", "BASHES"], + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "ANIMAL", "WARM", "FUR", "BONES", "FAT", "NO_BREATHE", "POISON", "REVIVES", "PUSH_MON", "STUMBLES", "BASHES"], "placate_triggers":["PLAYER_WEAK"], "fear_triggers": ["FIRE"] },{ @@ -915,7 +915,7 @@ } ], "description":"Its face disfigured and scabbed over, this foul child-sized corpse has been forged through constant combat, imbibing it with remarkable agility, speed, and savage brutality. It bears scars that indicate that this isn't the first (or second) time it has died.", - "flags":["SEES", "HEARS", "SMELLS", "WARM", "BASHES", "BLEED", "POISON", "NO_BREATHE", "REVIVES", "BONES"], + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "WARM", "BASHES", "BLEED", "POISON", "NO_BREATHE", "REVIVES", "BONES"], "categories":["CLASSIC"] },{ "type" : "MONSTER", @@ -948,7 +948,7 @@ "burn_into" : "mon_zombie_scorched_necro", "special_attacks":[["UPGRADE", 30], ["RESURRECT", 30], ["FORMBLOB", 180], ["LONGSWIPE", 15]], "description":"Standing with erect back and mocking smile, this graceful zombie appears to actually direct nearby zombies with glares and the twitching of its jagged claws. Its skin is a revolting shade of pink, and every once in a while it stops what it is doing to excrete a few gooey, animate blobs.", - "flags":["SEES", "HEARS", "GOODHEARING", "SMELLS", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "BONES"], + "flags":["SEES", "HEARS", "GOODHEARING", "PATH_AVOID_DANGER_2", "PRIORITIZE_TARGETS", "SMELLS", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "BONES"], "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK"], "fear_triggers":["HURT"] },{ @@ -983,7 +983,7 @@ "cooldown" : 5 }, ["GRAB", 4]], "description":"The permanent shadow around this gaunt figure makes it hard to make out. What you can see appears translucent and shimmering. It is disoriented in light, and actively avoids fire.", - "flags":["HARDTOSHOOT", "SEES", "HEARS", "SMELLS", "STUMBLES", "BASHES", "GROUP_BASH", "POISON", "BLEED", "NO_BREATHE", "REVIVES", "BONES", "PUSH_MON", "NIGHT_INVISIBILITY", "SWIMS", "PLASTIC"], + "flags":["HARDTOSHOOT", "SEES", "HEARS", "PATH_AVOID_DANGER_1", "SMELLS", "STUMBLES", "BASHES", "GROUP_BASH", "POISON", "BLEED", "NO_BREATHE", "REVIVES", "BONES", "PUSH_MON", "NIGHT_INVISIBILITY", "SWIMS", "PLASTIC"], "categories":["CLASSIC"], "anger_triggers":["PLAYER_CLOSE", "FRIEND_DIED", "STALK", "HURT"], "placate_triggers":["FIRE"] @@ -1124,7 +1124,7 @@ }, ["SHRIEK_ALERT", 50], ["SHRIEK_STUN", 1]], "description":"Through its smoke you can make out a lithe, tightly wound frame. From time to time it emits a coarse, rumbling howl that sounds like it came from the bowels of the Earth.", - "flags":["SEES", "HEARS", "NO_BREATHE", "HARDTOSHOOT", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO", "BASHES", "WARM"] + "flags":["SEES", "HEARS", "PATH_AVOID_DANGER_1", "NO_BREATHE", "HARDTOSHOOT", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO", "BASHES", "WARM"] },{ "type" : "MONSTER", "id" : "mon_dog_zombie_cop_pk", @@ -1389,7 +1389,7 @@ "death_function":["BLOBSPLIT", "BLOBSPLIT"], "special_attacks":[["RESURRECT", 90], ["FORMBLOB", 600]], "description":"An encrusted humanoid mass so blackened by fire only the simmering of the liquid oozing from its wounds indicate damage. Still seems capable of supporting its horde despite it weakened state.", - "flags":["SEES", "HEARS", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "BONES", "NIGHT_INVISIBILITY"], + "flags":["SEES", "HEARS", "PATH_AVOID_DANGER_2", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "BONES", "NIGHT_INVISIBILITY"], "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK"], "fear_triggers":["HURT"] },{ @@ -1421,7 +1421,7 @@ "death_function":["BLOBSPLIT", "BLOBSPLIT"], "special_attacks":[["UPGRADE", 90], ["FORMBLOB", 600]], "description":"An encrusted humanoid mass so blackened by fire only the simmering of the liquid oozing from its wounds indicate damage. Still seems capable of controlling its horde despite it weakened state.", - "flags":["SEES", "HEARS", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "BONES", "NIGHT_INVISIBILITY"], + "flags":["SEES", "HEARS", "PATH_AVOID_DANGER_2", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "BONES", "NIGHT_INVISIBILITY"], "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK"], "fear_triggers":["HURT"] },{ @@ -1455,7 +1455,7 @@ "death_function":["NORMAL"], "burn_into" : "mon_skeleton_scorched", "description":"A tiny charred body, jumping and kicked and flailing around in a mockery of playground exercise. It does not need a face for you to feel bad about killing it.", - "flags":["SEES", "HEARS", "STUMBLES", "POISON", "GRABS", "NO_BREATHE", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO", "BONES", "GUILT", "CLIMBS"] + "flags":["SEES", "HEARS", "PATH_AVOID_DANGER_1", "STUMBLES", "POISON", "GRABS", "NO_BREATHE", "REVIVES", "REVIVES_HEALTHY", "NO_NECRO", "BONES", "GUILT", "CLIMBS"] },{ "type" : "MONSTER", "id" : "mon_horse_zombie_scorched", @@ -1577,5 +1577,40 @@ "death_function": ["MELT", "BLOBSPLIT"], "description":"An appaling black mass of flowing crusted flesh, flailing helplessly about.", "flags":["HEARS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "BONES", "SWIMS", "NIGHT_INVISIBILITY"] + },{ + "type" : "MONSTER", + "id" : "mon_zombie_bear_mega", + "name": "zombie megabear", + "species":"MAMMAL", + "default_faction":"zombie", + "symbol":"B", + "color":"i_brown", + "size":"HUGE", + "material":"flesh", + "diff":30, + "aggression":100, + "morale":100, + "speed":110, + "melee_skill":4, + "melee_dice":2, + "melee_dice_sides":18, + "melee_cut":12, + "melee_damage" : [{"damage_type" : "bash", "amount" : 4}], + "dodge":2, + "armor_bash":16, + "armor_cut":8, + "vision_day":25, + "vision_night":10, + "hp":380, + "death_function":"NORMAL", + "special_attacks":[["FLESH_GOLEM", 40], ["SMASH", 40], + { + "type" : "bite", + "cooldown" : 40, + "accuracy" : 6, + "armor_multiplier" : 0.5 + }], + "description":"Although the elephant bears seem much more capable of avoiding death at the hands of zombies, a few do fall. Several humanoid zombies can fit into its mere shadow.", + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "ANIMAL", "WARM", "FUR", "BLEED", "BASHES", "DESTROYS", "ATTACKMON", "BONES", "FAT", "LEATHER", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES"] } ] From 102b456725937de0a28fcfd90434f5747a4507fe Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 16:25:06 -0400 Subject: [PATCH 046/110] Update pk_critter_ant.json --- data/mods/PKs_Rebalance/pk_critter_ant.json | 44 ++++++++++++++++++--- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_ant.json b/data/mods/PKs_Rebalance/pk_critter_ant.json index 5b91c7d2ae522..2950b80a071f6 100644 --- a/data/mods/PKs_Rebalance/pk_critter_ant.json +++ b/data/mods/PKs_Rebalance/pk_critter_ant.json @@ -85,7 +85,7 @@ "half_life": 14 }, "special_attacks":[["ANTQUEEN", 3], ["SHRIEK_ALERT", 30]], - "flags":["SEES", "SMELLS", "QUEEN", "CHITIN", "FAT", "CLIMBS", "BASHES"], + "flags":["SEES", "SMELLS", "PATH_AVOID_DANGER_1", "QUEEN", "CHITIN", "FAT", "CLIMBS", "BASHES"], "anger_triggers":["FRIEND_DIED", "HURT", "FIRE"] },{ "type" : "MONSTER", @@ -125,7 +125,7 @@ "species":"INSECT", "default_faction":"ant", "symbol":"s", - "color":"ltgrey", + "color":"ltgray", "size":"SMALL", "material":"iflesh", "diff":7, @@ -147,7 +147,7 @@ "death_function":"NORMAL", "special_attacks":[["SHRIEK_ALERT", 50], ["SHRIEK_STUN", 1]], "description":"A small giant ant with a carapace shell. Is capable of a surprising range of vocal expression for a bug, including ear-splitting wails.", - "flags":["SEES", "HEARS", "SMELLS", "CHITIN", "CLIMBS"], + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "CHITIN", "CLIMBS"], "anger_triggers":["FRIEND_DIED", "HURT"] },{ "type" : "MONSTER", @@ -357,7 +357,7 @@ "death_function":"NORMAL", "special_attacks":[["ANTQUEEN", 3], ["FLAMETHROWER", 10], ["SHRIEK_ALERT", 15]], "description":"A colossal red ant with a bulging, bloated thorax. It moves slowly and deliberately, tending to nearby eggs and continually laying more. Its antennae seem almost aesthetic, or at the least not used for sensing . . .", - "flags":["SEES", "SMELLS", "QUEEN", "CHITIN", "FAT", "CLIMBS", "FIREPROOF", "BASHES"], + "flags":["SEES", "SMELLS", "PATH_AVOID_DANGER_1", "QUEEN", "CHITIN", "FAT", "CLIMBS", "FIREPROOF", "BASHES"], "anger_triggers":["FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "FIRE"] },{ "type" : "MONSTER", @@ -388,10 +388,42 @@ "death_function":"NORMAL", "special_attacks":[["ANTQUEEN", 21], ["FLAMETHROWER", 30], ["SHRIEK_ALERT", 30], ["SHRIEK_STUN", 1]], "description":"A fecund female ant. It still bears its wings, and likely either s preparing for or just completed its nuptial flight. Its body is well-laden with stores of nutrients for its future young.", - "flags":["SEES", "SMELLS", "CHITIN", "FAT", "CLIMBS", "FIREPROOF", "FLIES", "BASHES"], + "flags":["SEES", "SMELLS", "PATH_AVOID_DANGER_1", "CHITIN", "FAT", "CLIMBS", "FIREPROOF", "FLIES", "BASHES"], "anger_triggers":["FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "FIRE"] },{ "type" : "MONSTER", + "id" : "mon_ant_male", + "name": "male ant", + "species":"INSECT", + "default_faction":"ant_male", + "symbol":"a", + "color":"dkgray", + "size":"MEDIUM", + "material":"iflesh", + "diff":16, + "aggression":30, + "morale":70, + "speed":105, + "melee_skill":6, + "melee_dice":1, + "melee_dice_sides":12, + "melee_damage" : [ {"damage_type" : "stab", "amount" : 6} ], + "dodge":5, + "armor_bash":5, + "armor_cut":8, + "armor_fire":12, + "armor_acid":3, + "vision_day":25, + "vision_night":7, + "hp":80, + "death_function":"NORMAL", + "description":"The male giant ant, seen often during the spring and rarely anytime else. Spends its short life jockeying with other male ants for mating rights, only actually mating once before death.", + "flags":["SEES", "SMELLS", "CHITIN", "FAT", "CLIMBS", "FLIES", "BASHES"], + "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK", "FIRE"], + "fear_triggers":["FRIEND_DIED", "HURT"], + "placate_triggers": ["FRIEND_ATTACKED"] + },{ + "type" : "MONSTER", "id" : "mon_ant_kwama", "name": "kwama", "species":"INSECT", @@ -417,7 +449,7 @@ "hp":120, "death_function":"NORMAL", "special_attacks":[["GRAB", 60], ["SHOCKSTORM", 30]], - "description":"You don't know what this thing is, but the ants treat it as one of their own. Its head looks like a maggot, completely devoid of pincers and with three beady eyes staring in different directions. While it typically travels on its four limbs, it occasionally stands upon its hind limbs to gaze about. It claws clumsily with the three digits on each limb, and rumors exist of it being capable of harnessing electricity for attack.", + "description":"You don't know what this thing is, but the ants treat it as one of their own. Its head looks like a maggot, completely devoid of pincers and with three beady eyes staring in different directions. While it typically travels on its four limbs, it occasionally stands upon its hind limbs to gaze about. It claws clumsily with the three digits on each limb, and rumors exist of it being capable of harnessing electricity for attack.", "flags":["SEES", "HEARS", "SMELLS", "CHITIN", "CLIMBS", "BASHES"], "anger_triggers":["FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_CLOSE", "FIRE"] } From 70c2c90e580b1a770ab756aadd80daae15f88fe0 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 16:25:43 -0400 Subject: [PATCH 047/110] Update pk_critter_fungus.json --- .../mods/PKs_Rebalance/pk_critter_fungus.json | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_fungus.json b/data/mods/PKs_Rebalance/pk_critter_fungus.json index 0eec32ce96280..4ddadf616b50a 100644 --- a/data/mods/PKs_Rebalance/pk_critter_fungus.json +++ b/data/mods/PKs_Rebalance/pk_critter_fungus.json @@ -11,7 +11,7 @@ "hp":50, "vision_day":2, "vision_night":2, - "special_attacks":[["FUNGUS_BRISTLE", 10], ["FUNGUS", 300], ["TENTACLE", 50], ["GRENADIER", 120]], + "special_attacks":[["FUNGUS_BRISTLE", 10], ["FUNGUS", 300], ["TENTACLE", 50], ["GRENADIER", 90]], "starting_ammo": { "bot_fungal_boil": 4 }, "death_function":["FUNGUS", "DISINTEGRATE"], "flags":["SEES", "NOHEAD", "POISON", "NO_BREATHE", "IMMOBILE"] @@ -25,10 +25,10 @@ "armor_fire":1, "armor_acid":1, "hp":30, - "vision_day":5, - "vision_night":5, - "special_attacks":[["FUNGUS_BRISTLE", 30], ["FUNGUS", 20], ["GRENADIER", 120]], - "starting_ammo": { "bot_fungal_boil": 4 }, + "vision_day":30, + "vision_night":30, + "special_attacks":[["FUNGUS_BRISTLE", 30], ["FUNGUS", 20], ["GRENADIER", 60]], + "starting_ammo": { "bot_fungal_boil": 8 }, "death_function":["FUNGUS", "DISINTEGRATE"], "flags":["SEES", "NOHEAD", "POISON", "NO_BREATHE", "IMMOBILE", "REGENERATES_10"] },{ @@ -134,10 +134,10 @@ "aggression":0, "morale":70, "speed":115, - "melee_skill":6, + "melee_skill":5, "melee_dice":2, "melee_dice_sides":5, - "melee_cut":3, + "melee_cut":5, "dodge":4, "armor_bash":3, "armor_cut":2, @@ -151,9 +151,9 @@ "cooldown" : 10, "max_range" : 4 }, - ["LUNGE", 60], ["FUNGUS", 180], ["FUNGUS_INJECT", 70]], + ["LUNGE", 60], ["FUNGUS", 180], ["FUNGUS_INJECT", 40]], "description":"The Eastern cougar, now an aspiring fungaloid. Although it appears its transformation has affected its agility some, it still bounds after targets with savagery.", - "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "POISON", "WARM", "FUR", "HIT_AND_RUN", "KEENNOSE", "BLEED", "ATTACKMON", "BONES", "FAT"], + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "ANIMAL", "POISON", "WARM", "FUR", "HIT_AND_RUN", "KEENNOSE", "BLEED", "ATTACKMON", "BONES", "FAT"], "anger_triggers":["PLAYER_WEAK", "HURT", "FRIEND_ATTACKED"], "fear_triggers":["SOUND", "FIRE"] },{ @@ -202,7 +202,7 @@ "speed":170, "melee_skill":7, "melee_dice":3, - "melee_dice_sides":5, + "melee_dice_sides":6, "melee_cut":1, "dodge":2, "armor_bash":5, @@ -214,7 +214,7 @@ "death_function":["NORMAL", "FUNGUS"], "special_attacks":[["SMASH", 40], ["FUNGUS", 180], ["HOWL", 60]], "description":"The 'foose' is an ill-tempered beast, fighting a battle it must inevitably lose. Occasionally it gives unearthly voice to its anguish.", - "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "POISON", "BASHES", "WARM", "FUR", "BLEED", "ATTACKMON", "BONES", "FAT"], + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "ANIMAL", "POISON", "BASHES", "WARM", "FUR", "BLEED", "ATTACKMON", "BONES", "FAT"], "anger_triggers":["FIRE", "HURT", "PLAYER_CLOSE", "FRIEND_ATTACKED"], "placate_triggers":["PLAYER_WEAK", "SOUND"], "//" : "The mighty foose. Not mighty enough. Ever." @@ -237,7 +237,7 @@ "melee_dice":2, "melee_dice_sides":3, "melee_cut":3, - "melee_damage" : [ {"damage_type" : "stab", "amount" : 3} ], + "melee_damage" : [ {"damage_type" : "stab", "amount" : 2} ], "dodge":3, "armor_bash":2, "armor_cut":1, @@ -250,10 +250,10 @@ "type" : "bite", "cooldown" : 7, "no_infection_chance" : 20, - "min_mul" : 0.5, "//" : "strong jaws" + "min_mul" : 0.65, "//" : "strong jaws" }], "description":"Whether wolf or dog, this canine is clearly sick. The slavering of its mouth is consistent, at least.", - "flags":["SEES", "HEARS", "SMELLS", "ANIMAL", "WARM", "FUR", "KEENNOSE", "BLEED", "BONES", "FAT"], + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "ANIMAL", "WARM", "FUR", "KEENNOSE", "BLEED", "BONES", "FAT"], "anger_triggers":["FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE"], "placate_triggers":["MEAT"], "fear_triggers": "FIRE" @@ -322,10 +322,10 @@ "hp":130, "vision_day":2, "vision_night":2, - "death_function":["FUNGUS"], + "death_function":["FUNGUS", "NORMAL"], "special_attacks":[["TENTACLE", 20], ["FUNGUS_INJECT", 10], ["FUNGUS", 300]], "description":"A stout stalk of gray matter, this fungus pulls itself along with several tipped tendrils. Two of these tendrils are raised ominously when the fungaloid finds a suitable host for its crop of spores.", - "flags":["SEES", "HEARS", "SMELLS", "STUMBLES", "POISON", "NO_BREATHE", "NOHEAD", "CAN_DIG"], + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "PRIORITIZE_TARGETS", "STUMBLES", "POISON", "NO_BREATHE", "NOHEAD", "CAN_DIG"], "anger_triggers":["SOUND", "HURT"], "placate_triggers":["PLAYER_WEAK"] },{ @@ -357,7 +357,7 @@ "death_function":["NORMAL"], "special_attacks":[["GRAB", 30], ["VINE", 7], ["FUNGUS", 90], ["TENTACLE", 20], ["FUNGUS_BRISTLE", 20]], "description":"A giant water bear that is host to the fungal invasion. Its body has softened as a result of the infection, and its sensory tentacles have lengthened significantly where fungal buds have formed. Even as this gentle beast ignores you the fungal tentacles seek new flesh to pollinate.", - "flags":["SEES", "SMELLS","POISON", "STUMBLES", "BASHES", "ARTHROPOD_BLOOD", "NO_BREATHE", "SWIMS", "ANIMAL", "FAT","CHITIN"], + "flags":["SEES", "SMELLS", "PATH_AVOID_DANGER_1","POISON", "STUMBLES", "BASHES", "ARTHROPOD_BLOOD", "NO_BREATHE", "SWIMS", "ANIMAL", "FAT","CHITIN"], "anger_triggers":["HURT", "STALK", "FRIEND_ATTACKED"], "placate_triggers":["PLAYER_WEAK"], "//" : "As it currently stands this guy will whip at you even if it is peaceful. The tentacle attacks were taken from the Dog-Thing, and can cover quite a distance. So the reduced vision radius keeps the max distance of the tentacle down. It's a neat effect caused by what I'm sure is an unintended bug." @@ -466,7 +466,7 @@ }], "starting_ammo" : {"9mm": 31}, "description":"A survivor of the apocalypse, this individual is succumbing to their infection; displaying paranoia, and incoherency. Unpredictable and terminally-ill, they will not respond to any attempts to communicate. You can't help but notice they still wear their armor and holster, despite the fresh fungal budding that threatens to rip through it . . .", - "flags":["SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "HUMAN", "LEATHER", "FAT", "BONES", "PUSH_MON", "GUILT"], + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_2", "WARM", "BASHES", "GROUP_BASH", "POISON", "HUMAN", "LEATHER", "FAT", "BONES", "PUSH_MON", "GUILT"], "anger_triggers":["FRIEND_DIED", "FIRE", "PLAYER_CLOSE"], "placate_triggers":["FRIEND_ATTACKED"], "//" : "I'm vaguely aware that the way I compiled the loot item_groups for these gun-toting Zs is pretty inefficient. Just sayin'''" @@ -532,7 +532,7 @@ ], "starting_ammo" : {"shot_00": 10}, "description":"A survivor of the apocalypse, this individual is succumbing to their infection; displaying paranoia, and incoherency. Unpredictable and terminally-ill, they will not respond to any attempts to communicate. You can't help but notice they still wear their armor and holster, despite the fresh fungal budding that threatens to rip through it . . .", - "flags":["SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "HUMAN", "LEATHER", "FAT", "BONES", "PUSH_MON", "GUILT"], + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_2", "WARM", "BASHES", "GROUP_BASH", "POISON", "HUMAN", "LEATHER", "FAT", "BONES", "PUSH_MON", "GUILT"], "anger_triggers":["FRIEND_DIED", "FIRE", "PLAYER_CLOSE"], "placate_triggers":["FRIEND_ATTACKED"] },{ @@ -596,7 +596,7 @@ ], "starting_ammo" : {"44fmj": 17}, "description":"A survivor of the apocalypse, this individual is succumbing to their infection; displaying paranoia, and incoherency. Unpredictable and terminally-ill, they will not respond to any attempts to communicate. You can't help but notice they still wear their armor and holster, despite the fresh fungal budding that threatens to rip through it . . .", - "flags":["SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "HUMAN", "LEATHER", "FAT", "BONES", "PUSH_MON", "GUILT"], + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_2", "WARM", "BASHES", "GROUP_BASH", "POISON", "HUMAN", "LEATHER", "FAT", "BONES", "PUSH_MON", "GUILT"], "anger_triggers":["FRIEND_DIED", "PLAYER_WEAK", "FIRE", "PLAYER_CLOSE"], "placate_triggers":["FRIEND_ATTACKED"] },{ @@ -660,7 +660,7 @@ ], "starting_ammo" : {"9mm":128}, "description":"A survivor of the apocalypse, this individual is succumbing to their infection; displaying paranoia, and incoherency. Unpredictable and terminally-ill, they will not respond to any attempts to communicate. You can't help but notice they still wear their armor and holster, despite the fresh fungal budding that threatens to rip through it . . .", - "flags":["SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "HUMAN", "LEATHER", "FAT", "BONES", "PUSH_MON", "GUILT"], + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_2", "WARM", "BASHES", "GROUP_BASH", "POISON", "HUMAN", "LEATHER", "FAT", "BONES", "PUSH_MON", "GUILT"], "anger_triggers":["FRIEND_DIED", "FIRE", "PLAYER_CLOSE"], "placate_triggers":["FRIEND_ATTACKED"] },{ @@ -705,7 +705,7 @@ }, ["GRAB", 30], ["IMPALE", 30], ["FUNGUS", 180]], "description":"A survivor of the apocalypse, this individual is succumbing to their infection; displaying paranoia, and incoherency. Unpredictable and terminally-ill, they will not respond to any attempts to communicate. You can't help but notice they still wear their armor and holster, despite the fresh fungal budding that threatens to rip through it . . .", - "flags":["SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "HUMAN", "LEATHER", "FAT", "BONES", "PUSH_MON", "GUILT"], + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_2", "WARM", "BASHES", "GROUP_BASH", "POISON", "HUMAN", "LEATHER", "FAT", "BONES", "PUSH_MON", "GUILT"], "anger_triggers":["FRIEND_DIED", "FIRE", "PLAYER_CLOSE"], "placate_triggers":["FRIEND_ATTACKED"] },{ @@ -766,7 +766,7 @@ }], "starting_ammo" : {"223":150}, "description":"This survivor has willingly given their body to the fungus in some strange, ill-described ritual. As a result they have retained much of their personality and hold unnatural abilities. They don't seem interested in talking to you; you cannot even discern their gender.", - "flags":["SEES", "HEARS", "BASHES", "GROUP_BASH", "DESTROYS", "POISON", "HUMAN", "NO_BREATHE", "FIREPROOF", "BONES", "PUSH_MON"], + "flags":["SEES", "HEARS", "PATH_AVOID_DANGER_2", "PRIORITIZE_TARGETS", "BASHES", "GROUP_BASH", "DESTROYS", "POISON", "HUMAN", "NO_BREATHE", "FIREPROOF", "BONES", "PUSH_MON"], "anger_triggers":["HURT", "FRIEND_ATTACKED", "FIRE", "PLAYER_CLOSE"], "//" : "Very dangerous to anyone not in a PA suit. Will be evolving into a laser-wielding monstrosity." },{ @@ -861,7 +861,7 @@ "starting_ammo": { "EMPbomb": 3}, "death_function":["EXPLODE", "ACID", "FUNGUS", "FUNGUS", "FUNGUS", "FUNGUS", "FUNGUS", "FUNGUS", "FUNGUS", "FUNGUS", "FUNGUS", "FUNGUS"], "description":"This plant's dry body is now host to moist fluid sacs that hang off haphazardly; occasionally bursting into a cloud of haze.", - "flags":["SEES", "HEARS", "GOODHEARING", "CAN_DIG", "POISON", "ANIMAL", "SWIMS", "NOHEAD", "BASHES"], + "flags":["SEES", "HEARS", "GOODHEARING", "PATH_AVOID_DANGER_1", "CAN_DIG", "POISON", "ANIMAL", "SWIMS", "NOHEAD", "BASHES"], "anger_triggers":["SOUND", "PLAYER_WEAK", "PLAYER_CLOSE"], "//" : "While I feel the triffid HB is somewhat forced into their fold, this guy works pretty well for the fungus and their themes. Doesn't seem to want to blow up of his own volition though. The fungal mdeaths def stack, but its diminishing returns." },{ @@ -920,11 +920,11 @@ "melee_dice_sides":3, "melee_cut":20, "dodge":2, - "armor_bash":4, - "armor_cut":4, + "armor_bash":2, + "armor_cut":2, "vision_day":35, "vision_night":5, - "hp":85, + "hp":65, "death_function":"NORMAL", "special_attacks":[["FUNGUS", 60], { From de55dd90d3628104c4a4735eea8af0b524ac831b Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 16:34:58 -0400 Subject: [PATCH 048/110] Update pk_critter_doom.json --- data/mods/PKs_Rebalance/pk_critter_doom.json | 134 +++++++++---------- 1 file changed, 61 insertions(+), 73 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_doom.json b/data/mods/PKs_Rebalance/pk_critter_doom.json index 54f78211f4fae..10f413d6877a9 100644 --- a/data/mods/PKs_Rebalance/pk_critter_doom.json +++ b/data/mods/PKs_Rebalance/pk_critter_doom.json @@ -15,12 +15,11 @@ "speed":110, "melee_skill":5, "melee_dice":2, - "melee_dice_sides":6, + "melee_dice_sides":5, "melee_cut":7, "dodge":2, - "armor_bash":5, - "armor_cut":5, - "armor_stab":5, + "armor_bash":2, + "armor_cut":2, "armor_fire":5, "armor_acid":1, "vision_day":40, @@ -32,8 +31,7 @@ "type" : "leap", "cooldown" : 25, "max_range" : 4 - }, - { + },{ "type" : "bite", "cooldown" : 60 },{ @@ -76,9 +74,8 @@ "melee_dice_sides":6, "melee_cut":7, "dodge":2, - "armor_bash":5, - "armor_cut":5, - "armor_stab":5, + "armor_bash":4, + "armor_cut":4, "armor_fire":7, "armor_acid":3, "vision_day":40, @@ -90,8 +87,7 @@ "type" : "leap", "cooldown" : 25, "max_range" : 4 - }, - { + },{ "type" : "bite", "cooldown" : 60 },{ @@ -113,8 +109,8 @@ "no_ammo_sound" : "RAAGH?" }], "starting_ammo": { "flaming_ball": 66 }, - "description":"Even for an imp, this figure has black skin. It attacks with fire and claw, and leads its brethren into battle.", - "flags":["SEES", "HEARS", "SMELLS", "WARM", "BASHES", "POISON", "BLEED", "BONES", "CLIMBS", "PUSH_MON", "GROUP_MORALE"] + "description":"Even for an imp, this figure has blackened skin. It attacks with fire and claw, and leads its brethren into battle.", + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "WARM", "BASHES", "POISON", "BLEED", "BONES", "CLIMBS", "PUSH_MON", "GROUP_MORALE"] },{ "type" : "MONSTER", "id" : "mon_pinky", @@ -131,11 +127,11 @@ "speed":95, "melee_skill":5, "melee_dice":3, - "melee_dice_sides":9, + "melee_dice_sides":8, "melee_cut":4, "dodge":2, - "armor_bash":6, - "armor_cut":8, + "armor_bash":8, + "armor_cut":4, "armor_stab":10, "armor_fire":8, "armor_acid":1, @@ -143,7 +139,7 @@ "vision_night":10, "hp":140, "death_function":"NORMAL", - "special_attacks":[ + "special_attacks":[["GRAB", 30], ["GRAB_DRAG", 10], { "type" : "bite", "cooldown" : 5, @@ -152,8 +148,7 @@ {"damage_type" : "stab", "amount" : 12, "armor_multiplier" : 0.5}, {"damage_type" : "bash", "amount" : 21, "armor_multiplier" : 0.5} ] - }, - ["GRAB", 30], ["GRAB_DRAG", 10]], + }], "description":"A pink-skinned bipedal monster, with jaws that occupy a disproportionate amount of its muscular body. Melds into the shadows to ambush victims.", "flags":["SEES", "HEARS", "SMELLS", "WARM", "BASHES", "POISON", "BLEED", "BONES", "PUSH_MON", "GROUP_BASH", "NIGHT_INVISIBILITY", "GROUP_MORALE"] },{ @@ -174,8 +169,8 @@ "melee_dice":1, "melee_dice_sides":15, "melee_cut":2, - "dodge":3, - "armor_bash":6, + "dodge":2, + "armor_bash":4, "armor_cut":6, "armor_stab":20, "armor_acid":1, @@ -224,7 +219,7 @@ "melee_dice_sides":12, "melee_cut":3, "dodge":3, - "armor_bash":8, + "armor_bash":3, "armor_cut":15, "armor_stab":25, "armor_acid":4, @@ -240,10 +235,9 @@ "//": "Sometimes drops its manhacks. Sometimes it drops grenade-style bombs.", "groups": [ [ "revenant_death_drops", 75] - ] - }, + ]}, "description":"A gaunt figure with translucent flesh, this backbone of the demonic army sports a salvo of homing rockets on each shoulder. Its punch can crack human bones.", - "flags":["SEES", "HEARS", "NO_BREATHE", "PUSH_MON", "BASHES", "GROUP_BASH"] + "flags":["SEES", "HEARS", "PRIORITIZE_TARGETS", "NO_BREATHE", "PUSH_MON", "BASHES", "GROUP_BASH"] },{ "type" : "MONSTER", "id" : "mon_hell_knight", @@ -263,11 +257,10 @@ "melee_dice_sides":13, "melee_cut":3, "dodge":1, - "armor_bash":8, - "armor_cut":8, - "armor_stab":8, + "armor_bash":6, + "armor_cut":10, "armor_acid":3, - "armor_fire":6, + "armor_fire":10, "vision_day":50, "vision_night":7, "hp":160, @@ -286,14 +279,14 @@ "move_cost" : 150, "targeting_cost" : 200, "range" : 9, - "description" : "With a clap the Knight's hands close!", + "description" : "With a clap the knight's hands close!", "targeting_sound" : "ROOAWNNT!!", "targeting_volume" : 40, "no_ammo_sound" : "Rooar?" }], "starting_ammo": { "hell_plasma_k": 66 }, "description":"A towering monster vaguely reminiscent of a satyr. As a member of the ruling species of its domains, it is given administrative control. Its plasma blasts are deadly.", - "flags":["SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "POISON", "BONES", "PUSH_MON", "BLEED"] + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "WARM", "BASHES", "GROUP_BASH", "POISON", "BONES", "PUSH_MON", "BLEED"] },{ "type" : "MONSTER", "id" : "mon_hell_baron", @@ -313,11 +306,10 @@ "melee_dice_sides":14, "melee_cut":5, "dodge":2, - "armor_bash":12, + "armor_bash":8, "armor_cut":12, - "armor_stab":12, "armor_acid":3, - "armor_fire":9, + "armor_fire":12, "vision_day":50, "vision_night":7, "hp":200, @@ -342,8 +334,8 @@ "no_ammo_sound" : "Rownt :(" }], "starting_ammo": { "hell_plasma_b": 66 }, - "description":"A towering monster vaguely reminiscent of a satyr. A ranking member of the ruling species of its domains, it is given command. Its plasma blasts are deadly.", - "flags":["SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "DESTROYS", "POISON", "BONES", "PUSH_MON", "BLEED"] + "description":"A towering monster vaguely reminicent of a satyr. A ranking member of the ruling species of its domains, it is given command. Its plasma blasts are deadly.", + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "PRIORITIZE_TARGETS", "WARM", "BASHES", "GROUP_BASH", "DESTROYS", "POISON", "BONES", "PUSH_MON", "BLEED"] },{ "type" : "MONSTER", "id" : "mon_mancubus", @@ -361,11 +353,10 @@ "melee_skill":3, "melee_dice":2, "melee_dice_sides":12, - "melee_cut":0, "dodge":1, - "armor_bash":10, + "armor_bash":12, "armor_cut":6, - "armor_stab":10, + "armor_stab":12, "armor_fire":17, "armor_acid":4, "vision_day":40, @@ -392,7 +383,7 @@ }], "starting_ammo" : { "hell_napalm": 122}, "description":"A corpulent, pig-faced monster; its arms have been forcibly replaced with huge flame-cannons.", - "flags":["SEES", "HEARS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "DESTROYS", "POISON", "BLEED", "NO_BREATHE", "BONES", "FAT", "PUSH_MON"] + "flags":["SEES", "HEARS", "PRIORITIZE_TARGETS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "DESTROYS", "POISON", "BLEED", "NO_BREATHE", "BONES", "FAT", "PUSH_MON"] },{ "type" : "MONSTER", "id" : "mon_cacodemon", @@ -412,7 +403,7 @@ "melee_dice_sides":15, "melee_cut":10, "dodge":3, - "armor_bash":10, + "armor_bash":8, "armor_cut":16, "armor_stab":10, "armor_acid":6, @@ -439,13 +430,13 @@ "move_cost" : 95, "targeting_cost" : 300, "range" : 21, - "description" : "As the caccodemon opens its mouth a torrent of plasma bursts forth!", + "description" :"As the cacodemon opens its mouth a torrent of plasma bursts forth!", "targeting_sound" : "SKIIIEEEE", "targeting_volume" : 30, "no_ammo_sound" : "HIiiiss?" }], "starting_ammo": { "hell_plasma_c": 122 }, - "description":"A dark red sphere with wicked teeth. Its single eye lights up as it expels plasma from its mouth.", + "description":"A dark red sphere with wicked teeth. Its single eye lights up as it expells plasma from its mouth.", "flags":["SEES", "HEARS", "SMELLS", "FLIES", "POISON", "BLEED", "BASHES", "CHITIN", "BONES", "FAT", "PUSH_MON"] },{ "type" : "MONSTER", @@ -464,16 +455,15 @@ "melee_skill":3, "melee_dice":1, "melee_dice_sides":12, - "melee_cut":0, - "dodge":2, + "dodge":1, "armor_bash":10, - "armor_cut":14, + "armor_cut":20, "armor_acid":5, - "armor_fire":10, + "armor_fire":8, "vision_day":45, "vision_night":5, - "hp":150, - "death_function":["SMOKEBURST", "NORMAL"], + "hp":140, + "death_function":["SMOKEBURST", "BROKEN"], "special_attacks":[ { "type" : "gun", @@ -493,9 +483,9 @@ "targeting_volume" : 50, "no_ammo_sound" : "-Beep-beep-beep-" }], - "starting_ammo" : { "laser_pack": 1, "hell_laser": 200 }, + "starting_ammo" : { "hell_laser": 264 }, "description":"With metal girders supporting an encased brain, this lasgun-armed robot is almost ripped directly from 80s sci-fi.", - "flags":["SEES", "HEARS", "STUMBLES", "WARM", "ELECTRONIC", "POISON", "NO_BREATHE", "PUSH_MON", "INTERIOR_AMMO"] + "flags":["SEES", "HEARS", "PATH_AVOID_DANGER_2", "PRIORITIZE_TARGETS", "STUMBLES", "WARM", "ELECTRONIC", "NO_BREATHE", "PUSH_MON", "INTERIOR_AMMO"] },{ "type" : "MONSTER", "id" : "mon_cyberdemon", @@ -545,7 +535,7 @@ }], "starting_ammo": { "cyber_rocket": 99 }, "description":"A gigantic humanoid with equally impressive machinery and bionics. Affixed to one arm is a barrel large enough for you to fit into.", - "flags":["SEES", "HEARS", "WARM", "POISON", "BLEED", "BASHES", "DESTROYS", "NO_BREATHE", "PUSH_MON", "ATTACKMON"] + "flags":["SEES", "HEARS", "PRIORITIZE_TARGETS", "WARM", "POISON", "BLEED", "BASHES", "DESTROYS", "NO_BREATHE", "PUSH_MON", "ATTACKMON"] },{ "type" : "MONSTER", "id" : "mon_doom_churl", @@ -565,8 +555,8 @@ "melee_dice_sides":6, "melee_cut":9, "dodge":3, - "armor_bash":6, - "armor_cut":6, + "armor_bash":5, + "armor_cut":5, "death_drops": { "subtype": "collection", "groups": [ @@ -576,7 +566,7 @@ "hp":65, "death_function":["NORMAL"], "description":"A tortured slave; a living survivor, beaten, starved, wearing tattered rags and wielding a crude weapon. They look hungry enough to eat anything.", - "flags":["SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "BLEED", "HUMAN", "CLIMBS", "LEATHER", "BONES"] + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "WARM", "BASHES", "GROUP_BASH", "BLEED", "HUMAN", "CLIMBS", "LEATHER", "BONES"] },{ "type" : "MONSTER", "id" : "mon_doom_slave", @@ -593,16 +583,16 @@ "speed":125, "melee_skill":4, "melee_dice":3, - "melee_dice_sides":5, + "melee_dice_sides":4, "melee_cut":3, "dodge":4, - "armor_bash":4, - "armor_cut":4, + "armor_bash":3, + "armor_cut":3, "death_drops": "default_zombie_clothes", "hp":60, "death_function":["NORMAL"], "description":"A servant of the damned. This poor soul was spared from the horrors of the demonic front line to be abused in the back. Its tongue has been cut out.", - "flags":["SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "BLEED", "HUMAN", "CLIMBS", "LEATHER", "BONES", "GUILT"] + "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_2", "WARM", "BASHES", "GROUP_BASH", "BLEED", "HUMAN", "CLIMBS", "LEATHER", "BONES", "GUILT"] },{ "type" : "MONSTER", "id" : "mon_doom_cur", @@ -620,10 +610,9 @@ "melee_skill":0, "melee_dice":0, "melee_dice_sides":0, - "melee_cut":0, "dodge":2, "armor_bash":2, - "armor_cut":2, + "armor_cut":3, "death_drops": "mon_zombie_survivor_death_drops", "hp":100, "death_function":["NORMAL"], @@ -646,10 +635,9 @@ "melee_skill":0, "melee_dice":0, "melee_dice_sides":0, - "melee_cut":0, - "dodge":1, - "armor_bash":7, - "armor_cut":7, + "dodge":0, + "armor_bash":6, + "armor_cut":6, "armor_stab":25, "armor_acid":4, "vision_day":5, @@ -688,7 +676,7 @@ "color":"ltred", "size":"MEDIUM", "material":"flesh", - "diff":0, + "diff":2, "aggression":100, "morale":100, "speed":85, @@ -697,14 +685,16 @@ "melee_dice_sides":5, "melee_cut":2, "dodge":0, - "armor_bash":3, + "armor_bash":2, "armor_cut":3, + "vision_day":35, + "vision_night":3, "death_drops": "default_zombie_clothes", "hp":50, "death_function":["NORMAL"], "special_attacks":[ - ["FEAR_PARALYZE", 10]], - "description":"All evidence indicates that this used to be a survivor, who was killed by torture and body reanimated. Its garments lack the weathered look of other zombies but are mutilated none-the-less. Although it struggles to free itself, it is held fast with spikes, nails, and chains.", + ["FEAR_PARALYZE", 25]], + "description":"All evidence indicates that this used to be a survivor, who was killed by torture and body reanimated. Its garments lack the weathered look of other zombies but are mutilated none-the-less. Although it struggles to free itself, it is held fast with spikes, nails, and chains.", "flags":["SEES", "HEARS", "SMELLS", "WARM", "IMMOBILE", "GUILT", "POISON", "REVIVES", "BONES"] },{ "type" : "MONSTER", @@ -723,7 +713,6 @@ "melee_skill":8, "melee_dice":3, "melee_dice_sides":9, - "melee_cut":0, "dodge":3, "armor_bash":15, "armor_cut":15, @@ -733,7 +722,7 @@ "death_function":["NORMAL"], "special_attacks":[["RESURRECT", 0]], "description":"A sickly yellow, elongated humanoid. With almost complete control over its own flames it attacks with pyrokinesis and breathes life into its fallen allies.", - "flags":["SEES", "HEARS", "WARM", "POISON", "NO_BREATHE", "BONES"], + "flags":["SEES", "HEARS", "PATH_AVOID_DANGER_2", "PRIORITIZE_TARGETS", "WARM", "POISON", "NO_BREATHE", "BONES"], "anger_triggers":["HURT", "PLAYER_CLOSE", "PLAYER_WEAK"] },{ "type" : "MONSTER", @@ -752,7 +741,6 @@ "melee_skill":0, "melee_dice":0, "melee_dice_sides":0, - "melee_cut":0, "dodge":0, "armor_bash":30, "armor_cut":30, @@ -762,7 +750,7 @@ "vision_night":50, "hp":300, "death_function":["JABBERWOCKY", "EXPLODE"], - "description":"A massive face cross-sectioned with large machinery; various tubes of bubbling liquid bury themselves and reemerge from pustulating wounds. Its forehead has been removed, exposing a pulsating brain mass from which sound eminates.", + "description":"A massive face cross-sectioned with large machinery; various tubes of bubbling liquid bury themselves and reemerge from pustulating wounds. Its forehead has been removed, exposing a pulsating brain mass from which sound emanates.", "flags":["SEES", "WARM", "POISON", "NO_BREATHE", "IMMOBILE", "ELECTRIC"] } ] From 7295f48bb668762ba048fd096a4f2217c020586a Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 16:36:30 -0400 Subject: [PATCH 049/110] Create pk_critter_robot.json --- data/mods/PKs_Rebalance/pk_critter_robot.json | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 data/mods/PKs_Rebalance/pk_critter_robot.json diff --git a/data/mods/PKs_Rebalance/pk_critter_robot.json b/data/mods/PKs_Rebalance/pk_critter_robot.json new file mode 100644 index 0000000000000..41eeb9289230f --- /dev/null +++ b/data/mods/PKs_Rebalance/pk_critter_robot.json @@ -0,0 +1,74 @@ +[ + { + "type" : "MONSTER", + "id" : "mon_eyebot", + "edit-mode" : "modify", + "vision_night":20 + },{ + "type" : "MONSTER", + "id" : "mon_secubot", + "edit-mode" : "modify", + "vision_night":10 + },{ + "type" : "MONSTER", + "id" : "mon_copbot", + "edit-mode" : "modify", + "vision_night":15 + },{ + "type" : "MONSTER", + "id" : "mon_tripod", + "edit-mode" : "modify", + "vision_night":30 + },{ + "type" : "MONSTER", + "id" : "mon_chickenbot", + "edit-mode" : "modify", + "vision_night":20 + },{ + "type" : "MONSTER", + "id" : "mon_tankbot", + "edit-mode" : "modify", + "vision_night":20 + },{ + "type" : "MONSTER", + "id" : "mon_turret_searchlight", + "edit-mode" : "modify", + "vision_night":50 + },{ + "type" : "MONSTER", + "id" : "mon_laserturret", + "edit-mode" : "modify", + "vision_night":10 + }, + + { + "type" : "MONSTER", + "id" : "mon_manhack_missile", + "name": "revenant rocket", + "species":"ROBOT", + "default_faction":"doom", + "symbol":",", + "color":"cyan", + "size":"TINY", + "material":"steel", + "diff":12, + "aggression":100, + "morale":100, + "speed":110, + "melee_skill":0, + "melee_dice":0, + "melee_dice_sides":0, + "dodge":0, + "armor_bash":5, + "armor_cut":5, + "vision_day":50, + "vision_night":25, + "revert_to_itype": "bot_manhack_missile", + "hp":5, + "death_function":["EXPLODE"], + "special_attacks":[["KAMIKAZE", 0], ["DISAPPEAR", 600]], + "starting_ammo": { "rocket_core": 1}, + "description":"A revenant's homing missile, working its way towards you. If only you could disable it . . .", + "flags":["SEES", "PATH_AVOID_DANGER_2", "PRIORITIZE_TARGETS", "FLIES", "NOHEAD", "ELECTRONIC", "NO_BREATHE", "INTERIOR_AMMO"] + } +] From d3e3fb61c546e1d6429d7979489b91f4acd41c0a Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 16:37:08 -0400 Subject: [PATCH 050/110] Create pk_critter_nether.json --- .../mods/PKs_Rebalance/pk_critter_nether.json | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 data/mods/PKs_Rebalance/pk_critter_nether.json diff --git a/data/mods/PKs_Rebalance/pk_critter_nether.json b/data/mods/PKs_Rebalance/pk_critter_nether.json new file mode 100644 index 0000000000000..27e7b3945b949 --- /dev/null +++ b/data/mods/PKs_Rebalance/pk_critter_nether.json @@ -0,0 +1,34 @@ +[ +{ + "type" : "MONSTER", + "id" : "mon_gracke", + "edit-mode" : "override", + "name": "gracken", + "species":"NETHER", + "default_faction":"nether", + "symbol":"h", + "color":"ltred", + "size":"MEDIUM", + "material":"flesh", + "diff":15, + "aggression":0, + "morale":50, + "speed":180, + "melee_skill":10, + "melee_dice":4, + "melee_dice_sides":4, + "melee_cut":1, + "dodge":4, + "armor_bash":2, + "armor_cut":2, + "hp":90, + "vision_day":15, + "vision_night":3, + "description":"A bizarre humanoid creature with a calculating stare. Its twitching hands move so fast they appear to be nothing but blurs.", + "flags":["SEES", "SMELLS", "HEARS", "PATH_AVOID_DANGER_2", "WARM", "NO_BREATHE", "GRABS", "BONES", "HIT_AND_RUN"], + "anger_triggers":["PLAYER_WEAK", "FIRE", "PLAYER_CLOSE"], + "fear_triggers":["MEAT", "FRIEND_DIED"], + "placate_triggers":["HURT", "SOUND"], + "//" : "http://smf.cataclysmdda.com/index.php?topic=2816.0" + } +] From 9089b20c5d0be0d39e0c14bb911979b9ff4d0921 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 16:38:48 -0400 Subject: [PATCH 051/110] Update pk_critter_blob.json Misc changes to blobs --- data/mods/PKs_Rebalance/pk_critter_blob.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_blob.json b/data/mods/PKs_Rebalance/pk_critter_blob.json index 18ffbebbcd398..71cfb0e72f426 100644 --- a/data/mods/PKs_Rebalance/pk_critter_blob.json +++ b/data/mods/PKs_Rebalance/pk_critter_blob.json @@ -8,11 +8,16 @@ "type" : "MONSTER", "id" : "mon_blob", "edit-mode" : "modify", - "special_attacks":[["FORMBLOB", 90]] + "special_attacks":[["FORMBLOB", 120]] },{ "type" : "MONSTER", "id" : "mon_blob_small", "edit-mode" : "modify", "death_function":["MELT"] + },{ + "type" : "MONSTER", + "id" : "mon_gelatin", + "edit-mode" : "modify", + "flags":["SMELLS", "HEARS", "PLASTIC", "NO_BREATHE", "NOHEAD", "NOGIB", "ABSORBS"] } -] \ No newline at end of file +] From 41c8735bcecc9231837aea41992493db1b98259d Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 16:41:02 -0400 Subject: [PATCH 052/110] Update pk_critter_doom.json --- data/mods/PKs_Rebalance/pk_critter_doom.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_doom.json b/data/mods/PKs_Rebalance/pk_critter_doom.json index 10f413d6877a9..6ca8c67cee350 100644 --- a/data/mods/PKs_Rebalance/pk_critter_doom.json +++ b/data/mods/PKs_Rebalance/pk_critter_doom.json @@ -334,7 +334,7 @@ "no_ammo_sound" : "Rownt :(" }], "starting_ammo": { "hell_plasma_b": 66 }, - "description":"A towering monster vaguely reminicent of a satyr. A ranking member of the ruling species of its domains, it is given command. Its plasma blasts are deadly.", + "description":"A towering monster vaguely reminiscent of a satyr. A ranking member of the ruling species of its domains, it is given command. Its plasma blasts are deadly.", "flags":["SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "PRIORITIZE_TARGETS", "WARM", "BASHES", "GROUP_BASH", "DESTROYS", "POISON", "BONES", "PUSH_MON", "BLEED"] },{ "type" : "MONSTER", From f03c97de10c1e608960a1b7120e3542a3c5d25ed Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 16:42:15 -0400 Subject: [PATCH 053/110] Update pk_critter_doom.json --- data/mods/PKs_Rebalance/pk_critter_doom.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_doom.json b/data/mods/PKs_Rebalance/pk_critter_doom.json index 6ca8c67cee350..5157311de3bbf 100644 --- a/data/mods/PKs_Rebalance/pk_critter_doom.json +++ b/data/mods/PKs_Rebalance/pk_critter_doom.json @@ -436,7 +436,7 @@ "no_ammo_sound" : "HIiiiss?" }], "starting_ammo": { "hell_plasma_c": 122 }, - "description":"A dark red sphere with wicked teeth. Its single eye lights up as it expells plasma from its mouth.", + "description":"A dark red sphere with wicked teeth. Its single eye lights up as it expels plasma from its mouth.", "flags":["SEES", "HEARS", "SMELLS", "FLIES", "POISON", "BLEED", "BASHES", "CHITIN", "BONES", "FAT", "PUSH_MON"] },{ "type" : "MONSTER", From 7107de9136047a96bf7e06c554a4822121eb3fc5 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 16:43:02 -0400 Subject: [PATCH 054/110] Update pk_critter_ant.json --- data/mods/PKs_Rebalance/pk_critter_ant.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_ant.json b/data/mods/PKs_Rebalance/pk_critter_ant.json index 2950b80a071f6..d0b536ede26de 100644 --- a/data/mods/PKs_Rebalance/pk_critter_ant.json +++ b/data/mods/PKs_Rebalance/pk_critter_ant.json @@ -449,7 +449,7 @@ "hp":120, "death_function":"NORMAL", "special_attacks":[["GRAB", 60], ["SHOCKSTORM", 30]], - "description":"You don't know what this thing is, but the ants treat it as one of their own. Its head looks like a maggot, completely devoid of pincers and with three beady eyes staring in different directions. While it typically travels on its four limbs, it occasionally stands upon its hind limbs to gaze about. It claws clumsily with the three digits on each limb, and rumors exist of it being capable of harnessing electricity for attack.", + "description":"You don't know what this thing is, but the ants treat it as one of their own. Its head looks like a maggot, completely devoid of pincers and with three beady eyes staring in different directions. While it typically travels on its four limbs, it occasionally stands upon its hind limbs to gaze about. It claws clumsily with the three digits on each limb, and rumors exist of it being capable of harnessing electricity for attack.", "flags":["SEES", "HEARS", "SMELLS", "CHITIN", "CLIMBS", "BASHES"], "anger_triggers":["FRIEND_ATTACKED", "FRIEND_DIED", "HURT", "PLAYER_CLOSE", "FIRE"] } From 53a0cbe5a167b1047551e92bb9e45d1adc277d86 Mon Sep 17 00:00:00 2001 From: pisskop Date: Mon, 6 Jun 2016 17:26:44 -0400 Subject: [PATCH 055/110] Update pk_critter_doom.json He aint broken in the core game yet, so he does a wicked witch for now --- data/mods/PKs_Rebalance/pk_critter_doom.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_doom.json b/data/mods/PKs_Rebalance/pk_critter_doom.json index 5157311de3bbf..c00d45c161068 100644 --- a/data/mods/PKs_Rebalance/pk_critter_doom.json +++ b/data/mods/PKs_Rebalance/pk_critter_doom.json @@ -463,7 +463,7 @@ "vision_day":45, "vision_night":5, "hp":140, - "death_function":["SMOKEBURST", "BROKEN"], + "death_function":["SMOKEBURST", "MELT"], "special_attacks":[ { "type" : "gun", From 54abf66268f15a8e8d1939dede7fb9b38a3946b0 Mon Sep 17 00:00:00 2001 From: sethsimon Date: Mon, 6 Jun 2016 21:34:34 -0400 Subject: [PATCH 056/110] Mop up liquids in vehicles Currently, it's impossible to remove a liquid from a cargo part without removing and re-installing it. This commit modifies map::mop_spills to add this feature. --- src/map.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/map.cpp b/src/map.cpp index 996403404e6a4..a40d5a8368abc 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -3129,6 +3129,15 @@ bool map::mop_spills( const tripoint &p ) veh->parts[elem].blood = 0; retval = true; } + //remove any liquids that somehow didn't fall through to the ground + vehicle_stack here = veh->get_items( elem ); + auto new_end = std::remove_if( here.begin(), here.end(), []( const item & it ) { + return it.made_of( LIQUID ); + } ); + retval |= ( new_end != here.end() ); + while( new_end != here.end() ) { + new_end = here.erase( new_end ); + } } } // if veh != 0 return retval; From 2b8ad7d8f62464c7f2fd1274a211e8153b55ea0d Mon Sep 17 00:00:00 2001 From: BevapDin Date: Tue, 7 Jun 2016 13:15:44 +0200 Subject: [PATCH 057/110] Automatically add starting components to the start vehicle construction. The vehicle parts already have a flag that indicates they can be create as initial part. The construction can use this flag to decide what items can be used. This allows mods to simply add new frames, give them the INITIAL_PART flag and thereby allow players to start vehicles with this new item. --- data/json/construction.json | 12 +----------- doc/JSON_FLAGS.md | 2 +- src/construction.cpp | 17 +++++++++++++++++ src/construction.h | 1 + src/init.cpp | 1 + src/requirements.cpp | 5 +++++ src/requirements.h | 1 + 7 files changed, 27 insertions(+), 12 deletions(-) diff --git a/data/json/construction.json b/data/json/construction.json index 3609515af0a10..67741682727a7 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -2083,17 +2083,7 @@ "category" : "OTHER", "difficulty" : 0, "time" : 10, - "components" : [ - [ - [ "frame", 1 ], - [ "hdframe", 1 ], - [ "frame_wood", 1 ], - [ "xlframe", 1 ], - [ "frame_wood_light", 1 ], - [ "foldwoodframe", 1 ], - [ "foldframe", 1 ] - ] - ], + "//": "no components required, they are filled in at runtime based on the vehicle parts that can be used to start a vehicle", "pre_special" : "check_empty", "post_special" : "done_vehicle" },{ diff --git a/doc/JSON_FLAGS.md b/doc/JSON_FLAGS.md index 7b2033e2b81cc..4445d3d2152da 100755 --- a/doc/JSON_FLAGS.md +++ b/doc/JSON_FLAGS.md @@ -480,7 +480,7 @@ These branches are also the valid entries for the categories of `dreams` in `dre - ```RECHARGE``` Recharge items with the same flag. ( Currently only the rechargeable battery mod. ) - ```UNMOUNT_ON_MOVE``` Dismount this part when the vehicle moves. Doesn't drop the part, unless you give it special handling. - ```POWER_TRANSFER``` Transmits power to and from an attached thingy (probably a vehicle). -- ```INITIAL_PART``` When starting a new vehicle via the construction menu, this vehicle part will be the initial part of the vehicle (if the used item matches the item required for this part). +- ```INITIAL_PART``` When starting a new vehicle via the construction menu, this vehicle part will be the initial part of the vehicle (if the used item matches the item required for this part). The items of parts with this flag are automatically added as component to the vehicle start construction. - ```NO_JACK``` - ```TOOL_NONE``` Can be removed/installed without any tools - ```TOOL_WRENCH``` Attached with bolts, can be removed/installed with a wrench diff --git a/src/construction.cpp b/src/construction.cpp index a5ec55aa297b0..ec66406ceea25 100644 --- a/src/construction.cpp +++ b/src/construction.cpp @@ -1500,3 +1500,20 @@ std::vector construction::get_folded_time_string( int width ) const std::vector folded_time = foldstring( time_text, width ); return folded_time; } + +void finalize_constructions() +{ + std::vector frame_items; + for( auto &vp : vpart_info::get_all() ) { + if( !vp->has_flag( "INITIAL_PART" ) ) { + continue; + } + frame_items.push_back( item_comp( vp->item, 1 ) ); + } + + for( construction &con : constructions ) { + if( con.post_special == &construct::done_vehicle ) { + con.requirements.get_components().push_back( frame_items ); + } + } +} diff --git a/src/construction.h b/src/construction.h index 939bcc40f13ad..e65b2a7dcde02 100644 --- a/src/construction.h +++ b/src/construction.h @@ -55,5 +55,6 @@ void reset_constructions(); void construction_menu(); void complete_construction(); void check_constructions(); +void finalize_constructions(); #endif diff --git a/src/init.cpp b/src/init.cpp index 98112c09be4e7..262567edddd80 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -390,6 +390,7 @@ void DynamicDataLoader::finalize_loaded_data() monfactions::finalize(); finalize_recipes(); finialize_martial_arts(); + finalize_constructions(); check_consistency(); } diff --git a/src/requirements.cpp b/src/requirements.cpp index 624452ea403ac..c7cfe413b08dc 100644 --- a/src/requirements.cpp +++ b/src/requirements.cpp @@ -579,6 +579,11 @@ const requirement_data::alter_item_comp_vector &requirement_data::get_components return components; } +requirement_data::alter_item_comp_vector &requirement_data::get_components() +{ + return components; +} + const requirement_data requirement_data::disassembly_requirements() const { // TODO: diff --git a/src/requirements.h b/src/requirements.h index d66b003b46092..8efee895eb5d3 100644 --- a/src/requirements.h +++ b/src/requirements.h @@ -163,6 +163,7 @@ struct requirement_data { const alter_tool_comp_vector &get_tools() const; const alter_quali_req_vector &get_qualities() const; const alter_item_comp_vector &get_components() const; + alter_item_comp_vector &get_components(); bool can_make_with_inventory( const inventory &crafting_inv, int batch = 1 ) const; From 2ab99d4b902a1c59d371c4cf9391d213adbcd326 Mon Sep 17 00:00:00 2001 From: pisskop Date: Tue, 7 Jun 2016 10:05:20 -0400 Subject: [PATCH 058/110] Update pk_overmap_terrain.json --- .../PKs_Rebalance/pk_overmap_terrain.json | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/data/mods/PKs_Rebalance/pk_overmap_terrain.json b/data/mods/PKs_Rebalance/pk_overmap_terrain.json index 87f406fb6182d..f8804fd510e62 100644 --- a/data/mods/PKs_Rebalance/pk_overmap_terrain.json +++ b/data/mods/PKs_Rebalance/pk_overmap_terrain.json @@ -80,5 +80,32 @@ "see_cost" : 5, "extras" : "field", "mondensity" : 5 + },{ + "type": "overmap_terrain", + "id": "trapdoor_pit", + "name": "field", + "sym": 46, + "color": "brown", + "see_cost": 2, + "extras": "field", + "mondensity": 5 + },{ + "type": "overmap_terrain", + "id": "trapdoor_pit_loner", + "name": "field", + "sym": 46, + "color": "brown", + "see_cost": 2, + "extras": "field", + "mondensity": 3 + },{ + "type": "overmap_terrain", + "id": "trapdoor_pit_b1", + "name": "spider lairs", + "sym": 79, + "color": "ltgrey", + "see_cost": 2, + "extras": "field", + "mondensity": 3 } ] From 6bc17b4123658aaace01238922f3dc87348a5803 Mon Sep 17 00:00:00 2001 From: pisskop Date: Tue, 7 Jun 2016 10:07:29 -0400 Subject: [PATCH 059/110] Update pk_overmap.json --- data/mods/PKs_Rebalance/pk_overmap.json | 59 ++++++++++++++++++++----- 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_overmap.json b/data/mods/PKs_Rebalance/pk_overmap.json index 606694831a740..6e0452c506da4 100644 --- a/data/mods/PKs_Rebalance/pk_overmap.json +++ b/data/mods/PKs_Rebalance/pk_overmap.json @@ -105,20 +105,59 @@ "rotate" : false, "spawns" : { "group" : "GROUP_ANT", "population":[1500,2500], "radius":[15,40] } },{ - "type" : "overmap_special", - "id" : "LMOE Shelter", - "overmaps" : + "type": "overmap_special", + "id": "LMOE Shelter", + "overmaps": [ { "point":[0,0,0], "overmap": "lmoe"}, { "point":[0,0,-1], "overmap": "lmoe_under"} ], - "locations" : [ "wilderness" ], - "city_distance" : [20, -1], - "city_sizes" : [4, 12], - "occurrences" : [0, 3], - "rotate" : false, - "spawns" : { "group" : "GROUP_MAYBE_ZOMBIE", "population":[0,20], "radius":[1,5] }, - "flags" : [ "CLASSIC" ] + "locations": [ "wilderness" ], + "city_distance": [20, -1], + "city_sizes": [4, 12], + "occurrences": [0, 3], + "rotate": true, + "spawns": { "group": "GROUP_MAYBE_ZOMBIE", "population":[1,20], "radius":[3,6] }, + "flags": [ "CLASSIC" ] + },{ + "type": "overmap_special", + "id": "Spider Pit", + "overmaps": [ + { "point":[0,0,0], "overmap": "spider_pit"}, + { "point":[0,0,-1], "overmap": "spider_pit_under"} + ], + "locations": [ "forest" ], + "city_distance": [0, -1], + "city_sizes": [4, 12], + "occurrences": [200, 500], + "rotate": true, + "spawns": { "group": "GROUP_SPIDER", "population":[20,50], "radius":[3,6] } + },{ + "type": "overmap_special", + "id": "trapdoor_spider_pit", + "overmaps": [ + { "point":[0,0,0], "overmap": "trapdoor_pit"}, + { "point":[0,0,-1], "overmap": "trapdoor_pit_b1"} + ], + "locations": [ "field" ], + "city_distance": [2, -1], + "city_sizes": [4, 16], + "occurrences": [100, 250], + "rotate": true, + "spawns": { "group": "GROUP_SPIDER_TRAP", "population":[15,40], "radius":[3,6] } + },{ + "type": "overmap_special", + "id": "trapdoor_spider_pit_loner", + "overmaps": [ + { "point":[0,0,0], "overmap": "trapdoor_pit_loner"}, + { "point":[0,0,-1], "overmap": "trapdoor_pit_b1"} + ], + "locations": [ "field" ], + "city_distance": [3, -1], + "city_sizes": [4, 16], + "occurrences": [0, 150], + "rotate": true, + "spawns": { "group": "GROUP_SPIDER_TRAP_LONER", "population":[10,25], "radius":[3,6] } },{ "type" : "overmap_special", "id" : "hell_castle", From 08edfaf47814d9326885b7dc5c3efea2b1c1ce92 Mon Sep 17 00:00:00 2001 From: pisskop Date: Tue, 7 Jun 2016 10:24:39 -0400 Subject: [PATCH 060/110] Update pk_overmap.json Lowered required/max number of spider pits --- data/mods/PKs_Rebalance/pk_overmap.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_overmap.json b/data/mods/PKs_Rebalance/pk_overmap.json index 6e0452c506da4..031416badcd6a 100644 --- a/data/mods/PKs_Rebalance/pk_overmap.json +++ b/data/mods/PKs_Rebalance/pk_overmap.json @@ -129,7 +129,7 @@ "locations": [ "forest" ], "city_distance": [0, -1], "city_sizes": [4, 12], - "occurrences": [200, 500], + "occurrences": [150, 450], "rotate": true, "spawns": { "group": "GROUP_SPIDER", "population":[20,50], "radius":[3,6] } },{ @@ -142,7 +142,7 @@ "locations": [ "field" ], "city_distance": [2, -1], "city_sizes": [4, 16], - "occurrences": [100, 250], + "occurrences": [75, 225], "rotate": true, "spawns": { "group": "GROUP_SPIDER_TRAP", "population":[15,40], "radius":[3,6] } },{ @@ -155,7 +155,7 @@ "locations": [ "field" ], "city_distance": [3, -1], "city_sizes": [4, 16], - "occurrences": [0, 150], + "occurrences": [50, 150], "rotate": true, "spawns": { "group": "GROUP_SPIDER_TRAP_LONER", "population":[10,25], "radius":[3,6] } },{ From 0f7861ecfad8eaef70b776c8f67f725cde0c4652 Mon Sep 17 00:00:00 2001 From: pisskop Date: Tue, 7 Jun 2016 11:26:41 -0400 Subject: [PATCH 061/110] Update pk_itemlist_new.json Adds fighter groupitems; just more stingers. --- data/mods/PKs_Rebalance/pk_itemlist_new.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/data/mods/PKs_Rebalance/pk_itemlist_new.json b/data/mods/PKs_Rebalance/pk_itemlist_new.json index b0cfd4885bfe2..a4c55837f83eb 100644 --- a/data/mods/PKs_Rebalance/pk_itemlist_new.json +++ b/data/mods/PKs_Rebalance/pk_itemlist_new.json @@ -294,5 +294,11 @@ { "group": "doom_corpse", "damage": [ 1, 4 ] }, { "group": "knifeblock", "damage": [ 1, 3], "prob": 40, "count": [1, 2] } ] - } + },{ + "type": "item_group", + "id": "fungal_fighter_sting", + "items":[ + { "item": "fighter_sting", "damage": [0, 1], "count": [ 1, 6 ] } + ] + } ] From 6e5e4feedf6d6d8e48da6dc7f891c3b4d8783880 Mon Sep 17 00:00:00 2001 From: codemime Date: Tue, 7 Jun 2016 18:56:15 +0300 Subject: [PATCH 062/110] Support aliases for monsters --- data/json/monsters.json | 2 ++ src/monstergenerator.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) mode change 100755 => 100644 data/json/monsters.json diff --git a/data/json/monsters.json b/data/json/monsters.json old mode 100755 new mode 100644 index b76d1db0d2e7c..d8e339ed6539e --- a/data/json/monsters.json +++ b/data/json/monsters.json @@ -2194,6 +2194,7 @@ },{ "type" : "MONSTER", "id" : "mon_zombie_dog", + "alias" : "mon_zombie_fast", "name": "zombie dog", "species":"ZOMBIE", "default_faction":"zombie", @@ -3643,6 +3644,7 @@ },{ "type" : "MONSTER", "id" : "mon_fungaloid", + "alias" : "mon_fungaloid_dormant", "name": "fungaloid", "species":"FUNGUS", "default_faction":"fungus", diff --git a/src/monstergenerator.cpp b/src/monstergenerator.cpp index 327143291dde3..beadfd8831be5 100644 --- a/src/monstergenerator.cpp +++ b/src/monstergenerator.cpp @@ -74,7 +74,7 @@ bool string_id::is_valid() const } MonsterGenerator::MonsterGenerator() -: mon_templates( new generic_factory( "monster type" ) ) +: mon_templates( new generic_factory( "monster type", "id", "alias" ) ) , mon_species( new generic_factory( "species" ) ) { mon_templates->insert( mtype() ); From d8cd50679f3f619d2d93259efb16bbc3716132e7 Mon Sep 17 00:00:00 2001 From: codemime Date: Tue, 7 Jun 2016 19:00:55 +0300 Subject: [PATCH 063/110] Delete hardcoded aliases --- src/monstergenerator.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/monstergenerator.cpp b/src/monstergenerator.cpp index beadfd8831be5..671655b886ace 100644 --- a/src/monstergenerator.cpp +++ b/src/monstergenerator.cpp @@ -21,8 +21,6 @@ #include const mtype_id mon_generator( "mon_generator" ); -const mtype_id mon_zombie_dog( "mon_zombie_dog" ); -const mtype_id mon_fungaloid( "mon_fungaloid" ); template<> const mtype_id string_id::NULL_ID( "mon_null" ); @@ -37,15 +35,6 @@ const mtype& string_id::obj() const return factory.obj( *this ); } - // second most likely are outdated ids from old saves, this compares against strings, not - // mtype_ids because the old ids are not valid ids at all. - if( str() == "mon_zombie_fast" ) { - return mon_zombie_dog.obj(); - } - if( str() == "mon_fungaloid_dormant" ) { - return mon_fungaloid.obj(); - } - // this is most unlikely and therefor checked last. debugmsg( "Could not find monster with type %s", c_str() ); return factory.obj( mtype_id::NULL_ID ); From 8030bdbbf51e7a9850d34f9b2d8b03d855c6edbf Mon Sep 17 00:00:00 2001 From: codemime Date: Tue, 7 Jun 2016 19:04:59 +0300 Subject: [PATCH 064/110] Simplify --- src/monstergenerator.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/monstergenerator.cpp b/src/monstergenerator.cpp index 671655b886ace..ceb4c24e7cb44 100644 --- a/src/monstergenerator.cpp +++ b/src/monstergenerator.cpp @@ -28,16 +28,7 @@ const mtype_id string_id::NULL_ID( "mon_null" ); template<> const mtype& string_id::obj() const { - auto &factory = *MonsterGenerator::generator().mon_templates; - - // first do the look-up as it is most likely to succeed - if( factory.is_valid( *this ) ) { - return factory.obj( *this ); - } - - // this is most unlikely and therefor checked last. - debugmsg( "Could not find monster with type %s", c_str() ); - return factory.obj( mtype_id::NULL_ID ); + return MonsterGenerator::generator().mon_templates->obj( *this ); } template<> @@ -52,8 +43,7 @@ const species_id string_id::NULL_ID( "spec_null" ); template<> const species_type& string_id::obj() const { - auto &factory = *MonsterGenerator::generator().mon_species; - return factory.obj( *this ); + return MonsterGenerator::generator().mon_species->obj( *this ); } template<> From 6b88d200499665518f19e175f6c9415c36bf737e Mon Sep 17 00:00:00 2001 From: Christian Buskirk Date: Tue, 7 Jun 2016 12:35:40 -0700 Subject: [PATCH 065/110] Fix/streamline bleed effect removal --- src/bionics.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/bionics.cpp b/src/bionics.cpp index 93267eccb36f0..62fbfe78ca9b2 100644 --- a/src/bionics.cpp +++ b/src/bionics.cpp @@ -728,8 +728,7 @@ void player::process_bionic( int b ) } } for( int i = 0; i < num_bp; i++ ) { - if( power_level >= 2 && has_effect( effect_bleed, ( body_part )i ) ) { - remove_effect( effect_bleed ); + if( power_level >= 2 && remove_effect( effect_bleed, ( body_part )i ) ) { charge_power( -2 ); } } From 8b91e3d48fdff33c98a42427fdba8fd7e3ae22b7 Mon Sep 17 00:00:00 2001 From: Karol Sobo Date: Tue, 7 Jun 2016 23:15:06 +0200 Subject: [PATCH 066/110] Tools_New_Line --- data/json/recipes/recipe_deconstruction.json | 24 +++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index d1dd0741d6aea..ec36d74f39575 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -1138,7 +1138,8 @@ "qualities" : [ {"id":"SCREW","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} - ], "tools": [ + ], + "tools": [ [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ], [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ], [ "welder_crude", 75 ] ] ], @@ -1182,7 +1183,8 @@ "qualities" : [ {"id":"SCREW","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} - ], "tools": [ + ], + "tools": [ [ [ "soldering_iron", 10 ], [ "toolset", 10 ] ], [ [ "oxy_torch", 20 ], [ "welder", 100 ], [ "toolset", 150 ], [ "welder_crude", 150 ] ] ], @@ -1209,7 +1211,8 @@ {"id":"SCREW","level":1,"amount":1}, {"id":"WRENCH","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} - ], "tools": [ + ], + "tools": [ [ [ "soldering_iron", 30 ], [ "toolset", 30 ] ], [ [ "oxy_torch", 40 ], [ "welder", 200 ], [ "toolset", 300 ], [ "welder_crude", 300 ] ] ], "components": [ @@ -1280,7 +1283,8 @@ {"id":"SCREW","level":1,"amount":1}, {"id":"WRENCH","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} - ], "tools": [ + ], + "tools": [ [ [ "soldering_iron", 40 ], [ "toolset", 40 ] ], [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "toolset", 45 ], [ "welder_crude", 45 ] ] ], "components": [ @@ -1304,7 +1308,8 @@ {"id":"SCREW","level":1,"amount":1}, {"id":"WRENCH","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} - ], "tools": [ + ], + "tools": [ [ [ "soldering_iron", 40 ], [ "toolset", 40 ] ], [ [ "oxy_torch", 6 ], [ "welder", 30 ], [ "toolset", 45 ], [ "welder_crude", 45 ] ] ], "components": [ @@ -1327,7 +1332,8 @@ {"id":"SCREW","level":1,"amount":1}, {"id":"WRENCH","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} - ], "tools": [ + ], + "tools": [ [ [ "soldering_iron", 50 ], [ "toolset", 50 ] ], [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ], [ "welder_crude", 75 ] ] ], "components": [ @@ -1523,7 +1529,8 @@ {"id":"SAW_M","level":1,"amount":1}, {"id":"SCREW","level":1,"amount":1}, {"id":"WRENCH","level":1,"amount":1} - ], "tools": [ + ], + "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] @@ -1564,7 +1571,8 @@ {"id":"SAW_M","level":1,"amount":1}, {"id":"SCREW","level":1,"amount":1}, {"id":"WRENCH","level":1,"amount":1} - ], "tools": [ + ], + "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] From a46029401f18f22872b2854a8fa4fa5b20a42d32 Mon Sep 17 00:00:00 2001 From: Angela Graves Date: Wed, 8 Jun 2016 01:21:19 -0500 Subject: [PATCH 067/110] Warmth fix for lowtop shoes. They're meant for warm weather. --- data/json/items/armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor.json b/data/json/items/armor.json index bdf8c7f0da355..7e324d6ee90ae 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -2272,7 +2272,7 @@ "price" : 1500, "material" : ["cotton", "plastic"], "volume" : 3, - "warmth" : 15, + "warmth" : 5, "encumbrance" : 0, "flags" : ["VARSIZE","WATER_FRIENDLY"], "coverage" : 80, From 73e8613298d887a698f719571160a52b8a1d32b6 Mon Sep 17 00:00:00 2001 From: BevapDin Date: Tue, 7 Jun 2016 18:58:43 +0200 Subject: [PATCH 068/110] Use std::array instead of native array --- src/game.cpp | 5 +++-- src/map.cpp | 4 ++-- src/map.h | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 7e8eb1da5a9f5..53f390a08b076 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -3376,8 +3376,9 @@ void game::update_scent() int squares_used_y[SEEY * MAPSIZE][SEEX * MAPSIZE]; //intermediate variable // these are for caching flag lookups - bool blocks_scent[SEEX * MAPSIZE][SEEY * MAPSIZE]; // currently only TFLAG_WALL blocks scent - bool reduces_scent[SEEX * MAPSIZE][SEEY * MAPSIZE]; + std::array, SEEY * MAPSIZE> blocks_scent; // currently only TFLAG_WALL blocks scent + std::array, SEEY * MAPSIZE> reduces_scent; + // for loop constants diff --git a/src/map.cpp b/src/map.cpp index 3d381fa76598a..dc98ed09e65b7 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -8175,8 +8175,8 @@ template } } -void map::scent_blockers( bool (&blocks_scent)[SEEX * MAPSIZE][SEEY * MAPSIZE], - bool (&reduces_scent)[SEEX * MAPSIZE][SEEY * MAPSIZE], +void map::scent_blockers( std::array, SEEY * MAPSIZE> &blocks_scent, + std::array, SEEY * MAPSIZE> &reduces_scent, const int minx, const int miny, const int maxx, const int maxy ) { auto reduce = TFLAG_REDUCE_SCENT; diff --git a/src/map.h b/src/map.h index 481c1648dc36f..168f635e0061e 100644 --- a/src/map.h +++ b/src/map.h @@ -997,8 +997,8 @@ void add_corpse( const tripoint &p ); * Build the map of scent-resistant tiles. * Should be way faster than if done in `game.cpp` using public map functions. */ - void scent_blockers( bool (&blocks_scent)[SEEX * MAPSIZE][SEEY * MAPSIZE], - bool (&reduces_scent)[SEEX * MAPSIZE][SEEY * MAPSIZE], + void scent_blockers( std::array, SEEY * MAPSIZE> &blocks_scent, + std::array, SEEY * MAPSIZE> &reduces_scent, int minx, int miny, int maxx, int maxy ); // Computers From 94b897bc61aa03ed478cfdbe03727962b2dea540 Mon Sep 17 00:00:00 2001 From: Cyrano7 Date: Tue, 7 Jun 2016 23:59:13 -0700 Subject: [PATCH 069/110] json data spaces --- data/json/effects.json | 2 +- data/json/furniture.json | 2 +- data/json/items/ammo/545x39.json | 1 - data/json/items/ammo/5x50.json | 4 +- data/json/items/ammo/9x18.json | 6 +- data/json/items/ammo/metal_rail.json | 4 +- data/json/items/comestibles/mutagen.json | 2 +- data/json/items/comestibles/seed.json | 4 +- data/json/items/magazine/762x25.json | 1 - data/json/mapgen/cemetery_4square.json | 9 ++- data/json/recipes/recipe_deconstruction.json | 74 ++++++++++---------- data/json/recipes/recipe_food.json | 2 +- 12 files changed, 54 insertions(+), 57 deletions(-) diff --git a/data/json/effects.json b/data/json/effects.json index 562313ad18a21..39b1ea65b0ff4 100644 --- a/data/json/effects.json +++ b/data/json/effects.json @@ -1560,7 +1560,7 @@ "desc": [ "A lack of vitamin A in your diet will progressively worsen your vision." ], "apply_message": "You beging struggling to make out the finer details.", "remove_message": "Your normal visual accuity returns.", - "decay_messages": [ + "decay_messages": [ [ "Your vitamin A deficiency is nearly resolved.", "good" ], [ "Your vision improves as your Vitamin A deficiency improves.", "good" ] ], diff --git a/data/json/furniture.json b/data/json/furniture.json index 0eb711c7d899e..6356f22ba210d 100644 --- a/data/json/furniture.json +++ b/data/json/furniture.json @@ -1124,7 +1124,7 @@ "bgcolor": "brown", "move_cost_mod": -1, "required_str": 14, - "flags": ["TRANSPARENT", "CONTAINER", "SEALED", "ALLOW_FIELD_EFFECT", "FLAMMABLE", "PLACE_ITEM", + "flags": ["TRANSPARENT", "CONTAINER", "SEALED", "ALLOW_FIELD_EFFECT", "FLAMMABLE", "PLACE_ITEM", "ORGANIC", "MOUNTABLE", "SHORT"], "deconstruct": { "items": [ diff --git a/data/json/items/ammo/545x39.json b/data/json/items/ammo/545x39.json index 45670e410964c..6470a34cc5503 100644 --- a/data/json/items/ammo/545x39.json +++ b/data/json/items/ammo/545x39.json @@ -23,7 +23,6 @@ "effects": [ "COOKOFF" ] }, { - "id": "545_ap", "copy-from": "545", "type": "AMMO", diff --git a/data/json/items/ammo/5x50.json b/data/json/items/ammo/5x50.json index adb4384a4cfbb..3b3ebf8d280a8 100644 --- a/data/json/items/ammo/5x50.json +++ b/data/json/items/ammo/5x50.json @@ -1,5 +1,5 @@ [ - { + { "id": "5x50dart", "type": "AMMO", "name": "RA110 5x50mm flechette", @@ -21,7 +21,7 @@ "recoil": 60, "effects": ["COOKOFF", "NEVER_MISFIRES"] }, - { + { "id": "5x50heavy", "copy-from": "5x50dart", "type": "AMMO", diff --git a/data/json/items/ammo/9x18.json b/data/json/items/ammo/9x18.json index f2a418ad74682..34a3dce2c4f59 100644 --- a/data/json/items/ammo/9x18.json +++ b/data/json/items/ammo/9x18.json @@ -1,5 +1,5 @@ [ - { + { "id": "9x18mm", "type": "AMMO", "name": "9x18mm 57-N-181S", @@ -22,7 +22,7 @@ "recoil": 185, "effects": [ "COOKOFF" ] }, - { + { "id": "9x18mmP2", "copy-from": "9x18mm", "type": "AMMO", @@ -38,7 +38,7 @@ "recoil": 30 } }, - { + { "id": "9x18mmfmj", "copy-from": "9x18mm", "type": "AMMO", diff --git a/data/json/items/ammo/metal_rail.json b/data/json/items/ammo/metal_rail.json index 49d8b95940a2a..d1cb5d13da2c2 100644 --- a/data/json/items/ammo/metal_rail.json +++ b/data/json/items/ammo/metal_rail.json @@ -1,6 +1,6 @@ [ - { + { "type": "AMMO", "id": "rebar_rail", "name": "rebar rail", @@ -23,7 +23,7 @@ "recoil": 300, "effects": [ "RECYCLED" ] }, - { + { "id": "steel_rail", "copy-from": "rebar_rail", "type": "AMMO", diff --git a/data/json/items/comestibles/mutagen.json b/data/json/items/comestibles/mutagen.json index 24316229e22c8..64d23615ed373 100644 --- a/data/json/items/comestibles/mutagen.json +++ b/data/json/items/comestibles/mutagen.json @@ -25,7 +25,7 @@ "type" : "COMESTIBLE", "name" : "abstract mutagen flavor", "addiction_potential" : 2 - }, + }, { "id" : "mutagen_alpha", "copy-from" : "mutagen_flavor", diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index bdc6d423eb5b3..467907b98f9f5 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -14,7 +14,7 @@ "symbol": ".", "color": "brown" }, - { + { "id": "seed_blackberries", "copy-from": "seed", "type": "COMESTIBLE", @@ -75,7 +75,7 @@ "grow": 120 } }, - { + { "id": "seed_raspberries", "copy-from": "seed", "type": "COMESTIBLE", diff --git a/data/json/items/magazine/762x25.json b/data/json/items/magazine/762x25.json index 8dcfdb4b16cba..fad1da02fd1e2 100644 --- a/data/json/items/magazine/762x25.json +++ b/data/json/items/magazine/762x25.json @@ -1,5 +1,4 @@ [ - { "id": "ppshmag", "type": "MAGAZINE", diff --git a/data/json/mapgen/cemetery_4square.json b/data/json/mapgen/cemetery_4square.json index f058e1aa2433c..89fa29cb55d0b 100644 --- a/data/json/mapgen/cemetery_4square.json +++ b/data/json/mapgen/cemetery_4square.json @@ -40,7 +40,6 @@ ["cigar_butt", 10] ] }, - { "type": "mapgen", "om_terrain": [ @@ -116,7 +115,7 @@ "8": "f_shackle", "P": "f_sign" }, - "place_items": [ + "place_items": [ { "item": "grave_memories", "chance": 45, "x": [ 5, 11 ], "y": [ 3, 21], "repeat": [ 1, 2 ] }, { "item": "grave_memories", "chance": 45, "x": [ 15, 21 ], "y": [ 3, 21], "repeat": [ 1, 2 ] } ] @@ -196,7 +195,7 @@ "8": "f_shackle", "P": "f_sign" }, - "place_items": [ + "place_items": [ { "item": "grave_memories", "chance": 45, "x": [ 2, 8 ], "y": [ 3, 21], "repeat": [ 1, 2 ] }, { "item": "grave_memories", "chance": 45, "x": [ 12, 18 ], "y": [ 3, 21], "repeat": [ 1, 2 ] } ] @@ -281,7 +280,7 @@ "P": "Closed at sunset.", "p": "Maintained by the the church." }, - "place_items": [ + "place_items": [ { "item": "trash", "chance": 20, "x": [ 2, 21 ], "y": [ 7, 14 ], "repeat": [ 1, 2 ] } ], "place_loot" : [ @@ -364,7 +363,7 @@ "8": "f_shackle", "P": "f_sign" }, - "place_items": [ + "place_items": [ { "item": "church", "chance": 85, "x": [14, 18], "y": [ 5, 14] }, { "item": "church", "chance": 85, "x": [ 11, 12 ], "y": [ 5, 6 ] }, { "item": "jackets", "chance": 95, "x": [12], "y": [14] } diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 8e4a98cf208b8..e1b8404792264 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -281,7 +281,7 @@ "difficulty": 0, "time": 500, "reversible": true, - "qualities": [ { "id": "HAMMER","level": 1 } ], + "qualities": [ { "id": "HAMMER","level": 1 } ], "components": [ [ [ "gold_small", 50 ] ] ] }, { @@ -587,7 +587,7 @@ [ [ "metal_tank_little", 1 ] ], [ [ "pipe", 3 ] ] ] - }, + }, { "result": "lighter", "type": "recipe", @@ -601,7 +601,7 @@ [ ["pilot_light", 1] ], [ ["plastic_chunk", 1] ] ] - }, + }, { "result": "ref_lighter", "type": "recipe", @@ -615,7 +615,7 @@ [ ["pilot_light", 1] ], [ ["scrap", 1] ] ] - }, + }, { "result": "tshirt", "type": "recipe", @@ -628,7 +628,7 @@ "reversible": true, "flags": ["BLIND_HARD"], "components": [ [ [ "rag", 5 ] ] ] - }, + }, { "result": "tank_top", "type": "recipe", @@ -641,7 +641,7 @@ "reversible": true, "flags": ["BLIND_HARD"], "components": [ [ [ "rag", 4 ] ] ] - }, + }, { "result": "boots_steel", "type": "recipe", @@ -657,7 +657,7 @@ [ [ "leather", 8 ] ], [ [ "scrap", 2 ] ] ] - }, + }, { "result": "lightstrip_dead", "type": "recipe", @@ -673,7 +673,7 @@ [ [ "amplifier", 1 ] ], [ [ "e_scrap", 1 ] ] ] - }, + }, { "result": "bio_recycler", "type": "recipe", @@ -688,7 +688,7 @@ "qualities": [ {"id": "SCREW","level": 1 } ], "tools": [ [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ] ], "components": [ [ [ "burnt_out_bionic", 1 ] ] ] - }, + }, { "result": "bio_digestion", "type": "recipe", @@ -703,7 +703,7 @@ "qualities": [ {"id": "SCREW","level": 1 } ], "tools": [ [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ] ], "components": [ [ [ "burnt_out_bionic", 1 ] ] ] - }, + }, { "result": "bio_face_mask", "type": "recipe", @@ -718,7 +718,7 @@ "qualities": [ {"id": "SCREW","level": 1 } ], "tools": [ [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ] ], "components": [ [ [ "burnt_out_bionic", 1 ] ] ] - }, + }, { "result": "bio_nanobots", "type": "recipe", @@ -733,7 +733,7 @@ "qualities": [ {"id": "SCREW","level": 1 } ], "tools": [ [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ] ], "components": [ [ [ "burnt_out_bionic", 1 ] ] ] - }, + }, { "result": "bio_ground_sonar", "type": "recipe", @@ -748,7 +748,7 @@ "qualities": [ {"id": "SCREW","level": 1 } ], "tools": [ [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ] ], "components": [ [ [ "burnt_out_bionic", 1 ] ] ] - }, + }, { "result": "bio_metabolics", "type": "recipe", @@ -763,7 +763,7 @@ "qualities": [ {"id": "SCREW","level": 1 } ], "tools": [ [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ] ], "components": [ [ [ "burnt_out_bionic", 1 ] ] ] - }, + }, { "result": "bio_blood_filter", "type": "recipe", @@ -778,7 +778,7 @@ "qualities": [ {"id": "SCREW","level": 1 } ], "tools": [ [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ] ], "components": [ [ [ "burnt_out_bionic", 1 ] ] ] - }, + }, { "result": "bindle", "type": "recipe", @@ -793,7 +793,7 @@ [ [ "rag", 4 ] ], [ [ "stick", 1 ] ] ] - }, + }, { "result": "makeshift_sling", "type": "recipe", @@ -805,7 +805,7 @@ "reversible": true, "flags": ["BLIND_HARD"], "components": [ [ [ "sheet", 1 ] ] ] - }, + }, { "result": "battletorch_done", "type": "recipe", @@ -819,7 +819,7 @@ [ [ "bat", 1 ] ], [ [ "nomex", 5 ] ] ] - }, + }, { "result": "pipe", "type": "recipe", @@ -832,7 +832,7 @@ "reversible": true, "qualities":[ {"id": "SAW_M","level": 1 } ], "components": [ [ [ "scrap", 7 ] ] ] - }, + }, { "result": "makeshift_crowbar", "type": "recipe", @@ -847,7 +847,7 @@ [ [ "scrap", 3 ] ], [ [ "steel_chunk", 1] ] ] - }, + }, { "result": "file", "type": "recipe", @@ -858,7 +858,7 @@ "reversible": true, "flags": ["BLIND_EASY"], "components": [ [ [ "paper", 3 ] ] ] - }, + }, { "result": "box_cigarette", "type": "recipe", @@ -869,7 +869,7 @@ "reversible": true, "flags": ["BLIND_EASY"], "components": [ [ [ "paper", 1 ] ] ] - }, + }, { "result": "flyer", "type": "recipe", @@ -880,7 +880,7 @@ "reversible": true, "flags": ["BLIND_EASY"], "components": [ [ [ "paper", 1 ] ] ] - }, + }, { "result": "survnote", "type": "recipe", @@ -891,7 +891,7 @@ "reversible": true, "flags": ["BLIND_EASY"], "components": [ [ [ "paper", 1 ] ] ] - }, + }, { "result": "broken_manhack", "type": "recipe", @@ -921,7 +921,7 @@ "autolearn": false, "qualities" : [ {"id":"SCREW","level":1,"amount":1} - ], + ], "tools": [ [ [ "soldering_iron", 5 ], [ "toolset", 5 ] ] ], "components": [ [ @@ -971,7 +971,7 @@ "autolearn": false, "qualities" : [ {"id":"SCREW","level":1,"amount":1} - ], + ], "tools": [ [ [ "soldering_iron", 5 ], [ "toolset", 5 ] ] ], "components": [ [ @@ -996,7 +996,7 @@ "autolearn": false, "qualities" : [ {"id":"SCREW","level":1,"amount":1} - ], + ], "tools": [ [ [ "soldering_iron", 5 ], [ "toolset", 5 ] ] ], "components": [ [ @@ -1021,7 +1021,7 @@ "autolearn": false, "qualities" : [ {"id":"SCREW","level":1,"amount":1} - ], + ], "tools": [ [ [ "soldering_iron", 5 ], [ "toolset", 5 ] ] ], "components": [ [ @@ -1046,7 +1046,7 @@ "autolearn": false, "qualities" : [ {"id":"SCREW","level":1,"amount":1} - ], + ], "tools": [ [ [ "soldering_iron", 5 ], [ "toolset", 5 ] ] ], "components": [ [ @@ -1071,7 +1071,7 @@ "autolearn": false, "qualities" : [ {"id":"SCREW","level":1,"amount":1} - ], + ], "tools": [ [ [ "soldering_iron", 3 ], [ "toolset", 3 ] ] ], "components": [ [ [ "processor", 1 ] ], @@ -1091,7 +1091,7 @@ "autolearn": false, "qualities" : [ {"id":"SCREW","level":1,"amount":1} - ], + ], "tools": [ [ [ "soldering_iron", 10 ], [ "toolset", 10 ] ] ], "components": [ [ [ "power_supply", 1 ] ], @@ -1112,9 +1112,9 @@ "qualities" : [ {"id":"SCREW","level":1,"amount":1}, {"id":"SAW_M","level":1,"amount":1} - ], + ], "tools": [ [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ], - [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ], [ "welder_crude", 75 ] ] + [ [ "oxy_torch", 10 ], [ "welder", 50 ], [ "toolset", 75 ], [ "welder_crude", 75 ] ] ], "components": [ [ [ "power_supply", 4 ] ], @@ -1160,7 +1160,7 @@ "autolearn": false, "qualities" : [ {"id":"SAW_M","level":1,"amount":1} - ], + ], "tools": [ [ [ "oxy_torch", 12 ], [ "welder", 60 ], [ "toolset", 90 ], [ "welder_crude", 90 ] ] ], "components": [ [ [ "power_supply", 4 ] ], @@ -1232,7 +1232,7 @@ "autolearn": false, "qualities" : [ {"id":"SCREW","level":1,"amount":1} - ], + ], "tools": [ [ [ "soldering_iron", 20 ], [ "toolset", 20 ] ] ], "components": [ [ [ "power_supply", 1 ] ], @@ -1253,7 +1253,7 @@ "qualities" : [ {"id":"SCREW","level":1,"amount":1}, {"id":"WRENCH","level":1,"amount":1} - ], + ], "tools": [ [ [ "soldering_iron", 30 ], [ "toolset", 30 ] ] ], "components": [ [ [ "power_supply", 1 ] ], @@ -1378,7 +1378,7 @@ "autolearn": false, "qualities" : [ {"id":"SCREW","level":1,"amount":1} - ], + ], "tools": [ [ [ "soldering_iron", 10 ], [ "toolset", 10 ] ] ], "components": [ [ [ "plastic_chunk", 8 ] ], diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 5da124b4893cd..1c71fe51a9897 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -8815,7 +8815,7 @@ "time": 7000, "reversible": false, "autolearn": true, - "qualities": [ { "id": "COOK", "level": 2 } ], + "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "hotplate", 4 ], [ "char_smoker", 4 ], [ "toolset", 4 ], [ "fire", -1 ] ] ], "components": [ [ ["meth", 4] ], [ ["cola", 2] ] ] From 2812be6b5ef46950edad3fa9002cdef18c3cd447 Mon Sep 17 00:00:00 2001 From: Cyrano7 Date: Wed, 8 Jun 2016 00:06:47 -0700 Subject: [PATCH 070/110] mod data --- data/mods/PKs_Rebalance/pk_critter_robot.json | 1 - .../mods/PKs_Rebalance/pk_critter_zombie.json | 6 ++--- data/mods/PKs_Rebalance/pk_itemlist_new.json | 24 +++++++++---------- .../PKs_Rebalance/pk_mapgen_trapspider.json | 4 +--- data/mods/PKs_Rebalance/pk_spawn_list.json | 20 ++++++++-------- 5 files changed, 25 insertions(+), 30 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_robot.json b/data/mods/PKs_Rebalance/pk_critter_robot.json index 41eeb9289230f..2ec1e8d04237b 100644 --- a/data/mods/PKs_Rebalance/pk_critter_robot.json +++ b/data/mods/PKs_Rebalance/pk_critter_robot.json @@ -40,7 +40,6 @@ "edit-mode" : "modify", "vision_night":10 }, - { "type" : "MONSTER", "id" : "mon_manhack_missile", diff --git a/data/mods/PKs_Rebalance/pk_critter_zombie.json b/data/mods/PKs_Rebalance/pk_critter_zombie.json index 04afc0aef5a28..ac93ded8fe34f 100644 --- a/data/mods/PKs_Rebalance/pk_critter_zombie.json +++ b/data/mods/PKs_Rebalance/pk_critter_zombie.json @@ -354,7 +354,7 @@ "into": "mon_zombie_gasbag_pk", "half_life": 28 }, - "burn_into" : "mon_zombie_scorched_pk" + "burn_into" : "mon_zombie_scorched_pk" },{ "type" : "MONSTER", "id" : "mon_zombie_shady", @@ -363,7 +363,7 @@ "into": "mon_zombie_shady_pk", "half_life": 28 }, - "burn_into" : "mon_zombie_crawler_pk" + "burn_into" : "mon_zombie_crawler_pk" },{ "type" : "MONSTER", "id" : "mon_dog_skeleton", @@ -790,7 +790,7 @@ "armor_acid":2, "armor_fire":2, "vision_day":45, - "vision_night":5, + "vision_night":5, "hp":140, "death_function":"NORMAL", "special_attacks":[["STRETCH_BITE", 15], ["STRETCH_ATTACK", 10]], diff --git a/data/mods/PKs_Rebalance/pk_itemlist_new.json b/data/mods/PKs_Rebalance/pk_itemlist_new.json index a4c55837f83eb..bc598ba944a73 100644 --- a/data/mods/PKs_Rebalance/pk_itemlist_new.json +++ b/data/mods/PKs_Rebalance/pk_itemlist_new.json @@ -65,7 +65,6 @@ { "group": "marloss_man_nommies", "damage": [0, 1], "prob": 95, "count": [3, 5] } ] }, - { "type" : "item_group", "id" : "furvivor_ninemm", @@ -75,7 +74,7 @@ ["glock_19", 10], ["9mm", 4], ["reloaded_9mm", 1] - ] + ] },{ "type" : "item_group", "id" : "furvivor_shot_gun", @@ -85,7 +84,7 @@ ["shotgun_s", 10], ["shotgun_d", 5], ["mossberg_500", 1] - ] + ] },{ "type" : "item_group", "id" : "furvivor_shot_ammo", @@ -93,7 +92,7 @@ "items": [ ["reloaded_shot_00", 5], ["reloaded_shot_bird", 5] - ] + ] },{ "type" : "item_group", "id" : "furvivor_deagle_gun", @@ -101,7 +100,7 @@ "items": [ ["deagle_44", 5], ["sw629", 2] - ] + ] },{ "type" : "item_group", "id" : "furvivor_deagle_ammo", @@ -110,7 +109,7 @@ [ "deaglemag", 4], ["44fmj", 1], ["reloaded_44fmj", 5] - ] + ] },{ "type" : "item_group", "id" : "furvivor_uzi", @@ -119,7 +118,7 @@ [ "uzimag", 4], ["9mm", 1], ["uzi", 5] - ] + ] },{ "type" : "item_group", "id" : "pk_melee", @@ -157,7 +156,7 @@ ["pipe", 1], ["golf_club", 1], ["glass_macuahuitl", 1], - ["longsword_inferior", 1] + ["longsword_inferior", 1] ] },{ "type" : "item_group", @@ -175,7 +174,7 @@ ["223", 4], ["reloaded_556_incendiary", 3], ["granade", 3] - ] + ] },{ "type" : "item_group", "id" : "marloss_man_nommies", @@ -183,7 +182,7 @@ "items": [ ["marloss_berry", 4], ["marloss_seed", 1] - ] + ] },{ "type" : "item_group", "subtype": "collection", @@ -199,15 +198,14 @@ "//" : "revenant rocket bots.", "items": [ [ "bot_manhack_missile", 1] - ] + ] },{ "type" : "item_group", "id" : "revenant_rocket_cores", "//" : "rockets in bomb form.", "items": [ [ "rocket_core", 1] - - ] + ] },{ "type" : "item_group", "id" : "doom_corpse", diff --git a/data/mods/PKs_Rebalance/pk_mapgen_trapspider.json b/data/mods/PKs_Rebalance/pk_mapgen_trapspider.json index 5b0ff8cbe925e..75e5f5067bc90 100644 --- a/data/mods/PKs_Rebalance/pk_mapgen_trapspider.json +++ b/data/mods/PKs_Rebalance/pk_mapgen_trapspider.json @@ -354,8 +354,6 @@ ] } } - - ,{ "type": "mapgen", "om_terrain": [ @@ -453,7 +451,7 @@ "^": "f_rubble_rock", "o": ["f_boulder_small", "f_boulder_small", "f_boulder_small", "f_boulder_medium", "f_boulder_medium", "f_boulder_large"] }, - "place_items": [ + "place_items": [ { "item": "spider", "chance": 55, "x": [ 10, 12 ], "y": [ 9, 12 ], "repeat": [ 1, 2 ] } ] } diff --git a/data/mods/PKs_Rebalance/pk_spawn_list.json b/data/mods/PKs_Rebalance/pk_spawn_list.json index 61a5deec09bd2..0b257f3838ccc 100644 --- a/data/mods/PKs_Rebalance/pk_spawn_list.json +++ b/data/mods/PKs_Rebalance/pk_spawn_list.json @@ -120,7 +120,7 @@ { "monster" : "mon_spider_trapdoor_giant", "freq" : 25, "cost_multiplier" : 1, "pack_size" : [1,2] }, { "monster" : "mon_spider_trapdoor_giant_guardian", "freq" : 5, "cost_multiplier" : 0, "starts": 75 }, { "monster" : "mon_spider_trapdoor_giant_pk", "freq" : 15, "cost_multiplier" : 0, "pack_size" : [1,2], "starts": 50 } - ] + ] },{ "type":"monstergroup", "name" : "GROUP_SPIDER_TRAP_LONER", @@ -132,13 +132,13 @@ { "monster" : "mon_spider_trapdoor_giant", "freq" : 10, "cost_multiplier" : 1, "pack_size" : [1,4] }, { "monster" : "mon_spider_trapdoor_giant_guardian", "freq" : 15, "cost_multiplier" : 5, "pack_size" : [1,2] , "starts": 50 }, { "monster" : "mon_spider_trapdoor_giant_pk", "freq" : 15, "cost_multiplier" : 3, "pack_size" : [1,3], "starts": 25 } - ] + ] },{ "type":"monstergroup", "name" : "GROUP_FOREST", "default" : "mon_null", "monsters" : [ - { "monster" : "mon_fougar", "freq" : 1, "cost_multiplier" : 8, "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_fougar", "freq" : 1, "cost_multiplier" : 8, "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_feer", "freq" : 2, "cost_multiplier" : 5, "pack_size" : [1,2], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_feer", "freq" : 1, "cost_multiplier" : 9, "pack_size" : [2,5], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_feer", "freq" : 1, "cost_multiplier" : 15, "pack_size" : [3,7], "conditions" : ["DUSK", "AUTUMN"] }, @@ -180,7 +180,7 @@ { "monster" : "mon_horse", "freq" : 1, "cost_multiplier" : 20, "pack_size" : [1,3], "ends" : 200, "conditions" : ["DAY", "WINTER"] }, { "monster" : "mon_horse", "freq" : 1, "cost_multiplier" : 20, "pack_size" : [1,3], "ends" : 600, "conditions" : ["DAY", "WINTER"] }, { "monster" : "mon_horse", "freq" : 1, "cost_multiplier" : 20, "pack_size" : [1,3], "ends" : 1000, "conditions" : ["DAY", "WINTER"] }, - + { "monster" : "mon_horse_zombie", "freq" : 2, "cost_multiplier" : 15, "starts" : 75, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_horse_zombie", "freq" : 2, "cost_multiplier" : 15, "starts" : 450, "ends" : 2000, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_horse_zombie", "freq" : 2, "cost_multiplier" : 15, "starts" : 850, "ends" : 2400, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, @@ -548,14 +548,14 @@ { "monster" : "mon_zombie_gasbag", "freq" : 5, "cost_multiplier": 15, "pack_size": [3,5], "starts" : 2 }, { "monster" : "mon_zombie_smoker", "freq" : 15, "cost_multiplier" : 5 }, { "monster" : "mon_zombie_smoker", "freq" : 5, "cost_multiplier" : 10, "pack_size": [2,3], "starts" : 2 }, - + { "monster" : "mon_boomer", "freq" : 30, "cost_multiplier" : 5 }, { "monster" : "mon_boomer", "freq" : 5, "cost_multiplier" : 15, "pack_size": [2,4], "starts" : 2 }, { "monster" : "mon_boomer_huge", "freq" : 5, "cost_multiplier" : 7, "starts" : 3 }, { "monster" : "mon_zombie_shrieker", "freq" : 25, "cost_multiplier" : 5 }, { "monster" : "mon_zombie_shrieker", "freq" : 5, "cost_multiplier" : 10, "pack_size": [1,3]}, - + { "monster" : "mon_zombie_acidic", "freq" : 25, "cost_multiplier" : 3 }, { "monster" : "mon_zombie_acidic", "freq" : 5, "cost_multiplier" : 9, "pack_size": [2,5], "starts" : 3 }, { "monster" : "mon_zombie_spitter", "freq" : 15, "cost_multiplier" : 5 }, @@ -583,7 +583,7 @@ { "monster" : "mon_beekeeper", "freq" : 1, "cost_multiplier" : 5 }, { "monster" : "mon_zombie_technician", "freq" : 2, "cost_multiplier" : 12}, - + { "monster" : "mon_zombie_scorched", "freq" : 1, "cost_multiplier" : 8, "pack_size": [1,4], "starts": 25 }, { "monster" : "mon_zombie_fiend", "freq" : 1, "cost_multiplier" : 14, "pack_size": [1, 2], "starts": 25 }, { "monster" : "mon_zombie_crawler_scorched", "freq" : 1, "cost_multiplier" : 2, "pack_size": [1,2], "starts": 50 }, @@ -653,7 +653,7 @@ { "monster" : "mon_zombie_predator", "freq" : 3, "cost_multiplier" : 15, "pack_size": [1,2] }, { "monster" : "mon_zombie_gasbag", "freq" : 15, "cost_multiplier": 5}, - { "monster" : "mon_zombie_gasbag", "freq" : 5, "cost_multiplier": 15, "pack_size": [3,5]}, + { "monster" : "mon_zombie_gasbag", "freq" : 5, "cost_multiplier": 15, "pack_size": [3,5]}, { "monster" : "mon_zombie_smoker", "freq" : 15, "cost_multiplier" : 5 }, { "monster" : "mon_zombie_smoker", "freq" : 5, "cost_multiplier" : 10, "pack_size": [2,3]}, { "monster" : "mon_zombie_gasbag_pk", "freq" : 2, "cost_multiplier": 25}, @@ -685,7 +685,7 @@ { "monster" : "mon_zombie_necro", "freq" : 2, "cost_multiplier" : 25 }, { "monster" : "mon_zombie_necro", "freq" : 1, "cost_multiplier" : 50, "pack_size": [1,3]}, - { "monster" : "mon_zombie_survivor", "freq" : 5, "cost_multiplier" : 40, "pack_size": [1,5]}, + { "monster" : "mon_zombie_survivor", "freq" : 5, "cost_multiplier" : 40, "pack_size": [1,5]}, { "monster" : "mon_zombie_master", "freq" : 2, "cost_multiplier" : 30 }, { "monster" : "mon_zombie_master", "freq" : 1, "cost_multiplier" : 60, "pack_size": [1,3]}, @@ -962,7 +962,7 @@ "name" : "GROUP_SWAMP", "default" : "mon_null", "monsters" : [ - { "monster" : "mon_fougar", "freq" : 1, "cost_multiplier" : 8, "conditions" : ["DUSK", "SUMMER"] }, + { "monster" : "mon_fougar", "freq" : 1, "cost_multiplier" : 8, "conditions" : ["DUSK", "SUMMER"] }, { "monster" : "mon_foose", "freq" : 1, "cost_multiplier" : 10, "conditions" : ["DAWN", "WINTER"] }, { "monster" : "mon_fardigrade", "freq" : 3, "cost_multiplier" : 25, "conditions" : ["DAWN", "SPRING", "SUMMER", "AUTUMN"], "starts" : 150 }, { "monster" : "mon_furvivor", "freq" : 3, "cost_multiplier" : 5, "conditions" : ["DUSK"] }, From 50fd48db4d227b17db107e73c30d5424eafa3482 Mon Sep 17 00:00:00 2001 From: BevapDin Date: Wed, 8 Jun 2016 09:13:54 +0200 Subject: [PATCH 071/110] Prevent debug message upon non-empty empty vat: Set the furniture to f_vat_empty when the liquid was completely removed. Examining the (changed) furniture again will run the other iexamine function (for the empty vat) instead. --- src/activity_handlers.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/activity_handlers.cpp b/src/activity_handlers.cpp index 2d660b2e81581..611aaef526aa1 100644 --- a/src/activity_handlers.cpp +++ b/src/activity_handlers.cpp @@ -627,6 +627,10 @@ void activity_handlers::fill_liquid_do_turn( player_activity *act_, player *p ) if( g->m.ter_at( source_pos ).examine == &iexamine::gaspump ) { add_msg( _( "With a clang and a shudder, the %s pump goes silent."), liquid.type_name( 1 ).c_str() ); + } else if( g->m.furn_at( source_pos ).examine == &iexamine::fvat_full ) { + g->m.furn_set( source_pos, f_fvat_empty ); + add_msg( _( "You squeeze the last drops of %s from the vat." ), + liquid.type_name( 1 ).c_str() ); } act.type = ACT_NULL; } From a75f5b6c32f09017573c39e0c5740875194fa21a Mon Sep 17 00:00:00 2001 From: BevapDin Date: Wed, 8 Jun 2016 09:23:04 +0200 Subject: [PATCH 072/110] Ensure map::water_from always returns a water item when expected. `iexamine::water_source` pretty much expects the function to return a valid liquid. --- src/map.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/map.cpp b/src/map.cpp index 3d381fa76598a..e67b376cfbfcc 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -4737,6 +4737,13 @@ item map::water_from( const tripoint &p ) ret.poison = rng( 1, 7 ); return ret; } + // iexamine::water_source requires a valid liquid from this function. + if( terrain_id.obj().examine == &iexamine::water_source ) { + return ret; + } + if( furn( p ).obj().examine == &iexamine::water_source ) { + return ret; + } return item(); } From de6b1a797d35c080f37635e82f041da868d1de55 Mon Sep 17 00:00:00 2001 From: BevapDin Date: Wed, 8 Jun 2016 09:31:35 +0200 Subject: [PATCH 073/110] Fix Aero-Evaporator bionic giving back power when being aborted. --- src/bionics.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bionics.cpp b/src/bionics.cpp index 1bc5d43e8031a..7c41f69183cbe 100644 --- a/src/bionics.cpp +++ b/src/bionics.cpp @@ -354,7 +354,7 @@ bool player::activate_bionic( int b, bool eff_only ) if( water_charges == 0 ) { add_msg_if_player( m_bad, _( "There was not enough moisture in the air from which to draw water!" ) ); - } else if( g->consume_liquid( water ) ) { + } else if( !g->consume_liquid( water ) ) { charge_power(bionics["bio_evap"].power_activate); } } else if( bio.id == "bio_lighter" ) { From 85039f0c0326169193a573b561ecbf2a6164dfd5 Mon Sep 17 00:00:00 2001 From: Cyrano7 Date: Wed, 8 Jun 2016 00:35:20 -0700 Subject: [PATCH 074/110] Double spaces after periods --- data/json/bionics.json | 2 +- data/json/mapgen/roadstop_a.json | 2 +- data/json/npcs/epilogues.json | 2 +- data/json/speech.json | 4 ++-- data/mods/More_Locations/modinfo.json | 2 +- data/mods/More_Survival_Tools/modinfo.json | 2 +- data/mods/PKs_Rebalance/pk_critter_doom.json | 4 ++-- data/mods/PKs_Rebalance/pk_critter_fungus.json | 2 +- data/mods/PKs_Rebalance/pk_critter_insect.json | 2 +- data/mods/StatsThroughSkills/modinfo.json | 2 +- data/mods/Z-Level_Buildings/modinfo.json | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/data/json/bionics.json b/data/json/bionics.json index cf3b0b2ef1264..f066cf923fd66 100644 --- a/data/json/bionics.json +++ b/data/json/bionics.json @@ -803,7 +803,7 @@ [ "HAND_L", 5 ] ], "act_cost": 50, - "description": "Your left arm has been replaced by a heavy-duty fusion blaster! You may use your energy banks to fire a damaging heat ray. However, you are unable to use or carry two-handed items, and your strength limits what you can use with your one hand." + "description": "Your left arm has been replaced by a heavy-duty fusion blaster! You may use your energy banks to fire a damaging heat ray. However, you are unable to use or carry two-handed items, and your strength limits what you can use with your one hand." },{ "type": "bionic", "id": "bio_laser", diff --git a/data/json/mapgen/roadstop_a.json b/data/json/mapgen/roadstop_a.json index fc657c475ea40..67ec93cc1d962 100644 --- a/data/json/mapgen/roadstop_a.json +++ b/data/json/mapgen/roadstop_a.json @@ -50,7 +50,7 @@ "o": "t_dirt" }, "signage": { - "i": "This was once a infromation map for the area, but it has long since been eroded beyond usefullness. There are small holders for tourist maps attached." + "i": "This was once a infromation map for the area, but it has long since been eroded beyond usefullness. There are small holders for tourist maps attached." }, "furniture": { "6": "f_table", diff --git a/data/json/npcs/epilogues.json b/data/json/npcs/epilogues.json index ccc67d7536c59..0fbcf4ad6f060 100644 --- a/data/json/npcs/epilogues.json +++ b/data/json/npcs/epilogues.json @@ -1003,7 +1003,7 @@ "line_06" : " ", "line_07" : " ", "line_08" : "* ", - "line_09" : " Went on to become a notable scout and urban explorer. Was tragically ", + "line_09" : " Went on to become a notable scout and urban explorer. Was tragically ", "line_10" : "killed by one of her students when leading a group of unskilled survivors ", "line_11" : "on a night supply raid. ", "line_12" : " ", diff --git a/data/json/speech.json b/data/json/speech.json index b67ea2fa1cbff..827f46be04ddd 100644 --- a/data/json/speech.json +++ b/data/json/speech.json @@ -1202,12 +1202,12 @@ },{ "type" : "speech", "speaker" : "mon_broken_cyborg", - "sound" : "an electronic voice saying \"CONNECTION FAILED. Abort, Retry, Fail?\"", + "sound" : "an electronic voice saying \"CONNECTION FAILED. Abort, Retry, Fail?\"", "volume" : 20 },{ "type" : "speech", "speaker" : "mon_broken_cyborg", - "sound" : "\"I was once a man. A MAN!\"", + "sound" : "\"I was once a man. A MAN!\"", "volume" : 10 },{ "type" : "speech", diff --git a/data/mods/More_Locations/modinfo.json b/data/mods/More_Locations/modinfo.json index 927e0d45fddc8..8051a20dfc3c2 100644 --- a/data/mods/More_Locations/modinfo.json +++ b/data/mods/More_Locations/modinfo.json @@ -4,7 +4,7 @@ "ident": "more_locations", "author": "Sunshine", "name": "More Locations", - "description": "Adds new Z-level buildings and dungeons. Still unpolished. Before generating a world, you can remove subfolders to nix unwanted locations.", + "description": "Adds new Z-level buildings and dungeons. Still unpolished. Before generating a world, you can remove subfolders to nix unwanted locations.", "category": "buildings", "path": "" } diff --git a/data/mods/More_Survival_Tools/modinfo.json b/data/mods/More_Survival_Tools/modinfo.json index 7463ffd5c2bac..5326528c3ceb5 100644 --- a/data/mods/More_Survival_Tools/modinfo.json +++ b/data/mods/More_Survival_Tools/modinfo.json @@ -4,7 +4,7 @@ "ident": "More_Survival_Tools", "name": "More Survival Tools", "author": "Chaosvolt", - "description": "For those who prefer being innawoods. Adds several tools, various recipes additions/tweaks, plus two new classes.", + "description": "For those who prefer being innawoods. Adds several tools, various recipes additions/tweaks, plus two new classes.", "category": "items", "path": "" } diff --git a/data/mods/PKs_Rebalance/pk_critter_doom.json b/data/mods/PKs_Rebalance/pk_critter_doom.json index c00d45c161068..4a68e7be21536 100644 --- a/data/mods/PKs_Rebalance/pk_critter_doom.json +++ b/data/mods/PKs_Rebalance/pk_critter_doom.json @@ -694,7 +694,7 @@ "death_function":["NORMAL"], "special_attacks":[ ["FEAR_PARALYZE", 25]], - "description":"All evidence indicates that this used to be a survivor, who was killed by torture and body reanimated. Its garments lack the weathered look of other zombies but are mutilated none-the-less. Although it struggles to free itself, it is held fast with spikes, nails, and chains.", + "description":"All evidence indicates that this used to be a survivor, who was killed by torture and body reanimated. Its garments lack the weathered look of other zombies but are mutilated none-the-less. Although it struggles to free itself, it is held fast with spikes, nails, and chains.", "flags":["SEES", "HEARS", "SMELLS", "WARM", "IMMOBILE", "GUILT", "POISON", "REVIVES", "BONES"] },{ "type" : "MONSTER", @@ -750,7 +750,7 @@ "vision_night":50, "hp":300, "death_function":["JABBERWOCKY", "EXPLODE"], - "description":"A massive face cross-sectioned with large machinery; various tubes of bubbling liquid bury themselves and reemerge from pustulating wounds. Its forehead has been removed, exposing a pulsating brain mass from which sound emanates.", + "description":"A massive face cross-sectioned with large machinery; various tubes of bubbling liquid bury themselves and reemerge from pustulating wounds. Its forehead has been removed, exposing a pulsating brain mass from which sound emanates.", "flags":["SEES", "WARM", "POISON", "NO_BREATHE", "IMMOBILE", "ELECTRIC"] } ] diff --git a/data/mods/PKs_Rebalance/pk_critter_fungus.json b/data/mods/PKs_Rebalance/pk_critter_fungus.json index 4ddadf616b50a..27ed5cfb50f8a 100644 --- a/data/mods/PKs_Rebalance/pk_critter_fungus.json +++ b/data/mods/PKs_Rebalance/pk_critter_fungus.json @@ -932,7 +932,7 @@ "cooldown" : 3 } ], - "description":"A large, astoundingly tough creature that used to be a dog or boar. Its massive maw takes up almost half its body. Rows of teeth pushing older rows forward; creating a jutting smile only made more terrifying by the beady red eyes, socketed above behind the maw, looking down at its prey.", + "description":"A large, astoundingly tough creature that used to be a dog or boar. Its massive maw takes up almost half its body. Rows of teeth pushing older rows forward; creating a jutting smile only made more terrifying by the beady red eyes, socketed above behind the maw, looking down at its prey.", "flags":["SEES", "HEARS", "SMELLS", "KEENNOSE", "STUMBLES", "WARM", "BLEED", "BASHES", "POISON", "BONES", "FAT", "REGENERATES_10", "PLASTIC"], "anger_triggers":["PLAYER_WEAK", "PLAYER_CLOSE"] } diff --git a/data/mods/PKs_Rebalance/pk_critter_insect.json b/data/mods/PKs_Rebalance/pk_critter_insect.json index face44ebfd691..9997ff68eb94f 100644 --- a/data/mods/PKs_Rebalance/pk_critter_insect.json +++ b/data/mods/PKs_Rebalance/pk_critter_insect.json @@ -440,7 +440,7 @@ } ], "special_when_hit":["ACIDSPLASH", 5], - "description":"A spider the size of a large dog with slender forelegs and massive hind legs. From its maw corrosive saliva drips, and can be manipulated by its agile limbs.", + "description":"A spider the size of a large dog with slender forelegs and massive hind legs. From its maw corrosive saliva drips, and can be manipulated by its agile limbs.", "flags":["SEES", "SMELLS", "KEENNOSE", "HEARS", "BADVENOM", "CHITIN", "CLIMBS", "ACIDPROOF", "ACID_BLOOD", "PUSH_MON"], "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK", "FRIEND_ATTACKED", "STALK"], "fear_triggers": ["HURT", "FIRE"] diff --git a/data/mods/StatsThroughSkills/modinfo.json b/data/mods/StatsThroughSkills/modinfo.json index 30c47603f5cbd..a6d485043aca9 100644 --- a/data/mods/StatsThroughSkills/modinfo.json +++ b/data/mods/StatsThroughSkills/modinfo.json @@ -4,7 +4,7 @@ "ident": "StatsThroughSkills", "name": "StatsThoughSkills", "author": "Ryan \"DeNarr\" Saige", - "description": "Allows stats to raise naturally via skill progression. Changes to starting stats will be disregarded", + "description": "Allows stats to raise naturally via skill progression. Changes to starting stats will be disregarded", "category": "rebalance", "path": "" } diff --git a/data/mods/Z-Level_Buildings/modinfo.json b/data/mods/Z-Level_Buildings/modinfo.json index 9497f2c4325cf..c069b0f3bd95d 100644 --- a/data/mods/Z-Level_Buildings/modinfo.json +++ b/data/mods/Z-Level_Buildings/modinfo.json @@ -3,7 +3,7 @@ "mod-type": "SUPPLEMENTAL", "ident": "Experimental-Z-Level", "name": "Tall Buildings", - "description": "Adds basic 3-D buildings. For testing z-levels and those who want to play with z-level buildings in their early state.", + "description": "Adds basic 3-D buildings. For testing z-levels and those who want to play with z-level buildings in their early state.", "category": "buildings", "path": "" } From a1735de5f375c0a4c4c08115036206e8dbe93078 Mon Sep 17 00:00:00 2001 From: BevapDin Date: Wed, 8 Jun 2016 08:54:20 +0200 Subject: [PATCH 075/110] Move scent data and code into a separate class and header --- CataclysmWin.cbp | 2 + astyled_whitelist | 2 + src/CMakeLists.txt | 2 + src/game.cpp | 167 +++++++++------------------------------------ src/game.h | 6 +- src/map.cpp | 8 +-- src/savegame.cpp | 80 ++++++++++++---------- src/scent_map.cpp | 117 +++++++++++++++++++++++++++++++ src/scent_map.h | 63 +++++++++++++++++ src/tutorial.cpp | 6 +- 10 files changed, 266 insertions(+), 187 deletions(-) create mode 100644 src/scent_map.cpp create mode 100644 src/scent_map.h diff --git a/CataclysmWin.cbp b/CataclysmWin.cbp index f84e8a9364d20..a6202d7515ce8 100644 --- a/CataclysmWin.cbp +++ b/CataclysmWin.cbp @@ -599,6 +599,8 @@ + + diff --git a/astyled_whitelist b/astyled_whitelist index 99abe88ac036c..55fb551cee3f5 100644 --- a/astyled_whitelist +++ b/astyled_whitelist @@ -56,6 +56,8 @@ src/profession.cpp src/recipe_dictionary.cpp src/rng.cpp src/scenario.cpp +src/scent_map.cpp +src/scent_map.h src/speech.cpp src/start_location.cpp src/submap.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4e4a7553fbb7e..81a6e712e5b9c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -110,6 +110,7 @@ SET(CATACLYSM_DDA_SOURCES ${CMAKE_SOURCE_DIR}/src/ui.cpp ${CMAKE_SOURCE_DIR}/src/newcharacter.cpp ${CMAKE_SOURCE_DIR}/src/scenario.cpp + ${CMAKE_SOURCE_DIR}/src/scent_map.cpp ${CMAKE_SOURCE_DIR}/src/faction.cpp ${CMAKE_SOURCE_DIR}/src/wish.cpp ${CMAKE_SOURCE_DIR}/src/bionics.cpp @@ -235,6 +236,7 @@ SET (CATACLYSM_DDA_HEADERS ${CMAKE_SOURCE_DIR}/src/simplexnoise.h ${CMAKE_SOURCE_DIR}/src/shadowcasting.h ${CMAKE_SOURCE_DIR}/src/scenario.h + ${CMAKE_SOURCE_DIR}/src/scent_map.h ${CMAKE_SOURCE_DIR}/src/auto_pickup.h ${CMAKE_SOURCE_DIR}/src/cata_tiles.h ${CMAKE_SOURCE_DIR}/src/cata_utility.h diff --git a/src/game.cpp b/src/game.cpp index 53f390a08b076..4c04f125ca687 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -159,7 +159,6 @@ const efftype_id effect_winded( "winded" ); void advanced_inv(); // player_activity.cpp void intro(); -nc_color sev(int a); // Right now, ONLY used for scent debugging.... //The one and only game instance game *g; @@ -720,12 +719,7 @@ void game::setup() // reset kill counts kills.clear(); - // Set the scent map to 0 - for( auto &elem : grscent ) { - for( auto &elem_j : elem ) { - elem_j = 0; - } - } + scent.reset(); remoteveh_cache_turn = INT_MIN; remoteveh_cache = nullptr; @@ -1447,7 +1441,13 @@ bool game::do_turn() calc_driving_offset(veh); } } - update_scent(); + + // No-scent debug mutation has to be processed here or else it takes time to start working + if( !u.has_active_bionic( "bio_scent_mask" ) && !u.has_trait( "DEBUG_NOSCENT" ) ) { + scent( u.pos() ) = u.scent; + overmap_buffer.set_scent( u.global_omt_location(), u.scent ); + } + scent.update( u.pos(), m ); // We need floor cache before checking falling 'n stuff m.build_floor_caches(); @@ -3341,60 +3341,39 @@ bool outside_scent_radius( const tripoint &p ) { p.y < (SEEY * MAPSIZE / 2) - SCENT_RADIUS || p.y >= (SEEY * MAPSIZE / 2) + SCENT_RADIUS; } -int &game::scent( const tripoint &p ) +void scent_map::update( const tripoint ¢er, map &m ) { - if( outside_scent_radius( p ) ) { - nulscent = 0; - return nulscent; // Out-of-bounds - null scent - } - return grscent[p.x][p.y]; -} - -void game::update_scent() -{ - static tripoint player_last_position = tripoint_min; - static int player_last_moved = calendar::turn; // Stop updating scent after X turns of the player not moving. // Once wind is added, need to reset this on wind shifts as well. - if( u.pos() == player_last_position ) { - if( player_last_moved + 1000 < calendar::turn ) { - return; - } - } else { - player_last_position = u.pos(); - player_last_moved = calendar::turn; + if( center == player_last_position && player_last_moved + 1000 < calendar::turn ) { + return; } - - overmap_buffer.set_scent( u.global_omt_location(), u.scent ); + player_last_position = center; + player_last_moved = calendar::turn; // note: the next four intermediate matrices need to be at least // [2*SCENT_RADIUS+3][2*SCENT_RADIUS+1] in size to hold enough data // The code I'm modifying used [SEEX * MAPSIZE]. I'm staying with that to avoid new bugs. + // These two matrices are transposed so that x addresses are contiguous in memory - int sum_3_scent_y[SEEY * MAPSIZE][SEEX * MAPSIZE]; //intermediate variable - int squares_used_y[SEEY * MAPSIZE][SEEX * MAPSIZE]; //intermediate variable + scent_array sum_3_scent_y; + scent_array squares_used_y; // these are for caching flag lookups - std::array, SEEY * MAPSIZE> blocks_scent; // currently only TFLAG_WALL blocks scent - std::array, SEEY * MAPSIZE> reduces_scent; - + scent_array blocks_scent; // currently only TFLAG_WALL blocks scent + scent_array reduces_scent; // for loop constants - const int scentmap_minx = u.posx() - SCENT_RADIUS; - const int scentmap_maxx = u.posx() + SCENT_RADIUS; - const int scentmap_miny = u.posy() - SCENT_RADIUS; - const int scentmap_maxy = u.posy() + SCENT_RADIUS; + const int scentmap_minx = center.x - SCENT_RADIUS; + const int scentmap_maxx = center.x + SCENT_RADIUS; + const int scentmap_miny = center.y - SCENT_RADIUS; + const int scentmap_maxy = center.y + SCENT_RADIUS; const int diffusivity = 100; // decrease this to reduce gas spread. Keep it under 125 for // stability. This is essentially a decimal number * 1000. - // No-scent debug mutation has to be processed here or else it takes time to start working - if( !u.has_active_bionic("bio_scent_mask") && !u.has_trait("DEBUG_NOSCENT") ) { - grscent[u.posx()][u.posy()] = u.scent; - } - // The new scent flag searching function. Should be wayyy faster than the old one. m.scent_blockers( blocks_scent, reduces_scent, scentmap_minx, scentmap_miny, scentmap_maxx, scentmap_maxy ); @@ -3427,6 +3406,7 @@ void game::update_scent() // Rest of the scent map for (int x = scentmap_minx; x <= scentmap_maxx; ++x) { for (int y = scentmap_miny; y <= scentmap_maxy; ++y) { + auto &scent_here = grscent[x][y]; if (! blocks_scent[x][y]) { // to how many neighboring squares do we diffuse out? (include our own square // since we also include our own square when diffusing in) @@ -3442,27 +3422,20 @@ void game::update_scent() } int temp_scent; // take the old scent and subtract what diffuses out - temp_scent = grscent[x][y] * (10 * 1000 - squares_used * this_diffusivity); + temp_scent = scent_here * (10 * 1000 - squares_used * this_diffusivity); // neighboring walls and reduce_scent squares absorb some scent - temp_scent -= grscent[x][y] * this_diffusivity * (90 - squares_used) / 5; + temp_scent -= scent_here * this_diffusivity * (90 - squares_used) / 5; // we've already summed neighboring scent values in the y direction in the previous // loop. Now we do it for the x direction, multiply by diffusion, and this is what // diffuses into our current square. - grscent[x][y] = + scent_here = (temp_scent + this_diffusivity * (sum_3_scent_y[y][x - 1] + sum_3_scent_y[y][x] + sum_3_scent_y[y][x + 1]) ) / (1000 * 10); - - if (grscent[x][y] > 10000) { - dbg(D_ERROR) << "game:update_scent: Wacky scent at " << x << "," - << y << " (" << grscent[x][y] << ")"; - debugmsg("Wacky scent at %d, %d (%d)", x, y, grscent[x][y]); - grscent[x][y] = 0; // Scent should never be higher - } } else { // this cell blocks scent - grscent[x][y] = 0; + scent_here = 0; } } } @@ -11721,7 +11694,7 @@ void game::pldrive(int x, int y) // At 10 skill, with a perfect vehicle, we could turn up to 3 times per turn cost = std::max( u.get_speed(), 100 ) * ( 1.0f - ( -penalty / 10.0f ) * 2 / 3 ); } - + if( penalty > skill || cost > 400 ) { add_msg( m_warning, _("You fumble with the %s's controls."), veh->name.c_str() ); // Anything from a wasted attempt to 2 turns in the intended direction @@ -13519,12 +13492,7 @@ void game::vertical_shift( const int z_after ) u.grab_point = tripoint_zero; u.grab_type = OBJECT_NONE; - // Clear current scents. - for( auto &elem : grscent ) { - for( auto &elem_j : elem ) { - elem_j = 0; - } - } + scent.reset(); u.setz( z_after ); const int z_before = get_levz(); @@ -13652,22 +13620,7 @@ void game::update_map(int &x, int &y) spawn_mon(shiftx, shifty); } - // Shift scent - const int sm_shift_x = (shiftx * SEEX); - const int sm_shift_y = (shifty * SEEY); - unsigned int newscent[SEEX * MAPSIZE][SEEY * MAPSIZE]; - std::fill_n( &newscent[0][0], SEEX * MAPSIZE * SEEY * MAPSIZE, 0 ); - tripoint tmp = u.pos(); - for( tmp.x = sm_shift_x; tmp.x < SEEX * MAPSIZE + sm_shift_x; tmp.x++ ) { - for( tmp.y = sm_shift_y; tmp.y < SEEY * MAPSIZE + sm_shift_y; tmp.y++ ) { - newscent[tmp.x - sm_shift_x][tmp.y - sm_shift_y] = scent(tmp); - } - } - for( tmp.x = 0; tmp.x < SEEX * MAPSIZE; tmp.x++ ) { - for( tmp.y = 0; tmp.y < SEEY * MAPSIZE; tmp.y++ ) { - scent(tmp) = newscent[tmp.x][tmp.y]; - } - } + scent.shift( shiftx * SEEX, shifty * SEEY ); // Make sure map cache is consistent since it may have shifted. m.build_map_cache( get_levz() ); @@ -14412,57 +14365,6 @@ std::vector game::factions_at( const tripoint &p ) return ret; } -nc_color sev(int a) -{ - switch (a) { - case 0: - return c_cyan; - case 1: - return c_ltcyan; - case 2: - return c_ltblue; - case 3: - return c_blue; - case 4: - return c_ltgreen; - case 5: - return c_green; - case 6: - return c_yellow; - case 7: - return c_pink; - case 8: - return c_ltred; - case 9: - return c_red; - case 10: - return c_magenta; - case 11: - return c_brown; - case 12: - return c_cyan_red; - case 13: - return c_ltcyan_red; - case 14: - return c_ltblue_red; - case 15: - return c_blue_red; - case 16: - return c_ltgreen_red; - case 17: - return c_green_red; - case 18: - return c_yellow_red; - case 19: - return c_pink_red; - case 20: - return c_magenta_red; - case 21: - return c_brown_red; - } - return c_dkgray; -} - void game::display_scent() { int div = query_int(_("Set the Scent Map sensitivity to (0 to cancel)?")); @@ -14471,14 +14373,7 @@ void game::display_scent() return; }; draw_ter(); - for (int x = u.posx() - getmaxx(w_terrain) / 2; x <= u.posx() + getmaxx(w_terrain) / 2; x++) { - for (int y = u.posy() - getmaxy(w_terrain) / 2; y <= u.posy() + getmaxy(w_terrain) / 2; y++) { - int sn = scent({x, y, u.posz()}) / (div * 2); - mvwprintz(w_terrain, getmaxy(w_terrain) / 2 + y - u.posy(), getmaxx(w_terrain) / 2 + x - u.posx(), - sev(sn / 10), "%d", - sn % 10); - } - } + scent.draw( w_terrain, div * 2, u.pos() ); wrefresh(w_terrain); getch(); } diff --git a/src/game.h b/src/game.h index 9078662f3bd16..ffa68cc31581f 100644 --- a/src/game.h +++ b/src/game.h @@ -8,6 +8,7 @@ #include "int_id.h" #include "item_location.h" #include "cursesdef.h" +#include "scent_map.h" #include #include @@ -383,7 +384,7 @@ class game void nuke( const tripoint &p ); bool spread_fungus( const tripoint &p ); std::vector factions_at( const tripoint &p ); - int &scent( const tripoint &p ); + scent_map scent; // The scent map float natural_light_level( int zlev ) const; /** Returns coarse number-of-squares of visibility at the current light level. * Used by monster and NPC AI. @@ -869,7 +870,6 @@ class game */ bool disable_robot( const tripoint &p ); - void update_scent(); // Updates the scent map bool is_game_over(); // Returns true if the player quit or died void death_screen(); // Display our stats, "GAME OVER BOO HOO" void gameover(); // Ends the game @@ -919,8 +919,6 @@ class game calendar nextspawn; // The turn on which monsters will spawn next. calendar nextweather; // The turn on which weather will shift next. int next_npc_id, next_faction_id, next_mission_id; // Keep track of UIDs - int grscent[SEEX *MAPSIZE][SEEY *MAPSIZE]; // The scent map - int nulscent; // Returned for OOB scent checks std::list events; // Game events to be processed std::map kills; // Player's kill count int moves_since_last_save; diff --git a/src/map.cpp b/src/map.cpp index dc98ed09e65b7..8b4c8cdddb8a9 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -2943,13 +2943,7 @@ void map::decay_fields_and_scent( const int amount ) // Decay scent separately, so that later we can use field count to skip empty submaps tripoint tmp; tmp.z = abs_sub.z; // TODO: Make this happen on all z-levels - for( tmp.x = 0; tmp.x < my_MAPSIZE * SEEX; tmp.x++ ) { - for( tmp.y = 0; tmp.y < my_MAPSIZE * SEEY; tmp.y++ ) { - if( g->scent( tmp ) > 0 ) { - g->scent( tmp )--; - } - } - } + g->scent.decay(); const int amount_fire = amount / 3; // Decay fire by this much const int amount_liquid = amount / 2; // Decay washable fields (blood, guts etc.) by this diff --git a/src/savegame.cpp b/src/savegame.cpp index 6c4fb78e6861b..c3bf6ab65d9dd 100644 --- a/src/savegame.cpp +++ b/src/savegame.cpp @@ -85,27 +85,8 @@ void game::serialize(std::ostream & fout) { json.member( "om_x", pos_om.x ); json.member( "om_y", pos_om.y ); - // Next, the scent map. - std::stringstream rle_out; - int rle_lastval = -1; - int rle_count = 0; - for( auto &elem : grscent ) { - for( auto val : elem ) { - - if (val == rle_lastval) { - rle_count++; - } else { - if ( rle_count ) { - rle_out << rle_count << " "; - } - rle_out << val << " "; - rle_lastval = val; - rle_count = 1; - } - } - } - rle_out << rle_count; - json.member( "grscent", rle_out.str() ); + + json.member( "grscent", scent.serialize() ); // Then each monster json.member( "active_monsters", critter_tracker->list() ); @@ -125,6 +106,30 @@ void game::serialize(std::ostream & fout) { json.end_object(); } +std::string scent_map::serialize() const +{ + std::stringstream rle_out; + int rle_lastval = -1; + int rle_count = 0; + for( auto &elem : grscent ) { + for( auto &val : elem ) { + if( val == rle_lastval ) { + rle_count++; + } else { + if( rle_count ) { + rle_out << rle_count << " "; + } + rle_out << val << " "; + rle_lastval = val; + rle_count = 1; + } + } + } + rle_out << rle_count; + return rle_out.str(); +} + + /* * Properly reuse a stringstream object for line by line parsing */ @@ -209,20 +214,9 @@ void game::unserialize(std::istream & fin) linebuf=""; if ( data.read("grscent",linebuf) ) { - linein.clear(); - linein.str(linebuf); - - int stmp; - int count = 0; - for( auto &elem : grscent ) { - for( auto &elem_j : elem ) { - if (count == 0) { - linein >> stmp >> count; - } - count--; - elem_j = stmp; - } - } + scent.deserialize( linebuf ); + } else { + scent.reset(); } JsonArray vdata = data.get_array("active_monsters"); @@ -256,6 +250,22 @@ void game::unserialize(std::istream & fin) } } +void scent_map::deserialize( const std::string &data ) +{ + std::istringstream buffer( data ); + int stmp; + int count = 0; + for( auto &elem : grscent ) { + for( auto &val : elem ) { + if( count == 0 ) { + buffer >> stmp >> count; + } + count--; + val = stmp; + } + } +} + ///// weather void game::load_weather(std::istream & fin) { if ( fin.peek() == '#' ) { diff --git a/src/scent_map.cpp b/src/scent_map.cpp new file mode 100644 index 0000000000000..21625511cb292 --- /dev/null +++ b/src/scent_map.cpp @@ -0,0 +1,117 @@ +#include "scent_map.h" +#include "calendar.h" +#include "color.h" +#include "map.h" +#include "output.h" + +nc_color sev( const int a ) +{ + switch( a ) { + case 0: + return c_cyan; + case 1: + return c_ltcyan; + case 2: + return c_ltblue; + case 3: + return c_blue; + case 4: + return c_ltgreen; + case 5: + return c_green; + case 6: + return c_yellow; + case 7: + return c_pink; + case 8: + return c_ltred; + case 9: + return c_red; + case 10: + return c_magenta; + case 11: + return c_brown; + case 12: + return c_cyan_red; + case 13: + return c_ltcyan_red; + case 14: + return c_ltblue_red; + case 15: + return c_blue_red; + case 16: + return c_ltgreen_red; + case 17: + return c_green_red; + case 18: + return c_yellow_red; + case 19: + return c_pink_red; + case 20: + return c_magenta_red; + case 21: + return c_brown_red; + } + return c_dkgray; +} + +scent_map::scent_map() = default; + +void scent_map::reset() +{ + for( auto &elem : grscent ) { + for( auto &val : elem ) { + val = 0; + } + } +} + +void scent_map::decay() +{ + for( auto &elem : grscent ) { + for( auto &val : elem ) { + val = std::max( 0, val - 1 ); + } + } +} + +void scent_map::draw( WINDOW *const win, const int div, const tripoint ¢er ) const +{ + const int maxx = getmaxx( win ); + const int maxy = getmaxy( win ); + for( int x = 0; x < maxx; ++x ) { + for( int y = 0; y < maxy; ++y ) { + const int sn = operator()( x + center.x - maxx / 2, y + center.y - maxy / 2 ) / div; + mvwprintz( win, y, x, sev( sn / 10 ), "%d", sn % 10 ); + } + } +} + +void scent_map::shift( const int sm_shift_x, const int sm_shift_y ) +{ + scent_array new_scent; + for( size_t x = 0; x < SEEX * MAPSIZE; ++x ) { + for( size_t y = 0; y < SEEY * MAPSIZE; ++y ) { + // operator() does bound checking and returns 0 upon invalid coordinates + new_scent[x][y] = operator()( x + sm_shift_x, y + sm_shift_y ); + } + } + grscent = new_scent; +} + +int scent_map::operator()( const size_t x, const size_t y ) const +{ + if( inbounds( x, y ) ) { + return grscent[x][y]; + } + return 0; +} + +int &scent_map::operator()( const size_t x, const size_t y ) +{ + if( inbounds( x, y ) ) { + return grscent[x][y]; + } + null_scent = 0; + return null_scent; +} diff --git a/src/scent_map.h b/src/scent_map.h new file mode 100644 index 0000000000000..c23c499d366f0 --- /dev/null +++ b/src/scent_map.h @@ -0,0 +1,63 @@ +#ifndef SCENT_H +#define SCENT_H + +#include "enums.h" +#include "game_constants.h" +#include "cursesdef.h" + +#include + +class map; + +class scent_map +{ + protected: + template + using scent_array = std::array, SEEX *MAPSIZE>; + + scent_array grscent; + int null_scent = 0; + tripoint player_last_position = tripoint_min; + int player_last_moved = -1; + + public: + scent_map(); + + void deserialize( const std::string &data ); + std::string serialize() const; + + void draw( WINDOW *w, int div, const tripoint ¢er ) const; + + void update( const tripoint ¢er, map &m ); + void reset(); + void decay(); + void shift( int sm_shift_x, int sm_shift_y ); + + /** + * Get the scent value at the given position. + * An invalid position is allows and will yield a 0 value. + * The coordinate system is the same as the @ref map (`g->m`) uses. + */ + /**@{*/ + int &operator()( size_t x, size_t y ); + int &operator()( const point &p ) { + return operator()( p.x, p.y ); + } + int &operator()( const tripoint &p ) { + return operator()( p.x, p.y ); + } + int operator()( size_t x, size_t y ) const; + int operator()( const point &p ) const { + return operator()( p.x, p.y ); + } + int operator()( const tripoint &p ) const { + return operator()( p.x, p.y ); + } + /**@}*/ + + bool inbounds( size_t x, size_t y ) const { + return x < SEEX * MAPSIZE && y < SEEY * MAPSIZE; + } +}; + +#endif diff --git a/src/tutorial.cpp b/src/tutorial.cpp index f0734c8f8cc5d..269abf79d05c3 100644 --- a/src/tutorial.cpp +++ b/src/tutorial.cpp @@ -25,11 +25,7 @@ bool tutorial_game::init() for( auto &elem : tutorials_seen ) { elem = false; } - // Set the scent map to 0 - for( int i = 0; i < SEEX * MAPSIZE; i++ ) { - for( int j = 0; j < SEEX * MAPSIZE; j++ ) - g->scent( { i, j, g->get_levz() } ) = 0; - } + g->scent.reset(); g->temperature = 65; // We use a Z-factor of 10 so that we don't plop down tutorial rooms in the // middle of the "real" game world From 5ba65d515cc89f5f077827a60a6e380d30d4ccd4 Mon Sep 17 00:00:00 2001 From: BevapDin Date: Tue, 7 Jun 2016 19:01:07 +0200 Subject: [PATCH 076/110] Move scent_map::update to scent_map.h --- src/game.cpp | 108 ---------------------------------------------- src/scent_map.cpp | 102 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 108 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 4c04f125ca687..bcb20284ef8d9 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -3333,114 +3333,6 @@ bool game::try_get_right_click_action( action_id &act, const tripoint &mouse_tar return true; } -#define SCENT_RADIUS 40 - -// TODO: Unify this and scent area used in update_scent to fix "scent pocket" bug -bool outside_scent_radius( const tripoint &p ) { - return p.x < (SEEX * MAPSIZE / 2) - SCENT_RADIUS || p.x >= (SEEX * MAPSIZE / 2) + SCENT_RADIUS || - p.y < (SEEY * MAPSIZE / 2) - SCENT_RADIUS || p.y >= (SEEY * MAPSIZE / 2) + SCENT_RADIUS; -} - -void scent_map::update( const tripoint ¢er, map &m ) -{ - // Stop updating scent after X turns of the player not moving. - // Once wind is added, need to reset this on wind shifts as well. - if( center == player_last_position && player_last_moved + 1000 < calendar::turn ) { - return; - } - player_last_position = center; - player_last_moved = calendar::turn; - - // note: the next four intermediate matrices need to be at least - // [2*SCENT_RADIUS+3][2*SCENT_RADIUS+1] in size to hold enough data - // The code I'm modifying used [SEEX * MAPSIZE]. I'm staying with that to avoid new bugs. - - - // These two matrices are transposed so that x addresses are contiguous in memory - scent_array sum_3_scent_y; - scent_array squares_used_y; - - // these are for caching flag lookups - scent_array blocks_scent; // currently only TFLAG_WALL blocks scent - scent_array reduces_scent; - - - // for loop constants - const int scentmap_minx = center.x - SCENT_RADIUS; - const int scentmap_maxx = center.x + SCENT_RADIUS; - const int scentmap_miny = center.y - SCENT_RADIUS; - const int scentmap_maxy = center.y + SCENT_RADIUS; - - const int diffusivity = 100; // decrease this to reduce gas spread. Keep it under 125 for - // stability. This is essentially a decimal number * 1000. - - // The new scent flag searching function. Should be wayyy faster than the old one. - m.scent_blockers( blocks_scent, reduces_scent, - scentmap_minx, scentmap_miny, scentmap_maxx, scentmap_maxy ); - // Sum neighbors in the y direction. This way, each square gets called 3 times instead of 9 - // times. This cost us an extra loop here, but it also eliminated a loop at the end, so there - // is a net performance improvement over the old code. Could probably still be better. - // note: this method needs an array that is one square larger on each side in the x direction - // than the final scent matrix. I think this is fine since SCENT_RADIUS is less than - // SEEX*MAPSIZE, but if that changes, this may need tweaking. - for (int x = scentmap_minx - 1; x <= scentmap_maxx + 1; ++x) { - for (int y = scentmap_miny; y <= scentmap_maxy; ++y) { - // remember the sum of the scent val for the 3 neighboring squares that can defuse into - sum_3_scent_y[y][x] = 0; - squares_used_y[y][x] = 0; - for (int i = y - 1; i <= y + 1; ++i) { - if (! blocks_scent[x][i]) { - if (reduces_scent[x][i]) { - // only 20% of scent can diffuse on REDUCE_SCENT squares - sum_3_scent_y[y][x] += 2 * grscent[x][i]; - squares_used_y[y][x] += 2; - } else { - sum_3_scent_y[y][x] += 10 * grscent[x][i]; - squares_used_y[y][x] += 10; - } - } - } - } - } - - // Rest of the scent map - for (int x = scentmap_minx; x <= scentmap_maxx; ++x) { - for (int y = scentmap_miny; y <= scentmap_maxy; ++y) { - auto &scent_here = grscent[x][y]; - if (! blocks_scent[x][y]) { - // to how many neighboring squares do we diffuse out? (include our own square - // since we also include our own square when diffusing in) - int squares_used = squares_used_y[y][x - 1] - + squares_used_y[y][x] - + squares_used_y[y][x + 1]; - - int this_diffusivity; - if (! reduces_scent[x][y]) { - this_diffusivity = diffusivity; - } else { - this_diffusivity = diffusivity / 5; //less air movement for REDUCE_SCENT square - } - int temp_scent; - // take the old scent and subtract what diffuses out - temp_scent = scent_here * (10 * 1000 - squares_used * this_diffusivity); - // neighboring walls and reduce_scent squares absorb some scent - temp_scent -= scent_here * this_diffusivity * (90 - squares_used) / 5; - // we've already summed neighboring scent values in the y direction in the previous - // loop. Now we do it for the x direction, multiply by diffusion, and this is what - // diffuses into our current square. - scent_here = - (temp_scent - + this_diffusivity * (sum_3_scent_y[y][x - 1] - + sum_3_scent_y[y][x] - + sum_3_scent_y[y][x + 1]) - ) / (1000 * 10); - } else { // this cell blocks scent - scent_here = 0; - } - } - } -} - bool game::is_game_over() { if (uquit == QUIT_WATCH) { diff --git a/src/scent_map.cpp b/src/scent_map.cpp index 21625511cb292..f32bdec8100c9 100644 --- a/src/scent_map.cpp +++ b/src/scent_map.cpp @@ -4,6 +4,8 @@ #include "map.h" #include "output.h" +static constexpr int SCENT_RADIUS = 40; + nc_color sev( const int a ) { switch( a ) { @@ -115,3 +117,103 @@ int &scent_map::operator()( const size_t x, const size_t y ) null_scent = 0; return null_scent; } + +void scent_map::update( const tripoint ¢er, map &m ) +{ + // Stop updating scent after X turns of the player not moving. + // Once wind is added, need to reset this on wind shifts as well. + if( center == player_last_position && player_last_moved + 1000 < calendar::turn ) { + return; + } + player_last_position = center; + player_last_moved = calendar::turn; + + // note: the next four intermediate matrices need to be at least + // [2*SCENT_RADIUS+3][2*SCENT_RADIUS+1] in size to hold enough data + // The code I'm modifying used [SEEX * MAPSIZE]. I'm staying with that to avoid new bugs. + + // These two matrices are transposed so that x addresses are contiguous in memory + scent_array sum_3_scent_y; + scent_array squares_used_y; + + // these are for caching flag lookups + scent_array blocks_scent; // currently only TFLAG_WALL blocks scent + scent_array reduces_scent; + + // for loop constants + const int scentmap_minx = center.x - SCENT_RADIUS; + const int scentmap_maxx = center.x + SCENT_RADIUS; + const int scentmap_miny = center.y - SCENT_RADIUS; + const int scentmap_maxy = center.y + SCENT_RADIUS; + + // decrease this to reduce gas spread. Keep it under 125 for + // stability. This is essentially a decimal number * 1000. + const int diffusivity = 100; + + // The new scent flag searching function. Should be wayyy faster than the old one. + m.scent_blockers( blocks_scent, reduces_scent, scentmap_minx, scentmap_miny, scentmap_maxx, + scentmap_maxy ); + // Sum neighbors in the y direction. This way, each square gets called 3 times instead of 9 + // times. This cost us an extra loop here, but it also eliminated a loop at the end, so there + // is a net performance improvement over the old code. Could probably still be better. + // note: this method needs an array that is one square larger on each side in the x direction + // than the final scent matrix. I think this is fine since SCENT_RADIUS is less than + // SEEX*MAPSIZE, but if that changes, this may need tweaking. + for( int x = scentmap_minx - 1; x <= scentmap_maxx + 1; ++x ) { + for( int y = scentmap_miny; y <= scentmap_maxy; ++y ) { + // remember the sum of the scent val for the 3 neighboring squares that can defuse into + sum_3_scent_y[y][x] = 0; + squares_used_y[y][x] = 0; + for( int i = y - 1; i <= y + 1; ++i ) { + if( !blocks_scent[x][i] ) { + if( reduces_scent[x][i] ) { + // only 20% of scent can diffuse on REDUCE_SCENT squares + sum_3_scent_y[y][x] += 2 * grscent[x][i]; + squares_used_y[y][x] += 2; + } else { + sum_3_scent_y[y][x] += 10 * grscent[x][i]; + squares_used_y[y][x] += 10; + } + } + } + } + } + + // Rest of the scent map + for( int x = scentmap_minx; x <= scentmap_maxx; ++x ) { + for( int y = scentmap_miny; y <= scentmap_maxy; ++y ) { + auto &scent_here = grscent[x][y]; + if( !blocks_scent[x][y] ) { + // to how many neighboring squares do we diffuse out? (include our own square + // since we also include our own square when diffusing in) + int squares_used = squares_used_y[y][x - 1] + + squares_used_y[y][x] + + squares_used_y[y][x + 1]; + + int this_diffusivity; + if( !reduces_scent[x][y] ) { + this_diffusivity = diffusivity; + } else { + this_diffusivity = diffusivity / 5; //less air movement for REDUCE_SCENT square + } + int temp_scent; + // take the old scent and subtract what diffuses out + temp_scent = scent_here * ( 10 * 1000 - squares_used * this_diffusivity ); + // neighboring walls and reduce_scent squares absorb some scent + temp_scent -= scent_here * this_diffusivity * ( 90 - squares_used ) / 5; + // we've already summed neighboring scent values in the y direction in the previous + // loop. Now we do it for the x direction, multiply by diffusion, and this is what + // diffuses into our current square. + scent_here = + ( temp_scent + + this_diffusivity * ( sum_3_scent_y[y][x - 1] + + sum_3_scent_y[y][x] + + sum_3_scent_y[y][x + 1] ) + ) / ( 1000 * 10 ); + } else { + // this cell blocks scent + scent_here = 0; + } + } + } +} From 48c80ca3c0303101e9b06d4153f3e068421c4a0b Mon Sep 17 00:00:00 2001 From: BevapDin Date: Tue, 7 Jun 2016 21:51:59 +0200 Subject: [PATCH 077/110] Fix accessing uninitialized memory Both arrays (`blocks_scent` and `reduces_scent`) are uninitialized when the function is called. The function is supposed to initialized all entries in the given range. --- src/map.cpp | 13 ++++++++----- src/scent_map.cpp | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/map.cpp b/src/map.cpp index 8b4c8cdddb8a9..cd2381ca60e50 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -8176,15 +8176,18 @@ void map::scent_blockers( std::array, SEEY * MA auto reduce = TFLAG_REDUCE_SCENT; auto block = TFLAG_WALL; auto fill_values = [&]( const tripoint &gp, const submap *sm, const point &lp ) { + // We need to generate the x/y coords, because we can't get them "for free" + const int x = gp.x * SEEX + lp.x; + const int y = gp.y * SEEY + lp.y; if( sm->get_ter( lp.x, lp.y ).obj().has_flag( block ) ) { - // We need to generate the x/y coords, because we can't get them "for free" - const int x = ( gp.x * SEEX ) + lp.x; - const int y = ( gp.y * SEEY ) + lp.y; blocks_scent[x][y] = true; + reduces_scent[x][y] = false; } else if( sm->get_ter( lp.x, lp.y ).obj().has_flag( reduce ) || sm->get_furn( lp.x, lp.y ).obj().has_flag( reduce ) ) { - const int x = ( gp.x * SEEX ) + lp.x; - const int y = ( gp.y * SEEY ) + lp.y; + blocks_scent[x][y] = false; reduces_scent[x][y] = true; + } else { + blocks_scent[x][y] = false; + reduces_scent[x][y] = false; } return ITER_CONTINUE; diff --git a/src/scent_map.cpp b/src/scent_map.cpp index f32bdec8100c9..8e844329a1255 100644 --- a/src/scent_map.cpp +++ b/src/scent_map.cpp @@ -151,8 +151,8 @@ void scent_map::update( const tripoint ¢er, map &m ) const int diffusivity = 100; // The new scent flag searching function. Should be wayyy faster than the old one. - m.scent_blockers( blocks_scent, reduces_scent, scentmap_minx, scentmap_miny, scentmap_maxx, - scentmap_maxy ); + m.scent_blockers( blocks_scent, reduces_scent, scentmap_minx - 1, scentmap_miny - 1, + scentmap_maxx + 1, scentmap_maxy + 1 ); // Sum neighbors in the y direction. This way, each square gets called 3 times instead of 9 // times. This cost us an extra loop here, but it also eliminated a loop at the end, so there // is a net performance improvement over the old code. Could probably still be better. From b7343a895e18f5d3241a3b1dbb569944ee1d5fbe Mon Sep 17 00:00:00 2001 From: codemime Date: Wed, 8 Jun 2016 13:25:04 +0300 Subject: [PATCH 078/110] Fix waiting and use the actual time of sunrise and sunset --- src/calendar.cpp | 10 ++++++++++ src/calendar.h | 5 +++++ src/game.cpp | 12 +++++------- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/calendar.cpp b/src/calendar.cpp index 640d2bcb6d616..e561bc58bbb4f 100644 --- a/src/calendar.cpp +++ b/src/calendar.cpp @@ -441,6 +441,16 @@ int calendar::day_of_year() const return day + season_length() * season; } +int calendar::diurnal_time_before( int turn ) const +{ + return ( turn >= get_turn() ) ? turn - get_turn() : DAYS( 1 ) - get_turn() + turn; +} + +int calendar::diurnal_time_before( const calendar &time ) const +{ + return diurnal_time_before( time.get_turn() ); +} + void calendar::sync() { const int sl = season_length(); diff --git a/src/calendar.h b/src/calendar.h index c42e73596a835..0d145ebdab168 100644 --- a/src/calendar.h +++ b/src/calendar.h @@ -154,6 +154,10 @@ class calendar int day_of_year() const; + /** Returns the remaining time (in turns) before the specified diurnal time (in turns) */ + int diurnal_time_before( int turn ) const; + int diurnal_time_before( const calendar &time ) const; + static std::string print_duration( int turns ); /** Returns the current time in a string according to the options set */ @@ -168,4 +172,5 @@ class calendar static season_type initial_season; static bool eternal_season; }; + #endif diff --git a/src/game.cpp b/src/game.cpp index 7e8eb1da5a9f5..754f969afe3b6 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -11720,7 +11720,7 @@ void game::pldrive(int x, int y) // At 10 skill, with a perfect vehicle, we could turn up to 3 times per turn cost = std::max( u.get_speed(), 100 ) * ( 1.0f - ( -penalty / 10.0f ) * 2 / 3 ); } - + if( penalty > skill || cost > 400 ) { add_msg( m_warning, _("You fumble with the %s's controls."), veh->name.c_str() ); // Anything from a wasted attempt to 2 turns in the intended direction @@ -14036,8 +14036,6 @@ void game::spawn_mon(int /*shiftx*/, int /*shifty*/) // Helper function for game::wait(). static int convert_wait_chosen_to_turns( int choice ) { - const int iHour = calendar::turn.hours(); - switch( choice ) { case 1: return MINUTES( 5 ); @@ -14052,13 +14050,13 @@ static int convert_wait_chosen_to_turns( int choice ) { case 6: return HOURS( 6 ); case 7: - return HOURS( ((iHour <= 6) ? 6 - iHour : 24 - iHour + 6) ); + return calendar::turn.diurnal_time_before( calendar::turn.sunrise() ); case 8: - return HOURS( ((iHour <= 12) ? 12 - iHour : 12 - iHour + 6) ); + return calendar::turn.diurnal_time_before( HOURS( 12 ) ); case 9: - return HOURS( ((iHour <= 18) ? 18 - iHour : 18 - iHour + 6) ); + return calendar::turn.diurnal_time_before( calendar::turn.sunset() ); case 10: - return HOURS( ((iHour <= 24) ? 24 - iHour : 24 - iHour + 6) ); + return calendar::turn.diurnal_time_before( HOURS( 0 ) ); case 11: default: return 999999999; From 24fb08e7cd0ad8bcd6a88f78b9fc4ccd82231aaf Mon Sep 17 00:00:00 2001 From: codemime Date: Wed, 8 Jun 2016 14:52:31 +0300 Subject: [PATCH 079/110] Simplify a bit --- src/calendar.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calendar.cpp b/src/calendar.cpp index e561bc58bbb4f..6bba58a209bdd 100644 --- a/src/calendar.cpp +++ b/src/calendar.cpp @@ -443,7 +443,8 @@ int calendar::day_of_year() const int calendar::diurnal_time_before( int turn ) const { - return ( turn >= get_turn() ) ? turn - get_turn() : DAYS( 1 ) - get_turn() + turn; + const int remainder = turn - get_turn() % DAYS( 1 ); + return ( remainder >= 0 ) ? remainder : DAYS( 1 ) + remainder; } int calendar::diurnal_time_before( const calendar &time ) const From 596cec412d1d6f134ee95fad79dfed5c13fa4d41 Mon Sep 17 00:00:00 2001 From: codemime Date: Wed, 8 Jun 2016 16:05:15 +0300 Subject: [PATCH 080/110] Remove the excessive overloaded function --- src/calendar.cpp | 5 ----- src/calendar.h | 1 - 2 files changed, 6 deletions(-) diff --git a/src/calendar.cpp b/src/calendar.cpp index 6bba58a209bdd..d5a126cdc5737 100644 --- a/src/calendar.cpp +++ b/src/calendar.cpp @@ -447,11 +447,6 @@ int calendar::diurnal_time_before( int turn ) const return ( remainder >= 0 ) ? remainder : DAYS( 1 ) + remainder; } -int calendar::diurnal_time_before( const calendar &time ) const -{ - return diurnal_time_before( time.get_turn() ); -} - void calendar::sync() { const int sl = season_length(); diff --git a/src/calendar.h b/src/calendar.h index 0d145ebdab168..374661852e6ed 100644 --- a/src/calendar.h +++ b/src/calendar.h @@ -156,7 +156,6 @@ class calendar /** Returns the remaining time (in turns) before the specified diurnal time (in turns) */ int diurnal_time_before( int turn ) const; - int diurnal_time_before( const calendar &time ) const; static std::string print_duration( int turns ); From b11175469a8e5bceca27bcc2b1c9af0cf891a33a Mon Sep 17 00:00:00 2001 From: pisskop Date: Wed, 8 Jun 2016 09:12:23 -0400 Subject: [PATCH 081/110] Update road_4way.json --- data/json/mapgen/road_4way.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/mapgen/road_4way.json b/data/json/mapgen/road_4way.json index 5bb88fa811f76..b4a1683b57a1d 100644 --- a/data/json/mapgen/road_4way.json +++ b/data/json/mapgen/road_4way.json @@ -19,16 +19,16 @@ "........................", "........................", "........................", - "........................", - ".:::.......]].......:::.", + "...........]]...........", + ".:::......]]]]......:::.", ".:::......]]]]......:::.", - "..........]]]]..........", "...........]]...........", "........................", "........................", "........................", "........................", "........................", + "........................", " .......::....... ", " .......::....... ", " .......::....... ", From a07009cc674c55ab0ad5c1be423d595350150610 Mon Sep 17 00:00:00 2001 From: pisskop Date: Wed, 8 Jun 2016 09:14:18 -0400 Subject: [PATCH 082/110] Update cemetery_4square.json Tune down those sapwn chances to reduce the 'omgcrapere'where' effect --- data/json/mapgen/cemetery_4square.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/mapgen/cemetery_4square.json b/data/json/mapgen/cemetery_4square.json index f058e1aa2433c..9511effa6c874 100644 --- a/data/json/mapgen/cemetery_4square.json +++ b/data/json/mapgen/cemetery_4square.json @@ -365,9 +365,9 @@ "P": "f_sign" }, "place_items": [ - { "item": "church", "chance": 85, "x": [14, 18], "y": [ 5, 14] }, - { "item": "church", "chance": 85, "x": [ 11, 12 ], "y": [ 5, 6 ] }, - { "item": "jackets", "chance": 95, "x": [12], "y": [14] } + { "item": "church", "chance": 65, "x": [14, 18], "y": [ 5, 14] }, + { "item": "church", "chance": 65, "x": [ 11, 12 ], "y": [ 5, 6 ] }, + { "item": "jackets", "chance": 50, "x": [12], "y": [14] } ] } } From 0b34e142251c33996c5364f58a01541ec1f6d6e6 Mon Sep 17 00:00:00 2001 From: BevapDin Date: Wed, 8 Jun 2016 17:18:59 +0200 Subject: [PATCH 083/110] Remove include of scent_map.h from game.h Only expose an reference to the scent_map as public member, referring to the content of a member pointer. Code that accesses the scent_map object itself needs to include scent_map.h itself. --- src/editmap.cpp | 1 + src/field.cpp | 1 + src/game.cpp | 3 +++ src/game.h | 5 +++-- src/map.cpp | 1 + src/monmove.cpp | 1 + src/savegame.cpp | 1 + src/tutorial.cpp | 1 + 8 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/editmap.cpp b/src/editmap.cpp index 54e22358b4e21..e889b8e740abf 100644 --- a/src/editmap.cpp +++ b/src/editmap.cpp @@ -27,6 +27,7 @@ #include "overmap.h" #include "field.h" #include "ui.h" +#include "scent_map.h" #include #include diff --git a/src/field.cpp b/src/field.cpp index e38a83682562d..54264f4a2b1d7 100644 --- a/src/field.cpp +++ b/src/field.cpp @@ -14,6 +14,7 @@ #include "submap.h" #include "mapdata.h" #include "mtype.h" +#include "scent_map.h" const species_id FUNGUS( "FUNGUS" ); diff --git a/src/game.cpp b/src/game.cpp index bcb20284ef8d9..bbba57d4d6736 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -83,6 +83,7 @@ #include "pathfinding.h" #include "gates.h" #include "item_factory.h" +#include "scent_map.h" #include #include @@ -208,10 +209,12 @@ game::game() : u_ptr( new player() ), liveview_ptr( new live_view() ), liveview( *liveview_ptr ), + scent_ptr( new scent_map() ), new_game(false), uquit(QUIT_NO), m( *map_ptr ), u( *u_ptr ), + scent( *scent_ptr ), critter_tracker( new Creature_tracker() ), weather_gen( new weather_generator() ), weather_precise( new w_point() ), diff --git a/src/game.h b/src/game.h index ffa68cc31581f..14c3c35683ab0 100644 --- a/src/game.h +++ b/src/game.h @@ -8,7 +8,6 @@ #include "int_id.h" #include "item_location.h" #include "cursesdef.h" -#include "scent_map.h" #include #include @@ -119,6 +118,7 @@ typedef int nc_color; struct w_point; struct explosion_data; struct visibility_variables; +class scent_map; // Note: this is copied from inventory.h // Entire inventory.h would also bring item.h here @@ -154,6 +154,7 @@ class game std::unique_ptr u_ptr; std::unique_ptr liveview_ptr; live_view& liveview; + std::unique_ptr scent_ptr; public: /** Initializes the UI. */ @@ -206,6 +207,7 @@ class game /** Make map a reference here, to avoid map.h in game.h */ map &m; player &u; + scent_map &scent; std::unique_ptr critter_tracker; /** @@ -384,7 +386,6 @@ class game void nuke( const tripoint &p ); bool spread_fungus( const tripoint &p ); std::vector factions_at( const tripoint &p ); - scent_map scent; // The scent map float natural_light_level( int zlev ) const; /** Returns coarse number-of-squares of visibility at the current light level. * Used by monster and NPC AI. diff --git a/src/map.cpp b/src/map.cpp index cd2381ca60e50..af768f5b8d5c2 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -32,6 +32,7 @@ #include "weather.h" #include "item_group.h" #include "pathfinding.h" +#include "scent_map.h" #include #include diff --git a/src/monmove.cpp b/src/monmove.cpp index 8dac173f8ebfa..d57b1399ed96b 100644 --- a/src/monmove.cpp +++ b/src/monmove.cpp @@ -18,6 +18,7 @@ #include "mapdata.h" #include "mtype.h" #include "field.h" +#include "scent_map.h" #include //Used for e^(x) functions diff --git a/src/savegame.cpp b/src/savegame.cpp index c3bf6ab65d9dd..5ac0cb36a7d79 100644 --- a/src/savegame.cpp +++ b/src/savegame.cpp @@ -21,6 +21,7 @@ #include "mapdata.h" #include "translations.h" #include "mongroup.h" +#include "scent_map.h" #include #include diff --git a/src/tutorial.cpp b/src/tutorial.cpp index 269abf79d05c3..979688f03c63d 100644 --- a/src/tutorial.cpp +++ b/src/tutorial.cpp @@ -12,6 +12,7 @@ #include "overmap.h" #include "trap.h" #include "player.h" +#include "scent_map.h" const mtype_id mon_zombie( "mon_zombie" ); From 169d80eb7d350bf0b1721e96e99c81e4eae425d8 Mon Sep 17 00:00:00 2001 From: BevapDin Date: Wed, 8 Jun 2016 17:41:10 +0200 Subject: [PATCH 084/110] Add assert to report on value that would cause undefined behavior --- src/scent_map.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/scent_map.cpp b/src/scent_map.cpp index 8e844329a1255..8179007da6255 100644 --- a/src/scent_map.cpp +++ b/src/scent_map.cpp @@ -4,6 +4,8 @@ #include "map.h" #include "output.h" +#include + static constexpr int SCENT_RADIUS = 40; nc_color sev( const int a ) @@ -79,6 +81,7 @@ void scent_map::decay() void scent_map::draw( WINDOW *const win, const int div, const tripoint ¢er ) const { + assert( div != 0 ); const int maxx = getmaxx( win ); const int maxy = getmaxy( win ); for( int x = 0; x < maxx; ++x ) { From 8f33b8cf8a29974b70cea39552b4ba8c82c95d9c Mon Sep 17 00:00:00 2001 From: BevapDin Date: Wed, 8 Jun 2016 18:42:00 +0200 Subject: [PATCH 085/110] Convert switch statement to array. No more messing around with numbers. And shorter. And C++11. --- src/scent_map.cpp | 75 +++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 48 deletions(-) diff --git a/src/scent_map.cpp b/src/scent_map.cpp index 8179007da6255..12f3e843af73b 100644 --- a/src/scent_map.cpp +++ b/src/scent_map.cpp @@ -8,55 +8,34 @@ static constexpr int SCENT_RADIUS = 40; -nc_color sev( const int a ) +nc_color sev( const size_t level ) { - switch( a ) { - case 0: - return c_cyan; - case 1: - return c_ltcyan; - case 2: - return c_ltblue; - case 3: - return c_blue; - case 4: - return c_ltgreen; - case 5: - return c_green; - case 6: - return c_yellow; - case 7: - return c_pink; - case 8: - return c_ltred; - case 9: - return c_red; - case 10: - return c_magenta; - case 11: - return c_brown; - case 12: - return c_cyan_red; - case 13: - return c_ltcyan_red; - case 14: - return c_ltblue_red; - case 15: - return c_blue_red; - case 16: - return c_ltgreen_red; - case 17: - return c_green_red; - case 18: - return c_yellow_red; - case 19: - return c_pink_red; - case 20: - return c_magenta_red; - case 21: - return c_brown_red; - } - return c_dkgray; + static const std::array colors = { { + c_cyan, + c_ltcyan, + c_ltblue, + c_blue, + c_ltgreen, + c_green, + c_yellow, + c_pink, + c_ltred, + c_red, + c_magenta, + c_brown, + c_cyan_red, + c_ltcyan_red, + c_ltblue_red, + c_blue_red, + c_ltgreen_red, + c_green_red, + c_yellow_red, + c_pink_red, + c_magenta_red, + c_brown_red, + } + }; + return level < colors.size() ? colors[level] : c_dkgray; } scent_map::scent_map() = default; From 8238cfff252be1addcf60542e575741ea4a1ea81 Mon Sep 17 00:00:00 2001 From: Cyrano7 Date: Tue, 7 Jun 2016 23:59:13 -0700 Subject: [PATCH 086/110] json data spaces --- data/json/effects.json | 2 +- data/json/furniture.json | 2 +- data/json/items/ammo/545x39.json | 1 - data/json/items/ammo/5x50.json | 4 ++-- data/json/items/ammo/9x18.json | 6 +++--- data/json/items/ammo/metal_rail.json | 4 ++-- data/json/items/comestibles/mutagen.json | 2 +- data/json/items/comestibles/seed.json | 4 ++-- data/json/items/magazine/762x25.json | 1 - data/json/mapgen/cemetery_4square.json | 9 ++++----- data/json/recipes/recipe_food.json | 2 +- 11 files changed, 17 insertions(+), 20 deletions(-) diff --git a/data/json/effects.json b/data/json/effects.json index 562313ad18a21..39b1ea65b0ff4 100644 --- a/data/json/effects.json +++ b/data/json/effects.json @@ -1560,7 +1560,7 @@ "desc": [ "A lack of vitamin A in your diet will progressively worsen your vision." ], "apply_message": "You beging struggling to make out the finer details.", "remove_message": "Your normal visual accuity returns.", - "decay_messages": [ + "decay_messages": [ [ "Your vitamin A deficiency is nearly resolved.", "good" ], [ "Your vision improves as your Vitamin A deficiency improves.", "good" ] ], diff --git a/data/json/furniture.json b/data/json/furniture.json index 0eb711c7d899e..6356f22ba210d 100644 --- a/data/json/furniture.json +++ b/data/json/furniture.json @@ -1124,7 +1124,7 @@ "bgcolor": "brown", "move_cost_mod": -1, "required_str": 14, - "flags": ["TRANSPARENT", "CONTAINER", "SEALED", "ALLOW_FIELD_EFFECT", "FLAMMABLE", "PLACE_ITEM", + "flags": ["TRANSPARENT", "CONTAINER", "SEALED", "ALLOW_FIELD_EFFECT", "FLAMMABLE", "PLACE_ITEM", "ORGANIC", "MOUNTABLE", "SHORT"], "deconstruct": { "items": [ diff --git a/data/json/items/ammo/545x39.json b/data/json/items/ammo/545x39.json index 45670e410964c..6470a34cc5503 100644 --- a/data/json/items/ammo/545x39.json +++ b/data/json/items/ammo/545x39.json @@ -23,7 +23,6 @@ "effects": [ "COOKOFF" ] }, { - "id": "545_ap", "copy-from": "545", "type": "AMMO", diff --git a/data/json/items/ammo/5x50.json b/data/json/items/ammo/5x50.json index adb4384a4cfbb..3b3ebf8d280a8 100644 --- a/data/json/items/ammo/5x50.json +++ b/data/json/items/ammo/5x50.json @@ -1,5 +1,5 @@ [ - { + { "id": "5x50dart", "type": "AMMO", "name": "RA110 5x50mm flechette", @@ -21,7 +21,7 @@ "recoil": 60, "effects": ["COOKOFF", "NEVER_MISFIRES"] }, - { + { "id": "5x50heavy", "copy-from": "5x50dart", "type": "AMMO", diff --git a/data/json/items/ammo/9x18.json b/data/json/items/ammo/9x18.json index f2a418ad74682..34a3dce2c4f59 100644 --- a/data/json/items/ammo/9x18.json +++ b/data/json/items/ammo/9x18.json @@ -1,5 +1,5 @@ [ - { + { "id": "9x18mm", "type": "AMMO", "name": "9x18mm 57-N-181S", @@ -22,7 +22,7 @@ "recoil": 185, "effects": [ "COOKOFF" ] }, - { + { "id": "9x18mmP2", "copy-from": "9x18mm", "type": "AMMO", @@ -38,7 +38,7 @@ "recoil": 30 } }, - { + { "id": "9x18mmfmj", "copy-from": "9x18mm", "type": "AMMO", diff --git a/data/json/items/ammo/metal_rail.json b/data/json/items/ammo/metal_rail.json index 49d8b95940a2a..d1cb5d13da2c2 100644 --- a/data/json/items/ammo/metal_rail.json +++ b/data/json/items/ammo/metal_rail.json @@ -1,6 +1,6 @@ [ - { + { "type": "AMMO", "id": "rebar_rail", "name": "rebar rail", @@ -23,7 +23,7 @@ "recoil": 300, "effects": [ "RECYCLED" ] }, - { + { "id": "steel_rail", "copy-from": "rebar_rail", "type": "AMMO", diff --git a/data/json/items/comestibles/mutagen.json b/data/json/items/comestibles/mutagen.json index 24316229e22c8..64d23615ed373 100644 --- a/data/json/items/comestibles/mutagen.json +++ b/data/json/items/comestibles/mutagen.json @@ -25,7 +25,7 @@ "type" : "COMESTIBLE", "name" : "abstract mutagen flavor", "addiction_potential" : 2 - }, + }, { "id" : "mutagen_alpha", "copy-from" : "mutagen_flavor", diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index bdc6d423eb5b3..467907b98f9f5 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -14,7 +14,7 @@ "symbol": ".", "color": "brown" }, - { + { "id": "seed_blackberries", "copy-from": "seed", "type": "COMESTIBLE", @@ -75,7 +75,7 @@ "grow": 120 } }, - { + { "id": "seed_raspberries", "copy-from": "seed", "type": "COMESTIBLE", diff --git a/data/json/items/magazine/762x25.json b/data/json/items/magazine/762x25.json index 8dcfdb4b16cba..fad1da02fd1e2 100644 --- a/data/json/items/magazine/762x25.json +++ b/data/json/items/magazine/762x25.json @@ -1,5 +1,4 @@ [ - { "id": "ppshmag", "type": "MAGAZINE", diff --git a/data/json/mapgen/cemetery_4square.json b/data/json/mapgen/cemetery_4square.json index f058e1aa2433c..89fa29cb55d0b 100644 --- a/data/json/mapgen/cemetery_4square.json +++ b/data/json/mapgen/cemetery_4square.json @@ -40,7 +40,6 @@ ["cigar_butt", 10] ] }, - { "type": "mapgen", "om_terrain": [ @@ -116,7 +115,7 @@ "8": "f_shackle", "P": "f_sign" }, - "place_items": [ + "place_items": [ { "item": "grave_memories", "chance": 45, "x": [ 5, 11 ], "y": [ 3, 21], "repeat": [ 1, 2 ] }, { "item": "grave_memories", "chance": 45, "x": [ 15, 21 ], "y": [ 3, 21], "repeat": [ 1, 2 ] } ] @@ -196,7 +195,7 @@ "8": "f_shackle", "P": "f_sign" }, - "place_items": [ + "place_items": [ { "item": "grave_memories", "chance": 45, "x": [ 2, 8 ], "y": [ 3, 21], "repeat": [ 1, 2 ] }, { "item": "grave_memories", "chance": 45, "x": [ 12, 18 ], "y": [ 3, 21], "repeat": [ 1, 2 ] } ] @@ -281,7 +280,7 @@ "P": "Closed at sunset.", "p": "Maintained by the the church." }, - "place_items": [ + "place_items": [ { "item": "trash", "chance": 20, "x": [ 2, 21 ], "y": [ 7, 14 ], "repeat": [ 1, 2 ] } ], "place_loot" : [ @@ -364,7 +363,7 @@ "8": "f_shackle", "P": "f_sign" }, - "place_items": [ + "place_items": [ { "item": "church", "chance": 85, "x": [14, 18], "y": [ 5, 14] }, { "item": "church", "chance": 85, "x": [ 11, 12 ], "y": [ 5, 6 ] }, { "item": "jackets", "chance": 95, "x": [12], "y": [14] } diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 5da124b4893cd..1c71fe51a9897 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -8815,7 +8815,7 @@ "time": 7000, "reversible": false, "autolearn": true, - "qualities": [ { "id": "COOK", "level": 2 } ], + "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "hotplate", 4 ], [ "char_smoker", 4 ], [ "toolset", 4 ], [ "fire", -1 ] ] ], "components": [ [ ["meth", 4] ], [ ["cola", 2] ] ] From 1fb581e2c105c82962f21e576f93333a0f84a593 Mon Sep 17 00:00:00 2001 From: Cyrano7 Date: Wed, 8 Jun 2016 00:06:47 -0700 Subject: [PATCH 087/110] mod data --- data/mods/PKs_Rebalance/pk_critter_robot.json | 1 - .../mods/PKs_Rebalance/pk_critter_zombie.json | 6 ++--- data/mods/PKs_Rebalance/pk_itemlist_new.json | 24 +++++++++---------- .../PKs_Rebalance/pk_mapgen_trapspider.json | 4 +--- data/mods/PKs_Rebalance/pk_spawn_list.json | 20 ++++++++-------- 5 files changed, 25 insertions(+), 30 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_critter_robot.json b/data/mods/PKs_Rebalance/pk_critter_robot.json index 41eeb9289230f..2ec1e8d04237b 100644 --- a/data/mods/PKs_Rebalance/pk_critter_robot.json +++ b/data/mods/PKs_Rebalance/pk_critter_robot.json @@ -40,7 +40,6 @@ "edit-mode" : "modify", "vision_night":10 }, - { "type" : "MONSTER", "id" : "mon_manhack_missile", diff --git a/data/mods/PKs_Rebalance/pk_critter_zombie.json b/data/mods/PKs_Rebalance/pk_critter_zombie.json index 04afc0aef5a28..ac93ded8fe34f 100644 --- a/data/mods/PKs_Rebalance/pk_critter_zombie.json +++ b/data/mods/PKs_Rebalance/pk_critter_zombie.json @@ -354,7 +354,7 @@ "into": "mon_zombie_gasbag_pk", "half_life": 28 }, - "burn_into" : "mon_zombie_scorched_pk" + "burn_into" : "mon_zombie_scorched_pk" },{ "type" : "MONSTER", "id" : "mon_zombie_shady", @@ -363,7 +363,7 @@ "into": "mon_zombie_shady_pk", "half_life": 28 }, - "burn_into" : "mon_zombie_crawler_pk" + "burn_into" : "mon_zombie_crawler_pk" },{ "type" : "MONSTER", "id" : "mon_dog_skeleton", @@ -790,7 +790,7 @@ "armor_acid":2, "armor_fire":2, "vision_day":45, - "vision_night":5, + "vision_night":5, "hp":140, "death_function":"NORMAL", "special_attacks":[["STRETCH_BITE", 15], ["STRETCH_ATTACK", 10]], diff --git a/data/mods/PKs_Rebalance/pk_itemlist_new.json b/data/mods/PKs_Rebalance/pk_itemlist_new.json index a4c55837f83eb..bc598ba944a73 100644 --- a/data/mods/PKs_Rebalance/pk_itemlist_new.json +++ b/data/mods/PKs_Rebalance/pk_itemlist_new.json @@ -65,7 +65,6 @@ { "group": "marloss_man_nommies", "damage": [0, 1], "prob": 95, "count": [3, 5] } ] }, - { "type" : "item_group", "id" : "furvivor_ninemm", @@ -75,7 +74,7 @@ ["glock_19", 10], ["9mm", 4], ["reloaded_9mm", 1] - ] + ] },{ "type" : "item_group", "id" : "furvivor_shot_gun", @@ -85,7 +84,7 @@ ["shotgun_s", 10], ["shotgun_d", 5], ["mossberg_500", 1] - ] + ] },{ "type" : "item_group", "id" : "furvivor_shot_ammo", @@ -93,7 +92,7 @@ "items": [ ["reloaded_shot_00", 5], ["reloaded_shot_bird", 5] - ] + ] },{ "type" : "item_group", "id" : "furvivor_deagle_gun", @@ -101,7 +100,7 @@ "items": [ ["deagle_44", 5], ["sw629", 2] - ] + ] },{ "type" : "item_group", "id" : "furvivor_deagle_ammo", @@ -110,7 +109,7 @@ [ "deaglemag", 4], ["44fmj", 1], ["reloaded_44fmj", 5] - ] + ] },{ "type" : "item_group", "id" : "furvivor_uzi", @@ -119,7 +118,7 @@ [ "uzimag", 4], ["9mm", 1], ["uzi", 5] - ] + ] },{ "type" : "item_group", "id" : "pk_melee", @@ -157,7 +156,7 @@ ["pipe", 1], ["golf_club", 1], ["glass_macuahuitl", 1], - ["longsword_inferior", 1] + ["longsword_inferior", 1] ] },{ "type" : "item_group", @@ -175,7 +174,7 @@ ["223", 4], ["reloaded_556_incendiary", 3], ["granade", 3] - ] + ] },{ "type" : "item_group", "id" : "marloss_man_nommies", @@ -183,7 +182,7 @@ "items": [ ["marloss_berry", 4], ["marloss_seed", 1] - ] + ] },{ "type" : "item_group", "subtype": "collection", @@ -199,15 +198,14 @@ "//" : "revenant rocket bots.", "items": [ [ "bot_manhack_missile", 1] - ] + ] },{ "type" : "item_group", "id" : "revenant_rocket_cores", "//" : "rockets in bomb form.", "items": [ [ "rocket_core", 1] - - ] + ] },{ "type" : "item_group", "id" : "doom_corpse", diff --git a/data/mods/PKs_Rebalance/pk_mapgen_trapspider.json b/data/mods/PKs_Rebalance/pk_mapgen_trapspider.json index 5b0ff8cbe925e..75e5f5067bc90 100644 --- a/data/mods/PKs_Rebalance/pk_mapgen_trapspider.json +++ b/data/mods/PKs_Rebalance/pk_mapgen_trapspider.json @@ -354,8 +354,6 @@ ] } } - - ,{ "type": "mapgen", "om_terrain": [ @@ -453,7 +451,7 @@ "^": "f_rubble_rock", "o": ["f_boulder_small", "f_boulder_small", "f_boulder_small", "f_boulder_medium", "f_boulder_medium", "f_boulder_large"] }, - "place_items": [ + "place_items": [ { "item": "spider", "chance": 55, "x": [ 10, 12 ], "y": [ 9, 12 ], "repeat": [ 1, 2 ] } ] } diff --git a/data/mods/PKs_Rebalance/pk_spawn_list.json b/data/mods/PKs_Rebalance/pk_spawn_list.json index 61a5deec09bd2..0b257f3838ccc 100644 --- a/data/mods/PKs_Rebalance/pk_spawn_list.json +++ b/data/mods/PKs_Rebalance/pk_spawn_list.json @@ -120,7 +120,7 @@ { "monster" : "mon_spider_trapdoor_giant", "freq" : 25, "cost_multiplier" : 1, "pack_size" : [1,2] }, { "monster" : "mon_spider_trapdoor_giant_guardian", "freq" : 5, "cost_multiplier" : 0, "starts": 75 }, { "monster" : "mon_spider_trapdoor_giant_pk", "freq" : 15, "cost_multiplier" : 0, "pack_size" : [1,2], "starts": 50 } - ] + ] },{ "type":"monstergroup", "name" : "GROUP_SPIDER_TRAP_LONER", @@ -132,13 +132,13 @@ { "monster" : "mon_spider_trapdoor_giant", "freq" : 10, "cost_multiplier" : 1, "pack_size" : [1,4] }, { "monster" : "mon_spider_trapdoor_giant_guardian", "freq" : 15, "cost_multiplier" : 5, "pack_size" : [1,2] , "starts": 50 }, { "monster" : "mon_spider_trapdoor_giant_pk", "freq" : 15, "cost_multiplier" : 3, "pack_size" : [1,3], "starts": 25 } - ] + ] },{ "type":"monstergroup", "name" : "GROUP_FOREST", "default" : "mon_null", "monsters" : [ - { "monster" : "mon_fougar", "freq" : 1, "cost_multiplier" : 8, "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster" : "mon_fougar", "freq" : 1, "cost_multiplier" : 8, "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_feer", "freq" : 2, "cost_multiplier" : 5, "pack_size" : [1,2], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_feer", "freq" : 1, "cost_multiplier" : 9, "pack_size" : [2,5], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_feer", "freq" : 1, "cost_multiplier" : 15, "pack_size" : [3,7], "conditions" : ["DUSK", "AUTUMN"] }, @@ -180,7 +180,7 @@ { "monster" : "mon_horse", "freq" : 1, "cost_multiplier" : 20, "pack_size" : [1,3], "ends" : 200, "conditions" : ["DAY", "WINTER"] }, { "monster" : "mon_horse", "freq" : 1, "cost_multiplier" : 20, "pack_size" : [1,3], "ends" : 600, "conditions" : ["DAY", "WINTER"] }, { "monster" : "mon_horse", "freq" : 1, "cost_multiplier" : 20, "pack_size" : [1,3], "ends" : 1000, "conditions" : ["DAY", "WINTER"] }, - + { "monster" : "mon_horse_zombie", "freq" : 2, "cost_multiplier" : 15, "starts" : 75, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_horse_zombie", "freq" : 2, "cost_multiplier" : 15, "starts" : 450, "ends" : 2000, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, { "monster" : "mon_horse_zombie", "freq" : 2, "cost_multiplier" : 15, "starts" : 850, "ends" : 2400, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, @@ -548,14 +548,14 @@ { "monster" : "mon_zombie_gasbag", "freq" : 5, "cost_multiplier": 15, "pack_size": [3,5], "starts" : 2 }, { "monster" : "mon_zombie_smoker", "freq" : 15, "cost_multiplier" : 5 }, { "monster" : "mon_zombie_smoker", "freq" : 5, "cost_multiplier" : 10, "pack_size": [2,3], "starts" : 2 }, - + { "monster" : "mon_boomer", "freq" : 30, "cost_multiplier" : 5 }, { "monster" : "mon_boomer", "freq" : 5, "cost_multiplier" : 15, "pack_size": [2,4], "starts" : 2 }, { "monster" : "mon_boomer_huge", "freq" : 5, "cost_multiplier" : 7, "starts" : 3 }, { "monster" : "mon_zombie_shrieker", "freq" : 25, "cost_multiplier" : 5 }, { "monster" : "mon_zombie_shrieker", "freq" : 5, "cost_multiplier" : 10, "pack_size": [1,3]}, - + { "monster" : "mon_zombie_acidic", "freq" : 25, "cost_multiplier" : 3 }, { "monster" : "mon_zombie_acidic", "freq" : 5, "cost_multiplier" : 9, "pack_size": [2,5], "starts" : 3 }, { "monster" : "mon_zombie_spitter", "freq" : 15, "cost_multiplier" : 5 }, @@ -583,7 +583,7 @@ { "monster" : "mon_beekeeper", "freq" : 1, "cost_multiplier" : 5 }, { "monster" : "mon_zombie_technician", "freq" : 2, "cost_multiplier" : 12}, - + { "monster" : "mon_zombie_scorched", "freq" : 1, "cost_multiplier" : 8, "pack_size": [1,4], "starts": 25 }, { "monster" : "mon_zombie_fiend", "freq" : 1, "cost_multiplier" : 14, "pack_size": [1, 2], "starts": 25 }, { "monster" : "mon_zombie_crawler_scorched", "freq" : 1, "cost_multiplier" : 2, "pack_size": [1,2], "starts": 50 }, @@ -653,7 +653,7 @@ { "monster" : "mon_zombie_predator", "freq" : 3, "cost_multiplier" : 15, "pack_size": [1,2] }, { "monster" : "mon_zombie_gasbag", "freq" : 15, "cost_multiplier": 5}, - { "monster" : "mon_zombie_gasbag", "freq" : 5, "cost_multiplier": 15, "pack_size": [3,5]}, + { "monster" : "mon_zombie_gasbag", "freq" : 5, "cost_multiplier": 15, "pack_size": [3,5]}, { "monster" : "mon_zombie_smoker", "freq" : 15, "cost_multiplier" : 5 }, { "monster" : "mon_zombie_smoker", "freq" : 5, "cost_multiplier" : 10, "pack_size": [2,3]}, { "monster" : "mon_zombie_gasbag_pk", "freq" : 2, "cost_multiplier": 25}, @@ -685,7 +685,7 @@ { "monster" : "mon_zombie_necro", "freq" : 2, "cost_multiplier" : 25 }, { "monster" : "mon_zombie_necro", "freq" : 1, "cost_multiplier" : 50, "pack_size": [1,3]}, - { "monster" : "mon_zombie_survivor", "freq" : 5, "cost_multiplier" : 40, "pack_size": [1,5]}, + { "monster" : "mon_zombie_survivor", "freq" : 5, "cost_multiplier" : 40, "pack_size": [1,5]}, { "monster" : "mon_zombie_master", "freq" : 2, "cost_multiplier" : 30 }, { "monster" : "mon_zombie_master", "freq" : 1, "cost_multiplier" : 60, "pack_size": [1,3]}, @@ -962,7 +962,7 @@ "name" : "GROUP_SWAMP", "default" : "mon_null", "monsters" : [ - { "monster" : "mon_fougar", "freq" : 1, "cost_multiplier" : 8, "conditions" : ["DUSK", "SUMMER"] }, + { "monster" : "mon_fougar", "freq" : 1, "cost_multiplier" : 8, "conditions" : ["DUSK", "SUMMER"] }, { "monster" : "mon_foose", "freq" : 1, "cost_multiplier" : 10, "conditions" : ["DAWN", "WINTER"] }, { "monster" : "mon_fardigrade", "freq" : 3, "cost_multiplier" : 25, "conditions" : ["DAWN", "SPRING", "SUMMER", "AUTUMN"], "starts" : 150 }, { "monster" : "mon_furvivor", "freq" : 3, "cost_multiplier" : 5, "conditions" : ["DUSK"] }, From 63d899a52ea15174ab028ec473fc162348f9a840 Mon Sep 17 00:00:00 2001 From: Cyrano7 Date: Wed, 8 Jun 2016 00:35:20 -0700 Subject: [PATCH 088/110] Double spaces after periods --- data/json/bionics.json | 2 +- data/json/mapgen/roadstop_a.json | 2 +- data/json/npcs/epilogues.json | 2 +- data/json/speech.json | 4 ++-- data/mods/More_Locations/modinfo.json | 2 +- data/mods/More_Survival_Tools/modinfo.json | 2 +- data/mods/PKs_Rebalance/pk_critter_doom.json | 4 ++-- data/mods/PKs_Rebalance/pk_critter_fungus.json | 2 +- data/mods/PKs_Rebalance/pk_critter_insect.json | 2 +- data/mods/StatsThroughSkills/modinfo.json | 2 +- data/mods/Z-Level_Buildings/modinfo.json | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/data/json/bionics.json b/data/json/bionics.json index cf3b0b2ef1264..f066cf923fd66 100644 --- a/data/json/bionics.json +++ b/data/json/bionics.json @@ -803,7 +803,7 @@ [ "HAND_L", 5 ] ], "act_cost": 50, - "description": "Your left arm has been replaced by a heavy-duty fusion blaster! You may use your energy banks to fire a damaging heat ray. However, you are unable to use or carry two-handed items, and your strength limits what you can use with your one hand." + "description": "Your left arm has been replaced by a heavy-duty fusion blaster! You may use your energy banks to fire a damaging heat ray. However, you are unable to use or carry two-handed items, and your strength limits what you can use with your one hand." },{ "type": "bionic", "id": "bio_laser", diff --git a/data/json/mapgen/roadstop_a.json b/data/json/mapgen/roadstop_a.json index fc657c475ea40..67ec93cc1d962 100644 --- a/data/json/mapgen/roadstop_a.json +++ b/data/json/mapgen/roadstop_a.json @@ -50,7 +50,7 @@ "o": "t_dirt" }, "signage": { - "i": "This was once a infromation map for the area, but it has long since been eroded beyond usefullness. There are small holders for tourist maps attached." + "i": "This was once a infromation map for the area, but it has long since been eroded beyond usefullness. There are small holders for tourist maps attached." }, "furniture": { "6": "f_table", diff --git a/data/json/npcs/epilogues.json b/data/json/npcs/epilogues.json index ccc67d7536c59..0fbcf4ad6f060 100644 --- a/data/json/npcs/epilogues.json +++ b/data/json/npcs/epilogues.json @@ -1003,7 +1003,7 @@ "line_06" : " ", "line_07" : " ", "line_08" : "* ", - "line_09" : " Went on to become a notable scout and urban explorer. Was tragically ", + "line_09" : " Went on to become a notable scout and urban explorer. Was tragically ", "line_10" : "killed by one of her students when leading a group of unskilled survivors ", "line_11" : "on a night supply raid. ", "line_12" : " ", diff --git a/data/json/speech.json b/data/json/speech.json index b67ea2fa1cbff..827f46be04ddd 100644 --- a/data/json/speech.json +++ b/data/json/speech.json @@ -1202,12 +1202,12 @@ },{ "type" : "speech", "speaker" : "mon_broken_cyborg", - "sound" : "an electronic voice saying \"CONNECTION FAILED. Abort, Retry, Fail?\"", + "sound" : "an electronic voice saying \"CONNECTION FAILED. Abort, Retry, Fail?\"", "volume" : 20 },{ "type" : "speech", "speaker" : "mon_broken_cyborg", - "sound" : "\"I was once a man. A MAN!\"", + "sound" : "\"I was once a man. A MAN!\"", "volume" : 10 },{ "type" : "speech", diff --git a/data/mods/More_Locations/modinfo.json b/data/mods/More_Locations/modinfo.json index 927e0d45fddc8..8051a20dfc3c2 100644 --- a/data/mods/More_Locations/modinfo.json +++ b/data/mods/More_Locations/modinfo.json @@ -4,7 +4,7 @@ "ident": "more_locations", "author": "Sunshine", "name": "More Locations", - "description": "Adds new Z-level buildings and dungeons. Still unpolished. Before generating a world, you can remove subfolders to nix unwanted locations.", + "description": "Adds new Z-level buildings and dungeons. Still unpolished. Before generating a world, you can remove subfolders to nix unwanted locations.", "category": "buildings", "path": "" } diff --git a/data/mods/More_Survival_Tools/modinfo.json b/data/mods/More_Survival_Tools/modinfo.json index 7463ffd5c2bac..5326528c3ceb5 100644 --- a/data/mods/More_Survival_Tools/modinfo.json +++ b/data/mods/More_Survival_Tools/modinfo.json @@ -4,7 +4,7 @@ "ident": "More_Survival_Tools", "name": "More Survival Tools", "author": "Chaosvolt", - "description": "For those who prefer being innawoods. Adds several tools, various recipes additions/tweaks, plus two new classes.", + "description": "For those who prefer being innawoods. Adds several tools, various recipes additions/tweaks, plus two new classes.", "category": "items", "path": "" } diff --git a/data/mods/PKs_Rebalance/pk_critter_doom.json b/data/mods/PKs_Rebalance/pk_critter_doom.json index c00d45c161068..4a68e7be21536 100644 --- a/data/mods/PKs_Rebalance/pk_critter_doom.json +++ b/data/mods/PKs_Rebalance/pk_critter_doom.json @@ -694,7 +694,7 @@ "death_function":["NORMAL"], "special_attacks":[ ["FEAR_PARALYZE", 25]], - "description":"All evidence indicates that this used to be a survivor, who was killed by torture and body reanimated. Its garments lack the weathered look of other zombies but are mutilated none-the-less. Although it struggles to free itself, it is held fast with spikes, nails, and chains.", + "description":"All evidence indicates that this used to be a survivor, who was killed by torture and body reanimated. Its garments lack the weathered look of other zombies but are mutilated none-the-less. Although it struggles to free itself, it is held fast with spikes, nails, and chains.", "flags":["SEES", "HEARS", "SMELLS", "WARM", "IMMOBILE", "GUILT", "POISON", "REVIVES", "BONES"] },{ "type" : "MONSTER", @@ -750,7 +750,7 @@ "vision_night":50, "hp":300, "death_function":["JABBERWOCKY", "EXPLODE"], - "description":"A massive face cross-sectioned with large machinery; various tubes of bubbling liquid bury themselves and reemerge from pustulating wounds. Its forehead has been removed, exposing a pulsating brain mass from which sound emanates.", + "description":"A massive face cross-sectioned with large machinery; various tubes of bubbling liquid bury themselves and reemerge from pustulating wounds. Its forehead has been removed, exposing a pulsating brain mass from which sound emanates.", "flags":["SEES", "WARM", "POISON", "NO_BREATHE", "IMMOBILE", "ELECTRIC"] } ] diff --git a/data/mods/PKs_Rebalance/pk_critter_fungus.json b/data/mods/PKs_Rebalance/pk_critter_fungus.json index 4ddadf616b50a..27ed5cfb50f8a 100644 --- a/data/mods/PKs_Rebalance/pk_critter_fungus.json +++ b/data/mods/PKs_Rebalance/pk_critter_fungus.json @@ -932,7 +932,7 @@ "cooldown" : 3 } ], - "description":"A large, astoundingly tough creature that used to be a dog or boar. Its massive maw takes up almost half its body. Rows of teeth pushing older rows forward; creating a jutting smile only made more terrifying by the beady red eyes, socketed above behind the maw, looking down at its prey.", + "description":"A large, astoundingly tough creature that used to be a dog or boar. Its massive maw takes up almost half its body. Rows of teeth pushing older rows forward; creating a jutting smile only made more terrifying by the beady red eyes, socketed above behind the maw, looking down at its prey.", "flags":["SEES", "HEARS", "SMELLS", "KEENNOSE", "STUMBLES", "WARM", "BLEED", "BASHES", "POISON", "BONES", "FAT", "REGENERATES_10", "PLASTIC"], "anger_triggers":["PLAYER_WEAK", "PLAYER_CLOSE"] } diff --git a/data/mods/PKs_Rebalance/pk_critter_insect.json b/data/mods/PKs_Rebalance/pk_critter_insect.json index face44ebfd691..9997ff68eb94f 100644 --- a/data/mods/PKs_Rebalance/pk_critter_insect.json +++ b/data/mods/PKs_Rebalance/pk_critter_insect.json @@ -440,7 +440,7 @@ } ], "special_when_hit":["ACIDSPLASH", 5], - "description":"A spider the size of a large dog with slender forelegs and massive hind legs. From its maw corrosive saliva drips, and can be manipulated by its agile limbs.", + "description":"A spider the size of a large dog with slender forelegs and massive hind legs. From its maw corrosive saliva drips, and can be manipulated by its agile limbs.", "flags":["SEES", "SMELLS", "KEENNOSE", "HEARS", "BADVENOM", "CHITIN", "CLIMBS", "ACIDPROOF", "ACID_BLOOD", "PUSH_MON"], "anger_triggers":["PLAYER_CLOSE", "PLAYER_WEAK", "FRIEND_ATTACKED", "STALK"], "fear_triggers": ["HURT", "FIRE"] diff --git a/data/mods/StatsThroughSkills/modinfo.json b/data/mods/StatsThroughSkills/modinfo.json index 30c47603f5cbd..a6d485043aca9 100644 --- a/data/mods/StatsThroughSkills/modinfo.json +++ b/data/mods/StatsThroughSkills/modinfo.json @@ -4,7 +4,7 @@ "ident": "StatsThroughSkills", "name": "StatsThoughSkills", "author": "Ryan \"DeNarr\" Saige", - "description": "Allows stats to raise naturally via skill progression. Changes to starting stats will be disregarded", + "description": "Allows stats to raise naturally via skill progression. Changes to starting stats will be disregarded", "category": "rebalance", "path": "" } diff --git a/data/mods/Z-Level_Buildings/modinfo.json b/data/mods/Z-Level_Buildings/modinfo.json index 9497f2c4325cf..c069b0f3bd95d 100644 --- a/data/mods/Z-Level_Buildings/modinfo.json +++ b/data/mods/Z-Level_Buildings/modinfo.json @@ -3,7 +3,7 @@ "mod-type": "SUPPLEMENTAL", "ident": "Experimental-Z-Level", "name": "Tall Buildings", - "description": "Adds basic 3-D buildings. For testing z-levels and those who want to play with z-level buildings in their early state.", + "description": "Adds basic 3-D buildings. For testing z-levels and those who want to play with z-level buildings in their early state.", "category": "buildings", "path": "" } From f86920e041970996dcae61de0765c0aa7be2e29a Mon Sep 17 00:00:00 2001 From: pisskop Date: Wed, 8 Jun 2016 15:58:30 -0400 Subject: [PATCH 089/110] Update cemetery_4square.json Adds basic car list "Fun-eral" to the cemetery. --- data/json/mapgen/cemetery_4square.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/data/json/mapgen/cemetery_4square.json b/data/json/mapgen/cemetery_4square.json index 9511effa6c874..3e8cfb5e9fc78 100644 --- a/data/json/mapgen/cemetery_4square.json +++ b/data/json/mapgen/cemetery_4square.json @@ -1,5 +1,14 @@ [ { + "type": "vehicle_group", + "id": "FUNERAL", + "vehicles": [ + [ "car", 300 ], + [ "hearse", 200 ], + [ "suv", 100 ], + [ "policecar", 50 ] + ] + },{ "type" : "item_group", "id" : "grave_memories", "items":[ @@ -287,7 +296,14 @@ "place_loot" : [ { "item": "chain", "chance": 50, "x": [ 4, 11 ], "y": [22, 23], "repeat": [ 1, 2 ] }, { "item": "chain", "chance": 50, "x": [ 12, 19 ], "y": [22, 23], "repeat": [ 1, 2 ] } - ] + ], + "place_vehicles": [ + { "x": 2, "y": 9, "vehicle": "FUNERAL", "chance": 10 }, + { "x": 6, "y": 9, "vehicle": "FUNERAL", "chance": 15 }, + { "x": 10, "y": 9, "vehicle": "FUNERAL", "chance": 20 }, + { "x": 15, "y": 9, "vehicle": "FUNERAL", "chance": 15 }, + { "x": 19, "y": 9, "vehicle": "FUNERAL", "chance": 15 } + ], } },{ "type": "mapgen", From 032a6a4610e3d399c8503b6b8e09ca1a06465461 Mon Sep 17 00:00:00 2001 From: pisskop Date: Wed, 8 Jun 2016 17:06:37 -0400 Subject: [PATCH 090/110] Update cemetery_4square.json --- data/json/mapgen/cemetery_4square.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mapgen/cemetery_4square.json b/data/json/mapgen/cemetery_4square.json index 3e8cfb5e9fc78..c6ebc4dbe14f9 100644 --- a/data/json/mapgen/cemetery_4square.json +++ b/data/json/mapgen/cemetery_4square.json @@ -303,7 +303,7 @@ { "x": 10, "y": 9, "vehicle": "FUNERAL", "chance": 20 }, { "x": 15, "y": 9, "vehicle": "FUNERAL", "chance": 15 }, { "x": 19, "y": 9, "vehicle": "FUNERAL", "chance": 15 } - ], + ] } },{ "type": "mapgen", From 2eb8b8dc181ce8b10d2387789bcafadd7c013936 Mon Sep 17 00:00:00 2001 From: Xpyder Date: Wed, 8 Jun 2016 14:44:56 -0700 Subject: [PATCH 091/110] reverting fish nutrition values, they need their own PR --- data/json/items/comestibles.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/comestibles.json b/data/json/items/comestibles.json index eafa921e03808..6e93bbd7a7d78 100644 --- a/data/json/items/comestibles.json +++ b/data/json/items/comestibles.json @@ -2422,7 +2422,7 @@ "symbol" : "%", "quench" : -1, "healthy" : 1, - "nutrition" : 24, + "nutrition" : 40, "description" : "This is a serving of crisply brined and canned fish. Tasty and nutritious.", "price" : 250, "//" : "Two charges per jar.", "material" : "flesh", @@ -2443,7 +2443,7 @@ "symbol" : "%", "quench" : 0, "healthy" : 1, - "nutrition" : 18, + "nutrition" : 26, "description" : "Low-sodium preserved fish. It was boiled and canned. Contains most of the nutrition, but little of the savor of cooked fish.", "price" : 250, "material" : "flesh", From fb22f7242247123712e2cc0706582013306115cc Mon Sep 17 00:00:00 2001 From: pisskop Date: Thu, 9 Jun 2016 13:55:26 -0400 Subject: [PATCH 092/110] Update pk_spawn_list.json This completely merges my file and the core game's --- data/mods/PKs_Rebalance/pk_spawn_list.json | 2189 ++++++++++---------- 1 file changed, 1096 insertions(+), 1093 deletions(-) diff --git a/data/mods/PKs_Rebalance/pk_spawn_list.json b/data/mods/PKs_Rebalance/pk_spawn_list.json index 0b257f3838ccc..9de01d9a0a761 100644 --- a/data/mods/PKs_Rebalance/pk_spawn_list.json +++ b/data/mods/PKs_Rebalance/pk_spawn_list.json @@ -4,1192 +4,1195 @@ "name": "GROUP_DOOM", "default": "mon_imp", "monsters": [ - { "monster": "mon_doom_churl", "freq": 10, "cost_multiplier": 3, "pack_size" : [2,5] }, - { "monster": "mon_imp_black", "freq": 20, "cost_multiplier": 5, "starts" : 25 }, - { "monster": "mon_imp_black", "freq": 5, "cost_multiplier": 7, "pack_size" : [2,3], "starts" : 100 }, + { "monster": "mon_doom_churl", "freq": 10, "cost_multiplier": 3, "pack_size": [2,5] }, + { "monster": "mon_imp_black", "freq": 20, "cost_multiplier": 5, "starts": 25 }, + { "monster": "mon_imp_black", "freq": 5, "cost_multiplier": 7, "pack_size": [2,3], "starts": 100 }, { "monster": "mon_pinky", "freq": 35, "cost_multiplier": 3 }, - { "monster": "mon_pinky", "freq": 10, "cost_multiplier": 12, "pack_size" : [4,7], "starts" : 75 }, - { "monster": "mon_lostsoul", "freq": 10, "cost_multiplier": 10, "pack_size" : [1,4], "starts" : 25 }, - { "monster": "mon_lostsoul", "freq": 35, "cost_multiplier": 18, "pack_size" : [4,7], "starts" : 75 }, - { "monster": "mon_revenant", "freq": 20, "cost_multiplier": 5, "starts" : 125 }, - { "monster": "mon_revenant", "freq": 10, "cost_multiplier": 10, "pack_size" : [1,3], "starts" : 100 }, - { "monster": "mon_hell_knight", "freq": 20, "cost_multiplier": 4, "starts" : 50 }, - { "monster": "mon_hell_knight", "freq": 5, "cost_multiplier": 12, "pack_size" : [2,4], "starts" : 150 }, - { "monster": "mon_hell_baron", "freq": 15, "cost_multiplier": 12, "pack_size" : [1,3], "starts" : 200 }, - { "monster": "mon_mancubus", "freq": 14, "cost_multiplier": 13, "pack_size" : [1,3], "starts" : 125 }, - { "monster": "mon_cacodemon", "freq": 20, "cost_multiplier": 15, "pack_size" : [1,4], "starts" : 150 }, - { "monster": "mon_mechaspider", "freq": 17, "cost_multiplier": 7, "starts" : 150 }, - { "monster": "mon_mechaspider", "freq": 3, "cost_multiplier": 15, "pack_size" : [2,3], "starts" : 250 }, - { "monster": "mon_cyberdemon", "freq": 1, "cost_multiplier": 25, "starts" : 500 } + { "monster": "mon_pinky", "freq": 10, "cost_multiplier": 12, "pack_size": [4,7], "starts": 75 }, + { "monster": "mon_lostsoul", "freq": 10, "cost_multiplier": 10, "pack_size": [1,4], "starts": 25 }, + { "monster": "mon_lostsoul", "freq": 35, "cost_multiplier": 18, "pack_size": [4,7], "starts": 75 }, + { "monster": "mon_revenant", "freq": 20, "cost_multiplier": 5, "starts": 125 }, + { "monster": "mon_revenant", "freq": 10, "cost_multiplier": 10, "pack_size": [1,3], "starts": 100 }, + { "monster": "mon_hell_knight", "freq": 20, "cost_multiplier": 4, "starts": 50 }, + { "monster": "mon_hell_knight", "freq": 5, "cost_multiplier": 12, "pack_size": [2,4], "starts": 150 }, + { "monster": "mon_hell_baron", "freq": 15, "cost_multiplier": 12, "pack_size": [1,3], "starts": 200 }, + { "monster": "mon_mancubus", "freq": 14, "cost_multiplier": 13, "pack_size": [1,3], "starts": 125 }, + { "monster": "mon_cacodemon", "freq": 20, "cost_multiplier": 15, "pack_size": [1,4], "starts": 150 }, + { "monster": "mon_mechaspider", "freq": 17, "cost_multiplier": 7, "starts": 150 }, + { "monster": "mon_mechaspider", "freq": 3, "cost_multiplier": 15, "pack_size": [2,3], "starts": 250 }, + { "monster": "mon_cyberdemon", "freq": 1, "cost_multiplier": 25, "starts": 500 } ] },{ "type": "monstergroup", "name": "GROUP_DOOM_INFANTRY", "default": "mon_imp", "monsters": [ - { "monster": "mon_doom_churl", "freq": 10, "cost_multiplier": 3, "pack_size" : [4,5] }, - { "monster": "mon_imp_black", "freq": 20, "cost_multiplier": 3, "pack_size" : [1,2] }, - { "monster": "mon_pinky", "freq": 50, "cost_multiplier": 2, "pack_size" : [1,4] }, - { "monster": "mon_lostsoul", "freq": 40, "cost_multiplier": 5, "pack_size" : [2,6], "starts" : 50 }, + { "monster": "mon_doom_churl", "freq": 10, "cost_multiplier": 3, "pack_size": [4,5] }, + { "monster": "mon_imp_black", "freq": 20, "cost_multiplier": 3, "pack_size": [1,2] }, + { "monster": "mon_pinky", "freq": 50, "cost_multiplier": 2, "pack_size": [1,4] }, + { "monster": "mon_lostsoul", "freq": 40, "cost_multiplier": 5, "pack_size": [2,6], "starts": 50 }, { "monster": "mon_revenant", "freq": 30, "cost_multiplier": 3 }, { "monster": "mon_mechaspider", "freq": 15, "cost_multiplier": 5 }, - { "monster": "mon_mechaspider", "freq": 5, "cost_multiplier": 9, "pack_size" : [2,3], "starts" : 100 }, - { "monster": "mon_hell_knight", "freq": 20, "cost_multiplier": 7, "pack_size" : [1,2] }, - { "monster": "mon_cacodemon", "freq": 17, "cost_multiplier": 9, "pack_size" : [1,2], "starts" : 50 }, - { "monster": "mon_mancubus", "freq": 3, "cost_multiplier": 15, "starts" : 50 } + { "monster": "mon_mechaspider", "freq": 5, "cost_multiplier": 9, "pack_size": [2,3], "starts": 100 }, + { "monster": "mon_hell_knight", "freq": 20, "cost_multiplier": 7, "pack_size": [1,2] }, + { "monster": "mon_cacodemon", "freq": 17, "cost_multiplier": 9, "pack_size": [1,2], "starts": 50 }, + { "monster": "mon_mancubus", "freq": 3, "cost_multiplier": 15, "starts": 50 } ] },{ "type": "monstergroup", "name": "GROUP_DOOM_HELP", "default": "mon_null", "monsters": [ - { "monster": "mon_imp", "freq": 25, "cost_multiplier": 3, "pack_size" : [1,3] }, - { "monster": "mon_doom_slave", "freq": 20, "cost_multiplier": 0, "pack_size" : [2,4] }, - { "monster": "mon_doom_churl", "freq": 10, "cost_multiplier": 1, "pack_size" : [1,4] }, - { "monster": "mon_doom_cur", "freq": 25, "cost_multiplier": 0, "pack_size" : [1,2] }, + { "monster": "mon_imp", "freq": 25, "cost_multiplier": 3, "pack_size": [1,3] }, + { "monster": "mon_doom_slave", "freq": 20, "cost_multiplier": 0, "pack_size": [2,4] }, + { "monster": "mon_doom_churl", "freq": 10, "cost_multiplier": 1, "pack_size": [1,4] }, + { "monster": "mon_doom_cur", "freq": 25, "cost_multiplier": 0, "pack_size": [1,2] }, { "monster": "mon_revenant", "freq": 5, "cost_multiplier": 3 }, - { "monster": "mon_hell_knight", "freq": 20, "cost_multiplier": 5, "pack_size" : [1,2] } + { "monster": "mon_hell_knight", "freq": 20, "cost_multiplier": 5, "pack_size": [1,2] } ] },{ "type": "monstergroup", "name": "GROUP_DOOM_PRIEST", "default": "mon_hell_baron", "monsters": [ - { "monster": "mon_hell_baron", "freq": 7, "cost_multiplier": 15, "pack_size" : [2,4] }, + { "monster": "mon_hell_baron", "freq": 7, "cost_multiplier": 15, "pack_size": [2,4] }, { "monster": "mon_cyberdemon", "freq": 3, "cost_multiplier": 25 } ] },{ "type":"monstergroup", - "name" : "GROUP_ANT", - "default" : "mon_ant", - "monsters" : [ - { "monster" : "mon_ant_larva_pk", "freq" : 5, "cost_multiplier" : 0 }, - { "monster" : "mon_ant_scrib", "freq" : 30, "cost_multiplier" : 0 }, - { "monster" : "mon_ant_soldier_pk_weak", "freq" : 50, "cost_multiplier" : 5, "pack_size" : [1,3] }, - { "monster" : "mon_ant_queen_young", "freq" : 15, "cost_multiplier" : 5, "conditions" : ["SPRING"], "starts": 75 }, - { "monster" : "mon_ant_male", "freq" : 30, "cost_multiplier" : 5, "conditions" : ["SPRING"], "starts": 25 }, - { "monster" : "mon_ant_kwama", "freq" : 5, "cost_multiplier" : 0, "conditions" : ["SPRING"], "starts": 100 }, - { "monster" : "mon_ant_kwama", "freq" : 15, "cost_multiplier" : 0, "conditions" : ["SUMMER, AUTUMN"], "starts" : 100 }, - { "monster" : "mon_ant_kwama", "freq" : 25, "cost_multiplier" : 0, "conditions" : ["WINTER"], "starts": 100 }, - { "monster" : "mon_ant_larva", "freq" : 15, "cost_multiplier" : 0, "conditions" : ["SPRING"] }, - { "monster" : "mon_ant_queen_firebug", "freq" : 0, "cost_multiplier" : 0 }, - { "monster" : "mon_ant_fungus", "freq" : 1, "cost_multiplier" : 20, "pack_size" : [1,2], "conditions" : ["SUMMER"] }, - - { "monster" : "mon_ant_larva", "freq" : 5, "cost_multiplier" : 0 }, - { "monster" : "mon_ant_soldier", "freq" : 100, "cost_multiplier" : 5 }, - { "monster" : "mon_ant_queen", "freq" : 0, "cost_multiplier" : 0 } + "name": "GROUP_ANT", + "default": "mon_ant", + "monsters": [ + { "monster": "mon_ant_larva_pk", "freq": 5, "cost_multiplier": 0 }, + { "monster": "mon_ant_scrib", "freq": 30, "cost_multiplier": 0 }, + { "monster": "mon_ant_soldier_pk_weak", "freq": 50, "cost_multiplier": 5, "pack_size": [1,3] }, + { "monster": "mon_ant_queen_young", "freq": 15, "cost_multiplier": 5, "conditions": ["SPRING"], "starts": 75 }, + { "monster": "mon_ant_male", "freq": 30, "cost_multiplier": 5, "conditions": ["SPRING"], "starts": 25 }, + { "monster": "mon_ant_kwama", "freq": 5, "cost_multiplier": 0, "conditions": ["SPRING"], "starts": 100 }, + { "monster": "mon_ant_kwama", "freq": 15, "cost_multiplier": 0, "conditions": ["SUMMER, AUTUMN"], "starts": 100 }, + { "monster": "mon_ant_kwama", "freq": 25, "cost_multiplier": 0, "conditions": ["WINTER"], "starts": 100 }, + { "monster": "mon_ant_larva", "freq": 15, "cost_multiplier": 0, "conditions": ["SPRING"] }, + { "monster": "mon_ant_queen_firebug", "freq": 0, "cost_multiplier": 0 }, + { "monster": "mon_ant_fungus", "freq": 1, "cost_multiplier": 20, "pack_size": [1,2], "conditions": ["SUMMER"] }, + + { "monster": "mon_ant_larva", "freq": 5, "cost_multiplier": 0 }, + { "monster": "mon_ant_soldier", "freq": 100, "cost_multiplier": 5 }, + { "monster": "mon_ant_queen", "freq": 0, "cost_multiplier": 0 } ] },{ "type":"monstergroup", - "name" : "GROUP_SEWER", - "default" : "mon_sewer_rat", - "monsters" : [ - { "monster" : "mon_gator", "freq" : 15, "cost_multiplier" : 5 }, - { "monster" : "mon_twisted_body", "freq" : 10, "cost_multiplier" : 15, "pack_size" : [ 1 , 6 ], "starts": 25 }, - { "monster" : "mon_human_snail", "freq" : 4, "cost_multiplier" : 10, "pack_size" : [ 3 , 8 ], "starts": 25 }, - - { "monster" : "mon_sewer_fish", "freq" : 30, "cost_multiplier" : 0, "pack_size" : [2,6] }, - { "monster" : "mon_sewer_snake", "freq" : 20, "cost_multiplier" : 0 }, - { "monster" : "mon_sewer_rat", "freq" : 10, "cost_multiplier" : 0, "pack_size" : [6,18] }, - { "monster" : "mon_albino_penguin", "freq" : 1, "cost_multiplier" : 5, "pack_size" : [3,9] } + "name": "GROUP_SEWER", + "default": "mon_sewer_rat", + "monsters": [ + { "monster": "mon_gator", "freq": 15, "cost_multiplier": 5 }, + { "monster": "mon_twisted_body", "freq": 10, "cost_multiplier": 15, "pack_size": [ 1 , 6 ], "starts": 25 }, + { "monster": "mon_human_snail", "freq": 4, "cost_multiplier": 10, "pack_size": [ 3 , 8 ], "starts": 25 }, + + { "monster": "mon_sewer_fish", "freq": 30, "cost_multiplier": 0, "pack_size": [2,6] }, + { "monster": "mon_sewer_snake", "freq": 20, "cost_multiplier": 0 }, + { "monster": "mon_sewer_rat", "freq": 10, "cost_multiplier": 0, "pack_size": [6,18] }, + { "monster": "mon_albino_penguin", "freq": 1, "cost_multiplier": 5, "pack_size": [3,9] } ] },{ "type":"monstergroup", - "name" : "GROUP_SPIDER", - "default" : "mon_spider_web", - "monsters" : [ - { "monster" : "mon_null", "freq" : 1000, "cost_multiplier" : 0, "conditions" : ["WINTER"] }, - { "monster" : "mon_null", "freq" : 10, "cost_multiplier" : 0 }, - { "monster" : "mon_spider_web_queen", "freq" : 5, "cost_multiplier" : 3 }, - { "monster" : "mon_spider_web", "freq" : 20, "cost_multiplier" : 1, "pack_size" : [1,4] }, - { "monster" : "mon_spider_web_s", "freq" : 10, "cost_multiplier" : 3, "pack_size" : [4,16], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_web_alpha", "freq" : 10, "cost_multiplier" : 5, "pack_size" : [1,4], "starts" : 75 }, - { "monster" : "mon_spider_web_omega", "freq" : 10, "cost_multiplier" : 5, "pack_size" : [1,4], "starts" : 50 }, - { "monster" : "mon_spider_web_mu", "freq" : 10, "cost_multiplier" : 5, "pack_size" : [2,6], "starts" : 100 } + "name": "GROUP_SPIDER", + "default": "mon_spider_web", + "monsters": [ + { "monster": "mon_null", "freq": 1000, "cost_multiplier": 0, "conditions": ["WINTER"] }, + { "monster": "mon_null", "freq": 10, "cost_multiplier": 0 }, + { "monster": "mon_spider_web_queen", "freq": 5, "cost_multiplier": 3 }, + { "monster": "mon_spider_web", "freq": 20, "cost_multiplier": 1, "pack_size": [1,4] }, + { "monster": "mon_spider_web_s", "freq": 10, "cost_multiplier": 3, "pack_size": [4,16], "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_web_alpha", "freq": 10, "cost_multiplier": 5, "pack_size": [1,4], "starts": 75 }, + { "monster": "mon_spider_web_omega", "freq": 10, "cost_multiplier": 5, "pack_size": [1,4], "starts": 50 }, + { "monster": "mon_spider_web_mu", "freq": 10, "cost_multiplier": 5, "pack_size": [2,6], "starts": 100 } ] },{ "type":"monstergroup", - "name" : "GROUP_SPIDER_TRAP", - "default" : "mon_spider_trapdoor_giant", - "monsters" : [ - { "monster" : "mon_null", "freq" : 1000, "cost_multiplier" : 0, "conditions" : ["WINTER"] }, - { "monster" : "mon_null", "freq" : 5, "cost_multiplier" : 0 }, - { "monster" : "mon_trapdoor_egg", "freq" : 10, "cost_multiplier" : 1, "starts": 5 }, - { "monster" : "mon_trapdoor_queen", "freq" : 5, "cost_multiplier" : 3 }, - { "monster" : "mon_spider_trapdoor_giant_s", "freq" : 10, "cost_multiplier" : 3, "pack_size" : [3,8], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_trapdoor_giant", "freq" : 25, "cost_multiplier" : 1, "pack_size" : [1,2] }, - { "monster" : "mon_spider_trapdoor_giant_guardian", "freq" : 5, "cost_multiplier" : 0, "starts": 75 }, - { "monster" : "mon_spider_trapdoor_giant_pk", "freq" : 15, "cost_multiplier" : 0, "pack_size" : [1,2], "starts": 50 } - ] + "name": "GROUP_SPIDER_TRAP", + "default": "mon_spider_trapdoor_giant", + "monsters": [ + { "monster": "mon_null", "freq": 1000, "cost_multiplier": 0, "conditions": ["WINTER"] }, + { "monster": "mon_null", "freq": 5, "cost_multiplier": 0 }, + { "monster": "mon_trapdoor_egg", "freq": 10, "cost_multiplier": 1, "starts": 5 }, + { "monster": "mon_trapdoor_queen", "freq": 5, "cost_multiplier": 3 }, + { "monster": "mon_spider_trapdoor_giant_s", "freq": 10, "cost_multiplier": 3, "pack_size": [3,8], "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_trapdoor_giant", "freq": 25, "cost_multiplier": 1, "pack_size": [1,2] }, + { "monster": "mon_spider_trapdoor_giant_guardian", "freq": 5, "cost_multiplier": 0, "starts": 75 }, + { "monster": "mon_spider_trapdoor_giant_pk", "freq": 15, "cost_multiplier": 0, "pack_size": [1,2], "starts": 50 } + ] },{ "type":"monstergroup", - "name" : "GROUP_SPIDER_TRAP_LONER", - "default" : "mon_null", - "monsters" : [ - { "monster" : "mon_null", "freq" : 1000, "cost_multiplier" : 0, "conditions" : ["WINTER"] }, - { "monster" : "mon_trapdoor_egg", "freq" : 5, "cost_multiplier" : 1, "starts": 5 }, - { "monster" : "mon_trapdoor_queen", "freq" : 5, "cost_multiplier" : 3 }, - { "monster" : "mon_spider_trapdoor_giant", "freq" : 10, "cost_multiplier" : 1, "pack_size" : [1,4] }, - { "monster" : "mon_spider_trapdoor_giant_guardian", "freq" : 15, "cost_multiplier" : 5, "pack_size" : [1,2] , "starts": 50 }, - { "monster" : "mon_spider_trapdoor_giant_pk", "freq" : 15, "cost_multiplier" : 3, "pack_size" : [1,3], "starts": 25 } - ] + "name": "GROUP_SPIDER_TRAP_LONER", + "default": "mon_null", + "monsters": [ + { "monster": "mon_null", "freq": 1000, "cost_multiplier": 0, "conditions": ["WINTER"] }, + { "monster": "mon_trapdoor_egg", "freq": 5, "cost_multiplier": 1, "starts": 5 }, + { "monster": "mon_trapdoor_queen", "freq": 5, "cost_multiplier": 3 }, + { "monster": "mon_spider_trapdoor_giant", "freq": 10, "cost_multiplier": 1, "pack_size": [1,4] }, + { "monster": "mon_spider_trapdoor_giant_guardian", "freq": 15, "cost_multiplier": 5, "pack_size": [1,2] , "starts": 50 }, + { "monster": "mon_spider_trapdoor_giant_pk", "freq": 15, "cost_multiplier": 3, "pack_size": [1,3], "starts": 25 } + ] },{ "type":"monstergroup", - "name" : "GROUP_FOREST", - "default" : "mon_null", - "monsters" : [ - { "monster" : "mon_fougar", "freq" : 1, "cost_multiplier" : 8, "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_feer", "freq" : 2, "cost_multiplier" : 5, "pack_size" : [1,2], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_feer", "freq" : 1, "cost_multiplier" : 9, "pack_size" : [2,5], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_feer", "freq" : 1, "cost_multiplier" : 15, "pack_size" : [3,7], "conditions" : ["DUSK", "AUTUMN"] }, - { "monster" : "mon_foose", "freq" : 1, "cost_multiplier" : 10, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_foose", "freq" : 2, "cost_multiplier" : 20, "pack_size" : [1,2], "conditions" : ["SPRING", "NIGHT"] }, - { "monster" : "mon_folf", "freq" : 1, "cost_multiplier" : 8, "pack_size" : [3,6], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_folf", "freq" : 1, "cost_multiplier" : 4, "pack_size" : [1,4], "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_folf", "freq" : 1, "cost_multiplier" : 3, "pack_size" : [1,3], "conditions" : ["WINTER"] }, - { "monster" : "mon_fant", "freq" : 2, "cost_multiplier" : 2, "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fardigrade", "freq" : 1, "cost_multiplier" : 25, "conditions" : ["DAWN", "WINTER"] }, - { "monster" : "mon_furvivor", "freq" : 2, "cost_multiplier" : 5, "conditions" : ["DUSK", "SPRING"] }, - { "monster" : "mon_furvivor_glock", "freq" : 2, "cost_multiplier" : 10, "pack_size" : [1,2], "conditions" : ["DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_furvivor_glock", "freq" : 1, "cost_multiplier" : 15, "pack_size" : [1,3], "conditions" : ["DUSK", "SPRING"], "starts" : 72 }, - { "monster" : "mon_furvivor_shotgun", "freq" : 2, "cost_multiplier" : 15, "pack_size" : [1,2], "conditions" : ["DAWN", "DUSK", "SUMMER", "AUTUMN"], "starts" : 75 }, - { "monster" : "mon_furvivor_deagle", "freq" : 2, "cost_multiplier" : 10, "starts" : 25 }, - { "monster" : "mon_furvivor_deagle", "freq" : 1, "cost_multiplier" : 15, "pack_size" : [1,4], "conditions" : ["SUMMER"], "starts" : 75 }, - { "monster" : "mon_furvivor_smg", "freq" : 1, "cost_multiplier" : 20, "conditions" : ["DUSK"], "starts" : 50 }, - { "monster" : "mon_furvivor_pk", "freq" : 1, "cost_multiplier" : 10, "pack_size" : [1,2], "conditions" : ["DUSK", "SUMMER", "AUTUMN"], "starts" : 100 }, - { "monster" : "mon_furvivor_pk", "freq" : 1, "cost_multiplier" : 25, "pack_size" : [3,5], "conditions" : ["DAWN", "SPRING", "SUMMER", "AUTUMN"], "starts" : 100 }, - { "monster" : "mon_furvivor_pk", "freq" : 1, "cost_multiplier" : 10, "pack_size" : [1,3], "starts" : 100 }, - { "monster" : "mon_finebeast", "freq" : 2, "cost_multiplier" : 5, "conditions" : ["DUSK", "SUMMER", "AUTUMN"], "starts" : 75 }, - { "monster" : "mon_finecraft", "freq" : 2, "cost_multiplier" : 10, "pack_size" : [1,2], "conditions" : ["DAWN", "SPRING", "SUMMER"], "starts" : 150 }, - { "monster" : "mon_finecraft", "freq" : 1, "cost_multiplier" : 10, "pack_size" : [1,4], "conditions" : ["DUSK", "SUMMER", "AUTUMN", "WINTER"], "starts" : 150 }, - { "monster" : "mon_fionaea", "freq" : 2, "cost_multiplier" : 25, "conditions" : ["DUSK", "SUMMER"], "starts" : 150 }, - - { "monster" : "mon_jabberwock", "freq" : 5, "cost_multiplier" : 50, "conditions" : ["DAWN", "WINTER", "SUMMER"], "starts" : 250 }, - { "monster" : "mon_ant_queen_young", "freq" : 4, "cost_multiplier" : 5, "conditions" : ["SPRING"], "starts" : 75 }, - { "monster" : "mon_spider_trapdoor_giant_pk", "freq" : 3, "cost_multiplier" : 5, "pack_size" : [1,3], "conditions" : ["DAY", "DUSK", "NIGHT", "SUMMER", "AUTUMN"], "starts" : 100 }, - - { "monster" : "mon_zolf_scorched", "freq" : 1, "cost_multiplier" : 25, "starts" : 150, "conditions" : ["NIGHT"] }, - { "monster" : "mon_horse_zombie_scorched", "freq" : 1, "cost_multiplier" : 25, "starts" : 150, "conditions" : ["DUSK", "NIGHT"] }, - { "monster" : "mon_horse_zombie_scorched", "freq" : 1, "cost_multiplier" : 35, "pack_size" : [1,2], "starts" : 300, "conditions" : ["DUSK", "NIGHT"] }, - - { "monster" : "mon_horse", "freq" : 2, "cost_multiplier" : 15, "pack_size" : [1,4], "ends" : 200, "conditions" : ["DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_horse", "freq" : 2, "cost_multiplier" : 15, "pack_size" : [1,4], "ends" : 600, "conditions" : ["DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_horse", "freq" : 2, "cost_multiplier" : 15, "pack_size" : [1,4], "ends" : 1000, "conditions" : ["DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_horse", "freq" : 2, "cost_multiplier" : 15, "pack_size" : [1,4], "ends" : 1600, "conditions" : ["DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_horse", "freq" : 2, "cost_multiplier" : 15, "pack_size" : [1,4], "ends" : 2000, "conditions" : ["DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_horse", "freq" : 1, "cost_multiplier" : 20, "pack_size" : [1,3], "ends" : 200, "conditions" : ["DAY", "WINTER"] }, - { "monster" : "mon_horse", "freq" : 1, "cost_multiplier" : 20, "pack_size" : [1,3], "ends" : 600, "conditions" : ["DAY", "WINTER"] }, - { "monster" : "mon_horse", "freq" : 1, "cost_multiplier" : 20, "pack_size" : [1,3], "ends" : 1000, "conditions" : ["DAY", "WINTER"] }, - - { "monster" : "mon_horse_zombie", "freq" : 2, "cost_multiplier" : 15, "starts" : 75, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_horse_zombie", "freq" : 2, "cost_multiplier" : 15, "starts" : 450, "ends" : 2000, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_horse_zombie", "freq" : 2, "cost_multiplier" : 15, "starts" : 850, "ends" : 2400, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_horse_zombie", "freq" : 1, "cost_multiplier" : 15, "starts" : 1300, "ends" : 2700, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_horse_zombie", "freq" : 1, "cost_multiplier" : 15, "starts" : 1800, "ends" : 3500, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_horse_zombie", "freq" : 1, "cost_multiplier" : 25, "pack_size" : [1,3], "starts" : 100, "ends" : 2100 }, - { "monster" : "mon_horse_zombie", "freq" : 1, "cost_multiplier" : 25, "pack_size" : [1,3], "starts" : 750, "ends" : 2700 }, - { "monster" : "mon_horse_zombie", "freq" : 1, "cost_multiplier" : 25, "pack_size" : [1,3], "starts" : 1600, "ends" : 3500 }, - - { "monster" : "mon_deer", "freq" : 5, "cost_multiplier" : 2, "pack_size" : [1,5] }, - { "monster" : "mon_deer", "freq" : 5, "cost_multiplier" : 2, "pack_size" : [1,5], "ends" : 600, "conditions" : ["DAY"] }, - { "monster" : "mon_deer", "freq" : 5, "cost_multiplier" : 2, "pack_size" : [1,5], "ends" : 1200, "conditions" : ["DAY"] }, - { "monster" : "mon_deer", "freq" : 5, "cost_multiplier" : 2, "pack_size" : [1,5], "ends" : 1800, "conditions" : ["DAY"] }, - - { "monster" : "mon_bat", "freq" : 50, "cost_multiplier" : 2, "pack_size" : [3,12], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bat_vampire", "freq" : 10, "cost_multiplier" : 10, "pack_size" : [6,18], "starts" : 350, "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bat_vampire", "freq" : 5, "cost_multiplier" : 10, "pack_size" : [6,18], "starts" : 450, "conditions" : ["NIGHT", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bat_vampire", "freq" : 15, "cost_multiplier" : 10, "pack_size" : [6,12], "starts" : 800, "conditions" : ["DAWN", "DUSK", "NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_bear", "freq" : 1, "cost_multiplier" : 10, "ends" : 4000, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bear", "freq" : 1, "cost_multiplier" : 10, "ends" : 72, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bear", "freq" : 3, "cost_multiplier" : 10, "ends" : 72, "conditions" : ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bear", "freq" : 1, "cost_multiplier" : 10, "ends" : 168, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bear", "freq" : 3, "cost_multiplier" : 10, "ends" : 168, "conditions" : ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bear", "freq" : 2, "cost_multiplier" : 10, "ends" : 672, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bear", "freq" : 4, "cost_multiplier" : 10, "ends" : 672, "conditions" : ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bear", "freq" : 1, "cost_multiplier" : 10, "ends" : 2160, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bear", "freq" : 3, "cost_multiplier" : 10, "ends" : 2160, "conditions" : ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_bear_mega", "freq" : 1, "cost_multiplier" : 25, "starts" : 850 }, - { "monster" : "mon_bear_mega", "freq" : 5, "cost_multiplier" : 25, "starts" : 850, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bear_mega", "freq" : 2, "cost_multiplier" : 30, "starts" : 850, "conditions" : ["DAY", "SUMMER"], "pack_size" : [1,3] }, - { "monster" : "mon_bear_mega", "freq" : 1, "cost_multiplier" : 50, "starts" : 900, "conditions" : ["DAWN", "DAY", "SPRING"] }, - - { "monster" : "mon_bear_mega_mating", "freq" : 5, "cost_multiplier" : 30, "starts" : 950, "conditions" : ["DAWN", "DAY", "DUSK", "SUMMER"], "pack_size" : [1,3] }, - { "monster" : "mon_bear_mega_baby", "freq" : 2, "cost_multiplier" : 20, "starts" : 850, "conditions" : ["DAWN", "DAY", "SPRING"], "pack_size" : [1,4] }, - { "monster" : "mon_bear_mega_baby", "freq" : 1, "cost_multiplier" : 20, "starts" : 850, "conditions" : ["DAWN", "DAY", "SUMMER"], "pack_size" : [1,3] }, - { "monster" : "mon_bear_mega_kid", "freq" : 1, "cost_multiplier" : 20, "starts" : 1050, "conditions" : ["DAWN", "DAY", "SPRING"], "pack_size" : [1,4] }, - { "monster" : "mon_bear_mega_kid", "freq" : 2, "cost_multiplier" : 25, "starts" : 1050, "conditions" : ["DAWN", "DAY", "SUMMER"], "pack_size" : [1,3] }, - { "monster" : "mon_bear_mega_kid", "freq" : 2, "cost_multiplier" : 30, "starts" : 1050, "conditions" : ["DAWN", "DAY", "DUSK", "AUTUMN"] }, - - { "monster" : "mon_zombear", "freq" : 1, "cost_multiplier" : 10, "starts" : 72, "ends" : 2400 }, - { "monster" : "mon_zombear", "freq" : 2, "cost_multiplier" : 10, "starts" : 168, "ends" : 2700 }, - { "monster" : "mon_zombear", "freq" : 3, "cost_multiplier" : 10, "starts" : 672, "ends" : 3100 }, - { "monster" : "mon_zombear", "freq" : 4, "cost_multiplier" : 10, "starts" : 2160 }, - - { "monster" : "mon_bobcat", "freq" : 7, "cost_multiplier" : 2 }, - { "monster" : "mon_bobcat", "freq" : 13, "cost_multiplier" : 2, "conditions" : ["DAWN", "DUSK"] }, - - { "monster" : "mon_cat", "freq" : 10, "cost_multiplier" : 1 }, - { "monster" : "mon_cat", "freq" : 15, "cost_multiplier" : 1, "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_cat", "freq" : 1, "cost_multiplier" : 1, "pack_size" : [2,8] }, - { "monster" : "mon_cat", "freq" : 4, "cost_multiplier" : 1, "pack_size" : [2,8], "conditions" : ["DAWN", "DUSK"] }, - - { "monster" : "mon_chipmunk", "freq" : 30, "cost_multiplier" : 0, "pack_size" : [1,2], "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_cougar", "freq" : 1, "cost_multiplier" : 3 }, - { "monster" : "mon_cougar", "freq" : 1, "cost_multiplier" : 3, "ends" : 168 }, - { "monster" : "mon_cougar", "freq" : 2, "cost_multiplier" : 3, "ends" : 168, "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_cougar", "freq" : 1, "cost_multiplier" : 3, "ends" : 504 }, - { "monster" : "mon_cougar", "freq" : 2, "cost_multiplier" : 3, "ends" : 504, "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_cougar", "freq" : 1, "cost_multiplier" : 3, "ends" : 1008 }, - { "monster" : "mon_cougar", "freq" : 2, "cost_multiplier" : 3, "ends" : 1008, "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_cougar", "freq" : 1, "cost_multiplier" : 3, "ends" : 2160 }, - { "monster" : "mon_cougar", "freq" : 2, "cost_multiplier" : 3, "ends" : 2160, "conditions" : ["DAWN", "DUSK"] }, - - { "monster" : "mon_zougar", "freq" : 3, "cost_multiplier" : 10, "starts" : 168 }, - { "monster" : "mon_zougar", "freq" : 3, "cost_multiplier" : 10, "starts" : 504 }, - { "monster" : "mon_zougar", "freq" : 3, "cost_multiplier" : 10, "starts" : 1008 }, - { "monster" : "mon_zougar", "freq" : 3, "cost_multiplier" : 10, "starts" : 2160 }, - - { "monster" : "mon_crow", "freq" : 5, "cost_multiplier" : 0, "pack_size" : [1,14] }, - { "monster" : "mon_crow", "freq" : 25, "cost_multiplier" : 0, "pack_size" : [1,14], "conditions" : ["DAY"] }, - - { "monster" : "mon_dog", "freq" : 4, "cost_multiplier" : 25, "pack_size" : [1,12] }, - { "monster" : "mon_dog", "freq" : 3, "cost_multiplier" : 25, "pack_size" : [1,12], "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_dog", "freq" : 4, "cost_multiplier" : 25, "ends" : 72, "pack_size" : [1,12] }, - { "monster" : "mon_dog", "freq" : 3, "cost_multiplier" : 25, "ends" : 72, "pack_size" : [1,12], "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_dog", "freq" : 4, "cost_multiplier" : 25, "ends" : 168, "pack_size" : [1,12] }, - { "monster" : "mon_dog", "freq" : 3, "cost_multiplier" : 25, "ends" : 168, "pack_size" : [1,12], "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_dog", "freq" : 4, "cost_multiplier" : 25, "ends" : 672, "pack_size" : [1,12] }, - { "monster" : "mon_dog", "freq" : 3, "cost_multiplier" : 25, "ends" : 672, "pack_size" : [1,12], "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_dog", "freq" : 4, "cost_multiplier" : 25, "ends" : 2160, "pack_size" : [1,12] }, - { "monster" : "mon_dog", "freq" : 3, "cost_multiplier" : 25, "ends" : 2160, "pack_size" : [1,12], "conditions" : ["DAWN", "DUSK"] }, - - { "monster" : "mon_fox_gray", "freq" : 1, "cost_multiplier" : 0 }, - { "monster" : "mon_fox_gray", "freq" : 2, "cost_multiplier" : 0, "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_fox_gray", "freq" : 1, "cost_multiplier" : 0, "ends" : 72 }, - { "monster" : "mon_fox_gray", "freq" : 2, "cost_multiplier" : 0, "ends" : 72, "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_fox_gray", "freq" : 1, "cost_multiplier" : 0, "ends" : 168 }, - { "monster" : "mon_fox_gray", "freq" : 2, "cost_multiplier" : 0, "ends" : 168, "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_fox_gray", "freq" : 1, "cost_multiplier" : 0, "ends" : 672 }, - { "monster" : "mon_fox_gray", "freq" : 2, "cost_multiplier" : 0, "ends" : 672, "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_fox_gray", "freq" : 1, "cost_multiplier" : 0, "ends" : 2160 }, - { "monster" : "mon_fox_gray", "freq" : 2, "cost_multiplier" : 0, "ends" : 2160, "conditions" : ["DAWN", "DUSK"] }, - - { "monster" : "mon_fox_red", "freq" : 1, "cost_multiplier" : 0 }, - { "monster" : "mon_fox_red", "freq" : 2, "cost_multiplier" : 0, "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_fox_red", "freq" : 1, "cost_multiplier" : 0, "ends" : 72 }, - { "monster" : "mon_fox_red", "freq" : 2, "cost_multiplier" : 0, "ends" : 72, "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_fox_red", "freq" : 1, "cost_multiplier" : 0, "ends" : 168 }, - { "monster" : "mon_fox_red", "freq" : 2, "cost_multiplier" : 0, "ends" : 168, "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_fox_red", "freq" : 1, "cost_multiplier" : 0, "ends" : 672 }, - { "monster" : "mon_fox_red", "freq" : 2, "cost_multiplier" : 0, "ends" : 672, "conditions" : ["DAWN", "DUSK"] }, - { "monster" : "mon_fox_red", "freq" : 1, "cost_multiplier" : 0, "ends" : 2160 }, - { "monster" : "mon_fox_red", "freq" : 2, "cost_multiplier" : 0, "ends" : 2160, "conditions" : ["DAWN", "DUSK"] }, - - { "monster" : "mon_wolf", "freq" : 1, "cost_multiplier" : 2, "pack_size" : [2,5] }, - { "monster" : "mon_wolf", "freq" : 2, "cost_multiplier" : 2, "pack_size" : [2,5], "conditions" : ["NIGHT"] }, - { "monster" : "mon_wolf", "freq" : 1, "cost_multiplier" : 2, "ends" : 72, "pack_size" : [2,5] }, - { "monster" : "mon_wolf", "freq" : 2, "cost_multiplier" : 2, "ends" : 72, "pack_size" : [2,5], "conditions" : ["NIGHT"] }, - { "monster" : "mon_wolf", "freq" : 1, "cost_multiplier" : 2, "ends" : 168, "pack_size" : [2,5] }, - { "monster" : "mon_wolf", "freq" : 2, "cost_multiplier" : 2, "ends" : 168, "pack_size" : [2,5], "conditions" : ["NIGHT"] }, - { "monster" : "mon_wolf", "freq" : 1, "cost_multiplier" : 2, "ends" : 672, "pack_size" : [2,5] }, - { "monster" : "mon_wolf", "freq" : 2, "cost_multiplier" : 2, "ends" : 672, "pack_size" : [2,5], "conditions" : ["NIGHT"] }, - { "monster" : "mon_wolf", "freq" : 1, "cost_multiplier" : 2, "ends" : 2160, "pack_size" : [2,5] }, - { "monster" : "mon_wolf", "freq" : 2, "cost_multiplier" : 2, "ends" : 2160, "pack_size" : [2,5], "conditions" : ["NIGHT"] }, - - { "monster" : "mon_coyote", "freq" : 1, "cost_multiplier" : 2, "pack_size" : [1,6], "conditions" : ["NIGHT"] }, - { "monster" : "mon_coyote", "freq" : 1, "cost_multiplier" : 2, "ends" : 72, "pack_size" : [1,6] }, - { "monster" : "mon_coyote", "freq" : 2, "cost_multiplier" : 2, "ends" : 72, "pack_size" : [1,6], "conditions" : ["NIGHT"] }, - { "monster" : "mon_coyote", "freq" : 1, "cost_multiplier" : 2, "ends" : 168, "pack_size" : [1,6] }, - { "monster" : "mon_coyote", "freq" : 2, "cost_multiplier" : 2, "ends" : 168, "pack_size" : [1,6], "conditions" : ["NIGHT"] }, - { "monster" : "mon_coyote", "freq" : 1, "cost_multiplier" : 2, "ends" : 672, "pack_size" : [1,6] }, - { "monster" : "mon_coyote", "freq" : 2, "cost_multiplier" : 2, "ends" : 672, "pack_size" : [1,6], "conditions" : ["NIGHT"] }, - { "monster" : "mon_coyote", "freq" : 1, "cost_multiplier" : 2, "ends" : 2160, "pack_size" : [1,6] }, - { "monster" : "mon_coyote", "freq" : 2, "cost_multiplier" : 2, "ends" : 2160, "pack_size" : [1,6], "conditions" : ["NIGHT"] }, - - { "monster" : "mon_coyote_small", "freq" : 3, "cost_multiplier" : 5, "starts" : 200, "pack_size" : [3,8] }, - { "monster" : "mon_coyote_small", "freq" : 3, "cost_multiplier" : 5, "starts" : 600, "pack_size" : [10,18], "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_coyote_small", "freq" : 7, "cost_multiplier" : 5, "starts" : 800, "pack_size" : [3,8], "ends" : 1800 }, - - { "monster" : "mon_coyote_wolf", "freq" : 1, "cost_multiplier" : 2, "pack_size" : [1,8] }, - { "monster" : "mon_coyote_wolf", "freq" : 2, "cost_multiplier" : 2, "pack_size" : [1,8], "conditions" : ["NIGHT"] }, - { "monster" : "mon_coyote_wolf", "freq" : 1, "cost_multiplier" : 2, "ends" : 72, "pack_size" : [1,8] }, - { "monster" : "mon_coyote_wolf", "freq" : 2, "cost_multiplier" : 2, "ends" : 72, "pack_size" : [1,8], "conditions" : ["NIGHT"] }, - { "monster" : "mon_coyote_wolf", "freq" : 1, "cost_multiplier" : 2, "ends" : 168, "pack_size" : [1,8] }, - { "monster" : "mon_coyote_wolf", "freq" : 2, "cost_multiplier" : 2, "ends" : 168, "pack_size" : [1,8], "conditions" : ["NIGHT"] }, - { "monster" : "mon_coyote_wolf", "freq" : 1, "cost_multiplier" : 2, "ends" : 672, "pack_size" : [1,8] }, - { "monster" : "mon_coyote_wolf", "freq" : 2, "cost_multiplier" : 2, "ends" : 672, "pack_size" : [1,8], "conditions" : ["NIGHT"] }, - { "monster" : "mon_coyote_wolf", "freq" : 1, "cost_multiplier" : 2, "ends" : 2160, "pack_size" : [1,8] }, - { "monster" : "mon_coyote_wolf", "freq" : 2, "cost_multiplier" : 2, "ends" : 2160, "pack_size" : [1,8], "conditions" : ["NIGHT"] }, - - { "monster" : "mon_coyote_wolf_zerg", "freq" : 2, "cost_multiplier" : 15, "starts" : 600, "pack_size" : [2,7] }, - { "monster" : "mon_coyote_wolf_zerg", "freq" : 2, "cost_multiplier" : 25, "starts" : 800, "pack_size" : [6,12], "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_coyote_wolf_zerg", "freq" : 10, "cost_multiplier" : 15, "starts" : 700, "pack_size" : [2,7], "ends" : 2100 }, - { "monster" : "mon_coyote_wolf_zerg", "freq" : 1, "cost_multiplier" : 50, "starts" : 800, "pack_size" : [20,20], "conditions" : ["DUSK", "SUMMER"] }, - - { "monster" : "mon_zombie_dog", "freq" : 4, "cost_multiplier" : 2, "starts" : 72 }, - { "monster" : "mon_zombie_dog", "freq" : 4, "cost_multiplier" : 2, "starts" : 336 }, - { "monster" : "mon_zombie_dog", "freq" : 4, "cost_multiplier" : 2, "starts" : 504 }, - { "monster" : "mon_zombie_dog", "freq" : 4, "cost_multiplier" : 2, "starts" : 890 }, - { "monster" : "mon_zombie_dog", "freq" : 4, "cost_multiplier" : 2, "starts" : 1344 }, - { "monster" : "mon_zombie_dog", "freq" : 4, "cost_multiplier" : 2, "starts" : 2160 }, - { "monster" : "mon_zolf", "freq" : 2, "cost_multiplier" : 2, "starts" : 72, "pack_size" : [1,4] }, - { "monster" : "mon_zolf", "freq" : 2, "cost_multiplier" : 2, "starts" : 672, "pack_size" : [1,4] }, - { "monster" : "mon_zolf", "freq" : 2, "cost_multiplier" : 2, "starts" : 2160, "pack_size" : [1,4] }, - - { "monster" : "mon_groundhog", "freq" : 30, "cost_multiplier" : 5, "pack_size" : [1,6], "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_hare", "freq" : 12, "cost_multiplier" : 2, "pack_size" : [1,6] }, - { "monster" : "mon_hare", "freq" : 18, "cost_multiplier" : 2, "pack_size" : [1,6], "conditions" : ["NIGHT"] }, - - { "monster" : "mon_moose", "freq" : 1, "cost_multiplier" : 3, "ends" : 72 }, - { "monster" : "mon_moose", "freq" : 2, "cost_multiplier" : 3, "ends" : 72, "conditions" : ["DAY"] }, - { "monster" : "mon_moose", "freq" : 1, "cost_multiplier" : 3, "ends" : 168 }, - { "monster" : "mon_moose", "freq" : 2, "cost_multiplier" : 3, "ends" : 168, "conditions" : ["DAY"] }, - { "monster" : "mon_moose", "freq" : 1, "cost_multiplier" : 3, "ends" : 672 }, - { "monster" : "mon_moose", "freq" : 2, "cost_multiplier" : 3, "ends" : 672, "conditions" : ["DAY"] }, - { "monster" : "mon_moose", "freq" : 2, "cost_multiplier" : 3, "ends" : 1326 }, - { "monster" : "mon_moose", "freq" : 1, "cost_multiplier" : 3, "ends" : 2160, "conditions" : ["DAY"] }, - - { "monster" : "mon_zoose", "freq" : 1, "cost_multiplier" : 10 }, - { "monster" : "mon_zoose", "freq" : 1, "cost_multiplier" : 10, "starts" : 168, "ends" : 2160 }, - { "monster" : "mon_zoose", "freq" : 1, "cost_multiplier" : 10, "starts" : 672, "ends" : 3000 }, - { "monster" : "mon_zoose", "freq" : 1, "cost_multiplier" : 10, "starts" : 1326, "ends" : 4500 }, - - { "monster" : "mon_rabbit", "freq" : 10, "cost_multiplier" : 0, "pack_size" : [1,5] }, - { "monster" : "mon_rabbit", "freq" : 15, "cost_multiplier" : 0, "pack_size" : [1,5], "conditions" : ["DUSK", "NIGHT", "DAWN"] }, - - { "monster" : "mon_shrew", "freq" : 20, "cost_multiplier" : 0, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_squirrel", "freq" : 50, "cost_multiplier" : 0, "pack_size" : [1,2], "conditions" : ["DAY"] }, - { "monster" : "mon_squirrel", "freq" : 25, "cost_multiplier" : 0, "pack_size" : [1,2], "conditions" : ["DAWN", "DUSK"] }, - - { "monster" : "mon_squirrel_red", "freq" : 50, "cost_multiplier" : 0, "pack_size" : [1,2], "conditions" : ["DAY"] }, - { "monster" : "mon_squirrel_red", "freq" : 25, "cost_multiplier" : 0, "pack_size" : [1,2], "conditions" : ["DAWN", "DUSK"] }, - - { "monster" : "mon_weasel", "freq" : 5, "cost_multiplier" : 5 }, - { "monster" : "mon_weasel", "freq" : 15, "cost_multiplier" : 5, "conditions" : ["NIGHT"] }, - - { "monster" : "mon_turkey", "freq" : 6, "cost_multiplier" : 2, "pack_size" : [1,18] }, - { "monster" : "mon_turkey", "freq" : 9, "cost_multiplier" : 2, "pack_size" : [1,18], "conditions" : ["DAY"] }, - - { "monster" : "mon_raccoon", "freq" : 8, "cost_multiplier" : 0, "pack_size" : [1,3], "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_raccoon", "freq" : 12, "cost_multiplier" : 0, "pack_size" : [1,3], "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_opossum", "freq" : 8, "cost_multiplier" : 0, "pack_size" : [1,3], "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_opossum", "freq" : 12, "cost_multiplier" : 0, "pack_size" : [1,3], "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_deer_mouse", "freq" : 30, "cost_multiplier" : 0, "pack_size" : [1,2], "conditions" : ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_black_rat", "freq" : 10, "cost_multiplier" : 0, "pack_size" : [1,4], "conditions" : ["DAY"] }, - { "monster" : "mon_black_rat", "freq" : 15, "cost_multiplier" : 0, "pack_size" : [1,8], "conditions" : ["NIGHT"] }, - { "monster" : "mon_black_rat", "freq" : 2, "cost_multiplier" : 15, "pack_size" : [8,32], "conditions" : ["NIGHT"] }, - - { "monster" : "mon_rattlesnake", "freq" : 15, "cost_multiplier" : 5, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_rattlesnake_giant", "freq" : 5, "cost_multiplier" : 5, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_rattlesnake_giant", "freq" : 5, "cost_multiplier" : 5, "ends" : 600, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_bee", "freq" : 3, "cost_multiplier" : 0, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bee", "freq" : 2, "cost_multiplier" : 0, "starts" : 24, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bee", "freq" : 2, "cost_multiplier" : 0, "starts" : 120, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bee", "freq" : 2, "cost_multiplier" : 0, "starts" : 216, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bee", "freq" : 2, "cost_multiplier" : 0, "starts" : 336, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bee", "freq" : 2, "cost_multiplier" : 0, "starts" : 456, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bee", "freq" : 2, "cost_multiplier" : 0, "starts" : 552, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bee", "freq" : 2, "cost_multiplier" : 0, "starts" : 672, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bee", "freq" : 2, "cost_multiplier" : 0, "starts" : 792, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_centipede", "freq" : 30, "cost_multiplier" : 0, "conditions" : ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_fly", "freq" : 1, "cost_multiplier" : 0, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 3, "cost_multiplier" : 0, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 2, "cost_multiplier" : 0, "starts" : 24, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 3, "cost_multiplier" : 0, "starts" : 24, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 2, "cost_multiplier" : 0, "starts" : 120, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 3, "cost_multiplier" : 0, "starts" : 120, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 2, "cost_multiplier" : 0, "starts" : 216, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 3, "cost_multiplier" : 0, "starts" : 216, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 2, "cost_multiplier" : 0, "starts" : 336, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 3, "cost_multiplier" : 0, "starts" : 336, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 2, "cost_multiplier" : 0, "starts" : 456, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 3, "cost_multiplier" : 0, "starts" : 456, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 2, "cost_multiplier" : 0, "starts" : 552, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 3, "cost_multiplier" : 0, "starts" : 552, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 2, "cost_multiplier" : 0, "starts" : 672, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 3, "cost_multiplier" : 0, "starts" : 672, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 2, "cost_multiplier" : 0, "starts" : 793, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 3, "cost_multiplier" : 0, "starts" : 793, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_mosquito", "freq" : 30, "cost_multiplier" : 0, "pack_size" : [1,14], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_slug", "freq" : 30, "cost_multiplier" : 0, "conditions" : ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_spider_jumping", "freq" : 6, "cost_multiplier" : 2, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping", "freq" : 24, "cost_multiplier" : 2, "conditions" : ["DAWN", "DAY", "DUSK","SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_spider_jumping_giant", "freq" : 0, "cost_multiplier" : 0, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 2, "cost_multiplier" : 0, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 1, "cost_multiplier" : 0, "starts" : 24, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 2, "cost_multiplier" : 0, "starts" : 24, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 1, "cost_multiplier" : 0, "starts" : 120, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 2, "cost_multiplier" : 0, "starts" : 120, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 1, "cost_multiplier" : 0, "starts" : 216, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 2, "cost_multiplier" : 0, "starts" : 216, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 1, "cost_multiplier" : 0, "starts" : 336, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 2, "cost_multiplier" : 0, "starts" : 336, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 1, "cost_multiplier" : 0, "starts" : 456, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 2, "cost_multiplier" : 0, "starts" : 456, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 1, "cost_multiplier" : 0, "starts" : 552, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 2, "cost_multiplier" : 0, "starts" : 552, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 1, "cost_multiplier" : 0, "starts" : 672, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 2, "cost_multiplier" : 0, "starts" : 672, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 1, "cost_multiplier" : 0, "starts" : 792, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 2, "cost_multiplier" : 0, "starts" : 792, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant_acid", "freq" : 1, "cost_multiplier" : 15, "starts" : 150, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_spider_wolf", "freq" : 4, "cost_multiplier" : 2, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_wolf", "freq" : 24, "cost_multiplier" : 2, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_spider_wolf_giant", "freq" : 1, "cost_multiplier" : 5, "conditions" : ["SUMMER"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 3, "cost_multiplier" : 5, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 1, "cost_multiplier" : 5, "starts" : 50, "conditions" : ["SUMMER"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 2, "cost_multiplier" : 5, "starts" : 50, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 1, "cost_multiplier" : 5, "starts" : 100, "conditions" : ["SUMMER"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 2, "cost_multiplier" : 5, "starts" : 100, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 1, "cost_multiplier" : 5, "starts" : 250, "conditions" : ["SUMMER"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 2, "cost_multiplier" : 5, "starts" : 250, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 1, "cost_multiplier" : 5, "starts" : 350, "conditions" : ["SUMMER"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 2, "cost_multiplier" : 5, "starts" : 350, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_wasp_small", "freq" : 6, "cost_multiplier" : 2, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_wasp_small", "freq" : 24, "cost_multiplier" : 2, "conditions" : ["DAWN", "DAY", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_wasp", "freq" : 3, "cost_multiplier" : 0, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_wasp", "freq" : 2, "cost_multiplier" : 0, "starts" : 24, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_wasp", "freq" : 2, "cost_multiplier" : 0, "starts" : 120, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_wasp", "freq" : 2, "cost_multiplier" : 0, "starts" : 216, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_wasp", "freq" : 2, "cost_multiplier" : 0, "starts" : 336, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_wasp", "freq" : 2, "cost_multiplier" : 0, "starts" : 456, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_wasp", "freq" : 2, "cost_multiplier" : 0, "starts" : 552, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_wasp", "freq" : 2, "cost_multiplier" : 0, "starts" : 672, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_wasp", "freq" : 2, "cost_multiplier" : 0, "starts" : 792, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_worm", "freq" : 1, "cost_multiplier" : 0, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_worm", "freq" : 1, "cost_multiplier" : 0, "starts" : 336, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_worm", "freq" : 1, "cost_multiplier" : 0, "starts" : 672, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bear_smoky", "freq" : 1, "cost_multiplier" : 0, "starts" : 672, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] } + "name": "GROUP_FOREST", + "default": "mon_null", + "monsters": [ + { "monster": "mon_fougar", "freq": 1, "cost_multiplier": 8, "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_feer", "freq": 2, "cost_multiplier": 5, "pack_size": [1,2], "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_feer", "freq": 1, "cost_multiplier": 9, "pack_size": [2,5], "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_feer", "freq": 1, "cost_multiplier": 15, "pack_size": [3,7], "conditions": ["DUSK", "AUTUMN"] }, + { "monster": "mon_foose", "freq": 1, "cost_multiplier": 10, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_foose", "freq": 2, "cost_multiplier": 20, "pack_size": [1,2], "conditions": ["SPRING", "NIGHT"] }, + { "monster": "mon_folf", "freq": 1, "cost_multiplier": 8, "pack_size": [3,6], "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_folf", "freq": 1, "cost_multiplier": 4, "pack_size": [1,4], "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_folf", "freq": 1, "cost_multiplier": 3, "pack_size": [1,3], "conditions": ["WINTER"] }, + { "monster": "mon_fant", "freq": 2, "cost_multiplier": 2, "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fardigrade", "freq": 1, "cost_multiplier": 25, "conditions": ["DAWN", "WINTER"] }, + { "monster": "mon_furvivor", "freq": 2, "cost_multiplier": 5, "conditions": ["DUSK", "SPRING"] }, + { "monster": "mon_furvivor_glock", "freq": 2, "cost_multiplier": 10, "pack_size": [1,2], "conditions": ["DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_furvivor_glock", "freq": 1, "cost_multiplier": 15, "pack_size": [1,3], "conditions": ["DUSK", "SPRING"], "starts": 72 }, + { "monster": "mon_furvivor_shotgun", "freq": 2, "cost_multiplier": 15, "pack_size": [1,2], "conditions": ["DAWN", "DUSK", "SUMMER", "AUTUMN"], "starts": 75 }, + { "monster": "mon_furvivor_deagle", "freq": 2, "cost_multiplier": 10, "starts": 25 }, + { "monster": "mon_furvivor_deagle", "freq": 1, "cost_multiplier": 15, "pack_size": [1,4], "conditions": ["SUMMER"], "starts": 75 }, + { "monster": "mon_furvivor_smg", "freq": 1, "cost_multiplier": 20, "conditions": ["DUSK"], "starts": 50 }, + { "monster": "mon_furvivor_pk", "freq": 1, "cost_multiplier": 10, "pack_size": [1,2], "conditions": ["DUSK", "SUMMER", "AUTUMN"], "starts": 100 }, + { "monster": "mon_furvivor_pk", "freq": 1, "cost_multiplier": 25, "pack_size": [3,5], "conditions": ["DAWN", "SPRING", "SUMMER", "AUTUMN"], "starts": 100 }, + { "monster": "mon_furvivor_pk", "freq": 1, "cost_multiplier": 10, "pack_size": [1,3], "starts": 100 }, + { "monster": "mon_finebeast", "freq": 2, "cost_multiplier": 5, "conditions": ["DUSK", "SUMMER", "AUTUMN"], "starts": 75 }, + { "monster": "mon_finecraft", "freq": 2, "cost_multiplier": 10, "pack_size": [1,2], "conditions": ["DAWN", "SPRING", "SUMMER"], "starts": 150 }, + { "monster": "mon_finecraft", "freq": 1, "cost_multiplier": 10, "pack_size": [1,4], "conditions": ["DUSK", "SUMMER", "AUTUMN", "WINTER"], "starts": 150 }, + { "monster": "mon_fionaea", "freq": 2, "cost_multiplier": 25, "conditions": ["DUSK", "SUMMER"], "starts": 150 }, + + { "monster": "mon_jabberwock", "freq": 5, "cost_multiplier": 50, "conditions": ["DAWN", "WINTER", "SUMMER"], "starts": 250 }, + { "monster": "mon_ant_queen_young", "freq": 4, "cost_multiplier": 5, "conditions": ["SPRING"], "starts": 75 }, + { "monster": "mon_spider_trapdoor_giant_pk", "freq": 3, "cost_multiplier": 5, "pack_size": [1,3], "conditions": ["DAY", "DUSK", "NIGHT", "SUMMER", "AUTUMN"], "starts": 100 }, + + { "monster": "mon_zolf_scorched", "freq": 1, "cost_multiplier": 25, "starts": 150, "conditions": ["NIGHT"] }, + { "monster": "mon_horse_zombie_scorched", "freq": 1, "cost_multiplier": 25, "starts": 150, "conditions": ["DUSK", "NIGHT"] }, + { "monster": "mon_horse_zombie_scorched", "freq": 1, "cost_multiplier": 35, "pack_size": [1,2], "starts": 300, "conditions": ["DUSK", "NIGHT"] }, + + { "monster": "mon_horse", "freq": 2, "cost_multiplier": 15, "pack_size": [1,4], "ends": 200, "conditions": ["DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_horse", "freq": 2, "cost_multiplier": 15, "pack_size": [1,4], "ends": 600, "conditions": ["DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_horse", "freq": 2, "cost_multiplier": 15, "pack_size": [1,4], "ends": 1000, "conditions": ["DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_horse", "freq": 2, "cost_multiplier": 15, "pack_size": [1,4], "ends": 1600, "conditions": ["DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_horse", "freq": 2, "cost_multiplier": 15, "pack_size": [1,4], "ends": 2000, "conditions": ["DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_horse", "freq": 1, "cost_multiplier": 20, "pack_size": [1,3], "ends": 200, "conditions": ["DAY", "WINTER"] }, + { "monster": "mon_horse", "freq": 1, "cost_multiplier": 20, "pack_size": [1,3], "ends": 600, "conditions": ["DAY", "WINTER"] }, + { "monster": "mon_horse", "freq": 1, "cost_multiplier": 20, "pack_size": [1,3], "ends": 1000, "conditions": ["DAY", "WINTER"] }, + + { "monster": "mon_horse_zombie", "freq": 2, "cost_multiplier": 15, "starts": 75, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_horse_zombie", "freq": 2, "cost_multiplier": 15, "starts": 450, "ends": 2000, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_horse_zombie", "freq": 2, "cost_multiplier": 15, "starts": 850, "ends": 2400, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_horse_zombie", "freq": 1, "cost_multiplier": 15, "starts": 1300, "ends": 2700, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_horse_zombie", "freq": 1, "cost_multiplier": 15, "starts": 1800, "ends": 3500, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_horse_zombie", "freq": 1, "cost_multiplier": 25, "pack_size": [1,3], "starts": 100, "ends": 2100 }, + { "monster": "mon_horse_zombie", "freq": 1, "cost_multiplier": 25, "pack_size": [1,3], "starts": 750, "ends": 2700 }, + { "monster": "mon_horse_zombie", "freq": 1, "cost_multiplier": 25, "pack_size": [1,3], "starts": 1600, "ends": 3500 }, + + { "monster": "mon_deer", "freq": 5, "cost_multiplier": 2, "pack_size": [1,5] }, + { "monster": "mon_deer", "freq": 5, "cost_multiplier": 2, "pack_size": [1,5], "ends": 600, "conditions": ["DAY"] }, + { "monster": "mon_deer", "freq": 5, "cost_multiplier": 2, "pack_size": [1,5], "ends": 1200, "conditions": ["DAY"] }, + { "monster": "mon_deer", "freq": 5, "cost_multiplier": 2, "pack_size": [1,5], "ends": 1800, "conditions": ["DAY"] }, + + { "monster": "mon_bat", "freq": 50, "cost_multiplier": 2, "pack_size": [3,12], "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bat_vampire", "freq": 10, "cost_multiplier": 10, "pack_size": [6,18], "starts": 350, "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bat_vampire", "freq": 5, "cost_multiplier": 10, "pack_size": [6,18], "starts": 450, "conditions": ["NIGHT", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bat_vampire", "freq": 15, "cost_multiplier": 10, "pack_size": [6,12], "starts": 800, "conditions": ["DAWN", "DUSK", "NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_bear", "freq": 1, "cost_multiplier": 10, "ends": 4000, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bear", "freq": 1, "cost_multiplier": 10, "ends": 72, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bear", "freq": 3, "cost_multiplier": 10, "ends": 72, "conditions": ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bear", "freq": 1, "cost_multiplier": 10, "ends": 168, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bear", "freq": 3, "cost_multiplier": 10, "ends": 168, "conditions": ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bear", "freq": 2, "cost_multiplier": 10, "ends": 672, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bear", "freq": 4, "cost_multiplier": 10, "ends": 672, "conditions": ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bear", "freq": 1, "cost_multiplier": 10, "ends": 2160, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bear", "freq": 3, "cost_multiplier": 10, "ends": 2160, "conditions": ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_bear_mega", "freq": 1, "cost_multiplier": 25, "starts": 850 }, + { "monster": "mon_bear_mega", "freq": 5, "cost_multiplier": 25, "starts": 850, "conditions": ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bear_mega", "freq": 2, "cost_multiplier": 30, "starts": 850, "conditions": ["DAY", "SUMMER"], "pack_size": [1,3] }, + { "monster": "mon_bear_mega", "freq": 1, "cost_multiplier": 50, "starts": 900, "conditions": ["DAWN", "DAY", "SPRING"] }, + + { "monster": "mon_bear_mega_mating", "freq": 5, "cost_multiplier": 30, "starts": 950, "conditions": ["DAWN", "DAY", "DUSK", "SUMMER"], "pack_size": [1,3] }, + { "monster": "mon_bear_mega_baby", "freq": 2, "cost_multiplier": 20, "starts": 850, "conditions": ["DAWN", "DAY", "SPRING"], "pack_size": [1,4] }, + { "monster": "mon_bear_mega_baby", "freq": 1, "cost_multiplier": 20, "starts": 850, "conditions": ["DAWN", "DAY", "SUMMER"], "pack_size": [1,3] }, + { "monster": "mon_bear_mega_kid", "freq": 1, "cost_multiplier": 20, "starts": 1050, "conditions": ["DAWN", "DAY", "SPRING"], "pack_size": [1,4] }, + { "monster": "mon_bear_mega_kid", "freq": 2, "cost_multiplier": 25, "starts": 1050, "conditions": ["DAWN", "DAY", "SUMMER"], "pack_size": [1,3] }, + { "monster": "mon_bear_mega_kid", "freq": 2, "cost_multiplier": 30, "starts": 1050, "conditions": ["DAWN", "DAY", "DUSK", "AUTUMN"] }, + + { "monster": "mon_zombear", "freq": 1, "cost_multiplier": 10, "starts": 72, "ends": 2400 }, + { "monster": "mon_zombear", "freq": 2, "cost_multiplier": 10, "starts": 168, "ends": 2700 }, + { "monster": "mon_zombear", "freq": 3, "cost_multiplier": 10, "starts": 672, "ends": 3100 }, + { "monster": "mon_zombear", "freq": 4, "cost_multiplier": 10, "starts": 2160 }, + { "monster": "mon_zombie_bear_mega", "freq": 1, "cost_multiplier": 10, "starts": 900, "ends": 3100 }, + { "monster": "mon_zombie_bear_mega", "freq": 1, "cost_multiplier": 10, "starts": 1400 }, + { "monster": "mon_zombie_bear_mega", "freq": 1, "cost_multiplier": 10, "starts": 2100 }, + + { "monster": "mon_bobcat", "freq": 7, "cost_multiplier": 2 }, + { "monster": "mon_bobcat", "freq": 13, "cost_multiplier": 2, "conditions": ["DAWN", "DUSK"] }, + + { "monster": "mon_cat", "freq": 10, "cost_multiplier": 1 }, + { "monster": "mon_cat", "freq": 15, "cost_multiplier": 1, "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_cat", "freq": 1, "cost_multiplier": 1, "pack_size": [2,8] }, + { "monster": "mon_cat", "freq": 4, "cost_multiplier": 1, "pack_size": [2,8], "conditions": ["DAWN", "DUSK"] }, + + { "monster": "mon_chipmunk", "freq": 30, "cost_multiplier": 0, "pack_size": [1,2], "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_cougar", "freq": 1, "cost_multiplier": 3 }, + { "monster": "mon_cougar", "freq": 1, "cost_multiplier": 3, "ends": 168 }, + { "monster": "mon_cougar", "freq": 2, "cost_multiplier": 3, "ends": 168, "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_cougar", "freq": 1, "cost_multiplier": 3, "ends": 504 }, + { "monster": "mon_cougar", "freq": 2, "cost_multiplier": 3, "ends": 504, "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_cougar", "freq": 1, "cost_multiplier": 3, "ends": 1008 }, + { "monster": "mon_cougar", "freq": 2, "cost_multiplier": 3, "ends": 1008, "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_cougar", "freq": 1, "cost_multiplier": 3, "ends": 2160 }, + { "monster": "mon_cougar", "freq": 2, "cost_multiplier": 3, "ends": 2160, "conditions": ["DAWN", "DUSK"] }, + + { "monster": "mon_zougar", "freq": 3, "cost_multiplier": 10, "starts": 168 }, + { "monster": "mon_zougar", "freq": 3, "cost_multiplier": 10, "starts": 504 }, + { "monster": "mon_zougar", "freq": 3, "cost_multiplier": 10, "starts": 1008 }, + { "monster": "mon_zougar", "freq": 3, "cost_multiplier": 10, "starts": 2160 }, + + { "monster": "mon_crow", "freq": 5, "cost_multiplier": 0, "pack_size": [1,14] }, + { "monster": "mon_crow", "freq": 25, "cost_multiplier": 0, "pack_size": [1,14], "conditions": ["DAY"] }, + + { "monster": "mon_dog", "freq": 4, "cost_multiplier": 25, "pack_size": [1,12] }, + { "monster": "mon_dog", "freq": 3, "cost_multiplier": 25, "pack_size": [1,12], "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_dog", "freq": 4, "cost_multiplier": 25, "ends": 72, "pack_size": [1,12] }, + { "monster": "mon_dog", "freq": 3, "cost_multiplier": 25, "ends": 72, "pack_size": [1,12], "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_dog", "freq": 4, "cost_multiplier": 25, "ends": 168, "pack_size": [1,12] }, + { "monster": "mon_dog", "freq": 3, "cost_multiplier": 25, "ends": 168, "pack_size": [1,12], "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_dog", "freq": 4, "cost_multiplier": 25, "ends": 672, "pack_size": [1,12] }, + { "monster": "mon_dog", "freq": 3, "cost_multiplier": 25, "ends": 672, "pack_size": [1,12], "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_dog", "freq": 4, "cost_multiplier": 25, "ends": 2160, "pack_size": [1,12] }, + { "monster": "mon_dog", "freq": 3, "cost_multiplier": 25, "ends": 2160, "pack_size": [1,12], "conditions": ["DAWN", "DUSK"] }, + + { "monster": "mon_fox_gray", "freq": 1, "cost_multiplier": 0 }, + { "monster": "mon_fox_gray", "freq": 2, "cost_multiplier": 0, "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_fox_gray", "freq": 1, "cost_multiplier": 0, "ends": 72 }, + { "monster": "mon_fox_gray", "freq": 2, "cost_multiplier": 0, "ends": 72, "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_fox_gray", "freq": 1, "cost_multiplier": 0, "ends": 168 }, + { "monster": "mon_fox_gray", "freq": 2, "cost_multiplier": 0, "ends": 168, "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_fox_gray", "freq": 1, "cost_multiplier": 0, "ends": 672 }, + { "monster": "mon_fox_gray", "freq": 2, "cost_multiplier": 0, "ends": 672, "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_fox_gray", "freq": 1, "cost_multiplier": 0, "ends": 2160 }, + { "monster": "mon_fox_gray", "freq": 2, "cost_multiplier": 0, "ends": 2160, "conditions": ["DAWN", "DUSK"] }, + + { "monster": "mon_fox_red", "freq": 1, "cost_multiplier": 0 }, + { "monster": "mon_fox_red", "freq": 2, "cost_multiplier": 0, "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_fox_red", "freq": 1, "cost_multiplier": 0, "ends": 72 }, + { "monster": "mon_fox_red", "freq": 2, "cost_multiplier": 0, "ends": 72, "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_fox_red", "freq": 1, "cost_multiplier": 0, "ends": 168 }, + { "monster": "mon_fox_red", "freq": 2, "cost_multiplier": 0, "ends": 168, "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_fox_red", "freq": 1, "cost_multiplier": 0, "ends": 672 }, + { "monster": "mon_fox_red", "freq": 2, "cost_multiplier": 0, "ends": 672, "conditions": ["DAWN", "DUSK"] }, + { "monster": "mon_fox_red", "freq": 1, "cost_multiplier": 0, "ends": 2160 }, + { "monster": "mon_fox_red", "freq": 2, "cost_multiplier": 0, "ends": 2160, "conditions": ["DAWN", "DUSK"] }, + + { "monster": "mon_wolf", "freq": 1, "cost_multiplier": 2, "pack_size": [2,5] }, + { "monster": "mon_wolf", "freq": 2, "cost_multiplier": 2, "pack_size": [2,5], "conditions": ["NIGHT"] }, + { "monster": "mon_wolf", "freq": 1, "cost_multiplier": 2, "ends": 72, "pack_size": [2,5] }, + { "monster": "mon_wolf", "freq": 2, "cost_multiplier": 2, "ends": 72, "pack_size": [2,5], "conditions": ["NIGHT"] }, + { "monster": "mon_wolf", "freq": 1, "cost_multiplier": 2, "ends": 168, "pack_size": [2,5] }, + { "monster": "mon_wolf", "freq": 2, "cost_multiplier": 2, "ends": 168, "pack_size": [2,5], "conditions": ["NIGHT"] }, + { "monster": "mon_wolf", "freq": 1, "cost_multiplier": 2, "ends": 672, "pack_size": [2,5] }, + { "monster": "mon_wolf", "freq": 2, "cost_multiplier": 2, "ends": 672, "pack_size": [2,5], "conditions": ["NIGHT"] }, + { "monster": "mon_wolf", "freq": 1, "cost_multiplier": 2, "ends": 2160, "pack_size": [2,5] }, + { "monster": "mon_wolf", "freq": 2, "cost_multiplier": 2, "ends": 2160, "pack_size": [2,5], "conditions": ["NIGHT"] }, + + { "monster": "mon_coyote", "freq": 1, "cost_multiplier": 2, "pack_size": [1,6], "conditions": ["NIGHT"] }, + { "monster": "mon_coyote", "freq": 1, "cost_multiplier": 2, "ends": 72, "pack_size": [1,6] }, + { "monster": "mon_coyote", "freq": 2, "cost_multiplier": 2, "ends": 72, "pack_size": [1,6], "conditions": ["NIGHT"] }, + { "monster": "mon_coyote", "freq": 1, "cost_multiplier": 2, "ends": 168, "pack_size": [1,6] }, + { "monster": "mon_coyote", "freq": 2, "cost_multiplier": 2, "ends": 168, "pack_size": [1,6], "conditions": ["NIGHT"] }, + { "monster": "mon_coyote", "freq": 1, "cost_multiplier": 2, "ends": 672, "pack_size": [1,6] }, + { "monster": "mon_coyote", "freq": 2, "cost_multiplier": 2, "ends": 672, "pack_size": [1,6], "conditions": ["NIGHT"] }, + { "monster": "mon_coyote", "freq": 1, "cost_multiplier": 2, "ends": 2160, "pack_size": [1,6] }, + { "monster": "mon_coyote", "freq": 2, "cost_multiplier": 2, "ends": 2160, "pack_size": [1,6], "conditions": ["NIGHT"] }, + + { "monster": "mon_coyote_small", "freq": 3, "cost_multiplier": 5, "starts": 200, "pack_size": [3,8] }, + { "monster": "mon_coyote_small", "freq": 3, "cost_multiplier": 5, "starts": 600, "pack_size": [10,18], "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_coyote_small", "freq": 7, "cost_multiplier": 5, "starts": 800, "pack_size": [3,8], "ends": 1800 }, + + { "monster": "mon_coyote_wolf", "freq": 1, "cost_multiplier": 2, "pack_size": [1,8] }, + { "monster": "mon_coyote_wolf", "freq": 2, "cost_multiplier": 2, "pack_size": [1,8], "conditions": ["NIGHT"] }, + { "monster": "mon_coyote_wolf", "freq": 1, "cost_multiplier": 2, "ends": 72, "pack_size": [1,8] }, + { "monster": "mon_coyote_wolf", "freq": 2, "cost_multiplier": 2, "ends": 72, "pack_size": [1,8], "conditions": ["NIGHT"] }, + { "monster": "mon_coyote_wolf", "freq": 1, "cost_multiplier": 2, "ends": 168, "pack_size": [1,8] }, + { "monster": "mon_coyote_wolf", "freq": 2, "cost_multiplier": 2, "ends": 168, "pack_size": [1,8], "conditions": ["NIGHT"] }, + { "monster": "mon_coyote_wolf", "freq": 1, "cost_multiplier": 2, "ends": 672, "pack_size": [1,8] }, + { "monster": "mon_coyote_wolf", "freq": 2, "cost_multiplier": 2, "ends": 672, "pack_size": [1,8], "conditions": ["NIGHT"] }, + { "monster": "mon_coyote_wolf", "freq": 1, "cost_multiplier": 2, "ends": 2160, "pack_size": [1,8] }, + { "monster": "mon_coyote_wolf", "freq": 2, "cost_multiplier": 2, "ends": 2160, "pack_size": [1,8], "conditions": ["NIGHT"] }, + + { "monster": "mon_coyote_wolf_zerg", "freq": 2, "cost_multiplier": 15, "starts": 600, "pack_size": [2,7] }, + { "monster": "mon_coyote_wolf_zerg", "freq": 2, "cost_multiplier": 25, "starts": 800, "pack_size": [6,12], "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_coyote_wolf_zerg", "freq": 10, "cost_multiplier": 15, "starts": 700, "pack_size": [2,7], "ends": 2100 }, + { "monster": "mon_coyote_wolf_zerg", "freq": 1, "cost_multiplier": 50, "starts": 800, "pack_size": [20,20], "conditions": ["DUSK", "SUMMER"] }, + + { "monster": "mon_zombie_dog", "freq": 4, "cost_multiplier": 2, "starts": 72 }, + { "monster": "mon_zombie_dog", "freq": 4, "cost_multiplier": 2, "starts": 336 }, + { "monster": "mon_zombie_dog", "freq": 4, "cost_multiplier": 2, "starts": 504 }, + { "monster": "mon_zombie_dog", "freq": 4, "cost_multiplier": 2, "starts": 890 }, + { "monster": "mon_zombie_dog", "freq": 4, "cost_multiplier": 2, "starts": 1344 }, + { "monster": "mon_zombie_dog", "freq": 4, "cost_multiplier": 2, "starts": 2160 }, + { "monster": "mon_zolf", "freq": 2, "cost_multiplier": 2, "starts": 72, "pack_size": [1,4] }, + { "monster": "mon_zolf", "freq": 2, "cost_multiplier": 2, "starts": 672, "pack_size": [1,4] }, + { "monster": "mon_zolf", "freq": 2, "cost_multiplier": 2, "starts": 2160, "pack_size": [1,4] }, + + { "monster": "mon_groundhog", "freq": 30, "cost_multiplier": 5, "pack_size": [1,6], "conditions": ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_hare", "freq": 12, "cost_multiplier": 2, "pack_size": [1,6] }, + { "monster": "mon_hare", "freq": 18, "cost_multiplier": 2, "pack_size": [1,6], "conditions": ["NIGHT"] }, + + { "monster": "mon_moose", "freq": 1, "cost_multiplier": 3, "ends": 72 }, + { "monster": "mon_moose", "freq": 2, "cost_multiplier": 3, "ends": 72, "conditions": ["DAY"] }, + { "monster": "mon_moose", "freq": 1, "cost_multiplier": 3, "ends": 168 }, + { "monster": "mon_moose", "freq": 2, "cost_multiplier": 3, "ends": 168, "conditions": ["DAY"] }, + { "monster": "mon_moose", "freq": 1, "cost_multiplier": 3, "ends": 672 }, + { "monster": "mon_moose", "freq": 2, "cost_multiplier": 3, "ends": 672, "conditions": ["DAY"] }, + { "monster": "mon_moose", "freq": 2, "cost_multiplier": 3, "ends": 1326 }, + { "monster": "mon_moose", "freq": 1, "cost_multiplier": 3, "ends": 2160, "conditions": ["DAY"] }, + + { "monster": "mon_zoose", "freq": 1, "cost_multiplier": 10 }, + { "monster": "mon_zoose", "freq": 1, "cost_multiplier": 10, "starts": 168, "ends": 2160 }, + { "monster": "mon_zoose", "freq": 1, "cost_multiplier": 10, "starts": 672, "ends": 3000 }, + { "monster": "mon_zoose", "freq": 1, "cost_multiplier": 10, "starts": 1326, "ends": 4500 }, + + { "monster": "mon_rabbit", "freq": 10, "cost_multiplier": 0, "pack_size": [1,5] }, + { "monster": "mon_rabbit", "freq": 15, "cost_multiplier": 0, "pack_size": [1,5], "conditions": ["DUSK", "NIGHT", "DAWN"] }, + + { "monster": "mon_shrew", "freq": 20, "cost_multiplier": 0, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_squirrel", "freq": 50, "cost_multiplier": 0, "pack_size": [1,2], "conditions": ["DAY"] }, + { "monster": "mon_squirrel", "freq": 25, "cost_multiplier": 0, "pack_size": [1,2], "conditions": ["DAWN", "DUSK"] }, + + { "monster": "mon_squirrel_red", "freq": 50, "cost_multiplier": 0, "pack_size": [1,2], "conditions": ["DAY"] }, + { "monster": "mon_squirrel_red", "freq": 25, "cost_multiplier": 0, "pack_size": [1,2], "conditions": ["DAWN", "DUSK"] }, + + { "monster": "mon_weasel", "freq": 5, "cost_multiplier": 5 }, + { "monster": "mon_weasel", "freq": 15, "cost_multiplier": 5, "conditions": ["NIGHT"] }, + + { "monster": "mon_turkey", "freq": 6, "cost_multiplier": 2, "pack_size": [1,18] }, + { "monster": "mon_turkey", "freq": 9, "cost_multiplier": 2, "pack_size": [1,18], "conditions": ["DAY"] }, + + { "monster": "mon_raccoon", "freq": 8, "cost_multiplier": 0, "pack_size": [1,3], "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_raccoon", "freq": 12, "cost_multiplier": 0, "pack_size": [1,3], "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_opossum", "freq": 8, "cost_multiplier": 0, "pack_size": [1,3], "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_opossum", "freq": 12, "cost_multiplier": 0, "pack_size": [1,3], "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_deer_mouse", "freq": 30, "cost_multiplier": 0, "pack_size": [1,2], "conditions": ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_black_rat", "freq": 10, "cost_multiplier": 0, "pack_size": [1,4], "conditions": ["DAY"] }, + { "monster": "mon_black_rat", "freq": 15, "cost_multiplier": 0, "pack_size": [1,8], "conditions": ["NIGHT"] }, + { "monster": "mon_black_rat", "freq": 2, "cost_multiplier": 15, "pack_size": [8,32], "conditions": ["NIGHT"] }, + + { "monster": "mon_rattlesnake", "freq": 15, "cost_multiplier": 5, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_rattlesnake_giant", "freq": 5, "cost_multiplier": 5, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_rattlesnake_giant", "freq": 5, "cost_multiplier": 5, "ends": 600, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_bee", "freq": 3, "cost_multiplier": 0, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bee", "freq": 2, "cost_multiplier": 0, "starts": 24, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bee", "freq": 2, "cost_multiplier": 0, "starts": 120, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bee", "freq": 2, "cost_multiplier": 0, "starts": 216, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bee", "freq": 2, "cost_multiplier": 0, "starts": 336, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bee", "freq": 2, "cost_multiplier": 0, "starts": 456, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bee", "freq": 2, "cost_multiplier": 0, "starts": 552, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bee", "freq": 2, "cost_multiplier": 0, "starts": 672, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bee", "freq": 2, "cost_multiplier": 0, "starts": 792, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_centipede", "freq": 30, "cost_multiplier": 0, "conditions": ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_fly", "freq": 1, "cost_multiplier": 0, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 3, "cost_multiplier": 0, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 2, "cost_multiplier": 0, "starts": 24, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 3, "cost_multiplier": 0, "starts": 24, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 2, "cost_multiplier": 0, "starts": 120, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 3, "cost_multiplier": 0, "starts": 120, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 2, "cost_multiplier": 0, "starts": 216, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 3, "cost_multiplier": 0, "starts": 216, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 2, "cost_multiplier": 0, "starts": 336, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 3, "cost_multiplier": 0, "starts": 336, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 2, "cost_multiplier": 0, "starts": 456, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 3, "cost_multiplier": 0, "starts": 456, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 2, "cost_multiplier": 0, "starts": 552, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 3, "cost_multiplier": 0, "starts": 552, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 2, "cost_multiplier": 0, "starts": 672, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 3, "cost_multiplier": 0, "starts": 672, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 2, "cost_multiplier": 0, "starts": 793, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 3, "cost_multiplier": 0, "starts": 793, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_mosquito", "freq": 30, "cost_multiplier": 0, "pack_size": [1,14], "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_slug", "freq": 30, "cost_multiplier": 0, "conditions": ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_spider_jumping", "freq": 6, "cost_multiplier": 2, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping", "freq": 24, "cost_multiplier": 2, "conditions": ["DAWN", "DAY", "DUSK","SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_spider_jumping_giant", "freq": 0, "cost_multiplier": 0, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 2, "cost_multiplier": 0, "conditions": ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 1, "cost_multiplier": 0, "starts": 24, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 2, "cost_multiplier": 0, "starts": 24, "conditions": ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 1, "cost_multiplier": 0, "starts": 120, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 2, "cost_multiplier": 0, "starts": 120, "conditions": ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 1, "cost_multiplier": 0, "starts": 216, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 2, "cost_multiplier": 0, "starts": 216, "conditions": ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 1, "cost_multiplier": 0, "starts": 336, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 2, "cost_multiplier": 0, "starts": 336, "conditions": ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 1, "cost_multiplier": 0, "starts": 456, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 2, "cost_multiplier": 0, "starts": 456, "conditions": ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 1, "cost_multiplier": 0, "starts": 552, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 2, "cost_multiplier": 0, "starts": 552, "conditions": ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 1, "cost_multiplier": 0, "starts": 672, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 2, "cost_multiplier": 0, "starts": 672, "conditions": ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 1, "cost_multiplier": 0, "starts": 792, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 2, "cost_multiplier": 0, "starts": 792, "conditions": ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant_acid", "freq": 1, "cost_multiplier": 15, "starts": 150, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_spider_wolf", "freq": 4, "cost_multiplier": 2, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_wolf", "freq": 24, "cost_multiplier": 2, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_spider_wolf_giant", "freq": 1, "cost_multiplier": 5, "conditions": ["SUMMER"] }, + { "monster": "mon_spider_wolf_giant", "freq": 3, "cost_multiplier": 5, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_wolf_giant", "freq": 1, "cost_multiplier": 5, "starts": 50, "conditions": ["SUMMER"] }, + { "monster": "mon_spider_wolf_giant", "freq": 2, "cost_multiplier": 5, "starts": 50, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_wolf_giant", "freq": 1, "cost_multiplier": 5, "starts": 100, "conditions": ["SUMMER"] }, + { "monster": "mon_spider_wolf_giant", "freq": 2, "cost_multiplier": 5, "starts": 100, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_wolf_giant", "freq": 1, "cost_multiplier": 5, "starts": 250, "conditions": ["SUMMER"] }, + { "monster": "mon_spider_wolf_giant", "freq": 2, "cost_multiplier": 5, "starts": 250, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_wolf_giant", "freq": 1, "cost_multiplier": 5, "starts": 350, "conditions": ["SUMMER"] }, + { "monster": "mon_spider_wolf_giant", "freq": 2, "cost_multiplier": 5, "starts": 350, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_wasp_small", "freq": 6, "cost_multiplier": 2, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_wasp_small", "freq": 24, "cost_multiplier": 2, "conditions": ["DAWN", "DAY", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_wasp", "freq": 3, "cost_multiplier": 0, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_wasp", "freq": 2, "cost_multiplier": 0, "starts": 24, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_wasp", "freq": 2, "cost_multiplier": 0, "starts": 120, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_wasp", "freq": 2, "cost_multiplier": 0, "starts": 216, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_wasp", "freq": 2, "cost_multiplier": 0, "starts": 336, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_wasp", "freq": 2, "cost_multiplier": 0, "starts": 456, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_wasp", "freq": 2, "cost_multiplier": 0, "starts": 552, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_wasp", "freq": 2, "cost_multiplier": 0, "starts": 672, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_wasp", "freq": 2, "cost_multiplier": 0, "starts": 792, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_worm", "freq": 1, "cost_multiplier": 0, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_worm", "freq": 1, "cost_multiplier": 0, "starts": 336, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_worm", "freq": 1, "cost_multiplier": 0, "starts": 672, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bear_smoky", "freq": 1, "cost_multiplier": 0, "starts": 672, "conditions": ["SPRING", "SUMMER", "AUTUMN"] } ] },{ "type":"monstergroup", - "name" : "GROUP_ZOMBIE", - "default" : "mon_zombie", - "monsters" : [ - { "monster" : "mon_zombie_pk", "freq" : 4, "cost_multiplier": 6, "pack_size": [1,3], "starts" : 10 }, - { "monster" : "mon_zombie_pk", "freq" : 3, "cost_multiplier": 12, "pack_size": [2,5], "starts" : 10 }, - { "monster" : "mon_zombie_pk", "freq" : 2, "cost_multiplier": 21, "pack_size": [5,10], "starts" : 10 }, - { "monster" : "mon_zombie_pk", "freq" : 1, "cost_multiplier": 51, "pack_size": [15,20], "starts" : 15 }, - { "monster" : "mon_zombie", "freq" : 15, "cost_multiplier": 1, "pack_size": [1,3]}, - { "monster" : "mon_zombie", "freq" : 20, "cost_multiplier": 3, "pack_size": [2,5]}, - { "monster" : "mon_zombie", "freq" : 15, "cost_multiplier": 7, "pack_size": [5,10]}, - { "monster" : "mon_zombie", "freq" : 10, "cost_multiplier": 13, "pack_size": [15,20]}, - { "monster" : "mon_zombie", "freq" : 5, "cost_multiplier": 20, "pack_size": [25,30]}, - { "monster" : "mon_zombie_fat", "freq" : 50, "cost_multiplier": 2}, - { "monster" : "mon_zombie_fat", "freq" : 25, "cost_multiplier": 10, "pack_size": [4,6]}, - { "monster" : "mon_zombie_tough", "freq" : 50, "cost_multiplier": 3}, - { "monster" : "mon_zombie_tough", "freq" : 20, "cost_multiplier" : 9, "pack_size": [2, 4]}, - { "monster" : "mon_zombie_tough", "freq" : 5, "cost_multiplier" : 18, "pack_size": [5, 9]}, - { "monster" : "mon_zombie_child", "freq" : 50, "cost_multiplier" : 1 }, - { "monster" : "mon_zombie_child", "freq" : 20, "cost_multiplier" : 3, "pack_size": [2, 5]}, - { "monster" : "mon_zombie_child", "freq" : 5, "cost_multiplier" : 9, "pack_size": [6, 12]}, - { "monster" : "mon_zombie_child_pk", "freq" : 1, "cost_multiplier" : 20, "starts" : 25 }, - - { "monster" : "mon_zombie_rot", "freq" : 60, "cost_multiplier": 3 }, - { "monster" : "mon_zombie_rot_pk", "freq" : 15, "cost_multiplier": 10, "starts" : 5 }, - { "monster" : "mon_skeleton", "freq" : 20, "cost_multiplier" : 5 }, - { "monster" : "mon_skeleton", "freq" : 5, "cost_multiplier" : 25, "pack_size": [2,5]}, - { "monster" : "mon_skeleton_pk", "freq" : 1, "cost_multiplier" : 35, "pack_size": [1,2], "starts" : 15 }, - { "monster" : "mon_zombie_crawler", "freq" : 25, "cost_multiplier": 1 }, - { "monster" : "mon_zombie_crawler", "freq" : 5, "cost_multiplier": 5, "pack_size": [3,5]}, - { "monster" : "mon_zombie_crawler_pk", "freq" : 1, "cost_multiplier": 25, "starts" : 15 }, - - { "monster" : "mon_zombie_dog", "freq" : 15, "cost_multiplier" : 2 }, - { "monster" : "mon_zombie_dog", "freq" : 10, "cost_multiplier" : 8, "pack_size": [3,5]}, - { "monster" : "mon_zombie_dog", "freq" : 3, "cost_multiplier" : 14, "pack_size": [5,8], "starts" : 2 }, - { "monster" : "mon_zombie_dog", "freq" : 2, "cost_multiplier" : 20, "pack_size": [8,12], "starts" : 5 }, - { "monster" : "mon_dog_skeleton", "freq" : 10, "cost_multiplier" : 5 }, - { "monster" : "mon_dog_skeleton", "freq" : 3, "cost_multiplier" : 20, "pack_size": [3,5], "starts" : 2 }, - { "monster" : "mon_dog_zombie_cop", "freq" : 5, "cost_multiplier" : 4 }, - { "monster" : "mon_dog_zombie_rot", "freq" : 5, "cost_multiplier" : 10, "pack_size": [1,3]}, - - { "monster" : "mon_zombie_soldier", "freq" : 10, "cost_multiplier" : 2 }, - { "monster" : "mon_zombie_soldier", "freq" : 3, "cost_multiplier" : 8, "pack_size": [2,6]}, - { "monster" : "mon_zombie_cop", "freq" : 20, "cost_multiplier" : 3 }, - { "monster" : "mon_zombie_hazmat", "freq" : 10, "cost_multiplier" : 3 }, - { "monster" : "mon_zombie_fireman", "freq" : 5, "cost_multiplier" : 2 }, - - { "monster" : "mon_zombie_swimmer", "freq" : 1, "cost_multiplier" : 5 }, - { "monster" : "mon_zombie_swimmer_pk", "freq" : 1, "cost_multiplier" : 5 }, - { "monster" : "mon_zombie_scales", "freq" : 1, "cost_multiplier" : 15, "starts" : 150 }, - { "monster" : "mon_zombie_grabber", "freq" : 25, "cost_multiplier" : 2 }, - { "monster" : "mon_zombie_grabber", "freq" : 5, "cost_multiplier" : 12, "pack_size": [4,7]}, - { "monster" : "mon_zombie_grappler", "freq" : 10, "cost_multiplier" : 10, "starts" : 2 }, - { "monster" : "mon_zombie_grappler", "freq" : 5, "cost_multiplier" : 20, "pack_size": [2,3], "starts" : 3 }, - - { "monster" : "mon_zombie_runner", "freq" : 5, "cost_multiplier" : 3 }, - { "monster" : "mon_zombie_runner", "freq" : 20, "cost_multiplier" : 5, "pack_size": [1,4], "starts" : 2 }, - { "monster" : "mon_zombie_runner", "freq" : 3, "cost_multiplier" : 15, "pack_size": [4,8], "starts" : 5 }, - { "monster" : "mon_zombie_hunter", "freq" : 10, "cost_multiplier" : 5, "starts" : 2 }, - { "monster" : "mon_zombie_hunter", "freq" : 5, "cost_multiplier" : 15, "pack_size": [2,5], "starts" : 10 }, - - { "monster" : "mon_zombie_gasbag", "freq" : 15, "cost_multiplier": 5}, - { "monster" : "mon_zombie_gasbag", "freq" : 5, "cost_multiplier": 15, "pack_size": [3,5], "starts" : 2 }, - { "monster" : "mon_zombie_smoker", "freq" : 15, "cost_multiplier" : 5 }, - { "monster" : "mon_zombie_smoker", "freq" : 5, "cost_multiplier" : 10, "pack_size": [2,3], "starts" : 2 }, - - { "monster" : "mon_boomer", "freq" : 30, "cost_multiplier" : 5 }, - { "monster" : "mon_boomer", "freq" : 5, "cost_multiplier" : 15, "pack_size": [2,4], "starts" : 2 }, - { "monster" : "mon_boomer_huge", "freq" : 5, "cost_multiplier" : 7, "starts" : 3 }, - - { "monster" : "mon_zombie_shrieker", "freq" : 25, "cost_multiplier" : 5 }, - { "monster" : "mon_zombie_shrieker", "freq" : 5, "cost_multiplier" : 10, "pack_size": [1,3]}, - - { "monster" : "mon_zombie_acidic", "freq" : 25, "cost_multiplier" : 3 }, - { "monster" : "mon_zombie_acidic", "freq" : 5, "cost_multiplier" : 9, "pack_size": [2,5], "starts" : 3 }, - { "monster" : "mon_zombie_spitter", "freq" : 15, "cost_multiplier" : 5 }, - { "monster" : "mon_zombie_spitter", "freq" : 5, "cost_multiplier" : 15, "pack_size": [2,3], "starts" : 5 }, - - { "monster" : "mon_zombie_electric", "freq" : 15, "cost_multiplier" : 6 }, - { "monster" : "mon_zombie_electric", "freq" : 3, "cost_multiplier" : 12, "pack_size": [1,3], "starts" : 2 }, - { "monster" : "mon_zombie_brute_shocker", "freq" : 2, "cost_multiplier" : 40 }, - { "monster" : "mon_zombie_brute_shocker", "freq" : 1, "cost_multiplier" : 60, "pack_size": [1,2], "starts" : 2 }, - - { "monster" : "mon_zombie_brute", "freq" : 15, "cost_multiplier" : 15 }, - { "monster" : "mon_zombie_brute", "freq" : 5, "cost_multiplier" : 30, "pack_size": [1,3]}, - { "monster" : "mon_zombie_hulk", "freq" : 1, "cost_multiplier" : 50 }, - { "monster" : "mon_zombie_hulk", "freq" : 1, "cost_multiplier" : 80, "pack_size": [1,2], "starts" : 5 }, - - { "monster" : "mon_zombie_necro", "freq" : 2, "cost_multiplier" : 25, "starts" : 5 }, - { "monster" : "mon_zombie_necro", "freq" : 1, "cost_multiplier" : 50, "pack_size": [1,2], "starts" : 5 }, - { "monster" : "mon_zombie_survivor", "freq" : 5, "cost_multiplier" : 40, "pack_size": [1,3]}, - { "monster" : "mon_zombie_master", "freq" : 2, "cost_multiplier" : 30, "starts" : 5 }, - { "monster" : "mon_zombie_master", "freq" : 1, "cost_multiplier" : 60, "pack_size": [1,2], "starts" : 5 }, - - { "monster" : "mon_zombie_shady", "freq" : 15, "cost_multiplier" : 6, "pack_size": [1,2]}, - { "monster" : "mon_zombie_shady", "freq" : 10, "cost_multiplier" : 21, "pack_size": [3,7], "starts" : 2 }, - { "monster" : "mon_zombie_hollow", "freq" : 3, "cost_multiplier" : 10, "starts" : 2 }, - - { "monster" : "mon_beekeeper", "freq" : 1, "cost_multiplier" : 5 }, - { "monster" : "mon_zombie_technician", "freq" : 2, "cost_multiplier" : 12}, - - { "monster" : "mon_zombie_scorched", "freq" : 1, "cost_multiplier" : 8, "pack_size": [1,4], "starts": 25 }, - { "monster" : "mon_zombie_fiend", "freq" : 1, "cost_multiplier" : 14, "pack_size": [1, 2], "starts": 25 }, - { "monster" : "mon_zombie_crawler_scorched", "freq" : 1, "cost_multiplier" : 2, "pack_size": [1,2], "starts": 50 }, - { "monster" : "mon_zombie_child_scorched", "freq" : 1, "cost_multiplier" : 14, "pack_size": [1, 4], "starts": 50 }, - { "monster" : "mon_zombie_fiend_shocker", "freq" : 1, "cost_multiplier" : 12, "pack_size": [1,2], "starts": 50 }, - { "monster" : "mon_zombie_scorched_necro", "freq" : 1, "cost_multiplier" : 20, "pack_size": [1, 3], "starts": 75 }, - { "monster" : "mon_zombie_scorched_master", "freq" : 1, "cost_multiplier" : 20, "pack_size": [1, 3], "starts": 75 }, - { "monster" : "mon_zolf_scorched", "freq" : 1, "cost_multiplier" : 20, "conditions" : ["WINTER"] } + "name": "GROUP_ZOMBIE", + "default": "mon_zombie", + "monsters": [ + { "monster": "mon_zombie_pk", "freq": 4, "cost_multiplier": 6, "pack_size": [1,3], "starts": 10 }, + { "monster": "mon_zombie_pk", "freq": 3, "cost_multiplier": 12, "pack_size": [2,5], "starts": 10 }, + { "monster": "mon_zombie_pk", "freq": 2, "cost_multiplier": 21, "pack_size": [5,10], "starts": 10 }, + { "monster": "mon_zombie_pk", "freq": 1, "cost_multiplier": 51, "pack_size": [15,20], "starts": 15 }, + { "monster": "mon_zombie", "freq": 15, "cost_multiplier": 1, "pack_size": [1,3]}, + { "monster": "mon_zombie", "freq": 20, "cost_multiplier": 3, "pack_size": [2,5]}, + { "monster": "mon_zombie", "freq": 15, "cost_multiplier": 7, "pack_size": [5,10]}, + { "monster": "mon_zombie", "freq": 10, "cost_multiplier": 13, "pack_size": [15,20]}, + { "monster": "mon_zombie", "freq": 5, "cost_multiplier": 20, "pack_size": [25,30]}, + { "monster": "mon_zombie_fat", "freq": 50, "cost_multiplier": 2}, + { "monster": "mon_zombie_fat", "freq": 25, "cost_multiplier": 10, "pack_size": [4,6]}, + { "monster": "mon_zombie_tough", "freq": 50, "cost_multiplier": 3}, + { "monster": "mon_zombie_tough", "freq": 20, "cost_multiplier": 9, "pack_size": [2, 4]}, + { "monster": "mon_zombie_tough", "freq": 5, "cost_multiplier": 18, "pack_size": [5, 9]}, + { "monster": "mon_zombie_child", "freq": 50, "cost_multiplier": 1 }, + { "monster": "mon_zombie_child", "freq": 20, "cost_multiplier": 3, "pack_size": [2, 5]}, + { "monster": "mon_zombie_child", "freq": 5, "cost_multiplier": 9, "pack_size": [6, 12]}, + { "monster": "mon_zombie_child_pk", "freq": 1, "cost_multiplier": 20, "starts": 25 }, + + { "monster": "mon_zombie_rot", "freq": 60, "cost_multiplier": 3 }, + { "monster": "mon_zombie_rot_pk", "freq": 15, "cost_multiplier": 10, "starts": 5 }, + { "monster": "mon_skeleton", "freq": 20, "cost_multiplier": 5 }, + { "monster": "mon_skeleton", "freq": 5, "cost_multiplier": 25, "pack_size": [2,5]}, + { "monster": "mon_skeleton_pk", "freq": 1, "cost_multiplier": 35, "pack_size": [1,2], "starts": 15 }, + { "monster": "mon_zombie_crawler", "freq": 25, "cost_multiplier": 1 }, + { "monster": "mon_zombie_crawler", "freq": 5, "cost_multiplier": 5, "pack_size": [3,5]}, + { "monster": "mon_zombie_crawler_pk", "freq": 1, "cost_multiplier": 25, "starts": 15 }, + + { "monster": "mon_zombie_dog", "freq": 15, "cost_multiplier": 2 }, + { "monster": "mon_zombie_dog", "freq": 10, "cost_multiplier": 8, "pack_size": [3,5]}, + { "monster": "mon_zombie_dog", "freq": 3, "cost_multiplier": 14, "pack_size": [5,8], "starts": 2 }, + { "monster": "mon_zombie_dog", "freq": 2, "cost_multiplier": 20, "pack_size": [8,12], "starts": 5 }, + { "monster": "mon_dog_skeleton", "freq": 10, "cost_multiplier": 5 }, + { "monster": "mon_dog_skeleton", "freq": 3, "cost_multiplier": 20, "pack_size": [3,5], "starts": 2 }, + { "monster": "mon_dog_zombie_cop", "freq": 5, "cost_multiplier": 4 }, + { "monster": "mon_dog_zombie_rot", "freq": 5, "cost_multiplier": 10, "pack_size": [1,3]}, + + { "monster": "mon_zombie_soldier", "freq": 10, "cost_multiplier": 2 }, + { "monster": "mon_zombie_soldier", "freq": 3, "cost_multiplier": 8, "pack_size": [2,6]}, + { "monster": "mon_zombie_cop", "freq": 20, "cost_multiplier": 3 }, + { "monster": "mon_zombie_hazmat", "freq": 10, "cost_multiplier": 3 }, + { "monster": "mon_zombie_fireman", "freq": 5, "cost_multiplier": 2 }, + + { "monster": "mon_zombie_swimmer", "freq": 1, "cost_multiplier": 5 }, + { "monster": "mon_zombie_swimmer_pk", "freq": 1, "cost_multiplier": 5 }, + { "monster": "mon_zombie_scales", "freq": 1, "cost_multiplier": 15, "starts": 150 }, + { "monster": "mon_zombie_grabber", "freq": 25, "cost_multiplier": 2 }, + { "monster": "mon_zombie_grabber", "freq": 5, "cost_multiplier": 12, "pack_size": [4,7]}, + { "monster": "mon_zombie_grappler", "freq": 10, "cost_multiplier": 10, "starts": 2 }, + { "monster": "mon_zombie_grappler", "freq": 5, "cost_multiplier": 20, "pack_size": [2,3], "starts": 3 }, + + { "monster": "mon_zombie_runner", "freq": 5, "cost_multiplier": 3 }, + { "monster": "mon_zombie_runner", "freq": 20, "cost_multiplier": 5, "pack_size": [1,4], "starts": 2 }, + { "monster": "mon_zombie_runner", "freq": 3, "cost_multiplier": 15, "pack_size": [4,8], "starts": 5 }, + { "monster": "mon_zombie_hunter", "freq": 10, "cost_multiplier": 5, "starts": 2 }, + { "monster": "mon_zombie_hunter", "freq": 5, "cost_multiplier": 15, "pack_size": [2,5], "starts": 10 }, + + { "monster": "mon_zombie_gasbag", "freq": 15, "cost_multiplier": 5}, + { "monster": "mon_zombie_gasbag", "freq": 5, "cost_multiplier": 15, "pack_size": [3,5], "starts": 2 }, + { "monster": "mon_zombie_smoker", "freq": 15, "cost_multiplier": 5 }, + { "monster": "mon_zombie_smoker", "freq": 5, "cost_multiplier": 10, "pack_size": [2,3], "starts": 2 }, + + { "monster": "mon_boomer", "freq": 30, "cost_multiplier": 5 }, + { "monster": "mon_boomer", "freq": 5, "cost_multiplier": 15, "pack_size": [2,4], "starts": 2 }, + { "monster": "mon_boomer_huge", "freq": 5, "cost_multiplier": 7, "starts": 3 }, + + { "monster": "mon_zombie_shrieker", "freq": 25, "cost_multiplier": 5 }, + { "monster": "mon_zombie_shrieker", "freq": 5, "cost_multiplier": 10, "pack_size": [1,3]}, + + { "monster": "mon_zombie_acidic", "freq": 25, "cost_multiplier": 3 }, + { "monster": "mon_zombie_acidic", "freq": 5, "cost_multiplier": 9, "pack_size": [2,5], "starts": 3 }, + { "monster": "mon_zombie_spitter", "freq": 15, "cost_multiplier": 5 }, + { "monster": "mon_zombie_spitter", "freq": 5, "cost_multiplier": 15, "pack_size": [2,3], "starts": 5 }, + + { "monster": "mon_zombie_electric", "freq": 15, "cost_multiplier": 6 }, + { "monster": "mon_zombie_electric", "freq": 3, "cost_multiplier": 12, "pack_size": [1,3], "starts": 2 }, + { "monster": "mon_zombie_brute_shocker", "freq": 2, "cost_multiplier": 40 }, + { "monster": "mon_zombie_brute_shocker", "freq": 1, "cost_multiplier": 60, "pack_size": [1,2], "starts": 2 }, + + { "monster": "mon_zombie_brute", "freq": 15, "cost_multiplier": 15 }, + { "monster": "mon_zombie_brute", "freq": 5, "cost_multiplier": 30, "pack_size": [1,3]}, + { "monster": "mon_zombie_hulk", "freq": 1, "cost_multiplier": 50 }, + { "monster": "mon_zombie_hulk", "freq": 1, "cost_multiplier": 80, "pack_size": [1,2], "starts": 5 }, + + { "monster": "mon_zombie_necro", "freq": 2, "cost_multiplier": 25, "starts": 5 }, + { "monster": "mon_zombie_necro", "freq": 1, "cost_multiplier": 50, "pack_size": [1,2], "starts": 5 }, + { "monster": "mon_zombie_survivor", "freq": 5, "cost_multiplier": 40, "pack_size": [1,3]}, + { "monster": "mon_zombie_master", "freq": 2, "cost_multiplier": 30, "starts": 5 }, + { "monster": "mon_zombie_master", "freq": 1, "cost_multiplier": 60, "pack_size": [1,2], "starts": 5 }, + + { "monster": "mon_zombie_shady", "freq": 15, "cost_multiplier": 6, "pack_size": [1,2]}, + { "monster": "mon_zombie_shady", "freq": 10, "cost_multiplier": 21, "pack_size": [3,7], "starts": 2 }, + { "monster": "mon_zombie_hollow", "freq": 3, "cost_multiplier": 10, "starts": 2 }, + + { "monster": "mon_beekeeper", "freq": 1, "cost_multiplier": 5 }, + { "monster": "mon_zombie_technician", "freq": 2, "cost_multiplier": 12}, + + { "monster": "mon_zombie_scorched", "freq": 1, "cost_multiplier": 8, "pack_size": [1,4], "starts": 25 }, + { "monster": "mon_zombie_fiend", "freq": 1, "cost_multiplier": 14, "pack_size": [1, 2], "starts": 25 }, + { "monster": "mon_zombie_crawler_scorched", "freq": 1, "cost_multiplier": 2, "pack_size": [1,2], "starts": 50 }, + { "monster": "mon_zombie_child_scorched", "freq": 1, "cost_multiplier": 14, "pack_size": [1, 4], "starts": 50 }, + { "monster": "mon_zombie_fiend_shocker", "freq": 1, "cost_multiplier": 12, "pack_size": [1,2], "starts": 50 }, + { "monster": "mon_zombie_scorched_necro", "freq": 1, "cost_multiplier": 20, "pack_size": [1, 3], "starts": 75 }, + { "monster": "mon_zombie_scorched_master", "freq": 1, "cost_multiplier": 20, "pack_size": [1, 3], "starts": 75 }, + { "monster": "mon_zolf_scorched", "freq": 1, "cost_multiplier": 20, "conditions": ["WINTER"] } ], - "replace_monster_group" : true, - "new_monster_group_id" : "GROUP_ZOMBIE_MID", - "replacement_time" : 14, "//" : "(replacement_time * difficulty)DAYS *(SEASON_LENGTH / 14)" + "replace_monster_group": true, + "new_monster_group_id": "GROUP_ZOMBIE_MID", + "replacement_time": 14, "//": "(replacement_time * difficulty)DAYS *(SEASON_LENGTH / 14)" },{ "type":"monstergroup", - "name" : "GROUP_ZOMBIE_MID", - "//" : "PKs Mid spawn list. After the threshold for the formula in Group_Zom is reached, this list should start to take over.", - "default" : "mon_zombie_pk", - "monsters" : [ - { "monster" : "mon_zombie_pk", "freq" : 15, "cost_multiplier": 3, "pack_size": [1,3]}, - { "monster" : "mon_zombie_pk", "freq" : 15, "cost_multiplier": 5, "pack_size": [2,5]}, - { "monster" : "mon_zombie_pk", "freq" : 15, "cost_multiplier": 7, "pack_size": [5,10]}, - { "monster" : "mon_zombie_pk", "freq" : 10, "cost_multiplier": 13, "pack_size": [15,20]}, - { "monster" : "mon_zombie_pk", "freq" : 5, "cost_multiplier": 20, "pack_size": [25,30]}, - { "monster" : "mon_zombie", "freq" : 15, "cost_multiplier": 7, "pack_size": [5,10]}, - { "monster" : "mon_zombie_fat", "freq" : 25, "cost_multiplier": 8, "pack_size": [3,5]}, - { "monster" : "mon_zombie_tough", "freq" : 15, "cost_multiplier" : 9, "pack_size": [2, 3]}, - { "monster" : "mon_zombie_tough", "freq" : 5, "cost_multiplier" : 15, "pack_size": [3, 6]}, - { "monster" : "mon_zombie_child", "freq" : 20, "cost_multiplier" : 5, "pack_size": [1, 6]}, - { "monster" : "mon_zombie_child", "freq" : 5, "cost_multiplier" : 10, "pack_size": [7, 12]}, - { "monster" : "mon_zombie_child_pk", "freq" : 2, "cost_multiplier" : 3, "pack_size": [2, 5]}, - - { "monster" : "mon_zombie_rot", "freq" : 5, "cost_multiplier": 3 }, - { "monster" : "mon_zombie_rot_pk", "freq" : 15, "cost_multiplier": 10 }, - { "monster" : "mon_skeleton", "freq" : 20, "cost_multiplier" : 8, "pack_size": [2,5]}, - { "monster" : "mon_skeleton_pk", "freq" : 5, "cost_multiplier" : 16, "pack_size": [3,5]}, - { "monster" : "mon_skeleton_husk", "freq" : 1, "cost_multiplier" : 21 }, - { "monster" : "mon_zombie_crawler", "freq" : 20, "cost_multiplier": 12, "pack_size": [1,4]}, - { "monster" : "mon_zombie_crawler_pk", "freq" : 2, "cost_multiplier": 12, "pack_size": [1,2]}, - - { "monster" : "mon_zombie_dog", "freq" : 15, "cost_multiplier" : 6, "pack_size": [1,5]}, - { "monster" : "mon_zombie_dog", "freq" : 10, "cost_multiplier" : 14, "pack_size": [5,8]}, - { "monster" : "mon_zombie_dog", "freq" : 5, "cost_multiplier" : 20, "pack_size": [8,12]}, - { "monster" : "mon_zombie_dog_pk", "freq" : 1, "cost_multiplier" : 20, "pack_size": [2,4]}, - { "monster" : "mon_dog_skeleton", "freq" : 15, "cost_multiplier" : 5 }, - { "monster" : "mon_dog_skeleton", "freq" : 10, "cost_multiplier" : 20, "pack_size": [3,5]}, - { "monster" : "mon_dog_skeleton_pk", "freq" : 1, "cost_multiplier" : 30 }, - { "monster" : "mon_dog_zombie_cop", "freq" : 5, "cost_multiplier" : 5 }, - { "monster" : "mon_dog_zombie_rot", "freq" : 5, "cost_multiplier" : 10, "pack_size": [5,10]}, - { "monster" : "mon_dog_zombie_cop_pk", "freq" : 1, "cost_multiplier" : 20, "pack_size": [1,2]}, - - { "monster" : "mon_zombie_soldier", "freq" : 10, "cost_multiplier" : 2 }, - { "monster" : "mon_zombie_soldier", "freq" : 5, "cost_multiplier" : 8, "pack_size": [2,6]}, - { "monster" : "mon_zombie_cop", "freq" : 10, "cost_multiplier" : 3 }, - { "monster" : "mon_zombie_hazmat", "freq" : 10, "cost_multiplier" : 3 }, - { "monster" : "mon_zombie_fireman", "freq" : 5, "cost_multiplier" : 2 }, - - { "monster" : "mon_zombie_swimmer", "freq" : 1, "cost_multiplier" : 5 }, - { "monster" : "mon_zombie_swimmer_pk", "freq" : 1, "cost_multiplier" : 5 }, - { "monster" : "mon_zombie_grabber", "freq" : 10, "cost_multiplier" : 20, "pack_size": [3,5]}, - { "monster" : "mon_zombie_grappler", "freq" : 15, "cost_multiplier" : 10 }, - { "monster" : "mon_zombie_grappler", "freq" : 5, "cost_multiplier" : 20, "pack_size": [2,3]}, - { "monster" : "mon_zombie_biter", "freq" : 10, "cost_multiplier": 5 }, - { "monster" : "mon_zombie_scales", "freq" : 1, "cost_multiplier" : 15, "pack_size": [1,2]}, - - { "monster" : "mon_zombie_runner", "freq" : 15, "cost_multiplier" : 5, "pack_size": [1,4] }, - { "monster" : "mon_zombie_hunter", "freq" : 10, "cost_multiplier" : 15, "pack_size": [2,5]}, - { "monster" : "mon_zombie_predator", "freq" : 3, "cost_multiplier" : 15, "pack_size": [1,2] }, - - { "monster" : "mon_zombie_gasbag", "freq" : 15, "cost_multiplier": 5}, - { "monster" : "mon_zombie_gasbag", "freq" : 5, "cost_multiplier": 15, "pack_size": [3,5]}, - { "monster" : "mon_zombie_smoker", "freq" : 15, "cost_multiplier" : 5 }, - { "monster" : "mon_zombie_smoker", "freq" : 5, "cost_multiplier" : 10, "pack_size": [2,3]}, - { "monster" : "mon_zombie_gasbag_pk", "freq" : 2, "cost_multiplier": 25}, - { "monster" : "mon_zombie_gasbag_pk", "freq" : 1, "cost_multiplier": 65, "pack_size": [2,3]}, - - { "monster" : "mon_boomer", "freq" : 10, "cost_multiplier" : 5 }, - { "monster" : "mon_boomer", "freq" : 10, "cost_multiplier" : 15, "pack_size": [2,4] }, - { "monster" : "mon_boomer_huge", "freq" : 5, "cost_multiplier" : 14, "pack_size": [1,3] }, - - { "monster" : "mon_zombie_shrieker", "freq" : 20, "cost_multiplier" : 5 }, - { "monster" : "mon_zombie_shrieker", "freq" : 5, "cost_multiplier" : 10, "pack_size": [3,5]}, - { "monster" : "mon_zombie_screecher", "freq" : 3, "cost_multiplier" : 14, "pack_size": [1,2]}, - - { "monster" : "mon_zombie_acidic", "freq" : 10, "cost_multiplier" : 9, "pack_size": [2,5]}, - { "monster" : "mon_zombie_spitter", "freq" : 15, "cost_multiplier" : 5 }, - { "monster" : "mon_zombie_spitter", "freq" : 5, "cost_multiplier" : 15, "pack_size": [2,4]}, - { "monster" : "mon_zombie_corrosive", "freq" : 2, "cost_multiplier" : 15 }, - { "monster" : "mon_zombie_corrosive", "freq" : 1, "cost_multiplier" : 24, "pack_size": [1,3] }, - - { "monster" : "mon_zombie_electric", "freq" : 15, "cost_multiplier" : 6 }, - { "monster" : "mon_zombie_electric", "freq" : 3, "cost_multiplier" : 14, "pack_size": [2,3]}, - { "monster" : "mon_zombie_brute_shocker", "freq" : 3, "cost_multiplier" : 30 }, - { "monster" : "mon_zombie_brute_shocker", "freq" : 2, "cost_multiplier" : 50, "pack_size": [1,2]}, - - { "monster" : "mon_zombie_brute", "freq" : 15, "cost_multiplier" : 15 }, - { "monster" : "mon_zombie_brute", "freq" : 3, "cost_multiplier" : 30, "pack_size": [2,3]}, - { "monster" : "mon_zombie_hulk", "freq" : 1, "cost_multiplier" : 50 }, - { "monster" : "mon_zombie_hulk", "freq" : 1, "cost_multiplier" : 80, "pack_size": [1,2]}, - - { "monster" : "mon_zombie_necro", "freq" : 2, "cost_multiplier" : 25 }, - { "monster" : "mon_zombie_necro", "freq" : 1, "cost_multiplier" : 50, "pack_size": [1,3]}, - { "monster" : "mon_zombie_survivor", "freq" : 5, "cost_multiplier" : 40, "pack_size": [1,5]}, - { "monster" : "mon_zombie_master", "freq" : 2, "cost_multiplier" : 30 }, - { "monster" : "mon_zombie_master", "freq" : 1, "cost_multiplier" : 60, "pack_size": [1,3]}, - - { "monster" : "mon_zombie_shady", "freq" : 20, "cost_multiplier" : 10, "pack_size": [1,4]}, - { "monster" : "mon_zombie_shady", "freq" : 5, "cost_multiplier" : 25, "pack_size": [4,8]}, - { "monster" : "mon_zombie_shady_pk", "freq" : 1, "cost_multiplier" : 25, "pack_size": [1,2]}, - { "monster" : "mon_zombie_hollow", "freq" : 15, "cost_multiplier" : 10}, - { "monster" : "mon_zombie_hollow", "freq" : 10, "cost_multiplier" : 30, "pack_size": [2,5]}, - { "monster" : "mon_zombie_hollow_pk", "freq" : 3, "cost_multiplier" : 30, "pack_size": [1,3]}, - - { "monster" : "mon_beekeeper", "freq" : 1, "cost_multiplier" : 5 }, - { "monster" : "mon_zombie_technician", "freq" : 2, "cost_multiplier" : 12}, - - { "monster" : "mon_zombie_scorched", "freq" : 1, "cost_multiplier" : 8, "pack_size": [1,4], "starts": 25 }, - { "monster" : "mon_zombie_fiend", "freq" : 1, "cost_multiplier" : 14, "pack_size": [1, 2], "starts": 25 }, - { "monster" : "mon_zombie_child_scorched", "freq" : 1, "cost_multiplier" : 14, "pack_size": [2, 8], "starts": 50 }, - { "monster" : "mon_zombie_fiend_shocker", "freq" : 1, "cost_multiplier" : 12, "pack_size": [1,2], "starts": 50 }, - { "monster" : "mon_zombie_scorched_shocker", "freq" : 1, "cost_multiplier" : 10, "pack_size": [1, 3], "starts": 50 }, - { "monster" : "mon_zombie_scorched_necro", "freq" : 1, "cost_multiplier" : 18, "pack_size": [1, 3], "starts": 75 }, - { "monster" : "mon_zombie_scorched_master", "freq" : 1, "cost_multiplier" : 18, "pack_size": [1, 3], "starts": 75 }, - { "monster" : "mon_zolf_scorched", "freq" : 1, "cost_multiplier" : 25, "conditions" : ["WINTER"] } + "name": "GROUP_ZOMBIE_MID", + "//": "PKs Mid spawn list. After the threshold for the formula in Group_Zom is reached, this list should start to take over.", + "default": "mon_zombie_pk", + "monsters": [ + { "monster": "mon_zombie_pk", "freq": 15, "cost_multiplier": 3, "pack_size": [1,3]}, + { "monster": "mon_zombie_pk", "freq": 15, "cost_multiplier": 5, "pack_size": [2,5]}, + { "monster": "mon_zombie_pk", "freq": 15, "cost_multiplier": 7, "pack_size": [5,10]}, + { "monster": "mon_zombie_pk", "freq": 10, "cost_multiplier": 13, "pack_size": [15,20]}, + { "monster": "mon_zombie_pk", "freq": 5, "cost_multiplier": 20, "pack_size": [25,30]}, + { "monster": "mon_zombie", "freq": 15, "cost_multiplier": 7, "pack_size": [5,10]}, + { "monster": "mon_zombie_fat", "freq": 25, "cost_multiplier": 8, "pack_size": [3,5]}, + { "monster": "mon_zombie_tough", "freq": 15, "cost_multiplier": 9, "pack_size": [2, 3]}, + { "monster": "mon_zombie_tough", "freq": 5, "cost_multiplier": 15, "pack_size": [3, 6]}, + { "monster": "mon_zombie_child", "freq": 20, "cost_multiplier": 5, "pack_size": [1, 6]}, + { "monster": "mon_zombie_child", "freq": 5, "cost_multiplier": 10, "pack_size": [7, 12]}, + { "monster": "mon_zombie_child_pk", "freq": 2, "cost_multiplier": 3, "pack_size": [2, 5]}, + + { "monster": "mon_zombie_rot", "freq": 5, "cost_multiplier": 3 }, + { "monster": "mon_zombie_rot_pk", "freq": 15, "cost_multiplier": 10 }, + { "monster": "mon_skeleton", "freq": 20, "cost_multiplier": 8, "pack_size": [2,5]}, + { "monster": "mon_skeleton_pk", "freq": 5, "cost_multiplier": 16, "pack_size": [3,5]}, + { "monster": "mon_skeleton_husk", "freq": 1, "cost_multiplier": 21 }, + { "monster": "mon_zombie_crawler", "freq": 20, "cost_multiplier": 12, "pack_size": [1,4]}, + { "monster": "mon_zombie_crawler_pk", "freq": 2, "cost_multiplier": 12, "pack_size": [1,2]}, + + { "monster": "mon_zombie_dog", "freq": 15, "cost_multiplier": 6, "pack_size": [1,5]}, + { "monster": "mon_zombie_dog", "freq": 10, "cost_multiplier": 14, "pack_size": [5,8]}, + { "monster": "mon_zombie_dog", "freq": 5, "cost_multiplier": 20, "pack_size": [8,12]}, + { "monster": "mon_zombie_dog_pk", "freq": 1, "cost_multiplier": 20, "pack_size": [2,4]}, + { "monster": "mon_dog_skeleton", "freq": 15, "cost_multiplier": 5 }, + { "monster": "mon_dog_skeleton", "freq": 10, "cost_multiplier": 20, "pack_size": [3,5]}, + { "monster": "mon_dog_skeleton_pk", "freq": 1, "cost_multiplier": 30 }, + { "monster": "mon_dog_zombie_cop", "freq": 5, "cost_multiplier": 5 }, + { "monster": "mon_dog_zombie_rot", "freq": 5, "cost_multiplier": 10, "pack_size": [5,10]}, + { "monster": "mon_dog_zombie_cop_pk", "freq": 1, "cost_multiplier": 20, "pack_size": [1,2]}, + + { "monster": "mon_zombie_soldier", "freq": 10, "cost_multiplier": 2 }, + { "monster": "mon_zombie_soldier", "freq": 5, "cost_multiplier": 8, "pack_size": [2,6]}, + { "monster": "mon_zombie_cop", "freq": 10, "cost_multiplier": 3 }, + { "monster": "mon_zombie_hazmat", "freq": 10, "cost_multiplier": 3 }, + { "monster": "mon_zombie_fireman", "freq": 5, "cost_multiplier": 2 }, + + { "monster": "mon_zombie_swimmer", "freq": 1, "cost_multiplier": 5 }, + { "monster": "mon_zombie_swimmer_pk", "freq": 1, "cost_multiplier": 5 }, + { "monster": "mon_zombie_grabber", "freq": 10, "cost_multiplier": 20, "pack_size": [3,5]}, + { "monster": "mon_zombie_grappler", "freq": 15, "cost_multiplier": 10 }, + { "monster": "mon_zombie_grappler", "freq": 5, "cost_multiplier": 20, "pack_size": [2,3]}, + { "monster": "mon_zombie_biter", "freq": 10, "cost_multiplier": 5 }, + { "monster": "mon_zombie_scales", "freq": 1, "cost_multiplier": 15, "pack_size": [1,2]}, + + { "monster": "mon_zombie_runner", "freq": 15, "cost_multiplier": 5, "pack_size": [1,4] }, + { "monster": "mon_zombie_hunter", "freq": 10, "cost_multiplier": 15, "pack_size": [2,5]}, + { "monster": "mon_zombie_predator", "freq": 3, "cost_multiplier": 15, "pack_size": [1,2] }, + + { "monster": "mon_zombie_gasbag", "freq": 15, "cost_multiplier": 5}, + { "monster": "mon_zombie_gasbag", "freq": 5, "cost_multiplier": 15, "pack_size": [3,5]}, + { "monster": "mon_zombie_smoker", "freq": 15, "cost_multiplier": 5 }, + { "monster": "mon_zombie_smoker", "freq": 5, "cost_multiplier": 10, "pack_size": [2,3]}, + { "monster": "mon_zombie_gasbag_pk", "freq": 2, "cost_multiplier": 25}, + { "monster": "mon_zombie_gasbag_pk", "freq": 1, "cost_multiplier": 65, "pack_size": [2,3]}, + + { "monster": "mon_boomer", "freq": 10, "cost_multiplier": 5 }, + { "monster": "mon_boomer", "freq": 10, "cost_multiplier": 15, "pack_size": [2,4] }, + { "monster": "mon_boomer_huge", "freq": 5, "cost_multiplier": 14, "pack_size": [1,3] }, + + { "monster": "mon_zombie_shrieker", "freq": 20, "cost_multiplier": 5 }, + { "monster": "mon_zombie_shrieker", "freq": 5, "cost_multiplier": 10, "pack_size": [3,5]}, + { "monster": "mon_zombie_screecher", "freq": 3, "cost_multiplier": 14, "pack_size": [1,2]}, + + { "monster": "mon_zombie_acidic", "freq": 10, "cost_multiplier": 9, "pack_size": [2,5]}, + { "monster": "mon_zombie_spitter", "freq": 15, "cost_multiplier": 5 }, + { "monster": "mon_zombie_spitter", "freq": 5, "cost_multiplier": 15, "pack_size": [2,4]}, + { "monster": "mon_zombie_corrosive", "freq": 2, "cost_multiplier": 15 }, + { "monster": "mon_zombie_corrosive", "freq": 1, "cost_multiplier": 24, "pack_size": [1,3] }, + + { "monster": "mon_zombie_electric", "freq": 15, "cost_multiplier": 6 }, + { "monster": "mon_zombie_electric", "freq": 3, "cost_multiplier": 14, "pack_size": [2,3]}, + { "monster": "mon_zombie_brute_shocker", "freq": 3, "cost_multiplier": 30 }, + { "monster": "mon_zombie_brute_shocker", "freq": 2, "cost_multiplier": 50, "pack_size": [1,2]}, + + { "monster": "mon_zombie_brute", "freq": 15, "cost_multiplier": 15 }, + { "monster": "mon_zombie_brute", "freq": 3, "cost_multiplier": 30, "pack_size": [2,3]}, + { "monster": "mon_zombie_hulk", "freq": 1, "cost_multiplier": 50 }, + { "monster": "mon_zombie_hulk", "freq": 1, "cost_multiplier": 80, "pack_size": [1,2]}, + + { "monster": "mon_zombie_necro", "freq": 2, "cost_multiplier": 25 }, + { "monster": "mon_zombie_necro", "freq": 1, "cost_multiplier": 50, "pack_size": [1,3]}, + { "monster": "mon_zombie_survivor", "freq": 5, "cost_multiplier": 40, "pack_size": [1,5]}, + { "monster": "mon_zombie_master", "freq": 2, "cost_multiplier": 30 }, + { "monster": "mon_zombie_master", "freq": 1, "cost_multiplier": 60, "pack_size": [1,3]}, + + { "monster": "mon_zombie_shady", "freq": 20, "cost_multiplier": 10, "pack_size": [1,4]}, + { "monster": "mon_zombie_shady", "freq": 5, "cost_multiplier": 25, "pack_size": [4,8]}, + { "monster": "mon_zombie_shady_pk", "freq": 1, "cost_multiplier": 25, "pack_size": [1,2]}, + { "monster": "mon_zombie_hollow", "freq": 15, "cost_multiplier": 10}, + { "monster": "mon_zombie_hollow", "freq": 10, "cost_multiplier": 30, "pack_size": [2,5]}, + { "monster": "mon_zombie_hollow_pk", "freq": 3, "cost_multiplier": 30, "pack_size": [1,3]}, + + { "monster": "mon_beekeeper", "freq": 1, "cost_multiplier": 5 }, + { "monster": "mon_zombie_technician", "freq": 2, "cost_multiplier": 12}, + + { "monster": "mon_zombie_scorched", "freq": 1, "cost_multiplier": 8, "pack_size": [1,4], "starts": 25 }, + { "monster": "mon_zombie_fiend", "freq": 1, "cost_multiplier": 14, "pack_size": [1, 2], "starts": 25 }, + { "monster": "mon_zombie_child_scorched", "freq": 1, "cost_multiplier": 14, "pack_size": [2, 8], "starts": 50 }, + { "monster": "mon_zombie_fiend_shocker", "freq": 1, "cost_multiplier": 12, "pack_size": [1,2], "starts": 50 }, + { "monster": "mon_zombie_scorched_shocker", "freq": 1, "cost_multiplier": 10, "pack_size": [1, 3], "starts": 50 }, + { "monster": "mon_zombie_scorched_necro", "freq": 1, "cost_multiplier": 18, "pack_size": [1, 3], "starts": 75 }, + { "monster": "mon_zombie_scorched_master", "freq": 1, "cost_multiplier": 18, "pack_size": [1, 3], "starts": 75 }, + { "monster": "mon_zolf_scorched", "freq": 1, "cost_multiplier": 25, "conditions": ["WINTER"] } ] },{ "type":"monstergroup", - "name" : "GROUP_RIVER", - "default" : "mon_null", - "monsters" : [ - { "monster" : "mon_zombie_swimmer", "freq" : 4, "cost_multiplier" : 10, "pack_size" : [1,2] }, - { "monster" : "mon_zombie_swimmer", "freq" : 3, "cost_multiplier" : 20, "pack_size" : [2,6] }, - { "monster" : "mon_zombie_swimmer_pk", "freq" : 3, "cost_multiplier" : 10, "pack_size" : [1,2] }, - { "monster" : "mon_zombie_swimmer_pk", "freq" : 2, "cost_multiplier" : 20, "pack_size" : [2,6] }, - { "monster" : "mon_zombie_mancroc", "freq" : 1, "cost_multiplier" : 30, "pack_size" : [1,3] }, - { "monster" : "mon_zombie_scales", "freq" : 1, "cost_multiplier" : 35, "pack_size" : [1,3] }, + "name": "GROUP_RIVER", + "default": "mon_null", + "monsters": [ + { "monster": "mon_zombie_swimmer", "freq": 4, "cost_multiplier": 10, "pack_size": [1,2] }, + { "monster": "mon_zombie_swimmer", "freq": 3, "cost_multiplier": 20, "pack_size": [2,6] }, + { "monster": "mon_zombie_swimmer_pk", "freq": 3, "cost_multiplier": 10, "pack_size": [1,2] }, + { "monster": "mon_zombie_swimmer_pk", "freq": 2, "cost_multiplier": 20, "pack_size": [2,6] }, + { "monster": "mon_zombie_mancroc", "freq": 1, "cost_multiplier": 30, "pack_size": [1,3] }, + { "monster": "mon_zombie_scales", "freq": 1, "cost_multiplier": 35, "pack_size": [1,3] }, - { "monster" : "mon_fardigrade", "freq" : 1, "cost_multiplier" : 25, "conditions" : ["DAWN"], "starts" : 150 }, + { "monster": "mon_fardigrade", "freq": 1, "cost_multiplier": 25, "conditions": ["DAWN"], "starts": 150 }, - { "monster" : "mon_tardigrade", "freq" : 3, "cost_multiplier" : 25, "conditions" : ["DAY", "SUMMER", "SPRING", "AUTUMN"], "starts" : 150 }, - { "monster" : "mon_ant_queen_young", "freq" : 3, "cost_multiplier" : 5, "conditions" : ["SPRING"], "starts" : 75 }, + { "monster": "mon_tardigrade", "freq": 3, "cost_multiplier": 25, "conditions": ["DAY", "SUMMER", "SPRING", "AUTUMN"], "starts": 150 }, + { "monster": "mon_ant_queen_young", "freq": 3, "cost_multiplier": 5, "conditions": ["SPRING"], "starts": 75 }, - { "monster" : "mon_twisted_body", "freq" : 5, "cost_multiplier" : 25, "pack_size" : [ 1 , 6 ], "starts": 75, "conditions": ["DUSK", "NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_twisted_body", "freq": 5, "cost_multiplier": 25, "pack_size": [ 1 , 6 ], "starts": 75, "conditions": ["DUSK", "NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_beaver", "freq" : 30, "cost_multiplier" : 10, "pack_size" : [1,3] }, - { "monster" : "mon_beaver", "freq" : 60, "cost_multiplier" : 10, "pack_size" : [1,3], "conditions" : ["NIGHT"] }, + { "monster": "mon_beaver", "freq": 30, "cost_multiplier": 10, "pack_size": [1,3] }, + { "monster": "mon_beaver", "freq": 60, "cost_multiplier": 10, "pack_size": [1,3], "conditions": ["NIGHT"] }, - { "monster" : "mon_mink", "freq" : 10, "cost_multiplier" : 20, "pack_size" : [1,2], "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_mink", "freq" : 20, "cost_multiplier" : 20, "pack_size" : [1,2], "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_mink", "freq": 10, "cost_multiplier": 20, "pack_size": [1,2], "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_mink", "freq": 20, "cost_multiplier": 20, "pack_size": [1,2], "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_muskrat", "freq" : 30, "cost_multiplier" : 5, "pack_size" : [1,5], "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_muskrat", "freq" : 60, "cost_multiplier" : 5, "pack_size" : [1,5], "conditions" : ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_muskrat", "freq": 30, "cost_multiplier": 5, "pack_size": [1,5], "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_muskrat", "freq": 60, "cost_multiplier": 5, "pack_size": [1,5], "conditions": ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_otter", "freq" : 10, "cost_multiplier" : 5, "pack_size" : [1,8], "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_otter", "freq" : 20, "cost_multiplier" : 5, "pack_size" : [1,8], "conditions" : ["NIGHT","SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_otter", "freq": 10, "cost_multiplier": 5, "pack_size": [1,8], "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_otter", "freq": 20, "cost_multiplier": 5, "pack_size": [1,8], "conditions": ["NIGHT","SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_duck", "freq" : 30, "cost_multiplier" : 5, "pack_size" : [1, 4], "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_duck", "freq" : 60, "cost_multiplier" : 5, "pack_size" : [1, 4], "conditions" : ["DAWN", "DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_duck", "freq": 30, "cost_multiplier": 5, "pack_size": [1, 4], "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_duck", "freq": 60, "cost_multiplier": 5, "pack_size": [1, 4], "conditions": ["DAWN", "DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_sludge_crawler", "freq" : 3, "cost_multiplier" : 2, "starts" : 168, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_sludge_crawler", "freq" : 3, "cost_multiplier" : 2, "starts" : 336, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_sludge_crawler", "freq" : 3, "cost_multiplier" : 2, "starts" : 672, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_sludge_crawler", "freq" : 3, "cost_multiplier" : 2, "starts" : 840, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_sludge_crawler", "freq" : 4, "cost_multiplier" : 2, "starts" : 1008, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_sludge_crawler", "freq": 3, "cost_multiplier": 2, "starts": 168, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_sludge_crawler", "freq": 3, "cost_multiplier": 2, "starts": 336, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_sludge_crawler", "freq": 3, "cost_multiplier": 2, "starts": 672, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_sludge_crawler", "freq": 3, "cost_multiplier": 2, "starts": 840, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_sludge_crawler", "freq": 4, "cost_multiplier": 2, "starts": 1008, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_zhark", "freq" : 1, "cost_multiplier" : 25, "starts" : 24, "pack_size" : [1,3] }, - { "monster" : "mon_zhark", "freq" : 2, "cost_multiplier" : 25, "starts" : 672, "pack_size" : [1,3] }, + { "monster": "mon_zhark", "freq": 1, "cost_multiplier": 25, "starts": 24, "pack_size": [1,3] }, + { "monster": "mon_zhark", "freq": 2, "cost_multiplier": 25, "starts": 672, "pack_size": [1,3] }, - { "monster" : "mon_mutant_carp", "freq" : 3, "cost_multiplier" : 15, "starts" : 168}, + { "monster": "mon_mutant_carp", "freq": 3, "cost_multiplier": 15, "starts": 168}, - { "monster" : "mon_mutant_salmon", "freq" : 2, "cost_multiplier" : 15, "starts" : 168}, + { "monster": "mon_mutant_salmon", "freq": 2, "cost_multiplier": 15, "starts": 168}, - { "monster" : "mon_fish_eel", "freq" : 25, "cost_multiplier" : 3, "pack_size" : [1,3] }, - { "monster" : "mon_fish_eel", "freq" : 50, "cost_multiplier" : 3, "conditions" : ["DAWN", "DUSK"], "pack_size" : [1,3] }, + { "monster": "mon_fish_eel", "freq": 25, "cost_multiplier": 3, "pack_size": [1,3] }, + { "monster": "mon_fish_eel", "freq": 50, "cost_multiplier": 3, "conditions": ["DAWN", "DUSK"], "pack_size": [1,3] }, - { "monster" : "mon_fish_bowfin", "freq" : 25, "cost_multiplier" : 3, "pack_size" : [1,3] }, - { "monster" : "mon_fish_bowfin", "freq" : 50, "cost_multiplier" : 3, "conditions" : ["DAWN", "DUSK"], "pack_size" : [1,3] }, + { "monster": "mon_fish_bowfin", "freq": 25, "cost_multiplier": 3, "pack_size": [1,3] }, + { "monster": "mon_fish_bowfin", "freq": 50, "cost_multiplier": 3, "conditions": ["DAWN", "DUSK"], "pack_size": [1,3] }, - { "monster" : "mon_fish_bullhead", "freq" : 25, "cost_multiplier" : 3, "pack_size" : [1,3] }, - { "monster" : "mon_fish_bullhead", "freq" : 50, "cost_multiplier" : 3, "conditions" : ["DAWN", "DUSK"], "pack_size" : [1,3] }, + { "monster": "mon_fish_bullhead", "freq": 25, "cost_multiplier": 3, "pack_size": [1,3] }, + { "monster": "mon_fish_bullhead", "freq": 50, "cost_multiplier": 3, "conditions": ["DAWN", "DUSK"], "pack_size": [1,3] }, - { "monster" : "mon_fish_trout", "freq" : 15, "cost_multiplier" : 8, "pack_size" : [1,3] }, - { "monster" : "mon_fish_trout", "freq" : 20, "cost_multiplier" : 8, "conditions" : ["DAWN", "DUSK"], "pack_size" : [1,3] }, + { "monster": "mon_fish_trout", "freq": 15, "cost_multiplier": 8, "pack_size": [1,3] }, + { "monster": "mon_fish_trout", "freq": 20, "cost_multiplier": 8, "conditions": ["DAWN", "DUSK"], "pack_size": [1,3] }, - { "monster" : "mon_fish_carp", "freq" : 10, "cost_multiplier" : 10, "pack_size" : [1,3] }, - { "monster" : "mon_fish_carp", "freq" : 15, "cost_multiplier" : 10, "conditions" : ["DAWN", "DUSK"], "pack_size" : [1,3] }, + { "monster": "mon_fish_carp", "freq": 10, "cost_multiplier": 10, "pack_size": [1,3] }, + { "monster": "mon_fish_carp", "freq": 15, "cost_multiplier": 10, "conditions": ["DAWN", "DUSK"], "pack_size": [1,3] }, - { "monster" : "mon_fish_pike", "freq" : 15, "cost_multiplier" : 8, "pack_size" : [1,3] }, - { "monster" : "mon_fish_pike", "freq" : 20, "cost_multiplier" : 8, "conditions" : ["DAWN", "DUSK"], "pack_size" : [1,3] }, + { "monster": "mon_fish_pike", "freq": 15, "cost_multiplier": 8, "pack_size": [1,3] }, + { "monster": "mon_fish_pike", "freq": 20, "cost_multiplier": 8, "conditions": ["DAWN", "DUSK"], "pack_size": [1,3] }, - { "monster" : "mon_fish_sbass", "freq" : 25, "cost_multiplier" : 3, "pack_size" : [1,3] }, - { "monster" : "mon_fish_sbass", "freq" : 50, "cost_multiplier" : 3, "conditions" : ["DAWN", "DUSK"], "pack_size" : [1,3] }, + { "monster": "mon_fish_sbass", "freq": 25, "cost_multiplier": 3, "pack_size": [1,3] }, + { "monster": "mon_fish_sbass", "freq": 50, "cost_multiplier": 3, "conditions": ["DAWN", "DUSK"], "pack_size": [1,3] }, - { "monster" : "mon_fish_perch", "freq" : 30, "cost_multiplier" : 3, "pack_size" : [1,3] }, - { "monster" : "mon_fish_perch", "freq" : 55, "cost_multiplier" : 3, "conditions" : ["DAWN", "DUSK"], "pack_size" : [1,3] }, + { "monster": "mon_fish_perch", "freq": 30, "cost_multiplier": 3, "pack_size": [1,3] }, + { "monster": "mon_fish_perch", "freq": 55, "cost_multiplier": 3, "conditions": ["DAWN", "DUSK"], "pack_size": [1,3] }, - { "monster" : "mon_fish_salmon", "freq" : 15, "cost_multiplier" : 8, "pack_size" : [1,3] }, - { "monster" : "mon_fish_salmon", "freq" : 20, "cost_multiplier" : 8, "conditions" : ["DAWN", "DUSK"], "pack_size" : [1,3] }, + { "monster": "mon_fish_salmon", "freq": 15, "cost_multiplier": 8, "pack_size": [1,3] }, + { "monster": "mon_fish_salmon", "freq": 20, "cost_multiplier": 8, "conditions": ["DAWN", "DUSK"], "pack_size": [1,3] }, - { "monster" : "mon_fish_lbass", "freq" : 25, "cost_multiplier" : 3, "pack_size" : [1,3] }, - { "monster" : "mon_fish_lbass", "freq" : 50, "cost_multiplier" : 3, "conditions" : ["DAWN", "DUSK"], "pack_size" : [1,3] }, + { "monster": "mon_fish_lbass", "freq": 25, "cost_multiplier": 3, "pack_size": [1,3] }, + { "monster": "mon_fish_lbass", "freq": 50, "cost_multiplier": 3, "conditions": ["DAWN", "DUSK"], "pack_size": [1,3] }, - { "monster" : "mon_fish_pbass", "freq" : 25, "cost_multiplier" : 3, "pack_size" : [1,3] }, - { "monster" : "mon_fish_pbass", "freq" : 50, "cost_multiplier" : 3, "conditions" : ["DAWN", "DUSK"], "pack_size" : [1,3] }, + { "monster": "mon_fish_pbass", "freq": 25, "cost_multiplier": 3, "pack_size": [1,3] }, + { "monster": "mon_fish_pbass", "freq": 50, "cost_multiplier": 3, "conditions": ["DAWN", "DUSK"], "pack_size": [1,3] }, - { "monster" : "mon_fish_bluegill", "freq" : 25, "cost_multiplier" : 3, "pack_size" : [1,3] }, - { "monster" : "mon_fish_bluegill", "freq" : 50, "cost_multiplier" : 3, "conditions" : ["DAWN", "DUSK"], "pack_size" : [1,3] }, + { "monster": "mon_fish_bluegill", "freq": 25, "cost_multiplier": 3, "pack_size": [1,3] }, + { "monster": "mon_fish_bluegill", "freq": 50, "cost_multiplier": 3, "conditions": ["DAWN", "DUSK"], "pack_size": [1,3] }, - { "monster" : "mon_fish_whitefish", "freq" : 30, "cost_multiplier" : 2, "pack_size" : [1,3] }, - { "monster" : "mon_fish_whitefish", "freq" : 55, "cost_multiplier" : 2, "conditions" : ["DAWN", "DUSK"], "pack_size" : [1,3] }, + { "monster": "mon_fish_whitefish", "freq": 30, "cost_multiplier": 2, "pack_size": [1,3] }, + { "monster": "mon_fish_whitefish", "freq": 55, "cost_multiplier": 2, "conditions": ["DAWN", "DUSK"], "pack_size": [1,3] }, - { "monster" : "mon_fish_pickerel", "freq" : 15, "cost_multiplier" : 10, "pack_size" : [1,3] }, - { "monster" : "mon_fish_pickerel", "freq" : 20, "cost_multiplier" : 10, "conditions" : ["DAWN", "DUSK"], "pack_size" : [1,3] }, + { "monster": "mon_fish_pickerel", "freq": 15, "cost_multiplier": 10, "pack_size": [1,3] }, + { "monster": "mon_fish_pickerel", "freq": 20, "cost_multiplier": 10, "conditions": ["DAWN", "DUSK"], "pack_size": [1,3] }, - { "monster" : "mon_fish_blinky", "freq": 5, "cost_multiplier": 3, "pack_size": [1, 3] }, - { "monster" : "mon_bear_smoky", "freq" : 1, "cost_multiplier" : 0, "starts" : 672, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] } + { "monster": "mon_fish_blinky", "freq": 5, "cost_multiplier": 3, "pack_size": [1, 3] }, + { "monster": "mon_bear_smoky", "freq": 1, "cost_multiplier": 0, "starts": 672, "conditions": ["SPRING", "SUMMER", "AUTUMN"] } ] },{ "type":"monstergroup", - "name" : "GROUP_TRIFFID", - "default" : "mon_triffid", - "monsters" : [ - { "monster" : "mon_triffid_young", "freq" : 100, "cost_multiplier" : 1 }, - { "monster" : "mon_triffid", "freq" : 25, "cost_multiplier" : 3 }, - { "monster" : "mon_fungal_fighter", "freq" : 50, "cost_multiplier" : 3 }, - { "monster" : "mon_vinebeast", "freq" : 50, "cost_multiplier" : 3 }, - { "monster" : "mon_triffid_queen", "freq" : 50, "cost_multiplier" : 5 }, - { "monster" : "mon_creeper_root", "freq" : 50, "cost_multiplier" : 3, "pack_size" : [1,3] }, - { "monster" : "mon_creeper_hub", "freq" : 5, "cost_multiplier" : 13, "starts" : 200 }, - { "monster" : "mon_creeper_vine_pk", "freq" : 50, "cost_multiplier" : 15, "pack_size" : [1,3], "starts" : 25 }, - { "monster" : "mon_dionaea_sprout", "freq" : 50, "cost_multiplier" : 3, "starts" : 50 }, - { "monster" : "mon_dionaea", "freq" : 10, "cost_multiplier" : 7, "starts" : 100 }, - { "monster" : "mon_treent", "freq" : 15, "cost_multiplier" : 10, "starts" : 75 }, - { "monster" : "mon_treent_green", "freq" : 50, "cost_multiplier" : 7, "starts": 250 }, - { "monster" : "mon_minecraft", "freq" : 3, "cost_multiplier" : 20, "pack_size" : [1,4], "starts" : 125 }, - { "monster" : "mon_minecraft_charged", "freq" : 2, "cost_multiplier" : 25, "pack_size" : [1,4], "starts" : 200 }, - { "monster" : "mon_triffid_heart", "freq" : 0, "cost_multiplier" : 0 }, - { "monster" : "mon_spider_wolf_giant", "freq" : 4, "cost_multiplier" : 5, "pack_size" : [1,3], "starts" : 50, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 1, "cost_multiplier" : 15, "pack_size" : [2,3], "starts" : 250, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] } + "name": "GROUP_TRIFFID", + "default": "mon_triffid", + "monsters": [ + { "monster": "mon_triffid_young", "freq": 100, "cost_multiplier": 1 }, + { "monster": "mon_triffid", "freq": 25, "cost_multiplier": 3 }, + { "monster": "mon_fungal_fighter", "freq": 50, "cost_multiplier": 3 }, + { "monster": "mon_vinebeast", "freq": 50, "cost_multiplier": 3 }, + { "monster": "mon_triffid_queen", "freq": 50, "cost_multiplier": 5 }, + { "monster": "mon_creeper_root", "freq": 50, "cost_multiplier": 3, "pack_size": [1,3] }, + { "monster": "mon_creeper_hub", "freq": 5, "cost_multiplier": 13, "starts": 200 }, + { "monster": "mon_creeper_vine_pk", "freq": 50, "cost_multiplier": 15, "pack_size": [1,3], "starts": 25 }, + { "monster": "mon_dionaea_sprout", "freq": 50, "cost_multiplier": 3, "starts": 50 }, + { "monster": "mon_dionaea", "freq": 10, "cost_multiplier": 7, "starts": 100 }, + { "monster": "mon_treent", "freq": 15, "cost_multiplier": 10, "starts": 75 }, + { "monster": "mon_treent_green", "freq": 50, "cost_multiplier": 7, "starts": 250 }, + { "monster": "mon_minecraft", "freq": 3, "cost_multiplier": 20, "pack_size": [1,4], "starts": 125 }, + { "monster": "mon_minecraft_charged", "freq": 2, "cost_multiplier": 25, "pack_size": [1,4], "starts": 200 }, + { "monster": "mon_triffid_heart", "freq": 0, "cost_multiplier": 0 }, + { "monster": "mon_spider_wolf_giant", "freq": 4, "cost_multiplier": 5, "pack_size": [1,3], "starts": 50, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_wolf_giant", "freq": 1, "cost_multiplier": 15, "pack_size": [2,3], "starts": 250, "conditions": ["SPRING", "SUMMER", "AUTUMN"] } ] },{ "type":"monstergroup", - "name" : "GROUP_FUNGI", - "default" : "mon_fungus_boil", - "monsters" : [ - { "monster" : "mon_fungal_wall", "freq" : 0, "cost_multiplier" : 0 }, - { "monster" : "mon_fungaloid_queen", "freq" : 0, "cost_multiplier" : 0 }, - { "monster" : "mon_fungaloid", "freq" : 250, "cost_multiplier" : 1 }, - { "monster" : "mon_fungaloid_young", "freq" : 200, "cost_multiplier" : 0 }, - { "monster" : "mon_fungus_boil", "freq" : 50, "cost_multiplier" : 0 }, - { "monster" : "mon_zombie_fungus", "freq" : 100, "cost_multiplier" : 1 }, - { "monster" : "mon_zombie_fungus", "freq" : 75, "cost_multiplier" : 2, "pack_size" : [3,7] }, - { "monster" : "mon_boomer_fungus", "freq" : 40, "cost_multiplier" : 1, "pack_size" : [1,3] }, - { "monster" : "mon_zombie_electric_fungal", "freq" : 15, "cost_multiplier" : 3, "starts" : 75 }, - { "monster" : "mon_ant_fungus", "freq" : 50, "cost_multiplier" : 1, "pack_size" : [1,4] }, - { "monster" : "mon_ant_fungus", "freq" : 25, "cost_multiplier" : 5, "pack_size" : [4,9] }, - { "monster" : "mon_fungaloid_pk", "freq" : 150, "cost_multiplier" : 5, "starts" : 25 }, - { "monster" : "mon_fougar", "freq" : 15, "cost_multiplier" : 3, "starts" : 50 }, - { "monster" : "mon_fungus_pig", "freq" : 15, "cost_multiplier" : 12, "pack_size" : [2,5], "starts" : 75 }, - { "monster" : "mon_feer", "freq" : 15, "cost_multiplier" : 10, "pack_size" : [1,2], "starts" : 75 }, - { "monster" : "mon_feer", "freq" : 5, "cost_multiplier" : 10, "pack_size" : [2,5], "starts" : 100, "conditions" : ["SUMMER", "AUTUMN"] }, - { "monster" : "mon_foose", "freq" : 15, "cost_multiplier" : 5, "starts" : 75 }, - { "monster" : "mon_folf", "freq" : 15, "cost_multiplier" : 3 }, - { "monster" : "mon_folf", "freq" : 10, "cost_multiplier" : 7, "pack_size" : [3,5], "starts" : 50 }, - { "monster" : "mon_fardigrade", "freq" : 10, "cost_multiplier" : 15, "starts" : 150 }, - { "monster" : "mon_furvivor", "freq" : 75, "cost_multiplier" : 3, "pack_size" : [1,2], "starts" : 25 }, - { "monster" : "mon_furvivor_glock", "freq" : 15, "cost_multiplier" : 7, "pack_size" : [1,3], "starts" : 25 }, - { "monster" : "mon_furvivor_shotgun", "freq" : 10, "cost_multiplier" : 10, "starts" : 125 }, - { "monster" : "mon_furvivor_deagle", "freq" : 10, "cost_multiplier" : 12, "starts" : 100 }, - { "monster" : "mon_furvivor_smg", "freq" : 7, "cost_multiplier" : 20, "starts" : 200 }, - { "monster" : "mon_furvivor_pk", "freq" : 15, "cost_multiplier" : 15, "pack_size" : [1,3], "starts" : 100 }, - { "monster" : "mon_marloss_man", "freq" : 1, "cost_multiplier" : 50, "starts" : 200, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_finebeast", "freq" : 25, "cost_multiplier" : 5, "starts" : 150 }, - { "monster" : "mon_finecraft", "freq" : 10, "cost_multiplier" : 10, "starts" : 175 }, - { "monster" : "mon_fionaea", "freq" : 5, "cost_multiplier" : 25, "starts" : 150 } + "name": "GROUP_FUNGI", + "default": "mon_fungus_boil", + "monsters": [ + { "monster": "mon_fungal_wall", "freq": 0, "cost_multiplier": 0 }, + { "monster": "mon_fungaloid_queen", "freq": 0, "cost_multiplier": 0 }, + { "monster": "mon_fungaloid", "freq": 250, "cost_multiplier": 1 }, + { "monster": "mon_fungaloid_young", "freq": 200, "cost_multiplier": 0 }, + { "monster": "mon_fungus_boil", "freq": 50, "cost_multiplier": 0 }, + { "monster": "mon_zombie_fungus", "freq": 100, "cost_multiplier": 1 }, + { "monster": "mon_zombie_fungus", "freq": 75, "cost_multiplier": 2, "pack_size": [3,7] }, + { "monster": "mon_boomer_fungus", "freq": 40, "cost_multiplier": 1, "pack_size": [1,3] }, + { "monster": "mon_zombie_electric_fungal", "freq": 15, "cost_multiplier": 3, "starts": 75 }, + { "monster": "mon_ant_fungus", "freq": 50, "cost_multiplier": 1, "pack_size": [1,4] }, + { "monster": "mon_ant_fungus", "freq": 25, "cost_multiplier": 5, "pack_size": [4,9] }, + { "monster": "mon_fungaloid_pk", "freq": 150, "cost_multiplier": 5, "starts": 25 }, + { "monster": "mon_fougar", "freq": 15, "cost_multiplier": 3, "starts": 50 }, + { "monster": "mon_fungus_pig", "freq": 15, "cost_multiplier": 12, "pack_size": [2,5], "starts": 75 }, + { "monster": "mon_feer", "freq": 15, "cost_multiplier": 10, "pack_size": [1,2], "starts": 75 }, + { "monster": "mon_feer", "freq": 5, "cost_multiplier": 10, "pack_size": [2,5], "starts": 100, "conditions": ["SUMMER", "AUTUMN"] }, + { "monster": "mon_foose", "freq": 15, "cost_multiplier": 5, "starts": 75 }, + { "monster": "mon_folf", "freq": 15, "cost_multiplier": 3 }, + { "monster": "mon_folf", "freq": 10, "cost_multiplier": 7, "pack_size": [3,5], "starts": 50 }, + { "monster": "mon_fardigrade", "freq": 10, "cost_multiplier": 15, "starts": 150 }, + { "monster": "mon_furvivor", "freq": 75, "cost_multiplier": 3, "pack_size": [1,2], "starts": 25 }, + { "monster": "mon_furvivor_glock", "freq": 15, "cost_multiplier": 7, "pack_size": [1,3], "starts": 25 }, + { "monster": "mon_furvivor_shotgun", "freq": 10, "cost_multiplier": 10, "starts": 125 }, + { "monster": "mon_furvivor_deagle", "freq": 10, "cost_multiplier": 12, "starts": 100 }, + { "monster": "mon_furvivor_smg", "freq": 7, "cost_multiplier": 20, "starts": 200 }, + { "monster": "mon_furvivor_pk", "freq": 15, "cost_multiplier": 15, "pack_size": [1,3], "starts": 100 }, + { "monster": "mon_marloss_man", "freq": 1, "cost_multiplier": 50, "starts": 200, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_finebeast", "freq": 25, "cost_multiplier": 5, "starts": 150 }, + { "monster": "mon_finecraft", "freq": 10, "cost_multiplier": 10, "starts": 175 }, + { "monster": "mon_fionaea", "freq": 5, "cost_multiplier": 25, "starts": 150 } ] },{ "type":"monstergroup", - "name" : "GROUP_FUNGI_TOWER", - "default" : "mon_fungal_tendril", - "monsters" : [ - { "monster" : "mon_fungal_hedgerow", "freq" : 0, "cost_multiplier" : 0 }, - { "monster" : "mon_fungaloid_tower", "freq" : 0, "cost_multiplier" : 0 }, - { "monster" : "mon_fungaloid", "freq" : 50, "cost_multiplier" : 1 }, - { "monster" : "mon_fungaloid_young", "freq" : 100, "cost_multiplier" : 0 }, - { "monster" : "mon_fungus_boil", "freq" : 50, "cost_multiplier" : 0 }, - { "monster" : "mon_zombie_fungus", "freq" : 150, "cost_multiplier" : 1 }, - { "monster" : "mon_zombie_fungus", "freq" : 50, "cost_multiplier" : 2, "pack_size" : [3,7] }, - { "monster" : "mon_boomer_fungus", "freq" : 35, "cost_multiplier" : 1, "pack_size" : [1,3] }, - { "monster" : "mon_zombie_electric_fungal", "freq" : 25, "cost_multiplier" : 3, "starts" : 50 }, - { "monster" : "mon_ant_fungus", "freq" : 45, "cost_multiplier" : 2, "pack_size" : [1,4] }, - { "monster" : "mon_ant_fungus", "freq" : 5, "cost_multiplier" : 5, "pack_size" : [4,9] }, - { "monster" : "mon_fungaloid_pk", "freq" : 150, "cost_multiplier" : 5, "starts" : 25 }, - { "monster" : "mon_fungus_pig", "freq" : 15, "cost_multiplier" : 12, "pack_size" : [2,5], "starts" : 75 }, - { "monster" : "mon_fougar", "freq" : 5, "cost_multiplier" : 7, "starts" : 75 }, - { "monster" : "mon_feer", "freq" : 5, "cost_multiplier" : 12, "pack_size" : [1,2], "starts" : 100 }, - { "monster" : "mon_foose", "freq" : 20, "cost_multiplier" : 10, "starts" : 75 }, - { "monster" : "mon_folf", "freq" : 10, "cost_multiplier" : 7, "pack_size" : [1,3], "starts" : 75 }, - { "monster" : "mon_fardigrade", "freq" : 5, "cost_multiplier" : 25, "starts" : 250 }, - { "monster" : "mon_furvivor", "freq" : 75, "cost_multiplier" : 5, "pack_size" : [1,2], "starts" : 25 }, - { "monster" : "mon_furvivor_glock", "freq" : 20, "cost_multiplier" : 12, "pack_size" : [1,3], "starts" : 50 }, - { "monster" : "mon_furvivor_shotgun", "freq" : 15, "cost_multiplier" : 17, "starts" : 150 }, - { "monster" : "mon_furvivor_deagle", "freq" : 10, "cost_multiplier" : 17, "starts" : 125 }, - { "monster" : "mon_furvivor_smg", "freq" : 10, "cost_multiplier" : 25, "starts" : 250 }, - { "monster" : "mon_furvivor_pk", "freq" : 15, "cost_multiplier" : 20, "pack_size" : [1,3], "starts" : 125 }, - { "monster" : "mon_marloss_man", "freq" : 1, "cost_multiplier" : 75, "starts" : 600, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_finebeast", "freq" : 3, "cost_multiplier" : 12, "starts" : 150 }, - { "monster" : "mon_finecraft", "freq" : 4, "cost_multiplier" : 15, "starts" : 200 }, - { "monster" : "mon_fionaea", "freq" : 2, "cost_multiplier" : 25, "starts" : 250 } + "name": "GROUP_FUNGI_TOWER", + "default": "mon_fungal_tendril", + "monsters": [ + { "monster": "mon_fungal_hedgerow", "freq": 0, "cost_multiplier": 0 }, + { "monster": "mon_fungaloid_tower", "freq": 0, "cost_multiplier": 0 }, + { "monster": "mon_fungaloid", "freq": 50, "cost_multiplier": 1 }, + { "monster": "mon_fungaloid_young", "freq": 100, "cost_multiplier": 0 }, + { "monster": "mon_fungus_boil", "freq": 50, "cost_multiplier": 0 }, + { "monster": "mon_zombie_fungus", "freq": 150, "cost_multiplier": 1 }, + { "monster": "mon_zombie_fungus", "freq": 50, "cost_multiplier": 2, "pack_size": [3,7] }, + { "monster": "mon_boomer_fungus", "freq": 35, "cost_multiplier": 1, "pack_size": [1,3] }, + { "monster": "mon_zombie_electric_fungal", "freq": 25, "cost_multiplier": 3, "starts": 50 }, + { "monster": "mon_ant_fungus", "freq": 45, "cost_multiplier": 2, "pack_size": [1,4] }, + { "monster": "mon_ant_fungus", "freq": 5, "cost_multiplier": 5, "pack_size": [4,9] }, + { "monster": "mon_fungaloid_pk", "freq": 150, "cost_multiplier": 5, "starts": 25 }, + { "monster": "mon_fungus_pig", "freq": 15, "cost_multiplier": 12, "pack_size": [2,5], "starts": 75 }, + { "monster": "mon_fougar", "freq": 5, "cost_multiplier": 7, "starts": 75 }, + { "monster": "mon_feer", "freq": 5, "cost_multiplier": 12, "pack_size": [1,2], "starts": 100 }, + { "monster": "mon_foose", "freq": 20, "cost_multiplier": 10, "starts": 75 }, + { "monster": "mon_folf", "freq": 10, "cost_multiplier": 7, "pack_size": [1,3], "starts": 75 }, + { "monster": "mon_fardigrade", "freq": 5, "cost_multiplier": 25, "starts": 250 }, + { "monster": "mon_furvivor", "freq": 75, "cost_multiplier": 5, "pack_size": [1,2], "starts": 25 }, + { "monster": "mon_furvivor_glock", "freq": 20, "cost_multiplier": 12, "pack_size": [1,3], "starts": 50 }, + { "monster": "mon_furvivor_shotgun", "freq": 15, "cost_multiplier": 17, "starts": 150 }, + { "monster": "mon_furvivor_deagle", "freq": 10, "cost_multiplier": 17, "starts": 125 }, + { "monster": "mon_furvivor_smg", "freq": 10, "cost_multiplier": 25, "starts": 250 }, + { "monster": "mon_furvivor_pk", "freq": 15, "cost_multiplier": 20, "pack_size": [1,3], "starts": 125 }, + { "monster": "mon_marloss_man", "freq": 1, "cost_multiplier": 75, "starts": 600, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_finebeast", "freq": 3, "cost_multiplier": 12, "starts": 150 }, + { "monster": "mon_finecraft", "freq": 4, "cost_multiplier": 15, "starts": 200 }, + { "monster": "mon_fionaea", "freq": 2, "cost_multiplier": 25, "starts": 250 } ] },{ "type":"monstergroup", - "name" : "GROUP_FUNGI_FLOWERS", - "default" : "mon_fungal_blossom", - "monsters" : [ - { "monster" : "mon_fungaloid", "freq" : 10, "cost_multiplier" : 1 }, - { "monster" : "mon_fungaloid_young", "freq" : 200, "cost_multiplier" : 1 }, - { "monster" : "mon_fungus_boil", "freq" : 50, "cost_multiplier" : 0 }, - { "monster" : "mon_fungaloid_seeder", "freq" : 0, "cost_multiplier" : 0 }, - { "monster" : "mon_zombie_fungus", "freq" : 20, "cost_multiplier" : 1, "pack_size" : [1,3] }, - { "monster" : "mon_boomer_fungus", "freq" : 5, "cost_multiplier" : 1, "pack_size" : [1,3] }, - { "monster" : "mon_ant_fungus", "freq" : 15, "cost_multiplier" : 3, "pack_size" : [4,9] }, - { "monster" : "mon_fungaloid_pk", "freq" : 35, "cost_multiplier" : 5, "starts" : 25 }, - { "monster" : "mon_fungus_pig", "freq" : 5, "cost_multiplier" : 12, "pack_size" : [1,4], "starts" : 75 }, - { "monster" : "mon_fougar", "freq" : 10, "cost_multiplier" : 7, "starts" : 25 }, - { "monster" : "mon_feer", "freq" : 10, "cost_multiplier" : 12, "pack_size" : [1,2], "starts" : 25 }, - { "monster" : "mon_feer", "freq" : 5, "cost_multiplier" : 17, "pack_size" : [2,5], "starts" : 75 }, - { "monster" : "mon_foose", "freq" : 25, "cost_multiplier" : 12, "starts" : 25 }, - { "monster" : "mon_folf", "freq" : 15, "cost_multiplier" : 7 }, - { "monster" : "mon_folf", "freq" : 5, "cost_multiplier" : 12, "pack_size" : [3,5], "starts" : 25 }, - { "monster" : "mon_fardigrade", "freq" : 5, "cost_multiplier" : 25, "starts" : 50 }, - { "monster" : "mon_furvivor", "freq" : 5, "cost_multiplier" : 12, "pack_size" : [1,2], "starts" : 25 }, - { "monster" : "mon_furvivor_glock", "freq" : 1, "cost_multiplier" : 17, "pack_size" : [1,3], "starts" : 25 }, - { "monster" : "mon_furvivor_shotgun", "freq" : 1, "cost_multiplier" : 20, "starts" : 100 }, - { "monster" : "mon_furvivor_deagle", "freq" : 1, "cost_multiplier" : 17, "starts" : 100 }, - { "monster" : "mon_furvivor_smg", "freq" : 1, "cost_multiplier" : 30, "starts" : 175 }, - { "monster" : "mon_furvivor_pk", "freq" : 5, "cost_multiplier" : 25, "pack_size" : [1,3], "starts" : 100 }, - { "monster" : "mon_marloss_man", "freq" : 1, "cost_multiplier" : 99, "starts" : 250, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_finebeast", "freq" : 10, "cost_multiplier" : 15, "starts" : 100 }, - { "monster" : "mon_finecraft", "freq" : 10, "cost_multiplier" : 7, "starts" : 150 }, - { "monster" : "mon_fionaea", "freq" : 5, "cost_multiplier" : 17, "starts" : 150 } + "name": "GROUP_FUNGI_FLOWERS", + "default": "mon_fungal_blossom", + "monsters": [ + { "monster": "mon_fungaloid", "freq": 10, "cost_multiplier": 1 }, + { "monster": "mon_fungaloid_young", "freq": 200, "cost_multiplier": 1 }, + { "monster": "mon_fungus_boil", "freq": 50, "cost_multiplier": 0 }, + { "monster": "mon_fungaloid_seeder", "freq": 0, "cost_multiplier": 0 }, + { "monster": "mon_zombie_fungus", "freq": 20, "cost_multiplier": 1, "pack_size": [1,3] }, + { "monster": "mon_boomer_fungus", "freq": 5, "cost_multiplier": 1, "pack_size": [1,3] }, + { "monster": "mon_ant_fungus", "freq": 15, "cost_multiplier": 3, "pack_size": [4,9] }, + { "monster": "mon_fungaloid_pk", "freq": 35, "cost_multiplier": 5, "starts": 25 }, + { "monster": "mon_fungus_pig", "freq": 5, "cost_multiplier": 12, "pack_size": [1,4], "starts": 75 }, + { "monster": "mon_fougar", "freq": 10, "cost_multiplier": 7, "starts": 25 }, + { "monster": "mon_feer", "freq": 10, "cost_multiplier": 12, "pack_size": [1,2], "starts": 25 }, + { "monster": "mon_feer", "freq": 5, "cost_multiplier": 17, "pack_size": [2,5], "starts": 75 }, + { "monster": "mon_foose", "freq": 25, "cost_multiplier": 12, "starts": 25 }, + { "monster": "mon_folf", "freq": 15, "cost_multiplier": 7 }, + { "monster": "mon_folf", "freq": 5, "cost_multiplier": 12, "pack_size": [3,5], "starts": 25 }, + { "monster": "mon_fardigrade", "freq": 5, "cost_multiplier": 25, "starts": 50 }, + { "monster": "mon_furvivor", "freq": 5, "cost_multiplier": 12, "pack_size": [1,2], "starts": 25 }, + { "monster": "mon_furvivor_glock", "freq": 1, "cost_multiplier": 17, "pack_size": [1,3], "starts": 25 }, + { "monster": "mon_furvivor_shotgun", "freq": 1, "cost_multiplier": 20, "starts": 100 }, + { "monster": "mon_furvivor_deagle", "freq": 1, "cost_multiplier": 17, "starts": 100 }, + { "monster": "mon_furvivor_smg", "freq": 1, "cost_multiplier": 30, "starts": 175 }, + { "monster": "mon_furvivor_pk", "freq": 5, "cost_multiplier": 25, "pack_size": [1,3], "starts": 100 }, + { "monster": "mon_marloss_man", "freq": 1, "cost_multiplier": 99, "starts": 250, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_finebeast", "freq": 10, "cost_multiplier": 15, "starts": 100 }, + { "monster": "mon_finecraft", "freq": 10, "cost_multiplier": 7, "starts": 150 }, + { "monster": "mon_fionaea", "freq": 5, "cost_multiplier": 17, "starts": 150 } ] },{ "type":"monstergroup", - "name" : "GROUP_CAVE", - "default" : "mon_null", - "monsters" : [ - { "monster" : "mon_furvivor", "freq" : 1, "cost_multiplier" : 5, "conditions" : ["DUSK", "SPRING"], "pack_size" : [3,5] }, - { "monster" : "mon_furvivor_glock", "freq" : 10, "cost_multiplier" : 10, "pack_size" : [1,2], "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_furvivor_glock", "freq" : 10, "cost_multiplier" : 15, "pack_size" : [1,3], "conditions" : ["SPRING"], "starts" : 72 }, - { "monster" : "mon_furvivor_shotgun", "freq" : 10, "cost_multiplier" : 15, "pack_size" : [1,2], "conditions" : ["SUMMER", "AUTUMN"], "starts" : 75 }, - { "monster" : "mon_furvivor_deagle", "freq" : 10, "cost_multiplier" : 10, "starts" : 25 }, - { "monster" : "mon_furvivor_deagle", "freq" : 10, "cost_multiplier" : 15, "pack_size" : [1,4], "conditions" : ["SUMMER"], "starts" : 75 }, - { "monster" : "mon_furvivor_smg", "freq" : 10, "cost_multiplier" : 20, "starts" : 50 }, - { "monster" : "mon_furvivor_pk", "freq" : 10, "cost_multiplier" : 10, "pack_size" : [1,2], "conditions" : ["SUMMER", "AUTUMN"], "starts" : 100 }, - { "monster" : "mon_furvivor_pk", "freq" : 10, "cost_multiplier" : 25, "pack_size" : [2,3], "conditions" : ["SPRING", "SUMMER", "AUTUMN"], "starts" : 100 }, - { "monster" : "mon_furvivor_pk", "freq" : 10, "cost_multiplier" : 10, "pack_size" : [1,3], "starts" : 100 }, - { "monster" : "mon_fougar", "freq" : 20, "cost_multiplier" : 8, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_twisted_body", "freq" : 20, "cost_multiplier" : 20, "pack_size" : [ 1 , 6 ], "starts": 25 }, - { "monster" : "mon_human_snail", "freq" : 20, "cost_multiplier" : 15, "pack_size" : [ 3 , 8 ], "starts": 25 }, - - { "monster" : "mon_jabberwock", "freq" : 5, "cost_multiplier" : 50, "starts" : 672 }, - { "monster" : "mon_ant_queen_young", "freq" : 20, "cost_multiplier" : 2, "conditions" : ["SPRING"], "starts" : 75 }, - - { "monster" : "mon_bat", "freq" : 600, "cost_multiplier" : 5, "pack_size" : [6,32] }, - { "monster" : "mon_bat_vampire", "freq" : 50, "cost_multiplier" : 10, "pack_size" : [12,32], "starts" : 600 }, - { "monster" : "mon_bear", "freq" : 100, "cost_multiplier" : 10, "pack_size" : [1,3], "ends" : 600 }, - { "monster" : "mon_bear", "freq" : 25, "cost_multiplier" : 10, "pack_size" : [1,3], "starts" : 600 }, - { "monster" : "mon_bear_mega", "freq" : 100, "cost_multiplier" : 15, "pack_size" : [1,2], "starts" : 800 }, - { "monster" : "mon_bear_mega_baby", "freq" : 50, "cost_multiplier" : 25, "pack_size" : [1,4], "starts" : 850, "conditions" : ["SPRING", "SUMMER"] }, - { "monster" : "mon_cougar", "freq" : 100, "cost_multiplier" : 20, "pack_size" : [1,2] }, - { "monster" : "mon_bear_smoky", "freq" : 100, "cost_multiplier" : 0, "starts" : 250 } + "name": "GROUP_CAVE", + "default": "mon_null", + "monsters": [ + { "monster": "mon_furvivor", "freq": 1, "cost_multiplier": 5, "conditions": ["DUSK", "SPRING"], "pack_size": [3,5] }, + { "monster": "mon_furvivor_glock", "freq": 10, "cost_multiplier": 10, "pack_size": [1,2], "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_furvivor_glock", "freq": 10, "cost_multiplier": 15, "pack_size": [1,3], "conditions": ["SPRING"], "starts": 72 }, + { "monster": "mon_furvivor_shotgun", "freq": 10, "cost_multiplier": 15, "pack_size": [1,2], "conditions": ["SUMMER", "AUTUMN"], "starts": 75 }, + { "monster": "mon_furvivor_deagle", "freq": 10, "cost_multiplier": 10, "starts": 25 }, + { "monster": "mon_furvivor_deagle", "freq": 10, "cost_multiplier": 15, "pack_size": [1,4], "conditions": ["SUMMER"], "starts": 75 }, + { "monster": "mon_furvivor_smg", "freq": 10, "cost_multiplier": 20, "starts": 50 }, + { "monster": "mon_furvivor_pk", "freq": 10, "cost_multiplier": 10, "pack_size": [1,2], "conditions": ["SUMMER", "AUTUMN"], "starts": 100 }, + { "monster": "mon_furvivor_pk", "freq": 10, "cost_multiplier": 25, "pack_size": [2,3], "conditions": ["SPRING", "SUMMER", "AUTUMN"], "starts": 100 }, + { "monster": "mon_furvivor_pk", "freq": 10, "cost_multiplier": 10, "pack_size": [1,3], "starts": 100 }, + { "monster": "mon_fougar", "freq": 20, "cost_multiplier": 8, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_twisted_body", "freq": 20, "cost_multiplier": 20, "pack_size": [ 1 , 6 ], "starts": 25 }, + { "monster": "mon_human_snail", "freq": 20, "cost_multiplier": 15, "pack_size": [ 3 , 8 ], "starts": 25 }, + + { "monster": "mon_jabberwock", "freq": 5, "cost_multiplier": 50, "starts": 672 }, + { "monster": "mon_ant_queen_young", "freq": 20, "cost_multiplier": 2, "conditions": ["SPRING"], "starts": 75 }, + + { "monster": "mon_bat", "freq": 600, "cost_multiplier": 5, "pack_size": [6,32] }, + { "monster": "mon_bat_vampire", "freq": 50, "cost_multiplier": 10, "pack_size": [12,32], "starts": 600 }, + { "monster": "mon_bear", "freq": 100, "cost_multiplier": 10, "pack_size": [1,3], "ends": 600 }, + { "monster": "mon_bear", "freq": 25, "cost_multiplier": 10, "pack_size": [1,3], "starts": 600 }, + { "monster": "mon_bear_mega", "freq": 100, "cost_multiplier": 15, "pack_size": [1,2], "starts": 800 }, + { "monster": "mon_bear_mega_baby", "freq": 50, "cost_multiplier": 25, "pack_size": [1,4], "starts": 850, "conditions": ["SPRING", "SUMMER"] }, + { "monster": "mon_cougar", "freq": 100, "cost_multiplier": 20, "pack_size": [1,2] }, + { "monster": "mon_bear_smoky", "freq": 100, "cost_multiplier": 0, "starts": 250 } ] },{ "type":"monstergroup", - "name" : "GROUP_SWAMP", - "default" : "mon_null", - "monsters" : [ - { "monster" : "mon_fougar", "freq" : 1, "cost_multiplier" : 8, "conditions" : ["DUSK", "SUMMER"] }, - { "monster" : "mon_foose", "freq" : 1, "cost_multiplier" : 10, "conditions" : ["DAWN", "WINTER"] }, - { "monster" : "mon_fardigrade", "freq" : 3, "cost_multiplier" : 25, "conditions" : ["DAWN", "SPRING", "SUMMER", "AUTUMN"], "starts" : 150 }, - { "monster" : "mon_furvivor", "freq" : 3, "cost_multiplier" : 5, "conditions" : ["DUSK"] }, - { "monster" : "mon_furvivor_glock", "freq" : 2, "cost_multiplier" : 10, "pack_size" : [1,2], "conditions" : ["DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_furvivor_shotgun", "freq" : 2, "cost_multiplier" : 15, "pack_size" : [1,2], "conditions" : ["DAWN", "DUSK", "SUMMER", "AUTUMN"], "starts" : 75 }, - { "monster" : "mon_furvivor_deagle", "freq" : 1, "cost_multiplier" : 10, "starts" : 25 }, - { "monster" : "mon_furvivor_smg", "freq" : 1, "cost_multiplier" : 20, "conditions" : ["DUSK"], "starts" : 150 }, - { "monster" : "mon_furvivor_pk", "freq" : 2, "cost_multiplier" : 10, "pack_size" : [1,2], "conditions" : ["DUSK", "SUMMER", "AUTUMN"], "starts" : 100 }, - { "monster" : "mon_furvivor_pk", "freq" : 2, "cost_multiplier" : 10, "pack_size" : [1,3], "starts" : 100 }, - { "monster" : "mon_finebeast", "freq" : 2, "cost_multiplier" : 5, "conditions" : ["DUSK", "SUMMER"], "starts" : 75 }, - { "monster" : "mon_finecraft", "freq" : 2, "cost_multiplier" : 10, "pack_size" : [1,2], "conditions" : ["DAWN", "SPRING", "SUMMER"], "starts" : 150 }, - { "monster" : "mon_finecraft", "freq" : 2, "cost_multiplier" : 10, "pack_size" : [1,4], "conditions" : ["DUSK", "SUMMER", "AUTUMN"], "starts" : 150 }, - { "monster" : "mon_fionaea", "freq" : 1, "cost_multiplier" : 25, "conditions" : ["DUSK", "DAWN", "SUMMER"], "starts" : 200 }, - { "monster" : "mon_fungus_pig", "freq" : 5, "cost_multiplier" : 15, "pack_size" : [1,5], "starts" : 75 }, - - { "monster" : "mon_tardigrade", "freq" : 3, "cost_multiplier" : 15, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"], "starts" : 150 }, - { "monster" : "mon_ant_queen_young", "freq" : 4, "cost_multiplier" : 5, "conditions" : ["SPRING"], "starts" : 75 }, - { "monster" : "mon_twisted_body", "freq" : 1, "cost_multiplier" : 15, "pack_size" : [ 1 , 6 ], "starts": 50, "conditions": ["DUSK", "NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_human_snail", "freq" : 5, "cost_multiplier" : 10, "pack_size" : [ 1 , 4 ], "starts": 50, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_horse_zombie", "freq" : 1, "cost_multiplier" : 15, "starts" : 150 }, - { "monster" : "mon_horse_zombie", "freq" : 1, "cost_multiplier" : 15, "starts" : 1350, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_lemming", "freq" : 50, "cost_multiplier" : 0, "pack_size" : [2,7], "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_mosquito", "freq" : 50, "cost_multiplier" : 0, "pack_size" : [1,7], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_mosquito_giant", "freq" : 5, "cost_multiplier" : 0, "pack_size" : [1,3], "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_mosquito_giant", "freq" : 10, "cost_multiplier" : 0, "pack_size" : [1,3], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_mosquito_giant", "freq" : 5, "cost_multiplier" : 0, "pack_size" : [1,3], "starts" : 72, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_mosquito_giant", "freq" : 10, "cost_multiplier" : 0, "pack_size" : [1,3], "starts" : 72, "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_mosquito_giant", "freq" : 5, "cost_multiplier" : 0, "pack_size" : [1,3], "starts" : 672, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_mosquito_giant", "freq" : 10, "cost_multiplier" : 0, "pack_size" : [1,3], "starts" : 672, "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_dragonfly", "freq" : 30, "cost_multiplier" : 0, "pack_size" : [1,3] }, - - { "monster" : "mon_dragonfly_giant", "freq" : 5, "cost_multiplier" : 0, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_dragonfly_giant", "freq" : 5, "cost_multiplier" : 0, "starts" : 216, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_dragonfly_giant", "freq" : 5, "cost_multiplier" : 0, "starts" : 792, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_fly", "freq" : 2, "cost_multiplier" : 0, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 3, "cost_multiplier" : 0, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 2, "cost_multiplier" : 0, "starts" : 168, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 3, "cost_multiplier" : 0, "starts" : 168, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 2, "cost_multiplier" : 0, "starts" : 384, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 3, "cost_multiplier" : 0, "starts" : 384, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 2, "cost_multiplier" : 0, "starts" : 793, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_fly", "freq" : 3, "cost_multiplier" : 0, "starts" : 793, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_centipede", "freq" : 30, "cost_multiplier" : 0, "conditions" : ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_centipede_giant", "freq" : 2, "cost_multiplier" : 0, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_centipede_giant", "freq" : 6, "cost_multiplier" : 0, "conditions" : ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_centipede_giant", "freq" : 2, "cost_multiplier" : 0, "starts" : 672, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_centipede_giant", "freq" : 6, "cost_multiplier" : 0, "starts" : 672, "conditions" : ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_spider_jumping", "freq" : 6, "cost_multiplier" : 2, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping", "freq" : 24, "cost_multiplier" : 2, "conditions" : ["DAWN", "DAY", "DUSK","SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_spider_jumping_giant", "freq" : 1, "cost_multiplier" : 0, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 3, "cost_multiplier" : 0, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 1, "cost_multiplier" : 0, "starts" : 168, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 3, "cost_multiplier" : 0, "starts" : 168, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 1, "cost_multiplier" : 0, "starts" : 384, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 3, "cost_multiplier" : 0, "starts" : 384, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 1, "cost_multiplier" : 0, "starts" : 792, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant", "freq" : 3, "cost_multiplier" : 0, "starts" : 792, "conditions" : ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_jumping_giant_acid", "freq" : 1, "cost_multiplier" : 15, "starts" : 250, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_spider_wolf", "freq" : 6, "cost_multiplier" : 2, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_wolf", "freq" : 24, "cost_multiplier" : 2, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_spider_wolf_giant", "freq" : 1, "cost_multiplier" : 5, "conditions" : ["SUMMER"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 3, "cost_multiplier" : 5, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 1, "cost_multiplier" : 5, "starts" : 50, "conditions" : ["SUMMER"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 3, "cost_multiplier" : 5, "starts" : 50, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 1, "cost_multiplier" : 5, "starts" : 100, "conditions" : ["SUMMER"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 3, "cost_multiplier" : 5, "starts" : 100, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 1, "cost_multiplier" : 5, "starts" : 250, "conditions" : ["SUMMER"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 3, "cost_multiplier" : 5, "starts" : 250, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 1, "cost_multiplier" : 5, "starts" : 350, "conditions" : ["SUMMER"] }, - { "monster" : "mon_spider_wolf_giant", "freq" : 3, "cost_multiplier" : 5, "starts" : 350, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_wasp_small", "freq" : 3, "cost_multiplier" : 2, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_wasp_small", "freq" : 12, "cost_multiplier" : 2, "conditions" : ["DAWN", "DAY", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_wasp", "freq" : 1, "cost_multiplier" : 0, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_wasp", "freq" : 4, "cost_multiplier" : 0, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_wasp", "freq" : 1, "cost_multiplier" : 0, "starts" : 288, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_wasp", "freq" : 4, "cost_multiplier" : 0, "starts" : 288, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_wasp", "freq" : 1, "cost_multiplier" : 0, "starts" : 792, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_wasp", "freq" : 4, "cost_multiplier" : 0, "starts" : 792, "conditions" : ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_dermatik" , "freq" : 2, "cost_multiplier" : 2, "starts" : 50, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_dermatik" , "freq" : 8, "cost_multiplier" : 2, "starts" : 50, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_dermatik_larva", "freq" : 4, "cost_multiplier" : 2, "starts" : 50, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_dermatik" , "freq" : 2, "cost_multiplier" : 2, "starts" : 168, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_dermatik" , "freq" : 8, "cost_multiplier" : 2, "starts" : 168, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_dermatik_larva", "freq" : 4, "cost_multiplier" : 2, "starts" : 168, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_dermatik" , "freq" : 2, "cost_multiplier" : 2, "starts" : 792, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_dermatik" , "freq" : 8, "cost_multiplier" : 2, "starts" : 792, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_dermatik_larva", "freq" : 4, "cost_multiplier" : 2, "starts" : 792, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_slug", "freq" : 30, "cost_multiplier" : 0, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_slug_giant", "freq" : 5, "cost_multiplier" : 0, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_slug_giant", "freq" : 5, "cost_multiplier" : 0, "starts" : 144, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_slug_giant", "freq" : 5, "cost_multiplier" : 0, "starts" : 432, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_slug_giant", "freq" : 5, "cost_multiplier" : 0, "starts" : 792, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_sludge_crawler", "freq" : 5, "cost_multiplier" : 2, "starts" : 100, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_sludge_crawler", "freq" : 5, "cost_multiplier" : 2, "starts" : 288, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_sludge_crawler", "freq" : 5, "cost_multiplier" : 2, "starts" : 792, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_frog", "freq" : 50, "cost_multiplier" : 0 }, - - { "monster" : "mon_frog_giant", "freq" : 2, "cost_multiplier" : 0, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_frog_giant", "freq" : 3, "cost_multiplier" : 0, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_frog_giant", "freq" : 2, "cost_multiplier" : 0, "starts" : 168, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_frog_giant", "freq" : 3, "cost_multiplier" : 0, "starts" : 168, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_frog_giant", "freq" : 2, "cost_multiplier" : 0, "starts" : 456, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_frog_giant", "freq" : 3, "cost_multiplier" : 0, "starts" : 456, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_frog_giant", "freq" : 2, "cost_multiplier" : 0, "starts" : 792, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_frog_giant", "freq" : 3, "cost_multiplier" : 0, "starts" : 792, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - - { "monster" : "mon_giant_crayfish", "freq" : 1, "cost_multiplier" : 0, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_giant_crayfish", "freq" : 4, "cost_multiplier" : 0, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_giant_crayfish", "freq" : 1, "cost_multiplier" : 0, "starts" : 120, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_giant_crayfish", "freq" : 4, "cost_multiplier" : 0, "starts" : 120, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_giant_crayfish", "freq" : 1, "cost_multiplier" : 0, "starts" : 336, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_giant_crayfish", "freq" : 4, "cost_multiplier" : 0, "starts" : 336, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_giant_crayfish", "freq" : 1, "cost_multiplier" : 0, "starts" : 624, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_giant_crayfish", "freq" : 4, "cost_multiplier" : 0, "starts" : 624, "conditions" : ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_bear_smoky", "freq" : 1, "cost_multiplier" : 0, "starts" : 672, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] } + "name": "GROUP_SWAMP", + "default": "mon_null", + "monsters": [ + { "monster": "mon_fougar", "freq": 1, "cost_multiplier": 8, "conditions": ["DUSK", "SUMMER"] }, + { "monster": "mon_foose", "freq": 1, "cost_multiplier": 10, "conditions": ["DAWN", "WINTER"] }, + { "monster": "mon_fardigrade", "freq": 3, "cost_multiplier": 25, "conditions": ["DAWN", "SPRING", "SUMMER", "AUTUMN"], "starts": 150 }, + { "monster": "mon_furvivor", "freq": 3, "cost_multiplier": 5, "conditions": ["DUSK"] }, + { "monster": "mon_furvivor_glock", "freq": 2, "cost_multiplier": 10, "pack_size": [1,2], "conditions": ["DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_furvivor_shotgun", "freq": 2, "cost_multiplier": 15, "pack_size": [1,2], "conditions": ["DAWN", "DUSK", "SUMMER", "AUTUMN"], "starts": 75 }, + { "monster": "mon_furvivor_deagle", "freq": 1, "cost_multiplier": 10, "starts": 25 }, + { "monster": "mon_furvivor_smg", "freq": 1, "cost_multiplier": 20, "conditions": ["DUSK"], "starts": 150 }, + { "monster": "mon_furvivor_pk", "freq": 2, "cost_multiplier": 10, "pack_size": [1,2], "conditions": ["DUSK", "SUMMER", "AUTUMN"], "starts": 100 }, + { "monster": "mon_furvivor_pk", "freq": 2, "cost_multiplier": 10, "pack_size": [1,3], "starts": 100 }, + { "monster": "mon_finebeast", "freq": 2, "cost_multiplier": 5, "conditions": ["DUSK", "SUMMER"], "starts": 75 }, + { "monster": "mon_finecraft", "freq": 2, "cost_multiplier": 10, "pack_size": [1,2], "conditions": ["DAWN", "SPRING", "SUMMER"], "starts": 150 }, + { "monster": "mon_finecraft", "freq": 2, "cost_multiplier": 10, "pack_size": [1,4], "conditions": ["DUSK", "SUMMER", "AUTUMN"], "starts": 150 }, + { "monster": "mon_fionaea", "freq": 1, "cost_multiplier": 25, "conditions": ["DUSK", "DAWN", "SUMMER"], "starts": 200 }, + { "monster": "mon_fungus_pig", "freq": 5, "cost_multiplier": 15, "pack_size": [1,5], "starts": 75 }, + + { "monster": "mon_tardigrade", "freq": 3, "cost_multiplier": 15, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"], "starts": 150 }, + { "monster": "mon_ant_queen_young", "freq": 4, "cost_multiplier": 5, "conditions": ["SPRING"], "starts": 75 }, + { "monster": "mon_twisted_body", "freq": 1, "cost_multiplier": 15, "pack_size": [ 1 , 6 ], "starts": 50, "conditions": ["DUSK", "NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_human_snail", "freq": 5, "cost_multiplier": 10, "pack_size": [ 1 , 4 ], "starts": 50, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_horse_zombie", "freq": 1, "cost_multiplier": 15, "starts": 150 }, + { "monster": "mon_horse_zombie", "freq": 1, "cost_multiplier": 15, "starts": 1350, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_lemming", "freq": 50, "cost_multiplier": 0, "pack_size": [2,7], "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_mosquito", "freq": 50, "cost_multiplier": 0, "pack_size": [1,7], "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_mosquito_giant", "freq": 5, "cost_multiplier": 0, "pack_size": [1,3], "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_mosquito_giant", "freq": 10, "cost_multiplier": 0, "pack_size": [1,3], "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_mosquito_giant", "freq": 5, "cost_multiplier": 0, "pack_size": [1,3], "starts": 72, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_mosquito_giant", "freq": 10, "cost_multiplier": 0, "pack_size": [1,3], "starts": 72, "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_mosquito_giant", "freq": 5, "cost_multiplier": 0, "pack_size": [1,3], "starts": 672, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_mosquito_giant", "freq": 10, "cost_multiplier": 0, "pack_size": [1,3], "starts": 672, "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_dragonfly", "freq": 30, "cost_multiplier": 0, "pack_size": [1,3] }, + + { "monster": "mon_dragonfly_giant", "freq": 5, "cost_multiplier": 0, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_dragonfly_giant", "freq": 5, "cost_multiplier": 0, "starts": 216, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_dragonfly_giant", "freq": 5, "cost_multiplier": 0, "starts": 792, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_fly", "freq": 2, "cost_multiplier": 0, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 3, "cost_multiplier": 0, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 2, "cost_multiplier": 0, "starts": 168, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 3, "cost_multiplier": 0, "starts": 168, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 2, "cost_multiplier": 0, "starts": 384, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 3, "cost_multiplier": 0, "starts": 384, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 2, "cost_multiplier": 0, "starts": 793, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fly", "freq": 3, "cost_multiplier": 0, "starts": 793, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_centipede", "freq": 30, "cost_multiplier": 0, "conditions": ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_centipede_giant", "freq": 2, "cost_multiplier": 0, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_centipede_giant", "freq": 6, "cost_multiplier": 0, "conditions": ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_centipede_giant", "freq": 2, "cost_multiplier": 0, "starts": 672, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_centipede_giant", "freq": 6, "cost_multiplier": 0, "starts": 672, "conditions": ["NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_spider_jumping", "freq": 6, "cost_multiplier": 2, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping", "freq": 24, "cost_multiplier": 2, "conditions": ["DAWN", "DAY", "DUSK","SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_spider_jumping_giant", "freq": 1, "cost_multiplier": 0, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 3, "cost_multiplier": 0, "conditions": ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 1, "cost_multiplier": 0, "starts": 168, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 3, "cost_multiplier": 0, "starts": 168, "conditions": ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 1, "cost_multiplier": 0, "starts": 384, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 3, "cost_multiplier": 0, "starts": 384, "conditions": ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 1, "cost_multiplier": 0, "starts": 792, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant", "freq": 3, "cost_multiplier": 0, "starts": 792, "conditions": ["DAWN", "DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_jumping_giant_acid", "freq": 1, "cost_multiplier": 15, "starts": 250, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_spider_wolf", "freq": 6, "cost_multiplier": 2, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_wolf", "freq": 24, "cost_multiplier": 2, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_spider_wolf_giant", "freq": 1, "cost_multiplier": 5, "conditions": ["SUMMER"] }, + { "monster": "mon_spider_wolf_giant", "freq": 3, "cost_multiplier": 5, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_wolf_giant", "freq": 1, "cost_multiplier": 5, "starts": 50, "conditions": ["SUMMER"] }, + { "monster": "mon_spider_wolf_giant", "freq": 3, "cost_multiplier": 5, "starts": 50, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_wolf_giant", "freq": 1, "cost_multiplier": 5, "starts": 100, "conditions": ["SUMMER"] }, + { "monster": "mon_spider_wolf_giant", "freq": 3, "cost_multiplier": 5, "starts": 100, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_wolf_giant", "freq": 1, "cost_multiplier": 5, "starts": 250, "conditions": ["SUMMER"] }, + { "monster": "mon_spider_wolf_giant", "freq": 3, "cost_multiplier": 5, "starts": 250, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_spider_wolf_giant", "freq": 1, "cost_multiplier": 5, "starts": 350, "conditions": ["SUMMER"] }, + { "monster": "mon_spider_wolf_giant", "freq": 3, "cost_multiplier": 5, "starts": 350, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_wasp_small", "freq": 3, "cost_multiplier": 2, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_wasp_small", "freq": 12, "cost_multiplier": 2, "conditions": ["DAWN", "DAY", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_wasp", "freq": 1, "cost_multiplier": 0, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_wasp", "freq": 4, "cost_multiplier": 0, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_wasp", "freq": 1, "cost_multiplier": 0, "starts": 288, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_wasp", "freq": 4, "cost_multiplier": 0, "starts": 288, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_wasp", "freq": 1, "cost_multiplier": 0, "starts": 792, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_wasp", "freq": 4, "cost_multiplier": 0, "starts": 792, "conditions": ["DAY", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_dermatik" , "freq": 2, "cost_multiplier": 2, "starts": 50, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_dermatik" , "freq": 8, "cost_multiplier": 2, "starts": 50, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_dermatik_larva", "freq": 4, "cost_multiplier": 2, "starts": 50, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_dermatik" , "freq": 2, "cost_multiplier": 2, "starts": 168, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_dermatik" , "freq": 8, "cost_multiplier": 2, "starts": 168, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_dermatik_larva", "freq": 4, "cost_multiplier": 2, "starts": 168, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_dermatik" , "freq": 2, "cost_multiplier": 2, "starts": 792, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_dermatik" , "freq": 8, "cost_multiplier": 2, "starts": 792, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_dermatik_larva", "freq": 4, "cost_multiplier": 2, "starts": 792, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_slug", "freq": 30, "cost_multiplier": 0, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_slug_giant", "freq": 5, "cost_multiplier": 0, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_slug_giant", "freq": 5, "cost_multiplier": 0, "starts": 144, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_slug_giant", "freq": 5, "cost_multiplier": 0, "starts": 432, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_slug_giant", "freq": 5, "cost_multiplier": 0, "starts": 792, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_sludge_crawler", "freq": 5, "cost_multiplier": 2, "starts": 100, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_sludge_crawler", "freq": 5, "cost_multiplier": 2, "starts": 288, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_sludge_crawler", "freq": 5, "cost_multiplier": 2, "starts": 792, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_frog", "freq": 50, "cost_multiplier": 0 }, + + { "monster": "mon_frog_giant", "freq": 2, "cost_multiplier": 0, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_frog_giant", "freq": 3, "cost_multiplier": 0, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_frog_giant", "freq": 2, "cost_multiplier": 0, "starts": 168, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_frog_giant", "freq": 3, "cost_multiplier": 0, "starts": 168, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_frog_giant", "freq": 2, "cost_multiplier": 0, "starts": 456, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_frog_giant", "freq": 3, "cost_multiplier": 0, "starts": 456, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_frog_giant", "freq": 2, "cost_multiplier": 0, "starts": 792, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_frog_giant", "freq": 3, "cost_multiplier": 0, "starts": 792, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + + { "monster": "mon_giant_crayfish", "freq": 1, "cost_multiplier": 0, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_giant_crayfish", "freq": 4, "cost_multiplier": 0, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_giant_crayfish", "freq": 1, "cost_multiplier": 0, "starts": 120, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_giant_crayfish", "freq": 4, "cost_multiplier": 0, "starts": 120, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_giant_crayfish", "freq": 1, "cost_multiplier": 0, "starts": 336, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_giant_crayfish", "freq": 4, "cost_multiplier": 0, "starts": 336, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_giant_crayfish", "freq": 1, "cost_multiplier": 0, "starts": 624, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_giant_crayfish", "freq": 4, "cost_multiplier": 0, "starts": 624, "conditions": ["DUSK", "NIGHT", "DAWN", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bear_smoky", "freq": 1, "cost_multiplier": 0, "starts": 672, "conditions": ["SPRING", "SUMMER", "AUTUMN"] } ] },{ "type":"monstergroup", - "name" : "GROUP_MAYBE_ZOMBIE", "_comment" : "10% chance of a zombie", - "default" : "mon_null", - "monsters" : [ - { "monster" : "mon_zombie", "freq" : 35, "cost_multiplier": 0, "pack_size": [1,5] }, - { "monster" : "mon_zombie_fat", "freq" : 15, "cost_multiplier": 2, "pack_size": [1,5]}, - { "monster" : "mon_zombie_tough", "freq" : 7, "cost_multiplier": 3, "pack_size": [1,5]}, - { "monster" : "mon_zombie_rot", "freq" : 3, "cost_multiplier": 2, "pack_size": [1,5]}, - { "monster" : "mon_zombie_crawler", "freq" : 2, "cost_multiplier": 2, "pack_size": [1,5]}, - { "monster" : "mon_zombie_dog", "freq" : 7, "cost_multiplier" : 0 }, - { "monster" : "mon_dog_skeleton", "freq" : 3, "cost_multiplier" : 5 }, - { "monster" : "mon_zombie_child", "freq" : 8, "cost_multiplier" : 0 }, - { "monster" : "mon_skeleton", "freq" : 10, "cost_multiplier" : 5 }, - { "monster" : "mon_zombie_shrieker", "freq" : 10, "cost_multiplier" : 5 }, - { "monster" : "mon_ant_queen_young", "freq" : 5, "cost_multiplier" : 5, "conditions" : ["SPRING"], "starts" : 75 }, - {"monster" : "mon_jabberwock", "freq" : 3, "cost_multiplier" : 50, "conditions" : ["DAWN", "DAY"], "starts" : 250 } + "name": "GROUP_MAYBE_ZOMBIE", "_comment": "10% chance of a zombie", + "default": "mon_null", + "monsters": [ + { "monster": "mon_zombie", "freq": 35, "cost_multiplier": 0, "pack_size": [1,5] }, + { "monster": "mon_zombie_fat", "freq": 15, "cost_multiplier": 2, "pack_size": [1,5]}, + { "monster": "mon_zombie_tough", "freq": 7, "cost_multiplier": 3, "pack_size": [1,5]}, + { "monster": "mon_zombie_rot", "freq": 3, "cost_multiplier": 2, "pack_size": [1,5]}, + { "monster": "mon_zombie_crawler", "freq": 2, "cost_multiplier": 2, "pack_size": [1,5]}, + { "monster": "mon_zombie_dog", "freq": 7, "cost_multiplier": 0 }, + { "monster": "mon_dog_skeleton", "freq": 3, "cost_multiplier": 5 }, + { "monster": "mon_zombie_child", "freq": 8, "cost_multiplier": 0 }, + { "monster": "mon_skeleton", "freq": 10, "cost_multiplier": 5 }, + { "monster": "mon_zombie_shrieker", "freq": 10, "cost_multiplier": 5 }, + { "monster": "mon_ant_queen_young", "freq": 5, "cost_multiplier": 5, "conditions": ["SPRING"], "starts": 75 }, + {"monster": "mon_jabberwock", "freq": 3, "cost_multiplier": 50, "conditions": ["DAWN", "DAY"], "starts": 250 } ] },{ "type":"monstergroup", - "name" : "GROUP_SAFE", - "is_safe" : true, - "default" : "mon_null", - "monsters" : [ - { "monster" : "mon_ant_queen_young", "freq" : 1, "cost_multiplier" : 10, "conditions" : ["DAWN", "DUSK", "SPRING"], "starts" : 75 }, - - { "monster" : "mon_bat", "freq" : 2, "cost_multiplier" : 1 }, - { "monster" : "mon_bobcat", "freq" : 2, "cost_multiplier" : 1 }, - { "monster" : "mon_cat", "freq" : 4, "cost_multiplier" : 1 }, - { "monster" : "mon_chicken", "freq" : 3, "cost_multiplier" : 1 }, - { "monster" : "mon_chipmunk", "freq" : 5, "cost_multiplier" : 1 }, - { "monster" : "mon_crow", "freq" : 5, "cost_multiplier" : 1 }, - { "monster" : "mon_deer", "freq" : 3, "cost_multiplier" : 1 }, - { "monster" : "mon_dog", "freq" : 3, "cost_multiplier" : 1 }, - { "monster" : "mon_fox_gray", "freq" : 3, "cost_multiplier" : 1 }, - { "monster" : "mon_fox_red", "freq" : 3, "cost_multiplier" : 1 }, - { "monster" : "mon_groundhog", "freq" : 3, "cost_multiplier" : 1 }, - { "monster" : "mon_hare", "freq" : 4, "cost_multiplier" : 1 }, - { "monster" : "mon_mosquito", "freq" : 3, "cost_multiplier" : 1 }, - { "monster" : "mon_rabbit", "freq" : 4, "cost_multiplier" : 1 }, - { "monster" : "mon_shrew", "freq" : 3, "cost_multiplier" : 1 }, - { "monster" : "mon_squirrel_red", "freq" : 5, "cost_multiplier" : 1 }, - { "monster" : "mon_weasel", "freq" : 3, "cost_multiplier" : 1 }, - { "monster" : "mon_turkey", "freq" : 5, "cost_multiplier" : 1 }, - { "monster" : "mon_raccoon", "freq" : 5, "cost_multiplier" : 1 }, - { "monster" : "mon_opossum", "freq" : 4, "cost_multiplier" : 1 }, - { "monster" : "mon_deer_mouse", "freq" : 5, "cost_multiplier" : 1 }, - { "monster" : "mon_sewer_rat", "freq" : 3, "cost_multiplier" : 1 }, - { "monster" : "mon_black_rat", "freq" : 3, "cost_multiplier" : 1 }, - { "monster" : "mon_rattlesnake", "freq" : 3, "cost_multiplier" : 1 }, - { "monster" : "mon_spider_wolf", "freq" : 4, "cost_multiplier" : 1 }, - { "monster" : "mon_spider_jumping", "freq" : 4, "cost_multiplier" : 1 }, - { "monster" : "mon_cow", "freq" : 2, "cost_multiplier" : 1 }, - { "monster" : "mon_horse", "freq" : 2, "cost_multiplier" : 1, "pack_size" : [ 1 , 3 ] }, - { "monster" : "mon_pig", "freq" : 2, "cost_multiplier" : 1 }, - { "monster" : "mon_sheep", "freq" : 2, "cost_multiplier" : 1 }, - { "monster" : "mon_mosquito", "freq" : 3, "cost_multiplier" : 1 }, - { "monster" : "mon_dragonfly", "freq" : 3, "cost_multiplier" : 1 }, - { "monster" : "mon_centipede", "freq" : 3, "cost_multiplier" : 1 }, - { "monster" : "mon_lemming", "freq" : 5, "cost_multiplier" : 1 }, - { "monster" : "mon_slug", "freq" : 3, "cost_multiplier" : 1 } + "name": "GROUP_SAFE", + "is_safe": true, + "default": "mon_null", + "monsters": [ + { "monster": "mon_ant_queen_young", "freq": 1, "cost_multiplier": 10, "conditions": ["DAWN", "DUSK", "SPRING"], "starts": 75 }, + + { "monster": "mon_bat", "freq": 2, "cost_multiplier": 1 }, + { "monster": "mon_bobcat", "freq": 2, "cost_multiplier": 1 }, + { "monster": "mon_cat", "freq": 4, "cost_multiplier": 1 }, + { "monster": "mon_chicken", "freq": 3, "cost_multiplier": 1 }, + { "monster": "mon_chipmunk", "freq": 5, "cost_multiplier": 1 }, + { "monster": "mon_crow", "freq": 5, "cost_multiplier": 1 }, + { "monster": "mon_deer", "freq": 3, "cost_multiplier": 1 }, + { "monster": "mon_dog", "freq": 3, "cost_multiplier": 1 }, + { "monster": "mon_fox_gray", "freq": 3, "cost_multiplier": 1 }, + { "monster": "mon_fox_red", "freq": 3, "cost_multiplier": 1 }, + { "monster": "mon_groundhog", "freq": 3, "cost_multiplier": 1 }, + { "monster": "mon_hare", "freq": 4, "cost_multiplier": 1 }, + { "monster": "mon_mosquito", "freq": 3, "cost_multiplier": 1 }, + { "monster": "mon_rabbit", "freq": 4, "cost_multiplier": 1 }, + { "monster": "mon_shrew", "freq": 3, "cost_multiplier": 1 }, + { "monster": "mon_squirrel_red", "freq": 5, "cost_multiplier": 1 }, + { "monster": "mon_weasel", "freq": 3, "cost_multiplier": 1 }, + { "monster": "mon_turkey", "freq": 5, "cost_multiplier": 1 }, + { "monster": "mon_raccoon", "freq": 5, "cost_multiplier": 1 }, + { "monster": "mon_opossum", "freq": 4, "cost_multiplier": 1 }, + { "monster": "mon_deer_mouse", "freq": 5, "cost_multiplier": 1 }, + { "monster": "mon_sewer_rat", "freq": 3, "cost_multiplier": 1 }, + { "monster": "mon_black_rat", "freq": 3, "cost_multiplier": 1 }, + { "monster": "mon_rattlesnake", "freq": 3, "cost_multiplier": 1 }, + { "monster": "mon_spider_wolf", "freq": 4, "cost_multiplier": 1 }, + { "monster": "mon_spider_jumping", "freq": 4, "cost_multiplier": 1 }, + { "monster": "mon_cow", "freq": 2, "cost_multiplier": 1 }, + { "monster": "mon_horse", "freq": 2, "cost_multiplier": 1, "pack_size": [ 1 , 3 ] }, + { "monster": "mon_pig", "freq": 2, "cost_multiplier": 1 }, + { "monster": "mon_sheep", "freq": 2, "cost_multiplier": 1 }, + { "monster": "mon_mosquito", "freq": 3, "cost_multiplier": 1 }, + { "monster": "mon_dragonfly", "freq": 3, "cost_multiplier": 1 }, + { "monster": "mon_centipede", "freq": 3, "cost_multiplier": 1 }, + { "monster": "mon_lemming", "freq": 5, "cost_multiplier": 1 }, + { "monster": "mon_slug", "freq": 3, "cost_multiplier": 1 } ] },{ "type":"monstergroup", - "name" : "GROUP_DOMESTIC", - "default" : "mon_dog", - "monsters" : [ - { "monster" : "mon_horse_zombie", "freq" : 10, "cost_multiplier" : 25, "starts" : 75, "pack_size" : [1,4] }, - { "monster" : "mon_horse_zombie", "freq" : 5, "cost_multiplier" : 25, "starts" : 600, "pack_size" : [1,4] }, - { "monster" : "mon_horse_zombie", "freq" : 10, "cost_multiplier" : 25, "starts" : 1300, "pack_size" : [1,4] }, - { "monster" : "mon_horse_zombie", "freq" : 5, "cost_multiplier" : 25, "starts" : 1600, "pack_size" : [1,4] }, - { "monster" : "mon_zolf_scorched", "freq" : 5, "cost_multiplier" : 25, "starts": 150 }, - - { "monster" : "mon_cat", "freq" : 100, "cost_multiplier" : 0 }, - { "monster" : "mon_cat", "freq" : 20, "cost_multiplier" : 10, "pack_size" : [2,8] }, - { "monster" : "mon_dog", "freq" : 50, "cost_multiplier" : 25, "pack_size" : [1,12] }, - { "monster" : "mon_chicken", "freq" : 50, "cost_multiplier" : 10, "pack_size" : [1,16] }, - { "monster" : "mon_cow", "freq" : 50, "cost_multiplier" : 25, "pack_size" : [1,8] }, - { "monster" : "mon_horse", "freq" : 50, "cost_multiplier" : 25, "pack_size" : [1,4] }, - { "monster" : "mon_pig", "freq" : 10, "cost_multiplier" : 25, "pack_size" : [1,6] }, - { "monster" : "mon_pig", "freq" : 10, "cost_multiplier" : 25, "ends" : 72, "pack_size" : [1,6] }, - { "monster" : "mon_pig", "freq" : 10, "cost_multiplier" : 25, "ends" : 168, "pack_size" : [1,6] }, - { "monster" : "mon_pig", "freq" : 10, "cost_multiplier" : 25, "ends" : 672, "pack_size" : [1,6] }, - { "monster" : "mon_pig", "freq" : 10, "cost_multiplier" : 25, "ends" : 2160, "pack_size" : [1,6] }, - { "monster" : "mon_sheep", "freq" : 50, "cost_multiplier" : 25, "pack_size" : [1,12] }, - { "monster" : "mon_zombie_pig", "freq" : 10, "cost_multiplier" : 25, "starts" : 72, "pack_size" : [1,5] }, - { "monster" : "mon_zombie_pig", "freq" : 10, "cost_multiplier" : 25, "starts" : 168, "pack_size" : [1,5] }, - { "monster" : "mon_zombie_pig", "freq" : 10, "cost_multiplier" : 25, "starts" : 672, "pack_size" : [1,5] }, - { "monster" : "mon_zombie_pig", "freq" : 10, "cost_multiplier" : 25, "starts" : 2160, "pack_size" : [1,5] }, - { "monster" : "mon_giant_cockroach", "freq" : 12, "cost_multiplier" : 1, "pack_size" : [1,5] }, - { "monster" : "mon_pregnant_giant_cockroach", "freq" : 3, "cost_multiplier" : 3, "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster" : "mon_giant_cockroach_nymph", "freq" : 5, "cost_multiplier" : 1} + "name": "GROUP_DOMESTIC", + "default": "mon_dog", + "monsters": [ + { "monster": "mon_horse_zombie", "freq": 10, "cost_multiplier": 25, "starts": 75, "pack_size": [1,4] }, + { "monster": "mon_horse_zombie", "freq": 5, "cost_multiplier": 25, "starts": 600, "pack_size": [1,4] }, + { "monster": "mon_horse_zombie", "freq": 10, "cost_multiplier": 25, "starts": 1300, "pack_size": [1,4] }, + { "monster": "mon_horse_zombie", "freq": 5, "cost_multiplier": 25, "starts": 1600, "pack_size": [1,4] }, + { "monster": "mon_zolf_scorched", "freq": 5, "cost_multiplier": 25, "starts": 150 }, + + { "monster": "mon_cat", "freq": 100, "cost_multiplier": 0 }, + { "monster": "mon_cat", "freq": 20, "cost_multiplier": 10, "pack_size": [2,8] }, + { "monster": "mon_dog", "freq": 50, "cost_multiplier": 25, "pack_size": [1,12] }, + { "monster": "mon_chicken", "freq": 50, "cost_multiplier": 10, "pack_size": [1,16] }, + { "monster": "mon_cow", "freq": 50, "cost_multiplier": 25, "pack_size": [1,8] }, + { "monster": "mon_horse", "freq": 50, "cost_multiplier": 25, "pack_size": [1,4] }, + { "monster": "mon_pig", "freq": 10, "cost_multiplier": 25, "pack_size": [1,6] }, + { "monster": "mon_pig", "freq": 10, "cost_multiplier": 25, "ends": 72, "pack_size": [1,6] }, + { "monster": "mon_pig", "freq": 10, "cost_multiplier": 25, "ends": 168, "pack_size": [1,6] }, + { "monster": "mon_pig", "freq": 10, "cost_multiplier": 25, "ends": 672, "pack_size": [1,6] }, + { "monster": "mon_pig", "freq": 10, "cost_multiplier": 25, "ends": 2160, "pack_size": [1,6] }, + { "monster": "mon_sheep", "freq": 50, "cost_multiplier": 25, "pack_size": [1,12] }, + { "monster": "mon_zombie_pig", "freq": 10, "cost_multiplier": 25, "starts": 72, "pack_size": [1,5] }, + { "monster": "mon_zombie_pig", "freq": 10, "cost_multiplier": 25, "starts": 168, "pack_size": [1,5] }, + { "monster": "mon_zombie_pig", "freq": 10, "cost_multiplier": 25, "starts": 672, "pack_size": [1,5] }, + { "monster": "mon_zombie_pig", "freq": 10, "cost_multiplier": 25, "starts": 2160, "pack_size": [1,5] }, + { "monster": "mon_giant_cockroach", "freq": 12, "cost_multiplier": 1, "pack_size": [1,5] }, + { "monster": "mon_pregnant_giant_cockroach", "freq": 3, "cost_multiplier": 3, "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_giant_cockroach_nymph", "freq": 5, "cost_multiplier": 1} ] },{ "type": "monstergroup", @@ -1202,20 +1205,20 @@ { "monster": "mon_dog", "freq": 15, "cost_multiplier":1, "pack_size": [2,5] }, { "monster": "mon_coyote_wolf", "freq": 10, "cost_multiplier": 1, "pack_size": [2,4] }, { "monster": "mon_black_rat", "freq": 20, "cost_multiplier": 1, "pack_size": [4,12] }, - { "monster": "mon_bat_vampire", "freq": 10, "cost_multiplier": 0, "pack_size": [8,16], "conditions" : ["DAWN", "DUSK", "NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_bat_vampire", "freq": 10, "cost_multiplier": 0, "pack_size": [8,16], "conditions": ["DAWN", "DUSK", "NIGHT", "SPRING", "SUMMER", "AUTUMN"] }, { "monster": "mon_gracke", "freq": 5, "cost_multiplier": 1, "pack_size": [2,5] }, { "monster": "mon_breather_hub", "freq": 1, "cost_multiplier":3, "pack_size": [1,2] }, { "monster": "mon_spider_wolf_giant_pk", "freq": 3, "cost_multiplier": 5 }, { "monster": "mon_spider_jumping_giant_acid", "freq": 10, "cost_multiplier": 3 }, - { "monster": "mon_feer", "freq" : 1, "cost_multiplier" : 3, "pack_size" : [1,2], "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster": "mon_fant", "freq" : 1, "cost_multiplier" : 3, "conditions" : ["SUMMER", "AUTUMN"] }, - { "monster": "mon_furvivor", "freq" : 3, "cost_multiplier" : 5, "pack_size" : [1,4], "conditions" : ["SPRING", "SUMMER", "AUTUMN"] }, - { "monster": "mon_furvivor_glock", "freq" : 2, "cost_multiplier" : 5, "pack_size" : [1,3], "conditions" : ["DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, - { "monster": "mon_furvivor_shotgun", "freq" : 2, "cost_multiplier" : 5, "conditions" : ["DAWN", "DUSK", "SUMMER", "AUTUMN"], "starts" : 25 }, - { "monster": "mon_furvivor_pk", "freq" : 1, "cost_multiplier" : 5, "pack_size" : [1,3], "starts" : 50 }, - { "monster": "mon_finecraft", "freq" : 1, "cost_multiplier" : 10, "pack_size" : [1,2], "conditions" : ["NIGHT", "SUMMER", "AUTUMN"], "starts" : 50 }, - { "monster": "mon_fionaea", "freq" : 1, "cost_multiplier" : 10, "conditions" : ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"], "starts" : 50 }, + { "monster": "mon_feer", "freq": 1, "cost_multiplier": 3, "pack_size": [1,2], "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_fant", "freq": 1, "cost_multiplier": 3, "conditions": ["SUMMER", "AUTUMN"] }, + { "monster": "mon_furvivor", "freq": 3, "cost_multiplier": 5, "pack_size": [1,4], "conditions": ["SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_furvivor_glock", "freq": 2, "cost_multiplier": 5, "pack_size": [1,3], "conditions": ["DAY", "DUSK", "SPRING", "SUMMER", "AUTUMN"] }, + { "monster": "mon_furvivor_shotgun", "freq": 2, "cost_multiplier": 5, "conditions": ["DAWN", "DUSK", "SUMMER", "AUTUMN"], "starts": 25 }, + { "monster": "mon_furvivor_pk", "freq": 1, "cost_multiplier": 5, "pack_size": [1,3], "starts": 50 }, + { "monster": "mon_finecraft", "freq": 1, "cost_multiplier": 10, "pack_size": [1,2], "conditions": ["NIGHT", "SUMMER", "AUTUMN"], "starts": 50 }, + { "monster": "mon_fionaea", "freq": 1, "cost_multiplier": 10, "conditions": ["DAWN", "DUSK", "SPRING", "SUMMER", "AUTUMN"], "starts": 50 }, { "monster": "mon_zombie", "freq": 15, "cost_multiplier": 1, "pack_size": [1,3] }, { "monster": "mon_zombie_child", "freq": 10, "cost_multiplier": 1, "pack_size": [1,2] }, From 531b55a85b831a947b4430aa2a5fde6c17b26d6a Mon Sep 17 00:00:00 2001 From: Vlasov Vitaly Date: Thu, 9 Jun 2016 20:59:30 +0300 Subject: [PATCH 093/110] German update --- lang/po/de.po | 527 ++++++++++++++++++++++---------------------------- 1 file changed, 230 insertions(+), 297 deletions(-) diff --git a/lang/po/de.po b/lang/po/de.po index fcbbf2d6e40be..0da212af9579e 100644 --- a/lang/po/de.po +++ b/lang/po/de.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Cataclysm-DDA\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-30 09:53+0300\n" -"PO-Revision-Date: 2016-05-30 08:22+0000\n" +"POT-Creation-Date: 2016-06-06 10:20+0300\n" +"PO-Revision-Date: 2016-06-06 08:46+0000\n" "Last-Translator: Vlasov Vitaly \n" "Language-Team: German (http://www.transifex.com/cataclysm-dda-translators/" "cataclysm-dda/language/de/)\n" @@ -1474,6 +1474,13 @@ msgstr "" "Eine Kiste mit kleinen Stahlkugeln. Sie verursachen so gut wie keinen " "Schaden." +#. ~ Description for .44 FMJ +#: lang/json/AMMO_from_json.py +msgid "" +"A brass-jacketed variant of the .44 Magnum round. This increases " +"penetration slightly at the cost of reduced damage from expansion." +msgstr "" + #. ~ Description for blue paint #: lang/json/AMMO_from_json.py msgid "A can of blue paint." @@ -2327,11 +2334,8 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A simple arrow shaft that has had a point carved into it and then fire-" -"hardened. Needs fletching to be worth firing from a bow." +"hardened. It needs fletching to be worth firing from a bow." msgstr "" -"Ein einfacher Pfeilschaft, in dem eine Spitze eingeritzt und anschließend " -"feuergehärtet wurde. Er braucht eine Befiederung, damit es sinnvoll ist, ihn " -"von einem Bogen zu schießen." #. ~ Description for ammo belt linkage #: lang/json/AMMO_from_json.py @@ -2974,18 +2978,6 @@ msgstr "" "werden. Verursacht schwere Verbrennungen auf jegliche organische Materie und " "kann sie bei Berührung in Brand setzen." -#. ~ Description for .22 CB -#: lang/json/AMMO_from_json.py -msgid "" -"Conical Ball .22 is a variety of .22 ammunition with a very small propellant " -"charge and generally lacks gunpowder. The end result is a subsonic round " -"that is so weak as to be nearly useless given your predicament." -msgstr "" -"Conical Ball .22 ist eine Variante der .22-Munition mit einer sehr kleinen " -"Treibladung und hat gewöhnlicherweise kein Schießpulver. Das Endergebnis ist " -"eine Infraschallpatrone, welche so schwach ist, dass sie fast nutzlos ist, " -"wenn man deine missliche Lage bedenkt." - #. ~ Description for handloaded .22 CB #: lang/json/AMMO_from_json.py msgid "" @@ -3553,14 +3545,11 @@ msgstr[1] "Hexogen" #. ~ Description for .22 rat-shot #: lang/json/AMMO_from_json.py msgid "" -"Rat-shot is extremely weak ammunition, designed for killing rats, snakes, or " -"other small vermin while being unable to damage walls. It has an extremely " -"short range and is unable to injure all but the smallest creatures." +"Rat-shot is an extremely weak .22 shotgun cartridge, designed for killing " +"rats, snakes, or other small vermin while being unable to damage walls. It " +"has an extremely short range and is unable to injure all but the smallest " +"creatures." msgstr "" -".22-Kleinkaliber ist eine extrem schwache Munition, die für das Töten von " -"Ratten, Schlangen oder anderem kleinen Ungeziefer gemacht wurde, während sie " -"unfähig ist, Wände zu beschädigen. Sie hat eine extrem kurze Reichweite und " -"ist unfähig, jegliche außer die kleinsten Kreaturen zu verletzen." #. ~ Description for handloaded .22 rat-shot #: lang/json/AMMO_from_json.py @@ -3707,6 +3696,14 @@ msgstr "" "an Chemikalien vorzubereiten, ist sie hauptsächlich als Batteriesäure " "bekannt, nach ihrer am weitesten verbreiteten kommerziellen Verwendung." +#. ~ Description for .22 CB +#: lang/json/AMMO_from_json.py +msgid "" +"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." +msgstr "" + #. ~ Description for reloaded .300 Winchester Magnum #: lang/json/AMMO_from_json.py msgid "" @@ -3949,11 +3946,8 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "This metal shaft has been carefully sharpened so that it has a crude point " -"at the end. Needs fletching to be worth firing from a bow." +"at the end. It needs fletching to be worth firing from a bow." msgstr "" -"Dieser Metallschaft wurde sorgfältig geschärft, damit er eine grobe Spitze " -"am Ende hat. Er braucht eine Befiederung, damit er es Wert ist, von einem " -"Bogen gefeuert zu werden." #. ~ Description for sharpened metal arrow #: lang/json/AMMO_from_json.py @@ -5318,10 +5312,10 @@ msgstr[0] "wiedergeladene 7,62×39mm M43" msgstr[1] "wiedergeladene 7,62×39mm M43" #: lang/json/AMMO_from_json.py -msgid "reloaded 7.62x39mm M87" -msgid_plural "reloaded 7.62x39mm M87" -msgstr[0] "wiedergeladene 7,62×39mm M87" -msgstr[1] "wiedergeladene 7,62×39mm M87" +msgid "reloaded 7.62x39mm M67" +msgid_plural "reloaded 7.62x39mm M67" +msgstr[0] "" +msgstr[1] "" #: lang/json/AMMO_from_json.py msgid "reloaded 7.62x51mm" @@ -7174,14 +7168,9 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "" "A large leather quiver trimmed with metal, worn on the back, that can hold " -"60 arrows.\n" -"Historically used by horse archers, rather than foot archers, but neither of " -"THEM had to fight zombies. Activate to store arrows." +"60 arrows. Historically used by horse archers, rather than foot archers, " +"but neither of THEM had to fight zombies. Activate to store arrows." msgstr "" -"Ein großer, mit Metall getrimmer Lederköcher, der auf dem Rücken getragen " -"wird und 80 Pfeile beinhalten kann.\n" -"Historisch benutzt von Bogenschützen zu Pferd, statt von Bogenschützen zu " -"Fuß, aber keiner von IHNEN musste gegen Zombies kämpfen." #. ~ Description for pair of ski goggles #: lang/json/ARMOR_from_json.py @@ -14962,9 +14951,8 @@ msgstr "" "der Elektronik und Roboter außer Kraft setzt, innerhalb einer kurzen " "Reichweite abzufeuern." -#. ~ Description for Telescopic Eyes #. ~ Description for Telescopic Eyes CBM -#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py +#: lang/json/BIONIC_ITEM_from_json.py msgid "" "Much of the material in your inner eye has been removed and replaced with an " "array of high-powered, auto-focusing lenses. You can now see much farther " @@ -22573,7 +22561,6 @@ msgstr "" "trüben. Lecker und erfrischend." #. ~ Description for whiskey -#. ~ Description for test_whiskey #: lang/json/COMESTIBLE_from_json.py msgid "Made from, by, and for real Southern colonels!" msgstr "Von, mit und für echte Oberste aus dem Süden gemacht!" @@ -28117,6 +28104,12 @@ msgid_plural "seasoned salt" msgstr[0] "Gewürzsalz" msgstr[1] "Gewürzsalze" +#: lang/json/COMESTIBLE_from_json.py lang/json/furniture_from_json.py +msgid "seed" +msgid_plural "seeds" +msgstr[0] "" +msgstr[1] "" + #: lang/json/COMESTIBLE_from_json.py msgid "seed potato" msgid_plural "seed potatoes" @@ -28493,12 +28486,6 @@ msgid_plural "tequilas" msgstr[0] "Tequila" msgstr[1] "Tequilas" -#: lang/json/COMESTIBLE_from_json.py -msgid "test_whiskey" -msgid_plural "test_whiskey" -msgstr[0] "test_whiskey" -msgstr[1] "test_whiskey" - #: lang/json/COMESTIBLE_from_json.py msgid "thyme" msgid_plural "thymes" @@ -29203,11 +29190,6 @@ msgstr "" "Eine wasserdichte Ledertasche, die 3 Liter Wasser fassen kann, mit einem " "Trageriemen." -#. ~ Description for test glass bottle -#: lang/json/CONTAINER_from_json.py -msgid "An UNSEALABLE glass bottle, holds 750 ml of liquid." -msgstr "" - #. ~ Description for aluminum can #: lang/json/CONTAINER_from_json.py msgid "An aluminum can, like what soda comes in." @@ -29490,12 +29472,6 @@ msgid_plural "steel jerrycans" msgstr[0] "Stahlkanne" msgstr[1] "Stahlkannen" -#: lang/json/CONTAINER_from_json.py -msgid "test glass bottle" -msgid_plural "test glass bottles" -msgstr[0] "" -msgstr[1] "" - #: lang/json/CONTAINER_from_json.py msgid "tin can" msgid_plural "tin cans" @@ -29745,21 +29721,6 @@ msgstr "" "verderben, sobald sie von dieser versiegelten Tasche entfernt worden sind. " "Demontiere sie, um an ihre Inhalte zu gelangen." -#. ~ Description for car battery -#: lang/json/GENERIC_from_json.py -msgid "A 12v lead-acid battery used to power car electrical systems." -msgstr "" -"Eine 12V-Blei-Säure-Batterie, die benutzt wird, um elektronische Systeme von " -"Autos zu versorgen." - -#. ~ Description for motorbike battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A 12v lead-acid battery used to power smaller vehicles' electrical systems." -msgstr "" -"Eine 12V-Blei-Säure-Batterie, die benutzt wird, um die elektronischen " -"Systeme kleinerer Fahrzeuge zu versorgen." - #. ~ Description for long rope #: lang/json/GENERIC_from_json.py msgid "" @@ -30780,13 +30741,6 @@ msgid "A kiln full of wood that has been lit; better drop it!" msgstr "" "Ein Holzkohleofen mit Holz, das angezündet wurde. Lass es besser fallen!" -#. ~ Description for truck battery -#: lang/json/GENERIC_from_json.py -msgid "A large 12v lead-acid battery used to power truck electrical systems." -msgstr "" -"Eine große 12V-Blei-Säure-Battere, die für die Versorgung der elektischen " -"Systeme in Lastkraftwägen verwendet wird." - #. ~ Description for truck alternator #: lang/json/GENERIC_from_json.py msgid "A large alternator used to power truck electrical systems." @@ -30923,13 +30877,6 @@ msgstr "" msgid "A large stone, roughly hollowed out into a pot." msgstr "Ein großer Stein, der grob zu einem Topf ausgehöhlt wurde." -#. ~ Description for storage battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A large storage battery. Could be installed into a storage battery case for " -"easy removal from a vehicle, or just welded straight in." -msgstr "" - #. ~ Description for folding wire basket #: lang/json/GENERIC_from_json.py msgid "A large wire basket from a shopping cart, modified to be foldable." @@ -31111,11 +31058,6 @@ msgstr "" "stacheligem Eisenkugel am Ende. Sie richtet verheerenden Schlagschaden und " "einen kleinen Stechschaden an." -#. ~ Description for medium storage battery -#: lang/json/GENERIC_from_json.py -msgid "A medium storage battery." -msgstr "Eine mittelgroße Speicherbatterie." - #. ~ Description for SD-Memory card #: lang/json/GENERIC_from_json.py msgid "A memory card, used. Might be worth a look." @@ -31882,11 +31824,6 @@ msgid "" "used to lift up to 1.5 metric tonnes." msgstr "" -#. ~ Description for small storage battery -#: lang/json/GENERIC_from_json.py -msgid "A small storage battery. Useful for crafting." -msgstr "Ein kleiner Akkumulator. Nützlich für die Fertigung." - #. ~ Description for damaged tent #: lang/json/GENERIC_from_json.py msgid "" @@ -34722,12 +34659,6 @@ msgid_plural "car alternators" msgstr[0] "Pkw-Lichtmaschine" msgstr[1] "Pkw-Lichtmaschinen" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "car battery" -msgid_plural "car batteries" -msgstr[0] "Autobatterie" -msgstr[1] "Autobatterien" - #: lang/json/GENERIC_from_json.py msgid "carding paddles" msgid_plural "pairs of carding paddles" @@ -35596,12 +35527,6 @@ msgid_plural "mechanical pumps" msgstr[0] "mechanische Pumpe" msgstr[1] "mechanische Pumpen" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "medium storage battery" -msgid_plural "medium storage batteries" -msgstr[0] "mittelgroße Speicherbatterie" -msgstr[1] "mittelgroße Speicherbatterien" - #: lang/json/GENERIC_from_json.py msgid "mess tin" msgid_plural "mess tins" @@ -35674,12 +35599,6 @@ msgid_plural "motorbike alternators" msgstr[0] "Motorradlichtmaschine" msgstr[1] "Motorradlichtmaschinen" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "motorbike battery" -msgid_plural "motorbike batteries" -msgstr[0] "Motorrad-Batterie" -msgstr[1] "Motorrad-Batterien" - #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "muffler" msgid_plural "mufflers" @@ -36341,12 +36260,6 @@ msgid_plural "small electric motors" msgstr[0] "kleiner Elektromotor" msgstr[1] "kleine Elektromotoren" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "small storage battery" -msgid_plural "small storage batteries" -msgstr[0] "kleiner Akkumulator" -msgstr[1] "kleine Akkumulatoren" - #: lang/json/GENERIC_from_json.py msgid "software" msgid_plural "softwares" @@ -36467,12 +36380,6 @@ msgid_plural "stone spears" msgstr[0] "" msgstr[1] "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "storage battery" -msgid_plural "storage batteries" -msgstr[0] "Speicherbatterie" -msgstr[1] "Speicherbatterien" - #: lang/json/GENERIC_from_json.py msgid "storage battery case" msgid_plural "storage battery cases" @@ -36629,12 +36536,6 @@ msgid_plural "truck alternators" msgstr[0] "Lkw-Lichtmaschine" msgstr[1] "Lkw-Lichtmaschinen" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "truck battery" -msgid_plural "truck batteries" -msgstr[0] "Lkw-Batterie" -msgstr[1] "Lkw-Batterien" - #: lang/json/GENERIC_from_json.py msgid "turret engine" msgid_plural "turret engines" @@ -38628,7 +38529,7 @@ msgstr "" #: lang/json/GUN_from_json.py msgid "" "A homemade triple-barrel 40mm grenade launcher. Capable of launching all " -"three grenades at once, it is extremely powerwul for a homemade weapon." +"three grenades at once, it is extremely powerful for a homemade weapon." msgstr "" #. ~ Description for blunderbuss @@ -43316,6 +43217,21 @@ msgid "" "L39B-45 pistols." msgstr "" +#. ~ Description for car battery +#: lang/json/MAGAZINE_from_json.py +msgid "A 12v lead-acid battery used to power car electrical systems." +msgstr "" +"Eine 12V-Blei-Säure-Batterie, die benutzt wird, um elektronische Systeme von " +"Autos zu versorgen." + +#. ~ Description for motorbike battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A 12v lead-acid battery used to power smaller vehicles' electrical systems." +msgstr "" +"Eine 12V-Blei-Säure-Batterie, die benutzt wird, um die elektronischen " +"Systeme kleinerer Fahrzeuge zu versorgen." + #. ~ Description for RMSB20 magazine #: lang/json/MAGAZINE_from_json.py msgid "A 20 round box magazine for use with the RM20 caseless shotgun." @@ -43553,6 +43469,13 @@ msgstr "" msgid "A high-capacity drum magazine for the PPSh-41." msgstr "" +#. ~ Description for truck battery +#: lang/json/MAGAZINE_from_json.py +msgid "A large 12v lead-acid battery used to power truck electrical systems." +msgstr "" +"Eine große 12V-Blei-Säure-Battere, die für die Versorgung der elektischen " +"Systeme in Lastkraftwägen verwendet wird." + #. ~ Description for welding tank #: lang/json/MAGAZINE_from_json.py msgid "" @@ -43560,6 +43483,13 @@ msgid "" "is marked with several faded and now unreadable symbols." msgstr "" +#. ~ Description for storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A large storage battery. Could be installed into a storage battery case for " +"easy removal from a vehicle, or just welded straight in." +msgstr "" + #. ~ Description for M1 Garand Clip #: lang/json/MAGAZINE_from_json.py msgid "" @@ -43572,6 +43502,11 @@ msgstr "" msgid "A lightweight aluminum box magazine for the H&K G3 rifle." msgstr "" +#. ~ Description for medium storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A medium storage battery." +msgstr "Eine mittelgroße Speicherbatterie." + #. ~ Description for M9 magazine #: lang/json/MAGAZINE_from_json.py msgid "" @@ -43613,6 +43548,11 @@ msgid "" "A removable plastic magazine for the Saiga-12 shotgun. Holds 30 rounds." msgstr "" +#. ~ Description for small storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A small storage battery. Useful for crafting." +msgstr "Ein kleiner Akkumulator. Nützlich für die Fertigung." + #. ~ Description for Battle rifle magazine #: lang/json/MAGAZINE_from_json.py msgid "A standard 20-round magazine for military issue battle rifles." @@ -44261,14 +44201,50 @@ msgstr "UZI-Magazin" msgid "Walther PPK magazine" msgstr "Walther-PPK-Magazin" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "car battery" +msgid_plural "car batteries" +msgstr[0] "Autobatterie" +msgstr[1] "Autobatterien" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "medium storage battery" +msgid_plural "medium storage batteries" +msgstr[0] "mittelgroße Speicherbatterie" +msgstr[1] "mittelgroße Speicherbatterien" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "motorbike battery" +msgid_plural "motorbike batteries" +msgstr[0] "Motorrad-Batterie" +msgstr[1] "Motorrad-Batterien" + #: lang/json/MAGAZINE_from_json.py msgid "nail rifle magazine" msgstr "" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "small storage battery" +msgid_plural "small storage batteries" +msgstr[0] "kleiner Akkumulator" +msgstr[1] "kleine Akkumulatoren" + #: lang/json/MAGAZINE_from_json.py msgid "small welding tank" msgstr "" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "storage battery" +msgid_plural "storage batteries" +msgstr[0] "Speicherbatterie" +msgstr[1] "Speicherbatterien" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "truck battery" +msgid_plural "truck batteries" +msgstr[0] "Lkw-Batterie" +msgstr[1] "Lkw-Batterien" + #: lang/json/MAGAZINE_from_json.py msgid "welding tank" msgstr "" @@ -46946,11 +46922,9 @@ msgstr "" #. ~ Description for giant mosquito #: lang/json/MONSTER_from_json.py msgid "" -"An enormous mutant mosquito, fluttering erratically, its face dominated by a " -"long, spear-tipped proboscis." +"An enormous mutant mosquito, fluttering erratically. Its face is dominated " +"by a long, spear-tipped proboscis." msgstr "" -"Eine riesiger Mutantenmoskito, der unberechenbar umherflattert; sein Gesicht " -"wird von einem langen speerspitzigen Rüssel dominiert." #. ~ Description for giant ant #: lang/json/MONSTER_from_json.py @@ -52419,11 +52393,6 @@ msgstr "»Zisch.«" msgid "Hsssss." msgstr "" -#. ~ Description for fake UPS -#: lang/json/TOOL_from_json.py -msgid "If you can see this, it is a bug." -msgstr "" - #: lang/json/TOOL_from_json.py msgid "Kevlar plate" msgid_plural "Kevlar plates" @@ -55406,6 +55375,11 @@ msgid "" "shouldn't spawn in normal game." msgstr "" +#. ~ Description for snowman +#: lang/json/TOOL_from_json.py +msgid "This is a test item for testing unicode support." +msgstr "" + #. ~ Description for candle (lit) #: lang/json/TOOL_from_json.py msgid "" @@ -57736,12 +57710,6 @@ msgid_plural "extra battery mods" msgstr[0] "Zusatzbatterie-Modifikation" msgstr[1] "Zusatzbatterie-Modifikationen" -#: lang/json/TOOL_from_json.py -msgid "fake UPS" -msgid_plural "fake UPS" -msgstr[0] "" -msgstr[1] "" - #: lang/json/TOOL_from_json.py msgid "fake item" msgid_plural "fake items" @@ -59156,6 +59124,12 @@ msgid_plural "snare triggers" msgstr[0] "Fallenauslöser" msgstr[1] "Fallenauslöser" +#: lang/json/TOOL_from_json.py +msgid "snowman" +msgid_plural "snowmans" +msgstr[0] "" +msgstr[1] "" + #: lang/json/TOOL_from_json.py msgid "soda can stove kit" msgid_plural "soda can stove kits" @@ -60479,6 +60453,15 @@ msgid "" "electronics and robots." msgstr "" +#. ~ Description for Telescopic Eyes +#: lang/json/bionic_from_json.py +msgid "" +"Much of the material in your inner eye has been removed and replaced with an " +"array of high-powered, auto-focusing lenses. You can now see much farther " +"and more clearly than before, any vision problems you might have had are now " +"gone." +msgstr "" + #: lang/json/bionic_from_json.py msgid "Muscle Augmentation" msgstr "Muskelaugmentation" @@ -64277,7 +64260,8 @@ msgstr "»Krach!«" msgid "crate" msgstr "Kiste" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp msgid "crunch!" msgstr "»Knirsch!«" @@ -64373,8 +64357,8 @@ msgstr "" msgid "glass breaking" msgstr "Glas zerbrechen." -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp -#: src/map.cpp src/ranged.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp src/map.cpp src/ranged.cpp msgid "glass breaking!" msgstr "Glas scheppern." @@ -64382,6 +64366,10 @@ msgstr "Glas scheppern." msgid "glass door fridge" msgstr "Glastür-Kühlschrank" +#: lang/json/furniture_from_json.py +msgid "gravestone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "groundsheet" msgstr "Unterlegplane" @@ -64398,6 +64386,10 @@ msgstr "erntbare Pflanze" msgid "hay" msgstr "Heu" +#: lang/json/furniture_from_json.py +msgid "headstone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "heavy punching bag" msgstr "schwerer Sandsack" @@ -64474,6 +64466,10 @@ msgstr "mutierter Kaktus" msgid "mutated poppy flower" msgstr "mutierte Mohnblube" +#: lang/json/furniture_from_json.py +msgid "obelisk" +msgstr "" + #: lang/json/furniture_from_json.py msgid "open animalskin flap" msgstr "offene Tierhaut-Klappe" @@ -64574,10 +64570,6 @@ msgstr "Sandsackwand" msgid "screeching metal!" msgstr "Metall knirschen!" -#: lang/json/furniture_from_json.py -msgid "seed" -msgstr "Samen" - #: lang/json/furniture_from_json.py msgid "seedling" msgstr "Setzling" @@ -64659,6 +64651,10 @@ msgstr "»Bums!«" msgid "thump." msgstr "»Bums.«." +#: lang/json/furniture_from_json.py +msgid "thunk!" +msgstr "" + #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py msgid "thunk." msgstr "»Donk.«." @@ -64735,6 +64731,10 @@ msgstr "Holzherd" msgid "wooden keg" msgstr "Holzfässchen" +#: lang/json/furniture_from_json.py +msgid "worn gravestone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "yellow indoor plant" msgstr "gelbe Zimmerpflanze" @@ -65174,10 +65174,10 @@ msgstr "" #: lang/json/hint_from_json.py msgid "" "If you get a pair of night vision goggles, hold on to them! A flashlight " -"will give you away, but with goggles you can be sneaky." +"will give you away, but with goggles you can be sneaky. Beware that some " +"types of zombies are camouflaged against it, and require proper light to be " +"visible." msgstr "" -"Wenn du eine Nachtsichtbrille kriegst, behalt sie! Eine Taschenlampe würde " -"dich verraten, aber mit einer Nachtsichtbrille kannst du unbemerkt bleiben." #: lang/json/hint_from_json.py msgid "" @@ -68034,6 +68034,13 @@ msgstr "" msgid "Niten Ichi-Ryu" msgstr "Niten Ichiryū" +#. ~ Description for martial art 'Niten Ichi-Ryu' +#: lang/json/martial_art_from_json.py +msgid "" +"Niten Ichi-Ryu is an ancient school of combat, transmitting a style of " +"classical Japanese swordsmanship conceived by the warrior Miyamoto Musashi." +msgstr "" + #. ~ Description for martial art 'Niten Ichi-Ryu' #: lang/json/martial_art_from_json.py msgid "" @@ -75326,6 +75333,10 @@ msgstr "Flüchtlingslager" msgid "regional school" msgstr "regionale Schule" +#: lang/json/overmap_terrain_from_json.py +msgid "religious cemetery" +msgstr "" + #: lang/json/overmap_terrain_from_json.py msgid "restaurant" msgstr "Restaurant" @@ -78079,26 +78090,18 @@ msgstr "Lehrer" msgctxt "prof_desc_female" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"Dank deiner Zeit im Labor bist du vertraut mit den Grundlagen der " -"Durchführung wissenschaftlicher Arbeit. Du bist gemeinsam mit den " -"glücklichen Zivilisten geflohen, aber du behieltest wenigstens deine " -"Laborausrüstung." #. ~ Profession (male Lab Technician) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"Dank deiner Zeit im Labor bist du vertraut mit den Grundlagen der " -"Durchführung wissenschaftlicher Arbeit. Du bist gemeinsam mit den " -"glücklichen Zivilisten geflohen, aber du behieltest wenigstens deine " -"Laborausrüstung." #. ~ Profession (Punk Rock Girl) description #: lang/json/professions_from_json.py @@ -89104,6 +89107,10 @@ msgstr "zerstörte Dieselzapfsäule" msgid "smashed gas pump" msgstr "zerstörte Benzinzapfsäule" +#: lang/json/terrain_from_json.py +msgid "smoothed rock" +msgstr "" + #: lang/json/terrain_from_json.py lang/json/trap_from_json.py msgid "spiked pit" msgstr "Speergrube" @@ -91181,8 +91188,8 @@ msgstr "Zurück" #: src/action.cpp src/activity_handlers.cpp src/color.cpp src/crafting.cpp #: src/editmap.cpp src/game.cpp src/iexamine.cpp src/inventory_ui.cpp #: src/item_action.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/mission_companion.cpp src/pickup.cpp src/player.cpp src/veh_interact.cpp -#: src/vehicle.cpp +#: src/mission_companion.cpp src/pickup.cpp src/player.cpp +#: src/veh_interact.cpp src/vehicle.cpp msgid "Cancel" msgstr "Abbrechen" @@ -93187,7 +93194,8 @@ msgstr "Bitte lade zuerst eine Person, bevor du diese Seite benutzt!" msgid "Rules" msgstr "Regeln" -#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp src/options.cpp +#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp +#: src/options.cpp msgid "Save changes?" msgstr "Änderungen speichern?" @@ -93740,23 +93748,23 @@ msgstr "" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / %d turns" -msgstr "%d EE / %d Züge" +msgid "%d PU act" +msgstr "%d EE Aktion" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / turn" -msgstr "%d EE / Zug" +msgid "%d PU deact" +msgstr "%d EE Aktion Ende" #: src/bionics_ui.cpp #, c-format -msgid "%d PU act" -msgstr "%d EE Aktion" +msgid "%d PU/%d turns" +msgstr "" #: src/bionics_ui.cpp #, c-format -msgid "%d PU deact" -msgstr "%d EE Aktion Ende" +msgid "%d PU/turn" +msgstr "" #: src/bionics_ui.cpp src/mutation_ui.cpp #, c-format @@ -100300,6 +100308,14 @@ msgstr "" msgid "It takes some time to move the heavy %s." msgstr "Es kostet etwas Zeit, das schwere %s zu bewegen!" +#: src/game.cpp +msgid "It takes you a long time to steer that vehicle!" +msgstr "" + +#: src/game.cpp +msgid "It takes you a very long time to steer that vehicle!" +msgstr "" + #: src/game.cpp msgid "It's too dangerous to tunnel that far!" msgstr "Es ist zu gefährlich, so weit zu tunneln!" @@ -100659,6 +100675,10 @@ msgstr "" msgid "Pour %s where?" msgstr "Wohin %s verschütten?" +#: src/game.cpp +msgid "Pour into a container" +msgstr "" + #: src/game.cpp #, c-format msgid "Pour into an adjacent keg (%s)" @@ -102105,6 +102125,11 @@ msgstr "Du spürst deinen Körper verwesen." msgid "You feel your genetic makeup degrading." msgstr "Du fühlst wie dein Erbgut schwächer wird." +#: src/game.cpp +#, c-format +msgid "You fumble with the %s's controls." +msgstr "Du fummelst mit der Steuerung von %s herum." + #: src/game.cpp msgid "You get a hold of yourself." msgstr "" @@ -107359,6 +107384,11 @@ msgstr "Du könntest es benutzen, um diverse andere Dinge zu fertigen." msgid "You could use it to craft: %s" msgstr "Du könntest es zum Fertigen davon verwenden: %s" +#: src/item.cpp +#, c-format +msgid "You fall asleep and drop your %s." +msgstr "" + #: src/item.cpp #, c-format msgid "You finish your %s." @@ -108947,10 +108977,6 @@ msgstr "Dieses %s ist zu nass, um noch mehr Flüssigkeit aufzusaugen!" msgid "That isn't a firearm!" msgstr "Das ist keine Feuerwaffe!" -#: src/iuse.cpp -msgid "That item already has a rechargeable battery pack." -msgstr "Dieser Gegenstand hat bereits einen Akku." - #: src/iuse.cpp msgid "That item has already had its battery capacity doubled." msgstr "Bei diesem Gegenstand wurde die Batterienkapazität bereits verdoppelt." @@ -110514,13 +110540,6 @@ msgstr "Du reparierst deinen %s vollständig!" msgid "You repair your %s!" msgstr "Du reparierst deinen %s!" -#: src/iuse.cpp -#, c-format -msgid "" -"You replace the battery compartment of your %s with a rechargeable battery " -"pack!" -msgstr "Du ersetzt das Batteriefach deines %s mit einem Akkusatz!" - #: src/iuse.cpp #, c-format msgid "You replace your current %s." @@ -113425,11 +113444,6 @@ msgstr "Du versagst beim Entschärfen der Falle und löst sie aus!" msgid "You fail to disarm the trap." msgstr "Dir misslingt das Entschärfen der Falle." -#: src/map.cpp -#, c-format -msgid "You fumble with the %s's controls." -msgstr "Du fummelst mit der Steuerung von %s herum." - #: src/map.cpp #, c-format msgid "You lose control of the %s." @@ -121701,10 +121715,6 @@ msgstr "Beweg keinen Muskel!" msgid "Drop items" msgstr "Gegenstände fallen lassen" -#: src/npcmove.cpp -msgid "Fire a burst" -msgstr "Feuerstoß abgeben" - #: src/npcmove.cpp msgid "Flee" msgstr "Fliehen" @@ -127166,10 +127176,6 @@ msgstr "Glühende Lichter umhüllen dich, bevor du wegteleportiert wirst." msgid "Good mood +%s%d%%" msgstr "Gute Laune +%s%d%%" -#: src/player.cpp -msgid "Gun:" -msgstr "" - #: src/player.cpp msgid "He" msgstr "Er" @@ -129457,10 +129463,6 @@ msgstr "Geweih" msgid "armor" msgstr "Rüstung" -#: src/player.cpp -msgid "auto" -msgstr "" - #: src/player.cpp msgid "beep-beep-beep!" msgstr "»Piep, piep, piep!«" @@ -129473,10 +129475,6 @@ msgstr "Haar" msgid "horns" msgstr "Hörner" -#: src/player.cpp -msgid "off " -msgstr "" - #: src/player.cpp msgid "quills" msgstr "Stacheln" @@ -131325,11 +131323,6 @@ msgstr "" msgid "%d\"" msgstr "" -#: src/vehicle.cpp -#, c-format -msgid "%s failed to fire! It isn't loaded and/or powered." -msgstr "%s versagt beim Schießen! Es ist nicht geladen und/oder bestromt." - #: src/vehicle.cpp #, c-format msgid "%s points in your direction and emits an IFF warning beep." @@ -131368,10 +131361,6 @@ msgstr "" "Als sich die gnadenlosen Metallstangen in deinen Genitalbereich schlossen, " "überdenkst du es nochmal, das %s während der Fahrt zusammenzuklappen." -#: src/vehicle.cpp -msgid "Auto" -msgstr "Auto" - #. ~ backfire sound #: src/vehicle.cpp msgid "BANG!" @@ -131434,10 +131423,6 @@ msgstr "" msgid "Close" msgstr "Schließen" -#: src/vehicle.cpp -msgid "Configure individual turrets" -msgstr "Geschütztürme einzeln konfigurieren" - #: src/vehicle.cpp msgid "Control individual engines" msgstr "Motoren einzeln steuern" @@ -131454,32 +131439,10 @@ msgstr "Fahrtregler eingeschaltet" msgid "Cugugugugug" msgstr "" -#: src/vehicle.cpp -msgid "Cycle turret mode" -msgstr "Geschützturmmodus wechseln" - -#: src/vehicle.cpp -msgid "Deactivating automatic target acquisition for this turret" -msgstr "" - #: src/vehicle.cpp msgid "Disable cruise control" msgstr "Fahrtregler deaktivieren" -#: src/vehicle.cpp -msgid "Disable turrets" -msgstr "Geschütztürme ausschalten" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling automatic target acquisition on %s" -msgstr "" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling turret %s." -msgstr "" - #: src/vehicle.cpp msgid "Do nothing" msgstr "Nichts tun" @@ -131496,10 +131459,6 @@ msgstr "Deckenlampen eingeschaltet" msgid "Enable cruise control" msgstr "Fahrtregler aktivieren" -#: src/vehicle.cpp -msgid "Enable turrets" -msgstr "Geschütztürme einschalten" - #. ~ indicates that a vehicle part is outside #: src/vehicle.cpp msgid "Exterior" @@ -131586,10 +131545,6 @@ msgstr "" msgid "No controls there." msgstr "Da ist keine Fahrzeugsteuerung." -#: src/vehicle.cpp -msgid "No target" -msgstr "Kein Ziel" - #: src/vehicle.cpp msgid "Open" msgstr "Öffnen" @@ -131655,18 +131610,15 @@ msgid "Select door to toggle" msgstr "Tür zum umschalten wählen" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to buggy mode." +msgid "Set turret firing modes" msgstr "" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to burst mode." +msgid "Set turret targeting" msgstr "" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to single-fire mode." +msgid "Set turret targeting modes" msgstr "" #: src/vehicle.cpp @@ -131714,6 +131666,11 @@ msgstr "" msgid "The %s doesn't have enough wheels to move!" msgstr "%s hat nicht genügend Räder, um sich zu bewegen!" +#: src/vehicle.cpp +#, c-format +msgid "The %s is stuck." +msgstr "" + #: src/vehicle.cpp #, c-format msgid "The %s is too leaky!" @@ -131849,14 +131806,6 @@ msgstr "Die Stereoanlage geht nicht an!" msgid "The vehicle part you were working on has gone!" msgstr "Das Fahrzeugteil, an dem du arbeitetest, ist verschwunden!" -#: src/vehicle.cpp -msgid "This turret can't be aimed manually" -msgstr "" - -#: src/vehicle.cpp -msgid "This turret doesn't have enough ammo" -msgstr "" - #: src/vehicle.cpp msgid "This turret is not powered" msgstr "" @@ -132023,30 +131972,6 @@ msgstr "" msgid "Turned on music" msgstr "Musik ausschalten" -#: src/vehicle.cpp -msgid "Turret system is on, but all turrets are configured not to shoot." -msgstr "" -"Das Geschützturmsystem ist eingeschaltet, aber alle Turrets sind so " -"eingestellt, um nicht zu schießen." - -#: src/vehicle.cpp -msgid "Turrets have been configured, but the vehicle turret system is off." -msgstr "" -"Geschütztürme sind konfiguriert worden, aber das Fahrzeuggeschützturmsystem " -"ist ausgeschaltet." - -#: src/vehicle.cpp -msgid "Turrets: Disabled" -msgstr "Geschütztürme: abgeschaltet" - -#: src/vehicle.cpp -msgid "Turrets: Enabled" -msgstr "Geschütztürme: eingeschaltet" - -#: src/vehicle.cpp -msgid "Unseen" -msgstr "Unsichtbar" - #: src/vehicle.cpp msgid "Vehicle controls" msgstr "Fahrzeugsteuerung" @@ -132178,6 +132103,10 @@ msgstr "Dein Motor lässt ein lautes Schleifgeräusch los." msgid "a simple melody blaring from the loudspeakers." msgstr "" +#: src/vehicle.cpp +msgid "auto" +msgstr "" + #. ~ Beeper sound #: src/vehicle.cpp msgid "beep!" @@ -132192,6 +132121,10 @@ msgstr "gefaltenes %s" msgid "hummm!" msgstr "" +#: src/vehicle.cpp +msgid "manual" +msgstr "" + #: src/vehicle.cpp msgid "roarrr!" msgstr "" From c54bfd047560ba7c9a5d08d40043b8c3d34df9b5 Mon Sep 17 00:00:00 2001 From: Vlasov Vitaly Date: Thu, 9 Jun 2016 21:00:06 +0300 Subject: [PATCH 094/110] Argentinian update --- lang/po/es_AR.po | 788 ++++++++++++++++++++++++++--------------------- 1 file changed, 440 insertions(+), 348 deletions(-) diff --git a/lang/po/es_AR.po b/lang/po/es_AR.po index 990969d3b721b..a55836d99e3c7 100644 --- a/lang/po/es_AR.po +++ b/lang/po/es_AR.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Cataclysm-DDA\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-30 09:53+0300\n" -"PO-Revision-Date: 2016-06-01 02:27+0000\n" +"POT-Creation-Date: 2016-06-06 10:20+0300\n" +"PO-Revision-Date: 2016-06-09 01:01+0000\n" "Last-Translator: Noctivagante \n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/cataclysm-dda-" "translators/cataclysm-dda/language/es_AR/)\n" @@ -1578,6 +1578,15 @@ msgid "A box of small steel balls. They deal virtually no damage." msgstr "" "Una caja de pequeños balines de acero. Prácticamente, no causan ningún daño." +#. ~ Description for .44 FMJ +#: lang/json/AMMO_from_json.py +msgid "" +"A brass-jacketed variant of the .44 Magnum round. This increases " +"penetration slightly at the cost of reduced damage from expansion." +msgstr "" +"Una variante recubierta de latón de la bala .44 Magnum. Tiene mejor " +"penetración pero su daño está reducido debido a la expansión." + #. ~ Description for blue paint #: lang/json/AMMO_from_json.py msgid "A can of blue paint." @@ -2434,11 +2443,10 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A simple arrow shaft that has had a point carved into it and then fire-" -"hardened. Needs fletching to be worth firing from a bow." +"hardened. It needs fletching to be worth firing from a bow." msgstr "" -"Es una simple flecha de madera con la punta tallada en un extremo y " -"endurecida al fuego. Necesita emplumado para que tenga sentido dispararla " -"con un arco." +"Una simple flecha de madera con una punta tallada en un extremo y endurecida " +"al fuego. Necesita emplumado para que tenga sentido dispararla con un arco." #. ~ Description for ammo belt linkage #: lang/json/AMMO_from_json.py @@ -3113,17 +3121,6 @@ msgstr "" "explosivos grandes. Causa quemaduras severas a la materia orgánica y puede " "prenderla fuego al contacto." -#. ~ Description for .22 CB -#: lang/json/AMMO_from_json.py -msgid "" -"Conical Ball .22 is a variety of .22 ammunition with a very small propellant " -"charge and generally lacks gunpowder. The end result is a subsonic round " -"that is so weak as to be nearly useless given your predicament." -msgstr "" -"La .22 de punta cónica es una variante de este calibre con poca carga " -"propulsora y sin pólvora. El resultado es una bala subsónica tan débil que " -"es prácticamente inservible para tu situación." - #. ~ Description for handloaded .22 CB #: lang/json/AMMO_from_json.py msgid "" @@ -3748,13 +3745,15 @@ msgstr[1] "RDX" #. ~ Description for .22 rat-shot #: lang/json/AMMO_from_json.py msgid "" -"Rat-shot is extremely weak ammunition, designed for killing rats, snakes, or " -"other small vermin while being unable to damage walls. It has an extremely " -"short range and is unable to injure all but the smallest creatures." +"Rat-shot is an extremely weak .22 shotgun cartridge, designed for killing " +"rats, snakes, or other small vermin while being unable to damage walls. It " +"has an extremely short range and is unable to injure all but the smallest " +"creatures." msgstr "" -"La rat-shot es una munición muy débil, diseñada para matar ratas, serpientes " -"y otras pequeñas alimañas, ya que no daña las paredes. Tiene muy poco " -"alcance y solo es capaz de lastimar a las criaturas más pequeñas." +"La rat-shot es un cartucho .22 de escopeta muy débil, diseñada para matar " +"ratas, serpientes y otras pequeñas alimañas, ya que no daña las paredes. " +"Tiene muy poco alcance y solo es capaz de lastimar a las criaturas más " +"pequeñas." #. ~ Description for handloaded .22 rat-shot #: lang/json/AMMO_from_json.py @@ -3898,6 +3897,17 @@ msgstr "" "para preparar varios químicas, su uso más conocido es para hacer ácido de " "batería, debido a su amplio uso comercial." +#. ~ Description for .22 CB +#: lang/json/AMMO_from_json.py +msgid "" +"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." +msgstr "" +"La .22 de punta cónica es una variante de este calibre impulsa la bala " +"usando un iniciador en lugar de pólvora. El resultado es una bala subsónica " +"tan débil que es prácticamente inservible para tu situación." + #. ~ Description for reloaded .300 Winchester Magnum #: lang/json/AMMO_from_json.py msgid "" @@ -4142,7 +4152,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "This metal shaft has been carefully sharpened so that it has a crude point " -"at the end. Needs fletching to be worth firing from a bow." +"at the end. It needs fletching to be worth firing from a bow." msgstr "" "Esta asta de metal ha sido afilada cuidadosamente para terminar en punta en " "un extremo. Necesita emplumado para que valga la pena dispararla." @@ -5506,10 +5516,10 @@ msgstr[0] "7.62x39mm M43 recargada" msgstr[1] "7.62x39mm M43 recargadas" #: lang/json/AMMO_from_json.py -msgid "reloaded 7.62x39mm M87" -msgid_plural "reloaded 7.62x39mm M87" -msgstr[0] "7.62x39mm M87 recargada" -msgstr[1] "7.62x39mm M87 recargadas" +msgid "reloaded 7.62x39mm M67" +msgid_plural "reloaded 7.62x39mm M67" +msgstr[0] "7.62x39mm M67 recargada" +msgstr[1] "7.62x39mm M67 recargadas" #: lang/json/AMMO_from_json.py msgid "reloaded 7.62x51mm" @@ -7404,14 +7414,13 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "" "A large leather quiver trimmed with metal, worn on the back, that can hold " -"60 arrows.\n" -"Historically used by horse archers, rather than foot archers, but neither of " -"THEM had to fight zombies. Activate to store arrows." +"60 arrows. Historically used by horse archers, rather than foot archers, " +"but neither of THEM had to fight zombies. Activate to store arrows." msgstr "" -"Es una aljaba grande de cuero adornada con metal, se usa en la espalda y " -"puede almacenar hasta 60 flechas. Históricamente fue utilizada por los " -"arqueros a caballo, más que por los que iban a pie, pero ninguno de ELLOS " -"tuvo que pelearse contra zombis. Hay que activarlo para guardar flechas." +"Una aljaba grande de cuero adornada con metal, se usa en la espalda y puede " +"almacenar hasta 60 flechas. Históricamente fue utilizada por los arqueros a " +"caballo, más que por los que iban a pie, pero ninguno de ELLOS tuvo que " +"pelearse contra zombis. Hay que activarlo para guardar flechas." #. ~ Description for pair of ski goggles #: lang/json/ARMOR_from_json.py @@ -15301,9 +15310,8 @@ msgstr "" "de campos de PEM. Podés usar energía para disparar un rayo de corto alcance " "que desactivará lo electrónico y los robots." -#. ~ Description for Telescopic Eyes #. ~ Description for Telescopic Eyes CBM -#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py +#: lang/json/BIONIC_ITEM_from_json.py msgid "" "Much of the material in your inner eye has been removed and replaced with an " "array of high-powered, auto-focusing lenses. You can now see much farther " @@ -23048,7 +23056,6 @@ msgstr "" "Hecho con verdaderos arándanos de Massachusetts. Delicioso y nutritivo." #. ~ Description for whiskey -#. ~ Description for test_whiskey #: lang/json/COMESTIBLE_from_json.py msgid "Made from, by, and for real Southern colonels!" msgstr "¡Hecho de, por y para los verdaderos coroneles sureños!" @@ -28656,6 +28663,12 @@ msgid_plural "seasoned salt" msgstr[0] "sal condimentada" msgstr[1] "sal condimentada" +#: lang/json/COMESTIBLE_from_json.py lang/json/furniture_from_json.py +msgid "seed" +msgid_plural "seeds" +msgstr[0] "semilla" +msgstr[1] "semillas" + #: lang/json/COMESTIBLE_from_json.py msgid "seed potato" msgid_plural "seed potatoes" @@ -29032,12 +29045,6 @@ msgid_plural "tequilas" msgstr[0] "tequila" msgstr[1] "tequilas" -#: lang/json/COMESTIBLE_from_json.py -msgid "test_whiskey" -msgid_plural "test_whiskey" -msgstr[0] "test_whiskey" -msgstr[1] "test_whiskey" - #: lang/json/COMESTIBLE_from_json.py msgid "thyme" msgid_plural "thymes" @@ -29788,13 +29795,6 @@ msgstr "" "Es una bolsa hermética de cuero con una correa para colgarla. Tiene una " "capacidad de 3 litros de agua." -#. ~ Description for test glass bottle -#: lang/json/CONTAINER_from_json.py -msgid "An UNSEALABLE glass bottle, holds 750 ml of liquid." -msgstr "" -"Es una botella de vidrio que NO SE PUEDE SELLAR, y que puede contener hasta " -"750 ml." - #. ~ Description for aluminum can #: lang/json/CONTAINER_from_json.py msgid "An aluminum can, like what soda comes in." @@ -30083,12 +30083,6 @@ msgid_plural "steel jerrycans" msgstr[0] "bidón de acero" msgstr[1] "bidones de acero" -#: lang/json/CONTAINER_from_json.py -msgid "test glass bottle" -msgid_plural "test glass bottles" -msgstr[0] "botella de vidrio de prueba" -msgstr[1] "botellas de vidrio de prueba" - #: lang/json/CONTAINER_from_json.py msgid "tin can" msgid_plural "tin cans" @@ -30345,21 +30339,6 @@ msgstr "" "pudrirse luego de haberlo sacado de la bolsa sellada. Hay que desarmarlo " "para agarrar el contenido." -#. ~ Description for car battery -#: lang/json/GENERIC_from_json.py -msgid "A 12v lead-acid battery used to power car electrical systems." -msgstr "" -"Una batería de plomo y ácido usada para darle energía a los sistemas " -"eléctricos de los autos." - -#. ~ Description for motorbike battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A 12v lead-acid battery used to power smaller vehicles' electrical systems." -msgstr "" -"Una batería de plomo y ácido de 12v, usada para darle energía a los sistemas " -"eléctricos de vehículos pequeños." - #. ~ Description for long rope #: lang/json/GENERIC_from_json.py msgid "" @@ -31424,13 +31403,6 @@ msgstr "" "Una fosa de carbonización llena de madera que ha sido encendida. ¡Mejor que " "la dejes!" -#. ~ Description for truck battery -#: lang/json/GENERIC_from_json.py -msgid "A large 12v lead-acid battery used to power truck electrical systems." -msgstr "" -"Una gran batería de plomo y ácido usada para darle energía a los sistemas " -"eléctricos de los camiones." - #. ~ Description for truck alternator #: lang/json/GENERIC_from_json.py msgid "A large alternator used to power truck electrical systems." @@ -31575,16 +31547,6 @@ msgstr "" msgid "A large stone, roughly hollowed out into a pot." msgstr "Una piedra grande ahuecada para usarla como olla." -#. ~ Description for storage battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A large storage battery. Could be installed into a storage battery case for " -"easy removal from a vehicle, or just welded straight in." -msgstr "" -"Una batería grande de almacenamiento. Puede ser instalada en una caja para " -"baterías de almacenamiento para que sea más fácil desmontarla del vehículo, " -"o si no puede ser soldada." - #. ~ Description for folding wire basket #: lang/json/GENERIC_from_json.py msgid "A large wire basket from a shopping cart, modified to be foldable." @@ -31766,11 +31728,6 @@ msgstr "" "con púas en la punta. Causa un daño aplastante devastador, con una pequeña " "cantidad de daño penetrante." -#. ~ Description for medium storage battery -#: lang/json/GENERIC_from_json.py -msgid "A medium storage battery." -msgstr "Una batería de mediano almacenamiento." - #. ~ Description for SD-Memory card #: lang/json/GENERIC_from_json.py msgid "A memory card, used. Might be worth a look." @@ -32573,11 +32530,6 @@ msgstr "" "Es una viga telescópica chica. Si se la agrega a un armazón, puede ser usada " "para levantar hasta 1,5 toneladas métricas." -#. ~ Description for small storage battery -#: lang/json/GENERIC_from_json.py -msgid "A small storage battery. Useful for crafting." -msgstr "Una batería de poco almacenamiento. Útil para armar un vehículo." - #. ~ Description for damaged tent #: lang/json/GENERIC_from_json.py msgid "" @@ -35574,12 +35526,6 @@ msgid_plural "car alternators" msgstr[0] "alternador de auto" msgstr[1] "alternadores de auto" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "car battery" -msgid_plural "car batteries" -msgstr[0] "batería de auto" -msgstr[1] "baterías de auto" - #: lang/json/GENERIC_from_json.py msgid "carding paddles" msgid_plural "pairs of carding paddles" @@ -36448,12 +36394,6 @@ msgid_plural "mechanical pumps" msgstr[0] "bomba mecánica" msgstr[1] "bombas mecánicas" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "medium storage battery" -msgid_plural "medium storage batteries" -msgstr[0] "batería mediana" -msgstr[1] "baterías medianas" - #: lang/json/GENERIC_from_json.py msgid "mess tin" msgid_plural "mess tins" @@ -36526,12 +36466,6 @@ msgid_plural "motorbike alternators" msgstr[0] "alternador de moto" msgstr[1] "alternadores de moto" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "motorbike battery" -msgid_plural "motorbike batteries" -msgstr[0] "batería de moto" -msgstr[1] "baterías de moto" - #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "muffler" msgid_plural "mufflers" @@ -37193,12 +37127,6 @@ msgid_plural "small electric motors" msgstr[0] "motor eléctrico chico" msgstr[1] "motores eléctricos chicos" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "small storage battery" -msgid_plural "small storage batteries" -msgstr[0] "batería chica" -msgstr[1] "baterías chicas" - #: lang/json/GENERIC_from_json.py msgid "software" msgid_plural "softwares" @@ -37319,12 +37247,6 @@ msgid_plural "stone spears" msgstr[0] "lanza de piedra" msgstr[1] "lanzas de piedra" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "storage battery" -msgid_plural "storage batteries" -msgstr[0] "batería de almacenamiento" -msgstr[1] "baterías de almacenamiento" - #: lang/json/GENERIC_from_json.py msgid "storage battery case" msgid_plural "storage battery cases" @@ -37481,12 +37403,6 @@ msgid_plural "truck alternators" msgstr[0] "alternador de camión" msgstr[1] "alternadores de camión" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "truck battery" -msgid_plural "truck batteries" -msgstr[0] "batería de camión" -msgstr[1] "baterías de camión" - #: lang/json/GENERIC_from_json.py msgid "turret engine" msgid_plural "turret engines" @@ -39637,7 +39553,7 @@ msgstr "" #: lang/json/GUN_from_json.py msgid "" "A homemade triple-barrel 40mm grenade launcher. Capable of launching all " -"three grenades at once, it is extremely powerwul for a homemade weapon." +"three grenades at once, it is extremely powerful for a homemade weapon." msgstr "" "Es un lanzador de granadas de 40mm con triple caño, hecho en casa. Es capaz " "de lanzar tres granadas a la vez, y es extremadamente poderosa para ser un " @@ -44761,6 +44677,21 @@ msgstr "" "Es un cargador de polímero de 12 balas para usar en las pistolas L39-45 y " "L39B-45 de Leadworks LLC." +#. ~ Description for car battery +#: lang/json/MAGAZINE_from_json.py +msgid "A 12v lead-acid battery used to power car electrical systems." +msgstr "" +"Una batería de plomo y ácido usada para darle energía a los sistemas " +"eléctricos de los autos." + +#. ~ Description for motorbike battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A 12v lead-acid battery used to power smaller vehicles' electrical systems." +msgstr "" +"Una batería de plomo y ácido de 12v, usada para darle energía a los sistemas " +"eléctricos de vehículos pequeños." + #. ~ Description for RMSB20 magazine #: lang/json/MAGAZINE_from_json.py msgid "A 20 round box magazine for use with the RM20 caseless shotgun." @@ -44836,7 +44767,7 @@ msgstr "" #. ~ Description for PPSh 35-round magazine #: lang/json/MAGAZINE_from_json.py msgid "A 35-round box magazine for the PPSh-41." -msgstr "" +msgstr "Es un cargador de caja de 35 balas para la PPSh-41." #. ~ Description for RMSB40 magazine #: lang/json/MAGAZINE_from_json.py @@ -45064,7 +44995,14 @@ msgstr "" #. ~ Description for PPSh 71-round drum #: lang/json/MAGAZINE_from_json.py msgid "A high-capacity drum magazine for the PPSh-41." +msgstr "Es un cargador de tambor de gran capacidad para la PPSh-41." + +#. ~ Description for truck battery +#: lang/json/MAGAZINE_from_json.py +msgid "A large 12v lead-acid battery used to power truck electrical systems." msgstr "" +"Una gran batería de plomo y ácido usada para darle energía a los sistemas " +"eléctricos de los camiones." #. ~ Description for welding tank #: lang/json/MAGAZINE_from_json.py @@ -45075,6 +45013,16 @@ msgstr "" "Es un cilindro grande de acero, diseñado para contener gases presurizados de " "soldadura. Está lleno de símbolos borrosos y actualmente ilegibles." +#. ~ Description for storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A large storage battery. Could be installed into a storage battery case for " +"easy removal from a vehicle, or just welded straight in." +msgstr "" +"Una batería grande de almacenamiento. Puede ser instalada en una caja para " +"baterías de almacenamiento para que sea más fácil desmontarla del vehículo, " +"o si no puede ser soldada." + #. ~ Description for M1 Garand Clip #: lang/json/MAGAZINE_from_json.py msgid "" @@ -45089,6 +45037,11 @@ msgstr "" msgid "A lightweight aluminum box magazine for the H&K G3 rifle." msgstr "Es un cargador de caja liviano de aluminio para el rifle H&K G3." +#. ~ Description for medium storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A medium storage battery." +msgstr "Una batería de mediano almacenamiento." + #. ~ Description for M9 magazine #: lang/json/MAGAZINE_from_json.py msgid "" @@ -45139,6 +45092,11 @@ msgstr "" "Es un cargador de plástico extraíble para la escopeta Saiga-12. Contiene 30 " "balas." +#. ~ Description for small storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A small storage battery. Useful for crafting." +msgstr "Una batería de poco almacenamiento. Útil para armar un vehículo." + #. ~ Description for Battle rifle magazine #: lang/json/MAGAZINE_from_json.py msgid "A standard 20-round magazine for military issue battle rifles." @@ -45451,6 +45409,9 @@ msgid "" "can, spring and some duct tape it is awkward to reload and not especially " "reliable." msgstr "" +"Es un cargador improvisado para usar en un rifle de clavos. Es poco más que " +"una lata, con un resorte y un poco de cinta... es incómodo para recargar y " +"no es muy confiable." #. ~ Description for Imported drum magazine #: lang/json/MAGAZINE_from_json.py @@ -45655,11 +45616,11 @@ msgstr "cargador improvisado STEN" #: lang/json/MAGAZINE_from_json.py msgid "PPSh 35-round magazine" -msgstr "" +msgstr "cargador PPSh de 35 balas" #: lang/json/MAGAZINE_from_json.py msgid "PPSh 71-round drum" -msgstr "" +msgstr "tambor PPSh de 71 balas" #: lang/json/MAGAZINE_from_json.py msgid "Pistol magazine" @@ -45843,14 +45804,50 @@ msgstr "cargador UZI" msgid "Walther PPK magazine" msgstr "cargador Walther PPK" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "car battery" +msgid_plural "car batteries" +msgstr[0] "batería de auto" +msgstr[1] "baterías de auto" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "medium storage battery" +msgid_plural "medium storage batteries" +msgstr[0] "batería mediana" +msgstr[1] "baterías medianas" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "motorbike battery" +msgid_plural "motorbike batteries" +msgstr[0] "batería de moto" +msgstr[1] "baterías de moto" + #: lang/json/MAGAZINE_from_json.py msgid "nail rifle magazine" -msgstr "" +msgstr "cargador de rifle de clavos" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "small storage battery" +msgid_plural "small storage batteries" +msgstr[0] "batería chica" +msgstr[1] "baterías chicas" #: lang/json/MAGAZINE_from_json.py msgid "small welding tank" msgstr "tanque pequeño de soldadura" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "storage battery" +msgid_plural "storage batteries" +msgstr[0] "batería de almacenamiento" +msgstr[1] "baterías de almacenamiento" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "truck battery" +msgid_plural "truck batteries" +msgstr[0] "batería de camión" +msgstr[1] "baterías de camión" + #: lang/json/MAGAZINE_from_json.py msgid "welding tank" msgstr "tanque de soldadura" @@ -45922,6 +45919,8 @@ msgid "" "Adds many new creatures and rebalances existing ones to make the game more " "challenging." msgstr "" +"Agrega muchas criaturas nuevas y rebalancea las existentes para hacer que el " +"juego sea más exigente." #. ~ Description for Craftable Gun Pack #: lang/json/MOD_INFO_from_json.py @@ -46019,7 +46018,7 @@ msgstr "Sin Textos Religiosos" #. ~ Description for Simplified nutrition #: lang/json/MOD_INFO_from_json.py msgid "Disables vitamin requirements." -msgstr "" +msgstr "Desactiva los requisitos de vitaminas." #. ~ Description for Prevent Zombie Revivication #: lang/json/MOD_INFO_from_json.py @@ -46164,11 +46163,11 @@ msgstr "Sin Trífidos" #: lang/json/MOD_INFO_from_json.py msgid "PKs Reimagining" -msgstr "" +msgstr "Reimaginación de PK" #: lang/json/MOD_INFO_from_json.py msgid "Perfect Reliability" -msgstr "" +msgstr "Fiabilidad Perfecta" #: lang/json/MOD_INFO_from_json.py msgid "Prevent Zombie Revivication" @@ -46273,7 +46272,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "Simplified nutrition" -msgstr "" +msgstr "Nutrición simplificada" #: lang/json/MOD_INFO_from_json.py msgid "Slow Zombies" @@ -46305,6 +46304,8 @@ msgid "" "Vehicle parts are perfectly reliable and never spawn with faults or develop " "them during use" msgstr "" +"Las partes de los vehículos son perfectamente fiables y nunca se generarán " +"en el mundo con fallas o se romperán durante el uso." #. ~ Description for Crazy Cataclysm #: lang/json/MOD_INFO_from_json.py @@ -46326,7 +46327,7 @@ msgstr "predeterminado" #: lang/json/MONSTER_from_json.py msgid " alpha razorclaw" -msgstr "" +msgstr "garrafilada alfa" #. ~ Description for bowfin #: lang/json/MONSTER_from_json.py @@ -46618,6 +46619,8 @@ msgid "" "A blood red, gigantic razorclaw. Its sword like pincers serve as the " "keepers of the nest." msgstr "" +"Es un garrafilada gigantesco, de un rojo sangriento. Sus tenazas son como " +"espadas y le sirven para custodiar el nido." #. ~ Description for mosquito #: lang/json/MONSTER_from_json.py @@ -46657,6 +46660,9 @@ msgid "" "reluctant, and most of its normally rapidly-growing vines now lie limp; " "rupturing to release spores." msgstr "" +"Es un grupo de lianas grises muy crecidas. Sus movimientos son generalmente " +"muy lentos y escasos, y la mayor parte de sus lianas que normalmente crecen " +"rápidamente ahora están tiradas quietas, rasgándose para dejar salir esporas." #. ~ Description for queen ant #: lang/json/MONSTER_from_json.py @@ -46773,6 +46779,8 @@ msgid "" "A deer riddled with budding fungi. Suicidally fast. So fast you hardly " "have time to recognize its affliction." msgstr "" +"Es un ciervo plagado de hongos incipientes. Crecen insensatamente rápido. " +"Tan rápido que te cuesta reconocer cuál es su desgracia." #. ~ Description for blood sacrifice #: lang/json/MONSTER_from_json.py @@ -46973,6 +46981,8 @@ msgid "" "A fungal Zombie with bionic implants, it uses its energy to harm others " "despite the harm it can cause its own flesh." msgstr "" +"Es un zombi fúngico con implantes biónicos. Utiliza su energía para lastimar " +"a los demás a pesar del daño que puede causarle a su propia carne." #. ~ Description for fungal sporeling #: lang/json/MONSTER_from_json.py @@ -47053,6 +47063,11 @@ msgid "" "lengthened significantly where fungal buds have formed. Even as this gentle " "beast ignores you the fungal tentacles seek new flesh to pollinate." msgstr "" +"Es un oso acuático gigante que está sufriendo una invasión fúngica. Su " +"cuerpo se ha ablandado como resultado de la infección, y sus tentáculos " +"sensitivos se alargaron significativamente en donde se han formado los " +"capullos fúngicos. Y aunque esta gentil bestia te ignora, los tentáculos " +"fúngicos buscan nueva carne para polinizar." #. ~ Description for brain blob #: lang/json/MONSTER_from_json.py @@ -47107,6 +47122,8 @@ msgid "" "A gigantic spider with a bulbous thorax. It digs an underground burrow that " "serves as a pit to trap unwary prey." msgstr "" +"Una araña gigante con un tórax protuberante. Cava nidos subterráneos que le " +"sirven de pozo para atrapar a las presas desprevenidas." #. ~ Description for carp #: lang/json/MONSTER_from_json.py @@ -47367,6 +47384,12 @@ msgid "" "forward; creating a jutting smile only made more terrifying by the beady red " "eyes, socketed above behind the maw, looking down at its prey." msgstr "" +"Es una gran criatura, sorprendentemente dura que antes pudo ser un perro o " +"un jabalí. Sus enormes fauces ocupan casi la mitad de su cuerpo. Varias " +"filas de dientes empujan a los dientes anteriores hacia adelante, creando " +"una sonrisa que sobresale, y su aspecto terrorífico lo completan unos ojos " +"rojos pequeños y brillantes, incrustados por encima y detrás de las fauces, " +"para menospreciar a su presa." #. ~ Description for largemouth bass #: lang/json/MONSTER_from_json.py @@ -47425,6 +47448,10 @@ msgid "" "most horrible of shrieks. Often spotted near shipwrecks or other dark damp " "places, which it uses as nesting grounds." msgstr "" +"Es un crustáceo del tamaño de un humano cubierto de una quitina que parece " +"de hierro, capaz de emitir el más horrible de los aullidos. Se lo puede " +"encontrar a menudo cerca de los naufragios y otros lugares húmedos y " +"oscuros, que utiliza para hacer sus nidos." #. ~ Description for hunting horror #: lang/json/MONSTER_from_json.py @@ -47468,6 +47495,10 @@ msgid "" "forehead has been removed, exposing a pulsating brain mass from which sound " "eminates." msgstr "" +"Es una cara enorme dividida en cuatro con maquinaria grande; varios tubos de " +"un líquido burbujeante se hunden y emergen de sus heridas palpitantes. Su " +"frente ha sido quitada, lo que expone una masa cerebral que late y desde la " +"que emana un sonido." #. ~ Description for Triceratops #: lang/json/MONSTER_from_json.py @@ -47487,6 +47518,12 @@ msgid "" "densely packed slivers at the top. Its actually almost beautiful at night, " "where it can be seen from a distance pulsating among the tallest tree." msgstr "" +"Es un pedazo enorme de corteza con unos zarcillos planos que brillan " +"levemente y grandes conos marrones en lugar de hojas. Se parece un poco a un " +"árbol, por los zarcillos gruesos en la base del monstruo y se van afinando " +"en grupos densos de astillas en la parte de arriba. Es casi hermoso a la " +"noche, donde se lo puede ver desde lejos titilando entre los árboles más " +"altos." #. ~ Description for dracolich #: lang/json/MONSTER_from_json.py @@ -47778,6 +47815,8 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "A quick-growing mass of spores, wafting around vague with purpose." msgstr "" +"Es una masa de esporas que crece rápidamente, flotando vagamente con un " +"objetivo." #. ~ Description for cyclopean #: lang/json/MONSTER_from_json.py @@ -47949,6 +47988,9 @@ msgid "" "A small giant ant with a carapace shell. Is capable of a surprising range " "of vocal expression for a bug, including ear-splitting wails." msgstr "" +"Es una pequeña hormiga gigante con caparazón. Es capaz de tener una " +"expresión vocal sorpresiva para un insecto, incluyendo gemidos que taladran " +"el oído." #. ~ Description for squirrel #: lang/json/MONSTER_from_json.py @@ -48065,6 +48107,8 @@ msgid "" "A still immature giant grass spider. Too young to be truly venomous, or to " "walk proficiently for that matter" msgstr "" +"Una araña gigante todavía inmadura. Demasiado joven para ser peligrosamente " +"venenosa, o para caminar bien, incluso." #. ~ Description for immature giant web spider #: lang/json/MONSTER_from_json.py @@ -48082,6 +48126,9 @@ msgid "" "tipped tendrils. Two of these tendrils are raised ominously when the " "fungaloid finds a suitable host for its crop of spores." msgstr "" +"Es un tallo grueso de materia gris. Este hongo se mueve usando sus zarcillos " +"puntiagudos. Dos de estos zarcillos son levantados amenazantes cuando el " +"fungaloide encuentra un portador adecuado para su cosecha de esporas." #. ~ Description for fungal fighter #: lang/json/MONSTER_from_json.py @@ -48132,6 +48179,12 @@ msgid "" "can't help but notice they still wear their armor and holster, despite the " "fresh fungal budding that threatens to rip through it . . ." msgstr "" +"Es un sobreviviente del apocalipsis. Este individuo ha sucumbido a su " +"infección, se nota su paranoia e incoherencia. Impredecible y con una " +"enfermedad terminal, no responderá a ningún intento de comunicación. No " +"podés evitar darte cuenta que todavía tiene puesta la ropa y la funda de su " +"pistola, a pesar de que los incipientes hongos amenazan con destrozar sus " +"prendas..." #. ~ Description for flesh angel #: lang/json/MONSTER_from_json.py @@ -48217,6 +48270,9 @@ msgid "" "playground exercise. It does not need a face for you to feel bad about " "killing it." msgstr "" +"Es un pequeño cuerpo chamuscado, saltando y revolcándose en lo que parece " +"una burla al ejercicio. No necesita tener una cara para que te haga sentir " +"mal por matarlo." #. ~ Description for squirrel #: lang/json/MONSTER_from_json.py @@ -48314,6 +48370,9 @@ msgid "" "wildly cluster of smaller vines. When disturbed, it can release several of " "these vines." msgstr "" +"Es un grupo de raíces que se retuercen, con 3 enredaderas espinosas " +"enroscadas débilmente en enredaderas más pequeñas. Cuando se siente " +"molestada, puede liberar varias de estas enredaderas." #. ~ Description for vortex #: lang/json/MONSTER_from_json.py @@ -48424,6 +48483,9 @@ msgid "" "A writhing mass of yellowing flesh, this little guy has developed a means of " "expelling stomach contents if disturbed." msgstr "" +"Es una masa de carne amarillenta que se retuerce. Este pequeñín ha " +"desarrollado los medios de expulsar el contenido de su estómago cuando es " +"molestado." #. ~ Description for zombie slave #: lang/json/MONSTER_from_json.py @@ -48479,6 +48541,10 @@ msgid "" "zombies but are mutilated none-the-less. Although it struggles to free " "itself, it is held fast with spikes, nails, and chains." msgstr "" +"La evidencia indica que esto era un sobreviviente que ha sido muerto por " +"tortura y luego reanimado. Su ropa no tiene la apariencia raída de los otros " +"zombis, pero igual está mutilado. Aunque lucha por liberarse, está sujetado " +"por púas, clavos y cadenas." #: lang/json/MONSTER_from_json.py msgid "Allosaurus" @@ -48548,6 +48614,8 @@ msgid "" "An animate plant a little under 2 meters long, this juvenile still packs a " "wallop with its fetid mouth." msgstr "" +"Es una planta con vida animada, de casi 2 metros de largo. Este joven puede " +"causar daño con su fétida boca." #. ~ Description for vine beast #: lang/json/MONSTER_from_json.py @@ -48587,6 +48655,10 @@ msgid "" "fungal growth sprouting throughout their body. Whatever individuality they " "once held is completely subverted." msgstr "" +"Parece ser un sobreviviente del apocalipsis. Este individuo sufre de un " +"visible crecimiento fúngico que se esparce por todo su cuerpo. Sea cual " +"fuere la personalidad que poseía alguna vez, ahora está completamente " +"alterada." #. ~ Description for manhack #: lang/json/MONSTER_from_json.py @@ -48687,8 +48759,8 @@ msgstr "" #. ~ Description for giant mosquito #: lang/json/MONSTER_from_json.py msgid "" -"An enormous mutant mosquito, fluttering erratically, its face dominated by a " -"long, spear-tipped proboscis." +"An enormous mutant mosquito, fluttering erratically. Its face is dominated " +"by a long, spear-tipped proboscis." msgstr "" "Un enorme mosquito gigante, aleteando erráticamente. Su cara está dominada " "por una trompa larga, similar a una lanza." @@ -49028,6 +49100,8 @@ msgid "" "Its fur pulled taunt and dyed a faint green, this once-dog is now an " "accomplished pack hunter." msgstr "" +"Su pelaje arruinado y con un leve tono verde, esto que alguna vez fue un " +"perro ahora es un dotado cazador en manada." #. ~ Description for zombie mangler #: lang/json/MONSTER_from_json.py @@ -49223,6 +49297,8 @@ msgid "" "Pale and sickly gray in color, it's hard to believe this ant is still alive, " "much less moving to attack you." msgstr "" +"Pálida y de un gris enfermizo, es difícil creer que esta hormiga todavía " +"está viva, y más difícil creer que se puede mover para atacarte." #. ~ Description for fungal ant #: lang/json/MONSTER_from_json.py @@ -49287,6 +49363,9 @@ msgid "" "Somehow this dessicated plant has become charged up with some lightning? " "Probably not good for nearby electronic devices. . ." msgstr "" +"De alguna manera, esta planta disecada parece haberse cargado con un rayo? " +"Probablemente, no sea aconsejable que esté cerca de dispositivos " +"electrónicos..." #. ~ Description for jack ant #: lang/json/MONSTER_from_json.py @@ -49365,6 +49444,9 @@ msgid "" "The 'foose' is an ill-tempered beast, fighting a battle it must inevitably " "lose. Occasionally it gives unearthly voice to its anguish." msgstr "" +"El 'alcehongo' es una bestia que siempre está de mal humor, peleando una " +"batalla que inevitablemente va a perder. De vez en cuando, le pone una voz " +"sobrenatural a su angustia." #. ~ Description for bear #: lang/json/MONSTER_from_json.py @@ -49413,9 +49495,9 @@ msgid "" "region, conservation efforts were successful in restoring a thriving " "population." msgstr "" -"El puma del este, un gran felino depredador. Alguna vez se pensó que estaba " -"extinto en esta región, pero los esfuerzos de conservación fueron exitosos y " -"se restauró su población." +"Es el puma del este, un gran felino depredador. Alguna vez se pensó que " +"estaba extinto en esta región, pero los esfuerzos de conservación fueron " +"exitosos y se restauró su población." #. ~ Description for fungal cougar #: lang/json/MONSTER_from_json.py @@ -49424,6 +49506,9 @@ msgid "" "transformation has affected its agility some, it still bounds after targets " "with savagery." msgstr "" +"Es el puma del este, ahora próximo a convertirse en fungaloide. Aunque " +"parece que su transformación le ha afectado un poco su agilidad, todavía " +"puede saltar hacia su objetivo con ferocidad." #. ~ Description for coyote #: lang/json/MONSTER_from_json.py @@ -49538,6 +49623,10 @@ msgid "" "robots. Initially designed for military patrol and escort service, it rolls " "on a set of hydraulic treads and is armed with a 9x19mm SMG." msgstr "" +"El Northrop Watchman X-1 es una producción en serie de robots de combate " +"poderosamente armados. Originalmente diseñados para patrulla militar y " +"servicio de escolta. Rueda con un conjunto de bandas hidráulicas y está " +"armado con un subfusil calibre 9x19mm." #. ~ Description for chicken walker #: lang/json/MONSTER_from_json.py @@ -49923,6 +50012,9 @@ msgid "" "This plant's dry body is now host to moist fluid sacs that hang off " "haphazardly; occasionally bursting into a cloud of haze." msgstr "" +"El cuerpo seco de esta planta ahora sirve de huésped para bolsas húmedas de " +"fluídos que cuelgan desordenadamente, y de vez en cuando explotan formando " +"una neblina." #. ~ Description for feral runner #: lang/json/MONSTER_from_json.py @@ -49952,6 +50044,11 @@ msgid "" "personality and hold unnatural abilities. They don't seem interested in " "talking to you; you cannot even discern their gender." msgstr "" +"Este sobreviviente ha entregado voluntariamente su cuerpo a los hongos " +"mediante algún extraño ritual poco conocido. Como resultado, todavía " +"mantiene mucho de su personalidad y tiene habilidades sobrenaturales. No " +"parece estar interesado en hablar con vos, y ni siquiera podés distinguir su " +"género." #. ~ Description for snotgobbler #: lang/json/MONSTER_from_json.py @@ -49984,6 +50081,9 @@ msgid "" "hardened into a flaky chitinous layer, and its ponderous movements belie its " "hostility." msgstr "" +"Este zombi parece estar más cómodo en el agua que fuera de ella. Su piel se " +"ha endurecido hasta formar una capa quitinosa, y sus movimientos pesados " +"ocultan su hostilidad." #. ~ Description for hazmat zombie #: lang/json/MONSTER_from_json.py @@ -50059,6 +50159,10 @@ msgid "" "creature is large enough to suffer the growth and birth of man-sized walls " "of fungus." msgstr "" +"A diferencia de sus maestros Trífidos, no posee los componentes " +"antifúngicos. Ha quedado discapacitado debido a los bulbos crecidos en sus " +"lianas. Esta criatura-planta es lo suficientemente grande para sufrir el " +"nacimiento y crecimiento de paredes de hongos del tamaño de un humano." #: lang/json/MONSTER_from_json.py msgid "Utahraptor" @@ -50084,6 +50188,8 @@ msgid "" "Whether wolf or dog, this canine is clearly sick. The slavering of its " "mouth is consistent, at least." msgstr "" +"Ya sea un lobo o un perro, este canino está obviamente enfermo. Babea " +"consistentemente, por decirlo de alguna manera." #. ~ Description for zombie snapper #: lang/json/MONSTER_from_json.py @@ -50111,6 +50217,9 @@ msgid "" "deliberately. As it scans, its body pulsates and contorts in a fashion that " "should break most bones." msgstr "" +"Con las cuencas vacías, esta criatura vigila sus alrededores " +"deliberadamente. Mientras observa, su cuerpo vibra y se contorsiona de una " +"manera que debería romperle la mayoría de los huesos." #. ~ Description for bloated zombie #: lang/json/MONSTER_from_json.py @@ -50177,6 +50286,12 @@ msgid "" "gaze about. It claws clumsily with the three digits on each limb, and " "rumors exist of it being capable of harnessing electricity for attack." msgstr "" +"No sabés lo que es esto, pero las hormigas lo tratan como si fuera uno de " +"ellos. Su cabeza parece la de un gusano, sin tenazas y con tres ojos " +"pequeños y brillantes mirando en diferentes direcciones. Aunque comúnmente " +"se mueve con sus cuatro miembros, a veces se para en sus miembros traseros " +"para observar. Clava torpemente los tres dedos de cada miembro, y dicen que " +"puede ser capaz de causar electricidad en sus ataques." #. ~ Description for generator #: lang/json/MONSTER_from_json.py @@ -50586,7 +50701,7 @@ msgstr "ojobot" #: lang/json/MONSTER_from_json.py msgid "fant" -msgstr "" +msgstr "hormigongo" #: lang/json/MONSTER_from_json.py msgid "fat zombie" @@ -50614,7 +50729,7 @@ msgstr "diablito" #: lang/json/MONSTER_from_json.py msgid "fionaea" -msgstr "" +msgstr "fionaea" #: lang/json/MONSTER_from_json.py msgid "firefighter zombie" @@ -50638,7 +50753,7 @@ msgstr "pólipo volador" #: lang/json/MONSTER_from_json.py msgid "foose" -msgstr "" +msgstr "alcehongo" #: lang/json/MONSTER_from_json.py msgid "forager ant" @@ -50664,7 +50779,7 @@ msgstr "capullo fúngico" #: lang/json/MONSTER_from_json.py msgid "fungal boil" -msgstr "" +msgstr "forúnculo fúngico" #: lang/json/MONSTER_from_json.py msgid "fungal boomer" @@ -50672,11 +50787,11 @@ msgstr "boomer fúngico" #: lang/json/MONSTER_from_json.py msgid "fungal brood" -msgstr "" +msgstr "cría fúngica" #: lang/json/MONSTER_from_json.py msgid "fungal cougar" -msgstr "" +msgstr "puma fúngico" #: lang/json/MONSTER_from_json.py msgid "fungal fighter" @@ -50688,7 +50803,7 @@ msgstr "seto fúngico" #: lang/json/MONSTER_from_json.py msgid "fungal shocker" -msgstr "" +msgstr "shocker fúngico" #: lang/json/MONSTER_from_json.py msgid "fungal spire" @@ -50700,11 +50815,11 @@ msgstr "espora fúngica" #: lang/json/MONSTER_from_json.py msgid "fungal survivor" -msgstr "" +msgstr "sobreviviente fúngico" #: lang/json/MONSTER_from_json.py msgid "fungal tender" -msgstr "" +msgstr "cargador fúngico" #: lang/json/MONSTER_from_json.py msgid "fungal tendril" @@ -50716,7 +50831,7 @@ msgstr "torre fúngica" #: lang/json/MONSTER_from_json.py msgid "fungal vinebeast" -msgstr "" +msgstr "bestia enredadera fúngica" #: lang/json/MONSTER_from_json.py lang/json/terrain_from_json.py msgid "fungal wall" @@ -50938,11 +51053,11 @@ msgstr "imp" #: lang/json/MONSTER_from_json.py msgid "infected survivor" -msgstr "" +msgstr "sobreviviente infectado" #: lang/json/MONSTER_from_json.py msgid "infected tardigrade" -msgstr "" +msgstr "tardigrado infectado" #: lang/json/MONSTER_from_json.py msgid "irradiated wanderer" @@ -51008,7 +51123,7 @@ msgstr "marioneta" #: lang/json/MONSTER_from_json.py msgid "marloss man" -msgstr "" +msgstr "hombre marloss" #: lang/json/MONSTER_from_json.py msgid "mi-go" @@ -51148,7 +51263,7 @@ msgstr "serpiente de cascabel" #: lang/json/MONSTER_from_json.py msgid "razorclaw" -msgstr "" +msgstr "garrafilada" #: lang/json/MONSTER_from_json.py msgid "revenant" @@ -51326,7 +51441,7 @@ msgstr "vastaglodita" #: lang/json/MONSTER_from_json.py msgid "squig" -msgstr "" +msgstr "squig" #: lang/json/MONSTER_from_json.py msgid "squirrel" @@ -51549,8 +51664,8 @@ msgstr "zombi cáscara" #: lang/json/MONSTER_from_json.py msgid "zombie kinderling" msgid_plural "zombie kinderlings" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "zombi infantil" +msgstr[1] "zombis infantiles" #: lang/json/MONSTER_from_json.py msgid "zombie lord" @@ -53401,6 +53516,7 @@ msgstr "" #: lang/json/TOOL_from_json.py msgid "A compact scissor jack used for lifting vehicles." msgstr "" +"Es un gato hidráulico compacto de tipo tijera, usado para levantar vehículos." #. ~ Description for acetylene torch #: lang/json/TOOL_from_json.py @@ -53778,6 +53894,8 @@ msgid "" "A poorly constructed improvised scissor jack used for lifting vehicles if " "you're brave enough to use it." msgstr "" +"Es un gato hidráulico improvisado de tipo tijera, bastante mal construido, " +"capaz de levantar vehículos si sos tan valiente como para usarlo." #. ~ Description for concrete mixer #: lang/json/TOOL_from_json.py @@ -53793,6 +53911,7 @@ msgstr "" #: lang/json/TOOL_from_json.py msgid "A portable hydraulic bottle jack used for lifting vehicles." msgstr "" +"Es un gato hidráulico portátil de tipo botella usado para levantar vehículos." #. ~ Description for hand drill #: lang/json/TOOL_from_json.py @@ -54523,11 +54642,6 @@ msgstr "Hiss." msgid "Hsssss." msgstr "Hsssss." -#. ~ Description for fake UPS -#: lang/json/TOOL_from_json.py -msgid "If you can see this, it is a bug." -msgstr "Si podés ver esto, es un bug." - #: lang/json/TOOL_from_json.py msgid "Kevlar plate" msgid_plural "Kevlar plates" @@ -56765,6 +56879,9 @@ msgid "" "it will ever be manufactured again, so its got to be worth something to " "somebody . . . right?" msgstr "" +"Es un pedazos de plástico ligero, con microcapas espaceadas. Es poco " +"probable que alguna vez vuelva a ser fabricado, así que debe ser valioso " +"para alguien... ¿no?" #. ~ Description for plastic chunk #: lang/json/TOOL_from_json.py @@ -57704,6 +57821,11 @@ msgid "" "shouldn't spawn in normal game." msgstr "" +#. ~ Description for snowman +#: lang/json/TOOL_from_json.py +msgid "This is a test item for testing unicode support." +msgstr "" + #. ~ Description for candle (lit) #: lang/json/TOOL_from_json.py msgid "" @@ -60123,12 +60245,6 @@ msgid_plural "extra battery mods" msgstr[0] "modificación de batería extra" msgstr[1] "modificaciones de batería extra" -#: lang/json/TOOL_from_json.py -msgid "fake UPS" -msgid_plural "fake UPS" -msgstr[0] "UPS falso" -msgstr[1] "UPS falsos" - #: lang/json/TOOL_from_json.py msgid "fake item" msgid_plural "fake items" @@ -61543,6 +61659,12 @@ msgid_plural "snare triggers" msgstr[0] "disparador de trampa de lazo" msgstr[1] "disparadores de trampa de lazo" +#: lang/json/TOOL_from_json.py +msgid "snowman" +msgid_plural "snowmans" +msgstr[0] "hombre de nieve" +msgstr[1] "hombres de nieve" + #: lang/json/TOOL_from_json.py msgid "soda can stove kit" msgid_plural "soda can stove kits" @@ -62895,6 +63017,15 @@ msgstr "" "campos de PEM. Podés usar energía para disparar un rayo de corto alcance que " "desactivará lo electrónico y los robots." +#. ~ Description for Telescopic Eyes +#: lang/json/bionic_from_json.py +msgid "" +"Much of the material in your inner eye has been removed and replaced with an " +"array of high-powered, auto-focusing lenses. You can now see much farther " +"and more clearly than before, any vision problems you might have had are now " +"gone." +msgstr "" + #: lang/json/bionic_from_json.py msgid "Muscle Augmentation" msgstr "Aumento Muscular" @@ -63286,6 +63417,10 @@ msgid "" "use or carry two-handed items, and your strength limits what you can use " "with your one hand." msgstr "" +"¡Tu brazo izquierdo ha sido reemplazado con una pistola de fusión! Podés " +"usar tus reservas de energía para disparar un rayo de calor. Sin embargo, no " +"podés usar o agarrar objetos que necesitan las dos manos, y tu fuerza " +"determina qué podés usar con una mano sola y qué no." #. ~ Description for Infrared Vision #: lang/json/bionic_from_json.py @@ -64589,19 +64724,24 @@ msgstr "" msgid "" "A lack of calcium in your diet will make your bones progressively weaker." msgstr "" +"La falta de calcio en tu dieta irá progresivamente debilitando tus huesos." #: lang/json/effects_from_json.py msgid "" "A lack of iron in your diet will result in progressively worsening anemia." msgstr "" +"La falta de hierro en tu dieta irá progresivamente empeorando tu anemia." #: lang/json/effects_from_json.py msgid "A lack of vitamin A in your diet will progressively worsen your vision." msgstr "" +"La falta de vitamina A en tu dieta irá progresivamente empeorando tu vista." #: lang/json/effects_from_json.py msgid "A lack of vitamin B12 in your diet will affect your ability to heal." msgstr "" +"La falta de vitamina B12 en tu dieta afectará tu habilidad para curar tus " +"heridas." #: lang/json/effects_from_json.py msgid "" @@ -64854,7 +64994,7 @@ msgstr "Asma" #: lang/json/effects_from_json.py msgid "B12 deficiency" -msgstr "" +msgstr "Deficiencia de B12" #: lang/json/effects_from_json.py msgid "Bad Bleeding" @@ -65039,7 +65179,7 @@ msgstr "Borracho" #: lang/json/effects_from_json.py msgid "Early anemia" -msgstr "" +msgstr "Anemia precoz" #: lang/json/effects_from_json.py msgid "Early scurvy" @@ -65151,7 +65291,7 @@ msgstr "Hipervitaminosis" #: lang/json/effects_from_json.py msgid "Hypocalcemia" -msgstr "" +msgstr "Hipocalcemia" #. ~ Description of effect 'Aegis Cure'. #: lang/json/effects_from_json.py @@ -65187,7 +65327,7 @@ msgstr "Adormecimiento Intenso" #: lang/json/effects_from_json.py msgid "Iron deficiency" -msgstr "" +msgstr "Deficiencia de hierro" #: lang/json/effects_from_json.py msgid "Itchy skin" @@ -65245,7 +65385,7 @@ msgstr "Sin munición" #: lang/json/effects_from_json.py msgid "No healing" -msgstr "" +msgstr "Sin curación" #. ~ Description of effect 'Elixir'. #: lang/json/effects_from_json.py @@ -65301,7 +65441,7 @@ msgstr "Envenenado" #: lang/json/effects_from_json.py msgid "Poor vision" -msgstr "" +msgstr "Mala visión" #. ~ Description of effect 'Ward Against Evil'. #: lang/json/effects_from_json.py @@ -65437,7 +65577,7 @@ msgstr "Chillando" #. ~ Apply message for effect(s) 'B12 deficiency, Slow healing, No healing'. #: lang/json/effects_from_json.py msgid "Simple wounds are starting to concern you more than usual." -msgstr "" +msgstr "Las heridas comunes te empiezan a preocupar más de lo común." #: lang/json/effects_from_json.py msgid "Slimed" @@ -65646,7 +65786,7 @@ msgstr "Punto de apoyo inestable" #: lang/json/effects_from_json.py msgid "VitA deficiency" -msgstr "" +msgstr "Deficiencia de VitA" #: lang/json/effects_from_json.py msgid "Ward Against Evil" @@ -65667,7 +65807,7 @@ msgstr "Nosotros necesitamos descansar; nuestras fibras están casi gastadas..." #: lang/json/effects_from_json.py msgid "Weak bones" -msgstr "" +msgstr "Huesos frágiles" #: lang/json/effects_from_json.py msgid "Wearing earphones" @@ -65750,12 +65890,12 @@ msgstr "" #. ~ Apply message for effect(s) 'Iron deficiency, Early anemia, Anemia'. #: lang/json/effects_from_json.py msgid "You beging feeling increasingly tired and listless." -msgstr "" +msgstr "Empezás a sentirte cada vez más cansado y apático." #. ~ Apply message for effect(s) 'VitA deficiency, Poor vision, Night blindness'. #: lang/json/effects_from_json.py msgid "You beging struggling to make out the finer details." -msgstr "" +msgstr "Empezás a tener dificultades para distinguir los detalles." #. ~ Description of effect 'Ringing ears'. #: lang/json/effects_from_json.py @@ -65873,7 +66013,7 @@ msgstr "Te sentís como una rata, y con náuseas." #. ~ Description of effect 'Nausea'. #: lang/json/effects_from_json.py msgid "You feel nauseous. Even a thought of food makes you feel sick." -msgstr "" +msgstr "Sentís náuseas. Apenas pensás en comida y ya te hace sentir mal." #: lang/json/effects_from_json.py msgid "You feel sick inside." @@ -65974,7 +66114,7 @@ msgstr "Ya no te sentís anémico." #. ~ Remove message for effect(s) 'Nausea'. #: lang/json/effects_from_json.py msgid "You no longer feel nauseous." -msgstr "" +msgstr "Ya no sentís náuseas." #. ~ Apply message for effect(s) 'Stem cell treatment'. #: lang/json/effects_from_json.py @@ -66204,6 +66344,8 @@ msgstr "Tu %s está muy expuesto/a al frío." #: lang/json/effects_from_json.py msgid "Your ability to heal returns as your Vitamin B12 deficiency improves." msgstr "" +"Volvés a recuperar tu capacidad de curación a medida que superás tu " +"deficiencia de B12." #. ~ Decay message for effect(s) 'Adrenaline Comedown, Adrenaline Rush'. #: lang/json/effects_from_json.py @@ -66228,12 +66370,13 @@ msgstr "Sentís tu cuerpo increíblemente adormecido." #. ~ Apply message for effect(s) 'Hypocalcemia, Weak bones, Brittle bones'. #: lang/json/effects_from_json.py msgid "Your bones are becoming more brittle." -msgstr "" +msgstr "Tus huesos se están volviendo más quebradizos." #. ~ Decay message for effect(s) 'Hypocalcemia, Weak bones, Brittle bones'. #: lang/json/effects_from_json.py msgid "Your bones become stronger as your calcium deficiency improves." msgstr "" +"Tus huesos se vuelven más fuertes a medida que mejorás tus niveles de calcio." #. ~ Remove message for effect(s) 'Hypocalcemia, Weak bones, Brittle bones'. #: lang/json/effects_from_json.py @@ -66248,7 +66391,7 @@ msgstr "¡Te falla la respiración!" #. ~ Decay message for effect(s) 'Hypocalcemia, Weak bones, Brittle bones'. #: lang/json/effects_from_json.py msgid "Your calcium deficiency is nearly resolved." -msgstr "" +msgstr "Ya casi has superado tu deficiencia de calcio." #. ~ Miss message for effect(s) 'Adrenaline Comedown, Adrenaline Rush'. #: lang/json/effects_from_json.py @@ -66273,7 +66416,7 @@ msgstr "Te arden los ojos por el gas lacrimógeno." #. ~ Decay message for effect(s) 'Iron deficiency, Early anemia, Anemia'. #: lang/json/effects_from_json.py msgid "Your feel stronger as your anemia starts to improve." -msgstr "" +msgstr "Te sentís con más fuerza a medida que mejorás de tu anemia." #. ~ Description of effect 'Unstable footing'. #: lang/json/effects_from_json.py @@ -66314,7 +66457,7 @@ msgstr "" #. ~ Decay message for effect(s) 'Iron deficiency, Early anemia, Anemia'. #: lang/json/effects_from_json.py msgid "Your iron deficiency is nearly resolved." -msgstr "" +msgstr "Ya casi has superado tu deficiencia de hierro." #. ~ Miss message for effect(s) 'Smoke'. #: lang/json/effects_from_json.py @@ -66378,7 +66521,7 @@ msgstr "¡Tu visión va y viene y ves todo gris!" #. ~ Decay message for effect(s) 'VitA deficiency, Poor vision, Night blindness'. #: lang/json/effects_from_json.py msgid "Your vision improves as your Vitamin A deficiency improves." -msgstr "" +msgstr "Tu vista mejora a medida que mejorás tus niveles de vitamina A." #. ~ Remove message for effect(s) 'Contact Lenses'. #: lang/json/effects_from_json.py @@ -66388,12 +66531,12 @@ msgstr "Tu visión se empieza a hacer borrosa." #. ~ Decay message for effect(s) 'VitA deficiency, Poor vision, Night blindness'. #: lang/json/effects_from_json.py msgid "Your vitamin A deficiency is nearly resolved." -msgstr "" +msgstr "Ya casi has superado tu deficiencia de vitamina A." #. ~ Decay message for effect(s) 'B12 deficiency, Slow healing, No healing'. #: lang/json/effects_from_json.py msgid "Your vitamin B12 deficiency is starting to resolve." -msgstr "" +msgstr "Has comenzado a superar tu deficiencia de vitamina B12." #. ~ Decay message for effect(s) 'Early scurvy, Scurvy, Bad Scurvy'. #: lang/json/effects_from_json.py @@ -66715,7 +66858,8 @@ msgstr "¡crash!" msgid "crate" msgstr "caja" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp msgid "crunch!" msgstr "¡crunch!" @@ -66811,8 +66955,8 @@ msgstr "horno industrial" msgid "glass breaking" msgstr "vidrio rompiéndose" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp -#: src/map.cpp src/ranged.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp src/map.cpp src/ranged.cpp msgid "glass breaking!" msgstr "¡vidrio rompiéndose!" @@ -66820,6 +66964,10 @@ msgstr "¡vidrio rompiéndose!" msgid "glass door fridge" msgstr "heladera con puerta de vidrio" +#: lang/json/furniture_from_json.py +msgid "gravestone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "groundsheet" msgstr "lona impermeable" @@ -66836,6 +66984,10 @@ msgstr "planta cosechable" msgid "hay" msgstr "paja" +#: lang/json/furniture_from_json.py +msgid "headstone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "heavy punching bag" msgstr "bolsa de boxeo grande" @@ -66912,6 +67064,10 @@ msgstr "cactus mutado" msgid "mutated poppy flower" msgstr "flor de amapola mutada" +#: lang/json/furniture_from_json.py +msgid "obelisk" +msgstr "" + #: lang/json/furniture_from_json.py msgid "open animalskin flap" msgstr "solapa abierta de piel de animal" @@ -67012,10 +67168,6 @@ msgstr "pared de bolsas de arena" msgid "screeching metal!" msgstr "¡chillido de metal!" -#: lang/json/furniture_from_json.py -msgid "seed" -msgstr "semilla" - #: lang/json/furniture_from_json.py msgid "seedling" msgstr "brote" @@ -67097,6 +67249,10 @@ msgstr "¡tomp!" msgid "thump." msgstr "tomp." +#: lang/json/furniture_from_json.py +msgid "thunk!" +msgstr "" + #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py msgid "thunk." msgstr "tonk," @@ -67173,6 +67329,10 @@ msgstr "cocina de madera" msgid "wooden keg" msgstr "barril de madera" +#: lang/json/furniture_from_json.py +msgid "worn gravestone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "yellow indoor plant" msgstr "planta amarilla de interior" @@ -67606,11 +67766,10 @@ msgstr "" #: lang/json/hint_from_json.py msgid "" "If you get a pair of night vision goggles, hold on to them! A flashlight " -"will give you away, but with goggles you can be sneaky." +"will give you away, but with goggles you can be sneaky. Beware that some " +"types of zombies are camouflaged against it, and require proper light to be " +"visible." msgstr "" -"Si conseguís un par de anteojos de visión nocturna, ¡guardátelos! Una " -"linterna puede delatar tu ubicación, pero con esos anteojos podés pasar " -"desapercibido." #: lang/json/hint_from_json.py msgid "" @@ -70461,6 +70620,13 @@ msgstr "" msgid "Niten Ichi-Ryu" msgstr "Niten Ichi-Ryu" +#. ~ Description for martial art 'Niten Ichi-Ryu' +#: lang/json/martial_art_from_json.py +msgid "" +"Niten Ichi-Ryu is an ancient school of combat, transmitting a style of " +"classical Japanese swordsmanship conceived by the warrior Miyamoto Musashi." +msgstr "" + #. ~ Description for martial art 'Niten Ichi-Ryu' #: lang/json/martial_art_from_json.py msgid "" @@ -77744,6 +77910,10 @@ msgstr "centro de refugiados" msgid "regional school" msgstr "escuela rural" +#: lang/json/overmap_terrain_from_json.py +msgid "religious cemetery" +msgstr "" + #: lang/json/overmap_terrain_from_json.py msgid "restaurant" msgstr "restaurant" @@ -80552,24 +80722,18 @@ msgstr "Maestro" msgctxt "prof_desc_female" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"Gracias al tiempo que pasaste en el laboratorio, estás familiarizada con los " -"fundamentos de la ciencia conductual. Escapaste con civiles afortunados, " -"pero por lo menos vos todavía tenés tu ropa de laboratorio." #. ~ Profession (male Lab Technician) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"Gracias al tiempo que pasaste en el laboratorio, estás familiarizado con los " -"fundamentos de la ciencia conductual. Escapaste con civiles afortunados, " -"pero por lo menos vos todavía tenés tu ropa de laboratorio." #. ~ Profession (Punk Rock Girl) description #: lang/json/professions_from_json.py @@ -91714,6 +91878,10 @@ msgstr "surtidor diésel roto" msgid "smashed gas pump" msgstr "surtidor de nafta roto" +#: lang/json/terrain_from_json.py +msgid "smoothed rock" +msgstr "" + #: lang/json/terrain_from_json.py lang/json/trap_from_json.py msgid "spiked pit" msgstr "pozo con púas" @@ -93767,8 +93935,8 @@ msgstr "Volver" #: src/action.cpp src/activity_handlers.cpp src/color.cpp src/crafting.cpp #: src/editmap.cpp src/game.cpp src/iexamine.cpp src/inventory_ui.cpp #: src/item_action.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/mission_companion.cpp src/pickup.cpp src/player.cpp src/veh_interact.cpp -#: src/vehicle.cpp +#: src/mission_companion.cpp src/pickup.cpp src/player.cpp +#: src/veh_interact.cpp src/vehicle.cpp msgid "Cancel" msgstr "Cancelar" @@ -95785,7 +95953,8 @@ msgstr "¡Primero cargá un personaje antes de usar esto!" msgid "Rules" msgstr "Reglas" -#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp src/options.cpp +#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp +#: src/options.cpp msgid "Save changes?" msgstr "¿Guardar cambios?" @@ -96349,23 +96518,23 @@ msgstr "BIÓNICOS" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / %d turns" -msgstr "%d UP / %d turnos" +msgid "%d PU act" +msgstr "%d PU act" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / turn" -msgstr "%d UP / turno" +msgid "%d PU deact" +msgstr "%d UP desact" #: src/bionics_ui.cpp #, c-format -msgid "%d PU act" -msgstr "%d PU act" +msgid "%d PU/%d turns" +msgstr "" #: src/bionics_ui.cpp #, c-format -msgid "%d PU deact" -msgstr "%d UP desact" +msgid "%d PU/turn" +msgstr "" #: src/bionics_ui.cpp src/mutation_ui.cpp #, c-format @@ -102928,6 +103097,14 @@ msgstr "Te lleva un tiempo poder mover el %s." msgid "It takes some time to move the heavy %s." msgstr "Te lleva un tiempo mover el pesado %s." +#: src/game.cpp +msgid "It takes you a long time to steer that vehicle!" +msgstr "" + +#: src/game.cpp +msgid "It takes you a very long time to steer that vehicle!" +msgstr "" + #: src/game.cpp msgid "It's too dangerous to tunnel that far!" msgstr "¡Es demasiado peligroso hacer un túnel tan lejos!" @@ -103293,6 +103470,10 @@ msgstr "" msgid "Pour %s where?" msgstr "¿Verter %s en dónde?" +#: src/game.cpp +msgid "Pour into a container" +msgstr "" + #: src/game.cpp #, c-format msgid "Pour into an adjacent keg (%s)" @@ -104740,6 +104921,11 @@ msgstr "Sentís cómo se descompone tu cuerpo." msgid "You feel your genetic makeup degrading." msgstr "Sentís degradarse tu maquillaje genético." +#: src/game.cpp +#, c-format +msgid "You fumble with the %s's controls." +msgstr "Tocás torpemente los controles del %s." + #: src/game.cpp msgid "You get a hold of yourself." msgstr "Te controlás a vos mismo." @@ -110050,6 +110236,11 @@ msgstr "Lo podés usar para fabricar varios objetos más." msgid "You could use it to craft: %s" msgstr "Se puede usar para fabricar: %s" +#: src/item.cpp +#, c-format +msgid "You fall asleep and drop your %s." +msgstr "" + #: src/item.cpp #, c-format msgid "You finish your %s." @@ -111638,10 +111829,6 @@ msgstr "¡Esa %s está muy húmeda como para poder absorber más líquido!" msgid "That isn't a firearm!" msgstr "¡Eso no es un arma!" -#: src/iuse.cpp -msgid "That item already has a rechargeable battery pack." -msgstr "Ese objeto ya tiene un pack recargable de baterías." - #: src/iuse.cpp msgid "That item has already had its battery capacity doubled." msgstr "Ese objeto ya tiene duplicada su capacidad para baterías." @@ -113192,15 +113379,6 @@ msgstr "¡Reparaste completamente tu %s!" msgid "You repair your %s!" msgstr "¡Reparaste tu %s!" -#: src/iuse.cpp -#, c-format -msgid "" -"You replace the battery compartment of your %s with a rechargeable battery " -"pack!" -msgstr "" -"¡Reemplazás el compartimento de la batería de tu %s con un pack recargable " -"de baterías!" - #: src/iuse.cpp #, c-format msgid "You replace your current %s." @@ -116086,11 +116264,6 @@ msgstr "¡No pudiste desarmar la trampa, y la hiciste accionar!" msgid "You fail to disarm the trap." msgstr "No pudiste desarmar la trampa." -#: src/map.cpp -#, c-format -msgid "You fumble with the %s's controls." -msgstr "Tocás torpemente los controles del %s." - #: src/map.cpp #, c-format msgid "You lose control of the %s." @@ -124848,10 +125021,6 @@ msgstr "No muevas ni un músculo..." msgid "Drop items" msgstr "Dejar objetos" -#: src/npcmove.cpp -msgid "Fire a burst" -msgstr "Disparar una ráfaga" - #: src/npcmove.cpp msgid "Flee" msgstr "Huir" @@ -130535,10 +130704,6 @@ msgstr "Te rodean luces brillantes, y te teletransportás." msgid "Good mood +%s%d%%" msgstr "Buen humor +%s%d%%" -#: src/player.cpp -msgid "Gun:" -msgstr "Arma:" - #: src/player.cpp msgid "He" msgstr "Él" @@ -132853,10 +133018,6 @@ msgstr "astas" msgid "armor" msgstr "armadura" -#: src/player.cpp -msgid "auto" -msgstr "auto" - #: src/player.cpp msgid "beep-beep-beep!" msgstr "¡bip-bip-bip!" @@ -132869,10 +133030,6 @@ msgstr "pelo" msgid "horns" msgstr "cuernos" -#: src/player.cpp -msgid "off " -msgstr "apagado" - #: src/player.cpp msgid "quills" msgstr "púas" @@ -134748,11 +134905,6 @@ msgstr "%2.1fL " msgid "%d\"" msgstr "%d\"" -#: src/vehicle.cpp -#, c-format -msgid "%s failed to fire! It isn't loaded and/or powered." -msgstr "¡%s falló al disparar! No está cargada o alimentada." - #: src/vehicle.cpp #, c-format msgid "%s points in your direction and emits an IFF warning beep." @@ -134792,10 +134944,6 @@ msgstr "" "empezás a reconsiderar haber tratado de plegar el/a %s mientras lo/a estabas " "manejando." -#: src/vehicle.cpp -msgid "Auto" -msgstr "Auto" - #. ~ backfire sound #: src/vehicle.cpp msgid "BANG!" @@ -134858,10 +135006,6 @@ msgstr "Clink" msgid "Close" msgstr "Cerrar" -#: src/vehicle.cpp -msgid "Configure individual turrets" -msgstr "Configurar torretas individuales" - #: src/vehicle.cpp msgid "Control individual engines" msgstr "Controlar motores individuales" @@ -134878,32 +135022,10 @@ msgstr "Control de crucero encendida" msgid "Cugugugugug" msgstr "Cugugugugug" -#: src/vehicle.cpp -msgid "Cycle turret mode" -msgstr "Cambiar modo de torreta" - -#: src/vehicle.cpp -msgid "Deactivating automatic target acquisition for this turret" -msgstr "Desactivando adquisición automática de objetivo de esta torreta" - #: src/vehicle.cpp msgid "Disable cruise control" msgstr "Desactivar control de crucero" -#: src/vehicle.cpp -msgid "Disable turrets" -msgstr "Desactivar torretas" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling automatic target acquisition on %s" -msgstr "Desactivando adquisición automática de objetivo de %s" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling turret %s." -msgstr "Desactivando torreta %s." - #: src/vehicle.cpp msgid "Do nothing" msgstr "No hacer nada" @@ -134920,10 +135042,6 @@ msgstr "Luz de interior encendida" msgid "Enable cruise control" msgstr "Activar control de crucero" -#: src/vehicle.cpp -msgid "Enable turrets" -msgstr "Activar torretas" - #. ~ indicates that a vehicle part is outside #: src/vehicle.cpp msgid "Exterior" @@ -135010,10 +135128,6 @@ msgstr "NEEeu NEEeu NEEeu" msgid "No controls there." msgstr "No hay controles ahí." -#: src/vehicle.cpp -msgid "No target" -msgstr "Sin objetivo" - #: src/vehicle.cpp msgid "Open" msgstr "Abrir" @@ -135079,19 +135193,16 @@ msgid "Select door to toggle" msgstr "Seleccionar puerta para abrir/cerrar" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to buggy mode." -msgstr "Estableciéndo torreta %s en modo defectuoso." +msgid "Set turret firing modes" +msgstr "" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to burst mode." -msgstr "Estableciendo torreta %s en modo ráfaga." +msgid "Set turret targeting" +msgstr "" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to single-fire mode." -msgstr "Estableciendo torreta %s en modo disparo único." +msgid "Set turret targeting modes" +msgstr "" #: src/vehicle.cpp msgid "Stop controlling" @@ -135138,6 +135249,11 @@ msgstr "El %s del %1$s atropella al %2$s." msgid "The %s doesn't have enough wheels to move!" msgstr "¡El/a %s no tiene suficientes ruedas para moverse!" +#: src/vehicle.cpp +#, c-format +msgid "The %s is stuck." +msgstr "" + #: src/vehicle.cpp #, c-format msgid "The %s is too leaky!" @@ -135273,14 +135389,6 @@ msgstr "¡La radio no enciende!" msgid "The vehicle part you were working on has gone!" msgstr "¡La parte del vehículo en la que estabas trabajando desapareció!" -#: src/vehicle.cpp -msgid "This turret can't be aimed manually" -msgstr "Esta torreta no puede ser apuntada manualmente" - -#: src/vehicle.cpp -msgid "This turret doesn't have enough ammo" -msgstr "Esta torreta no tiene suficiente munición" - #: src/vehicle.cpp msgid "This turret is not powered" msgstr "Esta torreta no tiene energía" @@ -135447,30 +135555,6 @@ msgstr "Campanillas encendidas" msgid "Turned on music" msgstr "Música encendida" -#: src/vehicle.cpp -msgid "Turret system is on, but all turrets are configured not to shoot." -msgstr "" -"El sistema de torretas está activado, pero todas las torretas están " -"configuradas para no disparar." - -#: src/vehicle.cpp -msgid "Turrets have been configured, but the vehicle turret system is off." -msgstr "" -"Las torretas han sido configuradas, pero el sistema de torreta del vehículo " -"está apagado." - -#: src/vehicle.cpp -msgid "Turrets: Disabled" -msgstr "Torretas: Desactivadas" - -#: src/vehicle.cpp -msgid "Turrets: Enabled" -msgstr "Torretas: Activadas" - -#: src/vehicle.cpp -msgid "Unseen" -msgstr "Desapercibido" - #: src/vehicle.cpp msgid "Vehicle controls" msgstr "Controles del vehículo" @@ -135601,6 +135685,10 @@ msgstr "Tu motor emite un chirrido fuerte." msgid "a simple melody blaring from the loudspeakers." msgstr "una melodía simple resonando de los parlantes." +#: src/vehicle.cpp +msgid "auto" +msgstr "auto" + #. ~ Beeper sound #: src/vehicle.cpp msgid "beep!" @@ -135615,6 +135703,10 @@ msgstr "%s plegado" msgid "hummm!" msgstr "¡hummm!" +#: src/vehicle.cpp +msgid "manual" +msgstr "" + #: src/vehicle.cpp msgid "roarrr!" msgstr "¡roarrr!" From c8b8f090141b59c323c85e41b9b384e16f6a476f Mon Sep 17 00:00:00 2001 From: Vlasov Vitaly Date: Thu, 9 Jun 2016 21:00:41 +0300 Subject: [PATCH 095/110] Spanish update --- lang/po/es_ES.po | 472 ++++++++++++++++++++++------------------------- 1 file changed, 218 insertions(+), 254 deletions(-) diff --git a/lang/po/es_ES.po b/lang/po/es_ES.po index 8515e8301edba..f9696099b2c87 100644 --- a/lang/po/es_ES.po +++ b/lang/po/es_ES.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: Cataclysm-DDA\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-30 09:53+0300\n" -"PO-Revision-Date: 2016-05-30 08:22+0000\n" +"POT-Creation-Date: 2016-06-06 10:20+0300\n" +"PO-Revision-Date: 2016-06-06 08:46+0000\n" "Last-Translator: Vlasov Vitaly \n" "Language-Team: Spanish (Spain) (http://www.transifex.com/cataclysm-dda-" "translators/cataclysm-dda/language/es_ES/)\n" @@ -1439,6 +1439,13 @@ msgid "A box of small steel balls. They deal virtually no damage." msgstr "" "Una caja de pequeños balines de acero. Prácticamente, no causan ningún daño." +#. ~ Description for .44 FMJ +#: lang/json/AMMO_from_json.py +msgid "" +"A brass-jacketed variant of the .44 Magnum round. This increases " +"penetration slightly at the cost of reduced damage from expansion." +msgstr "" + #. ~ Description for blue paint #: lang/json/AMMO_from_json.py msgid "A can of blue paint." @@ -2135,7 +2142,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A simple arrow shaft that has had a point carved into it and then fire-" -"hardened. Needs fletching to be worth firing from a bow." +"hardened. It needs fletching to be worth firing from a bow." msgstr "" #. ~ Description for ammo belt linkage @@ -2694,14 +2701,6 @@ msgid "" "it on contact." msgstr "" -#. ~ Description for .22 CB -#: lang/json/AMMO_from_json.py -msgid "" -"Conical Ball .22 is a variety of .22 ammunition with a very small propellant " -"charge and generally lacks gunpowder. The end result is a subsonic round " -"that is so weak as to be nearly useless given your predicament." -msgstr "" - #. ~ Description for handloaded .22 CB #: lang/json/AMMO_from_json.py msgid "" @@ -3230,13 +3229,11 @@ msgstr[1] "RDX" #. ~ Description for .22 rat-shot #: lang/json/AMMO_from_json.py msgid "" -"Rat-shot is extremely weak ammunition, designed for killing rats, snakes, or " -"other small vermin while being unable to damage walls. It has an extremely " -"short range and is unable to injure all but the smallest creatures." +"Rat-shot is an extremely weak .22 shotgun cartridge, designed for killing " +"rats, snakes, or other small vermin while being unable to damage walls. It " +"has an extremely short range and is unable to injure all but the smallest " +"creatures." msgstr "" -"La rat-shot es una munición muy débil, diseñada para matar ratas, serpientes " -"y otras pequeñas alimañas, ya que no daña las paredes. Tiene muy poco " -"alcance y solo es capaz de lastimar a las criaturas más pequeñas." #. ~ Description for handloaded .22 rat-shot #: lang/json/AMMO_from_json.py @@ -3350,6 +3347,14 @@ msgid "" "application." msgstr "" +#. ~ Description for .22 CB +#: lang/json/AMMO_from_json.py +msgid "" +"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." +msgstr "" + #. ~ Description for reloaded .300 Winchester Magnum #: lang/json/AMMO_from_json.py msgid "" @@ -3561,7 +3566,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "This metal shaft has been carefully sharpened so that it has a crude point " -"at the end. Needs fletching to be worth firing from a bow." +"at the end. It needs fletching to be worth firing from a bow." msgstr "" #. ~ Description for sharpened metal arrow @@ -4914,8 +4919,8 @@ msgstr[0] "" msgstr[1] "" #: lang/json/AMMO_from_json.py -msgid "reloaded 7.62x39mm M87" -msgid_plural "reloaded 7.62x39mm M87" +msgid "reloaded 7.62x39mm M67" +msgid_plural "reloaded 7.62x39mm M67" msgstr[0] "" msgstr[1] "" @@ -6615,9 +6620,8 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "" "A large leather quiver trimmed with metal, worn on the back, that can hold " -"60 arrows.\n" -"Historically used by horse archers, rather than foot archers, but neither of " -"THEM had to fight zombies. Activate to store arrows." +"60 arrows. Historically used by horse archers, rather than foot archers, " +"but neither of THEM had to fight zombies. Activate to store arrows." msgstr "" #. ~ Description for pair of ski goggles @@ -13943,9 +13947,8 @@ msgid "" "electronics and robots." msgstr "" -#. ~ Description for Telescopic Eyes #. ~ Description for Telescopic Eyes CBM -#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py +#: lang/json/BIONIC_ITEM_from_json.py msgid "" "Much of the material in your inner eye has been removed and replaced with an " "array of high-powered, auto-focusing lenses. You can now see much farther " @@ -20388,7 +20391,6 @@ msgid "Made from real Massachusetts cranberries. Delicious and nutritious." msgstr "" #. ~ Description for whiskey -#. ~ Description for test_whiskey #: lang/json/COMESTIBLE_from_json.py msgid "Made from, by, and for real Southern colonels!" msgstr "" @@ -25683,6 +25685,12 @@ msgid_plural "seasoned salt" msgstr[0] "" msgstr[1] "" +#: lang/json/COMESTIBLE_from_json.py lang/json/furniture_from_json.py +msgid "seed" +msgid_plural "seeds" +msgstr[0] "" +msgstr[1] "" + #: lang/json/COMESTIBLE_from_json.py msgid "seed potato" msgid_plural "seed potatoes" @@ -26059,12 +26067,6 @@ msgid_plural "tequilas" msgstr[0] "tequila" msgstr[1] "tequilas" -#: lang/json/COMESTIBLE_from_json.py -msgid "test_whiskey" -msgid_plural "test_whiskey" -msgstr[0] "" -msgstr[1] "" - #: lang/json/COMESTIBLE_from_json.py msgid "thyme" msgid_plural "thymes" @@ -26731,11 +26733,6 @@ msgid "" "A watertight leather bag with a carrying strap, can hold 3 liters of water." msgstr "" -#. ~ Description for test glass bottle -#: lang/json/CONTAINER_from_json.py -msgid "An UNSEALABLE glass bottle, holds 750 ml of liquid." -msgstr "" - #. ~ Description for aluminum can #: lang/json/CONTAINER_from_json.py msgid "An aluminum can, like what soda comes in." @@ -27013,12 +27010,6 @@ msgid_plural "steel jerrycans" msgstr[0] "" msgstr[1] "" -#: lang/json/CONTAINER_from_json.py -msgid "test glass bottle" -msgid_plural "test glass bottles" -msgstr[0] "" -msgstr[1] "" - #: lang/json/CONTAINER_from_json.py msgid "tin can" msgid_plural "tin cans" @@ -27245,17 +27236,6 @@ msgid "" "removed from this sealed bag. Disassemble it to get to its contents." msgstr "" -#. ~ Description for car battery -#: lang/json/GENERIC_from_json.py -msgid "A 12v lead-acid battery used to power car electrical systems." -msgstr "" - -#. ~ Description for motorbike battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A 12v lead-acid battery used to power smaller vehicles' electrical systems." -msgstr "" - #. ~ Description for long rope #: lang/json/GENERIC_from_json.py msgid "" @@ -28125,11 +28105,6 @@ msgstr "" msgid "A kiln full of wood that has been lit; better drop it!" msgstr "" -#. ~ Description for truck battery -#: lang/json/GENERIC_from_json.py -msgid "A large 12v lead-acid battery used to power truck electrical systems." -msgstr "" - #. ~ Description for truck alternator #: lang/json/GENERIC_from_json.py msgid "A large alternator used to power truck electrical systems." @@ -28247,13 +28222,6 @@ msgstr "" msgid "A large stone, roughly hollowed out into a pot." msgstr "" -#. ~ Description for storage battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A large storage battery. Could be installed into a storage battery case for " -"easy removal from a vehicle, or just welded straight in." -msgstr "" - #. ~ Description for folding wire basket #: lang/json/GENERIC_from_json.py msgid "A large wire basket from a shopping cart, modified to be foldable." @@ -28393,11 +28361,6 @@ msgid "" "piercing to boot." msgstr "" -#. ~ Description for medium storage battery -#: lang/json/GENERIC_from_json.py -msgid "A medium storage battery." -msgstr "" - #. ~ Description for SD-Memory card #: lang/json/GENERIC_from_json.py msgid "A memory card, used. Might be worth a look." @@ -29052,11 +29015,6 @@ msgid "" "used to lift up to 1.5 metric tonnes." msgstr "" -#. ~ Description for small storage battery -#: lang/json/GENERIC_from_json.py -msgid "A small storage battery. Useful for crafting." -msgstr "" - #. ~ Description for damaged tent #: lang/json/GENERIC_from_json.py msgid "" @@ -31585,12 +31543,6 @@ msgid_plural "car alternators" msgstr[0] "alternador de coche" msgstr[1] "alternadores de coche" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "car battery" -msgid_plural "car batteries" -msgstr[0] "batería de coche" -msgstr[1] "baterías de coche" - #: lang/json/GENERIC_from_json.py msgid "carding paddles" msgid_plural "pairs of carding paddles" @@ -32459,12 +32411,6 @@ msgid_plural "mechanical pumps" msgstr[0] "" msgstr[1] "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "medium storage battery" -msgid_plural "medium storage batteries" -msgstr[0] "" -msgstr[1] "" - #: lang/json/GENERIC_from_json.py msgid "mess tin" msgid_plural "mess tins" @@ -32537,12 +32483,6 @@ msgid_plural "motorbike alternators" msgstr[0] "" msgstr[1] "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "motorbike battery" -msgid_plural "motorbike batteries" -msgstr[0] "" -msgstr[1] "" - #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "muffler" msgid_plural "mufflers" @@ -33204,12 +33144,6 @@ msgid_plural "small electric motors" msgstr[0] "" msgstr[1] "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "small storage battery" -msgid_plural "small storage batteries" -msgstr[0] "" -msgstr[1] "" - #: lang/json/GENERIC_from_json.py msgid "software" msgid_plural "softwares" @@ -33330,12 +33264,6 @@ msgid_plural "stone spears" msgstr[0] "" msgstr[1] "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "storage battery" -msgid_plural "storage batteries" -msgstr[0] "" -msgstr[1] "" - #: lang/json/GENERIC_from_json.py msgid "storage battery case" msgid_plural "storage battery cases" @@ -33492,12 +33420,6 @@ msgid_plural "truck alternators" msgstr[0] "" msgstr[1] "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "truck battery" -msgid_plural "truck batteries" -msgstr[0] "" -msgstr[1] "" - #: lang/json/GENERIC_from_json.py msgid "turret engine" msgid_plural "turret engines" @@ -35284,7 +35206,7 @@ msgstr "" #: lang/json/GUN_from_json.py msgid "" "A homemade triple-barrel 40mm grenade launcher. Capable of launching all " -"three grenades at once, it is extremely powerwul for a homemade weapon." +"three grenades at once, it is extremely powerful for a homemade weapon." msgstr "" #. ~ Description for blunderbuss @@ -39530,6 +39452,17 @@ msgid "" "L39B-45 pistols." msgstr "" +#. ~ Description for car battery +#: lang/json/MAGAZINE_from_json.py +msgid "A 12v lead-acid battery used to power car electrical systems." +msgstr "" + +#. ~ Description for motorbike battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A 12v lead-acid battery used to power smaller vehicles' electrical systems." +msgstr "" + #. ~ Description for RMSB20 magazine #: lang/json/MAGAZINE_from_json.py msgid "A 20 round box magazine for use with the RM20 caseless shotgun." @@ -39767,6 +39700,11 @@ msgstr "" msgid "A high-capacity drum magazine for the PPSh-41." msgstr "" +#. ~ Description for truck battery +#: lang/json/MAGAZINE_from_json.py +msgid "A large 12v lead-acid battery used to power truck electrical systems." +msgstr "" + #. ~ Description for welding tank #: lang/json/MAGAZINE_from_json.py msgid "" @@ -39774,6 +39712,13 @@ msgid "" "is marked with several faded and now unreadable symbols." msgstr "" +#. ~ Description for storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A large storage battery. Could be installed into a storage battery case for " +"easy removal from a vehicle, or just welded straight in." +msgstr "" + #. ~ Description for M1 Garand Clip #: lang/json/MAGAZINE_from_json.py msgid "" @@ -39786,6 +39731,11 @@ msgstr "" msgid "A lightweight aluminum box magazine for the H&K G3 rifle." msgstr "" +#. ~ Description for medium storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A medium storage battery." +msgstr "" + #. ~ Description for M9 magazine #: lang/json/MAGAZINE_from_json.py msgid "" @@ -39827,6 +39777,11 @@ msgid "" "A removable plastic magazine for the Saiga-12 shotgun. Holds 30 rounds." msgstr "" +#. ~ Description for small storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A small storage battery. Useful for crafting." +msgstr "" + #. ~ Description for Battle rifle magazine #: lang/json/MAGAZINE_from_json.py msgid "A standard 20-round magazine for military issue battle rifles." @@ -40475,14 +40430,50 @@ msgstr "" msgid "Walther PPK magazine" msgstr "" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "car battery" +msgid_plural "car batteries" +msgstr[0] "batería de coche" +msgstr[1] "baterías de coche" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "medium storage battery" +msgid_plural "medium storage batteries" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "motorbike battery" +msgid_plural "motorbike batteries" +msgstr[0] "" +msgstr[1] "" + #: lang/json/MAGAZINE_from_json.py msgid "nail rifle magazine" msgstr "" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "small storage battery" +msgid_plural "small storage batteries" +msgstr[0] "" +msgstr[1] "" + #: lang/json/MAGAZINE_from_json.py msgid "small welding tank" msgstr "" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "storage battery" +msgid_plural "storage batteries" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "truck battery" +msgid_plural "truck batteries" +msgstr[0] "" +msgstr[1] "" + #: lang/json/MAGAZINE_from_json.py msgid "welding tank" msgstr "" @@ -42746,8 +42737,8 @@ msgstr "" #. ~ Description for giant mosquito #: lang/json/MONSTER_from_json.py msgid "" -"An enormous mutant mosquito, fluttering erratically, its face dominated by a " -"long, spear-tipped proboscis." +"An enormous mutant mosquito, fluttering erratically. Its face is dominated " +"by a long, spear-tipped proboscis." msgstr "" #. ~ Description for giant ant @@ -47686,11 +47677,6 @@ msgstr "" msgid "Hsssss." msgstr "" -#. ~ Description for fake UPS -#: lang/json/TOOL_from_json.py -msgid "If you can see this, it is a bug." -msgstr "" - #: lang/json/TOOL_from_json.py msgid "Kevlar plate" msgid_plural "Kevlar plates" @@ -50126,6 +50112,11 @@ msgid "" "shouldn't spawn in normal game." msgstr "" +#. ~ Description for snowman +#: lang/json/TOOL_from_json.py +msgid "This is a test item for testing unicode support." +msgstr "" + #. ~ Description for candle (lit) #: lang/json/TOOL_from_json.py msgid "" @@ -52252,12 +52243,6 @@ msgid_plural "extra battery mods" msgstr[0] "" msgstr[1] "" -#: lang/json/TOOL_from_json.py -msgid "fake UPS" -msgid_plural "fake UPS" -msgstr[0] "" -msgstr[1] "" - #: lang/json/TOOL_from_json.py msgid "fake item" msgid_plural "fake items" @@ -53672,6 +53657,12 @@ msgid_plural "snare triggers" msgstr[0] "" msgstr[1] "" +#: lang/json/TOOL_from_json.py +msgid "snowman" +msgid_plural "snowmans" +msgstr[0] "" +msgstr[1] "" + #: lang/json/TOOL_from_json.py msgid "soda can stove kit" msgid_plural "soda can stove kits" @@ -54958,6 +54949,15 @@ msgid "" "electronics and robots." msgstr "" +#. ~ Description for Telescopic Eyes +#: lang/json/bionic_from_json.py +msgid "" +"Much of the material in your inner eye has been removed and replaced with an " +"array of high-powered, auto-focusing lenses. You can now see much farther " +"and more clearly than before, any vision problems you might have had are now " +"gone." +msgstr "" + #: lang/json/bionic_from_json.py msgid "Muscle Augmentation" msgstr "" @@ -58510,7 +58510,8 @@ msgstr "¡CRASH!" msgid "crate" msgstr "caja" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp msgid "crunch!" msgstr "¡CRUNCH!" @@ -58606,8 +58607,8 @@ msgstr "" msgid "glass breaking" msgstr "rotura de cristales" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp -#: src/map.cpp src/ranged.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp src/map.cpp src/ranged.cpp msgid "glass breaking!" msgstr "rotura de cristales." @@ -58615,6 +58616,10 @@ msgstr "rotura de cristales." msgid "glass door fridge" msgstr "puerta de nevera de cristal" +#: lang/json/furniture_from_json.py +msgid "gravestone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "groundsheet" msgstr "" @@ -58631,6 +58636,10 @@ msgstr "" msgid "hay" msgstr "" +#: lang/json/furniture_from_json.py +msgid "headstone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "heavy punching bag" msgstr "" @@ -58707,6 +58716,10 @@ msgstr "" msgid "mutated poppy flower" msgstr "" +#: lang/json/furniture_from_json.py +msgid "obelisk" +msgstr "" + #: lang/json/furniture_from_json.py msgid "open animalskin flap" msgstr "" @@ -58807,10 +58820,6 @@ msgstr "muro de sacos de arena" msgid "screeching metal!" msgstr "chirrido de metales." -#: lang/json/furniture_from_json.py -msgid "seed" -msgstr "semilla" - #: lang/json/furniture_from_json.py msgid "seedling" msgstr "" @@ -58892,6 +58901,10 @@ msgstr "¡THUMP!" msgid "thump." msgstr "thump." +#: lang/json/furniture_from_json.py +msgid "thunk!" +msgstr "" + #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py msgid "thunk." msgstr "" @@ -58968,6 +58981,10 @@ msgstr "estufa de leña" msgid "wooden keg" msgstr "" +#: lang/json/furniture_from_json.py +msgid "worn gravestone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "yellow indoor plant" msgstr "" @@ -59301,7 +59318,9 @@ msgstr "" #: lang/json/hint_from_json.py msgid "" "If you get a pair of night vision goggles, hold on to them! A flashlight " -"will give you away, but with goggles you can be sneaky." +"will give you away, but with goggles you can be sneaky. Beware that some " +"types of zombies are camouflaged against it, and require proper light to be " +"visible." msgstr "" #: lang/json/hint_from_json.py @@ -61701,6 +61720,13 @@ msgstr "" msgid "Niten Ichi-Ryu" msgstr "" +#. ~ Description for martial art 'Niten Ichi-Ryu' +#: lang/json/martial_art_from_json.py +msgid "" +"Niten Ichi-Ryu is an ancient school of combat, transmitting a style of " +"classical Japanese swordsmanship conceived by the warrior Miyamoto Musashi." +msgstr "" + #. ~ Description for martial art 'Niten Ichi-Ryu' #: lang/json/martial_art_from_json.py msgid "" @@ -68117,6 +68143,10 @@ msgstr "centro de refugiados" msgid "regional school" msgstr "escuela regional" +#: lang/json/overmap_terrain_from_json.py +msgid "religious cemetery" +msgstr "" + #: lang/json/overmap_terrain_from_json.py msgid "restaurant" msgstr "restaurante" @@ -70591,8 +70621,8 @@ msgstr "Profesor" msgctxt "prof_desc_female" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" #. ~ Profession (male Lab Technician) description @@ -70600,8 +70630,8 @@ msgstr "" msgctxt "prof_desc_male" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" #. ~ Profession (Punk Rock Girl) description @@ -80208,6 +80238,10 @@ msgstr "" msgid "smashed gas pump" msgstr "" +#: lang/json/terrain_from_json.py +msgid "smoothed rock" +msgstr "" + #: lang/json/terrain_from_json.py lang/json/trap_from_json.py msgid "spiked pit" msgstr "" @@ -82161,8 +82195,8 @@ msgstr "Atrás" #: src/action.cpp src/activity_handlers.cpp src/color.cpp src/crafting.cpp #: src/editmap.cpp src/game.cpp src/iexamine.cpp src/inventory_ui.cpp #: src/item_action.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/mission_companion.cpp src/pickup.cpp src/player.cpp src/veh_interact.cpp -#: src/vehicle.cpp +#: src/mission_companion.cpp src/pickup.cpp src/player.cpp +#: src/veh_interact.cpp src/vehicle.cpp msgid "Cancel" msgstr "Cancelar" @@ -84105,7 +84139,8 @@ msgstr "" msgid "Rules" msgstr "" -#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp src/options.cpp +#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp +#: src/options.cpp msgid "Save changes?" msgstr "¿Guardar cambios?" @@ -84649,22 +84684,22 @@ msgstr "" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / %d turns" +msgid "%d PU act" msgstr "" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / turn" +msgid "%d PU deact" msgstr "" #: src/bionics_ui.cpp #, c-format -msgid "%d PU act" +msgid "%d PU/%d turns" msgstr "" #: src/bionics_ui.cpp #, c-format -msgid "%d PU deact" +msgid "%d PU/turn" msgstr "" #: src/bionics_ui.cpp src/mutation_ui.cpp @@ -90875,6 +90910,14 @@ msgstr "" msgid "It takes some time to move the heavy %s." msgstr "" +#: src/game.cpp +msgid "It takes you a long time to steer that vehicle!" +msgstr "" + +#: src/game.cpp +msgid "It takes you a very long time to steer that vehicle!" +msgstr "" + #: src/game.cpp msgid "It's too dangerous to tunnel that far!" msgstr "" @@ -91230,6 +91273,10 @@ msgstr "" msgid "Pour %s where?" msgstr "" +#: src/game.cpp +msgid "Pour into a container" +msgstr "" + #: src/game.cpp #, c-format msgid "Pour into an adjacent keg (%s)" @@ -92639,6 +92686,11 @@ msgstr "" msgid "You feel your genetic makeup degrading." msgstr "" +#: src/game.cpp +#, c-format +msgid "You fumble with the %s's controls." +msgstr "Manejas torpemente los controles de %s." + #: src/game.cpp msgid "You get a hold of yourself." msgstr "" @@ -97197,6 +97249,11 @@ msgstr "Puedes usarlo para elaborar varias cosas." msgid "You could use it to craft: %s" msgstr "Puedes usarlo para elaborar: %s" +#: src/item.cpp +#, c-format +msgid "You fall asleep and drop your %s." +msgstr "" + #: src/item.cpp #, c-format msgid "You finish your %s." @@ -98747,10 +98804,6 @@ msgstr "" msgid "That isn't a firearm!" msgstr "" -#: src/iuse.cpp -msgid "That item already has a rechargeable battery pack." -msgstr "" - #: src/iuse.cpp msgid "That item has already had its battery capacity doubled." msgstr "" @@ -100245,13 +100298,6 @@ msgstr "¡Has reparado tu %s completamente!" msgid "You repair your %s!" msgstr "¡Has reparado tu %s!" -#: src/iuse.cpp -#, c-format -msgid "" -"You replace the battery compartment of your %s with a rechargeable battery " -"pack!" -msgstr "" - #: src/iuse.cpp #, c-format msgid "You replace your current %s." @@ -103027,11 +103073,6 @@ msgstr "" msgid "You fail to disarm the trap." msgstr "No has conseguido desarmar la trampa." -#: src/map.cpp -#, c-format -msgid "You fumble with the %s's controls." -msgstr "Manejas torpemente los controles de %s." - #: src/map.cpp #, c-format msgid "You lose control of the %s." @@ -110875,10 +110916,6 @@ msgstr "No muevas un músculo..." msgid "Drop items" msgstr "" -#: src/npcmove.cpp -msgid "Fire a burst" -msgstr "" - #: src/npcmove.cpp msgid "Flee" msgstr "" @@ -116151,10 +116188,6 @@ msgstr "" msgid "Good mood +%s%d%%" msgstr "Buen humor +%s%d%%" -#: src/player.cpp -msgid "Gun:" -msgstr "" - #: src/player.cpp msgid "He" msgstr "Él" @@ -118394,10 +118427,6 @@ msgstr "cornamenta" msgid "armor" msgstr "armadura" -#: src/player.cpp -msgid "auto" -msgstr "" - #: src/player.cpp msgid "beep-beep-beep!" msgstr "" @@ -118410,10 +118439,6 @@ msgstr "pelo" msgid "horns" msgstr "cuernos" -#: src/player.cpp -msgid "off " -msgstr "" - #: src/player.cpp msgid "quills" msgstr "" @@ -120246,11 +120271,6 @@ msgstr "" msgid "%d\"" msgstr "" -#: src/vehicle.cpp -#, c-format -msgid "%s failed to fire! It isn't loaded and/or powered." -msgstr "" - #: src/vehicle.cpp #, c-format msgid "%s points in your direction and emits an IFF warning beep." @@ -120287,10 +120307,6 @@ msgid "" "trying to fold the %s while riding it." msgstr "" -#: src/vehicle.cpp -msgid "Auto" -msgstr "Auto" - #. ~ backfire sound #: src/vehicle.cpp msgid "BANG!" @@ -120353,10 +120369,6 @@ msgstr "" msgid "Close" msgstr "Cerrar" -#: src/vehicle.cpp -msgid "Configure individual turrets" -msgstr "" - #: src/vehicle.cpp msgid "Control individual engines" msgstr "" @@ -120373,32 +120385,10 @@ msgstr "Control de crucero encendido" msgid "Cugugugugug" msgstr "" -#: src/vehicle.cpp -msgid "Cycle turret mode" -msgstr "" - -#: src/vehicle.cpp -msgid "Deactivating automatic target acquisition for this turret" -msgstr "" - #: src/vehicle.cpp msgid "Disable cruise control" msgstr "Deshabilitar control de crucero" -#: src/vehicle.cpp -msgid "Disable turrets" -msgstr "Desactivar torretas" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling automatic target acquisition on %s" -msgstr "" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling turret %s." -msgstr "" - #: src/vehicle.cpp msgid "Do nothing" msgstr "No hacer nada" @@ -120415,10 +120405,6 @@ msgstr "" msgid "Enable cruise control" msgstr "Habilitar control de crucero" -#: src/vehicle.cpp -msgid "Enable turrets" -msgstr "Activar torretas" - #. ~ indicates that a vehicle part is outside #: src/vehicle.cpp msgid "Exterior" @@ -120505,10 +120491,6 @@ msgstr "" msgid "No controls there." msgstr "No hay controles aquí." -#: src/vehicle.cpp -msgid "No target" -msgstr "" - #: src/vehicle.cpp msgid "Open" msgstr "Abrir" @@ -120574,18 +120556,15 @@ msgid "Select door to toggle" msgstr "" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to buggy mode." +msgid "Set turret firing modes" msgstr "" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to burst mode." +msgid "Set turret targeting" msgstr "" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to single-fire mode." +msgid "Set turret targeting modes" msgstr "" #: src/vehicle.cpp @@ -120633,6 +120612,11 @@ msgstr "" msgid "The %s doesn't have enough wheels to move!" msgstr "¡%s no tiene sifucientes ruedas para moverlo!" +#: src/vehicle.cpp +#, c-format +msgid "The %s is stuck." +msgstr "" + #: src/vehicle.cpp #, c-format msgid "The %s is too leaky!" @@ -120768,14 +120752,6 @@ msgstr "¡La radio no funciona!" msgid "The vehicle part you were working on has gone!" msgstr "" -#: src/vehicle.cpp -msgid "This turret can't be aimed manually" -msgstr "" - -#: src/vehicle.cpp -msgid "This turret doesn't have enough ammo" -msgstr "" - #: src/vehicle.cpp msgid "This turret is not powered" msgstr "" @@ -120942,26 +120918,6 @@ msgstr "" msgid "Turned on music" msgstr "" -#: src/vehicle.cpp -msgid "Turret system is on, but all turrets are configured not to shoot." -msgstr "" - -#: src/vehicle.cpp -msgid "Turrets have been configured, but the vehicle turret system is off." -msgstr "" - -#: src/vehicle.cpp -msgid "Turrets: Disabled" -msgstr "Torretas: Desactivadas" - -#: src/vehicle.cpp -msgid "Turrets: Enabled" -msgstr "Torretas: Activadas" - -#: src/vehicle.cpp -msgid "Unseen" -msgstr "" - #: src/vehicle.cpp msgid "Vehicle controls" msgstr "Controles del vehículo" @@ -121093,6 +121049,10 @@ msgstr "Tu motor emite un chirrido fuerte." msgid "a simple melody blaring from the loudspeakers." msgstr "" +#: src/vehicle.cpp +msgid "auto" +msgstr "" + #. ~ Beeper sound #: src/vehicle.cpp msgid "beep!" @@ -121107,6 +121067,10 @@ msgstr "" msgid "hummm!" msgstr "" +#: src/vehicle.cpp +msgid "manual" +msgstr "" + #: src/vehicle.cpp msgid "roarrr!" msgstr "" From 0c6fa3707bb156cbbb833e0ba41313fc299d1f95 Mon Sep 17 00:00:00 2001 From: Vlasov Vitaly Date: Thu, 9 Jun 2016 21:01:16 +0300 Subject: [PATCH 096/110] French update --- lang/po/fr.po | 554 +++++++++++++++++++++++--------------------------- 1 file changed, 253 insertions(+), 301 deletions(-) diff --git a/lang/po/fr.po b/lang/po/fr.po index 681db55bad791..9ec89febcf1b8 100644 --- a/lang/po/fr.po +++ b/lang/po/fr.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Cataclysm-DDA\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-30 09:53+0300\n" -"PO-Revision-Date: 2016-05-30 08:22+0000\n" -"Last-Translator: Vlasov Vitaly \n" +"POT-Creation-Date: 2016-06-06 10:20+0300\n" +"PO-Revision-Date: 2016-06-07 21:06+0000\n" +"Last-Translator: Jazz \n" "Language-Team: French (http://www.transifex.com/cataclysm-dda-translators/" "cataclysm-dda/language/fr/)\n" "Language: fr\n" @@ -1422,6 +1422,13 @@ msgid "A box of small steel balls. They deal virtually no damage." msgstr "" "Une boite de petites billes en acier, elles ne font quasiment aucun dommage." +#. ~ Description for .44 FMJ +#: lang/json/AMMO_from_json.py +msgid "" +"A brass-jacketed variant of the .44 Magnum round. This increases " +"penetration slightly at the cost of reduced damage from expansion." +msgstr "" + #. ~ Description for blue paint #: lang/json/AMMO_from_json.py msgid "A can of blue paint." @@ -2198,10 +2205,8 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A simple arrow shaft that has had a point carved into it and then fire-" -"hardened. Needs fletching to be worth firing from a bow." +"hardened. It needs fletching to be worth firing from a bow." msgstr "" -"Une hampe de flèche dont la pointe a été taillée et renforcée par le feu. Il " -"lui faut un empennage pour la tirer avec un arc." #. ~ Description for ammo belt linkage #: lang/json/AMMO_from_json.py @@ -2787,18 +2792,6 @@ msgstr "" "à roquettes ou des explosifs. Provoque de sérieuses brûlures sur les " "matières organiques et peut même les enflammer au contact." -#. ~ Description for .22 CB -#: lang/json/AMMO_from_json.py -msgid "" -"Conical Ball .22 is a variety of .22 ammunition with a very small propellant " -"charge and generally lacks gunpowder. The end result is a subsonic round " -"that is so weak as to be nearly useless given your predicament." -msgstr "" -"La munition conique .22 est une variété de munition .22 avec une très petite " -"charge propulsive et manque ordinairement de poudre à canon. Le résultat " -"final est une cartouche subsonique si faible qu'elle en est quasi inutile " -"considérant la situation fâcheuse où vous vous trouvez." - #. ~ Description for handloaded .22 CB #: lang/json/AMMO_from_json.py msgid "" @@ -3324,13 +3317,11 @@ msgstr[1] "RDX" #. ~ Description for .22 rat-shot #: lang/json/AMMO_from_json.py msgid "" -"Rat-shot is extremely weak ammunition, designed for killing rats, snakes, or " -"other small vermin while being unable to damage walls. It has an extremely " -"short range and is unable to injure all but the smallest creatures." +"Rat-shot is an extremely weak .22 shotgun cartridge, designed for killing " +"rats, snakes, or other small vermin while being unable to damage walls. It " +"has an extremely short range and is unable to injure all but the smallest " +"creatures." msgstr "" -"Les rat-shots sont des cartouches vraiment peu puissantes, conçues pour tuer " -"des rats, serpents, et autres vermines sans endommager les murs. La portée " -"est extrêmement faible et ne peut blesser que les plus petites créatures." #. ~ Description for handloaded .22 rat-shot #: lang/json/AMMO_from_json.py @@ -3457,6 +3448,14 @@ msgstr "" "nombreuses formules chimiques mais est principalement connu pour son " "utilisation en tant qu'acide de batterie." +#. ~ Description for .22 CB +#: lang/json/AMMO_from_json.py +msgid "" +"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." +msgstr "" + #. ~ Description for reloaded .300 Winchester Magnum #: lang/json/AMMO_from_json.py msgid "" @@ -3662,10 +3661,8 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "This metal shaft has been carefully sharpened so that it has a crude point " -"at the end. Needs fletching to be worth firing from a bow." +"at the end. It needs fletching to be worth firing from a bow." msgstr "" -"Cette hampe en métal a été soigneusement affûtée pour la tailler en pointe. " -"Il lui faut un empennage pour que ça vaille le coup de la tirer." #. ~ Description for sharpened metal arrow #: lang/json/AMMO_from_json.py @@ -5017,8 +5014,8 @@ msgstr[0] "" msgstr[1] "" #: lang/json/AMMO_from_json.py -msgid "reloaded 7.62x39mm M87" -msgid_plural "reloaded 7.62x39mm M87" +msgid "reloaded 7.62x39mm M67" +msgid_plural "reloaded 7.62x39mm M67" msgstr[0] "" msgstr[1] "" @@ -6765,15 +6762,9 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "" "A large leather quiver trimmed with metal, worn on the back, that can hold " -"60 arrows.\n" -"Historically used by horse archers, rather than foot archers, but neither of " -"THEM had to fight zombies. Activate to store arrows." +"60 arrows. Historically used by horse archers, rather than foot archers, " +"but neither of THEM had to fight zombies. Activate to store arrows." msgstr "" -"Un grand carquois en cuir garni de métal, que l'on porte sur le dos; il peut " -"contenir 60 flèches.\n" -"Historiquement utilisé par les archers à cheval plutôt que les archers à " -"pied, mais aucun d'entre EUX ne combattaient de zombies. Activer pour " -"stocker des flèches." #. ~ Description for pair of ski goggles #: lang/json/ARMOR_from_json.py @@ -14317,9 +14308,8 @@ msgstr "" "l'énergie pour tirer une explosion (à courte distance) qui désactivera les " "instruments électroniques et les robots." -#. ~ Description for Telescopic Eyes #. ~ Description for Telescopic Eyes CBM -#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py +#: lang/json/BIONIC_ITEM_from_json.py msgid "" "Much of the material in your inner eye has been removed and replaced with an " "array of high-powered, auto-focusing lenses. You can now see much farther " @@ -20107,6 +20097,9 @@ msgid "" "An assortment of edible-looking wild plants. Most are quite bitter-" "tasting. Some are inedible until cooked." msgstr "" +"Un assortiment de plantes sauvages qui ont l'air comestibles. La plupart " +"sont amères. \n" +"Certains sont immangeables crus." #. ~ Description for reptile egg #: lang/json/COMESTIBLE_from_json.py @@ -21632,7 +21625,6 @@ msgstr "" "nourrissant." #. ~ Description for whiskey -#. ~ Description for test_whiskey #: lang/json/COMESTIBLE_from_json.py msgid "Made from, by, and for real Southern colonels!" msgstr "" @@ -27146,6 +27138,12 @@ msgid_plural "seasoned salt" msgstr[0] "sel assaisonné" msgstr[1] "sel assaisonné" +#: lang/json/COMESTIBLE_from_json.py lang/json/furniture_from_json.py +msgid "seed" +msgid_plural "seeds" +msgstr[0] "" +msgstr[1] "" + #: lang/json/COMESTIBLE_from_json.py msgid "seed potato" msgid_plural "seed potatoes" @@ -27522,12 +27520,6 @@ msgid_plural "tequilas" msgstr[0] "tequila" msgstr[1] "tequila" -#: lang/json/COMESTIBLE_from_json.py -msgid "test_whiskey" -msgid_plural "test_whiskey" -msgstr[0] "" -msgstr[1] "" - #: lang/json/COMESTIBLE_from_json.py msgid "thyme" msgid_plural "thymes" @@ -28230,11 +28222,6 @@ msgstr "" "Une gourde en cuir avec une sangle pour la porter qui peut contenir 3 litres " "d'eau." -#. ~ Description for test glass bottle -#: lang/json/CONTAINER_from_json.py -msgid "An UNSEALABLE glass bottle, holds 750 ml of liquid." -msgstr "" - #. ~ Description for aluminum can #: lang/json/CONTAINER_from_json.py msgid "An aluminum can, like what soda comes in." @@ -28517,12 +28504,6 @@ msgid_plural "steel jerrycans" msgstr[0] "jerrycan en acier" msgstr[1] "jerrycans en acier" -#: lang/json/CONTAINER_from_json.py -msgid "test glass bottle" -msgid_plural "test glass bottles" -msgstr[0] "" -msgstr[1] "" - #: lang/json/CONTAINER_from_json.py msgid "tin can" msgid_plural "tin cans" @@ -28769,21 +28750,6 @@ msgid "" "removed from this sealed bag. Disassemble it to get to its contents." msgstr "" -#. ~ Description for car battery -#: lang/json/GENERIC_from_json.py -msgid "A 12v lead-acid battery used to power car electrical systems." -msgstr "" -"Une batterie au plomb de 12Volts utilisée pour alimenter le système " -"électrique de voitures." - -#. ~ Description for motorbike battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A 12v lead-acid battery used to power smaller vehicles' electrical systems." -msgstr "" -"Une batterie au plomb de 12Volts utilisée pour alimenter le système " -"électrique de petits véhicules." - #. ~ Description for long rope #: lang/json/GENERIC_from_json.py msgid "" @@ -29726,13 +29692,6 @@ msgstr "" msgid "A kiln full of wood that has been lit; better drop it!" msgstr "Un four rempli de bois qui brûle; vous feriez bien de le poser!" -#. ~ Description for truck battery -#: lang/json/GENERIC_from_json.py -msgid "A large 12v lead-acid battery used to power truck electrical systems." -msgstr "" -"Une batterie au plomb de 12Volts utilisée pour alimenter le système " -"électrique de camions." - #. ~ Description for truck alternator #: lang/json/GENERIC_from_json.py msgid "A large alternator used to power truck electrical systems." @@ -29861,13 +29820,6 @@ msgstr "" msgid "A large stone, roughly hollowed out into a pot." msgstr "Une large pierre, grossièrement creusée en pot." -#. ~ Description for storage battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A large storage battery. Could be installed into a storage battery case for " -"easy removal from a vehicle, or just welded straight in." -msgstr "" - #. ~ Description for folding wire basket #: lang/json/GENERIC_from_json.py msgid "A large wire basket from a shopping cart, modified to be foldable." @@ -30038,11 +29990,6 @@ msgstr "" "pointes de fer à son extrémité. Elle inflige des dommages contondants " "dévastateurs ainsi que quelques dommages perçants." -#. ~ Description for medium storage battery -#: lang/json/GENERIC_from_json.py -msgid "A medium storage battery." -msgstr "Une batterie moyenne." - #. ~ Description for SD-Memory card #: lang/json/GENERIC_from_json.py msgid "A memory card, used. Might be worth a look." @@ -30788,11 +30735,6 @@ msgid "" "used to lift up to 1.5 metric tonnes." msgstr "" -#. ~ Description for small storage battery -#: lang/json/GENERIC_from_json.py -msgid "A small storage battery. Useful for crafting." -msgstr "Une petite batterie d'accumulateurs, utile pour l'artisanat." - #. ~ Description for damaged tent #: lang/json/GENERIC_from_json.py msgid "" @@ -33524,12 +33466,6 @@ msgid_plural "car alternators" msgstr[0] "alternateur de voiture" msgstr[1] "alternateurs de voiture" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "car battery" -msgid_plural "car batteries" -msgstr[0] "batterie de voiture" -msgstr[1] "batteries de voiture" - #: lang/json/GENERIC_from_json.py msgid "carding paddles" msgid_plural "pairs of carding paddles" @@ -34398,12 +34334,6 @@ msgid_plural "mechanical pumps" msgstr[0] "pompe mécanique" msgstr[1] "pompes mécaniques" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "medium storage battery" -msgid_plural "medium storage batteries" -msgstr[0] "batterie moyenne" -msgstr[1] "batteries moyennes" - #: lang/json/GENERIC_from_json.py msgid "mess tin" msgid_plural "mess tins" @@ -34476,12 +34406,6 @@ msgid_plural "motorbike alternators" msgstr[0] "alternateur de moto" msgstr[1] "alternateurs de moto" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "motorbike battery" -msgid_plural "motorbike batteries" -msgstr[0] "batterie de moto" -msgstr[1] "batteries de moto" - #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "muffler" msgid_plural "mufflers" @@ -35143,12 +35067,6 @@ msgid_plural "small electric motors" msgstr[0] "petit moteur électrique" msgstr[1] "petits moteurs électriques" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "small storage battery" -msgid_plural "small storage batteries" -msgstr[0] "petite batterie" -msgstr[1] "petites batteries" - #: lang/json/GENERIC_from_json.py msgid "software" msgid_plural "softwares" @@ -35269,12 +35187,6 @@ msgid_plural "stone spears" msgstr[0] "" msgstr[1] "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "storage battery" -msgid_plural "storage batteries" -msgstr[0] "batterie" -msgstr[1] "batteries" - #: lang/json/GENERIC_from_json.py msgid "storage battery case" msgid_plural "storage battery cases" @@ -35431,12 +35343,6 @@ msgid_plural "truck alternators" msgstr[0] "alternateur de camion" msgstr[1] "alternateurs de camion" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "truck battery" -msgid_plural "truck batteries" -msgstr[0] "batterie de camion" -msgstr[1] "batteries de camion" - #: lang/json/GENERIC_from_json.py msgid "turret engine" msgid_plural "turret engines" @@ -35753,6 +35659,9 @@ msgid "" "shotgun, submachinegun or rifle, allowing a melee attack to deal piercing " "damage." msgstr "" +"Une baïonnette est une arme d'estoc qui peut être attachée à l'avant d'un " +"fusil, d'un pistolet mitrailleur ou d'un fusil militaire, permettant ainsi " +"une attaque au corps à corps avec des dommages perçants." #. ~ Description for leadworks magazine adaptor #: lang/json/GUNMOD_from_json.py @@ -35877,6 +35786,9 @@ msgid "" "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." msgstr "" +"Une baïonnette pour pistolet est une arme d'estoc qui peut être attachée à " +"l'avant d'un pistolet, permettant ainsi une attaque au corps à corps avec " +"des dommages perçants." #. ~ Description for ported barrel #: lang/json/GUNMOD_from_json.py @@ -36038,6 +35950,9 @@ msgid "" "A sword bayonet is a large slashing weapon that can be attached to the front " "of a shotgun or rifle, allowing a melee attack to deal cutting damage." msgstr "" +"Une baïonnette épée est une arme tranchante qui peut être attachée à l'avant " +"d'un fusil, d'un pistolet mitrailleur ou d'un fusil militaire, permettant " +"ainsi une attaque au corps à corps avec des dommages tranchants." #. ~ Description for underbarrel laser sight #: lang/json/GUNMOD_from_json.py @@ -37340,7 +37255,7 @@ msgstr "" #: lang/json/GUN_from_json.py msgid "" "A homemade triple-barrel 40mm grenade launcher. Capable of launching all " -"three grenades at once, it is extremely powerwul for a homemade weapon." +"three grenades at once, it is extremely powerful for a homemade weapon." msgstr "" #. ~ Description for blunderbuss @@ -41729,6 +41644,21 @@ msgid "" "L39B-45 pistols." msgstr "" +#. ~ Description for car battery +#: lang/json/MAGAZINE_from_json.py +msgid "A 12v lead-acid battery used to power car electrical systems." +msgstr "" +"Une batterie au plomb de 12Volts utilisée pour alimenter le système " +"électrique de voitures." + +#. ~ Description for motorbike battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A 12v lead-acid battery used to power smaller vehicles' electrical systems." +msgstr "" +"Une batterie au plomb de 12Volts utilisée pour alimenter le système " +"électrique de petits véhicules." + #. ~ Description for RMSB20 magazine #: lang/json/MAGAZINE_from_json.py msgid "A 20 round box magazine for use with the RM20 caseless shotgun." @@ -41966,6 +41896,13 @@ msgstr "" msgid "A high-capacity drum magazine for the PPSh-41." msgstr "" +#. ~ Description for truck battery +#: lang/json/MAGAZINE_from_json.py +msgid "A large 12v lead-acid battery used to power truck electrical systems." +msgstr "" +"Une batterie au plomb de 12Volts utilisée pour alimenter le système " +"électrique de camions." + #. ~ Description for welding tank #: lang/json/MAGAZINE_from_json.py msgid "" @@ -41973,6 +41910,13 @@ msgid "" "is marked with several faded and now unreadable symbols." msgstr "" +#. ~ Description for storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A large storage battery. Could be installed into a storage battery case for " +"easy removal from a vehicle, or just welded straight in." +msgstr "" + #. ~ Description for M1 Garand Clip #: lang/json/MAGAZINE_from_json.py msgid "" @@ -41985,6 +41929,11 @@ msgstr "" msgid "A lightweight aluminum box magazine for the H&K G3 rifle." msgstr "" +#. ~ Description for medium storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A medium storage battery." +msgstr "Une batterie moyenne." + #. ~ Description for M9 magazine #: lang/json/MAGAZINE_from_json.py msgid "" @@ -42026,6 +41975,11 @@ msgid "" "A removable plastic magazine for the Saiga-12 shotgun. Holds 30 rounds." msgstr "" +#. ~ Description for small storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A small storage battery. Useful for crafting." +msgstr "Une petite batterie d'accumulateurs, utile pour l'artisanat." + #. ~ Description for Battle rifle magazine #: lang/json/MAGAZINE_from_json.py msgid "A standard 20-round magazine for military issue battle rifles." @@ -42674,14 +42628,50 @@ msgstr "" msgid "Walther PPK magazine" msgstr "" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "car battery" +msgid_plural "car batteries" +msgstr[0] "batterie de voiture" +msgstr[1] "batteries de voiture" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "medium storage battery" +msgid_plural "medium storage batteries" +msgstr[0] "batterie moyenne" +msgstr[1] "batteries moyennes" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "motorbike battery" +msgid_plural "motorbike batteries" +msgstr[0] "batterie de moto" +msgstr[1] "batteries de moto" + #: lang/json/MAGAZINE_from_json.py msgid "nail rifle magazine" msgstr "" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "small storage battery" +msgid_plural "small storage batteries" +msgstr[0] "petite batterie" +msgstr[1] "petites batteries" + #: lang/json/MAGAZINE_from_json.py msgid "small welding tank" msgstr "" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "storage battery" +msgid_plural "storage batteries" +msgstr[0] "batterie" +msgstr[1] "batteries" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "truck battery" +msgid_plural "truck batteries" +msgstr[0] "batterie de camion" +msgstr[1] "batteries de camion" + #: lang/json/MAGAZINE_from_json.py msgid "welding tank" msgstr "" @@ -45103,11 +45093,9 @@ msgstr "" #. ~ Description for giant mosquito #: lang/json/MONSTER_from_json.py msgid "" -"An enormous mutant mosquito, fluttering erratically, its face dominated by a " -"long, spear-tipped proboscis." +"An enormous mutant mosquito, fluttering erratically. Its face is dominated " +"by a long, spear-tipped proboscis." msgstr "" -"Un moustique mutant, flottant à l'improviste, sa tête est affublée d'une " -"longue trompe qui forme une lance." #. ~ Description for giant ant #: lang/json/MONSTER_from_json.py @@ -50415,11 +50403,6 @@ msgstr "" msgid "Hsssss." msgstr "" -#. ~ Description for fake UPS -#: lang/json/TOOL_from_json.py -msgid "If you can see this, it is a bug." -msgstr "Si vous voyez ceci, c'est un bug." - #: lang/json/TOOL_from_json.py msgid "Kevlar plate" msgid_plural "Kevlar plates" @@ -53200,6 +53183,11 @@ msgid "" "shouldn't spawn in normal game." msgstr "" +#. ~ Description for snowman +#: lang/json/TOOL_from_json.py +msgid "This is a test item for testing unicode support." +msgstr "" + #. ~ Description for candle (lit) #: lang/json/TOOL_from_json.py msgid "" @@ -55420,12 +55408,6 @@ msgid_plural "extra battery mods" msgstr[0] "module piles supplémentaires" msgstr[1] "modules piles supplémentaires" -#: lang/json/TOOL_from_json.py -msgid "fake UPS" -msgid_plural "fake UPS" -msgstr[0] "faux onduleur" -msgstr[1] "faux onduleurs" - #: lang/json/TOOL_from_json.py msgid "fake item" msgid_plural "fake items" @@ -56840,6 +56822,12 @@ msgid_plural "snare triggers" msgstr[0] "piège à collet" msgstr[1] "pièges à collet" +#: lang/json/TOOL_from_json.py +msgid "snowman" +msgid_plural "snowmans" +msgstr[0] "" +msgstr[1] "" + #: lang/json/TOOL_from_json.py msgid "soda can stove kit" msgid_plural "soda can stove kits" @@ -58140,6 +58128,15 @@ msgid "" "electronics and robots." msgstr "" +#. ~ Description for Telescopic Eyes +#: lang/json/bionic_from_json.py +msgid "" +"Much of the material in your inner eye has been removed and replaced with an " +"array of high-powered, auto-focusing lenses. You can now see much farther " +"and more clearly than before, any vision problems you might have had are now " +"gone." +msgstr "" + #: lang/json/bionic_from_json.py msgid "Muscle Augmentation" msgstr "Augmentation musculaire" @@ -61791,7 +61788,8 @@ msgstr "fracas!" msgid "crate" msgstr "caisse" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp msgid "crunch!" msgstr "crac!" @@ -61887,8 +61885,8 @@ msgstr "" msgid "glass breaking" msgstr "débris de verre" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp -#: src/map.cpp src/ranged.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp src/map.cpp src/ranged.cpp msgid "glass breaking!" msgstr "bris de verre!" @@ -61896,6 +61894,10 @@ msgstr "bris de verre!" msgid "glass door fridge" msgstr "réfrigérateur à porte vitrée" +#: lang/json/furniture_from_json.py +msgid "gravestone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "groundsheet" msgstr "" @@ -61912,6 +61914,10 @@ msgstr "plante récoltable" msgid "hay" msgstr "foin" +#: lang/json/furniture_from_json.py +msgid "headstone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "heavy punching bag" msgstr "sac de frappe lourd" @@ -61988,6 +61994,10 @@ msgstr "cactus mutant" msgid "mutated poppy flower" msgstr "fleur de pavot mutante" +#: lang/json/furniture_from_json.py +msgid "obelisk" +msgstr "" + #: lang/json/furniture_from_json.py msgid "open animalskin flap" msgstr "porte ouverte en peau de bête" @@ -62088,10 +62098,6 @@ msgstr "mur en sacs de sable" msgid "screeching metal!" msgstr "du métal qui crisse!" -#: lang/json/furniture_from_json.py -msgid "seed" -msgstr "graine" - #: lang/json/furniture_from_json.py msgid "seedling" msgstr "semis" @@ -62173,6 +62179,10 @@ msgstr "bruit sourd!" msgid "thump." msgstr "grand coup." +#: lang/json/furniture_from_json.py +msgid "thunk!" +msgstr "" + #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py msgid "thunk." msgstr "" @@ -62249,6 +62259,10 @@ msgstr "poêle à bois" msgid "wooden keg" msgstr "tonnelet en bois" +#: lang/json/furniture_from_json.py +msgid "worn gravestone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "yellow indoor plant" msgstr "plante d'intérieur jaune" @@ -62685,11 +62699,10 @@ msgstr "" #: lang/json/hint_from_json.py msgid "" "If you get a pair of night vision goggles, hold on to them! A flashlight " -"will give you away, but with goggles you can be sneaky." +"will give you away, but with goggles you can be sneaky. Beware that some " +"types of zombies are camouflaged against it, and require proper light to be " +"visible." msgstr "" -"Si tu mets la main sur des jumelles de vision nocturne, garde les et fais-y " -"attention! Une lampe de poche trahira ta présence mais les jumelles te " -"permettront de t'infiltrer discrètement." #: lang/json/hint_from_json.py msgid "" @@ -65246,6 +65259,13 @@ msgstr "" msgid "Niten Ichi-Ryu" msgstr "" +#. ~ Description for martial art 'Niten Ichi-Ryu' +#: lang/json/martial_art_from_json.py +msgid "" +"Niten Ichi-Ryu is an ancient school of combat, transmitting a style of " +"classical Japanese swordsmanship conceived by the warrior Miyamoto Musashi." +msgstr "" + #. ~ Description for martial art 'Niten Ichi-Ryu' #: lang/json/martial_art_from_json.py msgid "" @@ -71996,6 +72016,10 @@ msgstr "centre de réfugiés" msgid "regional school" msgstr "école régionale" +#: lang/json/overmap_terrain_from_json.py +msgid "religious cemetery" +msgstr "" + #: lang/json/overmap_terrain_from_json.py msgid "restaurant" msgstr "restaurant" @@ -74720,24 +74744,18 @@ msgstr "Instituteur" msgctxt "prof_desc_female" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"Tout ce temps passé au labo vous a permis de vous familiariser avec les " -"principes de base de la science. Comme les autres civiles vous avez échappé " -"au cataclysm, et avec votre équipement de labo qui plus est." #. ~ Profession (male Lab Technician) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"Tout ce temps passé au labo vous a permis de vous familiariser avec les " -"principes de base de la science. Comme les autres civiles vous avez échappé " -"au cataclysm, et avec votre équipement de labo qui plus est." #. ~ Profession (Punk Rock Girl) description #: lang/json/professions_from_json.py @@ -85144,6 +85162,10 @@ msgstr "pompe à diesel détruite" msgid "smashed gas pump" msgstr "pompe à essence détruite" +#: lang/json/terrain_from_json.py +msgid "smoothed rock" +msgstr "" + #: lang/json/terrain_from_json.py lang/json/trap_from_json.py msgid "spiked pit" msgstr "fosse à piques" @@ -87206,8 +87228,8 @@ msgstr "Retour" #: src/action.cpp src/activity_handlers.cpp src/color.cpp src/crafting.cpp #: src/editmap.cpp src/game.cpp src/iexamine.cpp src/inventory_ui.cpp #: src/item_action.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/mission_companion.cpp src/pickup.cpp src/player.cpp src/veh_interact.cpp -#: src/vehicle.cpp +#: src/mission_companion.cpp src/pickup.cpp src/player.cpp +#: src/veh_interact.cpp src/vehicle.cpp msgid "Cancel" msgstr "Annuler" @@ -89190,7 +89212,8 @@ msgstr "Veuillez d'abord charger un personnage avant d'utiliser cette page." msgid "Rules" msgstr "Règles" -#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp src/options.cpp +#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp +#: src/options.cpp msgid "Save changes?" msgstr "Enregistrer les modifications ?" @@ -89743,23 +89766,23 @@ msgstr " BIONIQUES " #: src/bionics_ui.cpp #, c-format -msgid "%d PU / %d turns" -msgstr "%d Énergie / %d tours" +msgid "%d PU act" +msgstr "%d Énergie / activation" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / turn" -msgstr "%d Énergie / tour" +msgid "%d PU deact" +msgstr "%d Énergie / désactivation" #: src/bionics_ui.cpp #, c-format -msgid "%d PU act" -msgstr "%d Énergie / activation" +msgid "%d PU/%d turns" +msgstr "" #: src/bionics_ui.cpp #, c-format -msgid "%d PU deact" -msgstr "%d Énergie / désactivation" +msgid "%d PU/turn" +msgstr "" #: src/bionics_ui.cpp src/mutation_ui.cpp #, c-format @@ -92416,7 +92439,7 @@ msgstr "[b]: annuler lot" #: src/crafting_gui.cpp #, c-format msgid "slow %d%%" -msgstr "" +msgstr "lent %d%%" #: src/crafting_gui.cpp msgid "too dark" @@ -96271,6 +96294,14 @@ msgstr "Cela vous prend du temps pour bouger %s." msgid "It takes some time to move the heavy %s." msgstr "Il vous faut du temps pour déplacer le/la %s, lourd." +#: src/game.cpp +msgid "It takes you a long time to steer that vehicle!" +msgstr "" + +#: src/game.cpp +msgid "It takes you a very long time to steer that vehicle!" +msgstr "" + #: src/game.cpp msgid "It's too dangerous to tunnel that far!" msgstr "Il est trop dangereux de creuser aussi loin !" @@ -96635,6 +96666,10 @@ msgstr "" msgid "Pour %s where?" msgstr "Où verser %s?" +#: src/game.cpp +msgid "Pour into a container" +msgstr "" + #: src/game.cpp #, c-format msgid "Pour into an adjacent keg (%s)" @@ -96652,7 +96687,7 @@ msgstr "Appuyez sur %s pour accepter votre destinée..." #: src/game.cpp #, c-format msgid "Press %s to list items and monsters" -msgstr "" +msgstr "Pressez %s pour lister les objets et les monstres" #: src/game.cpp #, c-format @@ -98064,6 +98099,11 @@ msgstr "Vous sentez votre corps se flétrir." msgid "You feel your genetic makeup degrading." msgstr "Vous sentez votre profil génétique se dégrader." +#: src/game.cpp +#, c-format +msgid "You fumble with the %s's controls." +msgstr "Vous cafouillez avec les commandes du/de la %s." + #: src/game.cpp msgid "You get a hold of yourself." msgstr "" @@ -102534,7 +102574,7 @@ msgstr "Encombrement: " #: src/item.cpp msgid "Fire modes: " -msgstr "" +msgstr "Modes de tir: " #: src/item.cpp msgid "Minimum requirements:" @@ -103294,6 +103334,11 @@ msgstr "Vous pourriez l'utiliser pour fabriquer diverses choses." msgid "You could use it to craft: %s" msgstr "Vous pourriez l'utiliser pour fabriquer: %s" +#: src/item.cpp +#, c-format +msgid "You fall asleep and drop your %s." +msgstr "" + #: src/item.cpp #, c-format msgid "You finish your %s." @@ -104852,10 +104897,6 @@ msgstr "Cette %s est déjà trop mouillée pour absorber encore du liquide!" msgid "That isn't a firearm!" msgstr "Ce n'est pas une arme à feu!" -#: src/iuse.cpp -msgid "That item already has a rechargeable battery pack." -msgstr "" - #: src/iuse.cpp msgid "That item has already had its battery capacity doubled." msgstr "Cet objet a déjà sa capacité de batterie doublée." @@ -106373,13 +106414,6 @@ msgstr "Vous réparez entièrement votre %s!" msgid "You repair your %s!" msgstr "Vous réparez votre %s!" -#: src/iuse.cpp -#, c-format -msgid "" -"You replace the battery compartment of your %s with a rechargeable battery " -"pack!" -msgstr "" - #: src/iuse.cpp #, c-format msgid "You replace your current %s." @@ -109184,11 +109218,6 @@ msgstr "Vous ne parvenez pas à désamorcer le piège et vous le déclenchez!" msgid "You fail to disarm the trap." msgstr "Vous ne parvenez pas à désamorcer le piège." -#: src/map.cpp -#, c-format -msgid "You fumble with the %s's controls." -msgstr "Vous cafouillez avec les commandes du/de la %s." - #: src/map.cpp #, c-format msgid "You lose control of the %s." @@ -116242,6 +116271,8 @@ msgid "" "Points left: %d%c%d%c%d=%d" msgstr "" +"Points restants: %d%c%d%c%d=%d" #. ~ Gender switch message. 1s - change key name, 2s - profession name. #: src/newcharacter.cpp @@ -117181,10 +117212,6 @@ msgstr "" msgid "Drop items" msgstr "Déposer des objets" -#: src/npcmove.cpp -msgid "Fire a burst" -msgstr "Tirer une rafale" - #: src/npcmove.cpp msgid "Flee" msgstr "Fuir" @@ -122549,10 +122576,6 @@ msgstr "Une aura de lumière vous entoure, et vous vous téléportez." msgid "Good mood +%s%d%%" msgstr "Bonne humeur +%s%d%%" -#: src/player.cpp -msgid "Gun:" -msgstr "Arme à feu:" - #: src/player.cpp msgid "He" msgstr "Il" @@ -123244,11 +123267,11 @@ msgstr "" #: src/player.cpp msgid "The sunlight is really irritating your eyes." -msgstr "" +msgstr "La lumière du soleil irrite vraiment vos yeux." #: src/player.cpp msgid "The sunlight is really irritating your skin." -msgstr "" +msgstr "La lumière du soleil irrite vraiment votre peau." #: src/player.cpp #, c-format @@ -123973,7 +123996,7 @@ msgstr "Vous reprenez votre tâche." #: src/player.cpp msgid "You retched, but your stomach is empty." -msgstr "" +msgstr "Vous avez un haut-le-coeur, mais votre estomac est vide." #: src/player.cpp msgid "You scream loudly!" @@ -124840,10 +124863,6 @@ msgstr "ramure" msgid "armor" msgstr "armure" -#: src/player.cpp -msgid "auto" -msgstr "" - #: src/player.cpp msgid "beep-beep-beep!" msgstr "bip-bip-bip !" @@ -124856,10 +124875,6 @@ msgstr "" msgid "horns" msgstr "cornes" -#: src/player.cpp -msgid "off " -msgstr "" - #: src/player.cpp msgid "quills" msgstr "" @@ -126708,11 +126723,6 @@ msgstr "%2.1fL " msgid "%d\"" msgstr "%d pouces" -#: src/vehicle.cpp -#, c-format -msgid "%s failed to fire! It isn't loaded and/or powered." -msgstr "" - #: src/vehicle.cpp #, c-format msgid "%s points in your direction and emits an IFF warning beep." @@ -126751,10 +126761,6 @@ msgstr "" "Alors que les barres métalliques se ferment sur vos parties basses, vous " "reconsidérez le fait de plier %s tout en le conduisant." -#: src/vehicle.cpp -msgid "Auto" -msgstr "" - #. ~ backfire sound #: src/vehicle.cpp msgid "BANG!" @@ -126817,10 +126823,6 @@ msgstr "" msgid "Close" msgstr "Fermer" -#: src/vehicle.cpp -msgid "Configure individual turrets" -msgstr "Configuration individuelle des tourelles" - #: src/vehicle.cpp msgid "Control individual engines" msgstr "Contrôle individuel des moteurs" @@ -126837,32 +126839,10 @@ msgstr "Régulateur de vitesse activé" msgid "Cugugugugug" msgstr "" -#: src/vehicle.cpp -msgid "Cycle turret mode" -msgstr "" - -#: src/vehicle.cpp -msgid "Deactivating automatic target acquisition for this turret" -msgstr "" - #: src/vehicle.cpp msgid "Disable cruise control" msgstr "Désactiver régulateur de vitesse" -#: src/vehicle.cpp -msgid "Disable turrets" -msgstr "Désactiver les tourelles" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling automatic target acquisition on %s" -msgstr "Désactive le ciblage automatique sur %s" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling turret %s." -msgstr "Désactive la tourelle %s." - #: src/vehicle.cpp msgid "Do nothing" msgstr "Ne rien faire" @@ -126879,10 +126859,6 @@ msgstr "Lumières dôme allumées" msgid "Enable cruise control" msgstr "Activer régulateur de vitesse" -#: src/vehicle.cpp -msgid "Enable turrets" -msgstr "Activer les tourelles" - #. ~ indicates that a vehicle part is outside #: src/vehicle.cpp msgid "Exterior" @@ -126969,10 +126945,6 @@ msgstr "" msgid "No controls there." msgstr "Pas de commandes ici." -#: src/vehicle.cpp -msgid "No target" -msgstr "" - #: src/vehicle.cpp msgid "Open" msgstr "Ouvert" @@ -127038,19 +127010,16 @@ msgid "Select door to toggle" msgstr "Sélectionner la porte" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to buggy mode." -msgstr "Configure la tourelle %s en mode buggy." +msgid "Set turret firing modes" +msgstr "" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to burst mode." -msgstr "Configure la tourelle %s en mode rafale." +msgid "Set turret targeting" +msgstr "" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to single-fire mode." -msgstr "Configure la tourelle %s en mode tir unique." +msgid "Set turret targeting modes" +msgstr "" #: src/vehicle.cpp msgid "Stop controlling" @@ -127097,6 +127066,11 @@ msgstr "" msgid "The %s doesn't have enough wheels to move!" msgstr "Il manque des roues au/à la %s. Il ne peut avancer!" +#: src/vehicle.cpp +#, c-format +msgid "The %s is stuck." +msgstr "" + #: src/vehicle.cpp #, c-format msgid "The %s is too leaky!" @@ -127232,14 +127206,6 @@ msgstr "La radio ne veut pas s'allumer!" msgid "The vehicle part you were working on has gone!" msgstr "La pièce de véhicule sur laquelle vous travailliez est partie!" -#: src/vehicle.cpp -msgid "This turret can't be aimed manually" -msgstr "" - -#: src/vehicle.cpp -msgid "This turret doesn't have enough ammo" -msgstr "" - #: src/vehicle.cpp msgid "This turret is not powered" msgstr "" @@ -127406,28 +127372,6 @@ msgstr "" msgid "Turned on music" msgstr "Musique allumée" -#: src/vehicle.cpp -msgid "Turret system is on, but all turrets are configured not to shoot." -msgstr "" - -#: src/vehicle.cpp -msgid "Turrets have been configured, but the vehicle turret system is off." -msgstr "" -"Les tourelles ont été configurées, mais le système de tourelles du véhicule " -"est désactivé." - -#: src/vehicle.cpp -msgid "Turrets: Disabled" -msgstr "Tourelles: Désactivées" - -#: src/vehicle.cpp -msgid "Turrets: Enabled" -msgstr "Tourelles: Activées" - -#: src/vehicle.cpp -msgid "Unseen" -msgstr "" - #: src/vehicle.cpp msgid "Vehicle controls" msgstr "Commandes de véhicule" @@ -127558,6 +127502,10 @@ msgstr "Votre moteur émet un lourd grincement." msgid "a simple melody blaring from the loudspeakers." msgstr "" +#: src/vehicle.cpp +msgid "auto" +msgstr "" + #. ~ Beeper sound #: src/vehicle.cpp msgid "beep!" @@ -127572,6 +127520,10 @@ msgstr "%s plié" msgid "hummm!" msgstr "" +#: src/vehicle.cpp +msgid "manual" +msgstr "" + #: src/vehicle.cpp msgid "roarrr!" msgstr "" @@ -128022,7 +127974,7 @@ msgstr "Nom du monde:" #: src/worldfactory.cpp msgid "_______NO NAME ENTERED!!!!______" -msgstr "______PAS DE NOM ENTRE!!!!_____" +msgstr "______PAS DE NOM ENTRÉ!!!!_____" #: src/worldfactory.cpp msgid "world data" From b0f5430a2b31cee05cbe6a24953f5fafc5ed1f9f Mon Sep 17 00:00:00 2001 From: Vlasov Vitaly Date: Thu, 9 Jun 2016 21:01:59 +0300 Subject: [PATCH 097/110] Italian update --- lang/po/it_IT.po | 516 ++++++++++++++++++++++------------------------- 1 file changed, 236 insertions(+), 280 deletions(-) diff --git a/lang/po/it_IT.po b/lang/po/it_IT.po index 34141e5b66e8a..e7bf11edd4bfc 100644 --- a/lang/po/it_IT.po +++ b/lang/po/it_IT.po @@ -3,6 +3,7 @@ # DarkStar28 , 2014-2015 # FIRST AUTHOR , 2013 # gabriele carbonella , 2014 +# Giuseppe D'Orsi , 2016 # Luca Di Bartolomeo , 2016 # Matteo , 2014-2015 # Paolo Caponeri , 2015 @@ -11,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Cataclysm-DDA\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-30 09:53+0300\n" -"PO-Revision-Date: 2016-05-30 08:22+0000\n" +"POT-Creation-Date: 2016-06-06 10:20+0300\n" +"PO-Revision-Date: 2016-06-06 08:46+0000\n" "Last-Translator: Vlasov Vitaly \n" "Language-Team: Italian (Italy) (http://www.transifex.com/cataclysm-dda-" "translators/cataclysm-dda/language/it_IT/)\n" @@ -684,8 +685,8 @@ msgstr[1] "contenitori da 40mm" #: lang/json/AMMO_from_json.py msgid "40mm chemical round" msgid_plural "40mm chemical rounds" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Munizione chimica 40mm" +msgstr[1] "Munizioni chimiche 40mm" #: lang/json/AMMO_from_json.py msgid "40mm concussive" @@ -1309,6 +1310,8 @@ msgid "" "A 40mm grenade with a toxic gas load. It will burst in a cloud of hazardous " "gas." msgstr "" +"Una granata da 40mm caricata con un gas tossico. Esploderà in una nuvola di " +"gas pericoloso." #. ~ Description for 40mm acid bomb #: lang/json/AMMO_from_json.py @@ -1444,6 +1447,13 @@ msgstr "Una scatola di chiodi, usati principalmente col martello." msgid "A box of small steel balls. They deal virtually no damage." msgstr "Una scatola di piccole sfere d'acciaio. Teoricamente non fanno danni." +#. ~ Description for .44 FMJ +#: lang/json/AMMO_from_json.py +msgid "" +"A brass-jacketed variant of the .44 Magnum round. This increases " +"penetration slightly at the cost of reduced damage from expansion." +msgstr "" + #. ~ Description for blue paint #: lang/json/AMMO_from_json.py msgid "A can of blue paint." @@ -2181,10 +2191,8 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A simple arrow shaft that has had a point carved into it and then fire-" -"hardened. Needs fletching to be worth firing from a bow." +"hardened. It needs fletching to be worth firing from a bow." msgstr "" -"Una semplice asta appuntita e poi indurita al fuoco. Necessita di " -"impennaggio per essere degna di utilizzo." #. ~ Description for ammo belt linkage #: lang/json/AMMO_from_json.py @@ -2601,7 +2609,7 @@ msgstr "" #. ~ Description for shotgun hull #: lang/json/AMMO_from_json.py msgid "An empty hull from a shotgun shell." -msgstr "" +msgstr "Un bossolo vuoto proveniente da una cartuccia da fucile a pompa. " #. ~ Description for 5x50mm hull #: lang/json/AMMO_from_json.py @@ -2760,14 +2768,6 @@ msgstr "" "altamente esplosivi. Causa bruciature severe a ogni materiale organico e può " "appiccarvi fuoco al contatto. " -#. ~ Description for .22 CB -#: lang/json/AMMO_from_json.py -msgid "" -"Conical Ball .22 is a variety of .22 ammunition with a very small propellant " -"charge and generally lacks gunpowder. The end result is a subsonic round " -"that is so weak as to be nearly useless given your predicament." -msgstr "" - #. ~ Description for handloaded .22 CB #: lang/json/AMMO_from_json.py msgid "" @@ -3062,6 +3062,8 @@ msgstr "" msgid "" "Highly radioactive slurry. It is probably best to get far away from this." msgstr "" +"Poltiglia altamente radioattiva. Sarebbe meglio allontanarsi di molto da " +"questo impasto." #. ~ Description for cent #: lang/json/AMMO_from_json.py @@ -3298,14 +3300,11 @@ msgstr[1] "RDX" #. ~ Description for .22 rat-shot #: lang/json/AMMO_from_json.py msgid "" -"Rat-shot is extremely weak ammunition, designed for killing rats, snakes, or " -"other small vermin while being unable to damage walls. It has an extremely " -"short range and is unable to injure all but the smallest creatures." +"Rat-shot is an extremely weak .22 shotgun cartridge, designed for killing " +"rats, snakes, or other small vermin while being unable to damage walls. It " +"has an extremely short range and is unable to injure all but the smallest " +"creatures." msgstr "" -"Il rat-shot è un proiettile estremamente debole, ideato per uccidere topi, " -"serpenti, o piccoli animali senza danneggiare i muri.\n" -"Ha una portata molto corta ed è incapace di ferire chiunque a parte le " -"creature più piccole." #. ~ Description for handloaded .22 rat-shot #: lang/json/AMMO_from_json.py @@ -3427,6 +3426,14 @@ msgid "" "application." msgstr "" +#. ~ Description for .22 CB +#: lang/json/AMMO_from_json.py +msgid "" +"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." +msgstr "" + #. ~ Description for reloaded .300 Winchester Magnum #: lang/json/AMMO_from_json.py msgid "" @@ -3630,7 +3637,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "This metal shaft has been carefully sharpened so that it has a crude point " -"at the end. Needs fletching to be worth firing from a bow." +"at the end. It needs fletching to be worth firing from a bow." msgstr "" #. ~ Description for sharpened metal arrow @@ -4675,8 +4682,8 @@ msgstr[1] "celle di plutonio" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "plutonium slurry" msgid_plural "plutonium slurry" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Poltiglia al plutonio" +msgstr[1] "Poltiglie al plutonio" #: lang/json/AMMO_from_json.py msgid "point" @@ -4979,8 +4986,8 @@ msgstr[0] "" msgstr[1] "" #: lang/json/AMMO_from_json.py -msgid "reloaded 7.62x39mm M87" -msgid_plural "reloaded 7.62x39mm M87" +msgid "reloaded 7.62x39mm M67" +msgid_plural "reloaded 7.62x39mm M67" msgstr[0] "" msgstr[1] "" @@ -5491,8 +5498,8 @@ msgstr[1] "" #: lang/json/AMMO_from_json.py msgid "watery plutonium slurry" msgid_plural "watery plutonium slurry" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Poltiglia al plutonio annacquata" +msgstr[1] "Poltiglie al plutonio annacquate" #: lang/json/AMMO_from_json.py msgid "white paint" @@ -6588,9 +6595,8 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "" "A large leather quiver trimmed with metal, worn on the back, that can hold " -"60 arrows.\n" -"Historically used by horse archers, rather than foot archers, but neither of " -"THEM had to fight zombies. Activate to store arrows." +"60 arrows. Historically used by horse archers, rather than foot archers, " +"but neither of THEM had to fight zombies. Activate to store arrows." msgstr "" #. ~ Description for pair of ski goggles @@ -13804,9 +13810,8 @@ msgstr "" "Una volta attivato sparerà un raggio a corta gittata, permettendoti di " "disabilitare robot o qualsiasi cosa di natura elettrica." -#. ~ Description for Telescopic Eyes #. ~ Description for Telescopic Eyes CBM -#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py +#: lang/json/BIONIC_ITEM_from_json.py msgid "" "Much of the material in your inner eye has been removed and replaced with an " "array of high-powered, auto-focusing lenses. You can now see much farther " @@ -20345,7 +20350,6 @@ msgid "Made from real Massachusetts cranberries. Delicious and nutritious." msgstr "" #. ~ Description for whiskey -#. ~ Description for test_whiskey #: lang/json/COMESTIBLE_from_json.py msgid "Made from, by, and for real Southern colonels!" msgstr "" @@ -25652,6 +25656,12 @@ msgid_plural "seasoned salt" msgstr[0] "sale con spezie" msgstr[1] "sale con spezie" +#: lang/json/COMESTIBLE_from_json.py lang/json/furniture_from_json.py +msgid "seed" +msgid_plural "seeds" +msgstr[0] "" +msgstr[1] "" + #: lang/json/COMESTIBLE_from_json.py msgid "seed potato" msgid_plural "seed potatoes" @@ -26028,12 +26038,6 @@ msgid_plural "tequilas" msgstr[0] "" msgstr[1] "" -#: lang/json/COMESTIBLE_from_json.py -msgid "test_whiskey" -msgid_plural "test_whiskey" -msgstr[0] "" -msgstr[1] "" - #: lang/json/COMESTIBLE_from_json.py msgid "thyme" msgid_plural "thymes" @@ -26709,11 +26713,6 @@ msgid "" "A watertight leather bag with a carrying strap, can hold 3 liters of water." msgstr "" -#. ~ Description for test glass bottle -#: lang/json/CONTAINER_from_json.py -msgid "An UNSEALABLE glass bottle, holds 750 ml of liquid." -msgstr "" - #. ~ Description for aluminum can #: lang/json/CONTAINER_from_json.py msgid "An aluminum can, like what soda comes in." @@ -26991,12 +26990,6 @@ msgid_plural "steel jerrycans" msgstr[0] "tanica in acciaio" msgstr[1] "taniche in acciaio" -#: lang/json/CONTAINER_from_json.py -msgid "test glass bottle" -msgid_plural "test glass bottles" -msgstr[0] "" -msgstr[1] "" - #: lang/json/CONTAINER_from_json.py msgid "tin can" msgid_plural "tin cans" @@ -27225,21 +27218,6 @@ msgid "" "removed from this sealed bag. Disassemble it to get to its contents." msgstr "" -#. ~ Description for car battery -#: lang/json/GENERIC_from_json.py -msgid "A 12v lead-acid battery used to power car electrical systems." -msgstr "" -"Una batteria 12V di piombo-acido per alimentare sistemi elettrici di " -"macchine." - -#. ~ Description for motorbike battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A 12v lead-acid battery used to power smaller vehicles' electrical systems." -msgstr "" -"Una batteria 12V di piombo-acido per alimentare sistemi elettrici di piccoli " -"veicoli." - #. ~ Description for long rope #: lang/json/GENERIC_from_json.py msgid "" @@ -28106,13 +28084,6 @@ msgstr "" msgid "A kiln full of wood that has been lit; better drop it!" msgstr "" -#. ~ Description for truck battery -#: lang/json/GENERIC_from_json.py -msgid "A large 12v lead-acid battery used to power truck electrical systems." -msgstr "" -"Una grande batteria 12V di piombo-acido per alimentare sistemi elettrici di " -"camion." - #. ~ Description for truck alternator #: lang/json/GENERIC_from_json.py msgid "A large alternator used to power truck electrical systems." @@ -28230,13 +28201,6 @@ msgstr "" msgid "A large stone, roughly hollowed out into a pot." msgstr "" -#. ~ Description for storage battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A large storage battery. Could be installed into a storage battery case for " -"easy removal from a vehicle, or just welded straight in." -msgstr "" - #. ~ Description for folding wire basket #: lang/json/GENERIC_from_json.py msgid "A large wire basket from a shopping cart, modified to be foldable." @@ -28378,11 +28342,6 @@ msgid "" "piercing to boot." msgstr "" -#. ~ Description for medium storage battery -#: lang/json/GENERIC_from_json.py -msgid "A medium storage battery." -msgstr "" - #. ~ Description for SD-Memory card #: lang/json/GENERIC_from_json.py msgid "A memory card, used. Might be worth a look." @@ -29037,11 +28996,6 @@ msgid "" "used to lift up to 1.5 metric tonnes." msgstr "" -#. ~ Description for small storage battery -#: lang/json/GENERIC_from_json.py -msgid "A small storage battery. Useful for crafting." -msgstr "" - #. ~ Description for damaged tent #: lang/json/GENERIC_from_json.py msgid "" @@ -31574,12 +31528,6 @@ msgid_plural "car alternators" msgstr[0] "" msgstr[1] "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "car battery" -msgid_plural "car batteries" -msgstr[0] "" -msgstr[1] "" - #: lang/json/GENERIC_from_json.py msgid "carding paddles" msgid_plural "pairs of carding paddles" @@ -32448,12 +32396,6 @@ msgid_plural "mechanical pumps" msgstr[0] "" msgstr[1] "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "medium storage battery" -msgid_plural "medium storage batteries" -msgstr[0] "" -msgstr[1] "" - #: lang/json/GENERIC_from_json.py msgid "mess tin" msgid_plural "mess tins" @@ -32526,12 +32468,6 @@ msgid_plural "motorbike alternators" msgstr[0] "" msgstr[1] "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "motorbike battery" -msgid_plural "motorbike batteries" -msgstr[0] "" -msgstr[1] "" - #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "muffler" msgid_plural "mufflers" @@ -33193,12 +33129,6 @@ msgid_plural "small electric motors" msgstr[0] "" msgstr[1] "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "small storage battery" -msgid_plural "small storage batteries" -msgstr[0] "" -msgstr[1] "" - #: lang/json/GENERIC_from_json.py msgid "software" msgid_plural "softwares" @@ -33319,12 +33249,6 @@ msgid_plural "stone spears" msgstr[0] "" msgstr[1] "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "storage battery" -msgid_plural "storage batteries" -msgstr[0] "" -msgstr[1] "" - #: lang/json/GENERIC_from_json.py msgid "storage battery case" msgid_plural "storage battery cases" @@ -33481,12 +33405,6 @@ msgid_plural "truck alternators" msgstr[0] "" msgstr[1] "" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "truck battery" -msgid_plural "truck batteries" -msgstr[0] "" -msgstr[1] "" - #: lang/json/GENERIC_from_json.py msgid "turret engine" msgid_plural "turret engines" @@ -35277,7 +35195,7 @@ msgstr "" #: lang/json/GUN_from_json.py msgid "" "A homemade triple-barrel 40mm grenade launcher. Capable of launching all " -"three grenades at once, it is extremely powerwul for a homemade weapon." +"three grenades at once, it is extremely powerful for a homemade weapon." msgstr "" #. ~ Description for blunderbuss @@ -39523,6 +39441,21 @@ msgid "" "L39B-45 pistols." msgstr "" +#. ~ Description for car battery +#: lang/json/MAGAZINE_from_json.py +msgid "A 12v lead-acid battery used to power car electrical systems." +msgstr "" +"Una batteria 12V di piombo-acido per alimentare sistemi elettrici di " +"macchine." + +#. ~ Description for motorbike battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A 12v lead-acid battery used to power smaller vehicles' electrical systems." +msgstr "" +"Una batteria 12V di piombo-acido per alimentare sistemi elettrici di piccoli " +"veicoli." + #. ~ Description for RMSB20 magazine #: lang/json/MAGAZINE_from_json.py msgid "A 20 round box magazine for use with the RM20 caseless shotgun." @@ -39760,6 +39693,13 @@ msgstr "" msgid "A high-capacity drum magazine for the PPSh-41." msgstr "" +#. ~ Description for truck battery +#: lang/json/MAGAZINE_from_json.py +msgid "A large 12v lead-acid battery used to power truck electrical systems." +msgstr "" +"Una grande batteria 12V di piombo-acido per alimentare sistemi elettrici di " +"camion." + #. ~ Description for welding tank #: lang/json/MAGAZINE_from_json.py msgid "" @@ -39767,6 +39707,13 @@ msgid "" "is marked with several faded and now unreadable symbols." msgstr "" +#. ~ Description for storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A large storage battery. Could be installed into a storage battery case for " +"easy removal from a vehicle, or just welded straight in." +msgstr "" + #. ~ Description for M1 Garand Clip #: lang/json/MAGAZINE_from_json.py msgid "" @@ -39779,6 +39726,11 @@ msgstr "" msgid "A lightweight aluminum box magazine for the H&K G3 rifle." msgstr "" +#. ~ Description for medium storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A medium storage battery." +msgstr "" + #. ~ Description for M9 magazine #: lang/json/MAGAZINE_from_json.py msgid "" @@ -39820,6 +39772,11 @@ msgid "" "A removable plastic magazine for the Saiga-12 shotgun. Holds 30 rounds." msgstr "" +#. ~ Description for small storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A small storage battery. Useful for crafting." +msgstr "" + #. ~ Description for Battle rifle magazine #: lang/json/MAGAZINE_from_json.py msgid "A standard 20-round magazine for military issue battle rifles." @@ -40468,14 +40425,50 @@ msgstr "" msgid "Walther PPK magazine" msgstr "" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "car battery" +msgid_plural "car batteries" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "medium storage battery" +msgid_plural "medium storage batteries" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "motorbike battery" +msgid_plural "motorbike batteries" +msgstr[0] "" +msgstr[1] "" + #: lang/json/MAGAZINE_from_json.py msgid "nail rifle magazine" msgstr "" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "small storage battery" +msgid_plural "small storage batteries" +msgstr[0] "" +msgstr[1] "" + #: lang/json/MAGAZINE_from_json.py msgid "small welding tank" msgstr "" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "storage battery" +msgid_plural "storage batteries" +msgstr[0] "" +msgstr[1] "" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "truck battery" +msgid_plural "truck batteries" +msgstr[0] "" +msgstr[1] "" + #: lang/json/MAGAZINE_from_json.py msgid "welding tank" msgstr "" @@ -42744,8 +42737,8 @@ msgstr "" #. ~ Description for giant mosquito #: lang/json/MONSTER_from_json.py msgid "" -"An enormous mutant mosquito, fluttering erratically, its face dominated by a " -"long, spear-tipped proboscis." +"An enormous mutant mosquito, fluttering erratically. Its face is dominated " +"by a long, spear-tipped proboscis." msgstr "" #. ~ Description for giant ant @@ -47688,11 +47681,6 @@ msgstr "" msgid "Hsssss." msgstr "" -#. ~ Description for fake UPS -#: lang/json/TOOL_from_json.py -msgid "If you can see this, it is a bug." -msgstr "" - #: lang/json/TOOL_from_json.py msgid "Kevlar plate" msgid_plural "Kevlar plates" @@ -50153,6 +50141,11 @@ msgid "" "shouldn't spawn in normal game." msgstr "" +#. ~ Description for snowman +#: lang/json/TOOL_from_json.py +msgid "This is a test item for testing unicode support." +msgstr "" + #. ~ Description for candle (lit) #: lang/json/TOOL_from_json.py msgid "" @@ -52285,12 +52278,6 @@ msgid_plural "extra battery mods" msgstr[0] "" msgstr[1] "" -#: lang/json/TOOL_from_json.py -msgid "fake UPS" -msgid_plural "fake UPS" -msgstr[0] "" -msgstr[1] "" - #: lang/json/TOOL_from_json.py msgid "fake item" msgid_plural "fake items" @@ -53705,6 +53692,12 @@ msgid_plural "snare triggers" msgstr[0] "" msgstr[1] "" +#: lang/json/TOOL_from_json.py +msgid "snowman" +msgid_plural "snowmans" +msgstr[0] "" +msgstr[1] "" + #: lang/json/TOOL_from_json.py msgid "soda can stove kit" msgid_plural "soda can stove kits" @@ -54991,6 +54984,15 @@ msgid "" "electronics and robots." msgstr "" +#. ~ Description for Telescopic Eyes +#: lang/json/bionic_from_json.py +msgid "" +"Much of the material in your inner eye has been removed and replaced with an " +"array of high-powered, auto-focusing lenses. You can now see much farther " +"and more clearly than before, any vision problems you might have had are now " +"gone." +msgstr "" + #: lang/json/bionic_from_json.py msgid "Muscle Augmentation" msgstr "Muscolatura Migliorata" @@ -58563,7 +58565,8 @@ msgstr "" msgid "crate" msgstr "cesta" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp msgid "crunch!" msgstr "crunch!" @@ -58659,8 +58662,8 @@ msgstr "" msgid "glass breaking" msgstr "" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp -#: src/map.cpp src/ranged.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp src/map.cpp src/ranged.cpp msgid "glass breaking!" msgstr "vetro che si rompe" @@ -58668,6 +58671,10 @@ msgstr "vetro che si rompe" msgid "glass door fridge" msgstr "frigorifero con porta di vetro" +#: lang/json/furniture_from_json.py +msgid "gravestone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "groundsheet" msgstr "telo per tenda" @@ -58684,6 +58691,10 @@ msgstr "piante da raccolta" msgid "hay" msgstr "fieno" +#: lang/json/furniture_from_json.py +msgid "headstone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "heavy punching bag" msgstr "" @@ -58760,6 +58771,10 @@ msgstr "" msgid "mutated poppy flower" msgstr "fiore di papavero mutato" +#: lang/json/furniture_from_json.py +msgid "obelisk" +msgstr "" + #: lang/json/furniture_from_json.py msgid "open animalskin flap" msgstr "piano di pelli d'animali aperto" @@ -58860,10 +58875,6 @@ msgstr "" msgid "screeching metal!" msgstr "" -#: lang/json/furniture_from_json.py -msgid "seed" -msgstr "seme" - #: lang/json/furniture_from_json.py msgid "seedling" msgstr "germogli" @@ -58945,6 +58956,10 @@ msgstr "" msgid "thump." msgstr "" +#: lang/json/furniture_from_json.py +msgid "thunk!" +msgstr "" + #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py msgid "thunk." msgstr "" @@ -59021,6 +59036,10 @@ msgstr "stufa a legna" msgid "wooden keg" msgstr "" +#: lang/json/furniture_from_json.py +msgid "worn gravestone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "yellow indoor plant" msgstr "" @@ -59352,7 +59371,9 @@ msgstr "" #: lang/json/hint_from_json.py msgid "" "If you get a pair of night vision goggles, hold on to them! A flashlight " -"will give you away, but with goggles you can be sneaky." +"will give you away, but with goggles you can be sneaky. Beware that some " +"types of zombies are camouflaged against it, and require proper light to be " +"visible." msgstr "" #: lang/json/hint_from_json.py @@ -61762,6 +61783,13 @@ msgstr "" msgid "Niten Ichi-Ryu" msgstr "" +#. ~ Description for martial art 'Niten Ichi-Ryu' +#: lang/json/martial_art_from_json.py +msgid "" +"Niten Ichi-Ryu is an ancient school of combat, transmitting a style of " +"classical Japanese swordsmanship conceived by the warrior Miyamoto Musashi." +msgstr "" + #. ~ Description for martial art 'Niten Ichi-Ryu' #: lang/json/martial_art_from_json.py msgid "" @@ -68251,6 +68279,10 @@ msgstr "centro profughi" msgid "regional school" msgstr "scuola regionale" +#: lang/json/overmap_terrain_from_json.py +msgid "religious cemetery" +msgstr "" + #: lang/json/overmap_terrain_from_json.py msgid "restaurant" msgstr "ristorante" @@ -70935,24 +70967,18 @@ msgstr "" msgctxt "prof_desc_female" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"Grazie al tempo trascorso in laboratorio, hai familiarità con le basi della " -"scienza. Sei scappata come gli altri civili (fortunati), ma almeno sei " -"riuscito a portarti appresso l'attrezzatura da laboratorio." #. ~ Profession (male Lab Technician) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"Grazie al tempo trascorso in laboratorio, hai familiarità con le basi della " -"scienza. Sei scappata come gli altri civili (fortunati), ma almeno sei " -"riuscito a portarti appresso l'attrezzatura da laboratorio." #. ~ Profession (Punk Rock Girl) description #: lang/json/professions_from_json.py @@ -80872,6 +80898,10 @@ msgstr "" msgid "smashed gas pump" msgstr "" +#: lang/json/terrain_from_json.py +msgid "smoothed rock" +msgstr "" + #: lang/json/terrain_from_json.py lang/json/trap_from_json.py msgid "spiked pit" msgstr "buca appuntita" @@ -82863,8 +82893,8 @@ msgstr "Indietro" #: src/action.cpp src/activity_handlers.cpp src/color.cpp src/crafting.cpp #: src/editmap.cpp src/game.cpp src/iexamine.cpp src/inventory_ui.cpp #: src/item_action.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/mission_companion.cpp src/pickup.cpp src/player.cpp src/veh_interact.cpp -#: src/vehicle.cpp +#: src/mission_companion.cpp src/pickup.cpp src/player.cpp +#: src/veh_interact.cpp src/vehicle.cpp msgid "Cancel" msgstr "Annulla" @@ -84828,7 +84858,8 @@ msgstr "Per favore carica un personaggio prima di usare questa pagina!" msgid "Rules" msgstr "Regole" -#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp src/options.cpp +#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp +#: src/options.cpp msgid "Save changes?" msgstr "Salvare i cambiamenti?" @@ -85376,22 +85407,22 @@ msgstr "" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / %d turns" +msgid "%d PU act" msgstr "" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / turn" +msgid "%d PU deact" msgstr "" #: src/bionics_ui.cpp #, c-format -msgid "%d PU act" +msgid "%d PU/%d turns" msgstr "" #: src/bionics_ui.cpp #, c-format -msgid "%d PU deact" +msgid "%d PU/turn" msgstr "" #: src/bionics_ui.cpp src/mutation_ui.cpp @@ -91761,6 +91792,14 @@ msgstr "" msgid "It takes some time to move the heavy %s." msgstr "" +#: src/game.cpp +msgid "It takes you a long time to steer that vehicle!" +msgstr "" + +#: src/game.cpp +msgid "It takes you a very long time to steer that vehicle!" +msgstr "" + #: src/game.cpp msgid "It's too dangerous to tunnel that far!" msgstr "E' troppo pericoloso creare un tunnel cosi lontano!" @@ -92119,6 +92158,10 @@ msgstr "" msgid "Pour %s where?" msgstr "" +#: src/game.cpp +msgid "Pour into a container" +msgstr "" + #: src/game.cpp #, c-format msgid "Pour into an adjacent keg (%s)" @@ -93535,6 +93578,11 @@ msgstr "Senti il tuo corpo decadere." msgid "You feel your genetic makeup degrading." msgstr "Senti la tua costituzione genetica degradarsi." +#: src/game.cpp +#, c-format +msgid "You fumble with the %s's controls." +msgstr "" + #: src/game.cpp msgid "You get a hold of yourself." msgstr "" @@ -98603,6 +98651,11 @@ msgstr "Puoi anche usarlo per craftare altre cose." msgid "You could use it to craft: %s" msgstr "Puoi anche usarlo per craftare: %s" +#: src/item.cpp +#, c-format +msgid "You fall asleep and drop your %s." +msgstr "" + #: src/item.cpp #, c-format msgid "You finish your %s." @@ -100159,10 +100212,6 @@ msgstr "" msgid "That isn't a firearm!" msgstr "Quella non è un'arma da fuoco!" -#: src/iuse.cpp -msgid "That item already has a rechargeable battery pack." -msgstr "" - #: src/iuse.cpp msgid "That item has already had its battery capacity doubled." msgstr "La capacità della batteria di quell'oggetto è già raddoppiata." @@ -101663,13 +101712,6 @@ msgstr "Hai riparato %s completamente!" msgid "You repair your %s!" msgstr "Hai riparato il tuo %s!" -#: src/iuse.cpp -#, c-format -msgid "" -"You replace the battery compartment of your %s with a rechargeable battery " -"pack!" -msgstr "" - #: src/iuse.cpp #, c-format msgid "You replace your current %s." @@ -104454,11 +104496,6 @@ msgstr "" msgid "You fail to disarm the trap." msgstr "" -#: src/map.cpp -#, c-format -msgid "You fumble with the %s's controls." -msgstr "" - #: src/map.cpp #, c-format msgid "You lose control of the %s." @@ -112303,10 +112340,6 @@ msgstr "" msgid "Drop items" msgstr "" -#: src/npcmove.cpp -msgid "Fire a burst" -msgstr "" - #: src/npcmove.cpp msgid "Flee" msgstr "" @@ -117587,10 +117620,6 @@ msgstr "Una luce ti circonda, vieni teletrasportato." msgid "Good mood +%s%d%%" msgstr "Buon umore +%s%d%%" -#: src/player.cpp -msgid "Gun:" -msgstr "" - #: src/player.cpp msgid "He" msgstr "Lui" @@ -119845,10 +119874,6 @@ msgstr "" msgid "armor" msgstr "armatura" -#: src/player.cpp -msgid "auto" -msgstr "" - #: src/player.cpp msgid "beep-beep-beep!" msgstr "beep-beep-beep!" @@ -119861,10 +119886,6 @@ msgstr "" msgid "horns" msgstr "" -#: src/player.cpp -msgid "off " -msgstr "" - #: src/player.cpp msgid "quills" msgstr "" @@ -121712,11 +121733,6 @@ msgstr "" msgid "%d\"" msgstr "" -#: src/vehicle.cpp -#, c-format -msgid "%s failed to fire! It isn't loaded and/or powered." -msgstr "%s ha fallito nelllo sparare! Non ha munizioni oppure non è attiva." - #: src/vehicle.cpp #, c-format msgid "%s points in your direction and emits an IFF warning beep." @@ -121755,10 +121771,6 @@ msgstr "" "Come le spietate barre di metallo si chiudono sulle tue parti basse, ci " "ripensi di piegare %s mentre cavalchi." -#: src/vehicle.cpp -msgid "Auto" -msgstr "Automatico" - #. ~ backfire sound #: src/vehicle.cpp msgid "BANG!" @@ -121821,10 +121833,6 @@ msgstr "" msgid "Close" msgstr "Chiudi" -#: src/vehicle.cpp -msgid "Configure individual turrets" -msgstr "Configura torrette individualmente" - #: src/vehicle.cpp msgid "Control individual engines" msgstr "Controlla i motori individualmente" @@ -121841,32 +121849,10 @@ msgstr "Cruise control acceso" msgid "Cugugugugug" msgstr "" -#: src/vehicle.cpp -msgid "Cycle turret mode" -msgstr "Cambia motalità torrette" - -#: src/vehicle.cpp -msgid "Deactivating automatic target acquisition for this turret" -msgstr "" - #: src/vehicle.cpp msgid "Disable cruise control" msgstr "Disattiva il cruise control" -#: src/vehicle.cpp -msgid "Disable turrets" -msgstr "Disattiva le torrette" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling automatic target acquisition on %s" -msgstr "" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling turret %s." -msgstr "" - #: src/vehicle.cpp msgid "Do nothing" msgstr "Nessuna azione" @@ -121883,10 +121869,6 @@ msgstr "Luci del tettuccio accese." msgid "Enable cruise control" msgstr "Attiva il cruise control" -#: src/vehicle.cpp -msgid "Enable turrets" -msgstr "Abilita le torrette" - #. ~ indicates that a vehicle part is outside #: src/vehicle.cpp msgid "Exterior" @@ -121973,10 +121955,6 @@ msgstr "" msgid "No controls there." msgstr "Non ci sono controlli là." -#: src/vehicle.cpp -msgid "No target" -msgstr "Nessun bersagio" - #: src/vehicle.cpp msgid "Open" msgstr "Apri" @@ -122042,18 +122020,15 @@ msgid "Select door to toggle" msgstr "Selezionare porta" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to buggy mode." +msgid "Set turret firing modes" msgstr "" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to burst mode." +msgid "Set turret targeting" msgstr "" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to single-fire mode." +msgid "Set turret targeting modes" msgstr "" #: src/vehicle.cpp @@ -122101,6 +122076,11 @@ msgstr "" msgid "The %s doesn't have enough wheels to move!" msgstr "Il veicolo %s non ha abbastanza ruote per spostarsi!" +#: src/vehicle.cpp +#, c-format +msgid "The %s is stuck." +msgstr "" + #: src/vehicle.cpp #, c-format msgid "The %s is too leaky!" @@ -122236,14 +122216,6 @@ msgstr "Lo stereo non si accende!" msgid "The vehicle part you were working on has gone!" msgstr "La parte a cui stavi lavorando non c'è più!" -#: src/vehicle.cpp -msgid "This turret can't be aimed manually" -msgstr "" - -#: src/vehicle.cpp -msgid "This turret doesn't have enough ammo" -msgstr "" - #: src/vehicle.cpp msgid "This turret is not powered" msgstr "" @@ -122410,30 +122382,6 @@ msgstr "" msgid "Turned on music" msgstr "" -#: src/vehicle.cpp -msgid "Turret system is on, but all turrets are configured not to shoot." -msgstr "" -"Il sistema di torrette del veicolo è acceso, ma le torrette non sono state " -"configurate per poter sparare." - -#: src/vehicle.cpp -msgid "Turrets have been configured, but the vehicle turret system is off." -msgstr "" -"Le torrette sono state configurate, ma il sistema di torrette del veicolo è " -"spento." - -#: src/vehicle.cpp -msgid "Turrets: Disabled" -msgstr "Torretta: Disattivata" - -#: src/vehicle.cpp -msgid "Turrets: Enabled" -msgstr "Torretta: Attivata" - -#: src/vehicle.cpp -msgid "Unseen" -msgstr "Non individuato" - #: src/vehicle.cpp msgid "Vehicle controls" msgstr "Comandi del veicolo" @@ -122564,6 +122512,10 @@ msgstr "Il tuo motore emette un rumoroso cigolio." msgid "a simple melody blaring from the loudspeakers." msgstr "" +#: src/vehicle.cpp +msgid "auto" +msgstr "" + #. ~ Beeper sound #: src/vehicle.cpp msgid "beep!" @@ -122578,6 +122530,10 @@ msgstr "%s piegato." msgid "hummm!" msgstr "" +#: src/vehicle.cpp +msgid "manual" +msgstr "" + #: src/vehicle.cpp msgid "roarrr!" msgstr "" From 58932c4bd3b1d9a9f883da73365099137c4c5bf2 Mon Sep 17 00:00:00 2001 From: Vlasov Vitaly Date: Thu, 9 Jun 2016 21:02:29 +0300 Subject: [PATCH 098/110] Japanese update --- lang/po/ja.po | 876 ++++++++++++++++++++++++-------------------------- 1 file changed, 427 insertions(+), 449 deletions(-) diff --git a/lang/po/ja.po b/lang/po/ja.po index b44bc93c1d534..744068d458ddf 100644 --- a/lang/po/ja.po +++ b/lang/po/ja.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: Cataclysm-DDA\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-30 09:53+0300\n" -"PO-Revision-Date: 2016-06-01 02:01+0000\n" +"POT-Creation-Date: 2016-06-06 10:20+0300\n" +"PO-Revision-Date: 2016-06-09 14:28+0000\n" "Last-Translator: Pigmentblue15\n" "Language-Team: Japanese (http://www.transifex.com/cataclysm-dda-translators/" "cataclysm-dda/language/ja/)\n" @@ -1423,6 +1423,15 @@ msgstr "" "鋼で作られた小さな玉の入った箱です。この玉はほとんどダメージを与えられませ" "ん。" +#. ~ Description for .44 FMJ +#: lang/json/AMMO_from_json.py +msgid "" +"A brass-jacketed variant of the .44 Magnum round. This increases " +"penetration slightly at the cost of reduced damage from expansion." +msgstr "" +".44口径マグナム弾のブラスジャケット版です。貫通力の増加と引き換えに、弾薬の開" +"裂による損傷力が低下しました。" + #. ~ Description for blue paint #: lang/json/AMMO_from_json.py msgid "A can of blue paint." @@ -2218,7 +2227,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A simple arrow shaft that has had a point carved into it and then fire-" -"hardened. Needs fletching to be worth firing from a bow." +"hardened. It needs fletching to be worth firing from a bow." msgstr "" "先端を削って焼き固めた矢です。矢として真価を発揮させるには矢羽が必要です。" @@ -2836,17 +2845,6 @@ msgstr "" "す。ロケット燃料や爆薬の製造に使われます。有機物に触れると重度の炎症を引き起" "こし、発火させることもあります。" -#. ~ Description for .22 CB -#: lang/json/AMMO_from_json.py -msgid "" -"Conical Ball .22 is a variety of .22 ammunition with a very small propellant " -"charge and generally lacks gunpowder. The end result is a subsonic round " -"that is so weak as to be nearly useless given your predicament." -msgstr "" -"コニカルボール.22口径弾は.22口径弾のバリエーションの一つで、装薬の少ない弾薬" -"です。結果として弾速は亜音速の域に達していますが、窮地に立たされたとしても、" -"威力が弱過ぎて、ほとんど役には立ってくれないでしょう。" - #. ~ Description for handloaded .22 CB #: lang/json/AMMO_from_json.py msgid "" @@ -3419,13 +3417,14 @@ msgstr[0] "RDX" #. ~ Description for .22 rat-shot #: lang/json/AMMO_from_json.py msgid "" -"Rat-shot is extremely weak ammunition, designed for killing rats, snakes, or " -"other small vermin while being unable to damage walls. It has an extremely " -"short range and is unable to injure all but the smallest creatures." +"Rat-shot is an extremely weak .22 shotgun cartridge, designed for killing " +"rats, snakes, or other small vermin while being unable to damage walls. It " +"has an extremely short range and is unable to injure all but the smallest " +"creatures." msgstr "" -"ラットショットは威力が極めて弱い弾薬で、建築物を傷付けずに小動物を駆除出来る" -"ように設計されています。非常に射程が短く、小動物以外を傷付ける事は難しいで" -"しょう。" +"ラットショットは威力が極めて弱い.22口径の散弾で、建築物を傷付けずに小動物を駆" +"除出来るように設計されています。非常に射程が短く、小動物以外を傷付ける事は難" +"しいでしょう。" #. ~ Description for handloaded .22 rat-shot #: lang/json/AMMO_from_json.py @@ -3557,6 +3556,17 @@ msgstr "" "発揮します。数多くの化学物質の調合に使われますが、硫酸が含まれている一番身近" "な製品は電池です。" +#. ~ Description for .22 CB +#: lang/json/AMMO_from_json.py +msgid "" +"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." +msgstr "" +"コニカルボール.22口径弾は22口径弾のバリエーションの一つで、火薬の代わりに雷管" +"を使用して推進力を得ます。弾速は最終的に亜音速の域に達しますが、窮地に立たさ" +"れた時に使うとしても、威力が弱過ぎてほとんど役には立ってくれないでしょう。" + #. ~ Description for reloaded .300 Winchester Magnum #: lang/json/AMMO_from_json.py msgid "" @@ -3787,7 +3797,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "This metal shaft has been carefully sharpened so that it has a crude point " -"at the end. Needs fletching to be worth firing from a bow." +"at the end. It needs fletching to be worth firing from a bow." msgstr "" "先端に矢尻を取り付けられるように、丁寧に尖らせてある金属製の矢柄です。矢とし" "て真価を発揮させるには矢羽が必要です。" @@ -4941,9 +4951,9 @@ msgid_plural "reloaded 7.62x39mm M43" msgstr[0] "弾薬(7.62x39mm/M43(手詰め))" #: lang/json/AMMO_from_json.py -msgid "reloaded 7.62x39mm M87" -msgid_plural "reloaded 7.62x39mm M87" -msgstr[0] "弾薬(7.62x39mm/M87(手詰め))" +msgid "reloaded 7.62x39mm M67" +msgid_plural "reloaded 7.62x39mm M67" +msgstr[0] "弾薬(7.62x39mm/M67(手詰め))" #: lang/json/AMMO_from_json.py msgid "reloaded 7.62x51mm" @@ -6118,7 +6128,7 @@ msgid "" "A fabric ammo pouch that can be strapped to your chest which is capable of " "holding a single magazine close at hand." msgstr "" -"帯で胸に装着するタイプの布製弾薬ポーチです。取り出しやすい位置に弾倉を一つだ" +"帯で胸に装着するタイプの布製弾倉ポーチです。取り出しやすい位置に弾倉を一つだ" "け挿入しておくことができます。" #. ~ Description for leg ammo pouch @@ -6127,7 +6137,7 @@ msgid "" "A fabric ammo pouch that can be strapped to your leg and capable of holding " "a single magazine close at hand." msgstr "" -"帯で脚に括り付けるタイプの布製弾薬ポーチです。取り出しやすい位置に弾倉を一つ" +"帯で脚に括り付けるタイプの布製弾倉ポーチです。取り出しやすい位置に弾倉を一つ" "だけ挿入しておくことができます。" #. ~ Description for gold bracelet @@ -6664,9 +6674,8 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "" "A large leather quiver trimmed with metal, worn on the back, that can hold " -"60 arrows.\n" -"Historically used by horse archers, rather than foot archers, but neither of " -"THEM had to fight zombies. Activate to store arrows." +"60 arrows. Historically used by horse archers, rather than foot archers, " +"but neither of THEM had to fight zombies. Activate to store arrows." msgstr "" "革製の金属で補強した大型の矢筒です。肩に掛けて背負います。歴史上では弓騎兵、" "徒歩弓兵などが使っていましたが、ゾンビとの戦いに役立つかは未知数です。60本の" @@ -8174,7 +8183,7 @@ msgid "" "A small fabric ammo pouch that can be strapped to your ankle which is " "capable of holding a single small magazine close at hand." msgstr "" -"帯で足首に括り付けるタイプの小さな布製弾薬ポーチです。取り出しやすい位置に小" +"帯で足首に括り付けるタイプの小さな布製弾倉ポーチです。取り出しやすい位置に小" "型の弾倉を一つだけ挿入しておくことができます。" #. ~ Description for wrist bandolier @@ -9054,7 +9063,7 @@ msgid "" "as protecting from nuclear, biological, and chemical hazards." msgstr "" "不浸透性の全身用スーツです。装甲がボディアーマーとしての役目を果たし、放射" -"能、生物、化学による汚染からも身を守ります。" +"線、生物、化学による汚染からも身を守ります。" #. ~ Description for nasal helm #: lang/json/ARMOR_from_json.py @@ -9942,7 +9951,7 @@ msgstr "硬い靴底とスパイク付きの運動靴です。靴底が草地に #. ~ Use action holster_prompt for leg ammo pouch. #: lang/json/ARMOR_from_json.py msgid "Stash ammo" -msgstr "弾薬を収納する" +msgstr "弾倉を収納する" #. ~ Use action holster_prompt for leather belt. #: lang/json/ARMOR_from_json.py @@ -10346,7 +10355,7 @@ msgstr[0] "弾薬鞄" #: lang/json/ARMOR_from_json.py msgid "ankle ammo pouch" msgid_plural "ankle ammo pouches" -msgstr[0] "弾薬ポーチ(足)" +msgstr[0] "弾倉ポーチ(足)" #: lang/json/ARMOR_from_json.py msgid "ankle holster" @@ -10691,7 +10700,7 @@ msgstr[0] "ジャケット(シェフ)" #: lang/json/ARMOR_from_json.py msgid "chest ammo pouch" msgid_plural "chest ammo pouches" -msgstr[0] "弾薬ポーチ(胸)" +msgstr[0] "弾倉ポーチ(胸)" #: lang/json/ARMOR_from_json.py msgid "chest rig" @@ -11461,7 +11470,7 @@ msgstr[0] "レザーベスト" #: lang/json/ARMOR_from_json.py msgid "leg ammo pouch" msgid_plural "leg ammo pouches" -msgstr[0] "弾薬ポーチ(脚)" +msgstr[0] "弾倉ポーチ(脚)" #: lang/json/ARMOR_from_json.py msgid "leg splint" @@ -13685,9 +13694,8 @@ msgstr "" "掌に小型のEMP発生装置を埋め込みます。隣接タイルに存在する電子機器やロボットに" "放射する事で、それらを無力化できます。" -#. ~ Description for Telescopic Eyes #. ~ Description for Telescopic Eyes CBM -#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py +#: lang/json/BIONIC_ITEM_from_json.py msgid "" "Much of the material in your inner eye has been removed and replaced with an " "array of high-powered, auto-focusing lenses. You can now see much farther " @@ -14223,8 +14231,8 @@ msgid "" "contained in normal, everyday batteries. Use 'E' to consume batteries. Can " "be toggled on and off at will." msgstr "" -"自身に電池からの電力供給を可能する電力変換回路を取り付けます。電池の電力はE" -"キーで使用する事が出来ます。オンオフの切り替えが可能です。" +"自身に電池からの電力供給を可能する電力変換回路を取り付けます。電池の電力をE" +"キーで蓄積する事が出来ます。オンオフの切り替えが可能です。" #. ~ Description for Solar Panels #. ~ Description for Solar Panels CBM @@ -20130,7 +20138,7 @@ msgstr "美味しいピーカンナッツのエキスです。神々の飲料で #. ~ Description for lunch meat #: lang/json/COMESTIBLE_from_json.py msgid "Delicious lunch meat. Can be eaten cold." -msgstr "美味しそうなランチミートです。冷たくても食べれます。" +msgstr "美味しそうなランチミートです。冷たくても食べられます。" #. ~ Description for meat temaki #: lang/json/COMESTIBLE_from_json.py @@ -20879,7 +20887,6 @@ msgstr "" "美味しいです。" #. ~ Description for whiskey -#. ~ Description for test_whiskey #: lang/json/COMESTIBLE_from_json.py msgid "Made from, by, and for real Southern colonels!" msgstr "南部で育まれた南部の為の飲み物です。" @@ -22615,7 +22622,7 @@ msgstr "有毒だと思われる野菜です。食べる事は出来ますが、 #. ~ Description for lemon #: lang/json/COMESTIBLE_from_json.py msgid "Very sour citrus. Can be eaten if you really want." -msgstr "非常に酸っぱい果物です。食べたいと心から望むのなら食べれますよ。" +msgstr "非常に酸っぱい果物です。食べたいと心から望むのなら食べられますよ。" #. ~ Description for acid water #: lang/json/COMESTIBLE_from_json.py @@ -25821,6 +25828,11 @@ msgid "seasoned salt" msgid_plural "seasoned salt" msgstr[0] "調味塩" +#: lang/json/COMESTIBLE_from_json.py lang/json/furniture_from_json.py +msgid "seed" +msgid_plural "seeds" +msgstr[0] "種" + #: lang/json/COMESTIBLE_from_json.py msgid "seed potato" msgid_plural "seed potatoes" @@ -26135,11 +26147,6 @@ msgid "tequila" msgid_plural "tequilas" msgstr[0] "テキーラ" -#: lang/json/COMESTIBLE_from_json.py -msgid "test_whiskey" -msgid_plural "test_whiskey" -msgstr[0] "テストウィスキー" - #: lang/json/COMESTIBLE_from_json.py msgid "thyme" msgid_plural "thymes" @@ -26786,11 +26793,6 @@ msgid "" "A watertight leather bag with a carrying strap, can hold 3 liters of water." msgstr "水が漏れないように作られた革製の水筒です。3Lまで水が入ります。" -#. ~ Description for test glass bottle -#: lang/json/CONTAINER_from_json.py -msgid "An UNSEALABLE glass bottle, holds 750 ml of liquid." -msgstr "再密閉が可能なガラスのボトルです。750mlの容量があります。" - #. ~ Description for aluminum can #: lang/json/CONTAINER_from_json.py msgid "An aluminum can, like what soda comes in." @@ -27034,11 +27036,6 @@ msgid "steel jerrycan" msgid_plural "steel jerrycans" msgstr[0] "ジェリカン(25L/鋼)" -#: lang/json/CONTAINER_from_json.py -msgid "test glass bottle" -msgid_plural "test glass bottles" -msgstr[0] "テストガラスボトル(750ml)" - #: lang/json/CONTAINER_from_json.py msgid "tin can" msgid_plural "tin cans" @@ -27279,17 +27276,6 @@ msgstr "" "Rejected by the Enemy(敵も食わない食事)' です。密封された袋から取り出すと腐敗" "が進行を始めます。分解して使います。" -#. ~ Description for car battery -#: lang/json/GENERIC_from_json.py -msgid "A 12v lead-acid battery used to power car electrical systems." -msgstr "12Vの鉛蓄電池です。普通車両の電気系統に電力を供給する為に使用します。" - -#. ~ Description for motorbike battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A 12v lead-acid battery used to power smaller vehicles' electrical systems." -msgstr "12Vの鉛蓄電池です。小型車両の電気系統に電力を供給する為に使用します。" - #. ~ Description for long rope #: lang/json/GENERIC_from_json.py msgid "" @@ -28300,11 +28286,6 @@ msgstr "" msgid "A kiln full of wood that has been lit; better drop it!" msgstr "木材を詰めて火を点けました。" -#. ~ Description for truck battery -#: lang/json/GENERIC_from_json.py -msgid "A large 12v lead-acid battery used to power truck electrical systems." -msgstr "12Vの鉛蓄電池です。トラックの電気系統に電力を供給する為に使用します。" - #. ~ Description for truck alternator #: lang/json/GENERIC_from_json.py msgid "A large alternator used to power truck electrical systems." @@ -28438,15 +28419,6 @@ msgstr "大きなガラス板です。割れやすい。窓の修理に使いま msgid "A large stone, roughly hollowed out into a pot." msgstr "大きな石を大雑把にくり抜いて作られた鍋です。" -#. ~ Description for storage battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A large storage battery. Could be installed into a storage battery case for " -"easy removal from a vehicle, or just welded straight in." -msgstr "" -"大型の蓄電池です。蓄電池ケースを介することで簡単に付け外しできるようになりま" -"すが、直接溶接して使うこともできます。" - #. ~ Description for folding wire basket #: lang/json/GENERIC_from_json.py msgid "A large wire basket from a shopping cart, modified to be foldable." @@ -28612,11 +28584,6 @@ msgstr "" "中世の武器です。柄と重量のあるトゲのついた柄頭の2つの部位からなります。衝撃と" "刺突のダメージを与えます。" -#. ~ Description for medium storage battery -#: lang/json/GENERIC_from_json.py -msgid "A medium storage battery." -msgstr "中型の蓄電池です。" - #. ~ Description for SD-Memory card #: lang/json/GENERIC_from_json.py msgid "A memory card, used. Might be worth a look." @@ -29363,11 +29330,6 @@ msgstr "" "伸縮式の小さな鋼鉄製アームです。フレームに設置すれば1.5トンまでの重量を持ち上" "げることができます。" -#. ~ Description for small storage battery -#: lang/json/GENERIC_from_json.py -msgid "A small storage battery. Useful for crafting." -msgstr "小型の蓄電池です。アイテム製作に使います。" - #. ~ Description for damaged tent #: lang/json/GENERIC_from_json.py msgid "" @@ -29867,9 +29829,9 @@ msgid "" "configured L523, you'll need to disassemble it to the base platform, then " "assemble with the parts you prefer." msgstr "" -"L523を汎用小銃仕様に変換する互換部品一式です。あらゆる状況に適応し得る、バラ" -"ンスの取れた銃です。L523に既に別のキットが組み込まれている場合は、一度分解し" -"てL523プラットフォームに戻しておく必要があります。" +"L523を汎用バトルライフル仕様に変換する互換部品一式です。あらゆる状況に適応し" +"得る、バランスの取れた銃です。L523に既に別のキットが組み込まれている場合は、" +"一度分解してL523プラットフォームに戻しておく必要があります。" #. ~ Description for L523-LMG conversion #: lang/json/GENERIC_from_json.py @@ -32049,11 +32011,6 @@ msgid "car alternator" msgid_plural "car alternators" msgstr[0] "オルタネータ(自動車)" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "car battery" -msgid_plural "car batteries" -msgstr[0] "バッテリー(自動車)" - #: lang/json/GENERIC_from_json.py msgid "carding paddles" msgid_plural "pairs of carding paddles" @@ -32778,11 +32735,6 @@ msgid "mechanical pump" msgid_plural "mechanical pumps" msgstr[0] "機械式ポンプ" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "medium storage battery" -msgid_plural "medium storage batteries" -msgstr[0] "蓄電池(中型)" - #: lang/json/GENERIC_from_json.py msgid "mess tin" msgid_plural "mess tins" @@ -32843,11 +32795,6 @@ msgid "motorbike alternator" msgid_plural "motorbike alternators" msgstr[0] "オルタネータ(バイク)" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "motorbike battery" -msgid_plural "motorbike batteries" -msgstr[0] "バッテリー(バイク)" - #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "muffler" msgid_plural "mufflers" @@ -33401,11 +33348,6 @@ msgid "small electric motor" msgid_plural "small electric motors" msgstr[0] "小型電気モーター" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "small storage battery" -msgid_plural "small storage batteries" -msgstr[0] "蓄電池(小型)" - #: lang/json/GENERIC_from_json.py msgid "software" msgid_plural "softwares" @@ -33506,11 +33448,6 @@ msgid "stone spear" msgid_plural "stone spears" msgstr[0] "ストーンスピア" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "storage battery" -msgid_plural "storage batteries" -msgstr[0] "蓄電池(大型)" - #: lang/json/GENERIC_from_json.py msgid "storage battery case" msgid_plural "storage battery cases" @@ -33641,11 +33578,6 @@ msgid "truck alternator" msgid_plural "truck alternators" msgstr[0] "オルタネータ(トラック)" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "truck battery" -msgid_plural "truck batteries" -msgstr[0] "バッテリー(トラック)" - #: lang/json/GENERIC_from_json.py msgid "turret engine" msgid_plural "turret engines" @@ -34115,8 +34047,8 @@ msgid "" "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." msgstr "" -"小型化したショットガンです。小銃の銃身に取り付ける事が出来ます。2発装填が可能" -"です。" +"小型化したショットガンです。ライフルの銃身に取り付ける事が出来ます。2発装填が" +"可能です。" #. ~ Description for shortened barrel #: lang/json/GUNMOD_from_json.py @@ -35586,10 +35518,10 @@ msgstr "" #: lang/json/GUN_from_json.py msgid "" "A homemade triple-barrel 40mm grenade launcher. Capable of launching all " -"three grenades at once, it is extremely powerwul for a homemade weapon." +"three grenades at once, it is extremely powerful for a homemade weapon." msgstr "" -"手製40mm三連装グレネードランチャーです。3発同時に発射することも可能です。自家" -"製兵器の中では非常に強力な部類のものです。" +"手製の40mm三連装グレネードランチャーです。3発同時に発射することも可能です。自" +"家製兵器の中では非常に強力な部類のものです。" #. ~ Description for blunderbuss #: lang/json/GUN_from_json.py @@ -36012,7 +35944,7 @@ msgid "" msgstr "" "錆び付いたレシーバー、レミントン700互換の銃身、折れた松葉杖の上半分。これらの" "材料に接着剤を塗りダクトテープを巻き付けて、どうにかライフルらしき形に整え、" -"仕上げにありったけの祈りを込めて完成した、真の生存者の小銃です。" +"仕上げにありったけの祈りを込めて完成した、真の生存者のためのライフルです。" #. ~ Description for submachine gun #: lang/json/GUN_from_json.py @@ -39477,7 +39409,7 @@ msgstr[0] "ハンドガン(紙製薬莢/フリントロックピストル)" #: lang/json/GUN_from_json.py msgid "flintlock rifle" msgid_plural "flintlock rifles" -msgstr[0] "ライフル(紙製薬莢/ﾌﾘﾝﾄﾛｯｸ式小銃)" +msgstr[0] "ライフル(紙製薬莢/ﾌﾘﾝﾄﾛｯｸ式)" #: lang/json/GUN_from_json.py msgid "foreign assault rifle" @@ -40205,6 +40137,17 @@ msgid "" "L39B-45 pistols." msgstr "Leadworks LLC製L39-45及びL39B-45に対応する樹脂製12連発弾倉です。" +#. ~ Description for car battery +#: lang/json/MAGAZINE_from_json.py +msgid "A 12v lead-acid battery used to power car electrical systems." +msgstr "12Vの鉛蓄電池です。普通車両の電気系統に電力を供給する為に使用します。" + +#. ~ Description for motorbike battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A 12v lead-acid battery used to power smaller vehicles' electrical systems." +msgstr "12Vの鉛蓄電池です。小型車両の電気系統に電力を供給する為に使用します。" + #. ~ Description for RMSB20 magazine #: lang/json/MAGAZINE_from_json.py msgid "A 20 round box magazine for use with the RM20 caseless shotgun." @@ -40468,6 +40411,11 @@ msgstr "SIG P230に対応する、信頼性に優れたメーカー純正品の8 msgid "A high-capacity drum magazine for the PPSh-41." msgstr "PPSh-41に対応する、大容量のドラム型弾倉です。" +#. ~ Description for truck battery +#: lang/json/MAGAZINE_from_json.py +msgid "A large 12v lead-acid battery used to power truck electrical systems." +msgstr "12Vの鉛蓄電池です。トラックの電気系統に電力を供給する為に使用します。" + #. ~ Description for welding tank #: lang/json/MAGAZINE_from_json.py msgid "" @@ -40477,6 +40425,15 @@ msgstr "" "加圧された溶接ガスを保存するための大きな金属製シリンダーです。表面にいくつか" "記号が記されていますが、色あせていて読むことはできません。" +#. ~ Description for storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A large storage battery. Could be installed into a storage battery case for " +"easy removal from a vehicle, or just welded straight in." +msgstr "" +"大型の蓄電池です。蓄電池ケースを介することで簡単に付け外しできるようになりま" +"すが、直接溶接して使うこともできます。" + #. ~ Description for M1 Garand Clip #: lang/json/MAGAZINE_from_json.py msgid "" @@ -40491,6 +40448,11 @@ msgstr "" msgid "A lightweight aluminum box magazine for the H&K G3 rifle." msgstr "H&K G3に対応する、軽量なアルミ合金製の箱型弾倉です。" +#. ~ Description for medium storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A medium storage battery." +msgstr "中型の蓄電池です。" + #. ~ Description for M9 magazine #: lang/json/MAGAZINE_from_json.py msgid "" @@ -40534,6 +40496,11 @@ msgid "" "A removable plastic magazine for the Saiga-12 shotgun. Holds 30 rounds." msgstr "サイガ12に対応する樹脂製30連発ドラム弾倉です。" +#. ~ Description for small storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A small storage battery. Useful for crafting." +msgstr "小型の蓄電池です。アイテム製作に使います。" + #. ~ Description for Battle rifle magazine #: lang/json/MAGAZINE_from_json.py msgid "A standard 20-round magazine for military issue battle rifles." @@ -41024,11 +40991,11 @@ msgstr "弾倉(9mm/ステン/簡易)" #: lang/json/MAGAZINE_from_json.py msgid "PPSh 35-round magazine" -msgstr "弾倉(762x25/PPSh-35)" +msgstr "弾倉(7.62x25/PPSh-35)" #: lang/json/MAGAZINE_from_json.py msgid "PPSh 71-round drum" -msgstr "弾倉(762x25/PPSh-71)" +msgstr "弾倉(7.62x25/PPSh-71)" #: lang/json/MAGAZINE_from_json.py msgid "Pistol magazine" @@ -41212,14 +41179,44 @@ msgstr "弾倉(9mm/ウージー)" msgid "Walther PPK magazine" msgstr "弾倉(.32口径/ワルサーPPK)" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "car battery" +msgid_plural "car batteries" +msgstr[0] "バッテリー(自動車)" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "medium storage battery" +msgid_plural "medium storage batteries" +msgstr[0] "蓄電池(中型)" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "motorbike battery" +msgid_plural "motorbike batteries" +msgstr[0] "バッテリー(バイク)" + #: lang/json/MAGAZINE_from_json.py msgid "nail rifle magazine" msgstr "弾倉(ネイルライフル)" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "small storage battery" +msgid_plural "small storage batteries" +msgstr[0] "蓄電池(小型)" + #: lang/json/MAGAZINE_from_json.py msgid "small welding tank" msgstr "溶接タンク(小型)" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "storage battery" +msgid_plural "storage batteries" +msgstr[0] "蓄電池(大型)" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "truck battery" +msgid_plural "truck batteries" +msgstr[0] "バッテリー(トラック)" + #: lang/json/MAGAZINE_from_json.py msgid "welding tank" msgstr "溶接タンク" @@ -43966,11 +43963,11 @@ msgstr "" #. ~ Description for giant mosquito #: lang/json/MONSTER_from_json.py msgid "" -"An enormous mutant mosquito, fluttering erratically, its face dominated by a " -"long, spear-tipped proboscis." +"An enormous mutant mosquito, fluttering erratically. Its face is dominated " +"by a long, spear-tipped proboscis." msgstr "" -"変異により巨大化した蚊です。口先の針はまるで槍のように太くなり、空を舞いなが" -"ら貫く機会を伺っています。" +"変異により巨大化した蚊です。口先の針はまるで槍の様に太くなり、空を舞いながら" +"貫く機会を伺っています。" #. ~ Description for giant ant #: lang/json/MONSTER_from_json.py @@ -46495,7 +46492,7 @@ msgstr "涎垂ゾンビ" #: lang/json/MONSTER_from_json.py msgid "slimespring" -msgstr "湧き出る粘液" +msgstr "飛び跳ねる粘液" #: lang/json/MONSTER_from_json.py msgid "slithering root" @@ -48140,7 +48137,7 @@ msgstr[0] "雷の籠手" #: lang/json/TOOL_ARMOR_from_json.py msgid "radiation biomonitor" msgid_plural "radiation biomonitors" -msgstr[0] "放射能生体モニター" +msgstr[0] "放射線生体モニター" #: lang/json/TOOL_ARMOR_from_json.py msgid "rebreather mask" @@ -48835,7 +48832,7 @@ msgid "" "exhaust you quickly." msgstr "" "原始的な手回し式のドリルです。ドリルビットはひとつだけです。穴を空けるのに時" -"間がかかり、速やかに疲労します。" +"間がかかり、疲労がすぐに溜まります。" #. ~ Description for pro fishing rod #: lang/json/TOOL_from_json.py @@ -49523,11 +49520,6 @@ msgstr "シューッ。" msgid "Hsssss." msgstr "シューッ。" -#. ~ Description for fake UPS -#: lang/json/TOOL_from_json.py -msgid "If you can see this, it is a bug." -msgstr "このメッセージが見えている場合は、バグが発生しています。" - #: lang/json/TOOL_from_json.py msgid "Kevlar plate" msgid_plural "Kevlar plates" @@ -52456,6 +52448,11 @@ msgstr "" "これは短期間のheal_actorツール用テストです。通常のゲーム中は出現させないでく" "ださい。" +#. ~ Description for snowman +#: lang/json/TOOL_from_json.py +msgid "This is a test item for testing unicode support." +msgstr "これはユニコード対応テスト用のアイテムです。" + #. ~ Description for candle (lit) #: lang/json/TOOL_from_json.py msgid "" @@ -54660,11 +54657,6 @@ msgid "extra battery mod" msgid_plural "extra battery mods" msgstr[0] "予備拡張バッテリー" -#: lang/json/TOOL_from_json.py -msgid "fake UPS" -msgid_plural "fake UPS" -msgstr[0] "UPS(偽物)" - #: lang/json/TOOL_from_json.py msgid "fake item" msgid_plural "fake items" @@ -55845,6 +55837,11 @@ msgid "snare trigger" msgid_plural "snare triggers" msgstr[0] "スネアトリガー" +#: lang/json/TOOL_from_json.py +msgid "snowman" +msgid_plural "snowmans" +msgstr[0] "スノーマン" + #: lang/json/TOOL_from_json.py msgid "soda can stove kit" msgid_plural "soda can stove kits" @@ -57085,6 +57082,19 @@ msgstr "" "掌に小型のEMP発生装置を埋め込みます。隣接タイルに存在する電子機器やロボットに" "放射する事で、それらを無力化できます。" +#. ~ Description for Telescopic Eyes +#: lang/json/bionic_from_json.py +msgid "" +"Much of the material in your inner eye has been removed and replaced with an " +"array of high-powered, auto-focusing lenses. You can now see much farther " +"and more clearly than before, any vision problems you might have had are now " +"gone." +msgstr "" +"眼球と周辺組織の大部分を取り除き、高性能な人工眼球に置き換えます。生身の眼球" +"よりも素早く正確なオートフォーカス機能や望遠機能を備え、遥か遠くのものをより" +"鮮明に目視できるようになります。もちろん近視や遠視等の視覚障害とは完全に、か" +"つ永遠におさらばできます。" + #: lang/json/bionic_from_json.py msgid "Muscle Augmentation" msgstr "筋肉増強" @@ -60810,7 +60820,8 @@ msgstr "ガチャンという衝撃音が聞こえました！" msgid "crate" msgstr "木箱" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp msgid "crunch!" msgstr "バリバリと噛み砕くような音が聞こえました！" @@ -60844,7 +60855,7 @@ msgstr "ドレッサー" #: lang/json/furniture_from_json.py msgid "dryer" -msgstr "ドライヤー" +msgstr "乾燥機" #: lang/json/furniture_from_json.py msgid "dumpster" @@ -60906,8 +60917,8 @@ msgstr "かまど" msgid "glass breaking" msgstr "割れたガラス" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp -#: src/map.cpp src/ranged.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp src/map.cpp src/ranged.cpp msgid "glass breaking!" msgstr "ガラスが割れた音が聞こえました。" @@ -60915,6 +60926,10 @@ msgstr "ガラスが割れた音が聞こえました。" msgid "glass door fridge" msgstr "冷蔵庫(ガラスドア)" +#: lang/json/furniture_from_json.py +msgid "gravestone" +msgstr "墓碑" + #: lang/json/furniture_from_json.py msgid "groundsheet" msgstr "レジャーシート" @@ -60931,6 +60946,10 @@ msgstr "収穫できる作物" msgid "hay" msgstr "干し草" +#: lang/json/furniture_from_json.py +msgid "headstone" +msgstr "墓石" + #: lang/json/furniture_from_json.py msgid "heavy punching bag" msgstr "重いサンドバッグ" @@ -61007,6 +61026,10 @@ msgstr "変異したサボテン" msgid "mutated poppy flower" msgstr "変異したケシの花" +#: lang/json/furniture_from_json.py +msgid "obelisk" +msgstr "オベリスク" + #: lang/json/furniture_from_json.py msgid "open animalskin flap" msgstr "開いた獣皮の垂れ幕" @@ -61107,10 +61130,6 @@ msgstr "土嚢壁" msgid "screeching metal!" msgstr "金属音が鳴り響きました！" -#: lang/json/furniture_from_json.py -msgid "seed" -msgstr "種" - #: lang/json/furniture_from_json.py msgid "seedling" msgstr "苗木" @@ -61192,6 +61211,10 @@ msgstr "ゴツンという強い打撃音が聞こえました！" msgid "thump." msgstr "ゴツンという打撃音が聞こえました。" +#: lang/json/furniture_from_json.py +msgid "thunk!" +msgstr "ドスン！" + #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py msgid "thunk." msgstr "ドスン。" @@ -61268,6 +61291,10 @@ msgstr "薪ストーブ" msgid "wooden keg" msgstr "樽(木)" +#: lang/json/furniture_from_json.py +msgid "worn gravestone" +msgstr "古い墓碑" + #: lang/json/furniture_from_json.py msgid "yellow indoor plant" msgstr "観葉植物(黄色)" @@ -61679,10 +61706,13 @@ msgstr "" #: lang/json/hint_from_json.py msgid "" "If you get a pair of night vision goggles, hold on to them! A flashlight " -"will give you away, but with goggles you can be sneaky." +"will give you away, but with goggles you can be sneaky. Beware that some " +"types of zombies are camouflaged against it, and require proper light to be " +"visible." msgstr "" -"暗視ゴーグルを見つけたら何が何でも手に入れよう！懐中電灯を点けると居場所がば" -"れるけど、暗視ゴーグルなら隠れ続けられる。" +"暗視ゴーグルを見つけたら何としても持ち帰ろう！懐中電灯を点けると居場所がばれ" +"るけど、暗視ゴーグルなら隠れ続けられる。ゾンビの中には闇に溶け込み、光を当て" +"ないと見えない奴もいるから気をつけよう。" #: lang/json/hint_from_json.py msgid "" @@ -62224,7 +62254,7 @@ msgstr "地面を掘り返す" #: lang/json/item_action_from_json.py msgid "Use geiger counter" -msgstr "放射能測定器を使う" +msgstr "放射線測定器を使う" #: lang/json/item_action_from_json.py msgid "Use holster" @@ -62500,7 +62530,7 @@ msgstr "フィルタ" #: lang/json/keybinding_from_json.py msgid "Fire Weapon" -msgstr "銃を撃つ" +msgstr "発射" #: lang/json/keybinding_from_json.py msgid "Fire Wielded Item" @@ -62508,11 +62538,11 @@ msgstr "射撃する(装備中)" #: lang/json/keybinding_from_json.py msgid "Go Down" -msgstr "下がる" +msgstr "下層へ移動" #: lang/json/keybinding_from_json.py msgid "Go Up" -msgstr "上がる" +msgstr "上層へ移動" #: lang/json/keybinding_from_json.py msgid "Go to next tab" @@ -62662,7 +62692,7 @@ msgstr "移動/選択したMODを上昇" #: lang/json/keybinding_from_json.py msgid "Move shape" -msgstr "" +msgstr "形状の変更" #: lang/json/keybinding_from_json.py msgid "Move to next category tab" @@ -62974,7 +63004,7 @@ msgstr "アイテム選択 @ 中央" #: lang/json/keybinding_from_json.py msgid "Select items currently worn" -msgstr "アイテム選択 @ 装備" +msgstr "アイテム選択 @ 着用" #: lang/json/keybinding_from_json.py msgid "Select items in container" @@ -63038,7 +63068,7 @@ msgstr "半田/溶接" #: lang/json/keybinding_from_json.py msgid "Start" -msgstr "開始" +msgstr "開始地点へ" #: lang/json/keybinding_from_json.py msgid "Swap Inventory Letters" @@ -63058,7 +63088,7 @@ msgstr "切替/サイドバー形式" #: lang/json/keybinding_from_json.py msgid "Switch to move point / confirm" -msgstr "" +msgstr "メニュー切替" #: lang/json/keybinding_from_json.py msgid "Take Off Worn Item" @@ -63984,12 +64014,12 @@ msgstr "" #. ~ Sign #: lang/json/mapgen_from_json.py msgid " owned at " -msgstr "" +msgstr " 所有者 住所 " #. ~ Sign #: lang/json/mapgen_from_json.py msgid ", , and were here!" -msgstr "" +msgstr "、と はここに居ます！" #. ~ Sign #: lang/json/mapgen_from_json.py @@ -64029,7 +64059,7 @@ msgstr "足元注意！" #. ~ Sign #: lang/json/mapgen_from_json.py msgid "it works again." -msgstr "" +msgstr "正常に動作しています。" #. ~ Sign #: lang/json/mapgen_from_json.py @@ -64432,6 +64462,15 @@ msgstr "" msgid "Niten Ichi-Ryu" msgstr "二天一流" +#. ~ Description for martial art 'Niten Ichi-Ryu' +#: lang/json/martial_art_from_json.py +msgid "" +"Niten Ichi-Ryu is an ancient school of combat, transmitting a style of " +"classical Japanese swordsmanship conceived by the warrior Miyamoto Musashi." +msgstr "" +"二天一流は日本の剣豪「宮本武蔵」が編みだした、伝統的な剣士の哲学と剣術のスタ" +"イルです。" + #. ~ Description for martial art 'Niten Ichi-Ryu' #: lang/json/martial_art_from_json.py msgid "" @@ -65778,7 +65817,7 @@ msgstr "水生動物" #: lang/json/mutation_from_json.py msgid "Aqueous" -msgstr "水性人" +msgstr "水溶性" #: lang/json/mutation_from_json.py msgid "Arachnid" @@ -66116,7 +66155,7 @@ msgstr "" #: lang/json/mutation_from_json.py msgid "Eater Of The Dead" -msgstr "イーター・オブ・ザ・デッド" +msgstr "死肉喰らい" #. ~ Description for Eater Of The Dead #: lang/json/mutation_from_json.py @@ -66124,8 +66163,8 @@ msgid "" "Eating rotting, long-dead flesh is good for the struggle, and safe--if still " "completely unappealing--for you." msgstr "" -"死んでから時間が経ち腐ってしまった肉を食べれば、生き残るために有利かつ安全(し" -"かもとってもおいしそう)だとあなたは考えています。" +"死んでから時間が経ち腐ってしまった肉を食べれば、生き残るために有利かつ安全(た" +"とえ全然おいしそうじゃなくても)だとあなたは考えています。" #: lang/json/mutation_from_json.py msgid "Ectothermic" @@ -67190,7 +67229,7 @@ msgstr "放射線源(レベル2)" #: lang/json/mutation_from_json.py msgid "Radiogenic" -msgstr "放射能適応" +msgstr "放射線適応" #: lang/json/mutation_from_json.py msgid "Rapid Metabolism" @@ -68035,7 +68074,7 @@ msgid "" "long-term goal, but for now..." msgstr "" "昔の広告だかで、「惑星を水で満たそう」みたいなのがあったような？なかなかに骨" -"のある仕事でしょうが、今のあなたなら..." +"の折れる仕事でしょうが、今のあなたなら..." #: lang/json/mutation_from_json.py src/morale.cpp msgid "Wheat Allergy" @@ -70721,7 +70760,7 @@ msgid "" "Your system has adapted to radiation. While irradiated, you will actually " "heal slowly, converting the radiation into hit points." msgstr "" -"肉体が放射能汚染環境に適応しました。強い放射線を浴びている間、ゆっくりと傷が" +"肉体が放射線汚染環境に適応しました。強い放射線を浴びている間、ゆっくりと傷が" "回復していきます。" #. ~ Description for Poison Resistant @@ -71078,7 +71117,7 @@ msgstr "洞窟" #: lang/json/overmap_terrain_from_json.py msgid "cavern" -msgstr "大洞窟" +msgstr "洞穴" #: lang/json/overmap_terrain_from_json.py msgid "church" @@ -71122,7 +71161,7 @@ msgstr "電器店" #: lang/json/overmap_terrain_from_json.py msgid "errie cavern" -msgstr "エリーの洞窟" +msgstr "エリーの洞穴" #: lang/json/overmap_terrain_from_json.py msgid "evac shelter" @@ -71496,6 +71535,10 @@ msgstr "難民センター" msgid "regional school" msgstr "地域運営学校" +#: lang/json/overmap_terrain_from_json.py +msgid "religious cemetery" +msgstr "墓地" + #: lang/json/overmap_terrain_from_json.py msgid "restaurant" msgstr "レストラン" @@ -74246,22 +74289,24 @@ msgstr "教師" msgctxt "prof_desc_female" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"科学の徒です。研究所よ、今までありがとう。幸運にも逃げ延びる事は出来ました" -"が、これで研究所の設備は失ってしまいました。" +"研究所で働いていたお陰で、大抵の科学に関する知識には精通しています。世界は破" +"滅してしまいましたが、ある疑問が浮かびました。大変動の発生にはあなたも加担し" +"ていた訳ですが、果たして元に戻すことが可能なのでしょうか？" #. ~ Profession (male Lab Technician) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"科学の徒です。研究所よ、今までありがとう。幸運にも逃げ延びる事は出来ました" -"が、これで研究所の設備は失ってしまいました。" +"研究所で働いていたお陰で、大抵の科学に関する知識には精通しています。世界は破" +"滅してしまいましたが、ある疑問が浮かびました。大変動の発生にはあなたも加担し" +"ていた訳ですが、果たして元に戻すことが可能なのでしょうか？" #. ~ Profession (Punk Rock Girl) description #: lang/json/professions_from_json.py @@ -79774,8 +79819,8 @@ msgid "" "Sick of FUEL PRICES? Bus stop too far? Get your driving fix from THE SUN! " "Solar powered electric cars: Silent, Cheap, Powerful." msgstr "" -"広告:燃料高騰にうんざり？バス停が遠い？太陽が貴方の車事情を解決してくれま" -"す！　ソーラーカー：強い、安い、静か。" +"広告:燃料高騰にうんざり？バス停が遠い？太陽が貴方の車事情を解決してくれます！" +"　ソーラーカー：強い、安い、静か。" #: lang/json/snippet_from_json.py msgid "Smash the Bots!" @@ -79841,7 +79886,7 @@ msgstr "現金をありがとよ、！" #: lang/json/snippet_from_json.py msgid "Thanks, !" -msgstr "ありがとさん、！" +msgstr "どうも、！" #: lang/json/snippet_from_json.py msgid "" @@ -84247,7 +84292,7 @@ msgstr "壊れたコンソール" #: lang/json/terrain_from_json.py msgid "broken generator" -msgstr "壊れた発生器" +msgstr "壊れた発電機" #: lang/json/terrain_from_json.py msgid "broken log wall" @@ -84491,7 +84536,7 @@ msgstr "窓枠(金属)" #: lang/json/terrain_from_json.py msgid "empty space" -msgstr "隙間" +msgstr "空いた空間" #: lang/json/terrain_from_json.py msgid "empty window" @@ -84639,7 +84684,7 @@ msgstr "梯子" #: lang/json/terrain_from_json.py msgid "large metal support" -msgstr "大型担体(金属)" +msgstr "大型鉄柱" #: lang/json/terrain_from_json.py msgid "large switchgear" @@ -84719,7 +84764,7 @@ msgstr "床(金属)" #: lang/json/terrain_from_json.py msgid "metal grate" -msgstr "金属のグレーチング" +msgstr "金属の側溝蓋" #: lang/json/terrain_from_json.py msgid "metal post" @@ -85051,7 +85096,7 @@ msgstr "小型HV油遮断器" #: lang/json/terrain_from_json.py msgid "small metal support" -msgstr "小型担体(金属)" +msgstr "小型鉄柱" #: lang/json/terrain_from_json.py msgid "small rebar roof cage" @@ -85073,6 +85118,10 @@ msgstr "破壊された軽油ポンプ" msgid "smashed gas pump" msgstr "破壊された給油ポンプ" +#: lang/json/terrain_from_json.py +msgid "smoothed rock" +msgstr "滑らかな岩" + #: lang/json/terrain_from_json.py lang/json/trap_from_json.py msgid "spiked pit" msgstr "串刺し穴" @@ -87080,8 +87129,8 @@ msgstr "戻る" #: src/action.cpp src/activity_handlers.cpp src/color.cpp src/crafting.cpp #: src/editmap.cpp src/game.cpp src/iexamine.cpp src/inventory_ui.cpp #: src/item_action.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/mission_companion.cpp src/pickup.cpp src/player.cpp src/veh_interact.cpp -#: src/vehicle.cpp +#: src/mission_companion.cpp src/pickup.cpp src/player.cpp +#: src/veh_interact.cpp src/vehicle.cpp msgid "Cancel" msgstr "取消" @@ -87449,7 +87498,7 @@ msgstr "上手く%1$sを%2$sに取り付けられました。" #: src/activity_handlers.cpp #, c-format msgid "You successfully mended the %s." -msgstr "%sの修繕に成功しました。" +msgstr "%sの修復に成功しました。" #: src/activity_handlers.cpp msgid "You're too tired to continue." @@ -87875,11 +87924,11 @@ msgstr "所持品:" #: src/advanced_inv.cpp msgid "Moved no charges." -msgstr "" +msgstr "中身が空のため移動できません。" #: src/advanced_inv.cpp msgid "Moved no items." -msgstr "" +msgstr "移動するアイテムがありません。" #: src/advanced_inv.cpp msgid "N" @@ -87924,12 +87973,12 @@ msgstr "牽引車両無し" #: src/advanced_inv.cpp #, c-format msgid "Only moved %d of %d charges." -msgstr "" +msgstr "%d単位の内%d単位しか移動できません。" #: src/advanced_inv.cpp #, c-format msgid "Only moved %d of %d items." -msgstr "" +msgstr "%d個の内%d個しか移動できません。" #: src/advanced_inv.cpp msgid "Really move everything from your inventory?" @@ -88018,7 +88067,7 @@ msgstr "西" #: src/advanced_inv.cpp msgid "Worn Items" -msgstr "装備" +msgstr "着用" #: src/advanced_inv.cpp msgid "You can unload only liquids into target container." @@ -88289,7 +88338,7 @@ msgstr "収納箇所:" #: src/armor_layers.cpp #, c-format msgid "Swap side for %s?" -msgstr "" +msgstr "%sを反対側の部位に付け替えますか？" #: src/armor_layers.cpp msgid "This is strapped onto you." @@ -88331,12 +88380,12 @@ msgid "" "has for that bodypart." msgstr "" "矢印キーかテンキーで左メニューを操作する\n" -"[%s] で並べ替える装備を選択する。\n" +"[%s] で並べ替えるアイテムを選択する。\n" "[%s] / [%s] で右メニューをスクロールする。\n" -"[%s]で装備にキーを割り当てる。\n" -"[%s]で装備している部位の左右を変更する。\n" -"[%s]で所持品の中にある装備を着用する。\n" -"[%s]で選択した装備を外す。\n" +"[%s]で着用中のアイテムにキーを割り当てる。\n" +"[%s]で着用している部位の左右を変更する。\n" +"[%s]で所持しているアイテムを着用する。\n" +"[%s]で選択したアイテムを脱ぐ。\n" "\n" "[動作制限と暖かさ]項目について\n" "一番左の数値は、その部位に着用している衣服自体が持つ動作制限の合計です。\n" @@ -89071,7 +89120,8 @@ msgstr "キャラクターを作成してから設定して下さい！" msgid "Rules" msgstr "規則" -#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp src/options.cpp +#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp +#: src/options.cpp msgid "Save changes?" msgstr "保存しますか？" @@ -89281,7 +89331,7 @@ msgstr "この生体部品を導入する空間的余裕がありません！%s" #: src/bionics.cpp src/iuse.cpp src/iuse_actor.cpp msgid "Nothing" -msgstr "何もない" +msgstr "無効" #: src/bionics.cpp msgid "Perform which function:" @@ -89611,7 +89661,7 @@ msgstr "筋肉に負荷を掛け過ぎて、少し傷を負いました。" #: src/bionics.cpp src/iuse.cpp #, c-format msgid "Your radiation level: %d" -msgstr "放射能レベル: %d" +msgstr "放射線レベル: %d" #: src/bionics.cpp msgid "Your speed suddenly increases!" @@ -89628,23 +89678,23 @@ msgstr "生体部品" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / %d turns" -msgstr "電力 %d / %dターン" +msgid "%d PU act" +msgstr "電力 %d/起動" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / turn" -msgstr "電力 %d / ターン" +msgid "%d PU deact" +msgstr "電力 %d/停止" #: src/bionics_ui.cpp #, c-format -msgid "%d PU act" -msgstr "" +msgid "%d PU/%d turns" +msgstr "電力 %d / %dターン" #: src/bionics_ui.cpp #, c-format -msgid "%d PU deact" -msgstr "" +msgid "%d PU/turn" +msgstr "電力 %d / ターン" #: src/bionics_ui.cpp src/mutation_ui.cpp #, c-format @@ -90557,7 +90607,7 @@ msgid "" " \n" " \n" msgstr "" -"警告:ラジオタワーは応答していません。\n" +"警告:電波塔が応答していません。\n" "\n" "予備電源の送電量が放送要件を満たしていません。\n" "緊急時に発電機を使用する場合は、地域の州兵部隊に連絡を取り、優先的に供給を受" @@ -90724,7 +90774,7 @@ msgstr "" #, c-format msgid "%d OTHER FOUND..." msgid_plural "%d OTHERS FOUND..." -msgstr[0] "" +msgstr[0] "他に%d個見つかりました..." #: src/computer.cpp msgid "--ACCESS GRANTED--" @@ -91880,7 +91930,7 @@ msgstr "うわっ！どこの誰がこんな物を食べる事が出来るんだ #. ~of the Rat King's ALL CAPS invective. Probably shared-brain telepathy. #: src/consumption.cpp msgid "hey, you look like me! let's work together!" -msgstr "なあ、あんた、私みたいだな！一緒に行こう！" +msgstr "なあ、あんた、私にそっくりだな！一緒に行こう！" #: src/craft_command.cpp src/crafting.cpp src/veh_interact.cpp msgid " (nearby)" @@ -92243,12 +92293,12 @@ msgstr "製作可否：" #: src/crafting_gui.cpp msgid "cancel [b]atch" -msgstr "[b]一括を取消" +msgstr "[b]一括製作を取消" #: src/crafting_gui.cpp #, c-format msgid "slow %d%%" -msgstr "" +msgstr "時間がかかる %d%%" #: src/crafting_gui.cpp msgid "too dark" @@ -92780,12 +92830,12 @@ msgstr "-[発光]-" #: src/editmap.cpp msgid "-clear-" -msgstr "" +msgstr "-消去-" #: src/editmap.cpp msgctxt "map editor: used to describe a clean field (eg. without blood)" msgid "-clear-" -msgstr "" +msgstr "-消去-" #: src/editmap.cpp msgctxt "map generator" @@ -92794,17 +92844,17 @@ msgstr "中止" #: src/editmap.cpp msgid "Add item" -msgstr "" +msgstr "アイテム配置" #: src/editmap.cpp msgctxt "item manipulation debug menu entry for adding an item on a tile" msgid "Add item" -msgstr "" +msgstr "アイテム配置" #: src/editmap.cpp msgctxt "map generator" msgid "Apply" -msgstr "" +msgstr "生成" #: src/editmap.cpp msgctxt "item manipulation debug menu entry" @@ -92814,7 +92864,7 @@ msgstr "取消" #: src/editmap.cpp msgctxt "map generator" msgid "Change Overmap (Doesn't Apply)" -msgstr "" +msgstr "生成せず全体マップのみ変更" #. ~ message when applying the map generator #: src/editmap.cpp @@ -92823,16 +92873,18 @@ msgid "" "Changed 4 submaps\n" "%s" msgstr "" +"4地点のサブマップを変更しました\n" +"%s" #: src/editmap.cpp #, c-format msgid "Changed oter_id from '%s' (%s) to '%s' (%s)" -msgstr "" +msgstr "地形のidを'%s' (%s)から'%s' (%s)に変更しました" #: src/editmap.cpp msgctxt "Map editor: Editing field effects" msgid "Field effects" -msgstr "フィールド効果" +msgstr "空間での効果" #: src/editmap.cpp msgctxt "shape" @@ -92862,16 +92914,16 @@ msgstr "見回す" #: src/editmap.cpp msgctxt "map generator" msgid "Mapgen stamp" -msgstr "" +msgstr "区域生成" #: src/editmap.cpp msgctxt "map generator" msgid "Mapgen: Moving target" -msgstr "" +msgstr "区域生成: 移動" #: src/editmap.cpp msgid "Moving selection" -msgstr "" +msgstr "移動" #: src/editmap.cpp msgctxt "shape" @@ -92890,7 +92942,7 @@ msgstr "再生成" #: src/editmap.cpp msgid "Resizing selection" -msgstr "" +msgstr "サイズ変更" #: src/editmap.cpp msgctxt "map generator" @@ -92899,7 +92951,7 @@ msgstr "回転" #: src/editmap.cpp msgid "Selection type" -msgstr "" +msgstr "形状選択" #: src/editmap.cpp msgctxt "Map editor: terrain/furniture editing menu" @@ -92910,7 +92962,7 @@ msgstr "地形/家具" #, c-format msgid "There is %d other item there as well." msgid_plural "There are %d other items there as well." -msgstr[0] "" +msgstr[0] "このタイルには他に%d個のアイテムがあります。" #: src/editmap.cpp #, c-format @@ -92959,7 +93011,7 @@ msgstr "[enter]編集、[q]終了、[v]全表示" #: src/editmap.cpp msgctxt "map editor" msgid "[g] terrain/furn, [o] mapgen, [i]tems, [q]uit" -msgstr "[g]地形/設備、[o]生成、[i]アイテム、[q]終了" +msgstr "[g]地形/設備、[o]区域、[i]アイテム、[q]終了" #: src/editmap.cpp msgid "[indoors] " @@ -92976,7 +93028,7 @@ msgstr "[m]移動" #: src/editmap.cpp msgid "[pgup/pgdn]: prev/next oter type" -msgstr "" +msgstr "[pgup/pgdn]: 前/次の地形" #: src/editmap.cpp msgid "[roof] " @@ -92990,7 +93042,7 @@ msgstr "[s/tab]形状選択、[m]移動、[<,>]密度" #: src/editmap.cpp msgctxt "Map editor: terrain/furniture shortkeys" msgid "[s/tab] shape select, [m]ove, [<>^v] select" -msgstr "[s/tab]形状選択、[m]移動、[<>^v]選択" +msgstr "[s/tab]メニュー切替、[m]移動、[<>^v]選択" #: src/editmap.cpp msgctxt "map editor: traps shortkeys" @@ -93004,7 +93056,7 @@ msgstr "[s]サイズ変更、[y]交換" #: src/editmap.cpp msgctxt "map editor" msgid "[t]rap, [f]ield, [HJKL] move++, [v] showall" -msgstr "[t]罠、[f]フィールド、[HJKL]移動++、[v]表示" +msgstr "[t]罠、[f]空間、[HJKL]移動++、[v]表示" #: src/editmap.cpp msgid "[up/dn] select, [enter] accept, [q] abort" @@ -93013,30 +93065,30 @@ msgstr "[up/dn]選択、[enter]実行、[q]中止" #: src/editmap.cpp #, c-format msgid "apparent light: %.2f, light_at: %.2f" -msgstr "" +msgstr "主観明度: %.2f, 客観明度: %.2f" #: src/editmap.cpp #, c-format msgctxt "item manipulation debug menu entry" msgid "bday: %d" -msgstr "" +msgstr "経過:%d" #: src/editmap.cpp #, c-format msgctxt "item manipulation debug menu entry" msgid "burnt: %d" -msgstr "" +msgstr "焼損: %d" #: src/editmap.cpp #, c-format msgctxt "item manipulation debug menu entry" msgid "damage: %d" -msgstr "ダメージ: %d" +msgstr "損傷: %d" #: src/editmap.cpp #, c-format msgid "dist: %d u_see: %d v_in: %d scent: %d" -msgstr "" +msgstr "距離: %d 被視認: %d 車両: %d 臭い: %d" #: src/editmap.cpp msgctxt "item manipulation debug menu entry" @@ -93056,7 +93108,7 @@ msgstr "終了" #: src/editmap.cpp #, c-format msgid "field: %s (%d) density %d age %d" -msgstr "フィールド: %s(%d) 密度 %d　経過期間 %d" +msgstr "空間: %s(%d) 密度 %d　経過期間 %d" #: src/editmap.cpp #, c-format @@ -93066,12 +93118,12 @@ msgstr "移動コスト %d" #: src/editmap.cpp #, c-format msgid "outside: %d" -msgstr "" +msgstr "屋外: %d" #: src/editmap.cpp msgctxt "item manipulation debug menu entry" msgid "rehash" -msgstr "" +msgstr "rehash" #: src/editmap.cpp msgctxt "item manipulation debug menu entry" @@ -93081,12 +93133,12 @@ msgstr "セーブテスト" #: src/editmap.cpp #, c-format msgid "sight_range: %d, daylight_sight_range: %d," -msgstr "" +msgstr "視界: %d, 日中視界: %d," #: src/editmap.cpp #, c-format msgid "transparency: %.5f, visibility: %.5f," -msgstr "" +msgstr "透過: %.5f, 視認性: %.5f," #: src/editmap.cpp #, c-format @@ -93415,7 +93467,7 @@ msgstr "地面が揺れました。" #: src/event.cpp msgid "The entire cavern shakes!" -msgstr "洞窟全体が振動しました！" +msgstr "洞穴全体が振動しました！" #: src/event.cpp msgid "The eye you're carrying lets out a tortured scream!" @@ -95389,7 +95441,7 @@ msgstr "%sは自殺を決意しました。" #: src/game.cpp #, c-format msgid "%s from %s (%d)" -msgstr "" +msgstr "%sを%s (%d)から抜く" #: src/game.cpp #, c-format @@ -95528,7 +95580,7 @@ msgstr "<+/->優先度" #: src/game.cpp msgid "<:W;AUTO: goes up" -msgstr "" +msgstr ">:W;自動メモ:上り階段" #: src/game.cpp msgid "ompare" @@ -95558,7 +95610,7 @@ msgstr "整列: 距離" #: src/game.cpp msgid ">:W;AUTO: goes down" -msgstr "" +msgstr ">:W;自動メモ:下り階段" #: src/game.cpp #, c-format @@ -95714,11 +95766,11 @@ msgstr "生成する車両を選択" #: src/game.cpp #, c-format msgid "Clearing out the %s would take forever." -msgstr "" +msgstr "%sを全て汲み出すには永遠に近い時間が掛かります。" #: src/game.cpp msgid "Clearly visible." -msgstr "" +msgstr "視界は良好です。" #: src/game.cpp msgid "Click directly on NPC to attack." @@ -96101,6 +96153,14 @@ msgstr "%sを動かすには時間がかかります。" msgid "It takes some time to move the heavy %s." msgstr "重い%sを動かすには幾らか時間がかかります。" +#: src/game.cpp +msgid "It takes you a long time to steer that vehicle!" +msgstr "その車両を運転するには時間がかかります！" + +#: src/game.cpp +msgid "It takes you a very long time to steer that vehicle!" +msgstr "その車両を運転するには非常に時間がかかります！" + #: src/game.cpp msgid "It's too dangerous to tunnel that far!" msgstr "トンネルを開くには距離がありすぎて危険です！" @@ -96337,7 +96397,7 @@ msgstr "掴もうとした時には掴む家具が存在しなかった。" #: src/game.cpp msgid "No radio car connected." -msgstr "" +msgstr "ラジコン模型自動車と接続されていない。" #: src/game.cpp #, c-format @@ -96465,6 +96525,10 @@ msgstr "" msgid "Pour %s where?" msgstr "%sをどこへ注ぎますか？" +#: src/game.cpp +msgid "Pour into a container" +msgstr "容器に汲む" + #: src/game.cpp #, c-format msgid "Pour into an adjacent keg (%s)" @@ -96882,7 +96946,7 @@ msgstr "同じ容器です！" #: src/game.cpp msgid "That's where you took it from!" -msgstr "" +msgstr "汲む場所と注ぐ場所が同じです！" #: src/game.cpp #, c-format @@ -97304,7 +97368,7 @@ msgstr "価値: %d" #: src/game.cpp #, c-format msgid "Vehicle control has moved, %s" -msgstr "" +msgstr "車両制御キーは変更されました。%s" #: src/game.cpp msgid "Wait 1800 heartbeats" @@ -97542,7 +97606,7 @@ msgstr "運転中に分解は出来ない。" #: src/game.cpp #, c-format msgid "You can't displace your %s." -msgstr "%sに給電する事が出来ない。" +msgstr "%sと入れ替わる事が出来ない。" #: src/game.cpp msgid "You can't dive while wearing a flotation device." @@ -97878,6 +97942,11 @@ msgstr "身体が衰え出しました。" msgid "You feel your genetic makeup degrading." msgstr "遺伝子が劣化するのを感じました。" +#: src/game.cpp +#, c-format +msgid "You fumble with the %s's controls." +msgstr "%sの制御をしくじりました。" + #: src/game.cpp msgid "You get a hold of yourself." msgstr "自分自身を抱きしめて落ち着こうとしました。" @@ -97969,7 +98038,7 @@ msgstr "%sで右足に怪我をしました！" #: src/game.cpp msgid "You know how to craft that now." -msgstr "それをどう作ればいいのか、全て分かるようになりました。" +msgstr "何をどう作ればいいのか、全て分かるようになりました。" #: src/game.cpp #, c-format @@ -97984,7 +98053,7 @@ msgstr "空の%sを捨てました。" #: src/game.cpp #, c-format msgid "You let go of the %1$s as it slides past %2$s" -msgstr "" +msgstr "手を離すと%1$sは%2$sを滑っていきました。" #: src/game.cpp #, c-format @@ -98498,7 +98567,7 @@ msgstr "近くのアイテムを先頭に" #: src/game.cpp msgid "new binding is " -msgstr "新しい割り当ては" +msgstr "新しいキー割り当ては" #: src/game.cpp msgid "new default binding is '^'." @@ -98507,7 +98576,7 @@ msgstr "新しい初期割り当ては'^'です。" #: src/game.cpp msgctxt "action" msgid "part reload" -msgstr "部品装填" +msgstr "個別装填" #: src/game.cpp msgid "player data" @@ -98568,7 +98637,7 @@ msgstr "見回す" #: src/game.cpp msgid "to shoot" -msgstr "" +msgstr "射撃" #: src/game.cpp msgid "turn" @@ -98604,7 +98673,7 @@ msgstr "年" #. ~ Sound of moving a remote controlled car #: src/game.cpp msgid "zzz..." -msgstr "zzz..." +msgstr "ザザザ..." #: src/gamemode.cpp msgid "Defense" @@ -100344,7 +100413,7 @@ msgstr "%sを掘り起こしますか？実行するとこの木は死にます #: src/iexamine.cpp msgid "Do what with the curtains?" -msgstr "カーテンで何をしますか？" +msgstr "カーテンに何をしますか？" #: src/iexamine.cpp msgid "Do what with the door?" @@ -100619,7 +100688,7 @@ msgstr "キャッシュカードを買いますか？" #: src/iexamine.cpp #, c-format msgid "Put how many of the %1$s into the %2$s?" -msgstr "" +msgstr "%1$sを%2$sの中に何個入れますか？" #: src/iexamine.cpp #, c-format @@ -101523,7 +101592,7 @@ msgstr "キー割り当ての保存に失敗しました: %s" #: src/input.cpp #, c-format msgid "unknown key %ld" -msgstr "" +msgstr "不明なキー %ld" #: src/inventory_ui.cpp msgid "Category selection; [TAB] switches mode, arrows select." @@ -101556,7 +101625,7 @@ msgstr "ホットキー: %d/%d " #: src/inventory_ui.cpp msgid "ITEMS WORN:" -msgstr "装備中:" +msgstr "着用中:" #: src/inventory_ui.cpp src/player.cpp msgid "Inventory:" @@ -101577,7 +101646,7 @@ msgstr "ページ %d/%d" #: src/inventory_ui.cpp msgid "Switch inventory/worn" -msgstr "切替 所持品/装備中" +msgstr "切替 所持品/着用中" #: src/inventory_ui.cpp msgid "There are no items to compare." @@ -102577,7 +102646,7 @@ msgstr "攻撃コスト: " #: src/item.cpp msgid "No (contents increase volume)" -msgstr "軟質(内容物によって容積が増加します)" +msgstr "軟質(内容物によって容積が増加)" #: src/item.cpp src/options.cpp msgid "Note: " @@ -102932,6 +103001,11 @@ msgstr "このアイテムを使って、色々なアイテムが製作可能で msgid "You could use it to craft: %s" msgstr "製作可能: %s" +#: src/item.cpp +#, c-format +msgid "You fall asleep and drop your %s." +msgstr "眠りに落ちて%sを落としました。" + #: src/item.cpp #, c-format msgid "You finish your %s." @@ -103028,7 +103102,7 @@ msgstr "[統合]" #: src/item.cpp msgid "age: " -msgstr "経過: " +msgstr "経過時間: " #: src/item.cpp msgid "atomic " @@ -103036,7 +103110,7 @@ msgstr "アトミック" #: src/item.cpp msgid "bday rot: " -msgstr "" +msgstr "経過ターン:" #: src/item.cpp msgid "black" @@ -103065,7 +103139,7 @@ msgstr "故障" #: src/item.cpp msgid "fridge: " -msgstr "" +msgstr "冷蔵:" #: src/item.cpp msgid "intelligence" @@ -103077,7 +103151,7 @@ msgstr "水密性があり、" #: src/item.cpp msgid "last rot: " -msgstr "" +msgstr "判定ターン:" #: src/item.cpp msgid "left" @@ -103085,7 +103159,7 @@ msgstr "左" #: src/item.cpp msgid "max rot: " -msgstr "" +msgstr "腐敗期限:" #: src/item.cpp msgctxt "color" @@ -103110,7 +103184,7 @@ msgstr "筋力" #: src/item.cpp msgid "temp rot: " -msgstr "" +msgstr "腐敗ターン:" #: src/item.cpp msgid "yellow" @@ -103191,7 +103265,7 @@ msgstr "所持品" #: src/item_location.cpp msgid "worn" -msgstr "装備中" +msgstr "着用中" #: src/iuse.cpp msgid "\"Blue\"" @@ -103900,7 +103974,7 @@ msgstr "素晴らしい風景写真です。" #: src/iuse.cpp msgid "Execute one vehicle action" -msgstr "" +msgstr "操縦する車両を選択" #: src/iuse.cpp msgid "Feels like you're on fire, but you're OK." @@ -103932,7 +104006,7 @@ msgstr "ガチャン！" #: src/iuse.cpp msgid "Geiger counter:" -msgstr "放射能測定器:" +msgstr "放射線測定器:" #: src/iuse.cpp msgid "Giant bees appear!" @@ -104486,7 +104560,7 @@ msgstr "ラジコンカーを制御する" #: src/iuse.cpp msgid "Take control of a vehicle." -msgstr "車両の操縦を始めました。" +msgstr "車両の操縦を始める" #: src/iuse.cpp msgid "Take out dish" @@ -104511,10 +104585,6 @@ msgstr "%sは既に濡れすぎています！" msgid "That isn't a firearm!" msgstr "それは銃火器ではない！" -#: src/iuse.cpp -msgid "That item already has a rechargeable battery pack." -msgstr "この道具には既に充電式拡張バッテリーが組み込まれています。" - #: src/iuse.cpp msgid "That item has already had its battery capacity doubled." msgstr "この道具は既に容量を倍化してあります。" @@ -104729,39 +104799,39 @@ msgstr "宇宙の構造が崩壊しつつあるようです。" #: src/iuse.cpp msgid "The geiger counter buzzes intensely." -msgstr "放射能測定器が激しく唸り続けています。" +msgstr "放射線測定器が激しく唸り続けています。" #: src/iuse.cpp msgid "The geiger counter clicks intermittently." -msgstr "放射能測定器が断続的にカチ...カチ...と鳴っています。" +msgstr "放射線測定器が断続的にカチ...カチ...と鳴っています。" #: src/iuse.cpp msgid "The geiger counter clicks once." -msgstr "放射能測定器が1度だけカチッと鳴りました。" +msgstr "放射線測定器が1度だけカチッと鳴りました。" #: src/iuse.cpp msgid "The geiger counter clicks rapidly." -msgstr "放射能測定器が急速にカチカチと鳴り続けています。" +msgstr "放射線測定器が素早くカチカチと鳴り続けています。" #: src/iuse.cpp msgid "The geiger counter clicks slowly." -msgstr "放射能測定器が緩やかにカチカチと鳴り続けています。" +msgstr "放射線測定器が緩やかにカチカチと鳴り続けています。" #: src/iuse.cpp msgid "The geiger counter clicks steadily." -msgstr "放射能測定器が安定してカチカチと鳴り続けています。" +msgstr "放射線測定器が一定の速さでカチカチと鳴り続けています。" #: src/iuse.cpp msgid "The geiger counter clicks wildly." -msgstr "放射能測定器が狂ったようにカチカチと鳴り続けています。" +msgstr "放射線測定器が狂ったようにカチカチと鳴り続けています。" #: src/iuse.cpp msgid "The geiger counter's SCANNING LED turns off." -msgstr "放射能測定器のLED液晶画面のスイッチを切りました。" +msgstr "放射線測定器のLED液晶画面のスイッチを切りました。" #: src/iuse.cpp msgid "The geiger counter's scan LED turns on." -msgstr "放射能測定器のLED液晶画面のスイッチを入れました。" +msgstr "放射線測定器のLED液晶画面のスイッチを入れました。" #: src/iuse.cpp src/iuse_actor.cpp msgid "The ground" @@ -104770,7 +104840,7 @@ msgstr "地面" #: src/iuse.cpp #, c-format msgid "The ground's radiation level: %d" -msgstr "地面の放射能レベル: %d" +msgstr "地面の放射線レベル: %d" #: src/iuse.cpp msgid "The infernal racket dies as the noise emitter turns off." @@ -104848,7 +104918,7 @@ msgstr "頭の内側に感じていた圧迫感が薄れています。" #: src/iuse.cpp msgid "The radiation biomonitor needs batteries to function." -msgstr "放射能生体モニターは動作に電池が必要です。" +msgstr "放射線生体モニターは動作に電池が必要です。" #: src/iuse.cpp msgid "The radio dies." @@ -105274,7 +105344,7 @@ msgstr "RM13コンバットアーマーを起動しました。" #: src/iuse.cpp msgid "You activate your radiation biomonitor." -msgstr "放射能生体モニターを起動しました。" +msgstr "放射線生体モニターを起動しました。" #: src/iuse.cpp msgid "You already know all this book has to teach." @@ -105662,7 +105732,7 @@ msgstr "とても眠い..." #: src/iuse.cpp #, c-format msgid "You fire up your %s and start getting the tension out." -msgstr "握った%sに火を入れました。盛り上がってきたぞ。" +msgstr "%sのスイッチを入れました。盛り上がってきたぞ。" #: src/iuse.cpp msgid "You flip the switch, but nothing happens." @@ -105819,7 +105889,7 @@ msgstr "2つの固い地形の間にトリップワイヤーを渡して下さ #: src/iuse.cpp msgid "You must wear the radiation biomonitor before you can activate it." -msgstr "放射能生体モニターを起動する前に装着してください。" +msgstr "放射線生体モニターを起動する前に装着してください。" #: src/iuse.cpp msgid "You must wear the stimulant delivery system before you can activate it." @@ -106041,13 +106111,6 @@ msgstr "%sを完全に修理しました！" msgid "You repair your %s!" msgstr "%sを修理しました！" -#: src/iuse.cpp -#, c-format -msgid "" -"You replace the battery compartment of your %s with a rechargeable battery " -"pack!" -msgstr "%sの電源機構を充電式拡張バッテリーに置き換えました！" - #: src/iuse.cpp #, c-format msgid "You replace your current %s." @@ -106586,7 +106649,7 @@ msgstr "火炎ビンの火が消えました。" #: src/iuse.cpp #, c-format msgid "Your radiation level: %d (%d from items)" -msgstr "自身の放射能レベル: %d (検出量(アイテム): %d)" +msgstr "自身の放射線レベル: %d (検出量(アイテム): %d)" #: src/iuse.cpp msgid "Your skin grows warm for a moment." @@ -106835,7 +106898,7 @@ msgstr[0] "対応弾薬: %i発の" #: src/iuse_actor.cpp #, c-format msgid "Can be used to assemble: %s" -msgstr "" +msgstr "組み合わせて入手できる物: %s" #: src/iuse_actor.cpp #, c-format @@ -108881,11 +108944,6 @@ msgstr "罠の解除に失敗して、作動させてしまった。" msgid "You fail to disarm the trap." msgstr "罠の解除に失敗しました。" -#: src/map.cpp -#, c-format -msgid "You fumble with the %s's controls." -msgstr "%sの制御をしくじりました。" - #: src/map.cpp #, c-format msgid "You lose control of the %s." @@ -108964,7 +109022,7 @@ msgstr "兵舎の入口" #: src/mapgen.cpp msgid "Bionic access" -msgstr "生体部品にアクセス" +msgstr "生体部品呼び出し" #: src/mapgen.cpp msgid "Broadcasting Control" @@ -115396,7 +115454,7 @@ msgstr "%1$sは%2$sを押しのけました。" #, c-format msgid "" "The %s flows around the objects on the floor and they are quickly dissolved!" -msgstr "%sは床の物体の回りを流動し、瞬時に分解されました！" +msgstr "%sは動き回り、床の上にある物を速やかに分解しました！" #: src/monmove.cpp msgid "dives" @@ -115469,7 +115527,7 @@ msgstr "%sを殺しました。" #: src/monster.cpp msgid "On ground" -msgstr "地中" +msgstr "地上" #: src/monster.cpp msgid "Passive " @@ -115853,7 +115911,7 @@ msgstr "覚せい剤依存症" #: src/morale.cpp msgid "Supported" -msgstr "支えられている" +msgstr "同胞の支援" #: src/morale.cpp msgid "Total morale gain" @@ -116033,7 +116091,7 @@ msgstr "我々はチームだ！やるぞーっ！" #. ~ Usual enthusiastic slimespring small voices! :D #: src/mutation.cpp msgid "wow! you look just like me! we should look out for each other!" -msgstr "なあ、あんた、私みたいだな！お互い助け合おう！" +msgstr "なあ、あんた、私にそっくりだな！お互い助け合おう！" #: src/mutation_ui.cpp #, c-format @@ -116061,26 +116119,26 @@ msgstr "変異" #: src/mutation_ui.cpp #, c-format msgid "%s to activate mutation, " -msgstr "" +msgstr "%sを押して無効化する変異を選択" #: src/mutation_ui.cpp #, c-format msgid "%s to assign the hotkeys." -msgstr "" +msgstr "%sでキー設定の確認" #: src/mutation_ui.cpp #, c-format msgid "%s to examine mutation, " -msgstr "" +msgstr "%sを押して有効化する変異を選択" #: src/mutation_ui.cpp #, c-format msgid "%s to reassign invlet, " -msgstr "" +msgstr "%sでキー割り当て" #: src/mutation_ui.cpp msgid "Activating" -msgstr "" +msgstr "有効化" #: src/mutation_ui.cpp msgid "Active:" @@ -116088,7 +116146,7 @@ msgstr "アクティブ:" #: src/mutation_ui.cpp msgid "Examining" -msgstr "" +msgstr "無効化" #: src/mutation_ui.cpp #, c-format @@ -116111,7 +116169,7 @@ msgstr "パッシブ:" #: src/mutation_ui.cpp msgid "Reassigning." -msgstr "" +msgstr "キーを割り当てます。" #: src/mutation_ui.cpp msgid "" @@ -117331,10 +117389,6 @@ msgstr "その筋肉をぴくりとも動かすなよ..." msgid "Drop items" msgstr "アイテムを落とす" -#: src/npcmove.cpp -msgid "Fire a burst" -msgstr "制限点射" - #: src/npcmove.cpp msgid "Flee" msgstr "逃走" @@ -120253,7 +120307,7 @@ msgstr "その通りだ、一緒に行くよ！" #: src/npctalk.cpp msgid "You have no items to offer." -msgstr "" +msgstr "渡せるアイテムを持っていない。" #: src/npctalk.cpp msgid "You just asked me for stuff; ask later." @@ -120261,7 +120315,7 @@ msgstr "今はもう何もないんだ。また今度にしてくれ。" #: src/npctalk.cpp msgid "You might be seeing more of me..." -msgstr "君は私の多くを知る事になるかもね..." +msgstr "これからもよろしく..." #: src/npctalk.cpp msgid "You mind?" @@ -121172,7 +121226,7 @@ msgstr "音量/音楽" #: src/options.cpp msgid "Mutations by radiation" -msgstr "放射能で変異" +msgstr "放射線で変異" #: src/options.cpp msgid "NPC spawn rate scaling factor" @@ -122022,7 +122076,7 @@ msgstr "ホットプレートを使う" #: src/pickup.cpp msgid "Use the welding rig?" -msgstr "溶接装置を使いますか？" +msgstr "溶接装置を使う" #: src/pickup.cpp #, c-format @@ -122529,7 +122583,7 @@ msgstr "寒い%s" #: src/player.cpp msgid "Choose drive:" -msgstr "" +msgstr "ダウンロード先を選択:" #: src/player.cpp #, c-format @@ -122842,10 +122896,6 @@ msgstr "眩い光に包まれ、瞬間移動しました。" msgid "Good mood +%s%d%%" msgstr "気分高揚 +%s%d%%" -#: src/player.cpp -msgid "Gun:" -msgstr "武装:" - #: src/player.cpp msgid "He" msgstr "彼" @@ -123773,14 +123823,14 @@ msgstr "" #, c-format msgctxt "memorial_female" msgid "Worn %s was completely destroyed." -msgstr "装備していた%sは完全に破壊された。" +msgstr "着用していた%sは完全に破壊された。" #. ~ %s is armor name #: src/player.cpp #, c-format msgctxt "memorial_male" msgid "Worn %s was completely destroyed." -msgstr "装備していた%sは完全に破壊された。" +msgstr "着用していた%sは完全に破壊された。" #: src/player.cpp msgid "YOU SHOULD QUIT THE GAME IMMEDIATELY." @@ -123944,7 +123994,7 @@ msgstr "それは羊毛製なので装備できない！" #: src/player.cpp #, c-format msgid "You cannot swap the side on which your %s is worn." -msgstr "%sの装備位置を左右入れ替えることはできません。" +msgstr "%sの着用部位を左右入れ替えることはできません。" #: src/player.cpp #, c-format @@ -124379,7 +124429,7 @@ msgstr "痛みを伴う放電によって苦しみました！" #: src/player.cpp #, c-format msgid "You swap the side on which your %s is worn." -msgstr "%sの装備位置を左右入れ替えました。" +msgstr "%sの着用部位を左右入れ替えました。" #: src/player.cpp #, c-format @@ -124935,7 +124985,7 @@ msgstr "筋肉が固まり、痛んでいます。" #: src/player.cpp msgid "Your muscles feel like they're knotted and tired." -msgstr "筋肉が固結びにされたようになっています。" +msgstr "筋肉が疲れ切りこわばっています。" #: src/player.cpp msgid "Your muscles spasm." @@ -125037,8 +125087,8 @@ msgid "" "Your stomach gurgles. It's probably nothing, but maybe you should look into " "eating something healthy." msgstr "" -"腹がゴロゴロと鳴っています。多分なんでもありませんが、何か良いものを食べてお" -"いたほうがいいかもしれません。" +"腹がゴロゴロと鳴っています。多分なんでもありませんが、何かまともな物を食べて" +"おいたほうがいいかもしれません。" #: src/player.cpp msgid "Your thick scales get in the way." @@ -125114,10 +125164,6 @@ msgstr "枝角" msgid "armor" msgstr "装甲" -#: src/player.cpp -msgid "auto" -msgstr "自動" - #: src/player.cpp msgid "beep-beep-beep!" msgstr "ビー！ビー！ビー！" @@ -125130,10 +125176,6 @@ msgstr "髪" msgid "horns" msgstr "角" -#: src/player.cpp -msgid "off " -msgstr "オフ" - #: src/player.cpp msgid "quills" msgstr "羽軸" @@ -125168,7 +125210,7 @@ msgstr " 建設を中断しますか？" #: src/player_activity.cpp msgid " Stop cracking?" -msgstr "クラッキングを中断しますか？" +msgstr "金庫破りを中断しますか？" #: src/player_activity.cpp msgid " Stop crafting?" @@ -125331,7 +125373,7 @@ msgstr "%c %c 対象を切り換える / %c 撃つ" #: src/ranged.cpp #, c-format msgid "%c target self; %c toggle snap-to-target" -msgstr "%c 自分を狙う / %c 画面の中心を切り換える" +msgstr "%c 照準を中央へ / %c 画面の中心を切り換える" #: src/ranged.cpp #, c-format @@ -126392,7 +126434,7 @@ msgstr "、%2$dレベルの機械整備技能スキルが必 #: src/veh_interact.cpp #, c-format msgid "* Faulty %1$s" -msgstr "* %1$s故障した" +msgstr "* 故障した%1$s" #: src/veh_interact.cpp #, c-format @@ -126998,13 +127040,6 @@ msgstr "%2.1fリッター" msgid "%d\"" msgstr "%dインチ" -#: src/vehicle.cpp -#, c-format -msgid "%s failed to fire! It isn't loaded and/or powered." -msgstr "" -"%sは撃てない！弾薬が装填されていないか、動力が供給されていない、またはその両" -"方です。" - #: src/vehicle.cpp #, c-format msgid "%s points in your direction and emits an IFF warning beep." @@ -127042,10 +127077,6 @@ msgstr "" "脚の間の無慈悲な金属棒をしばし眺めて、今まさにまたがっている%sを畳もうという" "目論見は再考すべきである、という結論に到達しました。" -#: src/vehicle.cpp -msgid "Auto" -msgstr "自動" - #. ~ backfire sound #: src/vehicle.cpp msgid "BANG!" @@ -127108,10 +127139,6 @@ msgstr "カチィン" msgid "Close" msgstr "閉める" -#: src/vehicle.cpp -msgid "Configure individual turrets" -msgstr "各種タレットの射撃モード設定" - #: src/vehicle.cpp msgid "Control individual engines" msgstr "各エンジンの設定をする" @@ -127128,32 +127155,10 @@ msgstr "自動走行制御が有効になりました" msgid "Cugugugugug" msgstr "ゴゴゴゴゴゴ..." -#: src/vehicle.cpp -msgid "Cycle turret mode" -msgstr "タレットのモード切替" - -#: src/vehicle.cpp -msgid "Deactivating automatic target acquisition for this turret" -msgstr "このタレットの自動標的補足機能を無効にする" - #: src/vehicle.cpp msgid "Disable cruise control" msgstr "速度自動制御オフ" -#: src/vehicle.cpp -msgid "Disable turrets" -msgstr "タレットを無効化" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling automatic target acquisition on %s" -msgstr "%sの自動標的補足機能を無効にしました。" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling turret %s." -msgstr "%sタレットを無効化しました" - #: src/vehicle.cpp msgid "Do nothing" msgstr "何もしない" @@ -127170,10 +127175,6 @@ msgstr "天井灯を点けました" msgid "Enable cruise control" msgstr "速度自動制御オン" -#: src/vehicle.cpp -msgid "Enable turrets" -msgstr "タレットを有効化" - #. ~ indicates that a vehicle part is outside #: src/vehicle.cpp msgid "Exterior" @@ -127260,10 +127261,6 @@ msgstr "ピーッ ピーッ ピーッ" msgid "No controls there." msgstr "制御できない。" -#: src/vehicle.cpp -msgid "No target" -msgstr "標的なし" - #: src/vehicle.cpp msgid "Open" msgstr "開ける" @@ -127329,19 +127326,16 @@ msgid "Select door to toggle" msgstr "切り替えるドアを選択する" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to buggy mode." -msgstr "%sタレットをバギーモードに設定しました。" +msgid "Set turret firing modes" +msgstr "タレットの射撃モードを設定" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to burst mode." -msgstr "%sタレットをバースト射撃モードに設定しました。" +msgid "Set turret targeting" +msgstr "タレットの照準設定" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to single-fire mode." -msgstr "%sタレットを単発射撃モードに設定しました。" +msgid "Set turret targeting modes" +msgstr "タレットの照準モードを設定" #: src/vehicle.cpp msgid "Stop controlling" @@ -127388,6 +127382,11 @@ msgstr "%1$sの%3$sが%2$sを轢きました。" msgid "The %s doesn't have enough wheels to move!" msgstr "%sはタイヤが足りなくて動かない！" +#: src/vehicle.cpp +#, c-format +msgid "The %s is stuck." +msgstr "%sが動かない。" + #: src/vehicle.cpp #, c-format msgid "The %s is too leaky!" @@ -127523,14 +127522,6 @@ msgstr "ステレオが動かない！" msgid "The vehicle part you were working on has gone!" msgstr "作業中の車両の部品が壊れてしまいました！" -#: src/vehicle.cpp -msgid "This turret can't be aimed manually" -msgstr "このタレットは手動では照準を付けられない。" - -#: src/vehicle.cpp -msgid "This turret doesn't have enough ammo" -msgstr "タレットに弾薬が入っていない。" - #: src/vehicle.cpp msgid "This turret is not powered" msgstr "タレットに電源が入っていない。" @@ -127697,27 +127688,6 @@ msgstr "チャイムを作動させました" msgid "Turned on music" msgstr "音楽をオンにしました" -#: src/vehicle.cpp -msgid "Turret system is on, but all turrets are configured not to shoot." -msgstr "タレットシステムは有効ですが、射撃モードに設定されていない。" - -#: src/vehicle.cpp -msgid "Turrets have been configured, but the vehicle turret system is off." -msgstr "" -"タレットは設置されていますが、車両のタレットシステムがオフになっています。" - -#: src/vehicle.cpp -msgid "Turrets: Disabled" -msgstr "タレット: 無効" - -#: src/vehicle.cpp -msgid "Turrets: Enabled" -msgstr "タレット: 有効" - -#: src/vehicle.cpp -msgid "Unseen" -msgstr "視界外" - #: src/vehicle.cpp msgid "Vehicle controls" msgstr "車両制御装置" @@ -127776,7 +127746,7 @@ msgstr "クラクションを鳴らしましたが、何も起こらなかった #: src/vehicle.cpp msgid "You leave the controls alone." -msgstr "" +msgstr "制御装置をそのままにしておきました。" #: src/vehicle.cpp #, c-format @@ -127846,7 +127816,11 @@ msgstr "エンジンは大きな摩擦音を発しています。" #: src/vehicle.cpp msgid "a simple melody blaring from the loudspeakers." -msgstr "拡声器から単純な旋律が鳴り響いています。" +msgstr "拡声器によって単純な旋律が鳴り響いています。" + +#: src/vehicle.cpp +msgid "auto" +msgstr "自動" #. ~ Beeper sound #: src/vehicle.cpp @@ -127862,6 +127836,10 @@ msgstr "%s(折り畳まれた)" msgid "hummm!" msgstr "ブゥン！" +#: src/vehicle.cpp +msgid "manual" +msgstr "マニュアル" + #: src/vehicle.cpp msgid "roarrr!" msgstr "唸るような音が聞こえました！" @@ -128092,7 +128070,7 @@ msgstr "3増加" #: src/wish.cpp msgid "Add-ons:" -msgstr "アドオン:" +msgstr "追加:" #: src/wish.cpp msgid "Alter all skill values" From 18d061aea055ec96129550f8448b725c2d529a2d Mon Sep 17 00:00:00 2001 From: Vlasov Vitaly Date: Thu, 9 Jun 2016 21:02:57 +0300 Subject: [PATCH 099/110] Korean update --- lang/po/ko.po | 618 +++++++++++++++++++++++++------------------------- 1 file changed, 310 insertions(+), 308 deletions(-) diff --git a/lang/po/ko.po b/lang/po/ko.po index fbf687c43d361..8ec710cfca24f 100644 --- a/lang/po/ko.po +++ b/lang/po/ko.po @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: Cataclysm-DDA\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-30 09:53+0300\n" -"PO-Revision-Date: 2016-05-30 08:22+0000\n" -"Last-Translator: Vlasov Vitaly \n" +"POT-Creation-Date: 2016-06-06 10:20+0300\n" +"PO-Revision-Date: 2016-06-09 10:55+0000\n" +"Last-Translator: Jay Bae \n" "Language-Team: Korean (http://www.transifex.com/cataclysm-dda-translators/" "cataclysm-dda/language/ko/)\n" "Language: ko\n" @@ -1408,6 +1408,13 @@ msgstr "못이 들어있는 박스. 주로 망치와 함께 사용된다." msgid "A box of small steel balls. They deal virtually no damage." msgstr "작은 쇠구슬 한 박스. 탄환으로 사용해도 피해를 거의 주지 못합니다." +#. ~ Description for .44 FMJ +#: lang/json/AMMO_from_json.py +msgid "" +"A brass-jacketed variant of the .44 Magnum round. This increases " +"penetration slightly at the cost of reduced damage from expansion." +msgstr "" + #. ~ Description for blue paint #: lang/json/AMMO_from_json.py msgid "A can of blue paint." @@ -2192,10 +2199,10 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A simple arrow shaft that has had a point carved into it and then fire-" -"hardened. Needs fletching to be worth firing from a bow." +"hardened. It needs fletching to be worth firing from a bow." msgstr "" -"촉 부분을 뾰족하게 깎아 불로 그을려 단단하게 만든 단순한 화살. 활을 이용해 제" -"대로 쏘기 위해서는 화살깃을 달아야 합니다." +"촉 부분을 뾰족하게 깎아 불로 그을려 단단하게 만든 단순한 화살대. 활을 이용해 " +"제대로 쏘기 위해서는 화살깃을 달아야 합니다." #. ~ Description for ammo belt linkage #: lang/json/AMMO_from_json.py @@ -2802,17 +2809,6 @@ msgstr "" "다. 로켓 연료나 고폭탄을 만드는 데 사용되며, 유기물에 접촉시 불타 심한 화상" "을 입힐 가능성이 있다." -#. ~ Description for .22 CB -#: lang/json/AMMO_from_json.py -msgid "" -"Conical Ball .22 is a variety of .22 ammunition with a very small propellant " -"charge and generally lacks gunpowder. The end result is a subsonic round " -"that is so weak as to be nearly useless given your predicament." -msgstr "" -".22 Conical Ball 탄은 .22 구경 탄약에서 파생된 탄으로 매우 적은 추진 장약과 " -"탄두를 가지고 있다. 결과적으로 음속 이하의 속도를 내는 아음속탄으로 아주 약해" -"서 현재의 열악한 상황에선 거의 쓸모가 없다." - #. ~ Description for handloaded .22 CB #: lang/json/AMMO_from_json.py msgid "" @@ -3384,13 +3380,11 @@ msgstr[0] "RDX" #. ~ Description for .22 rat-shot #: lang/json/AMMO_from_json.py msgid "" -"Rat-shot is extremely weak ammunition, designed for killing rats, snakes, or " -"other small vermin while being unable to damage walls. It has an extremely " -"short range and is unable to injure all but the smallest creatures." +"Rat-shot is an extremely weak .22 shotgun cartridge, designed for killing " +"rats, snakes, or other small vermin while being unable to damage walls. It " +"has an extremely short range and is unable to injure all but the smallest " +"creatures." msgstr "" -"랫-샷은 매우 약한 탄약이다. 이름 그대로 쥐 혹은 뱀, 작은 해충을 죽이면서도 벽" -"에 구멍을 내지 않을 용도로 만들어졌다. 때문에 극단적으로 짧은 사거리를 가지" -"고 있고, 엄청나게 작은 생물을 제외하곤 거의 피해를 줄 수 없다." #. ~ Description for handloaded .22 rat-shot #: lang/json/AMMO_from_json.py @@ -3523,6 +3517,14 @@ msgstr "" "치명적이다. 인체에 치명적임에도 불구하고 다양한 용도 때문에 배터리용 산을 포" "함한 화학제품을 만드는데 사용된다." +#. ~ Description for .22 CB +#: lang/json/AMMO_from_json.py +msgid "" +"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." +msgstr "" + #. ~ Description for reloaded .300 Winchester Magnum #: lang/json/AMMO_from_json.py msgid "" @@ -3751,7 +3753,7 @@ msgstr "강철 촉과 깃을 붙인 금속 화살. 재사용 확률 상당히 #: lang/json/AMMO_from_json.py msgid "" "This metal shaft has been carefully sharpened so that it has a crude point " -"at the end. Needs fletching to be worth firing from a bow." +"at the end. It needs fletching to be worth firing from a bow." msgstr "" "끝을 세심히 갈아 적당히 촉을 만든 금속 화살대. 활을 이용해 제대로 쏘기 위해서" "는 화살깃을 달아야 합니다." @@ -4904,9 +4906,9 @@ msgid_plural "reloaded 7.62x39mm M43" msgstr[0] "7.62x39mm M43 (재생)" #: lang/json/AMMO_from_json.py -msgid "reloaded 7.62x39mm M87" -msgid_plural "reloaded 7.62x39mm M87" -msgstr[0] "7.62x39mm M87 (재생)" +msgid "reloaded 7.62x39mm M67" +msgid_plural "reloaded 7.62x39mm M67" +msgstr[0] "" #: lang/json/AMMO_from_json.py msgid "reloaded 7.62x51mm" @@ -6600,13 +6602,9 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "" "A large leather quiver trimmed with metal, worn on the back, that can hold " -"60 arrows.\n" -"Historically used by horse archers, rather than foot archers, but neither of " -"THEM had to fight zombies. Activate to store arrows." +"60 arrows. Historically used by horse archers, rather than foot archers, " +"but neither of THEM had to fight zombies. Activate to store arrows." msgstr "" -"등에 착용하는 커다란 금속 장식 가죽 화살통. 화살 60발을 수납할 수 있습니다. " -"과거 일반적인 궁수보다 기마 궁수들이 더 많이 사용했지만, 양쪽 모두 좀비와 싸" -"우지는 않았죠. 사용하면 화살을 집어넣습니다." #. ~ Description for pair of ski goggles #: lang/json/ARMOR_from_json.py @@ -13561,9 +13559,8 @@ msgstr "" "손바닥에 작은 반구형 EMP 장 발생기를 탑재했습니다. 내장 전력을 사용해서 로봇" "과 전자 장치를 무력화 시킬 수 있는 단거리 전자기 펄스를 발생시킬 수 있습니다." -#. ~ Description for Telescopic Eyes #. ~ Description for Telescopic Eyes CBM -#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py +#: lang/json/BIONIC_ITEM_from_json.py msgid "" "Much of the material in your inner eye has been removed and replaced with an " "array of high-powered, auto-focusing lenses. You can now see much farther " @@ -18627,6 +18624,9 @@ msgid "" "step towards creating the elixir of life, allegedly. Drinking this will " "strengthen the body, at the cost of minor pain and other side effects." msgstr "" +"코를 가렵게 하는 냄새가 나는 이상한 노란색 액체. 이른바 생명의 영약이란 걸 만" +"들기 위한 두 번째 단계입니다. 이걸 마시면 신체가 강력해지겠지만, 약간의 통증" +"과 몇가지 부작용이 있습니다." #. ~ Description for yellow potion #: lang/json/COMESTIBLE_from_json.py @@ -18635,6 +18635,9 @@ msgid "" "towards creating the elixir of life, allegedly. Drinking this will enhance " "your speed and dexterity, but it won't be a pleasant experience." msgstr "" +"취할 듯한 냄새가 나는 이상한 노란색 액체. 이른바 생명의 영약이라는 것을 만들" +"기 위한 세 번째 단계입니다. 이걸 마시면 속도와 손재주가 향상되지만, 별로 좋" +"은 경험은 아닐 겁니다." #. ~ Description for diazepam #: lang/json/COMESTIBLE_from_json.py @@ -19948,7 +19951,7 @@ msgstr "맛있는 황금색 알갱이들." #. ~ Description for hickory nut ambrosia #: lang/json/COMESTIBLE_from_json.py msgid "Delicious hickory nut ambrosia. A drink worthy of the gods." -msgstr "" +msgstr "신들의 음료라는 말에 걸맞은 맛있는 히코리 열매 암브로시아입니다." #. ~ Description for lunch meat #: lang/json/COMESTIBLE_from_json.py @@ -20685,7 +20688,6 @@ msgstr "" "매사추세츠에서 자란 진짜 크랜베리로 만들었습니다. 맛있고 영양가도 풍부합니다." #. ~ Description for whiskey -#. ~ Description for test_whiskey #: lang/json/COMESTIBLE_from_json.py msgid "Made from, by, and for real Southern colonels!" msgstr "남부 지방에서, 남부 사람이, 남부 사람을 위해 만든 진짜 위스키 입니다!" @@ -21767,6 +21769,8 @@ msgid "" "Sweetened coffee and whiskey topped with milk. Start your day the closeted " "alcoholic way!" msgstr "" +"위스키를 섞은 커피 위에 우유를 조금 띄운 것입니다. 아침부터 남 몰래 술을 드세" +"요!" #. ~ Description for Prussian blue tablet #: lang/json/COMESTIBLE_from_json.py @@ -25573,6 +25577,11 @@ msgid "seasoned salt" msgid_plural "seasoned salt" msgstr[0] "맛소금" +#: lang/json/COMESTIBLE_from_json.py lang/json/furniture_from_json.py +msgid "seed" +msgid_plural "seeds" +msgstr[0] "씨앗" + #: lang/json/COMESTIBLE_from_json.py msgid "seed potato" msgid_plural "seed potatoes" @@ -25887,11 +25896,6 @@ msgid "tequila" msgid_plural "tequilas" msgstr[0] "테킬라" -#: lang/json/COMESTIBLE_from_json.py -msgid "test_whiskey" -msgid_plural "test_whiskey" -msgstr[0] "test_whiskey" - #: lang/json/COMESTIBLE_from_json.py msgid "thyme" msgid_plural "thymes" @@ -26523,11 +26527,6 @@ msgid "" "A watertight leather bag with a carrying strap, can hold 3 liters of water." msgstr "물이 새지 않는 끈 달린 가죽 부대. 3L의 물을 담을 수 있다." -#. ~ Description for test glass bottle -#: lang/json/CONTAINER_from_json.py -msgid "An UNSEALABLE glass bottle, holds 750 ml of liquid." -msgstr "'개봉할 수 있는' 유리 병. 액체를 750ml까지 담을 수 있다." - #. ~ Description for aluminum can #: lang/json/CONTAINER_from_json.py msgid "An aluminum can, like what soda comes in." @@ -26770,11 +26769,6 @@ msgid "steel jerrycan" msgid_plural "steel jerrycans" msgstr[0] "강철 기름통" -#: lang/json/CONTAINER_from_json.py -msgid "test glass bottle" -msgid_plural "test glass bottles" -msgstr[0] "실험용 유리병" - #: lang/json/CONTAINER_from_json.py msgid "tin can" msgid_plural "tin cans" @@ -27011,17 +27005,6 @@ msgstr "" "능.\r\n" "(역주: 'Meal Rejected by the Enemy'를 해석하면 '적에게 거부당한 음식')" -#. ~ Description for car battery -#: lang/json/GENERIC_from_json.py -msgid "A 12v lead-acid battery used to power car electrical systems." -msgstr "12v 납산 축전지로, 일반 차량의 전력 시스템을 작동시킬 때 사용합니다." - -#. ~ Description for motorbike battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A 12v lead-acid battery used to power smaller vehicles' electrical systems." -msgstr "12v 납산 축전지로, 소형 차량의 전력 시스템을 작동시킬 때 사용합니다." - #. ~ Description for long rope #: lang/json/GENERIC_from_json.py msgid "" @@ -28010,11 +27993,6 @@ msgstr "" msgid "A kiln full of wood that has been lit; better drop it!" msgstr "땔감이 가득 찬 가마에 불이 붙어있다. 그냥 놔두는 편이 좋을 것 같다." -#. ~ Description for truck battery -#: lang/json/GENERIC_from_json.py -msgid "A large 12v lead-acid battery used to power truck electrical systems." -msgstr "큰 12v 납산 축전지로, 트럭의 전력 시스템을 작동시킬 때 사용합니다." - #. ~ Description for truck alternator #: lang/json/GENERIC_from_json.py msgid "A large alternator used to power truck electrical systems." @@ -28149,15 +28127,6 @@ msgstr "깨지기 쉬운 커다란 유리판. 창문을 갈아끼울 때 사용 msgid "A large stone, roughly hollowed out into a pot." msgstr "큰 돌의 속을 비워내어 만든 냄비입니다." -#. ~ Description for storage battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A large storage battery. Could be installed into a storage battery case for " -"easy removal from a vehicle, or just welded straight in." -msgstr "" -"대형 전력 저장용 배터리. 제작에 사용되며 배터리 케이스에 설치하면 차량에서 " -"쉽게 제거할 수 있지만 그냥 용접해 붙일 수도 있습니다." - #. ~ Description for folding wire basket #: lang/json/GENERIC_from_json.py msgid "A large wire basket from a shopping cart, modified to be foldable." @@ -28321,11 +28290,6 @@ msgstr "" "목제 손잡이에 가시 달린 철제 구가 달린 중세의 무기. 굉장히 파괴적인 피해를 가" "할 수 있으며, 약간의 관통력이 있다." -#. ~ Description for medium storage battery -#: lang/json/GENERIC_from_json.py -msgid "A medium storage battery." -msgstr "중간 사이즈의 전력 저장용 배터리이다." - #. ~ Description for SD-Memory card #: lang/json/GENERIC_from_json.py msgid "A memory card, used. Might be worth a look." @@ -29041,11 +29005,6 @@ msgid "" "used to lift up to 1.5 metric tonnes." msgstr "" -#. ~ Description for small storage battery -#: lang/json/GENERIC_from_json.py -msgid "A small storage battery. Useful for crafting." -msgstr "작은 사이즈의 전력 저장용 배터리이다. 제작에 쓰인다." - #. ~ Description for damaged tent #: lang/json/GENERIC_from_json.py msgid "" @@ -31705,11 +31664,6 @@ msgid "car alternator" msgid_plural "car alternators" msgstr[0] "자동차 발전기" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "car battery" -msgid_plural "car batteries" -msgstr[0] "자동차 배터리" - #: lang/json/GENERIC_from_json.py msgid "carding paddles" msgid_plural "pairs of carding paddles" @@ -32434,11 +32388,6 @@ msgid "mechanical pump" msgid_plural "mechanical pumps" msgstr[0] "기계식 펌프" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "medium storage battery" -msgid_plural "medium storage batteries" -msgstr[0] "중형 배터리" - #: lang/json/GENERIC_from_json.py msgid "mess tin" msgid_plural "mess tins" @@ -32499,11 +32448,6 @@ msgid "motorbike alternator" msgid_plural "motorbike alternators" msgstr[0] "오토바이 발전기" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "motorbike battery" -msgid_plural "motorbike batteries" -msgstr[0] "오토바이 배터리" - #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "muffler" msgid_plural "mufflers" @@ -33057,11 +33001,6 @@ msgid "small electric motor" msgid_plural "small electric motors" msgstr[0] "소형 전기모터" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "small storage battery" -msgid_plural "small storage batteries" -msgstr[0] "소형 배터리" - #: lang/json/GENERIC_from_json.py msgid "software" msgid_plural "softwares" @@ -33162,11 +33101,6 @@ msgid "stone spear" msgid_plural "stone spears" msgstr[0] "돌창" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "storage battery" -msgid_plural "storage batteries" -msgstr[0] "대형 배터리" - #: lang/json/GENERIC_from_json.py msgid "storage battery case" msgid_plural "storage battery cases" @@ -33297,11 +33231,6 @@ msgid "truck alternator" msgid_plural "truck alternators" msgstr[0] "트럭 발전기" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "truck battery" -msgid_plural "truck batteries" -msgstr[0] "트럭 배터리" - #: lang/json/GENERIC_from_json.py msgid "turret engine" msgid_plural "turret engines" @@ -35144,10 +35073,8 @@ msgstr "" #: lang/json/GUN_from_json.py msgid "" "A homemade triple-barrel 40mm grenade launcher. Capable of launching all " -"three grenades at once, it is extremely powerwul for a homemade weapon." +"three grenades at once, it is extremely powerful for a homemade weapon." msgstr "" -"수제 3총열 40mm 유탄발사기. 한 번에 3발의 유탄을 발사할 수 있으며, 수제 무기" -"치곤 매우 강력합니다." #. ~ Description for blunderbuss #: lang/json/GUN_from_json.py @@ -39531,6 +39458,17 @@ msgstr "" "Leadworks LLC 사의 L39-45 와 L39B-45 권총에 사용되는 12발들이 폴리머 탄창입니" "다." +#. ~ Description for car battery +#: lang/json/MAGAZINE_from_json.py +msgid "A 12v lead-acid battery used to power car electrical systems." +msgstr "12v 납산 축전지로, 일반 차량의 전력 시스템을 작동시킬 때 사용합니다." + +#. ~ Description for motorbike battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A 12v lead-acid battery used to power smaller vehicles' electrical systems." +msgstr "12v 납산 축전지로, 소형 차량의 전력 시스템을 작동시킬 때 사용합니다." + #. ~ Description for RMSB20 magazine #: lang/json/MAGAZINE_from_json.py msgid "A 20 round box magazine for use with the RM20 caseless shotgun." @@ -39780,6 +39718,11 @@ msgstr "SIG 자우어 P230에 사용되는 공장 사양 8발들이 탄창입니 msgid "A high-capacity drum magazine for the PPSh-41." msgstr "" +#. ~ Description for truck battery +#: lang/json/MAGAZINE_from_json.py +msgid "A large 12v lead-acid battery used to power truck electrical systems." +msgstr "큰 12v 납산 축전지로, 트럭의 전력 시스템을 작동시킬 때 사용합니다." + #. ~ Description for welding tank #: lang/json/MAGAZINE_from_json.py msgid "" @@ -39787,6 +39730,15 @@ msgid "" "is marked with several faded and now unreadable symbols." msgstr "" +#. ~ Description for storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A large storage battery. Could be installed into a storage battery case for " +"easy removal from a vehicle, or just welded straight in." +msgstr "" +"대형 전력 저장용 배터리. 제작에 사용되며 배터리 케이스에 설치하면 차량에서 " +"쉽게 제거할 수 있지만 그냥 용접해 붙일 수도 있습니다." + #. ~ Description for M1 Garand Clip #: lang/json/MAGAZINE_from_json.py msgid "" @@ -39799,6 +39751,11 @@ msgstr "" msgid "A lightweight aluminum box magazine for the H&K G3 rifle." msgstr "H&K G3에 사용되는 알루미늄제 경량형 박스탄창" +#. ~ Description for medium storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A medium storage battery." +msgstr "중간 사이즈의 전력 저장용 배터리이다." + #. ~ Description for M9 magazine #: lang/json/MAGAZINE_from_json.py msgid "" @@ -39840,6 +39797,11 @@ msgid "" "A removable plastic magazine for the Saiga-12 shotgun. Holds 30 rounds." msgstr "" +#. ~ Description for small storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A small storage battery. Useful for crafting." +msgstr "작은 사이즈의 전력 저장용 배터리이다. 제작에 쓰인다." + #. ~ Description for Battle rifle magazine #: lang/json/MAGAZINE_from_json.py msgid "A standard 20-round magazine for military issue battle rifles." @@ -40496,14 +40458,44 @@ msgstr "우지 탄창" msgid "Walther PPK magazine" msgstr "발터 PPK 탄창" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "car battery" +msgid_plural "car batteries" +msgstr[0] "자동차 배터리" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "medium storage battery" +msgid_plural "medium storage batteries" +msgstr[0] "중형 배터리" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "motorbike battery" +msgid_plural "motorbike batteries" +msgstr[0] "오토바이 배터리" + #: lang/json/MAGAZINE_from_json.py msgid "nail rifle magazine" msgstr "" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "small storage battery" +msgid_plural "small storage batteries" +msgstr[0] "소형 배터리" + #: lang/json/MAGAZINE_from_json.py msgid "small welding tank" msgstr "" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "storage battery" +msgid_plural "storage batteries" +msgstr[0] "대형 배터리" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "truck battery" +msgid_plural "truck batteries" +msgstr[0] "트럭 배터리" + #: lang/json/MAGAZINE_from_json.py msgid "welding tank" msgstr "" @@ -43061,9 +43053,9 @@ msgstr "" #. ~ Description for giant mosquito #: lang/json/MONSTER_from_json.py msgid "" -"An enormous mutant mosquito, fluttering erratically, its face dominated by a " -"long, spear-tipped proboscis." -msgstr "거대한 변이 모기로, 주둥이가 거의 창 수준으로 거대합니다." +"An enormous mutant mosquito, fluttering erratically. Its face is dominated " +"by a long, spear-tipped proboscis." +msgstr "" #. ~ Description for giant ant #: lang/json/MONSTER_from_json.py @@ -48275,11 +48267,6 @@ msgstr "쉬익." msgid "Hsssss." msgstr "치이이이익." -#. ~ Description for fake UPS -#: lang/json/TOOL_from_json.py -msgid "If you can see this, it is a bug." -msgstr "If you can see this, it is a bug." - #: lang/json/TOOL_from_json.py msgid "Kevlar plate" msgid_plural "Kevlar plates" @@ -49661,6 +49648,9 @@ msgid "" "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." msgstr "" +"발열체가 붙은 냄비에 커피가루를 얹을 프레임이 달려 있습니다. 전기가 끊기면 배" +"터리로 작동합니다. 커피를 끓일 때 쓰며 원한다면 다른 음료도 끓여낼 수 있습니" +"다." #. ~ Description for heavy duty flashlight (off) #: lang/json/TOOL_from_json.py @@ -50919,6 +50909,11 @@ msgid "" "shouldn't spawn in normal game." msgstr "" +#. ~ Description for snowman +#: lang/json/TOOL_from_json.py +msgid "This is a test item for testing unicode support." +msgstr "" + #. ~ Description for candle (lit) #: lang/json/TOOL_from_json.py msgid "" @@ -53005,11 +53000,6 @@ msgid "extra battery mod" msgid_plural "extra battery mods" msgstr[0] "확장 배터리" -#: lang/json/TOOL_from_json.py -msgid "fake UPS" -msgid_plural "fake UPS" -msgstr[0] "fake UPS" - #: lang/json/TOOL_from_json.py msgid "fake item" msgid_plural "fake items" @@ -54190,6 +54180,11 @@ msgid "snare trigger" msgid_plural "snare triggers" msgstr[0] "올가미 고정대" +#: lang/json/TOOL_from_json.py +msgid "snowman" +msgid_plural "snowmans" +msgstr[0] "눈사람" + #: lang/json/TOOL_from_json.py msgid "soda can stove kit" msgid_plural "soda can stove kits" @@ -55416,6 +55411,17 @@ msgid "" "electronics and robots." msgstr "" +#. ~ Description for Telescopic Eyes +#: lang/json/bionic_from_json.py +msgid "" +"Much of the material in your inner eye has been removed and replaced with an " +"array of high-powered, auto-focusing lenses. You can now see much farther " +"and more clearly than before, any vision problems you might have had are now " +"gone." +msgstr "" +"안구 내부를 대부분 제거하고 고성능, 자동 초점 렌즈를 탑재했습니다. 이제 더 멀" +"리, 더 선명하게 볼 수 있습니다. 근시, 원시가 있었다면 사라집니다." + #: lang/json/bionic_from_json.py msgid "Muscle Augmentation" msgstr "근력 증강장치" @@ -59062,7 +59068,8 @@ msgstr "꽈지직!" msgid "crate" msgstr "상자" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp msgid "crunch!" msgstr "우지끈!" @@ -59158,8 +59165,8 @@ msgstr "용광로" msgid "glass breaking" msgstr "쨍그랑!" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp -#: src/map.cpp src/ranged.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp src/map.cpp src/ranged.cpp msgid "glass breaking!" msgstr "쨍그랑!" @@ -59167,6 +59174,10 @@ msgstr "쨍그랑!" msgid "glass door fridge" msgstr "유리문 냉장고" +#: lang/json/furniture_from_json.py +msgid "gravestone" +msgstr "묘비" + #: lang/json/furniture_from_json.py msgid "groundsheet" msgstr "방수포" @@ -59183,6 +59194,10 @@ msgstr "수확 가능 작물" msgid "hay" msgstr "건초" +#: lang/json/furniture_from_json.py +msgid "headstone" +msgstr "주춧돌" + #: lang/json/furniture_from_json.py msgid "heavy punching bag" msgstr "샌드백" @@ -59259,6 +59274,10 @@ msgstr "변이된 선인장" msgid "mutated poppy flower" msgstr "변이된 양귀비 꽃" +#: lang/json/furniture_from_json.py +msgid "obelisk" +msgstr "오벨리스크" + #: lang/json/furniture_from_json.py msgid "open animalskin flap" msgstr "열린 짐승가죽 덮개" @@ -59359,10 +59378,6 @@ msgstr "모래주머니 벽" msgid "screeching metal!" msgstr "콰앙!" -#: lang/json/furniture_from_json.py -msgid "seed" -msgstr "씨앗" - #: lang/json/furniture_from_json.py msgid "seedling" msgstr "묘목" @@ -59444,6 +59459,10 @@ msgstr "쿵!" msgid "thump." msgstr "쿵." +#: lang/json/furniture_from_json.py +msgid "thunk!" +msgstr "" + #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py msgid "thunk." msgstr "꽝." @@ -59520,6 +59539,10 @@ msgstr "나무 난로" msgid "wooden keg" msgstr "나무통" +#: lang/json/furniture_from_json.py +msgid "worn gravestone" +msgstr "낡은 묘비" + #: lang/json/furniture_from_json.py msgid "yellow indoor plant" msgstr "노란 실내 조경식물" @@ -59938,10 +59961,14 @@ msgstr "" #: lang/json/hint_from_json.py msgid "" "If you get a pair of night vision goggles, hold on to them! A flashlight " -"will give you away, but with goggles you can be sneaky." +"will give you away, but with goggles you can be sneaky. Beware that some " +"types of zombies are camouflaged against it, and require proper light to be " +"visible." msgstr "" -"밤에 시야를 제공해주는 고글을 얻었다면, 꼭 착용하세요! 손전등 불빛은 자신의 " -"위치를 광고하는거나 다름없지만, 고글을 착용하면 몰래몰래 다닐 수 있습니다." +"밤에도 볼 수 있게 해주는 고글을 얻었다면, 꼭 착용하세요! 손전등 불빛은 자신" +"의 위치를 광고하는거나 다름없지만 이러한 특수 고글을 착용하면 들키지 않고 다" +"닐 수 있습니다. 특정 부류의 좀비들은 야시경으로는 보이지 않고 적절한 조명이 " +"있어야만 보이지 주의하세요." #: lang/json/hint_from_json.py msgid "" @@ -62578,6 +62605,15 @@ msgstr "" msgid "Niten Ichi-Ryu" msgstr "이천일류" +#. ~ Description for martial art 'Niten Ichi-Ryu' +#: lang/json/martial_art_from_json.py +msgid "" +"Niten Ichi-Ryu is an ancient school of combat, transmitting a style of " +"classical Japanese swordsmanship conceived by the warrior Miyamoto Musashi." +msgstr "" +"이천일류는 고대의 무술 학파로 미야모토 무사시가 창안한 전통적인 일본 검도를 " +"잇고 있다." + #. ~ Description for martial art 'Niten Ichi-Ryu' #: lang/json/martial_art_from_json.py msgid "" @@ -69428,6 +69464,10 @@ msgstr "피난시설" msgid "regional school" msgstr "지역 학교" +#: lang/json/overmap_terrain_from_json.py +msgid "religious cemetery" +msgstr "" + #: lang/json/overmap_terrain_from_json.py msgid "restaurant" msgstr "레스토랑" @@ -72126,24 +72166,24 @@ msgstr "교사" msgctxt "prof_desc_female" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"실험실에서 보낸 시간 덕분에 당신은 기초 과학에 대해 잘 알고 있습니다. 당신은 " -"재수 좋은 보통 시민과 마찬가지로 간신히 위기를 벗어났습니다만, 적어도 당신은 " -"연구장비를 가지고 있습니다." +"실험실에서 오랜 시간을 보낸 덕에 당신은 기초 과학에 대해 잘 알고 있습니다. 이" +"제 세상이 끝나고 단 하나의 질문만이 남았습니다. 당신 자신이 일어나도록 도왔" +"던 이 대재앙을 당신은 되돌릴 수 있습니까?" #. ~ Profession (male Lab Technician) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"실험실에서 보낸 시간 덕분에 당신은 기초 과학에 대해 잘 알고 있습니다. 당신은 " -"재수 좋은 보통 시민과 마찬가지로 간신히 위기를 벗어났습니다만, 적어도 당신은 " -"연구장비를 가지고 있습니다." +"실험실에서 오랜 시간을 보낸 덕에 당신은 기초 과학에 대해 잘 알고 있습니다. 이" +"제 세상이 끝나고 단 하나의 질문만이 남았습니다. 당신 자신이 일어나도록 도왔" +"던 이 대재앙을 당신은 되돌릴 수 있습니까?" #. ~ Profession (Punk Rock Girl) description #: lang/json/professions_from_json.py @@ -74376,7 +74416,7 @@ msgstr "" #. ~ Crafting recipes subcategory of 'FOOD' category #: lang/json/recipe_category_from_json.py msgid "DRINKS" -msgstr "" +msgstr "음료" #. ~ Crafting recipes subcategory of 'CHEM' category #: lang/json/recipe_category_from_json.py src/item_factory.cpp @@ -75095,6 +75135,9 @@ msgid "" "getting eaten by a perp before you even had coffee. The scene back at the " "station house looks bad, real bad. This is going to be an all-nighter." msgstr "" +"당신이 커피를 가지러 간 동안 동료가 범인에게 먹혔을 때부터 오늘이 최악의 날" +"이 될 거란 걸 깨달았습니다. 그 때의 본부 상황은 정말 최악이었습니다. 오늘 밤" +"은 철야로 지새야 될 것 같습니다." #. ~ Description for scenario 'Assault on Precinct Z' for a male character. #: lang/json/scenario_from_json.py @@ -75104,6 +75147,9 @@ msgid "" "getting eaten by a perp before you even had coffee. The scene back at the " "station house looks bad, real bad. This is going to be an all-nighter." msgstr "" +"당신이 커피를 가지러 간 동안 동료가 범인에게 먹혔을 때부터 오늘이 최악의 날" +"이 될 거란 걸 깨달았습니다. 그 때의 경찰서 상황은 정말 최악이었습니다. 오늘 " +"밤은 철야로 지새야 될 것 같습니다." #. ~ Description for scenario 'Challenge-Really Bad Day' for a female character. #: lang/json/scenario_from_json.py @@ -76327,7 +76373,7 @@ msgstr ". " #: lang/json/snippet_from_json.py msgid " if I don't drink something." -msgstr "" +msgstr "뭔가 마실게 없다면 ." #: lang/json/snippet_from_json.py msgid " if I don't get some food." @@ -76481,7 +76527,7 @@ msgstr "좀 쉴 수 있을까 ?" #: lang/json/snippet_from_json.py msgid "Can you give me something to drink, ?" -msgstr "" +msgstr "뭐든 마실 것 좀 주겠어, ?" #: lang/json/snippet_from_json.py msgid "Catch up!" @@ -76502,6 +76548,10 @@ msgid "" "ATOMIC power! To make boiling hot coffee the MINUTE you want it! Atomic " "Coffeemaker." msgstr "" +"미래의 커피를 바로 지금 손에 넣으세요! 요즘은 아무도 근사한 커피를 내릴 시간" +"이 없죠. 하지만 더이상 시간을 들일 필요가 없습니다! 리브텍이 지치지않는 원자" +"력을 당신에게 선사합니다. 펄펄 끓는 뜨거운 커피를 순식간에! 원자력 커피 제조" +"기." #: lang/json/snippet_from_json.py msgid "Come on, !" @@ -76921,7 +76971,7 @@ msgstr "난 빠져나가야겠어! " #: lang/json/snippet_from_json.py msgid "I'm parched, I need to drink something." -msgstr "" +msgstr "목말라 죽을 것 같아. 뭐라도 마셔야겠어." #: lang/json/snippet_from_json.py msgid "I'm thirsty..." @@ -77063,6 +77113,8 @@ msgid "" "NEVER BE LEFT IN THE DARK! Rivtech Atomic-nightlight uses \"inexhaustible\" " "plutonium fuel cell, provides light, feeds power back into your grid!" msgstr "" +"더 이상 어둠속에 있지 마세요! 리브텍 원자력 야간등은 \"지치지않는\" 플루토늄 " +"전지를 사용하여 빛나며 당신의 공간에 에너지를 돌려줍니다." #: lang/json/snippet_from_json.py msgid "" @@ -77342,6 +77394,8 @@ msgid "" "revolution since espresso. Why wait for milk to boil? Have your coffee " "ready instantly with \"THE POWER OF THE ATOM\"!" msgstr "" +"미래는 커피와 함께! 리브텍이 에스프레소 이래 최고의 커피혁명을 가져옵니다. 우" +"유가 끓을 때까지 기다리신다구요? 원자력으로 즉시 커피를 즐기세요!" #: lang/json/snippet_from_json.py msgid "" @@ -77620,6 +77674,16 @@ msgid "" "ataxia, amnesia, mania, stroke, neurodegeneration, malignalitaloptereosis, " "necrotizing fasciitis, recurrent flu, and pinkeye." msgstr "" +"리브텍사의 에너지 드링크 '원자력 파워 써스트' 광고. 동위원소 RU-238 '과일' " +"이라 불리는 새로운 맛을 홍보하려는 광고인데 섭취시 부작용에 대한 설명에 광고" +"의 대부분을 할애하고 있습니다. 섭취시 부작용 : 불안, 불면, 심한 불면, 어지러" +"움, 경련, 메스꺼움, 두통, 구토, 망상증, 환각증세, 횡문근융해증(근육녹음병), " +"속쓰림, 갑상선암, 광범위 내출혈, 위출혈, 설사, 부정맥, 심근경색, 자살충동, 간" +"질, 기능장애, 건망증, 조울증, 심장마비, 뇌손상, 악성전염종증후군(*), 근육괴" +"사, 만성감기, 유행성 결막염.\n" +"*malignalitaloptereosis : 디즈니 영화 The Sword in the Stone에 등장하는 가상" +"의 질병. 마법사가 세균으로 변해 인체에 침투하여 일으키는 병으로 전신이 붉은 " +"반점으로 뒤덮이며 심한 기침을 동반하여 전투에서 이길 수 없게 됨." #: lang/json/snippet_from_json.py msgid "" @@ -77889,11 +77953,11 @@ msgstr "뭐야 ?" #: lang/json/snippet_from_json.py msgid "When was the last time I had a drink?" -msgstr "" +msgstr "마지막으로 뭐라도 마신 지가 대체 언제야?" #: lang/json/snippet_from_json.py msgid "When we drinkin'?" -msgstr "" +msgstr "우린 언제쯤이나 목을 축일 수 있지?" #: lang/json/snippet_from_json.py msgid "When we eatin'?" @@ -82331,6 +82395,10 @@ msgstr "박살난 경유 펌프" msgid "smashed gas pump" msgstr "박살난 가스 펌프" +#: lang/json/terrain_from_json.py +msgid "smoothed rock" +msgstr "매끄러운 돌" + #: lang/json/terrain_from_json.py lang/json/trap_from_json.py msgid "spiked pit" msgstr "가시박힌 구덩이" @@ -84345,8 +84413,8 @@ msgstr "뒤로" #: src/action.cpp src/activity_handlers.cpp src/color.cpp src/crafting.cpp #: src/editmap.cpp src/game.cpp src/iexamine.cpp src/inventory_ui.cpp #: src/item_action.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/mission_companion.cpp src/pickup.cpp src/player.cpp src/veh_interact.cpp -#: src/vehicle.cpp +#: src/mission_companion.cpp src/pickup.cpp src/player.cpp +#: src/veh_interact.cpp src/vehicle.cpp msgid "Cancel" msgstr "취소" @@ -86313,7 +86381,8 @@ msgstr "먼저 캐릭터를 만들고 로드를 사용해주세요!" msgid "Rules" msgstr "규칙" -#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp src/options.cpp +#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp +#: src/options.cpp msgid "Save changes?" msgstr "변경사항을 저장할까요?" @@ -86860,23 +86929,23 @@ msgstr "" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / %d turns" -msgstr "%d 전력 / %d 턴" +msgid "%d PU act" +msgstr "%d 전력 / 작동" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / turn" -msgstr "%d 전력 / 턴" +msgid "%d PU deact" +msgstr "%d 전력 / 정지" #: src/bionics_ui.cpp #, c-format -msgid "%d PU act" -msgstr "%d 전력 / 작동" +msgid "%d PU/%d turns" +msgstr "" #: src/bionics_ui.cpp #, c-format -msgid "%d PU deact" -msgstr "%d 전력 / 정지" +msgid "%d PU/turn" +msgstr "" #: src/bionics_ui.cpp src/mutation_ui.cpp #, c-format @@ -93230,6 +93299,14 @@ msgstr "%s을(를) 움직이는데 시간이 좀 걸린다." msgid "It takes some time to move the heavy %s." msgstr "%s이(가) 무거워 움직이는데 시간이 좀 걸렸다." +#: src/game.cpp +msgid "It takes you a long time to steer that vehicle!" +msgstr "방향을 트는 데 오래 걸린다!" + +#: src/game.cpp +msgid "It takes you a very long time to steer that vehicle!" +msgstr "방향을 트는 데 상당히 오래 걸린다!" + #: src/game.cpp msgid "It's too dangerous to tunnel that far!" msgstr "더 이상 굴을 파는 것은 너무 위험합니다!" @@ -93588,6 +93665,10 @@ msgstr "" msgid "Pour %s where?" msgstr "%s을(를) 어디에 쏟아버립니까?" +#: src/game.cpp +msgid "Pour into a container" +msgstr "용기에 따르기" + #: src/game.cpp #, c-format msgid "Pour into an adjacent keg (%s)" @@ -95006,6 +95087,11 @@ msgstr "몸이 점점 썩어가는 것이 느껴진다." msgid "You feel your genetic makeup degrading." msgstr "유전자 구성이 나빠지는 것 같다." +#: src/game.cpp +#, c-format +msgid "You fumble with the %s's controls." +msgstr "%s의 조종장치를 찾아서 더듬었다." + #: src/game.cpp msgid "You get a hold of yourself." msgstr "스스로 균형을 잡았다." @@ -98045,11 +98131,12 @@ msgstr "잠이 들었습니다..." #, c-format msgid "You feel out of place as you explore the %s. Drink?" msgstr "" +"%s 을(를) 조사하다 보니 얼떨떨하고 갑자기 세상이 낯설게 느껴집니다. 마십니까?" #: src/iexamine.cpp #, c-format msgid "You feel woozy as you explore the %s. Drink?" -msgstr "" +msgstr "%s 을(를) 조사하다 보니 머리가 멍해집니다. 마십니까?" #: src/iexamine.cpp #, c-format @@ -98058,7 +98145,7 @@ msgstr "%1$s에 %2$s을(를) 담았다." #: src/iexamine.cpp msgid "You find a flower and drink some nectar." -msgstr "" +msgstr "꽃을 찾아내서 꽃꿀을 조금 마셨다." #: src/iexamine.cpp msgid "You fire the charcoal kiln." @@ -99824,6 +99911,11 @@ msgstr "제작 가능한 물품이 다양하다." msgid "You could use it to craft: %s" msgstr "제작 가능한 물품: %s" +#: src/item.cpp +#, c-format +msgid "You fall asleep and drop your %s." +msgstr "잠이 들면서 %s을(를) 떨어뜨렸다." + #: src/item.cpp #, c-format msgid "You finish your %s." @@ -100347,6 +100439,7 @@ msgid "" "After what happened that last time? uh-uh. You're not drinking that " "chemical stuff." msgstr "" +"그 일이 있고 나서 뭐가 어떻게 된 거야? 안돼. 저 화학약품은 마시지 않을거야." #. ~"Uh-uh" is a sound used for "nope", "no", etc. "Drek" is a borrowed synonym for "shit". #: src/iuse.cpp @@ -101381,10 +101474,6 @@ msgstr "%s은(는) 젖은 상태라서 액체를 더 빨아들일 수 없다!" msgid "That isn't a firearm!" msgstr "그것은 총기가 아니다!" -#: src/iuse.cpp -msgid "That item already has a rechargeable battery pack." -msgstr "그 물품은 이미 재충전 배터리가 장착된 상태이다." - #: src/iuse.cpp msgid "That item has already had its battery capacity doubled." msgstr "그 물품은 이미 배터리 용량이 두 배로 확장된 상태이다." @@ -102883,13 +102972,6 @@ msgstr "%s을(를) 완전히 수리했다!" msgid "You repair your %s!" msgstr "%s을(를) 수리했다!" -#: src/iuse.cpp -#, c-format -msgid "" -"You replace the battery compartment of your %s with a rechargeable battery " -"pack!" -msgstr "%s의 배터리 부품을 재충전 배터리팩으로 교체했다!" - #: src/iuse.cpp #, c-format msgid "You replace your current %s." @@ -105685,11 +105767,6 @@ msgstr "덫을 해체하는데 실패해서 작동시켜 버렸다!" msgid "You fail to disarm the trap." msgstr "덫을 해체하는데 실패했다!" -#: src/map.cpp -#, c-format -msgid "You fumble with the %s's controls." -msgstr "%s의 조종장치를 찾아서 더듬었다." - #: src/map.cpp #, c-format msgid "You lose control of the %s." @@ -113680,10 +113757,6 @@ msgstr ". 근육 한 가닥이라도 움직이기만 헤봐..." msgid "Drop items" msgstr "물품 버리기" -#: src/npcmove.cpp -msgid "Fire a burst" -msgstr "연발 사격" - #: src/npcmove.cpp msgid "Flee" msgstr "도망" @@ -115185,7 +115258,7 @@ msgstr "정보를 알고싶은데.." #: src/npctalk.cpp msgid "I'm looking for new drink recipes." -msgstr "" +msgstr "새 음료수 레시피를 찾고 있어." #: src/npctalk.cpp msgid "I'm looking for some choice systems to hack." @@ -115338,6 +115411,8 @@ msgid "" "through here though, the drinks we brew ourselves are the only thing they " "can afford." msgstr "" +"확실하진 않지만 여기 바가 있는 걸 봤어. 수색꾼들이 옛 세계에서 가져온 술을 " +"특별한 날에 팔지. 평상시엔 직접 만든 술밖에 팔지 않지만 말야." #: src/npctalk.cpp msgid "" @@ -118550,7 +118625,7 @@ msgstr "" #: src/player.cpp #, c-format msgid "Attach your %1$s to your %2$s?" -msgstr "" +msgstr "%1$s을(를) %2$s에 장착합니까?" #: src/player.cpp msgid "" @@ -118972,10 +119047,6 @@ msgstr "반짝이는 빛에 휩싸이며 순간이동했다." msgid "Good mood +%s%d%%" msgstr "기분 좋음 +%s%d%%" -#: src/player.cpp -msgid "Gun:" -msgstr "" - #: src/player.cpp msgid "He" msgstr "그는" @@ -119149,11 +119220,11 @@ msgstr "근접 명중률:" #: src/player.cpp msgid "Mend" -msgstr "" +msgstr "수리" #: src/player.cpp msgid "Mend which fault?" -msgstr "" +msgstr "어느 부분을 수리합니까?" #: src/player.cpp msgid "Near starving" @@ -119273,7 +119344,7 @@ msgstr "" #: src/player.cpp #, c-format msgid "Permanently install your %1$s in your %2$s?" -msgstr "" +msgstr "%2$s에 %1$s을(를) 영구적으로 설치합니까?" #: src/player.cpp #, c-format @@ -119568,7 +119639,7 @@ msgstr "%s은(는) 한손만으로 들 수 없다." #: src/player.cpp #, c-format msgid "The %s doesn't have any faults to mend." -msgstr "" +msgstr "%s에는 고칠 부분이 없다." #: src/player.cpp #, c-format @@ -119649,11 +119720,11 @@ msgstr "" #: src/player.cpp msgid "The sunlight is really irritating your eyes." -msgstr "" +msgstr "햇빛이 거슬려 잘 보이지 않는다." #: src/player.cpp msgid "The sunlight is really irritating your skin." -msgstr "" +msgstr "햇빛이 피부에 닿자 따끔거린다." #: src/player.cpp #, c-format @@ -120016,7 +120087,7 @@ msgstr "%s은(는) 먹을 수 없다." #: src/player.cpp #, c-format msgid "You can't remove any of the mods from your %s." -msgstr "" +msgstr "%s에서 모드를 제거할 수 없다." #: src/player.cpp msgid "You can't see to read!" @@ -120057,7 +120128,7 @@ msgstr "다른 장비 위에는 파워 아머를 착용할 수 없다!" #: src/player.cpp msgid "You can't wear that, it's filthy!" -msgstr "" +msgstr "불결해서 도저히 입을 수가 없다!" #: src/player.cpp msgid "You can't wear that, it's made of wool!" @@ -120099,11 +120170,11 @@ msgstr "그걸 입으려면 한 손이 자유로워야 한다." #: src/player.cpp msgid "You don't have compatible guns." -msgstr "" +msgstr "적합한 총이 없다." #: src/player.cpp msgid "You don't have that item. " -msgstr "" +msgstr "그런 물품은 가지고 있지 않다." #: src/player.cpp #, c-format @@ -120365,7 +120436,7 @@ msgstr "작업을 재개했다." #: src/player.cpp msgid "You retched, but your stomach is empty." -msgstr "" +msgstr "토하려 했지만 배가 비어있어 토해낼 것이 없었다." #: src/player.cpp msgid "You scream loudly!" @@ -121051,7 +121122,7 @@ msgstr "근육이 경련한다." #: src/player.cpp #, c-format msgid "Your mutation %s prevents you from wearing that %s." -msgstr "" +msgstr "%s 변이 때문에 %s을(를) 입을 수가 없다." #: src/player.cpp #, c-format @@ -121219,10 +121290,6 @@ msgstr "사슴뿔" msgid "armor" msgstr "보호구" -#: src/player.cpp -msgid "auto" -msgstr "" - #: src/player.cpp msgid "beep-beep-beep!" msgstr "삐익-삐익-삐익!" @@ -121235,10 +121302,6 @@ msgstr "머리카락" msgid "horns" msgstr "뿔" -#: src/player.cpp -msgid "off " -msgstr "" - #: src/player.cpp msgid "quills" msgstr "깃털" @@ -121321,7 +121384,7 @@ msgstr "소지 물품 정리를 멈춥니까?" #: src/player_activity.cpp msgid " Stop interacting with the vehicle?" -msgstr "" +msgstr "차량 작업을 중단합니까?" #: src/player_activity.cpp msgid " Stop lighting the fire?" @@ -121329,7 +121392,7 @@ msgstr " 불 붙이기를 멈춥니까?" #: src/player_activity.cpp msgid " Stop mending?" -msgstr "" +msgstr "수리를 멈춥니까?" #: src/player_activity.cpp msgid " Stop mining?" @@ -121337,7 +121400,7 @@ msgstr " 채광을 멈춥니까?" #: src/player_activity.cpp msgid " Stop modifying gun?" -msgstr "" +msgstr "총기 조정을 중단합니까?" #: src/player_activity.cpp msgid " Stop moving items?" @@ -121446,12 +121509,12 @@ msgstr "%c 일반 사격." #: src/ranged.cpp #, c-format msgid "%c to steady your aim. " -msgstr "" +msgstr "%c 조준 지속." #: src/ranged.cpp #, c-format msgid "%c to switch aiming modes." -msgstr "" +msgstr "%c 조준 모두 전환." #: src/ranged.cpp #, c-format @@ -121584,7 +121647,7 @@ msgstr "퓻!" #: src/ranged.cpp msgid "Precise Aim" -msgstr "" +msgstr "정밀 조준" #: src/ranged.cpp #, c-format @@ -122613,7 +122676,7 @@ msgstr "헤드라이트가 향할 방향을 정합니다." #: src/veh_interact.cpp msgid "Choose a part here to mend:" -msgstr "" +msgstr "수리할 부품을 선택하시오:" #: src/veh_interact.cpp msgid "Choose a part here to remove:" @@ -122740,7 +122803,7 @@ msgstr "새 라벨:" #: src/veh_interact.cpp msgid "No faulty parts here." -msgstr "" +msgstr "여기엔 아무 결함도 없다." #: src/veh_interact.cpp msgid "No parts here." @@ -122902,7 +122965,7 @@ msgstr "운전 중에 부품을 설치할 수는 없다." #: src/veh_interact.cpp msgid "You can't mend stuff while driving." -msgstr "" +msgstr "운전 중에 수리할 수는 없다." #: src/veh_interact.cpp msgid "You can't refill the vehicle while driving." @@ -123002,7 +123065,7 @@ msgstr "뭔가를 건설하기엔 의욕이 나지 않는다..." #: src/veh_interact.cpp msgid "Your morale is too low to mend..." -msgstr "" +msgstr "너무 의욕이 낮아서 수리할 생각이 들지 않는다..." #: src/veh_interact.cpp msgid "Your morale is too low to repair..." @@ -123080,11 +123143,6 @@ msgstr "" msgid "%d\"" msgstr "" -#: src/vehicle.cpp -#, c-format -msgid "%s failed to fire! It isn't loaded and/or powered." -msgstr "%s의 발사에 실패했다! 탄약 혹은 전원이 없다." - #: src/vehicle.cpp #, c-format msgid "%s points in your direction and emits an IFF warning beep." @@ -123122,10 +123180,6 @@ msgstr "" "사타구니를 금속 뼈대로 짓누르려 들기 전에, %s을(를) 타면서 동시에 접는 것을 " "다시 생각해봐야 한다." -#: src/vehicle.cpp -msgid "Auto" -msgstr "자동" - #. ~ backfire sound #: src/vehicle.cpp msgid "BANG!" @@ -123188,10 +123242,6 @@ msgstr "" msgid "Close" msgstr "닫기" -#: src/vehicle.cpp -msgid "Configure individual turrets" -msgstr "개별 터렛 설정" - #: src/vehicle.cpp msgid "Control individual engines" msgstr "개별 엔진 설정" @@ -123208,32 +123258,10 @@ msgstr "크루즈 모드 켜짐" msgid "Cugugugugug" msgstr "" -#: src/vehicle.cpp -msgid "Cycle turret mode" -msgstr "터렛 모드 전환" - -#: src/vehicle.cpp -msgid "Deactivating automatic target acquisition for this turret" -msgstr "이 터렛의 자동 표적 획득을 비활성화한다." - #: src/vehicle.cpp msgid "Disable cruise control" msgstr "크루즈 모드 해제" -#: src/vehicle.cpp -msgid "Disable turrets" -msgstr "터렛 비활성화" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling automatic target acquisition on %s" -msgstr "%s 자동 조준 비활성화." - -#: src/vehicle.cpp -#, c-format -msgid "Disabling turret %s." -msgstr "%s 비활성화." - #: src/vehicle.cpp msgid "Do nothing" msgstr "아무것도 하지 않기" @@ -123250,10 +123278,6 @@ msgstr "실내등 켜짐" msgid "Enable cruise control" msgstr "크루즈 모드 사용" -#: src/vehicle.cpp -msgid "Enable turrets" -msgstr "터렛 활성화" - #. ~ indicates that a vehicle part is outside #: src/vehicle.cpp msgid "Exterior" @@ -123340,10 +123364,6 @@ msgstr "" msgid "No controls there." msgstr "조종장치가 없다." -#: src/vehicle.cpp -msgid "No target" -msgstr "목표 없음" - #: src/vehicle.cpp msgid "Open" msgstr "열기" @@ -123409,19 +123429,16 @@ msgid "Select door to toggle" msgstr "여닫을 문을 선택하세요." #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to buggy mode." -msgstr "%s 버그 모드로 설정." +msgid "Set turret firing modes" +msgstr "터렛을 발사 모드로 설정" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to burst mode." -msgstr "%s 연발 사격 모드로 설정." +msgid "Set turret targeting" +msgstr "터렛 조준 설정" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to single-fire mode." -msgstr "%s 단발 사격 모드로 설정." +msgid "Set turret targeting modes" +msgstr "터렛을 조준 모드로 설정" #: src/vehicle.cpp msgid "Stop controlling" @@ -123468,6 +123485,11 @@ msgstr "%1$s의 %2$s이(가) %s을(를) 치어 넘었다." msgid "The %s doesn't have enough wheels to move!" msgstr "%s에는 움직이기 위해 필요한 만큼의 바퀴가 없다!" +#: src/vehicle.cpp +#, c-format +msgid "The %s is stuck." +msgstr "%s은(는) 걸려 있다." + #: src/vehicle.cpp #, c-format msgid "The %s is too leaky!" @@ -123603,14 +123625,6 @@ msgstr "오디오가 켜지지 않는다!" msgid "The vehicle part you were working on has gone!" msgstr "작업 중이던 차량 부품이 사라졌다!" -#: src/vehicle.cpp -msgid "This turret can't be aimed manually" -msgstr "이 터렛은 수동 조준을 할 수 없다." - -#: src/vehicle.cpp -msgid "This turret doesn't have enough ammo" -msgstr "이 터렛은 탄약이 없다." - #: src/vehicle.cpp msgid "This turret is not powered" msgstr "이 터렛에는 동력이 없다." @@ -123777,26 +123791,6 @@ msgstr "차임벨 켜짐" msgid "Turned on music" msgstr "오디오 켜짐" -#: src/vehicle.cpp -msgid "Turret system is on, but all turrets are configured not to shoot." -msgstr "터렛 시스템이 작동됐지만, 모든 터렛이 사격하지 않도록 설정되어 있다." - -#: src/vehicle.cpp -msgid "Turrets have been configured, but the vehicle turret system is off." -msgstr "터렛 설정이 끝났지만, 차량 터렛 시스템이 꺼져있다." - -#: src/vehicle.cpp -msgid "Turrets: Disabled" -msgstr "터렛: 비활성화" - -#: src/vehicle.cpp -msgid "Turrets: Enabled" -msgstr "터렛: 활성화" - -#: src/vehicle.cpp -msgid "Unseen" -msgstr "보이지 않음" - #: src/vehicle.cpp msgid "Vehicle controls" msgstr "차량 조종" @@ -123927,6 +123921,10 @@ msgstr "엔진이 시끄러운 마찰음을 냈다." msgid "a simple melody blaring from the loudspeakers." msgstr "확성기에서 단조로운 멜로디가 울려퍼지고 있다." +#: src/vehicle.cpp +msgid "auto" +msgstr "" + #. ~ Beeper sound #: src/vehicle.cpp msgid "beep!" @@ -123941,6 +123939,10 @@ msgstr "접힌 %s" msgid "hummm!" msgstr "" +#: src/vehicle.cpp +msgid "manual" +msgstr "설명서" + #: src/vehicle.cpp msgid "roarrr!" msgstr "" From d2aff1f1e35b3fd23ec881dd94be342492052eae Mon Sep 17 00:00:00 2001 From: Vlasov Vitaly Date: Thu, 9 Jun 2016 21:03:27 +0300 Subject: [PATCH 100/110] Russian update --- lang/po/ru.po | 592 +++++++++++++++++++++++--------------------------- 1 file changed, 274 insertions(+), 318 deletions(-) diff --git a/lang/po/ru.po b/lang/po/ru.po index 55174e7c910f4..e1d307a83a159 100644 --- a/lang/po/ru.po +++ b/lang/po/ru.po @@ -49,8 +49,8 @@ msgid "" msgstr "" "Project-Id-Version: Cataclysm-DDA\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-30 09:53+0300\n" -"PO-Revision-Date: 2016-05-30 20:13+0000\n" +"POT-Creation-Date: 2016-06-06 10:20+0300\n" +"PO-Revision-Date: 2016-06-09 17:30+0000\n" "Last-Translator: Леонид Васильев \n" "Language-Team: Russian (http://www.transifex.com/cataclysm-dda-translators/" "cataclysm-dda/language/ru/)\n" @@ -1848,6 +1848,15 @@ msgstr "" "Коробка с маленькими стальными шариками (4,5 мм) для пневматики. Они " "практически не наносят повреждений." +#. ~ Description for .44 FMJ +#: lang/json/AMMO_from_json.py +msgid "" +"A brass-jacketed variant of the .44 Magnum round. This increases " +"penetration slightly at the cost of reduced damage from expansion." +msgstr "" +"Пуля калибра .44 Магнум с цельнометаллической оболочкой. Увеличена " +"проникающая способность за счёт снижения дистанции стрельбы." + #. ~ Description for blue paint #: lang/json/AMMO_from_json.py msgid "A can of blue paint." @@ -2688,7 +2697,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A simple arrow shaft that has had a point carved into it and then fire-" -"hardened. Needs fletching to be worth firing from a bow." +"hardened. It needs fletching to be worth firing from a bow." msgstr "" "Деревянное древко с заточенным остриём, закалённым в огне. Нуждается в " "оперении, чтобы им можно было нормально стрелять из лука." @@ -3370,18 +3379,6 @@ msgstr "" "серьёзные ожоги любого органического вещества и может поджечь его при " "контакте." -#. ~ Description for .22 CB -#: lang/json/AMMO_from_json.py -msgid "" -"Conical Ball .22 is a variety of .22 ammunition with a very small propellant " -"charge and generally lacks gunpowder. The end result is a subsonic round " -"that is so weak as to be nearly useless given your predicament." -msgstr "" -"Конический патрон .22 калибра — разновидность патрона .22 калибра с очень " -"маленьким количеством порохового заряда. В итоге получился патрон с " -"дозвуковой скоростью, но он настолько слаб, что почти бесполезен, учитывая " -"ваше затруднительное положение." - #. ~ Description for handloaded .22 CB #: lang/json/AMMO_from_json.py msgid "" @@ -4025,14 +4022,15 @@ msgstr[3] "гексоген" #. ~ Description for .22 rat-shot #: lang/json/AMMO_from_json.py msgid "" -"Rat-shot is extremely weak ammunition, designed for killing rats, snakes, or " -"other small vermin while being unable to damage walls. It has an extremely " -"short range and is unable to injure all but the smallest creatures." +"Rat-shot is an extremely weak .22 shotgun cartridge, designed for killing " +"rats, snakes, or other small vermin while being unable to damage walls. It " +"has an extremely short range and is unable to injure all but the smallest " +"creatures." msgstr "" -"Rat-shot — это боеприпасы, предназначенные для отстрела крыс, змей и прочих " -"мелких вредителей без опасности повредить стены или обстановку. Настолько " -"маломощны, что способны нанести вред только мелким существам на небольшом " -"расстоянии." +"Rat-shot — это боеприпасы .22 калибра, предназначенные для отстрела крыс, " +"змей и прочих мелких вредителей без опасности повредить стены или " +"обстановку. Настолько маломощны, что способны нанести вред только мелким " +"существам на небольшом расстоянии." #. ~ Description for handloaded .22 rat-shot #: lang/json/AMMO_from_json.py @@ -4178,6 +4176,18 @@ msgstr "" "для получения многих химических веществ, в основном она известна как " "аккумуляторная кислота из-за широчайшего промышленного применения." +#. ~ Description for .22 CB +#: lang/json/AMMO_from_json.py +msgid "" +"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." +msgstr "" +"Конический патрон .22 калибра — разновидность патрона .22 калибра, который " +"разгоняет пулю праймером вместо пороха. В итоге получился патрон с " +"дозвуковой скоростью, но он настолько слаб, что почти бесполезен, учитывая " +"ваше затруднительное положение." + #. ~ Description for reloaded .300 Winchester Magnum #: lang/json/AMMO_from_json.py msgid "" @@ -4416,7 +4426,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "This metal shaft has been carefully sharpened so that it has a crude point " -"at the end. Needs fletching to be worth firing from a bow." +"at the end. It needs fletching to be worth firing from a bow." msgstr "" "Металлическое древко с тщательно заострённым концом. Нужно оперение, прежде " "чем стрелять из лука." @@ -6194,12 +6204,12 @@ msgstr[2] "переснаряжённых патронов 7,62x39 мм M43" msgstr[3] "переснаряжённый патрон 7,62x39 мм M43" #: lang/json/AMMO_from_json.py -msgid "reloaded 7.62x39mm M87" -msgid_plural "reloaded 7.62x39mm M87" -msgstr[0] "переснаряжённый патрон 7,62x39 мм M87" -msgstr[1] "переснаряжённых патрона 7,62x39 мм M87" -msgstr[2] "переснаряжённых патронов 7,62x39 мм M87" -msgstr[3] "переснаряжённый патрон 7,62x39 мм M87" +msgid "reloaded 7.62x39mm M67" +msgid_plural "reloaded 7.62x39mm M67" +msgstr[0] "переснаряжённый 7.62x39мм M67" +msgstr[1] "переснаряжённых 7.62x39мм M67" +msgstr[2] "переснаряжённых 7.62x39мм M67" +msgstr[3] "переснаряжённый 7.62x39мм M67" #: lang/json/AMMO_from_json.py msgid "reloaded 7.62x51mm" @@ -8254,14 +8264,9 @@ msgstr "" #: lang/json/ARMOR_from_json.py msgid "" "A large leather quiver trimmed with metal, worn on the back, that can hold " -"60 arrows.\n" -"Historically used by horse archers, rather than foot archers, but neither of " -"THEM had to fight zombies. Activate to store arrows." +"60 arrows. Historically used by horse archers, rather than foot archers, " +"but neither of THEM had to fight zombies. Activate to store arrows." msgstr "" -"Большой кожаный колчан, укреплённый металлом. Носится за спиной, вмещает 60 " -"стрел.\n" -"Исторически использовался конными лучниками, реже пешими, но НИКОГДА не " -"использовался для борьбы с зомби. Активируйте, чтобы убрать стрелы." #. ~ Description for pair of ski goggles #: lang/json/ARMOR_from_json.py @@ -17258,9 +17263,8 @@ msgstr "" "выстрелить на небольшое расстояние зарядом, отключающим электронику и " "роботов." -#. ~ Description for Telescopic Eyes #. ~ Description for Telescopic Eyes CBM -#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py +#: lang/json/BIONIC_ITEM_from_json.py msgid "" "Much of the material in your inner eye has been removed and replaced with an " "array of high-powered, auto-focusing lenses. You can now see much farther " @@ -25364,7 +25368,6 @@ msgid "Made from real Massachusetts cranberries. Delicious and nutritious." msgstr "Сделан из настоящей Массачусетской клюквы. Вкусный и питательный." #. ~ Description for whiskey -#. ~ Description for test_whiskey #: lang/json/COMESTIBLE_from_json.py msgid "Made from, by, and for real Southern colonels!" msgstr "Сделано на Юге, южанами и для южан!" @@ -32150,6 +32153,14 @@ msgstr[1] "приправленной соли" msgstr[2] "приправленной соли" msgstr[3] "приправленная соль" +#: lang/json/COMESTIBLE_from_json.py lang/json/furniture_from_json.py +msgid "seed" +msgid_plural "seeds" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #: lang/json/COMESTIBLE_from_json.py msgid "seed potato" msgid_plural "seed potatoes" @@ -32650,14 +32661,6 @@ msgstr[1] "текилы" msgstr[2] "текилы" msgstr[3] "текила" -#: lang/json/COMESTIBLE_from_json.py -msgid "test_whiskey" -msgid_plural "test_whiskey" -msgstr[0] "тест_виски" -msgstr[1] "тест_виски" -msgstr[2] "тест_виски" -msgstr[3] "тест_виски" - #: lang/json/COMESTIBLE_from_json.py msgid "thyme" msgid_plural "thymes" @@ -33521,11 +33524,6 @@ msgid "" "A watertight leather bag with a carrying strap, can hold 3 liters of water." msgstr "Герметичный кожаный мешок с подвесным ремнём, вмещает 3 литра воды." -#. ~ Description for test glass bottle -#: lang/json/CONTAINER_from_json.py -msgid "An UNSEALABLE glass bottle, holds 750 ml of liquid." -msgstr "НЕЗАПЕЧАТАННАЯ стеклянная бутылка, вмещает 750 мл жидкости. " - #. ~ Description for aluminum can #: lang/json/CONTAINER_from_json.py msgid "An aluminum can, like what soda comes in." @@ -33888,14 +33886,6 @@ msgstr[1] "стальных канистры" msgstr[2] "стальных канистр" msgstr[3] "стальная канистра" -#: lang/json/CONTAINER_from_json.py -msgid "test glass bottle" -msgid_plural "test glass bottles" -msgstr[0] "тест стеклянная бутылка" -msgstr[1] "тест стеклянных бутылок" -msgstr[2] "тест стеклянных бутылок" -msgstr[3] "тест стеклянные бутылки" - #: lang/json/CONTAINER_from_json.py msgid "tin can" msgid_plural "tin cans" @@ -34171,21 +34161,6 @@ msgstr "" "будет извлечено из герметичной упаковки. Разберите, чтобы получить " "содержимое." -#. ~ Description for car battery -#: lang/json/GENERIC_from_json.py -msgid "A 12v lead-acid battery used to power car electrical systems." -msgstr "" -"Свинцово-кислотный 12В аккумулятор, используемый для питания электрических " -"систем автомобиля." - -#. ~ Description for motorbike battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A 12v lead-acid battery used to power smaller vehicles' electrical systems." -msgstr "" -"Свинцово-кислотный 12В аккумулятор, используемый для питания электрических " -"систем малого транспорта." - #. ~ Description for long rope #: lang/json/GENERIC_from_json.py msgid "" @@ -35214,13 +35189,6 @@ msgstr "" msgid "A kiln full of wood that has been lit; better drop it!" msgstr "Печь полна горящего дерева. Отпустите её!" -#. ~ Description for truck battery -#: lang/json/GENERIC_from_json.py -msgid "A large 12v lead-acid battery used to power truck electrical systems." -msgstr "" -"Свинцово-кислотный 12В аккумулятор, используемый для питания электрических " -"систем грузовика." - #. ~ Description for truck alternator #: lang/json/GENERIC_from_json.py msgid "A large alternator used to power truck electrical systems." @@ -35365,15 +35333,6 @@ msgstr "Большой лист стекла. Очень хрупкий. Исп msgid "A large stone, roughly hollowed out into a pot." msgstr "Большой камень, выточеный в горшок." -#. ~ Description for storage battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A large storage battery. Could be installed into a storage battery case for " -"easy removal from a vehicle, or just welded straight in." -msgstr "" -"Большой аккумулятор. Можно установить в аккумуляторный ящик для лёгкого " -"извлечения из транспортного средства, или просто приварить прямо к нему." - #. ~ Description for folding wire basket #: lang/json/GENERIC_from_json.py msgid "A large wire basket from a shopping cart, modified to be foldable." @@ -35551,11 +35510,6 @@ msgstr "" "металлического покрытого шипами шара на конце. Наносит огромный дробящий " "урон, плюс немного колющего." -#. ~ Description for medium storage battery -#: lang/json/GENERIC_from_json.py -msgid "A medium storage battery." -msgstr "Аккумулятор средних размеров." - #. ~ Description for SD-Memory card #: lang/json/GENERIC_from_json.py msgid "A memory card, used. Might be worth a look." @@ -36342,11 +36296,6 @@ msgstr "" "Маленький стальной телескопический рычаг. Если его прикрепить к раме, то он " "сможет поднять до 1,5 тонн." -#. ~ Description for small storage battery -#: lang/json/GENERIC_from_json.py -msgid "A small storage battery. Useful for crafting." -msgstr "Небольшой аккумулятор. Используется при создании предметов." - #. ~ Description for damaged tent #: lang/json/GENERIC_from_json.py msgid "" @@ -39589,14 +39538,6 @@ msgstr[1] "автогенератора" msgstr[2] "автогенераторов" msgstr[3] "автогенератор" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "car battery" -msgid_plural "car batteries" -msgstr[0] "автоаккумулятор" -msgstr[1] "автоаккумулятора" -msgstr[2] "автоаккумуляторов" -msgstr[3] "автоаккумулятор" - #: lang/json/GENERIC_from_json.py msgid "carding paddles" msgid_plural "pairs of carding paddles" @@ -40753,14 +40694,6 @@ msgstr[1] "механических насоса" msgstr[2] "механических насосов" msgstr[3] "механический насос" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "medium storage battery" -msgid_plural "medium storage batteries" -msgstr[0] "средний аккумулятор" -msgstr[1] "средних аккумулятора" -msgstr[2] "средних аккумуляторов" -msgstr[3] "средний аккумулятор" - #: lang/json/GENERIC_from_json.py msgid "mess tin" msgid_plural "mess tins" @@ -40857,14 +40790,6 @@ msgstr[1] "мотогенератора" msgstr[2] "мотогенераторов" msgstr[3] "мотогенератор" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "motorbike battery" -msgid_plural "motorbike batteries" -msgstr[0] "мотоаккумулятор" -msgstr[1] "мотоаккумулятора" -msgstr[2] "мотоаккумуляторов" -msgstr[3] "мотоаккумулятор" - #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "muffler" msgid_plural "mufflers" @@ -41742,14 +41667,6 @@ msgstr[1] "малых электродвигателя" msgstr[2] "малых электродвигателей" msgstr[3] "малый электродвигатель" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "small storage battery" -msgid_plural "small storage batteries" -msgstr[0] "маленький аккумулятор" -msgstr[1] "маленьких аккумулятора" -msgstr[2] "маленьких аккумуляторов" -msgstr[3] "маленький аккумулятор" - #: lang/json/GENERIC_from_json.py msgid "software" msgid_plural "softwares" @@ -41910,14 +41827,6 @@ msgstr[1] "каменных копья" msgstr[2] "каменных копий" msgstr[3] "каменное копьё" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "storage battery" -msgid_plural "storage batteries" -msgstr[0] "аккумулятор" -msgstr[1] "аккумулятора" -msgstr[2] "аккумуляторов" -msgstr[3] "аккумулятор" - #: lang/json/GENERIC_from_json.py msgid "storage battery case" msgid_plural "storage battery cases" @@ -42126,14 +42035,6 @@ msgstr[1] "генератора грузовика" msgstr[2] "генераторов грузовика" msgstr[3] "генератор грузовика" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "truck battery" -msgid_plural "truck batteries" -msgstr[0] "аккумулятор грузовика" -msgstr[1] "аккумулятора грузовика" -msgstr[2] "аккумуляторов грузовика" -msgstr[3] "аккумулятор грузовика" - #: lang/json/GENERIC_from_json.py msgid "turret engine" msgid_plural "turret engines" @@ -43005,6 +42906,8 @@ msgid "" "Mechanism that allows your CW-24 rifle to fire in fully automatic mode. It " "is handmade." msgstr "" +"Самодельный механизм, который позволяет вашей винтовке CW-24 стрелять в " +"автоматическом режиме." #: lang/json/GUNMOD_from_json.py msgid "RM121 aux shotgun" @@ -44094,6 +43997,8 @@ msgid "" "A compact selective fire automatic rifle featuring an integrated folding " "stock." msgstr "" +"Автоматичская винтовка с возможностью отсечки очереди и интегрированным " +"складным прикладом." #. ~ Description for Ruger LCR .38 #: lang/json/GUN_from_json.py @@ -44454,10 +44359,10 @@ msgstr "" #: lang/json/GUN_from_json.py msgid "" "A homemade triple-barrel 40mm grenade launcher. Capable of launching all " -"three grenades at once, it is extremely powerwul for a homemade weapon." +"three grenades at once, it is extremely powerful for a homemade weapon." msgstr "" -"Кустарный 40-мм гранатомёт с тремя стволами. Способное выстреливать из всех " -"трёх стволов сразу, оно чрезвычайно мощное для самодельного оружия." +"Самодельный трех-ствольный 40мм гранатомет. Способен выстрелить все три " +"гранаты разом. Чрезвычайно мощный для самодельного оружия." #. ~ Description for blunderbuss #: lang/json/GUN_from_json.py @@ -47307,10 +47212,10 @@ msgstr[3] "S&W 629" #: lang/json/GUN_from_json.py msgid "SIG 552" msgid_plural "SIG 552s" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "SIG 552s" +msgstr[1] "SIG 552s" +msgstr[2] "SIG 552s" +msgstr[3] "SIG 552s" #: lang/json/GUN_from_json.py msgid "SIG Mosquito" @@ -50117,6 +50022,21 @@ msgstr "" "Полимерный магазин на 12 патронов для использования с пистолетами L39-45 и " "L39B-45 от Лидворкс." +#. ~ Description for car battery +#: lang/json/MAGAZINE_from_json.py +msgid "A 12v lead-acid battery used to power car electrical systems." +msgstr "" +"Свинцово-кислотный 12В аккумулятор, используемый для питания электрических " +"систем автомобиля." + +#. ~ Description for motorbike battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A 12v lead-acid battery used to power smaller vehicles' electrical systems." +msgstr "" +"Свинцово-кислотный 12В аккумулятор, используемый для питания электрических " +"систем малого транспорта." + #. ~ Description for RMSB20 magazine #: lang/json/MAGAZINE_from_json.py msgid "A 20 round box magazine for use with the RM20 caseless shotgun." @@ -50412,6 +50332,13 @@ msgstr "" msgid "A high-capacity drum magazine for the PPSh-41." msgstr "" +#. ~ Description for truck battery +#: lang/json/MAGAZINE_from_json.py +msgid "A large 12v lead-acid battery used to power truck electrical systems." +msgstr "" +"Свинцово-кислотный 12В аккумулятор, используемый для питания электрических " +"систем грузовика." + #. ~ Description for welding tank #: lang/json/MAGAZINE_from_json.py msgid "" @@ -50421,6 +50348,15 @@ msgstr "" "Большой стальной цилиндр, предназначенный для хранения газов для сварки под " "давлением. Он помечен несколькими выцветшими и нечитаемыми символами." +#. ~ Description for storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A large storage battery. Could be installed into a storage battery case for " +"easy removal from a vehicle, or just welded straight in." +msgstr "" +"Большой аккумулятор. Можно установить в аккумуляторный ящик для лёгкого " +"извлечения из транспортного средства, или просто приварить прямо к нему." + #. ~ Description for M1 Garand Clip #: lang/json/MAGAZINE_from_json.py msgid "" @@ -50435,6 +50371,11 @@ msgstr "" msgid "A lightweight aluminum box magazine for the H&K G3 rifle." msgstr "Лёгкий алюминиевый коробчатый магазин для винтовки H&K G3." +#. ~ Description for medium storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A medium storage battery." +msgstr "Аккумулятор средних размеров." + #. ~ Description for M9 magazine #: lang/json/MAGAZINE_from_json.py msgid "" @@ -50483,6 +50424,11 @@ msgid "" msgstr "" "Съемный пластиковый магазин для дробовика Сайга-12. Вмещает 30 патронов." +#. ~ Description for small storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A small storage battery. Useful for crafting." +msgstr "Небольшой аккумулятор. Используется при создании предметов." + #. ~ Description for Battle rifle magazine #: lang/json/MAGAZINE_from_json.py msgid "A standard 20-round magazine for military issue battle rifles." @@ -51181,14 +51127,62 @@ msgstr "магазин для Узи" msgid "Walther PPK magazine" msgstr "магазин для Walther PPK" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "car battery" +msgid_plural "car batteries" +msgstr[0] "автоаккумулятор" +msgstr[1] "автоаккумулятора" +msgstr[2] "автоаккумуляторов" +msgstr[3] "автоаккумулятор" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "medium storage battery" +msgid_plural "medium storage batteries" +msgstr[0] "средний аккумулятор" +msgstr[1] "средних аккумулятора" +msgstr[2] "средних аккумуляторов" +msgstr[3] "средний аккумулятор" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "motorbike battery" +msgid_plural "motorbike batteries" +msgstr[0] "мотоаккумулятор" +msgstr[1] "мотоаккумулятора" +msgstr[2] "мотоаккумуляторов" +msgstr[3] "мотоаккумулятор" + #: lang/json/MAGAZINE_from_json.py msgid "nail rifle magazine" msgstr "" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "small storage battery" +msgid_plural "small storage batteries" +msgstr[0] "маленький аккумулятор" +msgstr[1] "маленьких аккумулятора" +msgstr[2] "маленьких аккумуляторов" +msgstr[3] "маленький аккумулятор" + #: lang/json/MAGAZINE_from_json.py msgid "small welding tank" msgstr "малый сварочный резервуар" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "storage battery" +msgid_plural "storage batteries" +msgstr[0] "аккумулятор" +msgstr[1] "аккумулятора" +msgstr[2] "аккумуляторов" +msgstr[3] "аккумулятор" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "truck battery" +msgid_plural "truck batteries" +msgstr[0] "аккумулятор грузовика" +msgstr[1] "аккумулятора грузовика" +msgstr[2] "аккумуляторов грузовика" +msgstr[3] "аккумулятор грузовика" + #: lang/json/MAGAZINE_from_json.py msgid "welding tank" msgstr "сварочный резервуар" @@ -53870,11 +53864,9 @@ msgstr "" #. ~ Description for giant mosquito #: lang/json/MONSTER_from_json.py msgid "" -"An enormous mutant mosquito, fluttering erratically, its face dominated by a " -"long, spear-tipped proboscis." +"An enormous mutant mosquito, fluttering erratically. Its face is dominated " +"by a long, spear-tipped proboscis." msgstr "" -"Огромный комар-мутант с непредсказуемым полётом. Из его головы торчат " -"длинные, похожие на копья хоботки." #. ~ Description for giant ant #: lang/json/MONSTER_from_json.py @@ -57344,7 +57336,7 @@ msgstr "" msgid "RM13 combat armor" msgid_plural "RM13 combat armors" msgstr[0] "боевая броня RM13" -msgstr[1] "боевых брони RM13" +msgstr[1] "" msgstr[2] "боевых бронь RM13" msgstr[3] "боевая броня RM13" @@ -59730,11 +59722,6 @@ msgstr "«Сссс»." msgid "Hsssss." msgstr "Фссссс." -#. ~ Description for fake UPS -#: lang/json/TOOL_from_json.py -msgid "If you can see this, it is a bug." -msgstr "Если вы это видите, то это сбой." - #: lang/json/TOOL_from_json.py msgid "Kevlar plate" msgid_plural "Kevlar plates" @@ -62835,6 +62822,11 @@ msgstr "" "Это тестовый предмет для проверки работы быстрого действия heal_actor на " "инструментах. Он не должен появляться в обычной игре." +#. ~ Description for snowman +#: lang/json/TOOL_from_json.py +msgid "This is a test item for testing unicode support." +msgstr "" + #. ~ Description for candle (lit) #: lang/json/TOOL_from_json.py msgid "" @@ -65482,14 +65474,6 @@ msgstr[1] "расширителя заряда батарей" msgstr[2] "расширителей заряда батарей" msgstr[3] "расширитель заряда батарей" -#: lang/json/TOOL_from_json.py -msgid "fake UPS" -msgid_plural "fake UPS" -msgstr[0] "поддельный УБП" -msgstr[1] "поддельных УБП" -msgstr[2] "поддельных УБП" -msgstr[3] "поддельный УБП" - #: lang/json/TOOL_from_json.py msgid "fake item" msgid_plural "fake items" @@ -67372,6 +67356,14 @@ msgstr[1] "спусковых механизма" msgstr[2] "спусковых механизмов" msgstr[3] "спусковой механизм" +#: lang/json/TOOL_from_json.py +msgid "snowman" +msgid_plural "snowmans" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #: lang/json/TOOL_from_json.py msgid "soda can stove kit" msgid_plural "soda can stove kits" @@ -68873,6 +68865,15 @@ msgid "" "electronics and robots." msgstr "" +#. ~ Description for Telescopic Eyes +#: lang/json/bionic_from_json.py +msgid "" +"Much of the material in your inner eye has been removed and replaced with an " +"array of high-powered, auto-focusing lenses. You can now see much farther " +"and more clearly than before, any vision problems you might have had are now " +"gone." +msgstr "" + #: lang/json/bionic_from_json.py msgid "Muscle Augmentation" msgstr "Наращивание мышц" @@ -72609,7 +72610,8 @@ msgstr "«хрясь!»" msgid "crate" msgstr "контейнер" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp msgid "crunch!" msgstr "треск!" @@ -72705,8 +72707,8 @@ msgstr "печь" msgid "glass breaking" msgstr "звон разбитого стекла" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp -#: src/map.cpp src/ranged.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp src/map.cpp src/ranged.cpp msgid "glass breaking!" msgstr "звон разбитого стекла!" @@ -72714,6 +72716,10 @@ msgstr "звон разбитого стекла!" msgid "glass door fridge" msgstr "холодильник со стеклянной дверью" +#: lang/json/furniture_from_json.py +msgid "gravestone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "groundsheet" msgstr "подстилка" @@ -72730,6 +72736,10 @@ msgstr "созревшее растение" msgid "hay" msgstr "сено" +#: lang/json/furniture_from_json.py +msgid "headstone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "heavy punching bag" msgstr "большая боксёрская груша" @@ -72806,6 +72816,10 @@ msgstr "мутировавший кактус" msgid "mutated poppy flower" msgstr "мутировавший цветок мака" +#: lang/json/furniture_from_json.py +msgid "obelisk" +msgstr "" + #: lang/json/furniture_from_json.py msgid "open animalskin flap" msgstr "открытая заслонка из кожи" @@ -72906,10 +72920,6 @@ msgstr "стена из мешков с песком" msgid "screeching metal!" msgstr "скрежет металла!" -#: lang/json/furniture_from_json.py -msgid "seed" -msgstr "посев" - #: lang/json/furniture_from_json.py msgid "seedling" msgstr "росток" @@ -72991,6 +73001,10 @@ msgstr "стук!" msgid "thump." msgstr "стук." +#: lang/json/furniture_from_json.py +msgid "thunk!" +msgstr "" + #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py msgid "thunk." msgstr "хлопанье." @@ -73067,6 +73081,10 @@ msgstr "дровяная печь" msgid "wooden keg" msgstr "деревянный бочонок" +#: lang/json/furniture_from_json.py +msgid "worn gravestone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "yellow indoor plant" msgstr "жёлтое комнатное растение" @@ -73492,10 +73510,10 @@ msgstr "" #: lang/json/hint_from_json.py msgid "" "If you get a pair of night vision goggles, hold on to them! A flashlight " -"will give you away, but with goggles you can be sneaky." +"will give you away, but with goggles you can be sneaky. Beware that some " +"types of zombies are camouflaged against it, and require proper light to be " +"visible." msgstr "" -"Если вам попадутся очки ночного видения, то это большая удача! Фонарик " -"выдаёт вас с головой, а с этим прибором вы останетесь незаметным." #: lang/json/hint_from_json.py msgid "" @@ -76282,6 +76300,13 @@ msgstr "" msgid "Niten Ichi-Ryu" msgstr "Нитен Ичи-Рю" +#. ~ Description for martial art 'Niten Ichi-Ryu' +#: lang/json/martial_art_from_json.py +msgid "" +"Niten Ichi-Ryu is an ancient school of combat, transmitting a style of " +"classical Japanese swordsmanship conceived by the warrior Miyamoto Musashi." +msgstr "" + #. ~ Description for martial art 'Niten Ichi-Ryu' #: lang/json/martial_art_from_json.py msgid "" @@ -83494,6 +83519,10 @@ msgstr "центр для беженцев" msgid "regional school" msgstr "региональная школа" +#: lang/json/overmap_terrain_from_json.py +msgid "religious cemetery" +msgstr "" + #: lang/json/overmap_terrain_from_json.py msgid "restaurant" msgstr "ресторан" @@ -86254,24 +86283,18 @@ msgstr "Учитель" msgctxt "prof_desc_female" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"Благодаря времени, проведённому в лаборатории, ты изучила основные методы " -"проведения экспериментов. Ты удачно спаслась вместе с другими гражданскими и " -"сохранила свои лабораторные принадлежности." #. ~ Profession (male Lab Technician) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"Благодаря времени, проведённому в лаборатории, ты изучил основные методы " -"проведения экспериментов. Ты удачно спасся вместе с другими гражданскими и " -"сохранил свои лабораторные принадлежности." #. ~ Profession (Punk Rock Girl) description #: lang/json/professions_from_json.py @@ -97185,6 +97208,10 @@ msgstr "разбитая дизельная колонка" msgid "smashed gas pump" msgstr "разбитая бензоколонка" +#: lang/json/terrain_from_json.py +msgid "smoothed rock" +msgstr "" + #: lang/json/terrain_from_json.py lang/json/trap_from_json.py msgid "spiked pit" msgstr "яма с кольями" @@ -99231,8 +99258,8 @@ msgstr "Назад" #: src/action.cpp src/activity_handlers.cpp src/color.cpp src/crafting.cpp #: src/editmap.cpp src/game.cpp src/iexamine.cpp src/inventory_ui.cpp #: src/item_action.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/mission_companion.cpp src/pickup.cpp src/player.cpp src/veh_interact.cpp -#: src/vehicle.cpp +#: src/mission_companion.cpp src/pickup.cpp src/player.cpp +#: src/veh_interact.cpp src/vehicle.cpp msgid "Cancel" msgstr "Отмена" @@ -101267,7 +101294,8 @@ msgstr "Чтобы использовать эту страницу, требу msgid "Rules" msgstr "Правила" -#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp src/options.cpp +#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp +#: src/options.cpp msgid "Save changes?" msgstr "Сохранить изменения?" @@ -101827,23 +101855,23 @@ msgstr "БИОНИКА" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / %d turns" -msgstr "%d ЕЭ / %d ходов" +msgid "%d PU act" +msgstr "%d ЕЭ — вкл" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / turn" -msgstr "%d ЕЭ / ход" +msgid "%d PU deact" +msgstr "%d ЕЭ — выкл" #: src/bionics_ui.cpp #, c-format -msgid "%d PU act" -msgstr "%d ЕЭ — вкл" +msgid "%d PU/%d turns" +msgstr "" #: src/bionics_ui.cpp #, c-format -msgid "%d PU deact" -msgstr "%d ЕЭ — выкл" +msgid "%d PU/turn" +msgstr "" #: src/bionics_ui.cpp src/mutation_ui.cpp #, c-format @@ -108398,6 +108426,14 @@ msgstr "Надо какое-то время, чтобы передвинуть % msgid "It takes some time to move the heavy %s." msgstr "Надо какое-то время, чтобы передвинуть %s." +#: src/game.cpp +msgid "It takes you a long time to steer that vehicle!" +msgstr "" + +#: src/game.cpp +msgid "It takes you a very long time to steer that vehicle!" +msgstr "" + #: src/game.cpp msgid "It's too dangerous to tunnel that far!" msgstr "Слишком опасно создавать такой длинный туннель!" @@ -108764,6 +108800,10 @@ msgstr "" msgid "Pour %s where?" msgstr "Где вылить %s?" +#: src/game.cpp +msgid "Pour into a container" +msgstr "" + #: src/game.cpp #, c-format msgid "Pour into an adjacent keg (%s)" @@ -110199,6 +110239,11 @@ msgstr "Вы чувствуете, как ваше тело разлагаетс msgid "You feel your genetic makeup degrading." msgstr "Ваше генетическое строение деградирует." +#: src/game.cpp +#, c-format +msgid "You fumble with the %s's controls." +msgstr "Вы неумело ведёте %s." + #: src/game.cpp msgid "You get a hold of yourself." msgstr "Вы держите себя в руках." @@ -115431,6 +115476,11 @@ msgstr "Можно использовать для изготовления ра msgid "You could use it to craft: %s" msgstr "Можно использовать для изготовления: %s" +#: src/item.cpp +#, c-format +msgid "You fall asleep and drop your %s." +msgstr "" + #: src/item.cpp #, c-format msgid "You finish your %s." @@ -116994,10 +117044,6 @@ msgstr "Ваше %s и так слишком влажное, чтобы впит msgid "That isn't a firearm!" msgstr "Это не огнестрельное оружие!" -#: src/iuse.cpp -msgid "That item already has a rechargeable battery pack." -msgstr "У этого предмета батарея уже была модифицирована в аккумулятор." - #: src/iuse.cpp msgid "That item has already had its battery capacity doubled." msgstr "У этого предмета уже удвоенна ёмкость батарей." @@ -118530,14 +118576,6 @@ msgstr "Вы полностью починили %s!" msgid "You repair your %s!" msgstr "Вы починили %s!" -#: src/iuse.cpp -#, c-format -msgid "" -"You replace the battery compartment of your %s with a rechargeable battery " -"pack!" -msgstr "" -"Вы заменили батарейный отсек вашего %s на комплект аккумуляторных батарей!" - #: src/iuse.cpp #, c-format msgid "You replace your current %s." @@ -121384,11 +121422,6 @@ msgstr "Вы не смогли обезвредить ловушку, и она msgid "You fail to disarm the trap." msgstr "Вы не смогли обезвредить ловушку." -#: src/map.cpp -#, c-format -msgid "You fumble with the %s's controls." -msgstr "Вы неумело ведёте %s." - #: src/map.cpp #, c-format msgid "You lose control of the %s." @@ -129606,10 +129639,6 @@ msgstr "Не двигай ни одним ым мускулом..." msgid "Drop items" msgstr "Выброси предметы" -#: src/npcmove.cpp -msgid "Fire a burst" -msgstr "Поджигай" - #: src/npcmove.cpp msgid "Flee" msgstr "Убегай" @@ -135120,10 +135149,6 @@ msgstr "Светящиеся огни окружают вас, и вы теле msgid "Good mood +%s%d%%" msgstr "Хорошее настроение %s+%d%%" -#: src/player.cpp -msgid "Gun:" -msgstr "Оружие:" - #: src/player.cpp msgid "He" msgstr "Он" @@ -137439,10 +137464,6 @@ msgstr "ветвистых рогов" msgid "armor" msgstr "броня" -#: src/player.cpp -msgid "auto" -msgstr "авто" - #: src/player.cpp msgid "beep-beep-beep!" msgstr "«бип-бип-бип!»" @@ -137455,10 +137476,6 @@ msgstr "волосы" msgid "horns" msgstr "рога" -#: src/player.cpp -msgid "off " -msgstr "выкл" - #: src/player.cpp msgid "quills" msgstr "длинные иглы" @@ -139342,11 +139359,6 @@ msgstr "%2.1fL" msgid "%d\"" msgstr "%d\"" -#: src/vehicle.cpp -#, c-format -msgid "%s failed to fire! It isn't loaded and/or powered." -msgstr "%s не стреляет! Он не заряжен и/или не запитан." - #: src/vehicle.cpp #, c-format msgid "%s points in your direction and emits an IFF warning beep." @@ -139387,10 +139399,6 @@ msgstr "" "Как только безжалостные металлические прутья защемили ваши нежные места, вы " "пересмотрели попытки сложить %s во время езды на нём." -#: src/vehicle.cpp -msgid "Auto" -msgstr "Авто" - #. ~ backfire sound #: src/vehicle.cpp msgid "BANG!" @@ -139453,10 +139461,6 @@ msgstr "«Звяк»" msgid "Close" msgstr "Закрыть" -#: src/vehicle.cpp -msgid "Configure individual turrets" -msgstr "Настраивать турели индивидуально" - #: src/vehicle.cpp msgid "Control individual engines" msgstr "Регулировать двигатели индивидуально" @@ -139473,32 +139477,10 @@ msgstr "Круиз-контроль включён." msgid "Cugugugugug" msgstr "Чугугугугуг" -#: src/vehicle.cpp -msgid "Cycle turret mode" -msgstr "Сменить режим турели" - -#: src/vehicle.cpp -msgid "Deactivating automatic target acquisition for this turret" -msgstr "Отключение автоматического захвата целей для этой турели" - #: src/vehicle.cpp msgid "Disable cruise control" msgstr "Выкл. круиз-контроль" -#: src/vehicle.cpp -msgid "Disable turrets" -msgstr "Отключить турели" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling automatic target acquisition on %s" -msgstr "Отключение автоматического захвата целей на %s" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling turret %s." -msgstr "Отключение турели %s." - #: src/vehicle.cpp msgid "Do nothing" msgstr "Ничего не делать" @@ -139515,10 +139497,6 @@ msgstr "Плафон над рулём включён" msgid "Enable cruise control" msgstr "Вкл. круиз-контроль" -#: src/vehicle.cpp -msgid "Enable turrets" -msgstr "Включить турели" - #. ~ indicates that a vehicle part is outside #: src/vehicle.cpp msgid "Exterior" @@ -139605,10 +139583,6 @@ msgstr "Неиу НЕЕиу НЕЕеу" msgid "No controls there." msgstr "Тут нет руля" -#: src/vehicle.cpp -msgid "No target" -msgstr "Нет целей" - #: src/vehicle.cpp msgid "Open" msgstr "Открыть" @@ -139674,19 +139648,16 @@ msgid "Select door to toggle" msgstr "Выбрать сдвигаемую дверь" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to buggy mode." -msgstr "Переход турели %s в багги-режим" +msgid "Set turret firing modes" +msgstr "" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to burst mode." -msgstr "Переход турели %s на стрельбу очередями" +msgid "Set turret targeting" +msgstr "" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to single-fire mode." -msgstr "Переход турели %s на одиночные выстрелы" +msgid "Set turret targeting modes" +msgstr "" #: src/vehicle.cpp msgid "Stop controlling" @@ -139733,6 +139704,11 @@ msgstr "%s (%1$s) наезжает на %2$s." msgid "The %s doesn't have enough wheels to move!" msgstr "%s не хватает колёс для езды!" +#: src/vehicle.cpp +#, c-format +msgid "The %s is stuck." +msgstr "" + #: src/vehicle.cpp #, c-format msgid "The %s is too leaky!" @@ -139868,14 +139844,6 @@ msgstr "Стерео не пашет!" msgid "The vehicle part you were working on has gone!" msgstr "Деталь машины, над которой вы работали, пропала!" -#: src/vehicle.cpp -msgid "This turret can't be aimed manually" -msgstr "Этой турелью нельзя целиться вручную" - -#: src/vehicle.cpp -msgid "This turret doesn't have enough ammo" -msgstr "У этой турели недостаточно патронов" - #: src/vehicle.cpp msgid "This turret is not powered" msgstr "У этой турели отсутствует питание" @@ -140042,26 +140010,6 @@ msgstr "Звонок включён" msgid "Turned on music" msgstr "Включил музыку" -#: src/vehicle.cpp -msgid "Turret system is on, but all turrets are configured not to shoot." -msgstr "Система турелей включена, но не все турели настроены на стрельбу." - -#: src/vehicle.cpp -msgid "Turrets have been configured, but the vehicle turret system is off." -msgstr "Турели настроены, но система турелей машины выключена." - -#: src/vehicle.cpp -msgid "Turrets: Disabled" -msgstr "Турели: Отключены" - -#: src/vehicle.cpp -msgid "Turrets: Enabled" -msgstr "Турели: Включены" - -#: src/vehicle.cpp -msgid "Unseen" -msgstr "Невидимый" - #: src/vehicle.cpp msgid "Vehicle controls" msgstr "Система управления" @@ -140192,6 +140140,10 @@ msgstr "Из двигателя доносится громкий скрежет msgid "a simple melody blaring from the loudspeakers." msgstr "простая мелодия звучит из громкоговорителей. " +#: src/vehicle.cpp +msgid "auto" +msgstr "авто" + #. ~ Beeper sound #: src/vehicle.cpp msgid "beep!" @@ -140206,6 +140158,10 @@ msgstr "сложенный %s" msgid "hummm!" msgstr "«хаммм!»" +#: src/vehicle.cpp +msgid "manual" +msgstr "" + #: src/vehicle.cpp msgid "roarrr!" msgstr "«арррр!»" From e67fa3974db83371bd9a59e1cc91a20847c13a54 Mon Sep 17 00:00:00 2001 From: Vlasov Vitaly Date: Thu, 9 Jun 2016 21:04:03 +0300 Subject: [PATCH 101/110] Chinese update --- lang/po/zh_CN.po | 4544 +++++++++++++++++++++++----------------------- 1 file changed, 2304 insertions(+), 2240 deletions(-) diff --git a/lang/po/zh_CN.po b/lang/po/zh_CN.po index 2b96c2c5dc0f3..6fc094fae49a2 100644 --- a/lang/po/zh_CN.po +++ b/lang/po/zh_CN.po @@ -7,14 +7,15 @@ # FIRST AUTHOR , 2013 # Jin Zhang <610037437@qq.com>, 2016 # Lin Shu <1678161186@qq.com>, 2016 +# Miigon Anonymous , 2016 # startobira , 2016 msgid "" msgstr "" "Project-Id-Version: Cataclysm-DDA\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-30 09:53+0300\n" -"PO-Revision-Date: 2016-05-30 13:17+0000\n" -"Last-Translator: fei li \n" +"POT-Creation-Date: 2016-06-06 10:20+0300\n" +"PO-Revision-Date: 2016-06-08 05:51+0000\n" +"Last-Translator: D Laboratory \n" "Language-Team: Chinese (China) (http://www.transifex.com/cataclysm-dda-" "translators/cataclysm-dda/language/zh_CN/)\n" "Language: zh_CN\n" @@ -264,7 +265,7 @@ msgid "" "strengths while reducing recoil." msgstr "" ".40 S&W手枪弹是8.7克重的被甲空尖弹，用来取代10mm AUTO弹，在保持其威力基础上降" -"低了后坐力。" +"低了后坐力" #. ~ Description for .40 FMJ #: lang/json/AMMO_from_json.py @@ -489,7 +490,7 @@ msgid "" "reloaded." msgstr "" "20X66mm无壳霰弹，鹿弹型，Rivtech 霰弹枪专用，由于是无壳弹，所以不可拆卸和重新" -"装载。" +"装载." #. ~ Description for 20x66mm frag #: lang/json/AMMO_from_json.py @@ -499,7 +500,7 @@ msgid "" "disassembled or reloaded." msgstr "" "20X66mm无壳霰弹，碎片杀伤弹，Rivtech 霰弹枪专用，由于是无壳弹，所以不可拆卸和" -"重新装载。" +"重新装载." #. ~ Description for 20x66mm explosive #: lang/json/AMMO_from_json.py @@ -509,7 +510,7 @@ msgid "" "disassembled or reloaded." msgstr "" "20X66mm无壳霰弹，爆裂弹，Rivtech 霰弹枪专用，由于是无壳弹，所以不可拆卸和重新" -"装载。" +"装载." #. ~ Description for 20x66mm flechette #: lang/json/AMMO_from_json.py @@ -519,7 +520,7 @@ msgid "" "reloaded." msgstr "" "20X66mm无壳霰弹，箭形，Rivtech 霰弹枪专用，由于是无壳弹，所以不可拆卸和重新装" -"载。" +"载." #. ~ Description for 20x66mm incendiary #: lang/json/AMMO_from_json.py @@ -529,7 +530,7 @@ msgid "" "or reloaded." msgstr "" "20X66mm无壳霰弹，燃烧杀伤弹，Rivtech 霰弹枪专用，由于是无壳弹，所以不可拆卸和" -"重新装载。" +"重新装载." #. ~ Description for 20x66mm flare #: lang/json/AMMO_from_json.py @@ -539,7 +540,7 @@ msgid "" "or reloaded." msgstr "" "20X66mm无壳霰弹，火焰信号弹，Rivtech 霰弹枪专用，由于是无壳弹，所以不可拆卸和" -"重新装载。" +"重新装载." #. ~ Description for 20x66mm slug #: lang/json/AMMO_from_json.py @@ -549,7 +550,7 @@ msgid "" "disassembled or reloaded." msgstr "" "20X66mm无壳霰弹，实心金属铅弹，Rivtech 霰弹枪专用，由于是无壳弹，所以不可拆卸" -"和重新装载。" +"和重新装载." #. ~ Description for 20x66mm beanbag #: lang/json/AMMO_from_json.py @@ -559,7 +560,7 @@ msgid "" "disassembled or reloaded." msgstr "" "20X66mm无壳霰弹，非致死的沙包弹药，Rivtech 霰弹枪专用，由于是无壳弹，所以不可" -"拆卸和重新装载。" +"拆卸和重新装载." #: lang/json/AMMO_from_json.py msgid "20x66mm explosive" @@ -609,7 +610,7 @@ msgstr[0] "30x113mm HEI" #: lang/json/AMMO_from_json.py msgid "4.6x30mm" msgid_plural "4.6x30mm" -msgstr[0] "4.6x30mm 弹" +msgstr[0] "4.6x30mm子弹" #. ~ Description for 4.6x30mm #: lang/json/AMMO_from_json.py @@ -680,7 +681,7 @@ msgstr[0] "40mm榴弹" #: lang/json/AMMO_from_json.py msgid "40mm incendiary" msgid_plural "40mm incendiary" -msgstr[0] "40mm 燃烧弹" +msgstr[0] "40mm燃烧弹" #: lang/json/AMMO_from_json.py msgid "40mm smoke cover" @@ -806,7 +807,7 @@ msgstr[0] "7.62 NATO 曳光弹" #: lang/json/AMMO_from_json.py msgid "7.62x25mm FMJ hot load" msgid_plural "7.62x25mm FMJ hot load" -msgstr[0] "" +msgstr[0] "7.62x25mm FMJ增压弹" #: lang/json/AMMO_from_json.py msgid "7.62x25mm JHP" @@ -913,7 +914,7 @@ msgid "" "Rivtech firearms. Being caseless rounds, these cannot be disassembled or " "reloaded." msgstr "" -"8x40mm无壳弹，全金属被甲。专为军用级Rivtech枪支设计。作为无壳弹，它不能被拆卸" +"8x40mm无壳弹，全金属被甲。军用级Rivtech枪支弹药。由于是无壳弹，因此不能被拆解" "或重装。" #. ~ Description for 8x40mm incendiary caseless @@ -923,7 +924,7 @@ msgid "" "Rivtech firearms. Being caseless rounds, these cannot be disassembled or " "reloaded." msgstr "" -"8x40mm无壳弹，燃烧弹。专为军用级Rivtech枪支设计。作为无壳弹，它不能被拆卸或重" +"8x40mm无壳弹，燃烧弹。军用级Rivtech枪支弹药。由于是无壳弹，因此不能被拆解或重" "装。" #. ~ Description for 8x40mm JHP caseless @@ -933,8 +934,8 @@ msgid "" "Rivtech firearms. Being caseless rounds, these cannot be disassembled or " "reloaded." msgstr "" -"8x40mm无壳弹，被甲空尖弹头。专为军用级Rivtech枪支设计。作为无壳弹，它不能被拆" -"卸或重装。" +"8x40mm无壳弹，被甲空尖弹头。军用级Rivtech枪支弹药。由于是无壳弹，因此不能被拆" +"解或重装。" #. ~ Description for 8x40mm caseless sporting #: lang/json/AMMO_from_json.py @@ -943,8 +944,8 @@ msgid "" "Rivtech firearms. Being caseless rounds, these cannot be disassembled or " "reloaded." msgstr "" -"8x40mm无壳弹，运动型轻装药量。专为Rivtech枪支设计。作为无壳弹，它不能被拆卸或" -"重装。" +"8x40mm无壳弹，运动型轻装药量。专为Rivtech枪支设计。由于是无壳弹，因此不能被拆" +"解或重装。" #. ~ Description for 8x40mm HVP #: lang/json/AMMO_from_json.py @@ -955,14 +956,15 @@ msgid "" "reloaded." msgstr "" "8x40无壳弹，采用自动脱壳高速穿甲等技术。属于顶尖军火，携带贫油镖型的弹头。由" -"于采用无壳设计，因此无法被拆解或是装填。" +"于是无壳弹，因此不能被拆解或是装填。" #. ~ Description for 8x40mm caseless #: lang/json/AMMO_from_json.py msgid "" "8x40mm caseless rounds. Proprietary ammunition for Rivtech firearms. Being " "caseless rounds, these cannot be disassembled or reloaded." -msgstr "8x40mm无壳弹。专为Rivtech枪支设计。作为无壳弹，它不能被拆卸或重装。" +msgstr "" +"8x40mm无壳弹。专为Rivtech枪支设计。由于是无壳弹，因此不能被拆解或重装。" #: lang/json/AMMO_from_json.py msgid "8x40mm caseless sporting" @@ -982,7 +984,7 @@ msgstr "用于RPG-7的93mm单级高爆弹。" #: lang/json/AMMO_from_json.py msgid "9mm casing" msgid_plural "9mm casings" -msgstr[0] "9x19mm 弹壳" +msgstr[0] "9x19mm弹壳" #. ~ Description for reloaded 9x18mm #: lang/json/AMMO_from_json.py @@ -1025,7 +1027,7 @@ msgstr[0] "9x18mm弹" msgid "" "9x18mm Makarov RG028 ammunition. The RG028 round uses bullets with a " "hardened steel core to improve armor penetration." -msgstr "9x18mm马卡洛夫 RG028弹的弹头带有一个硬化钢芯，具有更好的护甲穿透能力" +msgstr "9x18mm马卡洛夫 RG028弹的弹头带有一个硬化钢芯，具有更好的护甲穿透能力。" #. ~ Description for 9x18mm SP-7 #: lang/json/AMMO_from_json.py @@ -1230,7 +1232,7 @@ msgstr "一颗40mm榴弹，能产生小型爆炸和大量冲击碎片。" msgid "" "A 40mm grenade with a small napalm load, designed to create a burst of flame." msgstr "" -"一个装载小型凝固汽油弹的40mm榴弹，爆炸时能产生高温火焰，内装有由汽油和其他化" +"一个装载小型汽油凝固弹的40mm榴弹，爆炸时能产生高温火焰，内装有由汽油和其他化" "学品制成的胶状物，爆炸时向四周溅射，发出一千摄氏度左右的高温，并能粘在其他物" "体上长时间燃烧。" @@ -1360,7 +1362,7 @@ msgid "" "weight, does some damage, and is so-so on accuracy. Stands a below average " "chance of remaining intact once fired." msgstr "" -"一支带有金属箭头和箭羽的木制箭矢。它有点轻，造成的伤害还不错，精准度也还凑" +"一支带有金属箭头和箭羽的木质箭矢。它有点轻，造成的伤害还不错，精准度也还凑" "合，射击后只有小概率可以保持完好。" #. ~ Description for shotgun beanbag @@ -1371,17 +1373,25 @@ msgstr "一种霰弹枪用的防暴霰弹，不致命但是会非常疼。" #. ~ Description for bearings #: lang/json/AMMO_from_json.py msgid "A box of ball bearings, useful as ammunition for slings." -msgstr "一小盒滚珠轴承，很适合作为弹弓的弹药。很适合用来弹小丧尸的小JJ。" +msgstr "" +"用于滚珠轴承的一盒小钢球，很适合作为弹弓的弹药。很适合用来弹小丧尸的小JJ。" #. ~ Description for nail #: lang/json/AMMO_from_json.py msgid "A box of nails, mainly useful with a hammer." -msgstr "一盒钉子，大部分时候需要配合锤子才能使用。禁止把它钉到别人的脑袋里。" +msgstr "一盒钉子，主要用来被锤子敲。禁止把它钉到别人的脑袋里。" #. ~ Description for BB #: lang/json/AMMO_from_json.py msgid "A box of small steel balls. They deal virtually no damage." -msgstr "一盒小钢珠。几乎不能造成任何实质性伤害。" +msgstr "一盒小钢球。你指望用它来欺负丧尸？除非人家是丧尸萝莉，你是怪蜀黍。" + +#. ~ Description for .44 FMJ +#: lang/json/AMMO_from_json.py +msgid "" +"A brass-jacketed variant of the .44 Magnum round. This increases " +"penetration slightly at the cost of reduced damage from expansion." +msgstr "一种带铜质外壳的改装版.44马格南手枪子弹。牺牲威力，提升穿透力。" #. ~ Description for blue paint #: lang/json/AMMO_from_json.py @@ -1439,7 +1449,7 @@ msgstr "一堆锌粉和硫磺的混合物，由强力胶粘合胶结，可以用 #. ~ Description for soap bar #: lang/json/AMMO_from_json.py msgid "A cleansing agent made into bars." -msgstr "做成条状的肥皂。如果丢在地上，会有好基友来捡吗？" +msgstr "做成条状的肥皂，如果丢在地上会有好基友来捡吗？" #. ~ Description for pool ball #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py @@ -1453,6 +1463,8 @@ msgid "" "of Soviet Russia. It was derived from the 7.63x25mm cartridge used by the " "C96 pistol." msgstr "" +"为苏俄军方制造的 7.62x25mm 弹药的商业版本，它衍生自C96手枪所使用的 7.63x25mm " +"弹药。" #. ~ Description for copper javelin #: lang/json/AMMO_from_json.py @@ -1529,7 +1541,7 @@ msgid "" msgstr "" "一小撮电石块，一股淡淡的蒜味。商业上，碳化钙用于即时制造乙炔，历史上也用于点" "亮乙炔灯。如果与水混合并密封起来，它会产生威力小但响声大的爆炸。或许可以用作" -"诱饵…" +"诱饵……" #. ~ Description for chromium oxide #: lang/json/AMMO_from_json.py @@ -1605,7 +1617,7 @@ msgid "" "fairs, but pretty useless as ammo. Maybe something could be crafted from " "this stuff…" msgstr "" -"一小撮石灰石。可用于科学实验，无法当作弹药使用。也许可以用它制作点什么…" +"一小撮石灰石。可用于科学实验，无法当作弹药使用。也许可以用它制作点什么……" #. ~ Description for hexamine #: lang/json/AMMO_from_json.py @@ -1647,8 +1659,8 @@ msgid "" "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." msgstr "" -"由家用清洁剂制成的致命喷雾，须填充于药剂喷罐喷洒。用在面部与口腔防护效果最" -"佳。" +"由家用清洁剂制成的致命喷雾，须填充于药剂喷罐喷洒。与面罩或口部防护配合使用效" +"果最佳。" #. ~ Description for lead ball #: lang/json/AMMO_from_json.py @@ -1694,7 +1706,7 @@ msgstr "" msgid "" "A heavy plastic cartridge made for use in flare guns. It appears to be a " "modified 12 gauge shotgun shell." -msgstr "一个沉重的塑料信号弹弹壳。似乎是通过修改霰弹枪弹药得来的。" +msgstr "一个沉重的塑料信号弹弹药。似乎是通过修改霰弹枪弹药得来的。" #. ~ Description for reloaded signal flare #: lang/json/AMMO_from_json.py @@ -1702,7 +1714,7 @@ msgid "" "A heavy plastic cartridge made for use in flare guns. It appears to be a " "modified 12 gauge shotgun shell. This one has been hand-reloaded." msgstr "" -"一个沉重的塑料信号弹弹壳。似乎是通过修改霰弹枪弹药得来的。这是手工重新装药的" +"一个沉重的塑料信号弹弹药。似乎是通过修改霰弹枪弹药得来的。这是手工重新装药的" "型号。" #. ~ Description for metal arrow shaft @@ -1737,6 +1749,7 @@ msgid "" "A high-pressure commercial version of the 7.62x25mm cartridge, loaded with a " "85 gr. FMJ bullet. It is more powerful than the original." msgstr "" +"7.62x25mm 弹药的高压商业版本，装填85 格令 FMJ 弹头。比原来的版本更加强大。" #. ~ Description for denatured alcohol #: lang/json/AMMO_from_json.py @@ -1802,7 +1815,7 @@ msgstr "一个155mm炮弹发射后的弹壳，可以当成昂贵的镇纸。" #. ~ Description for 40mm canister #: lang/json/AMMO_from_json.py msgid "A large canister from a spent 40mm grenade." -msgstr "一个装40mm榴弹的大罐。" +msgstr "40mm榴弹发射后留下的大号弹壳。" #. ~ Description for bladed disc #: lang/json/AMMO_from_json.py @@ -1853,7 +1866,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A metal disc surrounded by serrated edges. It's as menacing as it sounds." -msgstr "一个边缘满是锯齿的金属圆盘。就像听上去那么危险。" +msgstr "一个边缘满是锯齿的金属圆盘。就像听上去那么危险." #. ~ Description for plutonium cell #: lang/json/AMMO_from_json.py @@ -1900,13 +1913,13 @@ msgstr "" #. ~ Description for point #: lang/json/AMMO_from_json.py msgid "A point on turret control screen display." -msgstr "在炮塔控制台上显示的点" +msgstr "在炮塔控制台上显示的点。" #. ~ Description for blunderbuss slug #: lang/json/AMMO_from_json.py msgid "" "A prepared blunderbuss shot of a large hunk of metal. Better for distance." -msgstr "预填装好的火铳纸包弹，用一大块金属作独头弹头。中远距离射程适用。" +msgstr "一颗准备得当的火铳弹，装着一大块金属弹头，适合一定距离使用。" #. ~ Description for blunderbuss shot #: lang/json/AMMO_from_json.py @@ -1915,15 +1928,16 @@ msgid "" "whatever is at hand. The homemade pellet spread and number makes up for the " "shoddy quality." msgstr "" -"预填装好的火铳纸包弹，用可能是弹珠、小石子、轴承滚珠、或者是其他什么就地取材" -"的小珠子作霰弹弹头。手工制作的山寨货，子弹会打歪。" +"一颗准备得当的火铳弹，装着一玻璃珠，小石子等等东西。小弹丸的数量和散布稍稍挽" +"救了一下子弹低劣的质量。" #. ~ Description for blunderbuss flechette #: lang/json/AMMO_from_json.py msgid "" "A prepared blunderbuss shot of homemade flechette made out of nails or " "glass. Shreds armor." -msgstr "预填装好的火铳纸包弹，用玻璃或者钉子作成的箭弹。能撕裂装甲。" +msgstr "" +"一颗准备得当的火铳弹，装着从玻璃或者钉子自制来的镖型弹丸。可以撕破护甲。" #. ~ Description for RA10K stimulant module #: lang/json/AMMO_from_json.py @@ -1981,7 +1995,7 @@ msgstr "一卷黄地毯" #: lang/json/AMMO_from_json.py msgid "" "A set of universal batteries. Used to charge almost any electronic device." -msgstr "一组通用电池组，可以给几乎所有电子设备供电。" +msgstr "一组通用电池组，几乎可以给所有电气设备来供电。" #. ~ Description for steel crossbow bolt #: lang/json/AMMO_from_json.py @@ -2064,9 +2078,8 @@ msgid "" "around. It is fairly inaccurate, and does little damage, but it works in a " "pinch." msgstr "" -"手工制作的独头霰弹，在霰弹弹壳里塞了些火药，然后地上捡一颗大小适中的小石头作" -"为独头弹头做成。准头比较差，而且伤害很低，但是在紧急的关头也顾不了太多了，凑" -"合着用吧。" +"一颗塞进了各种乱七八糟东西的独头弹，弹头材料完全因地制宜。准确度一般，杀伤力" +"一般，但还是值得一用。" #. ~ Description for flechette shell #: lang/json/AMMO_from_json.py @@ -2083,8 +2096,8 @@ msgid "" "A shotgun shell filled with whatever was lying around. They are more " "damaging than birdshot, but fairly inaccurate." msgstr "" -"手工制作的分散弹头霰弹，在霰弹弹壳里塞了些火药和地上的砂石砾土什么的做成。比" -"在霰弹里最低威力的猎鸟弹威力高些，但是准头真的很差，凑合着用吧。" +"一颗塞进了各种乱七八糟东西的霰弹，弹丸材料完全因地制宜。总之，这玩意威力比鸟" +"弹强点，就是不太准。" #. ~ Description for field point wooden arrow #: lang/json/AMMO_from_json.py @@ -2129,7 +2142,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A simple arrow shaft that has had a point carved into it and then fire-" -"hardened. Needs fletching to be worth firing from a bow." +"hardened. It needs fletching to be worth firing from a bow." msgstr "一支经过火烤碳化加硬处理的箭杆，需要翎羽才能用弓有效发射。" #. ~ Description for ammo belt linkage @@ -2140,7 +2153,7 @@ msgstr "一件金属子弹连接器，从子弹带上拆下来的。" #. ~ Description for thread #: lang/json/AMMO_from_json.py msgid "A small quantity of thread that could be used to refill a sewing kit." -msgstr "一小团细线，能在缝纫工具里使用" +msgstr "一小团细线，能填充到缝纫工具里。" #. ~ Description for solder #: lang/json/AMMO_from_json.py @@ -2188,8 +2201,8 @@ msgid "" "A strange glowing mote of wispy vapor. It gives off a soothing warmth and " "feels surprisingly solid, almost alive even." msgstr "" -"一团闪闪发光的尘埃，散发着让人安心的温暖同时，抓起来又令人惊讶的结实，简直像" -"是活物一般。" +"一团闪闪发光的尘埃，散发着让人安心的温暖同时又坚固得令人惊讶，似乎是活物一" +"般。" #. ~ Description for 7.62x25mm Type P #: lang/json/AMMO_from_json.py @@ -2198,8 +2211,8 @@ msgid "" "firearms. It offers good armor penetration at the cost of slightly less " "damage." msgstr "" -"7.62x25mm托卡列夫手枪弹的次音速衍生版本，供微声武器使用。这种子弹通过稍稍降低" -"威力的改进来获得良好的装甲穿彻性能。" +"从7.62x25mm弹药发展而来的次音速弹药，为消音枪支设计。拥有不错的护甲穿透能力，" +"但是伤害较小。" #. ~ Description for lamp oil #: lang/json/AMMO_from_json.py @@ -2218,7 +2231,7 @@ msgstr "小李飞刀，例不虚发。所以基本上除了飞以外这把小刀 msgid "" "A thin foil made of aluminum. Sometimes called 'tin foil' due to being made " "of tin in the past." -msgstr "一块铝制的薄片。也被叫做\"罐头箔\"，因为以前它被用来制作罐头盒。" +msgstr "一小块铝制的薄片，有时也被叫做锡箔，因为过去通常是锡制。" #. ~ Description for stone javelin #: lang/json/AMMO_from_json.py @@ -2236,7 +2249,7 @@ msgid "" msgstr "" "安瓿（ampoule|ampule）是用于盛装药液小型玻璃容器。容量一般为1～25ml。常用于注" "射用药液，装有先进的快速愈合的化学物质，只能通过Rivtech注射器设备激活，侧面的" -"标签警示每小时最好不要使用超过两次。" +"标签警示每小时最好不要使用超过两次." #. ~ Description for tiny steel bolt #: lang/json/AMMO_from_json.py @@ -2347,9 +2360,8 @@ msgid "" "trigger it. Intended to be fired from a specialized launcher. This one is " "designed to douse a large area with deadly flames." msgstr "" -"一个用空容器装上满满的爆炸物和某种简易点火机构的简易爆炸装置。这个东西应使用" -"特制的发射装置发射。这种是燃烧弹型，在目标地区爆炸，把目标的大片地区变成地狱" -"般的火海。" +"一个简易的爆炸装置，说起来就是里边装了杀伤性物质的密封容器，遭遇撞击后触发。" +"看起来似乎应该用特制的发射器使用，这个设计来让大片区域充满火焰。" #. ~ Description for fire canister #: lang/json/AMMO_from_json.py @@ -2358,9 +2370,8 @@ msgid "" "trigger it. Intended to be fired from a specialized launcher. This one is " "designed to douse a small area with deadly flames." msgstr "" -"一个用空容器装上满满的爆炸物和某种简易点火机构的简易爆炸装置。这个东西应使用" -"特制的发射装置发射。这种是燃烧弹型，在目标地区爆炸，在小范围里喷洒致命的火" -"焰。" +"一个简易的爆炸装置，说起来就是里边装了杀伤性物质的密封容器，遭遇撞击后触发。" +"看起来似乎应该用特制的发射器使用，这个设计来让小片区域充满火焰。" #. ~ Description for fragmentation canister #: lang/json/AMMO_from_json.py @@ -2369,9 +2380,8 @@ msgid "" "trigger it. Intended to be fired from a specialized launcher. This one is " "designed to spray the immediate area with deadly shrapnel." msgstr "" -"一个用空容器装上满满的爆炸物和某种简易点火机构的简易爆炸装置。这个东西应使用" -"特制的发射装置发射。这种是榴弹型，在目标地区爆炸，在战术覆盖范围喷射致命的爆" -"炸破片。" +"一个简易的爆炸装置，说起来就是里边装了杀伤性物质的密封容器，遭遇撞击后触发。" +"看起来似乎应该用特制的发射器使用，这个设计来让目标区域弹片四溅。" #. ~ Description for nova bolt #: lang/json/AMMO_from_json.py @@ -2399,14 +2409,18 @@ msgstr "" msgid "" "An IED composed of a sealed container filled with a payload material that " "triggers on impact. Carries a VERY substantial explosive payload." -msgstr "一只土制的炸弹，撞击点火。密封的容器里装了 非常 大量的炸药。" +msgstr "" +"一个简易的爆炸装置，说起来就是里边装了杀伤性物质的密封容器，遭遇撞击后触发。" +"这个有 非常 大量的高爆装药。" #. ~ Description for blast canister #: lang/json/AMMO_from_json.py msgid "" "An IED composed of a sealed container filled with a payload material that " "triggers on impact. Carries a substantial explosive payload." -msgstr "一只土制的炸弹，撞击点火。密封的容器里装了大量的炸药。" +msgstr "" +"一个简易的爆炸装置，说起来就是里边装了杀伤性物质的密封容器，遭遇撞击后触发。" +"这个有大量的高爆装药。" #. ~ Description for .50 BMG API #: lang/json/AMMO_from_json.py @@ -2438,7 +2452,7 @@ msgstr "未使用过的 .22 空弹壳。弹壳完整，附有底火。" #. ~ Description for .22 casing #: lang/json/AMMO_from_json.py msgid "An empty casing from a .22 round. These can't be hand-reloaded." -msgstr ".22的空弹壳。这些不能手工重装。" +msgstr ".22的空弹壳。这些不能手工复装。" #. ~ Description for .223 casing #: lang/json/AMMO_from_json.py @@ -2483,7 +2497,7 @@ msgstr ".44子弹的空弹壳。" #. ~ Description for .45 casing #: lang/json/AMMO_from_json.py msgid "An empty casing from a .45 ACP round." -msgstr "一个空的.45 ACP弹壳。" +msgstr ".45 ACP子弹的空弹壳。" #. ~ Description for .454 Casull casing #: lang/json/AMMO_from_json.py @@ -2495,7 +2509,7 @@ msgstr ".454 Casull子弹的空弹壳。" msgid "" "An empty casing from a .50 BMG round. These are rare, so you might want to " "hold onto these." -msgstr "稀有的.50 BMG 弹壳。你一定要带上它们。" +msgstr "稀有的.50 BMG 弹壳。你可能想要带上它们。" #. ~ Description for .500 S&W Magnum casing #: lang/json/AMMO_from_json.py @@ -2507,7 +2521,7 @@ msgstr ".500 S&W Magnum子弹的空弹壳。" msgid "" "An empty casing from a .700 NX round. These are rare, so you might want to " "hold onto these." -msgstr "一个 .700 NX子弹的空弹壳，它很稀有，你最好全带走。" +msgstr ".700 NX子弹的空弹壳，它很稀有，你最好全带走。" #. ~ Description for 4.6x30mm casing #: lang/json/AMMO_from_json.py @@ -2517,7 +2531,7 @@ msgstr "4.6x30mm子弹的空弹壳。" #. ~ Description for 5.45x39mm casing #: lang/json/AMMO_from_json.py msgid "An empty casing from a 5.45x39mm round." -msgstr "一个 5.45x39mm 弹的空弹壳。" +msgstr "5.45x39mm子弹的空弹壳。" #. ~ Description for 5.7x28mm casing #: lang/json/AMMO_from_json.py @@ -2537,52 +2551,52 @@ msgstr "7.62x39mm子弹的空弹壳。" #. ~ Description for 7.62x54mmR casing #: lang/json/AMMO_from_json.py msgid "An empty casing from a 7.62x54mmR round." -msgstr "7.62x54mmR子弹的空弹壳。" +msgstr "7.62x54mmR子弹的空弹壳" #. ~ Description for 9x18mm casing #: lang/json/AMMO_from_json.py msgid "An empty casing from a 9x18mm round." -msgstr "9x18mm 空弹壳。" +msgstr "9x18mm子弹的空弹壳。" #. ~ Description for 9mm casing #: lang/json/AMMO_from_json.py msgid "An empty casing from a 9x19mm round." -msgstr "一个空的9x19mm弹壳。" +msgstr "9x19mm子弹的空弹壳。" #. ~ Description for heavy rifle casing #: lang/json/AMMO_from_json.py msgid "An empty casing from a heavy rifle round." -msgstr "一个空的重型步枪子弹弹壳。" +msgstr "一个空的重型步枪子弹弹壳." #. ~ Description for light rifle ammo casing #: lang/json/AMMO_from_json.py msgid "An empty casing from a light rifle round." -msgstr "一个空的轻型步枪子弹弹壳。" +msgstr "一个空的轻型步枪子弹弹壳." #. ~ Description for pistol ammo casing #: lang/json/AMMO_from_json.py msgid "An empty casing from a pistol round." -msgstr "一个空的手枪子弹弹壳。" +msgstr "一个空的手枪子弹弹壳." #. ~ Description for revolver ammo casing #: lang/json/AMMO_from_json.py msgid "An empty casing from a revolver round." -msgstr "一个空的左轮枪子弹弹壳。" +msgstr "一个空的左轮枪子弹弹壳." #. ~ Description for rifle casing #: lang/json/AMMO_from_json.py msgid "An empty casing from a rifle round." -msgstr "一个空的步枪子弹弹壳。" +msgstr "一个空的步枪子弹弹壳." #. ~ Description for shotgun hull #: lang/json/AMMO_from_json.py msgid "An empty hull from a shotgun shell." -msgstr "一个空的霰弹弹壳。" +msgstr "霰弹的空弹壳。" #. ~ Description for 5x50mm hull #: lang/json/AMMO_from_json.py msgid "An empty plastic hull from a 5x50mm flechette round." -msgstr "一个5x50mm镖形弹的空壳。" +msgstr "5x50mm镖形弹的空壳。" #. ~ Description for iron javelin #: lang/json/AMMO_from_json.py @@ -2726,16 +2740,6 @@ msgstr "" "浓缩过氧化氢溶液是一种强大的氧化剂，与大部分还原剂接触都会剧烈分解。可以用作" "火箭燃料或烈性炸药。与任何有机物接触都有可能点燃它们并导致剧烈燃烧。" -#. ~ Description for .22 CB -#: lang/json/AMMO_from_json.py -msgid "" -"Conical Ball .22 is a variety of .22 ammunition with a very small propellant " -"charge and generally lacks gunpowder. The end result is a subsonic round " -"that is so weak as to be nearly useless given your predicament." -msgstr "" -"Conical Ball .22（.22 CB）规格弹药，用一颗小铅球作弹头的减装药型.22口径子弹。" -"这样子改装结果变成了一种次音速弹药。但威力微小到近乎无用。" - #. ~ Description for handloaded .22 CB #: lang/json/AMMO_from_json.py msgid "" @@ -2753,7 +2757,7 @@ msgstr "" msgid "" "Copper scraps. Could be used to craft something, for example makeshift " "shotgun shells." -msgstr "废铜料。可用于制造些有用的东西，例如自制霰弹枪子弹。" +msgstr "废铜料，可以用来制作别的东西，比如手工霰弹。" #. ~ Description for bronze #: lang/json/AMMO_from_json.py @@ -2840,8 +2844,8 @@ msgid "" "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." msgstr "" -"抗真菌剂加琉制成的强化式抗真菌喷雾，须填充于药剂喷罐喷洒。用在面部与口腔防护" -"效果最佳。" +"抗真菌剂加硫磺制成的强化式抗真菌喷雾，须填充于药剂喷罐喷洒。与面罩或口部防护" +"配合使用效果最佳。" #. ~ Description for gasoline #: lang/json/AMMO_from_json.py @@ -2882,7 +2886,7 @@ msgstr "" #. ~ Description for reloaded revolver ammo #: lang/json/AMMO_from_json.py msgid "Hand-loaded ammunition for large revolvers, as well as a few carbines." -msgstr "用于左轮手枪和一些卡宾枪的手工装填子弹。" +msgstr "用于左轮手枪和一些卡宾枪的手工装填子弹." #. ~ Description for reloaded light rifle ammo #. ~ Description for handloaded light rifle ammo @@ -2913,7 +2917,7 @@ msgstr "手工装药型号中型步枪通用子弹，主要用来击倒大型猎 #: lang/json/AMMO_from_json.py msgid "" "Hand-loaded ammunition for semiautomatic pistols as well as submachine guns." -msgstr "用于半自动手枪和冲锋枪的手工装填子弹。" +msgstr "用于半自动手枪和冲锋枪的手工装填子弹." #. ~ Description for reloaded heavy rifle ammo, AP #: lang/json/AMMO_from_json.py @@ -2930,7 +2934,7 @@ msgstr "" msgid "" "Hand-loaded armor-piercing ammunition for pistols. It trades improved " "penetration for slightly reduced damage." -msgstr "手工装填的手枪穿甲弹。拥有较高的穿透力和较低的杀伤力。" +msgstr "手工装填的手枪穿甲弹。拥有较高的穿透力和较低的杀伤力." #. ~ Description for reloaded light rifle ammo, incendiary #: lang/json/AMMO_from_json.py @@ -2957,7 +2961,7 @@ msgid "" "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless buckshot rounds. " "Being caseless rounds, these cannot be disassembled or reloaded." msgstr "" -"手工制造的盗版Rivtech的26x66mm猎鹿弹，由于是无壳弹，所以不可拆卸和重新装载。" +"手工制造的盗版Rivtech的26x66mm猎鹿弹，由于是无壳弹，所以不可拆卸和重新装载." #. ~ Description for handmade 20x66mm flechette #: lang/json/AMMO_from_json.py @@ -2965,8 +2969,7 @@ msgid "" "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless flechette " "rounds. Being caseless rounds, these cannot be disassembled or reloaded." msgstr "" -"手工制造的盗版Rivtech的26x66mm箭型弹药，由于是无壳弹，所以不可拆卸和重新装" -"载。" +"手工制造的盗版Rivtech的26x66mm箭型弹药，由于是无壳弹，所以不可拆卸和重新装载." #. ~ Description for handmade 20x66mm slug #: lang/json/AMMO_from_json.py @@ -2974,15 +2977,14 @@ msgid "" "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless solid projectile " "rounds. Being caseless rounds, these cannot be disassembled or reloaded." msgstr "" -"手工制造的盗版Rivtech的26x66mm合金弹，由于是无壳弹，所以不可拆卸和重新装载。" +"手工制造的盗版Rivtech的26x66mm合金弹，由于是无壳弹，所以不可拆卸和重新装载." #. ~ Description for handmade 8x40mm caseless #: lang/json/AMMO_from_json.py msgid "" "Handcrafted bootleg duplicates of Rivtech 8x40mm caseless rounds. Being " "caseless rounds, these cannot be disassembled or reloaded." -msgstr "" -"小作坊制作的山寨8x40毫米无壳弹。由于采用无壳设计，因此不能被拆解或是填充。" +msgstr "小作坊制作的山寨8x40毫米无壳弹。由于是无壳弹，因此不能被拆解或是重装。" #. ~ Description for handmade 8x40mm caseless JSP #: lang/json/AMMO_from_json.py @@ -2991,8 +2993,8 @@ msgid "" "caseless rounds. Being caseless rounds, these cannot be disassembled or " "reloaded." msgstr "" -"小作坊制作的山寨Rivtech 8x40软尖无壳弹。由于采用无壳设计，因此无法被拆解或是" -"装填。" +"小作坊制作的山寨Rivtech 8x40软尖无壳弹。由于是无壳弹。因此不能被拆解或是重" +"装。" #. ~ Description for lead pellet #: lang/json/AMMO_from_json.py @@ -3037,7 +3039,7 @@ msgstr "高放射性泥浆。也许你该离得越远越好。" #. ~ Description for cent #: lang/json/AMMO_from_json.py msgid "IF YOU ARE SEEING THIS IT IS A BUG." -msgstr "如 果 你 看 到 本 句 意 味 着 这 有 一 个 BUG!" +msgstr "如 果 你 看 到 本 句 意 味 着 这 是 一 个 BUG！" #. ~ Description for fusion pack #: lang/json/AMMO_from_json.py @@ -3173,7 +3175,7 @@ msgstr "从加工汽油的副产品中提炼出来的石化燃料。" msgid "" "Plastic heads for an arrow. Placing these on arrows will make them more " "damaging and piercing." -msgstr "弓箭用的塑料箭镞。安装在箭上将会增加伤害和穿透性." +msgstr "弓箭用的塑料箭镞.安装在箭上将会增加伤害和穿透性." #. ~ Description for copper wire #: lang/json/AMMO_from_json.py @@ -3191,7 +3193,7 @@ msgstr "波特兰已死，水泥永恒！加水，然后玩转建筑学！" #. ~ Description for lye powder #: lang/json/AMMO_from_json.py msgid "Powdered caustic soda." -msgstr "苏打粉" +msgstr "腐蚀性苏打粉。" #. ~ Description for revolver ammo #: lang/json/AMMO_from_json.py @@ -3219,12 +3221,12 @@ msgstr "机炮炮弹的底火，似乎采用电触发。" #. ~ Description for large pistol primer #: lang/json/AMMO_from_json.py msgid "Primer from a large caliber pistol round." -msgstr "大口径手枪子弹底火" +msgstr "大口径手枪子弹的底火。" #. ~ Description for large rifle primer #: lang/json/AMMO_from_json.py msgid "Primer from a large caliber rifle round." -msgstr "大口径步枪子弹底火" +msgstr "大口径步枪子弹的底火。" #. ~ Description for shotgun primer #: lang/json/AMMO_from_json.py @@ -3234,12 +3236,12 @@ msgstr "霰弹枪子弹底火" #. ~ Description for small pistol primer #: lang/json/AMMO_from_json.py msgid "Primer from a small caliber pistol round." -msgstr "小口径手枪子弹底火" +msgstr "小口径手枪子弹的底火。" #. ~ Description for small rifle primer #: lang/json/AMMO_from_json.py msgid "Primer from a small caliber rifle round." -msgstr "小口径步枪子弹底火" +msgstr "小口径步枪子弹的底火。" #: lang/json/AMMO_from_json.py msgid "RA10K stimulant module" @@ -3269,12 +3271,13 @@ msgstr[0] "RDX炸药" #. ~ Description for .22 rat-shot #: lang/json/AMMO_from_json.py msgid "" -"Rat-shot is extremely weak ammunition, designed for killing rats, snakes, or " -"other small vermin while being unable to damage walls. It has an extremely " -"short range and is unable to injure all but the smallest creatures." +"Rat-shot is an extremely weak .22 shotgun cartridge, designed for killing " +"rats, snakes, or other small vermin while being unable to damage walls. It " +"has an extremely short range and is unable to injure all but the smallest " +"creatures." msgstr "" -"一种威力极弱的弹药，用于消灭老鼠、蛇或其他小型害虫，同时避免伤害到墙体。它的" -"射程极短且只能对那些最小的生物造成伤害。" +"猎鼠弹是一种威力极弱的弹药，用于消灭老鼠、蛇或其他小型害虫，同时避免伤害到墙" +"体。它的射程极短且只能对那些最小的生物造成伤害。" #. ~ Description for handloaded .22 rat-shot #: lang/json/AMMO_from_json.py @@ -3285,23 +3288,22 @@ msgid "" "one has been handmade using an intact casing." msgstr "" "猎鼠弹是一种威力极弱的弹药，用于枪毙老鼠、蛇或其它小型害虫，同时避免伤害到墙" -"体。它的射程极短而且只能对那些最小的生物造成伤害。这个是用全新弹壳手工装药的" -"型号。" +"体。它的射程极短而且只能对那些最小的生物造成伤害。这个是用完整的弹壳手工重新" +"装药的型号。" #. ~ Description for cyber rocket #: lang/json/AMMO_from_json.py msgid "" "Relatively weak for a rocket, the strength of it is its ability to be fired " "in burst." -msgstr "作为一条火箭，它的装药量较少；它主要优点在于它能快速连发。" +msgstr "对于火箭而言有点弱，它主要的威力在于可以连射。" #. ~ Description for rubber slug #: lang/json/AMMO_from_json.py msgid "" "Rubber slugs from a shotgun beanbag round. You could use them to make new " "beanbag rounds." -msgstr "" -"橡胶粒，在霰弹枪用的沙包弹里作为弹头使用。你可以收集它来制作新的沙包弹。" +msgstr "从霰弹枪沙包弹里拆出来的橡胶弹头，可以拿来重新制作新的沙包弹。" #. ~ Description for heavy rifle ammo #: lang/json/AMMO_from_json.py @@ -3373,7 +3375,7 @@ msgstr "一堆混凝土，随时可以用到工程建设项目中。" #. ~ Description for fungal seed #: lang/json/AMMO_from_json.py msgid "Some fungal seeds." -msgstr "一些真菌的种子" +msgstr "一些真菌的种子。" #. ~ Description for mortar #: lang/json/AMMO_from_json.py @@ -3399,6 +3401,16 @@ msgstr "" "于制备很多种化学物质，但它主要是被作为蓄电池酸液而广为人知，因为它主要的商业" "用途就是制造电池。" +#. ~ Description for .22 CB +#: lang/json/AMMO_from_json.py +msgid "" +"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." +msgstr "" +"Conical Ball .22（.22 CB）规格弹药，采用子弹底火而非黑火药装填。这样子改装结" +"果变成了一种次音速弹药。但威力微小到近乎无用。" + #. ~ Description for reloaded .300 Winchester Magnum #: lang/json/AMMO_from_json.py msgid "" @@ -3476,7 +3488,7 @@ msgstr "" msgid "" "The Heckler & Koch 12mm projectiles are used in H&K railguns. It's made of " "a ferromagnetic metal, probably cobalt." -msgstr "用于H&K电磁枪的子弹。由磁性金属制成，很可能是钴。" +msgstr "用于H&K电磁枪的子弹。由磁性金属(可能是钴)制成。" #. ~ Description for quicklime #: lang/json/AMMO_from_json.py @@ -3486,8 +3498,8 @@ msgid "" "severe burns to any tissue it comes in contact with. This property could " "probably be exploited..." msgstr "" -"烧结石灰石的产物，这种白色粉末是制造水泥的重要材料。但同时极具腐蚀性，会灼烧" -"任何接触的组织。也许这特性能派上点用处…" +"烧解石灰石的产物，这种白色粉末是制造水泥的重要材料。但同时极具腐蚀性，会灼烧" +"任何接触的组织。也许这特性能派上点用处……" #. ~ Description for unfinished charcoal #: lang/json/AMMO_from_json.py @@ -3495,8 +3507,8 @@ msgid "" "The result of an interrupted charcoal making process. Useless, except as " "fuel in a charcoal kiln." msgstr "" -"一堆未成品，木炭窑炉中因为中断了制造木炭过程，在半途就拆解取出来的东西。没啥" -"用，只能扔回窑炉里面继续制作。" +"中断了制造木炭过程，在半途就拆解取出来的东西。无用，除了塞回木炭窑炉当燃料。" +"=.=" #. ~ Description for charcoal pieces #: lang/json/AMMO_from_json.py @@ -3506,12 +3518,12 @@ msgstr "小片的炭，用于小型加热装置的燃料。" #. ~ Description for coal pieces #: lang/json/AMMO_from_json.py msgid "These are smaller pieces of coal used in smaller heating devices." -msgstr "小片的炭，用于小型加热装置的燃料。" +msgstr "小片的煤，用于小型加热装置的燃料。" #. ~ Description for rolling paper #: lang/json/AMMO_from_json.py msgid "These are thin paper strips intended for the rolling of cigarettes." -msgstr "卷烟丝用的薄纸带。也可以制作火药左轮枪的弹药。" +msgstr "卷烟丝用的薄纸带。" #. ~ Description for .20 DREAD Pellet #: lang/json/AMMO_from_json.py @@ -3532,7 +3544,7 @@ msgstr "该弹药为M80普通弹与M62曳光弹按5:1混合而成，有助于辅 msgid "" "This ammunition is a one-in-five mix of M855A1 and M856 tracer rounds to " "help keep the weapon they are fired from on target." -msgstr "该弹药为M855A1普通弹与M856曳光弹按5:1混合而成，有助于辅助锁定目标。" +msgstr "该弹药为M855A1普通弹与M856曳光弹按4:1混合而成，有助于辅助锁定目标。" #. ~ Description for flaming arrow #: lang/json/AMMO_from_json.py @@ -3560,7 +3572,7 @@ msgid "" "crude field point head and fletching. Stands a good chance of remaining " "intact once fired." msgstr "" -"一支带有粗制箭头和箭羽的木制箭矢。相较于其他木箭更稳固也更耐用，射击后有较好" +"一支带有粗制箭头和箭羽的木质箭矢。相较于其他木箭更稳固也更耐用，射击后有较好" "概率可以保持完好。" #. ~ Description for unfletched heavy field point arrow @@ -3569,7 +3581,7 @@ msgid "" "This arrow is significantly sturdier than other wooden arrows. It has a " "field point tip, but needs fletching before it is worth firing." msgstr "" -"一支带有粗制箭头的无翎木制箭矢。相较于其他木箭更稳固也更耐用，但是需要翎羽才" +"一支带有粗制箭头的无翎木质箭矢。相较于其他木箭更稳固也更耐用，但是需要翎羽才" "能用弓有效发射。" #. ~ Description for heavy fire-hardened arrow @@ -3579,7 +3591,7 @@ msgid "" "fire-hardened point and fletching. Stands a good chance of remaining intact " "once fired." msgstr "" -"一支顶端经过碳化加硬处理的木制箭矢。相较于其他木箭更稳固也更耐用，射击后有较" +"一支顶端经过碳化加硬处理的木质箭矢。相较于其他木箭更稳固也更耐用，射击后有较" "好概率可以保持完好。" #. ~ Description for unfletched heavy fire-hardened arrow @@ -3588,7 +3600,7 @@ msgid "" "This arrow is significantly sturdier than other wooden arrows. It has a " "fire-hardened point, but needs fletching to be worth firing." msgstr "" -"一支顶端经过碳化加硬处理的无翎木制箭矢。相较于其他木箭更稳固也更耐用，但是需" +"一支顶端经过碳化加硬处理的无翎木质箭矢。相较于其他木箭更稳固也更耐用，但是需" "要翎羽才能用弓有效发射。" #. ~ Description for napalm @@ -3612,7 +3624,7 @@ msgstr "一支装有钢制箭头的金属箭，射击后有较高概率可以保 #: lang/json/AMMO_from_json.py msgid "" "This metal shaft has been carefully sharpened so that it has a crude point " -"at the end. Needs fletching to be worth firing from a bow." +"at the end. It needs fletching to be worth firing from a bow." msgstr "一支磨尖了头的金属箭杆，需要翎羽才能用弓有效发射。" #. ~ Description for sharpened metal arrow @@ -3644,9 +3656,9 @@ msgid "" "This thick syrupy mixture of... let's not look too close, contains " "everything the blob needs to be healthy. You think..." msgstr "" -"这一罐粘稠的杂酱一样的混合物，混合了……我看不出里面的是什么。把它吃下去？！……" -"变形怪吃它的话应该可以帮助其\"健康\"成长，但我用手指点了一点尝了下，整个人都" -"不好了。" +"这一罐粘稠的杂酱一样的混合物，混合了……我看不出里面的是什么。把它吃下去？……变" +"形怪吃它的话应该可以帮助其\"健康\"成长，但我用手指点了一点尝了下，整个人都不" +"好了。" #. ~ Description for tin #: lang/json/AMMO_from_json.py @@ -3700,12 +3712,12 @@ msgstr "羊毛纱线，可用于编织羊毛服装。" #. ~ Description for fireball #: lang/json/AMMO_from_json.py msgid "a fist-sized fireball, scorching the air around it." -msgstr "一只拳头大小的火球，炙烤着周围的空气。" +msgstr "一个拳头大小的火球，灼烧着周围的空气。" #. ~ Description for skullfire #: lang/json/AMMO_from_json.py msgid "a gout of flame." -msgstr "来自地狱的永不熄灭的火焰，焚烧一切！" +msgstr "一团火焰。" #: lang/json/AMMO_from_json.py msgid "acetic acid" @@ -3735,17 +3747,17 @@ msgstr[0] "硫酸铝" #: lang/json/AMMO_from_json.py msgid "ammo belt linkage" msgid_plural "ammo belt linkages" -msgstr[0] "子弹带链接件" +msgstr[0] "可散弹链节" #: lang/json/AMMO_from_json.py msgid "ammo belt linkage (223)" msgid_plural "ammo belt linkages (223)" -msgstr[0] "子弹带链接件（.233）" +msgstr[0] "可散弹链节(223)" #: lang/json/AMMO_from_json.py msgid "ammo belt linkage (308)" msgid_plural "ammo belt linkages (308)" -msgstr[0] "子弹带链接件（.308）" +msgstr[0] "可散弹链节(308)" #: lang/json/AMMO_from_json.py msgid "ammonium nitrate" @@ -3765,17 +3777,17 @@ msgstr[0] "箭镞" #. ~ Description for plasma #: lang/json/AMMO_from_json.py msgid "baron-plasma." -msgstr "地狱骑士喷出的热等离子体" +msgstr "男爵的等离子。" #: lang/json/AMMO_from_json.py msgid "battery" msgid_plural "batteries" -msgstr[0] "电池组" +msgstr[0] "电池" #: lang/json/AMMO_from_json.py msgid "bearings" msgid_plural "bearings" -msgstr[0] "滚珠轴承" +msgstr[0] "滚珠" #: lang/json/AMMO_from_json.py msgid "birdshot" @@ -3800,7 +3812,7 @@ msgstr[0] "刀刃圆盘" #: lang/json/AMMO_from_json.py msgid "blast canister" msgid_plural "blast canisters" -msgstr[0] "爆破筒" +msgstr[0] "高爆大炸弹" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "blob feed" @@ -3850,7 +3862,7 @@ msgstr[0] "青铜" #. ~ Description for plasma #: lang/json/AMMO_from_json.py msgid "cacco-plasma." -msgstr "巨脑魔喷出的热等离子体" +msgstr "cacco的等离子。（调试标记）" #: lang/json/AMMO_from_json.py msgid "calcium carbide" @@ -3915,7 +3927,7 @@ msgstr[0] "混凝土" #: lang/json/AMMO_from_json.py msgid "copper" msgid_plural "copper" -msgstr[0] "铜" +msgstr[0] "铜块" #: lang/json/AMMO_from_json.py msgid "copper javelin" @@ -3930,12 +3942,12 @@ msgstr[0] "铜线" #: lang/json/AMMO_from_json.py msgid "cyber rocket" msgid_plural "cyber rockets" -msgstr[0] "程控火箭" +msgstr[0] "赛博火箭" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "dart" msgid_plural "darts" -msgstr[0] "飞镖" +msgstr[0] "镖" #: lang/json/AMMO_from_json.py msgid "denatured alcohol" @@ -3950,7 +3962,7 @@ msgstr[0] "柴油" #: lang/json/AMMO_from_json.py msgid "down feather" msgid_plural "down feathers" -msgstr[0] "掉落的羽绒" +msgstr[0] "羽绒" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "duct tape" @@ -4114,22 +4126,22 @@ msgstr[0] "火药" #: lang/json/AMMO_from_json.py msgid "handloaded .22 CB" msgid_plural "handloaded .22 CB" -msgstr[0] "手工装填.22 CB弹" +msgstr[0] "手装.22 CB弹" #: lang/json/AMMO_from_json.py msgid "handloaded .22 FMJ" msgid_plural "handloaded .22 FMJ" -msgstr[0] "手工装填.22 FMJ弹" +msgstr[0] "手装.22 FMJ弹" #: lang/json/AMMO_from_json.py msgid "handloaded .22 LR" msgid_plural "handloaded .22 LR" -msgstr[0] "手工装填.22 LR弹" +msgstr[0] "手装.22 LR弹" #: lang/json/AMMO_from_json.py msgid "handloaded .22 rat-shot" msgid_plural "handloaded .22 rat-shots" -msgstr[0] "手工装填.22猎鼠弹" +msgstr[0] "手装.22猎鼠弹" #: lang/json/AMMO_from_json.py msgid "handloaded light rifle ammo" @@ -4244,7 +4256,7 @@ msgstr[0] "铁标枪" #. ~ Description for plasma #: lang/json/AMMO_from_json.py msgid "knight's plasma." -msgstr "地狱骑士喷出的热等离子体" +msgstr "骑士的等离子。" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "lamp oil" @@ -4399,7 +4411,7 @@ msgstr[0] "凝固汽油弹弩机弩箭" #: lang/json/AMMO_from_json.py msgid "napalm glob" msgid_plural "napalm globs" -msgstr[0] "凝固汽油球型弹" +msgstr[0] "凝固汽油团" #: lang/json/AMMO_from_json.py msgid "nicotine liquid" @@ -4424,7 +4436,7 @@ msgstr[0] "核弩箭" #: lang/json/AMMO_from_json.py msgid "oxidizer powder" msgid_plural "oxidizer powder" -msgstr[0] "磷粉" +msgstr[0] "氧化剂粉" #: lang/json/AMMO_from_json.py msgid "oxyacetylene" @@ -4474,7 +4486,7 @@ msgstr[0] "手枪弹（穿甲型）" #: lang/json/AMMO_from_json.py msgid "placeholder ammunition" msgid_plural "placeholder ammunition" -msgstr[0] "弹药携行器" +msgstr[0] "弹药携行器（调试标记）" #: lang/json/AMMO_from_json.py msgid "plant fiber" @@ -4484,7 +4496,7 @@ msgstr[0] "植物纤维" #: lang/json/AMMO_from_json.py msgid "plasma" msgid_plural "plasmas" -msgstr[0] "热等离子体" +msgstr[0] "等离子" #: lang/json/AMMO_from_json.py msgid "plastic arrow" @@ -4514,7 +4526,7 @@ msgstr[0] "钚浆" #: lang/json/AMMO_from_json.py msgid "point" msgid_plural "points" -msgstr[0] "点" +msgstr[0] "点（调试标记）" #: lang/json/AMMO_from_json.py lang/json/GENERIC_from_json.py msgid "pool ball" @@ -4762,9 +4774,9 @@ msgid_plural "reloaded 7.62x39mm M43" msgstr[0] "复装7.62x39mm M43弹" #: lang/json/AMMO_from_json.py -msgid "reloaded 7.62x39mm M87" -msgid_plural "reloaded 7.62x39mm M87" -msgstr[0] "复装7.62x39mm M87弹" +msgid "reloaded 7.62x39mm M67" +msgid_plural "reloaded 7.62x39mm M67" +msgstr[0] "复装7.62x39mm M67弹" #: lang/json/AMMO_from_json.py msgid "reloaded 7.62x51mm" @@ -5014,7 +5026,7 @@ msgstr[0] "筋腱" #: lang/json/AMMO_from_json.py msgid "skullfire" msgid_plural "skullfires" -msgstr[0] "地狱火" +msgstr[0] "骷髅火" #: lang/json/AMMO_from_json.py msgid "small electric primer" @@ -5054,7 +5066,7 @@ msgstr[0] "焊料" #: lang/json/AMMO_from_json.py lang/json/GUN_from_json.py msgid "spider laser" msgid_plural "spider lasers" -msgstr[0] "机械蜘蛛激光箭" +msgstr[0] "蜘蛛激光" #: lang/json/AMMO_from_json.py msgid "spiked home-made rocket" @@ -5079,7 +5091,7 @@ msgstr[0] "钢制弩矢" #: lang/json/AMMO_from_json.py msgid "steel rail" msgid_plural "steel rails" -msgstr[0] "铁条筋" +msgstr[0] "钢条磁轨弹" #: lang/json/AMMO_from_json.py msgid "stone javelin" @@ -5169,7 +5181,7 @@ msgstr[0] "碳化无翎羽重箭" #: lang/json/AMMO_from_json.py msgid "unfletched sharpened metal arrow" msgid_plural "unfletched sharpened metal arrows" -msgstr[0] "尖头无翎羽金属箭" +msgstr[0] "磨尖无翎羽金属箭" #: lang/json/AMMO_from_json.py msgid "unfletched small game arrow" @@ -5199,7 +5211,7 @@ msgstr[0] "白油漆" #: lang/json/AMMO_from_json.py msgid "wood ballista bolt" msgid_plural "wood ballista bolts" -msgstr[0] "木制弩床矢" +msgstr[0] "木质弩床矢" #: lang/json/AMMO_from_json.py msgid "wooden arrow" @@ -5363,7 +5375,7 @@ msgid "" "Like all DoubleTech power armor, the control and climate-regulation systems " "require direct skin contact." msgstr "" -"基本动力装甲头盔，与Mk. I型动力装甲相配套。面对物理攻击和环境危机都表现出极好" +"基本动力装甲头盔，与Mk。I型动力装甲相配套。面对物理攻击和环境危机都表现出极好" "的防御素质。和其他DoubleTech动力装甲相同，它的控制与温度调节系统只在与皮肤直" "接接触时启动。" @@ -5608,7 +5620,7 @@ msgstr "一种原始的由叠纸和胶带卷制成的铠甲，这件胸甲提供 msgid "" "A crude wooden shield, lacking any metal or leather reinforcement. " "Lightweight but not very tough." -msgstr "一面粗糙的木制盾牌，没有使用任何金属或皮革作加固。轻量级但不太坚固。" +msgstr "一件粗糙的木制盾牌，缺少金属及皮革部件。重量很轻但不坚固。" #. ~ Description for sleeveless survivor duster #: lang/json/ARMOR_from_json.py @@ -5701,7 +5713,7 @@ msgid "" "A custom-built pair of armored goggles with tinted lenses. Comfortable and " "built to last, they provide excellent protection from environmental dangers." msgstr "" -"一个自制的带深色镜片的强化眼镜。舒适且耐用，保护你不会受到环境伤害的影响。" +"一个自制的带深色镜片的强化眼镜。舒适且耐用，保护你不会受到环境伤害的影响." #. ~ Description for XL survivor firemask #: lang/json/ARMOR_from_json.py @@ -5749,7 +5761,7 @@ msgid "" "Provides excellent protection from smoke, teargas, and shrapnel." msgstr "" "一个自制皮革强化的防毒面具，覆盖在面部保护眼睛，保护你不会受到弹片催泪瓦斯以" -"及烟雾的影响。" +"及烟雾的影响." #. ~ Description for XL survivor mask #: lang/json/ARMOR_from_json.py @@ -5768,7 +5780,7 @@ msgid "" "excellent protection from smoke, teargas, and shrapnel." msgstr "" "一个自制防毒面具，覆盖在面部保护眼睛，保护你不会受到弹片催泪瓦斯以及烟雾的影" -"响。" +"响." #. ~ Description for heavy survivor mask #: lang/json/ARMOR_from_json.py @@ -5777,7 +5789,7 @@ msgid "" "Provides excellent protection from smoke, teargas, and shrapnel." msgstr "" "一个自制钢筋强化的防毒面具，覆盖在面部保护眼睛，保护你不会受到弹片催泪瓦斯以" -"及烟雾的影响。" +"及烟雾的影响." #. ~ Description for survivor firehood #: lang/json/ARMOR_from_json.py @@ -5856,7 +5868,7 @@ msgid "" "from the front. Don't worry, it's silent." msgstr "" "一个毛皮制作的装饰用的项圈，前面还配了一个小铃铛，但是别担心，它不会响，尽管" -"带上吧！（羞耻…）" +"带上吧！（羞耻……）" #. ~ Description for firefighter helmet #: lang/json/ARMOR_from_json.py @@ -5983,7 +5995,7 @@ msgstr "一套贴身棉西装，让你体会到什么叫做绅士。" #. ~ Description for wetsuit #: lang/json/ARMOR_from_json.py msgid "A full-body neoprene wetsuit." -msgstr "一件全身氯丁橡胶潜水服。" +msgstr "一件全身氯丁橡胶潜水服." #. ~ Description for tuxedo #: lang/json/ARMOR_from_json.py @@ -6039,7 +6051,7 @@ msgid "" "you when you walk." msgstr "" "一个塑料小珠子吊着一条黄色毛茸茸的尾巴，当你走动时会随之摇摆！（记得塞紧一" -"点…）" +"点……）" #. ~ Description for leather cat tail #: lang/json/ARMOR_from_json.py @@ -6077,6 +6089,9 @@ msgid "" "stomach. Offers decent protection from flame and acid, and features various " "straps and pockets for holstering guns and holding stims and ammo." msgstr "" +"一套绿色的护甲。采用聚合物塑料材料，在肩膀、衣领和腹部处通过特殊打磨工艺制成" +"轻薄而不失柔韧性的纤维。为使用者防御火焰和酸的伤害，同时提供几个口袋放置枪械" +"和弹药。" #. ~ Description for bone armor helmet #: lang/json/ARMOR_from_json.py @@ -6107,8 +6122,8 @@ msgid "" "A hard plastic hat worn in construction sites. Excellent protection from " "cuts and percussion." msgstr "" -"建筑工地上的民工头上戴的安全帽，让你不知不觉间就想搬砖了。不过它能很好的提供" -"对劈砍和打击伤害的防御，也算值了。" +"建筑工地上的民工头上戴的安全帽，让你不知不觉间就想搬砖了，咳咳跑题了，不过它" +"能很好的提供对劈砍伤害的防御……也算值了。" #. ~ Description for baseball helmet #: lang/json/ARMOR_from_json.py @@ -6164,13 +6179,15 @@ msgid "" "A heavy helmet with a tinted visor and sturdy, reinforced electronic " "wiring. A simple filter is fixed onto either side." msgstr "" +"一个有着染色面罩和加强后的电子线路的重型头盔，一个简易的过滤器被安在了另一" +"侧。" #. ~ Description for leather cloak #: lang/json/ARMOR_from_json.py msgid "" "A heavy leather cloak that is thrown over your body. Provides decent " "protection." -msgstr "笨重的皮革披风，提供全方位的保护。" +msgstr "笨重的皮革披风，提供全方位的保护." #. ~ Description for pair of fire gauntlets #: lang/json/ARMOR_from_json.py @@ -6278,7 +6295,7 @@ msgstr "这款头盔能把你的脸也遮的严严实实，但还留下了可以 msgid "" "A high, black cap with a very narrow top. Traditionally worn by Shinto " "priests." -msgstr "一顶高窄黑帽。通常由神道教的祭司所配戴。" +msgstr "一顶高窄黑帽。通常由神道教的祭司所配戴，可有效增高。" #: lang/json/ARMOR_from_json.py msgid "" @@ -6309,7 +6326,9 @@ msgstr "" #. ~ Description for duffel bag #: lang/json/ARMOR_from_json.py msgid "A huge duffel bag, provides plenty of storage but severely encumbering." -msgstr "一个巨大的无纺布编织袋，很有LV的范。提供了充足的存储空间，但十分累赘。" +msgstr "" +"一个巨大的无纺布编织袋，很有LV的范。提供了充足的存储空间，是以前黑社会经常用" +"它来运尸。拎着这样的两个包包，刘翔也跑不起来……" #. ~ Description for military rucksack #: lang/json/ARMOR_from_json.py @@ -6360,7 +6379,7 @@ msgstr "一个带有花边的结婚面纱。" #. ~ Description for American flag #: lang/json/ARMOR_from_json.py msgid "A large American flag made to fly in even the worst conditions." -msgstr "一个大大的美国国旗，即使环境再差也能飘扬。" +msgstr "一个大大的美国国旗，即使环境再差也能飘扬。(made in china)" #. ~ Description for swag bag #: lang/json/ARMOR_from_json.py @@ -6381,13 +6400,11 @@ msgstr "一大匹布，可以用来制作成窗帘或床单，或干脆剪成一 #: lang/json/ARMOR_from_json.py msgid "" "A large leather quiver trimmed with metal, worn on the back, that can hold " -"60 arrows.\n" -"Historically used by horse archers, rather than foot archers, but neither of " -"THEM had to fight zombies. Activate to store arrows." +"60 arrows. Historically used by horse archers, rather than foot archers, " +"but neither of THEM had to fight zombies. Activate to store arrows." msgstr "" -"一个可容纳60支箭的大型皮革镶嵌金属的箭筒佩戴在后背。\n" -"历史上使用它的都是骑着马的弓骑兵，而不是步行的弓箭手。但是他们谁也没有打过丧" -"尸。" +"一个可容纳60支箭的大型皮革镶嵌金属的箭筒佩戴在后背。历史上使用它的都是骑着马" +"的弓骑兵，而不是步行的弓箭手。但是他们谁也没有打过丧尸。" #. ~ Description for pair of ski goggles #: lang/json/ARMOR_from_json.py @@ -6409,7 +6426,7 @@ msgstr "一个可容纳60支箭的桦树皮大箭筒，佩带在背部。使用 #: lang/json/ARMOR_from_json.py msgid "A large sheet tied into a crude, over-the-shoulder sling." msgstr "" -"用一块小床单折叠起来的简易过肩吊袋，可以放点东西挂在胸前…背你家熊孩子挺合适" +"用一块小床单折叠起来的简易过肩吊袋，可以放点东西挂在胸前……背你家熊孩子挺合适" "的！" #. ~ Description for fur sleeping bag @@ -6729,7 +6746,7 @@ msgid "" "shaped opening for the face." msgstr "" "一个中世纪古罗马时代使用的步兵头盔，正面一个Y型空隙可以保护你的头部却不影响视" -"线。带上它，你好像拥有了巨大的胸肌。" +"线。带上它，你好像拥有了巨大的胸肌……" #. ~ Description for great helm #: lang/json/ARMOR_from_json.py @@ -6774,7 +6791,7 @@ msgstr "一个橡胶的兜帽，通常是潜水员穿的" msgid "" "A nice silver bracelet. You can wear it if you like, but it won't provide " "any effects." -msgstr "一个漂亮的银手镯，你可以戴着它，不过没什么特殊效果。" +msgstr "一个漂亮的银手镯，你可以戴着它，不过没什么特殊效果。." #. ~ Description for silver necklace #: lang/json/ARMOR_from_json.py @@ -6805,7 +6822,7 @@ msgstr "" msgid "" "A one-piece suit of full-body long underwear that helps to maintain body " "temperature. It laces closed in the front." -msgstr "一件连身内衣，能维持体温。正面拉链拉上了。" +msgstr "一件连身内衣，能维持体温。正面有拉链可以拉上。" #. ~ Description for winter coat #: lang/json/ARMOR_from_json.py @@ -6818,8 +6835,8 @@ msgid "" "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." msgstr "" -"一件后背有拉链的带内衬夹克衫，剑术家们穿来防止意外伤害，没有存储空间，但是十" -"分舒适。" +"一件拉链在背后的击剑上衣，这种设计有助于防止运动时发生意外，这件衣服没有任何" +"装东西的地方，但是穿上它令你觉得非常舒适。" #. ~ Description for survivor cargo pants #: lang/json/ARMOR_from_json.py @@ -6875,7 +6892,7 @@ msgstr "" msgid "" "A pair of black gloves, stretched tight against the skin so as not to " "interfere with dexterous tasks." -msgstr "" +msgstr "一双黑色的手套，紧紧的贴着皮肤因此不会妨碍需要灵巧的工作。" #. ~ Description for leather chaps #: lang/json/ARMOR_from_json.py @@ -7168,7 +7185,7 @@ msgstr "一副好的皮手套，不仅会保护你的手掌，且不影响灵活 #. ~ Description for pair of leather vambraces #: lang/json/ARMOR_from_json.py msgid "A pair of light leather arm guards, made for archery." -msgstr "一对轻皮革护手，用于射箭。" +msgstr "一对轻皮革护臂，用于射箭。" #. ~ Description for light-blue work pants #: lang/json/ARMOR_from_json.py @@ -7300,7 +7317,7 @@ msgstr "" msgid "" "A pair of stylish sunglasses, look good while keeping the glare out of your " "eyes." -msgstr "超级时髦的太阳镜，看起来酷毙了，同时可以防止狗眼被眩晕。" +msgstr "超级时髦的太阳镜，看起来酷毙了，同时可以防止狗眼被眩晕." #. ~ Description for pair of sunglasses #: lang/json/ARMOR_from_json.py @@ -7310,7 +7327,7 @@ msgstr "一副太阳镜，避免你的眼睛被太阳闪瞎，耍酷装逼的必 #. ~ Description for pair of swimming trunks #: lang/json/ARMOR_from_json.py msgid "A pair of swimming trunks, with netting." -msgstr "一件有网的泳裤" +msgstr "一件有网的泳裤。" #. ~ Description for pair of glove liners #: lang/json/ARMOR_from_json.py @@ -7419,7 +7436,7 @@ msgid "" "armor, the control and climate-regulation systems require direct skin " "contact." msgstr "" -"为Mk. II-H型动力装甲设计的头盔，更重，但更为凉爽且加强了自然环境防护能力。和" +"为Mk。II-H型动力装甲设计的头盔，更重，但更为凉爽且加强了自然环境防护能力。和" "其他DoubleTech动力装甲相同，它的控制与气温调节系统只在与皮肤直接接触时启动。" #. ~ Description for light power armor helmet @@ -7430,7 +7447,7 @@ msgid "" "Like all DoubleTech power armor, the control and climate-regulation systems " "require direct skin contact." msgstr "" -"轻型动力装甲头盔，与Mk. II-L型动力装甲相配套。改进后的头盔更轻，也更凉爽。和" +"轻型动力装甲头盔，与Mk。II-L型动力装甲相配套。改进后的头盔更轻，也更凉爽。和" "其他DoubleTech动力装甲相同，它的控制与温度调节系统只在与皮肤直接接触时启动。" #: lang/json/ARMOR_from_json.py @@ -7444,7 +7461,7 @@ msgstr "" #. ~ Description for blazer #: lang/json/ARMOR_from_json.py msgid "A professional-looking wool blazer. Quite cumbersome." -msgstr "这件羊毛制的专业运动上衣。好像型号有点大，穿起来不是那么灵活。" +msgstr "这件羊毛制的专业运动上衣，好像型号有点大……穿起来不是那么灵活。" #. ~ Description for hooded hat #: lang/json/ARMOR_from_json.py @@ -7538,7 +7555,7 @@ msgid "" "of storage space due to its many pockets." msgstr "" "一件结实的防尘罩衫，让你的手臂有足够的伸展自由。衣服上有很多袋子让你放进子弹" -"或者薯片什么的。" +"或者薯片什么的。就算再加个覆面头盔你也没法用这个COS沙漠游骑兵。" #. ~ Description for pair of drop leg pouches #: lang/json/ARMOR_from_json.py @@ -7673,7 +7690,7 @@ msgstr "一件简单的皮制热裤" #. ~ Description for hot pants #: lang/json/ARMOR_from_json.py msgid "A simple pair of short shorts." -msgstr "干爹送的齐逼小短裤。" +msgstr "一件简单的热裤。" #. ~ Description for dust mask #: lang/json/ARMOR_from_json.py @@ -7694,7 +7711,7 @@ msgstr "一件简单的木制圆盾，边缘和轴由铁皮包制而成。由于 msgid "" "A simple single-sling backpack. Easier to access than a normal backpack, " "but can't comfortably hold as much." -msgstr "一个简单的斜肩袋。比一般背包更易获得，不过容量就比较小了。" +msgstr "一个简单的单肩挎包。比一般背包更方便拿取东西，不过容量就比较小了。" #. ~ Description for undershirt #: lang/json/ARMOR_from_json.py @@ -7747,8 +7764,8 @@ msgid "" "A slouching wool cap with a short front brim, traditionally associated with " "newspaper delivery boys. Quite warm." msgstr "" -"一顶松软的帽顶带有一点向前突出的棉质帽，是送报的小男孩的标志搭配装。比较保" -"暖。" +"一个看上去懒洋洋的羊毛帽，前边有一个帽沿，一般来说都会立刻让人想到送报童。十" +"分暖和。" #. ~ Description for backpack #: lang/json/ARMOR_from_json.py @@ -7815,8 +7832,8 @@ msgid "" "Extremely light and tough, but its small size is as much a hindrance as it " "is an advantage." msgstr "" -"一件小型金属圆盾，式样源自中世纪晚期及文艺复兴时期。极为轻便与坚固，但过于小" -"型是其优点的同时也是它主要的短板。" +"一件小型金属圆盾，源自中世纪晚期及文艺复兴时期。十分轻便耐用，但过小的体积对" +"其优势有不小的阻碍。" #. ~ Description for pair of swim goggles #: lang/json/ARMOR_from_json.py @@ -7985,7 +8002,7 @@ msgid "" "protection. Like all DoubleTech power armor, the control and climate-" "regulation systems require direct skin contact." msgstr "" -"DoubleTech出品的Mk. II-H型动力装甲。在Mk.I型基础上做出很多改进，特别是提升了" +"DoubleTech出品的Mk。II-H型动力装甲。在Mk.I型基础上做出很多改进，特别是提升了" "它的自然环境防护能力。和其他DoubleTech动力装甲相同，它的控制与气温调节系统只" "在与皮肤直接接触时启动。" @@ -7997,7 +8014,7 @@ msgid "" "DoubleTech power armor, the control and climate-regulation systems require " "direct skin contact." msgstr "" -"DoubleTech制造的Mk. II-L型动力装甲，在Mk. I的基础上做出了很多改进，其中最为显" +"DoubleTech制造的Mk。II-L型动力装甲，在Mk。I的基础上做出了很多改进，其中最为显" "著的是减轻了重量。和其他DoubleTech动力装甲相同，它的控制与温度调节系统只在与" "皮肤直接接触时启动。" @@ -8158,8 +8175,8 @@ msgid "" "A thick fur trenchcoat without sleeves, leaving your arms unencumbered. Has " "plenty of storage space due to its many pockets." msgstr "" -"一件厚实的毛皮无袖风衣，让你的手臂有足够的伸展自由。衣服上有很多袋子让你放进" -"子弹或者薯片啥的。" +"一件厚厚的毛皮风衣但是没有袖子，让你的手臂伸展自由，缝着不少口袋，看上去挺能" +"装。" #. ~ Description for fur trenchcoat #: lang/json/ARMOR_from_json.py @@ -8208,8 +8225,8 @@ msgid "" "A thick leather trenchcoat without sleeves, leaving your arms unencumbered. " "Has plenty of storage space due to its many pockets." msgstr "" -"一件厚实的皮革无袖风衣，让你的手臂有足够的伸展自由。衣服上有很多袋子让你放进" -"子弹或者薯片什么的。" +"一件厚厚的皮革风衣但是没有袖子，让你的手臂伸展自由，缝着不少口袋，看上去挺能" +"装。" #. ~ Description for leather trenchcoat #: lang/json/ARMOR_from_json.py @@ -8232,8 +8249,8 @@ msgid "" "A thin cotton trenchcoat that leaves your arms unencumbered. Has plenty of " "storage space due to its many pockets." msgstr "" -"一件轻便的棉质风衣，让你的手臂有足够的伸展自由。衣服上有很多袋子让你放进子弹" -"或者薯片什么的。" +"一件薄薄的棉质风衣但是没有袖子，让你的手臂伸展自由，缝着不少口袋，看上去挺能" +"装。穿着不是那么像雷锋侠！" #. ~ Description for trenchcoat #: lang/json/ARMOR_from_json.py @@ -8257,7 +8274,7 @@ msgid "" "tailoring and adjustment points... maybe you don't want to know who wore " "it. Provides nominal storage and is not very encumbering." msgstr "" -"薄薄的、短袖和短腿的单件西装。由奇怪的剪裁和拼接来看…也许你不想知道是谁穿的" +"薄薄的、短袖和短腿的单件西装。由奇怪的剪裁和拼接来看……也许你不想知道是谁穿的" "了。它提供一定的存储空间，也不是很累赘。" #. ~ Description for XL jumpsuit @@ -8294,7 +8311,7 @@ msgstr "一个用于固定和矫正骨骼的工具。" #. ~ Description for fencing mask #: lang/json/ARMOR_from_json.py msgid "A tough hood used by fencers made out of steel mesh." -msgstr "一个面部以钢丝网制成的击剑护脸。" +msgstr "一个面部以钢丝网制成的击剑护脸." #. ~ Description for army winter jacket #: lang/json/ARMOR_from_json.py @@ -8345,14 +8362,14 @@ msgstr "传统样式的邮差帽，塑料帽檐上方印着美国邮政服务的 msgid "" "A traditional, ankle-length Japanese robe, wrapped around the body with a " "sash." -msgstr "一件日本传统服饰，虽然很好看，但活动起来有点累赘" +msgstr "传统从头裹到脚的日本服饰，用腰带一扎了事。" #. ~ Description for kariginu #: lang/json/ARMOR_from_json.py msgid "" "A traditional, ankle-length Shinto robe with several layers and very wide " "sleeves." -msgstr "传统从头裹到脚的宽袖多层神道教长袍，正式之余到处透漏着土包子气。" +msgstr "传统从头裹到脚的宽袖多层神道教长袍。" #. ~ Description for keffiyeh #: lang/json/ARMOR_from_json.py @@ -8414,7 +8431,7 @@ msgstr "" msgid "" "A waterproof hood made to be worn in bad weather. Provides extra protection " "from rain." -msgstr "一件防水兜帽，可以保护你不受雨滴的影响，不过别指望它能抵御酸雨。" +msgstr "一件防水兜帽，可以保护你不受雨滴的影响，不过别指望它能抵御酸雨." #. ~ Description for diver's watch #: lang/json/ARMOR_from_json.py @@ -8443,8 +8460,8 @@ msgid "" "ankles and wrists to prevent bees from flying in. It's not very tough " "fabric, but light and has plenty of storage thanks to a chest pocket." msgstr "" -"一套白色套装，通常是职业养蜂人穿戴，防止蜜蜂蛰。衣服的纤维不是很硬，在提供轻" -"便之余，衣服胸膛处的大袋子提供了不少的储物空间。" +"一个养蜂头罩，空气请进，蜜蜂免入。你也可以顾名思义把蜜蜂养里边。因为宽大且阻" +"碍视野所以穿着有些累赘。" #. ~ Description for kittel #: lang/json/ARMOR_from_json.py @@ -8505,7 +8522,7 @@ msgstr "一顶罗马帝国头盔，有其独特的突出部以保护头部两侧 msgid "" "An all-encompassing black helmet that covers your entire face and neck, " "providing excellent protection from all sorts of damage." -msgstr "黑色的极简头盔，覆盖面部和颈部，保护你免受各种伤害的摧残。" +msgstr "黑色的极简头盔，覆盖面部和颈部，保护你免受各种伤害的摧残." #. ~ Description for bell cuirass #: lang/json/ARMOR_from_json.py @@ -8531,8 +8548,7 @@ msgstr "一件古罗马片甲，由互相重叠的金属片连接而成，内部 msgid "" "An ancient style of wooden shield, lacking any metal or leather " "reinforcement. Bulky, but offers a decent amount of protection." -msgstr "" -"一面复古的木质盾牌，没有使用任何金属或皮革作加固。笨重，但能提供不错的防护。" +msgstr "一件古老样式的木盾，缺少金属及皮革部件。相当笨重，但提供不错的防护。" #. ~ Description for leather apron #: lang/json/ARMOR_from_json.py @@ -8557,8 +8573,7 @@ msgid "" "An armored jacket made from thick leather and metal plates. Cumbersome, but " "offers excellent protection from harm." msgstr "" -"一件由厚实的皮革加上金属板制成的护甲外套。有点累赘，但是提供了绝佳的伤害保" -"护。" +"一件由厚实的皮革加上金属板制成的护甲外套。累赘，但是提供了绝佳的伤害保护。" #. ~ Description for armored leather vest #: lang/json/ARMOR_from_json.py @@ -8566,8 +8581,7 @@ msgid "" "An armored vest made from thick leather and metal plates. Cumbersome, but " "offers excellent protection from harm." msgstr "" -"一件由厚实的皮革加上金属板制成的护甲背心。有点累赘，但是提供了绝佳的伤害保" -"护。" +"一件由厚实的皮革加上金属板制成的护甲背心。累赘，但是提供了绝佳的伤害保护。" #. ~ Description for ANBC suit #: lang/json/ARMOR_from_json.py @@ -8674,7 +8688,7 @@ msgstr "一个过时的铜手镯。" #. ~ Description for O-yoroi #: lang/json/ARMOR_from_json.py msgid "An ornamental suit of Japanese samurai armor." -msgstr "日本武士的装饰用盔甲套装" +msgstr "日本武士的装饰用盔甲套装。" #. ~ Description for nanoskirt #: lang/json/ARMOR_from_json.py @@ -8700,7 +8714,7 @@ msgid "" "Bits of wool stitched together and tied into a makeshift loincloth. Covers " "your modesty, but not much else." msgstr "" -"羊毛扭啊扭啊扭出来的简易遮羞布，尊严的底线，穿完记得告诉我有多扎。——by 五毛" +"羊毛扭啊扭啊扭出来的简易兜裆布，尊严的底线，穿完记得告诉我有多扎。——by 五毛" #. ~ Description for bone body armor #: lang/json/ARMOR_from_json.py @@ -9004,7 +9018,7 @@ msgstr "" #. ~ Description for pair of lowtop tennis shoes #: lang/json/ARMOR_from_json.py msgid "Lightweight shoes made of cloth and rubber." -msgstr "轻量级的鞋，由布和橡胶制成。" +msgstr "轻量级的鞋，由布和橡胶制成." #. ~ Description for headgear #: lang/json/ARMOR_from_json.py @@ -9074,6 +9088,9 @@ msgid "" "the knee, where they are sealed with a large strap. They can be very hard " "to even walk around in untrained, especially if they are improperly fitted." msgstr "" +"被人们爱称为“踩屎靴”，这种塑料聚合物材料的靴子从脚一直覆盖到膝盖，在膝盖处用" +"一条皮带系紧。如果你没有经过训练，穿上它之后你几乎不会走路。当它不合脚的时" +"候，情况更糟糕。" #: lang/json/ARMOR_from_json.py msgid "MBR vest (Kevlar plates)" @@ -9248,7 +9265,10 @@ msgstr "" #. ~ Description for Guy Fawkes mask #: lang/json/ARMOR_from_json.py msgid "Remember, remember the fifth of November." -msgstr "记住，记住11月5日。" +msgstr "" +"记住，记住11月5日。（译注——老翻译：经典的盖伊·福克斯面具，那张经典的欠揍笑脸" +"冲着谁，谁都会忍不住抽丫的。我们是无名者，我们是大多数。我们不会原谅，我们不" +"会忘记，等着吧你们！）" #: lang/json/ARMOR_from_json.py msgid "SWAT ID" @@ -9382,6 +9402,8 @@ msgid "" "Space sleeves that keep the arms covered during cold conditions. Can also " "protect from flame, with some discomfort." msgstr "" +"星际战士护臂覆盖着臂部好在寒冷的环境中保暖，当然也可以防护火焰，就是有些不舒" +"服。" #. ~ Description for pair of cleats #: lang/json/ARMOR_from_json.py @@ -9402,7 +9424,7 @@ msgstr "存储弹药" #. ~ Use action holster_prompt for leather belt. #: lang/json/ARMOR_from_json.py msgid "Stick what into your belt" -msgstr "想要别什么东西到腰带上？" +msgstr "把什么插到腰带上？" #. ~ Description for pair of western boots #: lang/json/ARMOR_from_json.py @@ -9436,7 +9458,7 @@ msgid "" "yourself. Like all DoubleTech power armor, the control and climate-" "regulation systems require direct skin contact." msgstr "" -"DoubleTech制造的Mk. I型动力装甲，沉重的基本型号，防御性能良好但非常难穿。如果" +"DoubleTech制造的Mk。I型动力装甲，沉重的基本型号，防御性能良好但非常难穿。如果" "你不介意自己扛着这套玩意到处跑，里面的UPS供能装置也可以挪作他用。和其他" "DoubleTech动力装甲相同，它的控制与温度调节系统只在与皮肤直接接触时启动。" @@ -9457,7 +9479,9 @@ msgstr "" #. ~ Description for French maid clothes #: lang/json/ARMOR_from_json.py msgid "The French maid dress, blue with a frilly white apron." -msgstr "法式女仆装，主色调为蓝色，搭配有一个镶褶边的白色围裙。" +msgstr "" +"法式女仆装，主色调为蓝色，搭配有一个镶褶边的白色围裙。主人看到它难免会兽性大" +"发。" #. ~ Description for MOLLE pack #: lang/json/ARMOR_from_json.py @@ -9478,8 +9502,8 @@ msgid "" "micro-motions of the body, especially breathing and walking motions. " "Because of this your walking speed is impaired while wearing it." msgstr "" -"WebbStar保湿衣采用高端科技，能减少30%因流汗引起的水分流失。这件衣服由身体运动" -"充能。因此穿着时你的步行速度减弱。" +"WebbStar保湿衣采用高端科技，能减少30%因流汗引起的水分流失。这件衣服由身体的微" +"运动充能，特别是呼吸和行走动作。因此穿着时你的步行速度减弱。" #. ~ Description for boxer briefs #: lang/json/ARMOR_from_json.py @@ -9524,6 +9548,8 @@ msgid "" "fire. Although it has no pockets it does have slots along its length to " "carry small items more easily, and really shapes the thighs!" msgstr "" +"这个厚而且有些压迫感的护腿保护星际战士不受能量火力伤害。尽管没有口袋，它还是" +"有些槽来方便携带一些小型物品。另外，穿着这件大腿简直靓爆了。" #. ~ Description for fur body armor #: lang/json/ARMOR_from_json.py @@ -9651,7 +9677,7 @@ msgstr[0] "XL号防毒面具" #: lang/json/ARMOR_from_json.py msgid "XL holster" msgid_plural "XL holsters" -msgstr[0] "加大枪套" +msgstr[0] "XL号枪套" #: lang/json/ARMOR_from_json.py msgid "XL jumpsuit" @@ -9743,7 +9769,7 @@ msgstr "你存入了你的 %s 。" #: lang/json/ARMOR_from_json.py #, no-python-format msgid "You tuck your %s into your %s" -msgstr "”Chop“，你把你的%s挂插到%s上了。" +msgstr "你将 %s 插进你的 %s。" #. ~ Description for bindle #: lang/json/ARMOR_from_json.py @@ -9786,7 +9812,7 @@ msgstr[0] "枪套（脚）" #: lang/json/ARMOR_from_json.py msgid "ankle sheath" msgid_plural "ankle sheaths" -msgstr[0] "刀鞘（脚）" +msgstr[0] "小刀鞘（脚）" #: lang/json/ARMOR_from_json.py msgid "arm splint" @@ -9851,7 +9877,7 @@ msgstr[0] "面罩" #: lang/json/ARMOR_from_json.py msgid "baldric" msgid_plural "baldrics" -msgstr[0] "刀鞘（肩）" +msgstr[0] "大刀鞘" #: lang/json/ARMOR_from_json.py msgid "ballistic mask" @@ -10431,7 +10457,7 @@ msgstr[0] "毛皮帽" #: lang/json/ARMOR_from_json.py msgid "fur hot pants" msgid_plural "fur hot pants" -msgstr[0] "齐B小裘裤" +msgstr[0] "毛皮热裤" #: lang/json/ARMOR_from_json.py msgid "fur kitty collar" @@ -11201,7 +11227,7 @@ msgstr[0] "骨甲护手" #: lang/json/ARMOR_from_json.py msgid "pair of boots" msgid_plural "pairs of boots" -msgstr[0] "皮靴" +msgstr[0] "靴子" #: lang/json/ARMOR_from_json.py msgid "pair of bowling shoes" @@ -11396,7 +11422,7 @@ msgstr[0] "绑手带" #: lang/json/ARMOR_from_json.py msgid "pair of hard arm guards" msgid_plural "pairs of hard arm guards" -msgstr[0] "硬质橡胶护臂" +msgstr[0] "硬质护臂" #: lang/json/ARMOR_from_json.py msgid "pair of hard leg guards" @@ -11481,7 +11507,7 @@ msgstr[0] "皮拖鞋" #: lang/json/ARMOR_from_json.py msgid "pair of leather vambraces" msgid_plural "pairs of leather vambraces" -msgstr[0] "轻皮护臂" +msgstr[0] "皮护腕" #: lang/json/ARMOR_from_json.py msgid "pair of leg warmers" @@ -11941,7 +11967,7 @@ msgstr[0] "生物动力装甲头盔" #: lang/json/ARMOR_from_json.py msgid "scabbard" msgid_plural "scabbards" -msgstr[0] "刀鞘（腰）" +msgstr[0] "刀鞘" #: lang/json/ARMOR_from_json.py msgid "scavenger cowl" @@ -11986,7 +12012,7 @@ msgstr[0] "警用衬衫" #: lang/json/ARMOR_from_json.py msgid "shorts" msgid_plural "shorts" -msgstr[0] "卡其布短裤" +msgstr[0] "短裤" #: lang/json/ARMOR_from_json.py msgid "shotgun bandolier" @@ -12081,7 +12107,7 @@ msgstr[0] "无袖上衣" #: lang/json/ARMOR_from_json.py msgid "sling pack" msgid_plural "sling packs" -msgstr[0] "斜肩袋" +msgstr[0] "单肩挎包" #: lang/json/ARMOR_from_json.py msgid "small relic" @@ -12101,32 +12127,32 @@ msgstr[0] "墨西哥阔边帽" #: lang/json/ARMOR_from_json.py msgid "space marine armor" msgid_plural "space marine armors" -msgstr[0] "" +msgstr[0] "星际战士护甲" #: lang/json/ARMOR_from_json.py msgid "space marine boots" msgid_plural "space marine boots" -msgstr[0] "" +msgstr[0] "星际战士靴" #: lang/json/ARMOR_from_json.py msgid "space marine gloves" msgid_plural "space marine gloves" -msgstr[0] "" +msgstr[0] "星际战士手套" #: lang/json/ARMOR_from_json.py msgid "space marine helmet" msgid_plural "space marine helmets" -msgstr[0] "" +msgstr[0] "星际战士头盔" #: lang/json/ARMOR_from_json.py msgid "space marine leggings" msgid_plural "space marine leggings" -msgstr[0] "" +msgstr[0] "星际战士护腿" #: lang/json/ARMOR_from_json.py msgid "space marine sleeves" msgid_plural "space marine sleeves" -msgstr[0] "" +msgstr[0] "星际战士护臂" #: lang/json/ARMOR_from_json.py msgid "sports bra" @@ -12501,7 +12527,7 @@ msgstr[0] "羊毛裹胸" #: lang/json/ARMOR_from_json.py msgid "wool cloak" msgid_plural "wool cloaks" -msgstr[0] "羊毛披风" +msgstr[0] "羊毛斗篷" #: lang/json/ARMOR_from_json.py msgid "wool hoodie" @@ -12511,7 +12537,7 @@ msgstr[0] "羊毛连帽衫" #: lang/json/ARMOR_from_json.py msgid "wool loincloth" msgid_plural "wool loincloths" -msgstr[0] "羊毛遮羞布" +msgstr[0] "羊毛兜裆布" #: lang/json/ARMOR_from_json.py msgid "wool poncho" @@ -12526,7 +12552,7 @@ msgstr[0] "羊毛套装" #: lang/json/ARMOR_from_json.py msgid "wrist bandolier" msgid_plural "wrist bandoliers" -msgstr[0] "步枪子弹带（手腕）" +msgstr[0] "步枪子弹带（腕）" #: lang/json/ARMOR_from_json.py msgid "wrist watch" @@ -12581,7 +12607,7 @@ msgstr "" msgid "" "A kit for upgrading a pre-installed microreactor with enhanced maximum yield " "and automatic radiation scrubbing." -msgstr "将体内核反应堆输出功率提升，并增加自动核辐射防护。" +msgstr "将体内核反应堆输出功率提升，并增加自动核辐射清洗处理。" #. ~ Description for Alarm System #. ~ Description for Alarm System CBM @@ -13100,9 +13126,8 @@ msgstr "" "你的手掌心被嵌入了一只EMP发射器。使用该设备，你可以发射一次近程EMP冲击，摧毁" "电子产品及机器人。" -#. ~ Description for Telescopic Eyes #. ~ Description for Telescopic Eyes CBM -#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py +#: lang/json/BIONIC_ITEM_from_json.py msgid "" "Much of the material in your inner eye has been removed and replaced with an " "array of high-powered, auto-focusing lenses. You can now see much farther " @@ -13210,8 +13235,8 @@ msgid "" "powered, this system will prevent heat damage up to 2000 degrees " "Fahrenheit. Note that this does not affect your internal temperature." msgstr "" -"强大的散热片和超级材料纤维被植入了你的体内，供电时可以防护低于2000华氏度的高" -"温伤害。注意，这不会影响你体内的热量。" +"强大的散热片和超级材料纤维被植入了你的体内，如果给其供电可以防止不超过2000华" +"氏度的高温.注意，这不会影响你体内的热量。" #: lang/json/BIONIC_ITEM_from_json.py msgid "Probability Travel CBM" @@ -13903,7 +13928,7 @@ msgid "" "colorful, full-page photos of skilled athletes demonstrating proper form and " "technique." msgstr "" -"一本棒球杂志，附带一些击球技巧和丰富的演示照片，可以提高你对武器的熟练度。" +"一本棒球杂志，附带一些击球技巧和丰富的演示照片，可以提高你对武器的熟练度." #. ~ Description for What's a Transistor? #: lang/json/BOOK_from_json.py @@ -13923,8 +13948,8 @@ msgid "" "You could probably learn a lot about cooking from studying this domestic " "artifact." msgstr "" -"一本某人家传的烹饪食谱合集，家庭主妇亲自操刀为你解说各种烹饪技巧，你可以学到" -"很多食品加工知识。" +"大本烹饪合集，家庭主妇亲自操刀为你解说各种烹饪技巧，你可以学到很多食品加工知" +"识." #. ~ Description for experimental novel #: lang/json/BOOK_from_json.py @@ -13933,7 +13958,7 @@ msgid "" "about two guys waiting for their friend to show up. It's confusing." msgstr "" "这是关于存在及其荒谬性的哲学的奇怪的戏剧，或者也许是两人在等待他们的朋友来。" -"真让人困惑不已。（译注：《等待戈多》）" +"真让人困惑不已。（PS.《等待戈多》？）" #. ~ Description for Amateur Home Radio for Enthusiasts #: lang/json/BOOK_from_json.py @@ -13941,8 +13966,8 @@ msgid "" "A book about ham radio and citizen's band radio. It contains numerous " "diagrams and illustrations explaining the science behind the electronics." msgstr "" -"一本关于业余级无线电和民用无线电台的书。包含了大量的图册以及漂亮的插图解释背" -"后的科学原理。" +"一本关于业余级无线电和公民可以收到的频道无线电，包含了大量的图册以及漂亮的插" +"图解释背后的科学原理." #. ~ Description for The Book of the SubGenius #: lang/json/BOOK_from_json.py @@ -13969,7 +13994,7 @@ msgid "" "in summoning and ...controlling them?" msgstr "" "一本描述了数种异界生物和其起源——起码也是对起源的猜测——的书。仍然让人奇怪的" -"是，这些还描述了不少实验来召唤甚至尝试…控制这些生物？" +"是，这些还描述了不少实验来召唤甚至尝试……控制这些生物？" #. ~ Description for The Homebrewer's Bible #: lang/json/BOOK_from_json.py @@ -14056,7 +14081,7 @@ msgstr "" msgid "" "A collection of discourses attributed to the Buddha and his close disciples." msgstr "" -"佛陀和他弟子们的故事以及语录，主要就是老师告诫弟子别给软妹纸骗了之类的…" +"佛陀和他弟子们的故事以及语录，主要就是老师告诫弟子别给软妹纸骗了之类的……" #. ~ Description for book of essays #: lang/json/BOOK_from_json.py @@ -14064,8 +14089,8 @@ msgid "" "A collection of essays by various authors from around the world, including " "works by Churchill, Mailer, Eco, and Voltaire." msgstr "" -"一本由著名作家撰写的优美华丽的散文集。包括丘吉尔、梅勒、艾柯、伏尔泰的作品。" -"他们是谁？你不禁问着自己，这些玩意写出来以后作者自己特喵的看过没有啊？" +"一本由著名作家撰写的优美华丽的散文集.包括丘吉尔、梅勒、艾柯、伏尔泰的作品。他" +"们是谁？你不禁问着自己，这些玩意写出来以后作者自己特喵的看过没有啊？" #. ~ Description for book of plays #: lang/json/BOOK_from_json.py @@ -14126,7 +14151,7 @@ msgstr "一本讲述经济学的大学课本。" msgid "" "A college-level textbook that details the operation, maintenance, and repair " "of internal combustion engines." -msgstr "一本大学水平的教材，详细介绍了如何操作维护和修理内燃机。" +msgstr "大学水平的教材，有关如何操作维护和修理内燃机." #. ~ Description for Sew What? Clothing! #: lang/json/BOOK_from_json.py @@ -14142,8 +14167,7 @@ msgid "" "photos are beautiful, though the terminology in the sections on " "survivalcraft assume some proficiency." msgstr "" -"一个有关徒步旅行，和荒野摄影的杂志。这些照片非常美丽，但其中章节所使用的术语" -"需要读者对生存学相当熟悉。" +"一个有关徒步旅行，和荒野摄影的杂志.这些照片非常美丽，可以让你熟悉一些地形." #. ~ Description for Water Survival Training Field Manual #: lang/json/BOOK_from_json.py @@ -14158,7 +14182,8 @@ msgid "" "A compact manual with faded print detailing a number of improvised field " "repairs that can be made to vehicles." msgstr "" -"一个带有褪色印刷的小型手册，详细介绍了一些对车辆进行临时野战修理的方法。" +"一本紧凑的手册,劣质纸上打印的内容已经褪色了,书里教你如何在车子坏了的时候来一" +"场应急的维修." #. ~ Description for book of philosophy #: lang/json/BOOK_from_json.py @@ -14180,7 +14205,7 @@ msgstr "" msgid "A detective investigates an unusual murder in a secluded location." msgstr "" "凶手就是你！死神小学生这次又在一起密室杀人案中指出了不同寻常的凶手！凶手居然" -"是…" +"是……" #. ~ Description for The Trapper's Companion #: lang/json/BOOK_from_json.py @@ -14190,7 +14215,7 @@ msgid "" "knowledgeable trapper." msgstr "" "一本教你如何捕获野生动物的杂志，虽然充满了大量的信息，但是如果是初学者，很容" -"易陷入不知所措的地步。" +"易陷入不知所措的地步，对你来说比较深奥." #. ~ Description for black box transcript #: lang/json/BOOK_from_json.py @@ -14212,7 +14237,7 @@ msgstr "" msgid "" "A glossy magazine about surviving and hunting in the wilderness. There's an " "exciting article about a bear attack in the back pages." -msgstr "一本教你如何野外求生杂志。在其背面有着一篇关于熊的攻击的有趣文章。" +msgstr "一本教你如何野外求生杂志.更令人兴奋的是后边关于对付熊的攻击的一篇文章." #. ~ Description for Tactical Handgun Digest #: lang/json/BOOK_from_json.py @@ -14238,7 +14263,7 @@ msgstr "这本书里写着一些伐木技术及基本的野外求生的知识。 #: lang/json/BOOK_from_json.py msgid "" "A hardboiled detective tale filled with hard hitting action and intrigue." -msgstr "一个硬汉型侦探大破汉化组某淫魔的故事。" +msgstr "一个硬汉型侦探大破汉化组某淫魔的故事." #. ~ Description for First Responder Handbook #: lang/json/BOOK_from_json.py @@ -14257,7 +14282,7 @@ msgstr "一本能让你变得口若悬河的精装书。" msgid "" "A heavy textbook dedicated to advanced-level software design, written for " "several different programming languages." -msgstr "一本沉重的教科书，内容为高级软件编程设计。含有许多不同编程语言教学.。" +msgstr "一本沉重的书.致力于高级软件编程设计.含有比较丰富的编程语言教学." #. ~ Description for FM 23-16 Army marksmanship manual #: lang/json/BOOK_from_json.py @@ -14315,8 +14340,8 @@ msgid "" "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." msgstr "" -"一本高超的服装设计集，曾属于某个服装设计师。充满了各种草图和笔记，熟练的裁缝" -"师能从中学到不少东西。" +"一本高超的服装设计集合.充满了各种草图和笔记，不过对于初学者来说有一定难度，适" +"合有一定经验的读者." #. ~ Description for children's book #: lang/json/BOOK_from_json.py @@ -14333,7 +14358,8 @@ msgstr "" msgid "" "A magazine about mechanical innovations. Full of entertaining articles and " "advertisements for esoteric gadgets." -msgstr "一本关于机械创新杂志，充满了风趣的广告和涨姿势的文章。" +msgstr "" +"一本关于机械创新杂志，充满了风趣的广告和涨姿势的文章，对你来说比较深奥." #. ~ Description for The Complete Home Repair Guide #: lang/json/BOOK_from_json.py @@ -14341,8 +14367,8 @@ msgid "" "A massive book that details virtually every aspect of remodeling and " "repairing a home, with concise terminology aimed at experienced carpenters." msgstr "" -" 一本厚重的书，详细讲述了如何进行居家修缮，内容运用了资深老手才看的懂得简洁术" -"语。 " +"巨大的精装图书册，让你通过几乎每一个方面的细节改造和修复一个家，简洁的术语适" +"合经验丰富的木匠." #. ~ Description for patient treatment records #: lang/json/BOOK_from_json.py @@ -14377,13 +14403,13 @@ msgstr "这是一本不仅仅局限于食品本身，而且重在分析食物组 #. ~ Description for frequency list #: lang/json/BOOK_from_json.py msgid "A notepad with a number of frequencies scribbled on it." -msgstr "一个写满了不同电台频率的记事本" +msgstr "一个写满了不同电台频率的记事本。" #. ~ Description for 101 Home Repairs #: lang/json/BOOK_from_json.py msgid "" "A paperback book detailing 101 home repair projects the novice carpenter." -msgstr "一本平装书，为新手木匠详细提供了进行家居修缮的入门教程。" +msgstr "令人激动，里边竟然有101个日常家具详细修理的方法." #. ~ Description for satire novel #: lang/json/BOOK_from_json.py @@ -14404,7 +14430,7 @@ msgstr "有关机器人的设计的书，写了很多制造指南。" msgid "" "A rather technical textbook that illustrates the science and technique of " "becoming a better welder." -msgstr "一个相当有实力的技术教材，科学与技术可以让你的焊接机更完美。" +msgstr "一个相当有实力的技术教材，科学与技术可以让你的焊接机更完美." #. ~ Description for drama novel #: lang/json/BOOK_from_json.py @@ -14440,7 +14466,7 @@ msgid "" "more...anomalous practices." msgstr "" "一系列手写的笔记，为某位神秘教团队学徒的手笔。起初的主题似乎只是简单的宗教仪" -"式，但很快就蜕变成更…反常的实践。" +"式，但很快就蜕变成更……反常的实践。" #. ~ Description for History of Alchemy #: lang/json/BOOK_from_json.py @@ -14605,8 +14631,8 @@ msgid "" "A thick textbook for beginning drivers. It contains chapters on laws, safe " "vehicle operation, and defensive driving concepts." msgstr "" -"一本专用于教导新司机的厚重教科书。包含了法律，安全的车辆操作，和防御型驾驶理" -"念的章节。" +"一本厚厚的教科书，专用用来教导初学者司机.包含了法律，安全的车辆操作，和防御型" +"驾驶的教导." #. ~ Description for Guide to Advanced Emergency Care #: lang/json/BOOK_from_json.py @@ -14659,7 +14685,7 @@ msgstr "" msgid "" "A university-level textbook on advanced principles of chemistry, both " "organic and inorganic." -msgstr "一本解释化学原理的大学教科书，包含了有机物和无机物两个方面。" +msgstr "一本解释化学原理的教科书，有关有机物和无机物两个方面." #. ~ Description for Sew Awesome Monthly #: lang/json/BOOK_from_json.py @@ -14827,25 +14853,24 @@ msgid "" "An annual publication about fencing and dueling. There are many good " "illustrations which describe proper technique and form." msgstr "" -"每年都出版的关于击剑和近距离决斗的杂志，有许多插图以及文章描述里边的各种技" -"巧。" +"每年都出版的关于击剑和近距离决斗的杂志，有许多插图以及文章描述里边的各种技巧." #. ~ Description for Paramedics #: lang/json/BOOK_from_json.py msgid "An educational magazine for EMTs." -msgstr "这是一本有关急救知识讲解的杂志。每期的封面都是一个惹火的护士女郎。" +msgstr "这是一本有关急救知识讲解的杂志。每期的封面都是一个惹火的护士女郎." #. ~ Description for book of tall tales #: lang/json/BOOK_from_json.py msgid "" "An entertaining collection of early American folklore, featuring tales of " "larger than life individuals and their amazing adventures." -msgstr "一本有趣的故事书，收录了各种美国民间传说以及都是传说，包括冒险和解密。" +msgstr "一本有趣的故事书，收录了各种美国民间传说以及都是传说，包括冒险和解密." #. ~ Description for Computer Science 101 #: lang/json/BOOK_from_json.py msgid "An entry-level textbook about computers." -msgstr "关于计算机的初级教材，很适合初学者。" +msgstr "关于计算机的初级教材，很适合初学者." #. ~ Description for Boxing Monthly #: lang/json/BOOK_from_json.py @@ -14867,7 +14892,7 @@ msgstr "" #. ~ Description for The Modern Trapper #: lang/json/BOOK_from_json.py msgid "An extensive volume that details numerous methods of trapping game." -msgstr "一本内容详尽的书，说明了各种制作陷阱的方法。" +msgstr "一大本书!无数的有关如何使用陷阱捕猎的教学." #. ~ Description for The Compleat Trapper #: lang/json/BOOK_from_json.py @@ -14926,7 +14951,7 @@ msgid "" "nonsense information and written to be understandable for beginners." msgstr "" "一个经验丰富的作者所写的如何使用军用制式武器的技巧，针对警棍枪械等，经受了时" -"间的考验，严肃的信息和难以理解的内容对初学者很不友好。" +"间的考验，严肃的信息和难以理解的内容对初学者很不友好." #. ~ Description for Computer World #: lang/json/BOOK_from_json.py @@ -15087,7 +15112,7 @@ msgstr[0] "专业手工季刊" #: lang/json/BOOK_from_json.py msgid "Cucina Italiana" msgid_plural "Cucina Italiana" -msgstr[0] "意大利厨房" +msgstr[0] "意大利的厨房" #. ~ Description for TIME magazine #: lang/json/BOOK_from_json.py @@ -15233,7 +15258,7 @@ msgstr[0] "如何成功经商" #: lang/json/BOOK_from_json.py msgid "How to Trap Anything" msgid_plural "How to Trap Anything" -msgstr[0] "如何设置陷阱" +msgstr[0] "如何设陷阱" #. ~ Description for corporate accounting ledger #: lang/json/BOOK_from_json.py @@ -15290,12 +15315,14 @@ msgstr "虽然专业术语很多，但是里边还是记载着大量的急救知 #. ~ Description for To Serve Man #: lang/json/BOOK_from_json.py msgid "It's... it's a cookbook!" -msgstr "你以为这是什么？这就是一本烹饪指南！" +msgstr "" +"你以为这是什么？这就是一本简单易懂的烹人指南。\\n 1.找一个或八个人2.打人3.继" +"续打人4.把人扔到火里5.吃人" #: lang/json/BOOK_from_json.py msgid "Jane's Mortars and Rocket Launchers" msgid_plural "copies of Jane's Mortars and Rocket Launchers" -msgstr[0] "简氏教你打炮：迫击炮和火箭筒" +msgstr[0] "简氏-迫击炮火箭筒" #: lang/json/BOOK_from_json.py msgid "King James Bible" @@ -15465,7 +15492,7 @@ msgstr[0] "大农场建设企划书" #: lang/json/BOOK_from_json.py msgid "Readable magazine" msgid_plural "Readable magazines" -msgstr[0] "易读杂志" +msgstr[0] "可以读的杂志" #. ~ Description for Guns n Ammo #: lang/json/BOOK_from_json.py @@ -15822,7 +15849,7 @@ msgstr "" msgid "" "The story of two young lovers whose feuding families threaten to keep them " "apart." -msgstr "令人伤感的年轻恋人的故事，家庭的不和使他们难以相处。" +msgstr "令人伤感的年轻恋人的故事，家庭的不和使他们难以相处." #. ~ Description for Swim Planet #: lang/json/BOOK_from_json.py @@ -15876,7 +15903,7 @@ msgid "" "throughout the facility. However, some of the log sheets seem to be filled " "with...a chemical formula?" msgstr "" -"这个日志内有标明如何定期维护好管道，然而，一些记录表中似乎充满了…化学式？" +"这个日志内有标明如何定期维护好管道，然而，一些记录表中似乎充满了……化学式？" #. ~ Description for PE023 "Medical": Application and Findings #: lang/json/BOOK_from_json.py @@ -16016,7 +16043,7 @@ msgstr "" msgid "" "This humongous volume contains a vast collection of short stories by " "different authors, spanning a wide variety of topics and genres." -msgstr "这本超大的书收集了来自不同作者的短文，包含了各种风格的故事和主题。" +msgstr "这本超大的书包含了各种风格的故事和主题." #. ~ Description for Art and Science of Chemical Warfare #: lang/json/BOOK_from_json.py @@ -16159,7 +16186,7 @@ msgid "" "illustrations." msgstr "" "这本袖珍枪支指南集合看起来很袖珍，但是里边蕴含大量简洁的信息，以及简单容易阅" -"读的插图。" +"读的插图." #. ~ Description for Pocket Guide to First Aid #: lang/json/BOOK_from_json.py @@ -16169,7 +16196,7 @@ msgid "" "illustrations." msgstr "" "这本袖珍急救指南集合看起来很袖珍，但是里边蕴含大量简洁的信息，以及简单容易阅" -"读的插图。" +"读的插图." #. ~ Description for Pocket Survival Guide #: lang/json/BOOK_from_json.py @@ -16179,7 +16206,7 @@ msgid "" "illustrations." msgstr "" "这本袖珍生存指南集合看起来很袖珍，但是里边蕴含大量简洁的信息，以及简单容易阅" -"读的插图。" +"读的插图." #. ~ Description for PE070 "Raptor": Proposal #: lang/json/BOOK_from_json.py @@ -16199,7 +16226,7 @@ msgid "" "sort of ...crowd-control catalyst? That can't be right..." msgstr "" "这些文件上的日期是你接到疏散指令的前一天，详细描述了一个新发现的化学配方的应" -"用和结果，并着重说明其在\"群体意识控制催化\"方面的显著效果…天哪，这是怎么回" +"用和结果，并着重说明其在\"群体意识控制催化\"方面的显著效果……天哪，这是怎么回" "事？" #. ~ Description for PE050 "Alpha": Preliminary Report @@ -16210,7 +16237,7 @@ msgid "" "\"APPROVED\"..." msgstr "" "这叠文件上的日期是距大灾变发生两周前，详细分析了很多化学配方以及这些反应对于" -"人体的影响。上面盖了一个鲜红的图章\"同意\"…" +"人体的影响。上面盖了一个鲜红的图章\"同意\"……" #. ~ Description for chemical reference-CLASSIFIED #: lang/json/BOOK_from_json.py @@ -16279,7 +16306,7 @@ msgstr[0] "车迷杂志" #: lang/json/BOOK_from_json.py msgid "Trap and Field" msgid_plural "Trap and Field" -msgstr[0] "陷阱和场地" +msgstr[0] "飞靶和场地" #: lang/json/BOOK_from_json.py msgid "Trapper's Life" @@ -16378,7 +16405,7 @@ msgstr[0] "冒险小说" #: lang/json/BOOK_from_json.py msgid "army improvised field repairs" msgid_plural "army improvised field repairs" -msgstr[0] "军用简易野战修理学" +msgstr[0] "军用应急维修手册" #: lang/json/BOOK_from_json.py msgid "big book of short stories" @@ -16656,8 +16683,8 @@ msgid "" "A (rather bright) green super-concentrated mutagen. You need a syringe to " "inject it... if you really want to?" msgstr "" -"超浓缩的诱变剂，颜色绿油油的...非常夸张。你需要一个针管来注射……如果你真的想用" -"的话。" +"超浓缩的诱变剂，颜色绿油油的...非常夸张。你需要一个针管来注射...如果你真的想" +"使用它。" #. ~ Description for medikit #: lang/json/COMESTIBLE_from_json.py @@ -16665,6 +16692,8 @@ msgid "" "A PRM brand medikit. Can be quickly applied in battlefield situations, " "though it is designed to quickly attach to damaged tissue, not disinfect." msgstr "" +"一个PRM牌医疗包。可以用于快速治疗战斗损伤，然而它被设计用于快速修复损伤组织，" +"而非解除伤口感染。" #. ~ Description for BLT #: lang/json/COMESTIBLE_from_json.py @@ -16875,12 +16904,12 @@ msgstr "一块肉排，上面浇了蜂王浆。和蜜渍烤火腿很像。" #. ~ Description for grapefruit #: lang/json/COMESTIBLE_from_json.py msgid "A citrus fruit, whose taste ranges from sour to semi-sweet." -msgstr "柑橘类水果，有的甜有的酸" +msgstr "柑橘类水果，有的甜有的酸。" #. ~ Description for razorclaw roe #: lang/json/COMESTIBLE_from_json.py msgid "A clump of razorclaw eggs. A post-cataclysm delicacy." -msgstr "" +msgstr "一团利爪怪的卵。大灾变时代的美味。" #. ~ Description for grape #: lang/json/COMESTIBLE_from_json.py @@ -17094,7 +17123,7 @@ msgstr "" #. ~ Description for mango #: lang/json/COMESTIBLE_from_json.py msgid "A fleshy fruit with large pit." -msgstr "有大果核的新鲜水果" +msgstr "有大果核的新鲜水果。" #. ~ Description for fluid sac #: lang/json/COMESTIBLE_from_json.py @@ -17130,19 +17159,17 @@ msgstr "刚烹熟的人肉片，切自某个讨厌的家伙。不管怎样，味 msgid "" "A frothing slurry of alcohol-soaked zombie flesh and rotten blood, it smells " "almost as bad as it looks. Has weak mutagenic properties." -msgstr "" -"发泡浆料的酒精浸泡的僵尸烂血肉，它闻起来几乎像它看起来的那么糟糕。具有较弱的" -"致突变性。" +msgstr "由酒精发酵僵尸的烂肉和血液，惨不忍睹。据说喝了会多长出胳膊腿啥的？" #. ~ Description for coconut #: lang/json/COMESTIBLE_from_json.py msgid "A fruit with a hard and hairy shell." -msgstr "一种水果，有着坚硬多毛的外壳" +msgstr "一种水果，有着坚硬多毛的外壳。" #. ~ Description for watermelon #: lang/json/COMESTIBLE_from_json.py msgid "A fruit, bigger than your head. It is very juicy!" -msgstr "比你头还要大的水果，十分的多汁。（也许给丧尸爆头很好？）" +msgstr "比你头还要大的水果，十分的多汁。（也许给僵尸爆头很好？）" #. ~ Description for first aid kit #: lang/json/COMESTIBLE_from_json.py @@ -17297,7 +17324,7 @@ msgid "" "A heavily smoked portion of human flesh. Lasts for a very long time and " "tastes pretty good, if you like that sort of thing." msgstr "" -"经过熏制的人肉，可以保持很长一段时间不变质，味道不错，如果你喜欢吃的话。" +"经过熏制的人肉，可以保持很长一段时间不变质，味道不错，如果你喜欢吃的话." #. ~ Description for Mannwurst #: lang/json/COMESTIBLE_from_json.py @@ -17309,7 +17336,7 @@ msgstr "一根巨大的猪肉香肠，被特别加工以便于长期储存，十 #. ~ Description for sausage #: lang/json/COMESTIBLE_from_json.py msgid "A hefty sausage that has been cured for long term storage." -msgstr "美味腊肠，可以长期存储。" +msgstr "美味腊肠.可以长期存储." #. ~ Description for cheater chili dogs #: lang/json/COMESTIBLE_from_json.py @@ -17329,7 +17356,7 @@ msgstr "多汁，铃铛状的梨子。美味！" #. ~ Description for melon #: lang/json/COMESTIBLE_from_json.py msgid "A large and very sweet fruit." -msgstr "又大又甜的瓜" +msgstr "又大又甜的瓜。" #. ~ Description for wax #: lang/json/COMESTIBLE_from_json.py @@ -17431,7 +17458,7 @@ msgstr "" msgid "" "A meat pizza, for all the carnivores out there. Chock full of minced meat " "and heavily seasoned." -msgstr "一份加肉披萨，肉食者们的最爱。加入了大量切碎的肉并配以浓郁的酱料。" +msgstr "这张披萨面饼被撒上许多动物的肉...尽情享受食物的乐趣吧。" #. ~ Description for codeine #: lang/json/COMESTIBLE_from_json.py @@ -17517,7 +17544,7 @@ msgstr "用大自然的馈赠做成的营养又美味的汤。" #. ~ Description for human broth #: lang/json/COMESTIBLE_from_json.py msgid "A nutritious broth made from human bones." -msgstr "用人骨慢火熬成的富含营养的骨头汤" +msgstr "用人骨慢火熬成的富含营养的骨头汤。" #. ~ Description for tramadol #: lang/json/COMESTIBLE_from_json.py @@ -17667,7 +17694,7 @@ msgstr "一种罕见的未知来源物质，会导致你基因突变。" #. ~ Description for cherry #: lang/json/COMESTIBLE_from_json.py msgid "A red, sweet fruit that grows in trees." -msgstr "一种长在树上的红色果实，很甜" +msgstr "一种长在树上的红色果实，很甜。" #. ~ Description for cucumber sandwich #: lang/json/COMESTIBLE_from_json.py @@ -17819,7 +17846,7 @@ msgstr "一个煮熟的人胃，仅此而已。一看根本下不去口。" msgid "" "A small boiled stomach from an animal, nothing else. It looks all but " "appetizing." -msgstr "就是做熟的小型动物胃囊，看起来挺\"开胃\"。←＿←" +msgstr "一个煮熟的某种动物的胃，就这样。一看根本下不去口。" #. ~ Description for cooked burrito #: lang/json/COMESTIBLE_from_json.py @@ -18006,7 +18033,8 @@ msgstr "一种强大的半合成毒品，用来镇痛。高度上瘾。" msgid "" "A super-concentrated blood-red mutagen. You need a syringe to inject it... " "if you really want to?" -msgstr "超浓缩的诱变剂，红色的液体。你需要一个针管来注射……如果你真的想用的话。" +msgstr "" +"超浓缩的诱变剂，红色的液体。你需要一个针管来注射...如果你真的想使用它。" #. ~ Description for beast serum #. ~ Description for ursine serum @@ -18017,8 +18045,8 @@ msgid "" "A super-concentrated mutagen strongly resembling blood. You need a syringe " "to inject it... if you really want to?" msgstr "" -"超浓缩的诱变剂，看上去就像鲜血一样。你需要一个针管来注射……如果你真的想用的" -"话。" +"超浓缩的诱变剂，看上去就像鲜血一样。你需要一个针管来注射...如果你真的想使用" +"它。" #. ~ Description for plant serum #: lang/json/COMESTIBLE_from_json.py @@ -18036,8 +18064,8 @@ msgid "" "it-is in the zombies' eyes. You need a syringe to inject it... if you " "really want to?" msgstr "" -"超浓缩的诱变剂，看起来就像丧尸眼睛里的粘液。你需要一个针管来注射……如果你真的" -"想用的话。" +"超浓缩的诱变剂，看起来就像丧尸眼睛里的粘液。你需要一个针管来注射...如果你真的" +"那么熊。" #. ~ Description for elf-a serum #: lang/json/COMESTIBLE_from_json.py @@ -18045,8 +18073,8 @@ msgid "" "A super-concentrated mutagen that reminds you of the forests. You need a " "syringe to inject it... if you really want to?" msgstr "" -"超浓缩的诱变剂，让你不由自主的想起森林。你需要一个针管来注射……如果你真的想用" -"的话。" +"超浓缩的诱变剂，让你不由自主的想起森林。你需要一个针管来注射...如果你真的想使" +"用它。" #. ~ Description for cattle serum #: lang/json/COMESTIBLE_from_json.py @@ -18054,8 +18082,8 @@ msgid "" "A super-concentrated mutagen the color of grass. You need a syringe to " "inject it... if you really want to?" msgstr "" -"超浓缩的诱变剂，有着一种青草的颜色。你需要一个针管来注射……如果你真的想用的" -"话。" +"超浓缩的诱变剂，有着一种青草的颜色。你需要一个针管来注射...如果你真的想使用" +"它。" #. ~ Description for bird serum #: lang/json/COMESTIBLE_from_json.py @@ -18063,8 +18091,8 @@ msgid "" "A super-concentrated mutagen the color of the pre-cataclysmic skies. You " "need a syringe to inject it... if you really want to?" msgstr "" -"超浓缩的诱变剂，那种蓝色让你想起了大灾变之前的天空。你需要一个针管来注射……如" -"果你真的想用的话。" +"超浓缩的诱变剂，那种蓝色让你想起了大灾变之前的天空。你需要一个针管来注射...如" +"果你真的想使用它。" #. ~ Description for alpha serum #: lang/json/COMESTIBLE_from_json.py @@ -18101,12 +18129,12 @@ msgstr "高度浓缩的医疗用品。从分量来判断，应该通过注射来 #. ~ Description for maple pie #: lang/json/COMESTIBLE_from_json.py msgid "A sweet and delicious baked pie with pure maple syrup." -msgstr "香甜可口的纯枫树糖浆馅饼." +msgstr "一块美味的派，加了纯净的枫树糖浆烘烤制成。" #. ~ Description for sweet sausage #: lang/json/COMESTIBLE_from_json.py msgid "A sweet and delicious sausage." -msgstr "又香又甜的香肠." +msgstr "一块甜且香的香肠。" #. ~ Description for raspberry #: lang/json/COMESTIBLE_from_json.py @@ -18188,7 +18216,7 @@ msgid "" "A tender piece of meat perfectly seasoned with a thin sweet glaze and its " "veggie accompaniments. A gourmet dish that is both healthy, sweet and " "delicious." -msgstr "" +msgstr "一小块用糖裹起来的里脊肉，伴有蔬菜。健康美味。" #. ~ Description for soylent green shake #: lang/json/COMESTIBLE_from_json.py @@ -18203,8 +18231,8 @@ msgid "" "A thick and tasty beverage made from pure refined human protein and " "nutritious fruit. It has been supplemented with extra vitamins and minerals" msgstr "" -"由人类蛋白质粉和水果混合而成的营养丰富的美味饮料，口感醇厚。它已补充额外的维" -"生素和矿物质。" +"一份口感醇厚可口的饮料,使用纯净的精炼人类蛋白和天然水果制成，里面还添加了额外" +"的维生素和矿物质。" #. ~ Description for protein shake #: lang/json/COMESTIBLE_from_json.py @@ -18219,8 +18247,8 @@ msgid "" "A thick and tasty beverage made from pure refined protein and nutritious " "fruit. It has been supplemented with extra vitamins and minerals" msgstr "" -"由蛋白质粉和水果混合而成的营养丰富的美味饮料，口感醇厚。它已补充额外的维生素" -"和矿物质。" +"一份口感醇厚可口的饮料,使用纯净的精炼蛋白质粉和天然水果制成，里面还添加了额外" +"的维生素和矿物质。" #. ~ Description for bacon #: lang/json/COMESTIBLE_from_json.py @@ -18234,7 +18262,7 @@ msgstr "一片分量厚实的腌猪肉，超市里有卖，加热之后味道会 msgid "" "A thick syrup made of water and sugar strained through coffee grounds. Can " "be used to flavor many foods and beverages." -msgstr "水和糖和浓咖啡调制而成的粘稠糖浆，能用来给各种食物和饮料调味。" +msgstr "粘稠的咖啡糖浆，能用来给各种食物调味." #. ~ Description for sugar beet syrup #: lang/json/COMESTIBLE_from_json.py @@ -18282,7 +18310,7 @@ msgstr "" msgid "" "A traditional Mexican dish composed of a corn tortilla folded or rolled " "around a meat filling." -msgstr "一种传统的墨西哥食物，用玉米饼折叠或卷起肉馅所组成。" +msgstr "墨西哥传统料理，把肉馅夹在或卷在用玉米面或小麦面烙成的薄饼里制成。" #. ~ Description for chai tea #: lang/json/COMESTIBLE_from_json.py @@ -18376,12 +18404,12 @@ msgstr "" #. ~ Description for papaya #: lang/json/COMESTIBLE_from_json.py msgid "A very sweet and soft tropical fruit." -msgstr "香甜软嫩的热带水果，女性最爱" +msgstr "香甜软嫩的热带水果，女性最爱。" #. ~ Description for maple sap #: lang/json/COMESTIBLE_from_json.py msgid "A water and sugar solution that has been extracted from a maple tree." -msgstr "一种从枫树上提取的水和糖的混合溶液。" +msgstr "一些从枫树树液里提取出的混合物,基本上就是水和糖分." #. ~ Description for tainted fat #: lang/json/COMESTIBLE_from_json.py @@ -18451,7 +18479,7 @@ msgstr[0] "美国麦酒" #. ~ Description for apple #: lang/json/COMESTIBLE_from_json.py msgid "An apple a day keeps the doctor away." -msgstr "粉红的苹果，好吃又健康！特别是咬过一口的，有一种诱人的美感。" +msgstr "粉红的苹果，好吃又健康！特别是咬过一口的，有一种诱人的美感." #. ~ Description for onion #: lang/json/COMESTIBLE_from_json.py @@ -18844,7 +18872,7 @@ msgstr[0] "培根生菜番茄三明治" msgid "" "Baby cow food, appropriated for adult humans. Having been canned, this milk " "should last for a very long time." -msgstr "乳牛口粮，成人也可以食用。由于被密封，可以保持很长一段时间不过期。" +msgstr "乳牛口粮，成人也可以食用.由于被密封，可以保持很长一段时间不过期。" #. ~ Description for milk #: lang/json/COMESTIBLE_from_json.py @@ -18940,7 +18968,7 @@ msgstr "香烟形状的糖果棒。稍微比烟草香烟更健康，但依然有 msgid "" "Canned beans. A staple among canned goods, these are reputedly good for " "one's coronary health." -msgstr "罐装大豆。罐头食品的标志性产品，据说有利于冠动脉健康。" +msgstr "罐装大豆.一种罐装主食，有利于冠动脉健康." #. ~ Description for corn #: lang/json/COMESTIBLE_from_json.py @@ -19020,7 +19048,7 @@ msgstr "咖啡。每天早上来一杯，生活更清新。" #. ~ Description for cucumber #: lang/json/COMESTIBLE_from_json.py msgid "Come from the gourd family, not tasty but very juicy." -msgstr "葫芦科植物，不好吃但非常多汁。当然也有邪恶的用途……嗯，切片炒一炒。" +msgstr "葫芦科植物，不好吃但非常多汁。当然也有邪恶的用途...嗯，切片炒一炒。" #. ~ Description for concentrated acid #: lang/json/COMESTIBLE_from_json.py @@ -19044,6 +19072,9 @@ msgid "" "and demanding soldiers alike. Like most PRM products it is designed for " "short-term use only, and may upset the body's balance." msgstr "" +"装着许多充能后的有机化合物。这个三层的泥浆状物可能很难咽下去，但是确实可以提" +"供明显的耐力提升，通常为运动员和士兵使用。就像其他的PRM产品一样，这个是用来短" +"期使用的，并且会打算身体的平衡。" #. ~ Description for V8 #: lang/json/COMESTIBLE_from_json.py @@ -19082,7 +19113,7 @@ msgstr "嘎嘣脆的美味华夫饼浇上枫糖浆，配上巧克力使它更甜 #. ~ Description for malted milk ball #: lang/json/COMESTIBLE_from_json.py msgid "Crunchy sugar in chocolate capsules. Legal and stimmy." -msgstr "巧克力包裹着麦芽糖，味道好极了" +msgstr "巧克力包裹着麦芽糖，味道好极了。" #. ~ Description for cocaine #: lang/json/COMESTIBLE_from_json.py @@ -19291,7 +19322,7 @@ msgstr "热带植物的晒干的叶子，可以当茶叶泡，还可以直接嚼 #. ~ Description for dried mushroom #: lang/json/COMESTIBLE_from_json.py msgid "Dried mushrooms are a tasty and healthy addition to many meals." -msgstr "干香菇是一种美味的健康的食物，而且也是许多大餐的配菜。" +msgstr "干香菇是一种美味的健康的食物，嗯..." #. ~ Description for dried salad #: lang/json/COMESTIBLE_from_json.py @@ -19329,7 +19360,7 @@ msgstr "" #. ~ Description for cracker #: lang/json/COMESTIBLE_from_json.py msgid "Dry and salty, these crackers will leave you quite thirsty." -msgstr "这些又干又咸的饼干会让你感到非常口渴" +msgstr "这些又干又咸的饼干会让你感到非常口渴。" #. ~ Description for graham cracker #: lang/json/COMESTIBLE_from_json.py @@ -19373,8 +19404,8 @@ msgid "" "candy form. An option of last resort when a balanced diet is not possible. " "Excess use can cause hypervitaminosis." msgstr "" -"水果口味耐嚼树脂糖形式的基本膳食营养.是无法平衡饮食时的最后手段.过量使用可引" -"起维生素过多症." +"水果口味耐嚼树脂糖形式的基本膳食营养。当饮食营养不均衡时的最终解决方案，过多" +"使用会导致维生素过多症。" #. ~ Description for multivitamin #: lang/json/COMESTIBLE_from_json.py @@ -19383,8 +19414,10 @@ msgid "" "of last resort when a balanced diet is not possible. Excess use can cause " "hypervitaminosis." msgstr "" -"身体必需的各种膳食营养成分被方便地包装成丸状。是无法平衡饮食时的最后手段。过" -"量使用可引起维生素过多症。" +"上面写着基本膳食营养素补充片，一阵头晕之后你觉得这东西叫复合维生素药片比较" +"好。不能保证健康饮食情况下的最后手段。说明书上那些长的吓人的医学名词让你很是" +"感到头大，大概意思是说过量服用会导致维生素摄入过多症，为什么这些药厂就是不肯" +"说人话呢?" #: lang/json/COMESTIBLE_from_json.py msgid "European pilsner" @@ -19402,24 +19435,22 @@ msgstr "" msgid "" "Fermented, but not distilled moonshine. Contains all the contaminants you " "don't want in your moonshine." -msgstr "" -"已经过发酵，但尚未经过蒸馏的私酿威士忌。包含所有你不想留在你的私酿威士忌里的" -"杂质。" +msgstr "发酵完,但是还没蒸馏的私酒。包含了所有你不想要的酒品污染物." #. ~ Description for rum wash #: lang/json/COMESTIBLE_from_json.py msgid "Fermented, but not distilled rum. No longer tastes sweet." -msgstr "已经过发酵，但尚未经过蒸馏的朗姆酒。尝起来不再甜蜜。" +msgstr "发酵完,但是还没蒸馏的朗姆酒。再也不会尝起来很甜了。" #. ~ Description for vodka wash #: lang/json/COMESTIBLE_from_json.py msgid "Fermented, but not distilled vodka. No longer tastes sweet." -msgstr "已经过发酵，但尚未经过蒸馏的伏特加。尝起来不再甜蜜。" +msgstr "发酵完,但是还没蒸馏的伏特加。再也不会尝起来很甜了." #. ~ Description for whiskey wash #: lang/json/COMESTIBLE_from_json.py msgid "Fermented, but not distilled whiskey. No longer tastes sweet." -msgstr "已经过发酵，但尚未经过蒸馏的威士忌。尝起来不再甜蜜。" +msgstr "发酵完但是没有蒸馏过的威士忌。再也不会尝到甜甜的口感了." #. ~ Description for brioche #: lang/json/COMESTIBLE_from_json.py @@ -19435,7 +19466,7 @@ msgstr "真空包装的腌制鱼肉片，很咸但是在紧要关头也很美味 #. ~ Description for pickled herring #: lang/json/COMESTIBLE_from_json.py msgid "Fish fillets pickled in some sort of tangy white sauce." -msgstr "鱼肉片腌制在某种浓郁白色酱汁的罐头。" +msgstr "一罐鱼子酱腌在白色酱汁中." #. ~ Description for wastebread #: lang/json/COMESTIBLE_from_json.py @@ -19471,12 +19502,12 @@ msgstr "用枫糖浆做的的松软又美味的煎饼" msgid "" "Fluffy and delicious scrambled eggs made more delicious with the addition of " "other tasty ingredients." -msgstr "蓬松美味的摊鸡蛋，再加上一些配料，好吃!" +msgstr "蓬松美味的摊鸡蛋，再加上一些配料，好吃！" #. ~ Description for scrambled eggs #: lang/json/COMESTIBLE_from_json.py msgid "Fluffy and delicious scrambled eggs." -msgstr "蓬松而美味的炒鸡蛋。" +msgstr "美味的煎鸡蛋." #. ~ Description for cotton balls #: lang/json/COMESTIBLE_from_json.py @@ -19503,7 +19534,7 @@ msgstr "新鲜的蓝莓，用糖煮熟后可以保存的更久。" #. ~ Description for fruit jam #: lang/json/COMESTIBLE_from_json.py msgid "Fresh fruit, cooked with sugar to make them last longer." -msgstr "新鲜水果，加糖熬煮使保质期更长" +msgstr "新鲜水果，加糖熬煮使保质期更长。" #. ~ Description for strawberry jam #: lang/json/COMESTIBLE_from_json.py @@ -19569,7 +19600,7 @@ msgstr "新鲜的肉再加上高超的手艺，就成了这道营养的美食。 #. ~ Description for fruit juice #: lang/json/COMESTIBLE_from_json.py msgid "Freshly-squeezed from real fruit! Tasty and nutritious." -msgstr "从新鲜水果中榨取，营养又好吃" +msgstr "从新鲜水果中榨取，营养又好吃。" #. ~ Description for orange juice #: lang/json/COMESTIBLE_from_json.py @@ -19613,7 +19644,7 @@ msgstr "\"油腻矿工\"开发出的猪肉黄豆罐头。精选山核桃木熏 #. ~ Description for black pepper #: lang/json/COMESTIBLE_from_json.py msgid "Ground black spice berries with a pungent aroma." -msgstr "辛辣的黑浆果调味品" +msgstr "辛辣的黑浆果调味品。" #. ~ Description for cinnamon #: lang/json/COMESTIBLE_from_json.py @@ -19688,8 +19719,8 @@ msgid "" "better than the Marloss. If they didn't reject it for its alien origins. " "But we know better." msgstr "" -"人类也许称其为美味灰苹果：又大又灰，闻起来马洛斯莓更香。要不是他们因为这是异" -"界起源而排斥它。但我们更清楚。" +"人类也许称其为美味灰苹果：又大又灰，闻起来比马洛斯莓更香。如果不排斥它的变异" +"起源，它还会更受欢迎。" #. ~ Description for berry-shaped anomaly #: lang/json/COMESTIBLE_from_json.py @@ -19807,7 +19838,7 @@ msgstr "果肉榨汁后剩下的果肉渣。不太好吃，但富含有益身体 msgid "" "Lemon juice mixed with water and sugar to dull the sourness. Delicious and " "refreshing." -msgstr "柠檬汁、糖、水的混合液体，美味爽口又解渴" +msgstr "柠檬汁、糖、水的混合液体，美味爽口又解渴。" #. ~ Description for wild apple #: lang/json/COMESTIBLE_from_json.py @@ -19880,7 +19911,6 @@ msgid "Made from real Massachusetts cranberries. Delicious and nutritious." msgstr "由真正马萨诸塞州蔓越莓制成，原汁原味，味道鲜美，营养丰富。" #. ~ Description for whiskey -#. ~ Description for test_whiskey #: lang/json/COMESTIBLE_from_json.py msgid "Made from, by, and for real Southern colonels!" msgstr "由南方殖民者为您倾情奉献，纯正威士忌。" @@ -19900,7 +19930,7 @@ msgstr "人肉香肠泡在咖喱酱里。香辣美味！" #: lang/json/COMESTIBLE_from_json.py msgid "Mannwurst gravy" msgid_plural "Mannwurst gravies" -msgstr[0] "人肉综合粥" +msgstr[0] "香人肠肉汁" #. ~ Description for joint #: lang/json/COMESTIBLE_from_json.py @@ -19963,8 +19993,8 @@ msgid "" "health, it was once a favorite amongst baseball players, cowboys, and other " "macho types." msgstr "" -"薄荷味的咀嚼烟草。虽然对你的健康十分不利，它曾经是棒球运动员，牛仔，或者其他" -"的男子汉最喜欢的食品之一。" +"薄荷味的咀嚼烟草，对你的健康十分不利，曾经是棒球运动员，牛仔，或者其他的男子" +"汉喜欢的食品." #. ~ Description for nicotine gum #: lang/json/COMESTIBLE_from_json.py @@ -20052,7 +20082,7 @@ msgstr "没有比这更好的饮料了，而你拥有了它，但是，嘿，这 msgid "" "Not very nutritious. Warning: contains calories, unsuitable for " "breatharians." -msgstr "没什么营养物质。警告：含卡路里，不适用于吸气节食者。" +msgstr "没什么营养物质。警告：含卡路里，西北风级减肥者慎用。" #. ~ Description for canned tuna fish #: lang/json/COMESTIBLE_from_json.py @@ -20154,14 +20184,14 @@ msgstr "用于大规模接种的流感疫苗，未开封。据说提供某种免 msgid "" "Pieces of poisonous meat that have been dried to prevent them from rotting " "away. It will still poison you if you eat this." -msgstr "脱水过的有毒肉片，以免其腐坏。仍然有毒，别乱吃。" +msgstr "脱水保存以避免烂个精光的受感染的肉，依旧有毒，不信邪的人可以吃吃看。" #. ~ Description for dehydrated tainted veggy #: lang/json/COMESTIBLE_from_json.py msgid "" "Pieces of poisonous veggy that have been dried to prevent them from rotting " "away. It will still poison you if you eat this." -msgstr "脱水过的有毒蔬菜，以免其腐坏。仍然有毒，别乱吃。" +msgstr "脱水保存以避免烂个精光的受感染的蔬菜，依旧有毒，不信邪的人可以吃吃看。" #. ~ Description for popcorn #: lang/json/COMESTIBLE_from_json.py @@ -20242,7 +20272,7 @@ msgstr "" #. ~ Description for cheese spread #: lang/json/COMESTIBLE_from_json.py msgid "Processed cheese spread." -msgstr "精制奶酪酱" +msgstr "精制奶酪酱。" #: lang/json/COMESTIBLE_from_json.py src/bionics.cpp msgid "Prozac" @@ -20364,7 +20394,7 @@ msgstr "什锦菜做成的蔬菜色拉。" #. ~ Description for seasoned salt #: lang/json/COMESTIBLE_from_json.py msgid "Salt mixed with a fragrant blend of secret herbs and spices." -msgstr "混合了一些神秘药草和香料的盐。" +msgstr "把盐混合在某种香料也药材里的调味品。" #. ~ Description for nachos with meat and cheese #: lang/json/COMESTIBLE_from_json.py @@ -20503,13 +20533,17 @@ msgstr "慢火烹制的豆子，配有一些蔬菜，美味又管饱。" #: lang/json/COMESTIBLE_from_json.py msgid "" "Small vials of dark yellow liquid containing soluble iron for injection." -msgstr "小瓶暗黄色的液体，含有可溶性铁元素的注射液。" +msgstr "" +"一个小玻璃西林瓶,里面的液体呈暗黄色,但却是澄清的,标签上说这东西含有水溶性铁," +"可以用于治疗缺铁性贫血,或者用于补铁." #. ~ Description for injectable vitamin B #: lang/json/COMESTIBLE_from_json.py msgid "" "Small vials of pale yellow liquid containing soluble vitamin B for injection." -msgstr "小瓶装的淡黄色液体，含有水溶性维生素B的注射液。" +msgstr "" +"一只装着淡黄色液体的小号玻璃西林瓶，你看了看标签，认出这里面是水溶性维生素B注" +"射液." #. ~ Description for datura seeds #: lang/json/COMESTIBLE_from_json.py @@ -20582,7 +20616,7 @@ msgstr "一些西兰花种子。" #. ~ Description for buckwheat seeds #: lang/json/COMESTIBLE_from_json.py msgid "Some buckwheat seeds. You could probably plant these." -msgstr "一些荞麦种子，可种植" +msgstr "一些荞麦种子，可种植。" #. ~ Description for canola seeds #: lang/json/COMESTIBLE_from_json.py @@ -20635,14 +20669,12 @@ msgstr "一些黄瓜种子。" msgid "" "Some damned fool put honey on this peanut butter sandwich, who in their " "right mind- oh wait this is pretty good." -msgstr "" -"一些傻瓜把蜂蜜涂在了花生酱三明治上，那个脑子正常的会……等等，其实这尝起来还不" -"错。" +msgstr "一些傻瓜把蜂蜜涂在了花生酱三明治上，这尝起来很.......美味？" #. ~ Description for dandelion seeds #: lang/json/COMESTIBLE_from_json.py msgid "Some dandelion seeds. You could probably plant these." -msgstr "一些蒲公英种子，可种植" +msgstr "一些蒲公英种子，可种植。" #. ~ Description for dogbane seeds #: lang/json/COMESTIBLE_from_json.py @@ -20738,7 +20770,7 @@ msgstr "一些向日葵种子。可以榨出油。" #. ~ Description for rhubarb stems #: lang/json/COMESTIBLE_from_json.py msgid "Some rhubarb stems. You could probably plant these." -msgstr "一些大黄根茎，可种植" +msgstr "一些大黄根茎，可种植。" #. ~ Description for roasted coffee beans #: lang/json/COMESTIBLE_from_json.py @@ -20788,7 +20820,7 @@ msgstr "一些白卷心菜的种子。" #. ~ Description for wild vegetable stems #: lang/json/COMESTIBLE_from_json.py msgid "Some wild vegetable stems. You could probably plant these." -msgstr "一些野菜茎干，可种植" +msgstr "一些野菜茎干，可种植。" #. ~ Description for zucchini seed #: lang/json/COMESTIBLE_from_json.py @@ -20803,7 +20835,7 @@ msgstr "酸味红色浆果，对健康有益。" #. ~ Description for rhubarb #: lang/json/COMESTIBLE_from_json.py msgid "Sour stems of the rhubarb plant, often used in baking pies." -msgstr "带酸味的大黄叶柄，烤馅饼时常用它" +msgstr "带酸味的大黄叶柄，烤馅饼时常用它。" #. ~ Description for scoundrel spaghetti #: lang/json/COMESTIBLE_from_json.py @@ -20916,7 +20948,7 @@ msgstr "甜甜的糖，不可以多吃哦，会坏牙齿的。" msgid "" "Sweetened coffee and whiskey topped with milk. Start your day the closeted " "alcoholic way!" -msgstr "加了糖的咖啡和威士忌配上牛奶，开始你一整天的酒鬼生活." +msgstr "加糖咖啡喝威士忌的混合，还加了奶沫，开始你一整天的酒鬼生活吧！" #. ~ Description for Prussian blue tablet #: lang/json/COMESTIBLE_from_json.py @@ -20940,12 +20972,12 @@ msgstr "从松果里剥出来的松籽，又香又脆。" #. ~ Description for smoked fish #: lang/json/COMESTIBLE_from_json.py msgid "Tasty fish that has been heavily smoked for long term preservation." -msgstr "美味的熏鱼，为了保证质量经过烟熏处理，可以长期保存。" +msgstr "美味的熏鱼，为了保证质量经过烟熏处理，可以长期保存." #. ~ Description for smoked meat #: lang/json/COMESTIBLE_from_json.py msgid "Tasty meat that has been heavily smoked for long term preservation." -msgstr "美味的熏肉，为了保证质量经过烟熏处理，可以长期保存。" +msgstr "美味的熏肉，为了保证质量经过烟熏处理，可以长期保存." #. ~ Description for strawberry #: lang/json/COMESTIBLE_from_json.py @@ -21058,7 +21090,7 @@ msgstr "" #. ~ Description for cooking oil #: lang/json/COMESTIBLE_from_json.py msgid "Thin yellow vegetable oil used for cooking." -msgstr "淡黄色烹饪菜油" +msgstr "淡黄色烹饪菜油。" #. ~ Description for dark cola #: lang/json/COMESTIBLE_from_json.py @@ -21078,7 +21110,7 @@ msgstr "" #. ~ Description for bone meal #: lang/json/COMESTIBLE_from_json.py msgid "This bone meal is useful for fertilizing plants." -msgstr "这些骨粉是很好的植物肥料。" +msgstr "这些骨粉是很好的植物肥料." #. ~ Description for chitin powder #: lang/json/COMESTIBLE_from_json.py @@ -21139,6 +21171,8 @@ msgid "" "This golden, translucent leaf candy is made with pure maple syrup and melt " "slowly as you savor the taste of real maple." msgstr "" +"这种金黄色半透明的叶状糖果是由纯纯的枫树糖浆制作的，在你品尝正宗枫树的香味时" +"慢慢融化。" #. ~ Description for bobburger #: lang/json/COMESTIBLE_from_json.py @@ -21340,7 +21374,9 @@ msgstr "番茄酱，好吃，就是吃不够！" msgid "" "Uncooked internal organs and entrails. Unappealing to eat but filled with " "essential vitamins." -msgstr "生的器官和内脏。看着很难吃但充满了必需的维生素。" +msgstr "" +"直接挖出来没烹饪的内脏。生的,你一点也不想吃这玩意，但里面含有人体所需的维生" +"素." #. ~ Description for pomegranate #: lang/json/COMESTIBLE_from_json.py @@ -21381,8 +21417,7 @@ msgstr "" msgid "" "Unfermented moonshine. Just some water, sugar and corn, like good ol' " "aunt's recipe." -msgstr "" -"未发酵的私酿威士忌。只是一些水，糖和玉米粉的混合物；就像老姑妈的食谱一样。" +msgstr "未发酵的月光酒。只是一些水，糖和玉米粉的混合物；就像老姑妈的食谱一样。" #. ~ Description for pine wine must #: lang/json/COMESTIBLE_from_json.py @@ -21401,14 +21436,16 @@ msgstr "未发酵的朗姆酒。焦糖或糖蜜煮成的甜水。基本上就是 #. ~ Description for spiced mead must #: lang/json/COMESTIBLE_from_json.py msgid "Unfermented spiced mead. Dilluted honey and yeast." -msgstr "未发酵的香蜜酒。被水稀释的蜂蜜和酵母的混合物。" +msgstr "未发酵的香蜜酒。冲淡了的蜂蜜加酵母。" #. ~ Description for vodka wort #: lang/json/COMESTIBLE_from_json.py msgid "" "Unfermented vodka. Water with sugar from enzymatic breakdown of malted " "grains or just added in pure form." -msgstr "未发酵的伏特加。发芽的谷物加入酶而酶解成糖，或直接加入纯糖的糖水。" +msgstr "" +"没发酵的伏特加。由发芽的谷子被酶分解出的水和糖制成，或者直接用水和糖混一份出" +"来也成." #. ~ Description for whiskey wort #: lang/json/COMESTIBLE_from_json.py @@ -21437,8 +21474,8 @@ msgstr "与可乐不同此产品不含咖啡因，但仍含有许多碳酸和糖 msgid "" "Usually consumed in the mornings, milk tea is common among many countries." msgstr "" -"通常都在早上喝，许多国家都有喝奶茶的习俗。——译者：这个当然是正宗的咸味奶茶，" -"甜党不服可以来揍我。" +"通常都在早上喝，许多国家都有喝奶茶的习俗。——译注：这个当然是正宗的咸味奶茶，" +"甜党不服可以来揍我。——by 五毛" #: lang/json/COMESTIBLE_from_json.py msgid "V8" @@ -21522,12 +21559,13 @@ msgstr "上面覆盖着奶酪的通心粉，好香啊！" msgid "" "Who knew you could mix maple syrup and peanut butter to create yet another " "different sandwich?" -msgstr "谁知道你可以混合枫糖浆和花生黄油来创造又一种不同的三明治吗？" +msgstr "" +"把蛋黄酱和枫树糖浆混合起来，除了制作出了新的三明治，在制作出了你这个“天才”。" #. ~ Description for powdered egg #: lang/json/COMESTIBLE_from_json.py msgid "Whole fresh eggs, dehydrated into an easy to store powder." -msgstr "把新鲜鸡蛋脱水后变的更容易存储的粉末。" +msgstr "把新鲜鸡蛋，脱水后变的更容易存储。" #. ~ Description for fried dandelions #: lang/json/COMESTIBLE_from_json.py @@ -21584,12 +21622,13 @@ msgstr "你服用了摇头丸。" #. ~ Use action activation_message for injectable iron. #: lang/json/COMESTIBLE_from_json.py msgid "You inject some iron." -msgstr "你注射了一些铁补充剂。" +msgstr "嗷,你往身体里注射了一些深黄色的液体。你注射了一只补铁注射液." #. ~ Use action activation_message for injectable vitamin B. #: lang/json/COMESTIBLE_from_json.py msgid "You inject some vitamin B." -msgstr "你注射了一些维生素B。" +msgstr "" +"啊♂嗯,一些有着谷物香气的液体注入了你的身体。你注射了一只维生素B注射剂。" #. ~ Use action activation_message for heroin. #. ~ Use action activation_message for morphine. @@ -21651,12 +21690,12 @@ msgstr "你服用了一剂曲马朵。" #: lang/json/COMESTIBLE_from_json.py #, no-python-format msgid "You take the %s." -msgstr "" +msgstr "你服用了 %s 。" #. ~ Use action activation_message for sewagas inhaler. #: lang/json/COMESTIBLE_from_json.py msgid "You use your sewer gas inhaler." -msgstr "你使用了你的下水道气吸入剂。" +msgstr "你使用了你的水道气吸入剂。" #. ~ Description for salt #: lang/json/COMESTIBLE_from_json.py @@ -21669,7 +21708,7 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "abstract mutagen flavor" msgid_plural "abstract mutagen flavors" -msgstr[0] "" +msgstr[0] "虚拟诱变剂风味" #: lang/json/COMESTIBLE_from_json.py msgid "acid water" @@ -22588,7 +22627,7 @@ msgstr[0] "煮内脏" #: lang/json/COMESTIBLE_from_json.py msgid "cooked plant marrow" msgid_plural "cooked plant marrows" -msgstr[0] "烧熟西葫芦" +msgstr[0] "烧熟植物精华" #: lang/json/COMESTIBLE_from_json.py msgid "cooked rice" @@ -22920,7 +22959,7 @@ msgstr[0] "方便沙拉" #: lang/json/COMESTIBLE_from_json.py msgid "dudeluxe sandwich" msgid_plural "dudeluxe sandwiches" -msgstr[0] "特级人肉三明治" +msgstr[0] "特级仨明治" #: lang/json/COMESTIBLE_from_json.py msgid "eggnog" @@ -22940,7 +22979,7 @@ msgstr[0] "精灵诱变血清" #: lang/json/COMESTIBLE_from_json.py msgid "elfa mutagen" msgid_plural "elfa mutagens" -msgstr[0] "" +msgstr[0] "精灵诱变剂" #: lang/json/COMESTIBLE_from_json.py msgid "energy cola" @@ -23040,12 +23079,12 @@ msgstr[0] "森林蜂蜜" #: lang/json/COMESTIBLE_from_json.py msgid "fortified protein shake" msgid_plural "fortified protein shakes" -msgstr[0] "增强型蛋白混合饮料" +msgstr[0] "蛋白饮品增强型" #: lang/json/COMESTIBLE_from_json.py msgid "fortified soylent green shake" msgid_plural "fortified soylent green shakes" -msgstr[0] "增强型替代蛋白混合饮料" +msgstr[0] "强化双鹿蛋白混合饮料" #: lang/json/COMESTIBLE_from_json.py msgid "fried SPAM" @@ -23159,7 +23198,7 @@ msgstr[0] "琴酒" #: lang/json/COMESTIBLE_from_json.py msgid "glazed tenderloins" msgid_plural "glazed tenderloinss" -msgstr[0] "" +msgstr[0] "糖裹里脊" #: lang/json/COMESTIBLE_from_json.py msgid "graham cracker" @@ -23194,7 +23233,7 @@ msgstr[0] "烤奶酪三明治" #: lang/json/COMESTIBLE_from_json.py msgid "gummy vitamin" msgid_plural "gummy vitamins" -msgstr[0] "维生素树脂糖" +msgstr[0] "维他命树脂糖" #: lang/json/COMESTIBLE_from_json.py msgid "haggis" @@ -23353,12 +23392,12 @@ msgstr[0] "生黑啤" #: lang/json/COMESTIBLE_from_json.py msgid "injectable iron" msgid_plural "injectable irons" -msgstr[0] "注射用铁补充剂" +msgstr[0] "补铁注射液" #: lang/json/COMESTIBLE_from_json.py msgid "injectable vitamin B" msgid_plural "injectable vitamin Bs" -msgstr[0] "注射用维生素B" +msgstr[0] "维生素B族注射液" #: lang/json/COMESTIBLE_from_json.py msgid "insect mutagen" @@ -23373,7 +23412,7 @@ msgstr[0] "昆虫诱变血清" #: lang/json/COMESTIBLE_from_json.py msgid "insta-salad" msgid_plural "insta-salads" -msgstr[0] "方便沙拉" +msgstr[0] "泡好的方便沙拉" #: lang/json/COMESTIBLE_from_json.py msgid "irradiated apple" @@ -23743,12 +23782,12 @@ msgstr[0] "仨明治" #: lang/json/COMESTIBLE_from_json.py msgid "maple pie" msgid_plural "maple pies" -msgstr[0] "枫糖馅饼" +msgstr[0] "枫树派" #: lang/json/COMESTIBLE_from_json.py msgid "maple sap" msgid_plural "maple sap" -msgstr[0] "枫树树汁" +msgstr[0] "枫树汁液" #: lang/json/COMESTIBLE_from_json.py msgid "maple syrup" @@ -23758,7 +23797,7 @@ msgstr[0] "枫树糖浆" #: lang/json/COMESTIBLE_from_json.py msgid "maple syrup candy" msgid_plural "maple syrup candies" -msgstr[0] "" +msgstr[0] "枫树糖浆糖果" #: lang/json/COMESTIBLE_from_json.py msgid "marijuana" @@ -23853,7 +23892,7 @@ msgstr[0] "医♂学诱变血清" #: lang/json/COMESTIBLE_from_json.py msgid "medikit" msgid_plural "medikits" -msgstr[0] "" +msgstr[0] "医疗包" #: lang/json/COMESTIBLE_from_json.py msgid "melon" @@ -23903,7 +23942,7 @@ msgstr[0] "私酿威士忌原汁" #: lang/json/COMESTIBLE_from_json.py msgid "moonshine wash" msgid_plural "moonshine washes" -msgstr[0] "私酿威士忌淡酒" +msgstr[0] "未蒸馏的玉米私酒" #: lang/json/COMESTIBLE_from_json.py msgid "morel mushroom" @@ -23938,7 +23977,7 @@ msgstr[0] "艾草种子" #: lang/json/COMESTIBLE_from_json.py msgid "multivitamin" msgid_plural "multivitamins" -msgstr[0] "复合维生素" +msgstr[0] "复方维生素片" #: lang/json/COMESTIBLE_from_json.py msgid "mushroom" @@ -23953,7 +23992,7 @@ msgstr[0] "蘑菇汤" #: lang/json/COMESTIBLE_from_json.py msgid "mushroom spores" msgid_plural "mushroom spores" -msgstr[0] "杂菌菇" +msgstr[0] "杂菌菇孢子" #: lang/json/COMESTIBLE_from_json.py msgid "mustard" @@ -24218,7 +24257,7 @@ msgstr[0] "黑皮諾葡萄酒" #: lang/json/COMESTIBLE_from_json.py msgid "plant marrow" msgid_plural "plant marrows" -msgstr[0] "西葫芦" +msgstr[0] "植物精华" #: lang/json/COMESTIBLE_from_json.py msgid "plant mutagen" @@ -24283,7 +24322,7 @@ msgstr[0] "胡吹乱侃披萨" #: lang/json/COMESTIBLE_from_json.py msgid "potassium iodide tablet" msgid_plural "potassium iodide tablets" -msgstr[0] "碘片" +msgstr[0] "碘化钾片" #: lang/json/COMESTIBLE_from_json.py msgid "potato chips" @@ -24447,7 +24486,7 @@ msgstr[0] "生意大利面" #: lang/json/COMESTIBLE_from_json.py msgid "razorclaw roe" msgid_plural "razorclaw roes" -msgstr[0] "" +msgstr[0] "利爪怪鱼子酱" #: lang/json/COMESTIBLE_from_json.py msgid "red potion" @@ -24552,7 +24591,7 @@ msgstr[0] "可乐朗姆酒" #: lang/json/COMESTIBLE_from_json.py msgid "rum wash" msgid_plural "rum washes" -msgstr[0] "朗姆酒淡酒" +msgstr[0] "未蒸馏的朗姆酒" #: lang/json/COMESTIBLE_from_json.py msgid "rum wort" @@ -24622,7 +24661,7 @@ msgstr[0] "杯具浓汤" #: lang/json/COMESTIBLE_from_json.py msgid "sashimi" msgid_plural "sashimi" -msgstr[0] "生鱼片" +msgstr[0] "鱼刺身" #: lang/json/COMESTIBLE_from_json.py msgid "sauerkraut" @@ -24664,6 +24703,11 @@ msgid "seasoned salt" msgid_plural "seasoned salt" msgstr[0] "调味盐" +#: lang/json/COMESTIBLE_from_json.py lang/json/furniture_from_json.py +msgid "seed" +msgid_plural "seeds" +msgstr[0] "种子" + #: lang/json/COMESTIBLE_from_json.py msgid "seed potato" msgid_plural "seed potatoes" @@ -24737,17 +24781,17 @@ msgstr[0] "酱油" #: lang/json/COMESTIBLE_from_json.py msgid "soylent green" msgid_plural "soylent green drinks" -msgstr[0] "替代蛋白饮料" +msgstr[0] "双鹿蛋白饮料" #: lang/json/COMESTIBLE_from_json.py msgid "soylent green powder" msgid_plural "servings of soylent green powder" -msgstr[0] "替代蛋白粉" +msgstr[0] "双鹿蛋白粉" #: lang/json/COMESTIBLE_from_json.py msgid "soylent green shake" msgid_plural "soylent green shakes" -msgstr[0] "替代蛋白混合饮料" +msgstr[0] "双鹿蛋白混合饮料" #: lang/json/COMESTIBLE_from_json.py msgid "soylent slice" @@ -24812,7 +24856,7 @@ msgstr[0] "运动饮料" #: lang/json/COMESTIBLE_from_json.py msgid "stamina vial" msgid_plural "stamina vials" -msgstr[0] "" +msgstr[0] "耐力小药瓶" #: lang/json/COMESTIBLE_from_json.py msgid "starch" @@ -24936,12 +24980,12 @@ msgstr[0] "被感染的脂肪" #: lang/json/COMESTIBLE_from_json.py msgid "tainted hide" msgid_plural "tainted hides" -msgstr[0] "污染的生皮" +msgstr[0] "被感染的生皮" #: lang/json/COMESTIBLE_from_json.py msgid "tainted pelt" msgid_plural "tainted pelts" -msgstr[0] "被污染的毛皮" +msgstr[0] "被感染的毛皮" #: lang/json/COMESTIBLE_from_json.py msgid "tainted tallow" @@ -24956,7 +25000,7 @@ msgstr[0] "感染龙卷风" #: lang/json/COMESTIBLE_from_json.py msgid "tainted veggie" msgid_plural "tainted veggies" -msgstr[0] "被感染的蔬菜" +msgstr[0] "感染蔬菜" #: lang/json/COMESTIBLE_from_json.py msgid "tallow" @@ -24978,11 +25022,6 @@ msgid "tequila" msgid_plural "tequilas" msgstr[0] "龙舌兰酒" -#: lang/json/COMESTIBLE_from_json.py -msgid "test_whiskey" -msgid_plural "test_whiskey" -msgstr[0] "测试用威士忌" - #: lang/json/COMESTIBLE_from_json.py msgid "thyme" msgid_plural "thymes" @@ -25141,7 +25180,7 @@ msgstr[0] "伏特加" #: lang/json/COMESTIBLE_from_json.py msgid "vodka wash" msgid_plural "vodka washes" -msgstr[0] "伏特加淡酒" +msgstr[0] "未蒸馏的伏特加" #: lang/json/COMESTIBLE_from_json.py msgid "vodka wort" @@ -25216,7 +25255,7 @@ msgstr[0] "威士忌酸酒" #: lang/json/COMESTIBLE_from_json.py msgid "whiskey wash" msgid_plural "whiskey washes" -msgstr[0] "威士忌淡酒" +msgstr[0] "未蒸馏的威士忌" #: lang/json/COMESTIBLE_from_json.py msgid "whiskey wort" @@ -25376,9 +25415,10 @@ msgid "" "flowers, holding gift baskets, containing a fruit basket and herbs, loose " "item storage or as an ice bucket." msgstr "" -"一只镀锌的水桶，可用来装花生、冰镇白酒、冰镇啤酒、龙虾、蟹腿、法式薯条、动物" -"饲料，农用，追尾，制造物品，种植花草，装礼品篮，装水果篮和草本植物，松散的储" -"存物品或是用作冰桶。" +"一只镀锌铁皮做的花园桶,包括但不限于装花生,冰镇葡萄酒,冰镇啤酒,装龙虾,蟹腿,薯" +"条,动物饲料,农用,车尾即兴小party,工艺制作,花卉种植,礼品包装,做水果篮或草药篮," +"随手物品筐或者简单的当冰桶来用,还可以拿它作为应急马桶或者拿来挡住光头免得警卫" +"起疑等等等等超常规的用途." #. ~ Description for aluminum foil wrap #: lang/json/CONTAINER_from_json.py @@ -25500,7 +25540,7 @@ msgstr "" #. ~ Description for cardboard box #: lang/json/CONTAINER_from_json.py msgid "A small cardboard box. No bigger than a foot in dimension." -msgstr "一个小纸箱。" +msgstr "一个小纸箱。尺寸不大于一英寸。" #. ~ Description for metal tank (2L) #: lang/json/CONTAINER_from_json.py @@ -25555,7 +25595,7 @@ msgstr "一个有金属螺旋盖的3升玻璃罐，一般用于罐头。宜家 #. ~ Description for tin can #: lang/json/CONTAINER_from_json.py msgid "A tin can, like what beans come in." -msgstr "一个锡罐，就像装豆子的那种。" +msgstr "一个锡罐，就像装豆子的那种." #. ~ Description for vortex generator #: lang/json/CONTAINER_from_json.py @@ -25606,15 +25646,10 @@ msgid "" "A watertight leather bag with a carrying strap, can hold 3 liters of water." msgstr "防水皮革袋，可装3升水。" -#. ~ Description for test glass bottle -#: lang/json/CONTAINER_from_json.py -msgid "An UNSEALABLE glass bottle, holds 750 ml of liquid." -msgstr "无法再密封的玻璃瓶，能容纳750毫升的液体。" - #. ~ Description for aluminum can #: lang/json/CONTAINER_from_json.py msgid "An aluminum can, like what soda comes in." -msgstr "一个铝罐，好像有些苏打水在里面" +msgstr "一个铝罐，就是一般装着苏打水的那种。" #. ~ Description for paper wrapper #: lang/json/CONTAINER_from_json.py @@ -25679,7 +25714,7 @@ msgstr[0] "变形怪糊浓缩核心" #: lang/json/CONTAINER_from_json.py msgid "bucket" msgid_plural "buckets" -msgstr[0] "水桶" +msgstr[0] "铁皮桶" #: lang/json/CONTAINER_from_json.py msgid "canvas bag" @@ -25851,11 +25886,6 @@ msgid "steel jerrycan" msgid_plural "steel jerrycans" msgstr[0] "钢制油罐" -#: lang/json/CONTAINER_from_json.py -msgid "test glass bottle" -msgid_plural "test glass bottles" -msgstr[0] "测量烧瓶" - #: lang/json/CONTAINER_from_json.py msgid "tin can" msgid_plural "tin cans" @@ -26089,17 +26119,6 @@ msgstr "" "MRE作战口粮，包括一份遭天杀的热狗主菜和饿到精神失常的求生者需要的所有东西。开" "封之后会开始腐败。拆解它以获取内容物。" -#. ~ Description for car battery -#: lang/json/GENERIC_from_json.py -msgid "A 12v lead-acid battery used to power car electrical systems." -msgstr "一个12伏铅酸蓄电池，通常用于一般车辆的电力系统。" - -#. ~ Description for motorbike battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A 12v lead-acid battery used to power smaller vehicles' electrical systems." -msgstr "一个12伏铅酸蓄电池，通常用于小型车辆的电力系统。" - #. ~ Description for long rope #: lang/json/GENERIC_from_json.py msgid "" @@ -26145,7 +26164,7 @@ msgstr "在棒球棒的头部缠绕了几道尖利的铁丝。看起来就感到 msgid "" "A baseball, good for throwing at enemies. Getting hit with one of these " "hurts a lot more than you might think." -msgstr "一个普通的棒球，可以将其掷出，如果击中的话威力超乎你的想象" +msgstr "一个普通的棒球，可以将其掷出，如果击中的话威力超乎你的想象。" #. ~ Description for Mosin-Nagant classic conversion kit #: lang/json/GENERIC_from_json.py @@ -26154,7 +26173,7 @@ msgid "" "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." msgstr "" -"一个可支撑普通的莫辛纳甘步枪的精美的木制枪托及相关配件。若有枪械工具以及对应" +"一个可支撑普通的莫辛纳甘步枪的精美的木质枪托及相关配件。若有枪械工具以及对应" "技能，花费数个小时可以将一把\"战术酷\"步枪改装成经典俄式设计。" #. ~ Description for Kevlar dog harness @@ -26194,7 +26213,8 @@ msgstr "" msgid "" "A broken C-4 hack. Much less threatening now that it lies quiet on solid " "ground. Could be gutted for parts." -msgstr "一个损坏的C-4炸弹无人机。散在地上，已经没啥用了。可以拆解得到部件。" +msgstr "" +"一个损坏的C-4炸弹无人机。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #. ~ Description for broken EMP hack #: lang/json/GENERIC_from_json.py @@ -26202,7 +26222,8 @@ msgid "" "A broken EMP hack. Much less threatening now that it lies quiet on solid " "ground. Could be gutted for parts." msgstr "" -"一个损坏的EMP电磁脉冲无人机。散在地上，已经没啥用了。可以拆解得到部件。" +"一个损坏的EMP电磁脉冲无人机。现在安静的散在地上构不成威胁了。可以拆解得到部" +"件。" #. ~ Description for broken animatronic bat #: lang/json/GENERIC_from_json.py @@ -26361,21 +26382,25 @@ msgstr "" msgid "" "A broken eyebot. Much less threatening now that it won't be calling for " "backup. Could be gutted for parts." -msgstr "一个损坏的眼球机器人。看起来没什么威胁安静的躺在地上。拆开看看？" +msgstr "" +"一个损坏的眼球机器人。因为再也不能呼叫支援所以不再构成威胁。可以拆解得到部" +"件。" #. ~ Description for broken flashbang hack #: lang/json/GENERIC_from_json.py msgid "" "A broken flashbang hack. Much less threatening now that it lies quiet on " "solid ground. Could be gutted for parts." -msgstr "一个损坏的闪光弹无人机。散在地上，已经没啥用了。可以拆解得到部件。" +msgstr "" +"一个损坏的闪光弹无人机。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #. ~ Description for broken grenade hack #: lang/json/GENERIC_from_json.py msgid "" "A broken grenade hack. Much less threatening now that it lies quiet on " "solid ground. Could be gutted for parts." -msgstr "一个损坏的榴弹无人机。散在地上，已经没啥用了。可以拆解得到部件。" +msgstr "" +"一个损坏的榴弹无人机。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #. ~ Description for laptop computer #: lang/json/GENERIC_from_json.py @@ -26394,7 +26419,8 @@ msgstr "一个损坏的红色无人机。光是看着它就让你浑身发抖。 msgid "" "A broken manhack. Much less threatening now that it lies limp on solid " "ground. Could be gutted for parts." -msgstr "一个损坏的飞锯无人机。看起来没什么威胁。可以拆解得到部件。" +msgstr "" +"一个损坏的飞锯无人机。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #. ~ Description for broken marionette #: lang/json/GENERIC_from_json.py @@ -26406,21 +26432,24 @@ msgstr "一件损坏的木偶，看着很吓人。" msgid "" "A broken miner bot. Much less threatening now that it's no longer capable " "of drilling anything. Could be gutted for parts." -msgstr "一个损坏的蛇形机器人。看起来没什么威胁安静的躺在地上。拆开看看？" +msgstr "" +"一个损坏的蛇形机器人。看起来没什么威胁，因为现在它再也钻不了各种花花草草了。" +"可以拆解得到部件。" #. ~ Description for broken police bot #: lang/json/GENERIC_from_json.py msgid "" "A broken police bot. Much less threatening now that it's quiet and still. " "Could be gutted for parts." -msgstr "一个损坏的警用机器人。看起来没什么威胁安静的躺在地上。拆开看看？" +msgstr "" +"一个损坏的警用机器人。看起来没什么威胁安静的躺在地上。可以拆解得到部件。" #. ~ Description for broken riot control bot #: lang/json/GENERIC_from_json.py msgid "" "A broken riot control bot. Much less threatening now that it's out of gas. " "Could be gutted for parts." -msgstr "一个损坏的防暴机器人。看起来没什么威胁安静的躺在地上。拆开看看？" +msgstr "一个损坏的防暴机器人。现在它瓦斯耗尽构不成威胁了。可以拆解得到部件。" #. ~ Description for glass shard #: lang/json/GENERIC_from_json.py @@ -26434,7 +26463,8 @@ msgstr "一片碎玻璃，边缘锋利。可以拿来戳人，不过还是先戴 msgid "" "A broken skitterbot. Much less threatening now that it lies limp on solid " "ground. Could be gutted for parts." -msgstr "一个损坏的掠行机器人。看起来没什么威胁安静的躺在地上。拆开看看？" +msgstr "" +"一个损坏的掠行机器人。看起来没什么威胁安静的散在地上。可以拆解得到部件。" #. ~ Description for broken tank drone #: lang/json/GENERIC_from_json.py @@ -26442,21 +26472,26 @@ msgid "" "A broken tank drone. Still looks intimidating despite being permanently " "inoperative, possibly due to the sheer size and mass. Could be gutted for " "parts." -msgstr "一个损坏的坦克无人机。散在地上，已经没啥用了。可以拆解得到部件。" +msgstr "" +"一个损坏的坦克无人机。可能因为巨大的体积和质量的缘故，就算已经永久无法继续运" +"作依旧看起来可怕无比。可以拆解得到部件。" #. ~ Description for broken tear gas hack #: lang/json/GENERIC_from_json.py msgid "" "A broken tear gas hack. Much less threatening now that it lies quiet on " "solid ground. Could be gutted for parts." -msgstr "一个损坏的催泪弹无人机。散在地上，已经没啥用了。可以拆解得到部件。" +msgstr "" +"一个损坏的催泪弹无人机。现在安静的散在地上构不成威胁了。可以拆解得到部件。" #. ~ Description for broken tribot #: lang/json/GENERIC_from_json.py msgid "" "A broken tribot. Now that its legs lie broken and immobile, the world seems " "a little less threatening. Could be gutted for parts." -msgstr "一个损坏的三足机器人。看起来没什么威胁安静的躺在地上。拆开看看？" +msgstr "" +"一个损坏的三足机器人。现在它的腿断了一地，世界又多了一份和平。可以拆解得到部" +"件。" #. ~ Description for broken animatronic wreck #: lang/json/GENERIC_from_json.py @@ -26541,7 +26576,7 @@ msgstr "" msgid "" "A common short sword, forged from several pieces of steel. The pointy end " "is the dangerous one." -msgstr "一把普通的剑，用几块钢条锻打而成。其锋利的尖端十分危险。" +msgstr "一把普通的剑，用几块钢条锻打而成.锋利的尖端十分危险." #. ~ Description for mess tin #: lang/json/GENERIC_from_json.py @@ -26556,7 +26591,7 @@ msgstr "" #. ~ Description for The Spirit of Aikido #: lang/json/GENERIC_from_json.py msgid "A complete guide to Aikido." -msgstr "一本完整的合气道指南" +msgstr "一本完整的合气道指南。" #. ~ Description for Capoeira 100 #: lang/json/GENERIC_from_json.py @@ -26596,7 +26631,7 @@ msgstr "一本完整的柔道指南。" #. ~ Description for Complete Krav Maga #: lang/json/GENERIC_from_json.py msgid "A complete guide to Krav Maga." -msgstr "一个完整的以色列搏击防身术指南" +msgstr "一个完整的以色列搏击防身术指南。" #. ~ Description for The Deaf Leopard #: lang/json/GENERIC_from_json.py @@ -26641,7 +26676,7 @@ msgstr "一部完整的蝎子功指南。里面有你最喜爱的邵氏武打明 #. ~ Description for The Shotokan Karate Handbook #: lang/json/GENERIC_from_json.py msgid "A complete guide to Shotokan Karate." -msgstr "一本完整的空手道练习指南" +msgstr "一本完整的空手道练习指南。" #. ~ Description for The Black Snake #: lang/json/GENERIC_from_json.py @@ -26678,7 +26713,7 @@ msgstr "一部完整的毒蛇功指南。里面有你最喜爱的邵氏武打明 msgid "A complete guide to Zui Quan." msgstr "" "这本书的主人一定被那个乞丐骗了，这本书教的不是保卫宇宙和平的如来神掌，而是用" -"来拍电影的大醉拳。至少，写的还算详细……" +"来拍电影的大醉拳...至少，写的还算详细..." #. ~ Description for Practical Pugilism #: lang/json/GENERIC_from_json.py @@ -26724,7 +26759,9 @@ msgstr "木棍远端是弯曲的。冰球运动员常用。" msgid "" "A cylindrical heating device designed to be screwed in to a diesel engine to " "aid starting in cold weather." -msgstr "一个圆柱形加热装置，用来拧在柴油机上帮助其在寒冷的天气里启动。" +msgstr "" +"类似火花塞的一种圆柱形加热设备,设计有一圈螺纹,以便拧在柴油发动机上,它能帮助发" +"动机在严寒条件下启动." #. ~ Description for dahlia bud #: lang/json/GENERIC_from_json.py @@ -26846,7 +26883,8 @@ msgstr "" msgid "" "A forge rig made to run off a vehicle's storage battery with integrated tool " "storage for metalworking equipment." -msgstr "一种使用车载电源的锻造系统，有着集成的金属加工工具的储存箱。" +msgstr "" +"一个耗电量很大的金属加工用钻机。上面还有个盒子让你存放那些金属加工用的工具." #. ~ Description for fork #: lang/json/GENERIC_from_json.py @@ -26854,7 +26892,7 @@ msgid "" "A fork, if you stab something with it you eat it right away. Wait... " "nevermind." msgstr "" -"一把叉子，你可以用它叉起你想吃的任何东东放进你的嘴里。等等……还是算了吧。" +"一把叉子，你可以用它叉起你想吃的任何东东放进你的嘴里。等等...现在还是算了吧。" #. ~ Description for turret frame #: lang/json/GENERIC_from_json.py @@ -27002,8 +27040,8 @@ msgid "" "harvest its sap. Can be used on a maple tree in between late winter and " "early spring to harvest maple sap." msgstr "" -"在一棵树木表层中插入的一个中空的金属圆柱体，以缓慢的收割它的汁液。可以用在枫" -"树上，在晚冬和早春之间，来收获枫树树汁。" +"一根食指大小的中空金属管，把它深深地插进树皮里就可以从中缓慢的获得树液。可以" +"在晚冬早春时节用它从枫树里收集枫树液." #. ~ Description for microwave #: lang/json/GENERIC_from_json.py @@ -27017,11 +27055,6 @@ msgstr "此为家用微波炉，似乎应该用来烤豆子。但现在最适合 msgid "A kiln full of wood that has been lit; better drop it!" msgstr "装满木材的制炭窑炉，已经点燃了，你最好把它放下。" -#. ~ Description for truck battery -#: lang/json/GENERIC_from_json.py -msgid "A large 12v lead-acid battery used to power truck electrical systems." -msgstr "大型12v铅酸电池，用来给卡车供电。" - #. ~ Description for truck alternator #: lang/json/GENERIC_from_json.py msgid "A large alternator used to power truck electrical systems." @@ -27109,7 +27142,7 @@ msgstr "" " \n" "执此锤者，\n" "如其适格，\n" -"当承神威… \n" +"当承神威..。\n" "摧毁！！" #. ~ Description for log @@ -27131,6 +27164,7 @@ msgid "" "A large rigid steel boom. If attached to a frame it could be used to lift " "up to 6 metric tonnes." msgstr "" +"一个巨大而坚固的钢吊杆。如果连接到一个框架上，则可以用于起重不超过6吨的汽车。" #. ~ Description for sheet of reinforced glass #: lang/json/GENERIC_from_json.py @@ -27148,13 +27182,6 @@ msgstr "一整块玻璃，超级容易碎。可以用来装在窗户上。" msgid "A large stone, roughly hollowed out into a pot." msgstr "一块大石头，大致挖空了像个锅一样。" -#. ~ Description for storage battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A large storage battery. Could be installed into a storage battery case for " -"easy removal from a vehicle, or just welded straight in." -msgstr "大型蓄电池。可被安装到蓄电池箱上，便于快速拆卸，也可以直接焊接。" - #. ~ Description for folding wire basket #: lang/json/GENERIC_from_json.py msgid "A large wire basket from a shopping cart, modified to be foldable." @@ -27237,7 +27264,7 @@ msgstr "一条薄的、僵硬的钢丝，就像常见的铁丝网上的钢丝一 msgid "" "A long handle with a big metal head, flat on one side, for driving golf " "balls. Fore!" -msgstr "一根金属柄，一头是击球金属头，用来驱动高尔夫球。球来了！" +msgstr "一根金属柄，一头是击球金属头，gogogog." #. ~ Description for homewrecker #: lang/json/GENERIC_from_json.py @@ -27310,16 +27337,12 @@ msgstr "" "这是一款中世纪的铁锤，一根木柄上面插着一个带刺的铁球，能够造成大量的钝击和穿" "刺伤害。" -#. ~ Description for medium storage battery -#: lang/json/GENERIC_from_json.py -msgid "A medium storage battery." -msgstr "一个中型蓄电池。" - #. ~ Description for SD-Memory card #: lang/json/GENERIC_from_json.py msgid "A memory card, used. Might be worth a look." msgstr "" -"一张使用过的存储卡。你宅男的直觉认为里面也许有值得一看的东东，比如27G神马的……" +"一张使用过的存储卡。你宅男的直觉认为里面也许有值得一看的东东，比如27G神马" +"的..." #. ~ Description for peephole #: lang/json/GENERIC_from_json.py @@ -27342,7 +27365,7 @@ msgid "" "within punching range to use it." msgstr "" "一个铜制的金属武器，可以套在手中，造成额外的伤害。这是一件精良、快速的武器，" -"不过你可能需要在很近的距离来用它。" +"不过你可能需要在很近的距离来用它." #. ~ Description for misc software #: lang/json/GENERIC_from_json.py @@ -27401,7 +27424,7 @@ msgstr "一柄单手的短斧，砍人、砍柴两不误。" msgid "" "A pair of knuckles consisting of two small squares of wood with several " "nails coming through them. Useful in nasty street fights." -msgstr "一副木制护手拳套，上面还敲进了几个钉子。街头斗殴神器。" +msgstr "一副木质护手拳套，上面还敲进了几个钉子。街头斗殴神器。" #. ~ Description for distaff and spindle #: lang/json/GENERIC_from_json.py @@ -27514,6 +27537,8 @@ msgid "" "A plastic box containing crêped paper used to filter the air supply for " "combustion engines or other industrial equipment." msgstr "" +"一个塑料盒，装着叠的和可丽饼（法式薄饼）一样的滤纸，用于内燃机或其他工业设备" +"的空气过滤。" #. ~ Description for poppy bud #: lang/json/GENERIC_from_json.py @@ -27576,7 +27601,7 @@ msgid "" "skill. It is decorated with gold and silver ornaments." msgstr "" "Gungnir，奥丁之矛的仿制品，作为奥丁大神的长矛，这货号称可以无视使用者的水平而" -"完美击中其目标。应该不是真的，否则没圣斗士啥事了…" +"完美击中其目标。应该不是真的，否则没圣斗士啥事了..." #. ~ Description for Mjölnir #: lang/json/GENERIC_from_json.py @@ -27646,7 +27671,7 @@ msgstr "一张破旧的废纸，上面沾满了陈旧的干涸血迹。" #. ~ Description for flyer #: lang/json/GENERIC_from_json.py msgid "A scrap of paper." -msgstr "一张废弃的纸片" +msgstr "一张废弃的纸片。" #. ~ Description for survivor's note #: lang/json/GENERIC_from_json.py @@ -27733,7 +27758,7 @@ msgstr "一块坚固的高温合金板，十分坚硬，也很容易锻造。" msgid "" "A short and sharp double edged dagger made to be gripped in the palm, with " "the blade protruding between the fingers." -msgstr "一把锋利的双刃匕首紧握在手心中，刀尖隐约在闪闪发光。" +msgstr "一把锋利的双刃匕首紧握在手心中，刀尖隐约在闪闪发光." #. ~ Description for fungal fighter sting #: lang/json/GENERIC_from_json.py @@ -27800,7 +27825,7 @@ msgid "" "briefly." msgstr "" "一张报纸。可能是本地被丧尸淹没之前印刷的最后几期之一。大多是些琐碎或者过时的" -"信息。但有一件事吸引你的目光。" +"信息，无法引起你的注意。" #. ~ Description for newspaper page #: lang/json/GENERIC_from_json.py @@ -27810,7 +27835,7 @@ msgid "" "terribly trivial, or out of date, but one thing catches your eye briefly." msgstr "" "一张报纸。上面的日期是几年前的，能完整的保存下来真是蛮奇怪的。大多是些琐碎或" -"者过时的信息。但有一件事吸引你的目光。" +"者过时的信息，无法引起你的注意。" #. ~ Description for newspaper page #: lang/json/GENERIC_from_json.py @@ -27820,8 +27845,8 @@ msgid "" "there is terribly trivial, or out of date, but one thing catches your eye " "briefly." msgstr "" -"一张报纸。上面的日期居然是好几年前的，你很奇怪它是如何保存这么久的。大多是些" -"琐碎或者过时的信息。但有一件事吸引你的目光。" +"一张报纸。上面的日期居然是许多年以前的，你很奇怪它是如何保存这么久的。大多是" +"些琐碎或者过时的信息，无法引起你的注意。" #. ~ Description for newspaper page #: lang/json/GENERIC_from_json.py @@ -27830,8 +27855,8 @@ msgid "" "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." msgstr "" -"一张报纸。上面的日期是大灾变之前几个月。大多是些琐碎或者过时的信息。但有一件" -"事吸引你的目光。" +"一张报纸。上面的日期是大灾变之前几个月。大多是些琐碎或者过时的信息，无法引起" +"你的注意。" #. ~ Description for newspaper page #: lang/json/GENERIC_from_json.py @@ -27840,8 +27865,8 @@ msgid "" "up to the Cataclysm. Most of the information on there is terribly trivial, " "or out of date, but one thing catches your eye briefly." msgstr "" -"一张报纸。上面的日期是大灾变之前几周。大多是些琐碎或者过时的信息。但有一件事" -"吸引你的目光。" +"一张报纸。上面的日期是大灾变之前几周。大多是些琐碎或者过时的信息，无法引起你" +"的注意。" #. ~ Description for newspaper page #: lang/json/GENERIC_from_json.py @@ -27851,7 +27876,7 @@ msgid "" "but one thing catches your eye briefly." msgstr "" "一张报纸。上面的日期是一年前的，能完整的保存下来真是蛮奇怪的。大多是些琐碎或" -"者过时的信息。但有一件事吸引你的目光。" +"者过时的信息，无法引起你的注意。" #. ~ Description for short rope #: lang/json/GENERIC_from_json.py @@ -27888,7 +27913,7 @@ msgid "" "down to a powder, for more... high-profile applications." msgstr "" "一个小型铝锭，已经按后续要求标准化。轻巧而结实，它可以被用在各种建筑中或者研" -"成粉末，用于更加……高调的行动中。" +"成粉末，用于更加...高调的行动中。" #. ~ Description for clockworks #: lang/json/GENERIC_from_json.py @@ -27981,7 +28006,7 @@ msgstr "小金属茶壶，没有它的存在你的下午茶时间就是不完整 #. ~ Description for pane of reinforced glass #: lang/json/GENERIC_from_json.py msgid "A small pane of glass strengthened with steel wiring." -msgstr "一小块钢化玻璃" +msgstr "一小块钢化玻璃。" #. ~ Description for minireactor #: lang/json/GENERIC_from_json.py @@ -28002,11 +28027,7 @@ msgid "" "A small steel telescoping cantilever. If attached to a frame it could be " "used to lift up to 1.5 metric tonnes." msgstr "" - -#. ~ Description for small storage battery -#: lang/json/GENERIC_from_json.py -msgid "A small storage battery. Useful for crafting." -msgstr "一种小型蓄电池，用于制造。" +"一个小型钢制伸缩悬臂。如果连接到一个框架上，则可以用于起重不超过1.5吨的汽车。" #. ~ Description for damaged tent #: lang/json/GENERIC_from_json.py @@ -28056,7 +28077,7 @@ msgid "" "A sock with a rock tied into the end of it. A true weapon of desperation." msgstr "" "人称要你命3000。在符合你私人口味的袜子（比如黑丝）底部放上块石头，就可以像流" -"星锤一样挥动！噗，大杀器啊！" +"星锤一样挥动！噗...大杀器啊！" #. ~ Description for seat #: lang/json/GENERIC_from_json.py @@ -28080,7 +28101,7 @@ msgid "" "glass causes this panel to produce slightly less power than a normal panel. " "Useful for a vehicle." msgstr "" -"一个太阳能电池板，覆盖着一块加强版钢化玻璃保护脆弱的太阳能电池免受丧尸或者其" +"一个太阳能电池板，覆盖着一块加强版钢化玻璃保护脆弱的太阳能电池免受僵尸或者其" "他的物品的摧毁。" #. ~ Description for sharpened rebar @@ -28113,7 +28134,7 @@ msgstr "一块烂木头，除了生火没有其他用途。" #. ~ Description for automotive filter #: lang/json/GENERIC_from_json.py msgid "A steel can containing filter paper designed for automotive use." -msgstr "" +msgstr "一个装满了车用级滤纸的钢罐。" #. ~ Description for pipe #: lang/json/GENERIC_from_json.py @@ -28178,8 +28199,8 @@ msgid "" "Originally an Okinawan weapon, it consists of a stick with a perpendicular " "handle attached a third of the way down its length." msgstr "" -"一个通常为警用的木头结实短棍。原本是源于冲绳的武器，在棍身三分之一处有着一个" -"垂直的握柄。" +"一个结实的木头棍子，通常在警察身上可以捡到，最终是比较长的，现在敲掉了三分之" +"一，握着它使你信心倍增." #. ~ Description for vine #: lang/json/GENERIC_from_json.py @@ -28216,7 +28237,7 @@ msgstr "" #. ~ Description for baseball bat #: lang/json/GENERIC_from_json.py msgid "A sturdy wood bat. Makes a great melee weapon." -msgstr "一根牢固的木制棒球棍，揍起人来既顺手又给力。" +msgstr "一根牢固的木质棒球棍，揍起人来既顺手又给力。" #. ~ Description for heavy stick #: lang/json/GENERIC_from_json.py @@ -28230,7 +28251,7 @@ msgstr "一根坚实而沉重的棍子，既能做武器，也能在切割后用 msgid "" "A synthetic rubber V-belt with steel reinforcement fibers commonly fited to " "engines or other industrial equipment." -msgstr "一根有着钢纤维强化的合成橡胶质地的V带，通常用于引擎和其他工业设备中。" +msgstr "一条合成橡胶和钢丝加固的三角皮带,通常用于发动机或其他工业设备的传动." #. ~ Description for Mosin-Nagant EBR conversion kit #: lang/json/GENERIC_from_json.py @@ -28292,7 +28313,7 @@ msgstr "一根骨制的烤肉串。可惜这样并不会让松鼠烤肉串更美 #. ~ Description for skewer #: lang/json/GENERIC_from_json.py msgid "A thin wooden skewer. Squirrel on a stick, anyone?" -msgstr "这是木制烤肉串。你不知不觉就想起了楼下的烤羊肉串。要是有孜然就好了。" +msgstr "这是木质烤肉串。你不知不觉就想起了楼下的烤羊肉串。要是有孜然就好了。" #. ~ Description for tin plate #: lang/json/GENERIC_from_json.py @@ -28454,7 +28475,7 @@ msgid "" "A wooden spear, honed to a sharper point and fire hardened for toughness. " "The grip area has also be carved and covered for better grip." msgstr "" -"一根木制长矛，磨得很尖，还用火烤让它更硬。用手握的一侧还被雕刻，让你握起来更" +"一根木质长矛，磨得很尖，还用火烤让它更硬。用手握的一侧还被雕刻，让你握起来更" "容易。" #. ~ Description for blob seat @@ -28464,8 +28485,8 @@ msgid "" "engulf parts of your body. It feels a bit like a waterbed. Or a giant " "stomach." msgstr "" -"一个…嗯，座位，由变形怪糊内衬骨质框架制成，坐上去时变形怪糊会糊到你的身上，感" -"觉像是坐在水床上，或者一个巨大的胃里。" +"一个...嗯，座位，由变形怪糊内衬骨质框架制成，坐上去时变形怪糊会糊到你的身上，" +"感觉像是坐在水床上，或者...一个巨大的胃袋里面。" #. ~ Description for L523-DSR conversion #: lang/json/GENERIC_from_json.py @@ -28562,7 +28583,7 @@ msgstr "一个用来给车上的电气系统供能的发电机。" msgid "" "An aluminum baseball bat, lighter than a wooden bat and a little easier to " "swing as a result." -msgstr "铝制棒球棍，比木制棒球棍要轻，因此更易挥舞。" +msgstr "铝质棒球棍，比木质棒球棍要轻，因此更易挥舞。" #. ~ Description for qiang #: lang/json/GENERIC_from_json.py @@ -28621,7 +28642,9 @@ msgstr "一小块金属碎片，能用于几乎所有的机械制作，是非常 msgid "" "An complex mechanical pump capable of achieving high pressures. Far beyond " "anything you could reasonably improvise." -msgstr "一种复杂的能实现高压的机械泵。远远超出你手工制造的合理范畴。" +msgstr "" +"一个能提供很高压力的复杂机械泵，远远超出那些脑筋正常的人在应急维修中会使用的" +"设备规格." #. ~ Description for 7.5kW generator #: lang/json/GENERIC_from_json.py @@ -28668,7 +28691,7 @@ msgstr "" msgid "" "An improvised air filter useful for repairing engines or other industrial " "equipment when no better alternative is available." -msgstr "" +msgstr "当没有更好的选择的时候，这个简易的皮带可用于修理发动机或其它工业设备。" #. ~ Description for makeshift automotive filter #: lang/json/GENERIC_from_json.py @@ -28682,7 +28705,9 @@ msgstr "当没有更好的选择的时候，这个简易的皮带可用于修理 msgid "" "An improvised belt useful for repairing engines or other industrial " "equipment when no better alternative is available." -msgstr "当没有更好的选择的时候，这个简易的皮带可用于修理发动机或其它工业设备。" +msgstr "" +"当你需要让发动机重新输出动力或是让其他设备动起来的时候，能有这么一条自制的简" +"易传动皮带总比没有强." #. ~ Description for improvised fishing hook #: lang/json/GENERIC_from_json.py @@ -28739,7 +28764,7 @@ msgstr "" msgid "" "An simple cast iron mechanical impeller pump. It's not good for much of " "anything on its own." -msgstr "一种简易铸铁机械叶轮泵。单独它自己并没有什么用。" +msgstr "一个简单的铸铁制叶轮机械泵。不是太好,但是凑合能用." #. ~ Description for umbrella #: lang/json/GENERIC_from_json.py @@ -28763,8 +28788,8 @@ msgid "" "The glass causes this panel to produce slightly less power than a normal " "upgraded panel. Useful for a vehicle." msgstr "" -"一个高能太阳能电池板，覆盖着一块加强版钢化玻璃保护脆弱的太阳能电池免受丧尸或" -"者其他的物品的摧毁。" +"一个高能太阳能电池板，覆盖着一块加强版钢化玻璃保护脆弱的太阳能电池免受僵尸或" +"者其他的物品的摧毁." #. ~ Description for stabilized portal #: lang/json/GENERIC_from_json.py @@ -28984,12 +29009,12 @@ msgstr "一块钢筋焊接而成的栅板，重量不大却可以有效地加固 msgid "" "Items with are not themselves useful but are instead requirements for " "crafting or repairs" -msgstr "本身无法使用的物品，但在制造和修理时需要消耗。" +msgstr "这些东西本身不是很有用,但是可用于制造或是维修车上损坏的地方." #: lang/json/GENERIC_from_json.py msgid "Kevlar dog harness" msgid_plural "Kevlar dog harnesses" -msgstr[0] "凯夫拉狗链" +msgstr[0] "凯夫拉狗束具" #: lang/json/GENERIC_from_json.py msgid "Kodokan Judo" @@ -29059,7 +29084,7 @@ msgstr[0] "医疗软件" #. ~ Description for infection data #: lang/json/GENERIC_from_json.py msgid "Medical data on zombie blood." -msgstr "丧尸血液的医疗数据。" +msgstr "僵尸血液的医疗数据。" #: lang/json/GENERIC_from_json.py msgid "Mjölnir" @@ -29084,7 +29109,7 @@ msgid "" "guarantees a service life of at least 160 million years." msgstr "" "绝不为了方便而牺牲品味，只当你能同时拥有Rivtech原子咖啡机的时候！简单而强大的" -"原子时代设计能保证其使用寿命至少有一亿六千万年。绝无任何毒副作用。" +"原子时代设计能保证其使用寿命至少有1.6亿年。绝无任何毒副作用。" #: lang/json/GENERIC_from_json.py msgid "Nomex patch" @@ -29163,7 +29188,7 @@ msgstr[0] "车载厨房" #: lang/json/GENERIC_from_json.py msgid "Radio car box" msgid_plural "Radio car boxes" -msgstr[0] "无线遥控器" +msgstr[0] "遥控玩具车盒" #: lang/json/GENERIC_from_json.py msgid "SD-Memory card" @@ -29347,9 +29372,9 @@ msgid "" "sticking at jagged angles from edge of the blade, making it much better at " "chopping than slashing." msgstr "" -"钉齿剑，亦称诺德剑。这把木剑从剑刃上伸出很多歪歪扭扭的钉子。手里拿着它，你好" -"像回到了那个冰天雪地的天际省，可惜你不是那个追着龙揍的抓根宝，倒是一群怪物追" -"着你揍……" +"钉齿剑，简称诺德。这把木剑从剑刃上伸出很多歪歪扭扭的钉子。手里拿着它，你好像" +"回到了那个冰天雪地的天际省，可惜你不是那个追着龙揍的抓根宝，倒是一群怪物追着" +"你揍..." #. ~ Description for foot crank #: lang/json/GENERIC_from_json.py @@ -29804,7 +29829,7 @@ msgstr "" #. ~ Description for dead flare #: lang/json/GENERIC_from_json.py msgid "This is a spent magnesium flare. It is essentially trash." -msgstr "一个已经燃烧完毕的照明弹。本质上是垃圾，且不可回收。" +msgstr "一个已经燃烧完毕的照明弹。本质上是垃圾，且不可回收." #. ~ Description for estoc #: lang/json/GENERIC_from_json.py @@ -29872,15 +29897,15 @@ msgid "" "This memory card appears to be related to 'XEDRA', and is certainly " "encrypted. Looks * Interesting *, though..." msgstr "" -"这张存储卡看起来和'XEDRA'有关，而且还被加密了。嗯，有点意思……里面一定有美美和" -"天二的自拍照……" +"这张存储卡看起来和'XEDRA'有关，而且还被加密了。嗯，有点意思...里面一定有美美" +"和天二的自拍照..." #. ~ Description for SD-Memory card (encrypted) #: lang/json/GENERIC_from_json.py msgid "" "This memory card appears to have the firmware encryption set. Hopefully it " "contains something worth encrypting." -msgstr "这张存储卡好像被加密了。尼玛，看不到的A片才是最好的A片……" +msgstr "这张存储卡好像被加密了。尼玛，看不到的A片才是最好的A片..." #. ~ Description for SD-Memory card (clean) #: lang/json/GENERIC_from_json.py @@ -30201,7 +30226,7 @@ msgstr[0] "原子小夜灯（关）" #: lang/json/GENERIC_from_json.py msgid "automotive filter" msgid_plural "automotive filters" -msgstr[0] "" +msgstr[0] "汽车过滤器" #: lang/json/GENERIC_from_json.py msgid "awl pike" @@ -30573,11 +30598,6 @@ msgid "car alternator" msgid_plural "car alternators" msgstr[0] "轿车发电机" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "car battery" -msgid_plural "car batteries" -msgstr[0] "汽车电池" - #: lang/json/GENERIC_from_json.py msgid "carding paddles" msgid_plural "pairs of carding paddles" @@ -30751,7 +30771,7 @@ msgstr[0] "硬化毛皮" #: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py msgid "cutlass" msgid_plural "cutlasses" -msgstr[0] "水手短弯刀" +msgstr[0] "短弯刀" #: lang/json/GENERIC_from_json.py msgid "cvd machine" @@ -30810,7 +30830,7 @@ msgstr[0] "羽绒枕" #: lang/json/GENERIC_from_json.py lang/json/fault_from_json.py msgid "drive belt" msgid_plural "drive belts" -msgstr[0] "传动带" +msgstr[0] "传动皮带" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "drive by wire controls" @@ -30940,7 +30960,7 @@ msgstr[0] "传单" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "foldable wooden frame" msgid_plural "foldable wooden frames" -msgstr[0] "折叠式木制框架" +msgstr[0] "折叠式木质框架" #: lang/json/GENERIC_from_json.py msgid "foldable-light frame" @@ -31030,7 +31050,7 @@ msgstr[0] "玻璃剃刀" #: lang/json/GENERIC_from_json.py msgid "glow plug" msgid_plural "glow plugs" -msgstr[0] "火花塞" +msgstr[0] "柴油机预热塞" #: lang/json/GENERIC_from_json.py msgid "gold bar" @@ -31260,12 +31280,12 @@ msgstr[0] "铁锏" #: lang/json/GENERIC_from_json.py msgid "makeshift air filter" msgid_plural "makeshift air filters" -msgstr[0] "" +msgstr[0] "简易空气过滤器" #: lang/json/GENERIC_from_json.py msgid "makeshift automotive filter" msgid_plural "makeshift automotive filters" -msgstr[0] "" +msgstr[0] "简易汽车过滤器" #: lang/json/GENERIC_from_json.py msgid "makeshift copper pot" @@ -31275,7 +31295,7 @@ msgstr[0] "简易铜锅" #: lang/json/GENERIC_from_json.py msgid "makeshift drive belt" msgid_plural "makeshift drive belts" -msgstr[0] "简易传动带" +msgstr[0] "自制传动皮带" #: lang/json/GENERIC_from_json.py msgid "makeshift glaive" @@ -31302,11 +31322,6 @@ msgid "mechanical pump" msgid_plural "mechanical pumps" msgstr[0] "机械泵" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "medium storage battery" -msgid_plural "medium storage batteries" -msgstr[0] "中型蓄电池" - #: lang/json/GENERIC_from_json.py msgid "mess tin" msgid_plural "mess tins" @@ -31330,7 +31345,7 @@ msgstr[0] "军用复合甲板" #: lang/json/GENERIC_from_json.py msgid "military operations map" msgid_plural "military operations maps" -msgstr[0] "军事设施图" +msgstr[0] "军事行动地图" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "minifridge" @@ -31367,11 +31382,6 @@ msgid "motorbike alternator" msgid_plural "motorbike alternators" msgstr[0] "摩托发电机" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "motorbike battery" -msgid_plural "motorbike batteries" -msgstr[0] "摩托车电池" - #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "muffler" msgid_plural "mufflers" @@ -31925,11 +31935,6 @@ msgid "small electric motor" msgid_plural "small electric motors" msgstr[0] "小型电力引擎" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "small storage battery" -msgid_plural "small storage batteries" -msgstr[0] "小型蓄电池" - #: lang/json/GENERIC_from_json.py msgid "software" msgid_plural "softwares" @@ -31948,7 +31953,7 @@ msgstr[0] "太阳能板" #: lang/json/GENERIC_from_json.py msgid "spare parts" msgid_plural "spare partss" -msgstr[0] "零部件" +msgstr[0] "零配件" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "spike" @@ -31993,7 +31998,7 @@ msgstr[0] "稳定传送门" #: lang/json/GENERIC_from_json.py msgid "steel boom" msgid_plural "steel booms" -msgstr[0] "钢吊杆" +msgstr[0] "钢铁吊臂" #: lang/json/GENERIC_from_json.py msgid "steel chain" @@ -32030,11 +32035,6 @@ msgid "stone spear" msgid_plural "stone spears" msgstr[0] "石质长矛" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "storage battery" -msgid_plural "storage batteries" -msgstr[0] "蓄电池" - #: lang/json/GENERIC_from_json.py msgid "storage battery case" msgid_plural "storage battery cases" @@ -32113,7 +32113,7 @@ msgstr[0] "泰迪熊" #: lang/json/GENERIC_from_json.py msgid "telescopic cantilever" msgid_plural "telescopic cantilevers" -msgstr[0] "伸缩悬臂" +msgstr[0] "可伸缩吊臂" #: lang/json/GENERIC_from_json.py msgid "telescoping umbrella" @@ -32158,18 +32158,13 @@ msgstr[0] "电路转换器" #: lang/json/GENERIC_from_json.py msgid "tree spile" msgid_plural "tree spiles" -msgstr[0] "树木插管" +msgstr[0] "树液管" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "truck alternator" msgid_plural "truck alternators" msgstr[0] "卡车发电机" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "truck battery" -msgid_plural "truck batteries" -msgstr[0] "卡车电池" - #: lang/json/GENERIC_from_json.py msgid "turret engine" msgid_plural "turret engines" @@ -32248,7 +32243,7 @@ msgstr[0] "载具控制器" #: lang/json/GENERIC_from_json.py msgid "vehicle crafting rig" msgid_plural "vehicle crafting rigs" -msgstr[0] "车载制作平台" +msgstr[0] "车载钻机" #: lang/json/GENERIC_from_json.py msgid "vehicle curtain" @@ -32443,6 +32438,8 @@ msgid "" "A bootleg adaptor for permanently converting a firearm to accept proprietary " "Leadworks magazines. Guaranteed to void your warranty." msgstr "" +"一套非法的工具，用于将枪支永久性改装为使用LLC公司弹匣供弹。保证让枪的保修失" +"效。" #. ~ Description for compact suppressor #: lang/json/GUNMOD_from_json.py @@ -32504,6 +32501,7 @@ msgid "" "A kit providing the necessary parts for permanently converting a firearm " "from magazine to belt-feed. Guaranteed to void your warranty." msgstr "" +"一套工具，用于将枪支永久性从弹匣供弹改装为弹链供弹。保证让枪的保修失效。" #. ~ Description for rail-mounted crossbow #: lang/json/GUNMOD_from_json.py @@ -32683,7 +32681,7 @@ msgid "" "A spare magazine you can keep on hand to make reloads faster, but must " "itself be reloaded before it can be used again." msgstr "" -"一个备用弹夹，拿在手上可以加快弹药装填的速度——前提是你得先把子弹填进弹夹里。" +"一个备用弹匣，拿在手上可以加快弹药装填的速度——前提是你得先把子弹填进弹匣里。" #. ~ Description for homemade suppressor #. ~ Description for suppressor @@ -33082,7 +33080,7 @@ msgstr[0] "刺刀" #: lang/json/GUNMOD_from_json.py msgid "belt feed adaptor" msgid_plural "belt feed adaptors" -msgstr[0] "" +msgstr[0] "子弹带适配器" #: lang/json/GUNMOD_from_json.py msgid "bipod" @@ -33195,12 +33193,12 @@ msgstr[0] "机械瞄具改进型" #: lang/json/GUNMOD_from_json.py msgid "launcher" -msgstr "发射器" +msgstr "重武器" #: lang/json/GUNMOD_from_json.py msgid "leadworks magazine adaptor" msgid_plural "leadworks magazine adaptors" -msgstr[0] "" +msgstr[0] "LLC弹夹适配器" #: lang/json/GUNMOD_from_json.py msgid "lightweight replacement furniture" @@ -33371,7 +33369,7 @@ msgstr[0] ".45 SMG 炮台" #: lang/json/GUN_from_json.py msgid ".50 caliber rifle" msgid_plural ".50 caliber rifles" -msgstr[0] ".50 步枪" +msgstr[0] "魔改.50步枪" #: lang/json/GUN_from_json.py msgid "12 gauge pistol" @@ -33428,7 +33426,7 @@ msgid "" "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." msgstr "" -"一把装载.40S&W的Glock17手枪改良版，是FBI和世界上其他众多执法机关的标配武器。" +"一把装载.40sw的glock17手枪改良版，是FBI和世界上其他众多执法机关的标配武器。" #. ~ Description for 120mm autoloading tank gun #: lang/json/GUN_from_json.py @@ -33590,7 +33588,7 @@ msgstr "" #: lang/json/GUN_from_json.py msgid "" "A bug if you can see this, nonetheless it is here and plasma and deadly." -msgstr "" +msgstr "你能看到这个是出了BUG了。然而这玩意还是在这。" #. ~ Description for chemical thrower #: lang/json/GUN_from_json.py @@ -33689,7 +33687,7 @@ msgstr "" msgid "" "A compact selective fire automatic rifle featuring an integrated folding " "stock." -msgstr "" +msgstr "一把紧凑的带有可选射击模式的自动步枪，自带可折叠枪托。" #. ~ Description for Ruger LCR .38 #: lang/json/GUN_from_json.py @@ -33707,7 +33705,7 @@ msgid "" "Instead it propels bright green bolts of energy, with significant armor " "penetration." msgstr "" -"一把弩弓，上面装饰着各类金色标志，似乎没有弓弦。但它能够发射出绿色的能量弩" +"一把弩箭，上面装饰着各类金色标志，似乎没有弓弦。但它能够发射出绿色的能量弩" "箭，有着特别强的穿甲力。" #. ~ Description for 2 Shot Special @@ -34029,7 +34027,7 @@ msgstr "" #: lang/json/GUN_from_json.py msgid "" "A homemade triple-barrel 40mm grenade launcher. Capable of launching all " -"three grenades at once, it is extremely powerwul for a homemade weapon." +"three grenades at once, it is extremely powerful for a homemade weapon." msgstr "" "一台自制的三管40mm榴弹发射器。能够同时发射三颗榴弹，是一件相当强大的自制武" "器。" @@ -34056,7 +34054,7 @@ msgstr "" msgid "" "A large barrel with several inexplicable wires and blinking lights " "protruding at regular intervals." -msgstr "" +msgstr "一个大桶，上面布着几根令人费解的导线，以及按照固定间隔闪烁的灯。" #. ~ Description for flamethrower #: lang/json/GUN_from_json.py @@ -34280,7 +34278,7 @@ msgstr "一款手工制作可以连续发射的气枪。安静而致命。" #. ~ Description for flaregun #: lang/json/GUN_from_json.py msgid "A plastic single shot pistol made to fire signal flares." -msgstr "一个塑料单发手枪，用于发射信号弹。" +msgstr "一个塑料单发手枪，用于发射信号弹." #. ~ Description for S&W 22A #: lang/json/GUN_from_json.py @@ -34776,7 +34774,7 @@ msgid "" "A version of the Skorpion submachine gun chambered in 9x18mm Makarov, with a " "slightly longer barrel than the origional design." msgstr "" -"捷克斯洛伐克制造，Skorpion Vz. 82是原Skorpion Vz. 61 \"蝎\"式微型冲锋枪的改进" +"捷克斯洛伐克制造，Skorpion Vz。82是原Skorpion Vz。61 \"蝎\"式微型冲锋枪的改进" "出口型号，改成装填前苏联广泛使用的9x18mm 马卡洛夫手枪子弹，在原型枪的基础上稍" "稍加长了枪管，仍然是把不错的消声小突突。" @@ -34803,8 +34801,8 @@ msgid "" "US Marine snipers. Highly damaging, but perhaps not as accurate as the " "competing Browning BLR." msgstr "" -"一把非常普及的打猎/狙击两用步枪。SWAT特警队和美国海军陆战队狙击手都喜欢用它。" -"高杀伤力，但精准度比起勃朗宁BLR步枪来或许不那么高。" +"一把非常普及的打猎/狙击两用步枪。S.W.A.T特警队和美国海军陆战队狙击手都喜欢用" +"它。高杀伤力，但精准度比起布朗宁BLR步枪来或许不那么高。" #. ~ Description for FTK-93 fusion gun #: lang/json/GUN_from_json.py @@ -34881,7 +34879,7 @@ msgstr "一个木制吹箭筒，容易使用并且有比较高的准确度。使 msgid "" "A wooden slingshot, easy to use and accurate. It uses pebbles as ammunition." msgstr "" -"一个木制弹弓，使用很简单也很准，用小石子做弹药打出去有种童年的感觉，没什么杀" +"一个木质弹弓，使用很简单也很准，用小石子做弹药打出去有种童年的感觉，没什么杀" "伤力。" #. ~ Description for bane staff @@ -35314,7 +35312,7 @@ msgstr[0] "Cx4暴风卡宾枪" #: lang/json/GUN_from_json.py msgid "Cyber-rocket launcher" msgid_plural "Cyber-rocket launchers" -msgstr[0] "程控火箭发射器" +msgstr[0] "赛博火箭发射器" #: lang/json/GUN_from_json.py msgid "Desert Eagle .44" @@ -35626,7 +35624,7 @@ msgstr "" #: lang/json/GUN_from_json.py msgid "Ichaival" msgid_plural "Ichaivals" -msgstr[0] "1" +msgstr[0] "Ichaival，神圣之弓" #. ~ Description for RM11B scout rifle #: lang/json/GUN_from_json.py @@ -35672,7 +35670,7 @@ msgstr[0] "Kel-Tec KSG 霰弹枪" #: lang/json/GUN_from_json.py msgid "Kel-Tec SUB-2000" msgid_plural "Kel-Tec SUB-2000" -msgstr[0] "Kel-Tec SUB-2000卡宾枪" +msgstr[0] "SUB-2000卡宾枪" #: lang/json/GUN_from_json.py msgid "L.T. carbine" @@ -35770,9 +35768,10 @@ msgid "" "this barren proto-weapon." msgstr "" "Leadworks LLC的L523无托平台通过多种方式利用普遍的5.56北约弹，它的设计是可以在" -"不同配置间快速安全且有效的更换组件。\"理论上\"这个基础件的功能可以单独使用，" -"但是这即不被简易，除了问题你也拿不到保险赔偿金。有趣的是，这个光秃秃的原型武" -"器并没有给市场上乱七八糟的枪械配件留什么空间。" +"不同配置间快速安全且有效的更换组件。\n" +"\"理论上\"这个基础件的功能可以单独使用，但是这即不被简易，除了问题你也拿不到" +"保险赔偿金。有趣的是，这个光秃秃的原型武器并没有给市场上乱七八糟的枪械配件留" +"什么空间。" #. ~ Description for L523-MBR rifle #: lang/json/GUN_from_json.py @@ -35785,9 +35784,9 @@ msgid "" "though, it doesn't accept third-party modifications." msgstr "" "Leadworks LLC的L523无托平台通过多种方式利用普遍的5.56北约弹，它的设计是可以在" -"不同配置间快速安全且有效的更换组件。这把主战步枪的战术&红点瞄准镜提供了精确的" -"瞄准，并且有一个前握柄提供更加的控制。但是就和这一系列的其他枪支一样，第三方" -"配件基本都是按不上去的。" +"不同配置间快速安全且有效的更换组件。\n" +"这把主战步枪的战术&红点瞄准镜提供了精确的瞄准，并且有一个前握柄提供更加的控" +"制。但是就和这一系列的其他枪支一样，第三方配件基本都是按不上去的。" #. ~ Description for L523-CAR carbine #: lang/json/GUN_from_json.py @@ -35800,9 +35799,9 @@ msgid "" "modifications." msgstr "" "Leadworks LLC的L523无托平台通过多种方式利用普遍的5.56北约弹，它的设计是可以在" -"不同配置间快速安全且有效的更换组件。卡宾模式糅合了Leadworks拥有专利的陀螺仪稳" -"定技术，并且内置了一个激光瞄准仪，但是就和这一系列的其他枪支一样，第三方配件" -"基本都是按不上去的。" +"不同配置间快速安全且有效的更换组件。\n" +"卡宾模式糅合了Leadworks拥有专利的陀螺仪稳定技术，并且内置了一个激光瞄准仪，但" +"是就和这一系列的其他枪支一样，第三方配件基本都是按不上去的。" #. ~ Description for L523-DSR rifle #: lang/json/GUN_from_json.py @@ -35816,10 +35815,10 @@ msgid "" "it doesn't accept third-party modifications." msgstr "" "Leadworks LLC的L523无托平台通过多种方式利用普遍的5.56北约弹，它的设计是可以在" -"不同配置间快速安全且有效的更换组件。射手步枪结合了一个特制的增长枪管，并且自" -"带两脚架和前握柄，同样也有一个8倍战术瞄准镜，并且内置了一个激光瞄准仪，并且牺" -"牲了开火模式选择换来了陀螺仪稳定装置。但是就和这一系列的其他枪支一样，第三方" -"配件基本都是按不上去的。" +"不同配置间快速安全且有效的更换组件。\n" +"射手步枪结合了一个特制的增长枪管，并且自带两脚架和前握柄，同样也有一个8倍战术" +"瞄准镜，并且内置了一个激光瞄准仪，并且牺牲了开火模式选择换来了陀螺仪稳定装" +"置。但是就和这一系列的其他枪支一样，第三方配件基本都是按不上去的。" #. ~ Description for L523-LMG #: lang/json/GUN_from_json.py @@ -35833,9 +35832,10 @@ msgid "" "usual modifications." msgstr "" "Leadworks LLC的L523无托平台通过多种方式利用普遍的5.56北约弹，它的设计是可以在" -"不同配置间快速安全且有效的更换组件。把个野心颇大的轻机枪结合了一个重型枪管&前" -"握柄，还有Leadworks的陀螺稳定系统，并且有一个重新射击的100发弹容大弹鼓，但是" -"就和这一系列的其他枪支一样，第三方配件基本都是按不上去的。" +"不同配置间快速安全且有效的更换组件。\n" +"这个蛮有野心的轻机枪结合了一个重型枪管&前握柄，还有Leadworks的陀螺稳定系统，" +"并且有一个重新射击的100发弹容大弹鼓，但是就和这一系列的其他枪支一样，第三方配" +"件基本都是按不上去的。" #. ~ Description for L12 Defender #: lang/json/GUN_from_json.py @@ -36184,7 +36184,10 @@ msgstr[0] "PPSh-41冲锋枪" #: lang/json/GUN_from_json.py msgid "" "Popular among children. It's fairly accurate, but BBs deal nearly no damage." -msgstr "BB枪深受儿童们的喜爱。命中率不低，但是BB弹几乎无法造成伤害。" +msgstr "" +"BB枪是儿童们的专利，而你手中这把特制的BB枪也有着不同凡响的精准度，只是就BB弹" +"这种弹药来说...实在很难对敌人造成任何杀伤力。不过至少你可以用这把枪来将步枪技" +"能提升到1级。" #. ~ Description for Glock 19 #: lang/json/GUN_from_json.py @@ -36353,7 +36356,7 @@ msgstr[0] "S&W 629左轮" #: lang/json/GUN_from_json.py msgid "SIG 552" msgid_plural "SIG 552s" -msgstr[0] "" +msgstr[0] "SIG 552自动步枪" #: lang/json/GUN_from_json.py msgid "SIG Mosquito" @@ -36412,12 +36415,12 @@ msgstr "" #: lang/json/GUN_from_json.py msgid "Skorpion Vz. 61" msgid_plural "Skorpion Vz. 61s" -msgstr[0] "Skorpion Vz. 61 \"蝎\"式微冲" +msgstr[0] "Skorpion Vz。61 \"蝎\"式微冲" #: lang/json/GUN_from_json.py msgid "Skorpion Vz. 82" msgid_plural "Skorpion Vz. 82s" -msgstr[0] "Skorpion Vz. 82 \"蝎\"式微冲" +msgstr[0] "Skorpion Vz。82 \"蝎\"式微冲" #. ~ Description for FiveO handcannon #: lang/json/GUN_from_json.py @@ -36761,7 +36764,7 @@ msgid "" "The Skorpion Vz. 61 is a Czechosloavak submachine gun from the 1950s, " "chambered in .32 ACP." msgstr "" -"捷克斯洛伐克制造，Skorpion Vz. 61 \"蝎\"式微型冲锋枪。二十世纪五十年代研制，" +"捷克斯洛伐克制造，Skorpion Vz。61 \"蝎\"式微型冲锋枪。二十世纪五十年代研制，" "使用.32 ACP子弹，不错的消声小突突。" #. ~ Description for S&W 610 @@ -36921,7 +36924,7 @@ msgstr "" #. ~ Description for hell ball shooter #: lang/json/GUN_from_json.py msgid "The living hand of an imp. Its a bug that you can read this." -msgstr "" +msgstr "一个小鬼活生生的手，你能看到这个绝对是出BUG了。" #. ~ Description for Wrist DREAD #: lang/json/GUN_from_json.py @@ -36955,7 +36958,7 @@ msgid "" "synthetic model, carefully balanced to the same weight and handling yet " "offering support for modern accessories." msgstr "" -"这把莫辛纳甘步枪把传统木制枪托替换为现代合成枪托，并且精心调节至相同的重量及" +"这把莫辛纳甘步枪把传统木质枪托替换为现代合成枪托，并且精心调节至相同的重量及" "控制度，但又能接受现代改装配件。" #. ~ Description for tesla cannon turret @@ -37063,6 +37066,8 @@ msgid "" "short barrel, stock and hand guard. It can be reloaded using detachable " "magazines and is an overall much more effective weapon." msgstr "" +"这是一把射钉枪，被改造的面目全非，增加了一个短枪管，枪托和护木。它可以使用可" +"拆卸弹匣装填，总体上说是更为有效的武器。" #. ~ Description for Ichaival #: lang/json/GUN_from_json.py @@ -37538,7 +37543,7 @@ msgstr[0] "Wrist离心式武器" #. ~ Description for spider laser #: lang/json/GUN_from_json.py msgid "a laser gun mounted on the arachnatron. Or at least the carbine." -msgstr "" +msgstr "一个搭载在巨大蜘蛛上的激光枪，或者说卡宾。（调试标记）" #: lang/json/GUN_from_json.py msgid "accessories" @@ -37591,12 +37596,12 @@ msgstr[0] "基础冲锋枪" #: lang/json/GUN_from_json.py msgid "base flamethrower" msgid_plural "base flamethrowers" -msgstr[0] "" +msgstr[0] "基础火焰喷射器" #: lang/json/GUN_from_json.py msgid "base gun" msgid_plural "base guns" -msgstr[0] "" +msgstr[0] "基础枪械" #: lang/json/GUN_from_json.py msgid "base pistol" @@ -37744,7 +37749,7 @@ msgstr[0] "电磁轨道步枪" #: lang/json/GUN_from_json.py msgid "fire lance" msgid_plural "fire lances" -msgstr[0] "火铳" +msgstr[0] "火统" #: lang/json/GUN_from_json.py lang/json/vehicle_part_from_json.py msgid "flamecaster turret" @@ -37853,12 +37858,12 @@ msgstr[0] "重型轨道步枪" #: lang/json/GUN_from_json.py msgid "hell ball shooter" msgid_plural "hell ball shooters" -msgstr[0] "" +msgstr[0] "地狱球射击器。" #: lang/json/GUN_from_json.py msgid "hellfire plasma gun" msgid_plural "hellfire plasma guns" -msgstr[0] "" +msgstr[0] "地狱火等离子枪" #: lang/json/GUN_from_json.py msgid "hellfire stave" @@ -38040,7 +38045,7 @@ msgstr[0] "射钉步枪" #: lang/json/GUN_from_json.py msgid "napalm launcher" msgid_plural "napalm launchers" -msgstr[0] "凝固汽油球形弹发射器" +msgstr[0] "凝固汽油发射器" #: lang/json/GUN_from_json.py lang/json/vehicle_part_from_json.py msgid "needler turret" @@ -38105,7 +38110,7 @@ msgstr[0] "自制步枪（步枪弹）" #: lang/json/GUN_from_json.py msgid "pipe rifle" msgid_plural "pipe rifles" -msgstr[0] "" +msgstr[0] "铁管步枪" #: lang/json/GUN_from_json.py msgid "pipe rifle: .22" @@ -38224,7 +38229,7 @@ msgstr[0] "步枪炮台" #: lang/json/GUN_from_json.py msgid "rifles with manual actions" msgid_plural "rifles with manual actionss" -msgstr[0] "" +msgstr[0] "手动步枪" #: lang/json/GUN_from_json.py lang/json/vehicle_part_from_json.py msgid "ripper turret" @@ -38367,7 +38372,7 @@ msgstr[0] "幸存者卡宾枪" #: lang/json/GUN_from_json.py msgid "survivor lever rifle" msgid_plural "survivor lever rifles" -msgstr[0] "" +msgstr[0] "幸存者杠杆枪" #: lang/json/GUN_from_json.py msgid "survivor's carbine" @@ -38402,7 +38407,7 @@ msgstr[0] "测试枪" #. ~ Description for napalm launcher #: lang/json/GUN_from_json.py msgid "the /massive/ flamethrower mounted to the mancubus' arms." -msgstr "" +msgstr "这只“巨大”的火焰喷射器搭载在马库巴斯的臂膀上。" #. ~ Description for fusion blaster #. ~ Description for laser finger @@ -38507,6 +38512,17 @@ msgstr "" "一个12发的高分子聚合物弹夹，可用于Leadworks LLC公司出品的L39-45及L39B-45手" "枪。" +#. ~ Description for car battery +#: lang/json/MAGAZINE_from_json.py +msgid "A 12v lead-acid battery used to power car electrical systems." +msgstr "一个12伏铅酸蓄电池，通常用于一般车辆的电力系统。" + +#. ~ Description for motorbike battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A 12v lead-acid battery used to power smaller vehicles' electrical systems." +msgstr "一个12伏铅酸蓄电池，通常用于小型车辆的电力系统。" + #. ~ Description for RMSB20 magazine #: lang/json/MAGAZINE_from_json.py msgid "A 20 round box magazine for use with the RM20 caseless shotgun." @@ -38759,6 +38775,11 @@ msgstr "一个工厂生产的规范的8发弹夹，可用于SIG Sauer P230手枪 msgid "A high-capacity drum magazine for the PPSh-41." msgstr "一个大容量弹鼓，适用于PPSh-41冲锋枪。" +#. ~ Description for truck battery +#: lang/json/MAGAZINE_from_json.py +msgid "A large 12v lead-acid battery used to power truck electrical systems." +msgstr "大型12v铅酸电池，用来给卡车供电。" + #. ~ Description for welding tank #: lang/json/MAGAZINE_from_json.py msgid "" @@ -38767,6 +38788,13 @@ msgid "" msgstr "" "一个大型钢制圆筒，用于保存加压焊接气体。上面有着几个现已褪色无法分辨的标记。" +#. ~ Description for storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A large storage battery. Could be installed into a storage battery case for " +"easy removal from a vehicle, or just welded straight in." +msgstr "大型蓄电池。可被安装到蓄电池箱上，便于快速拆卸，也可以直接焊接。" + #. ~ Description for M1 Garand Clip #: lang/json/MAGAZINE_from_json.py msgid "" @@ -38781,6 +38809,11 @@ msgstr "" msgid "A lightweight aluminum box magazine for the H&K G3 rifle." msgstr "一个重量很轻的铝制弹夹，可用于H&K G3步枪。" +#. ~ Description for medium storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A medium storage battery." +msgstr "一个中型蓄电池。" + #. ~ Description for M9 magazine #: lang/json/MAGAZINE_from_json.py msgid "" @@ -38822,6 +38855,11 @@ msgid "" "A removable plastic magazine for the Saiga-12 shotgun. Holds 30 rounds." msgstr "一个可拆卸塑料弹夹，可用于Saiga-12霰弹枪。容量为30发。" +#. ~ Description for small storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A small storage battery. Useful for crafting." +msgstr "一种小型蓄电池，用于制造。" + #. ~ Description for Battle rifle magazine #: lang/json/MAGAZINE_from_json.py msgid "A standard 20-round magazine for military issue battle rifles." @@ -38830,13 +38868,13 @@ msgstr "一个标准20发弹夹，可用于军用战斗突击步枪上。" #. ~ Description for Skorpion Vz. 61 magazine #: lang/json/MAGAZINE_from_json.py msgid "A standard 20-round magazine for the Skorpion Vz. 61, in .32 ACP." -msgstr "一个标准的20发弹夹，可用于Skorpion Vz. 61 \"蝎\"式微冲。" +msgstr "一个标准的20发弹夹，可用于Skorpion Vz。61 \"蝎\"式微冲。" #. ~ Description for Skorpion Vz. 82 magazine #: lang/json/MAGAZINE_from_json.py msgid "" "A standard 20-round magazine for the Skorpion Vz. 82, in 9x18mm Makarov." -msgstr "一个标准的20发弹夹，可用于Skorpion Vz. 82 \"蝎\"式微冲。" +msgstr "一个标准的20发弹夹，可用于Skorpion Vz。82 \"蝎\"式微冲。" #. ~ Description for Thompson magazine #: lang/json/MAGAZINE_from_json.py @@ -38960,7 +38998,7 @@ msgstr "高级冲锋枪弹夹" #: lang/json/MAGAZINE_from_json.py msgid "Ammo belt" -msgstr "子弹带" +msgstr "弹链" #. ~ Description for FN SCAR-H drum magazine #: lang/json/MAGAZINE_from_json.py @@ -39414,11 +39452,11 @@ msgstr "Saiga-12霰弹枪鼓式弹夹" #: lang/json/MAGAZINE_from_json.py msgid "Skorpion Vz. 61 magazine" -msgstr "Skorpion Vz. 61 \"蝎\"式微冲弹夹" +msgstr "Skorpion Vz。61 \"蝎\"式微冲弹夹" #: lang/json/MAGAZINE_from_json.py msgid "Skorpion Vz. 82 magazine" -msgstr "Skorpion Vz. 82 \"蝎\"式微冲弹夹" +msgstr "Skorpion Vz。82 \"蝎\"式微冲弹夹" #: lang/json/MAGAZINE_from_json.py msgid "Small rifle magazine" @@ -39477,14 +39515,44 @@ msgstr "UZI冲锋枪弹夹" msgid "Walther PPK magazine" msgstr "瓦尔特 PPK 手枪弹夹" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "car battery" +msgid_plural "car batteries" +msgstr[0] "汽车电池" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "medium storage battery" +msgid_plural "medium storage batteries" +msgstr[0] "中型蓄电池" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "motorbike battery" +msgid_plural "motorbike batteries" +msgstr[0] "摩托车电池" + #: lang/json/MAGAZINE_from_json.py msgid "nail rifle magazine" msgstr "射钉步枪弹匣" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "small storage battery" +msgid_plural "small storage batteries" +msgstr[0] "小型蓄电池" + #: lang/json/MAGAZINE_from_json.py msgid "small welding tank" msgstr "小型焊接气瓶" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "storage battery" +msgid_plural "storage batteries" +msgstr[0] "蓄电池" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "truck battery" +msgid_plural "truck batteries" +msgstr[0] "卡车电池" + #: lang/json/MAGAZINE_from_json.py msgid "welding tank" msgstr "焊接气瓶" @@ -39613,7 +39681,7 @@ msgstr "自制枪械包" #: lang/json/MOD_INFO_from_json.py msgid "Crazy Cataclysm" -msgstr "疯狂的大灾变" +msgstr "疯狂大灾变" #: lang/json/MOD_INFO_from_json.py msgid "DeadLeaves' Fictional Guns" @@ -39701,7 +39769,7 @@ msgstr "Icecoon的武器包" #: lang/json/MOD_INFO_from_json.py msgid "Improved survivor weapons" -msgstr "改进的幸存者武器" +msgstr "自制幸存者武器" #. ~ Description for Folding Parts pack #: lang/json/MOD_INFO_from_json.py @@ -39786,7 +39854,7 @@ msgstr "PK重新平衡MOD" #: lang/json/MOD_INFO_from_json.py msgid "Perfect Reliability" -msgstr "" +msgstr "完美汽车可靠性" #: lang/json/MOD_INFO_from_json.py msgid "Prevent Zombie Revivication" @@ -39797,23 +39865,23 @@ msgstr "沉睡的丧尸" msgid "" "Rebalances survivor weapons to become a more viable alternative compared to " "their factory equivalents." -msgstr "" +msgstr "重平衡幸存者武器让它们相比工厂制品成为更加可行的替代物。" #. ~ Description for No Acid Zombies #: lang/json/MOD_INFO_from_json.py msgid "Removes all acid-based zombies from the game." -msgstr "去除游戏中的酸液类丧尸。" +msgstr "去除游戏中的酸液类僵尸。" #. ~ Description for No Monsters #: lang/json/MOD_INFO_from_json.py msgid "" "Removes all monsters from the game, save for those in the WILDLIFE category." -msgstr "移除所有在 WILDLIFE目录下的怪物。" +msgstr "移除所有在怪物，除了在wildlife分类下的那些。" #. ~ Description for Mundane Zombies #: lang/json/MOD_INFO_from_json.py msgid "Removes all special zombies from the game." -msgstr "去除游戏中的特殊丧尸。" +msgstr "去除游戏中的特殊僵尸。" #. ~ Description for No Antique Firearms #: lang/json/MOD_INFO_from_json.py @@ -39913,12 +39981,12 @@ msgstr "载具增强包" msgid "" "Vehicle parts are perfectly reliable and never spawn with faults or develop " "them during use" -msgstr "" +msgstr "汽车部件完全可靠，部件生成及使用时不会故障。" #. ~ Description for Crazy Cataclysm #: lang/json/MOD_INFO_from_json.py msgid "Want a little crazy in your Cataclysm? Try this one." -msgstr "想让你的大灾变疯狂一点？试试这个。" +msgstr "想让游戏看起来疯狂一些? 试试这个." #: lang/json/MOD_INFO_from_json.py msgid "Zombie Nightvision" @@ -39935,7 +40003,7 @@ msgstr "默认" #: lang/json/MONSTER_from_json.py msgid " alpha razorclaw" -msgstr "" +msgstr "利爪怪首领" #. ~ Description for bowfin #: lang/json/MONSTER_from_json.py @@ -40177,7 +40245,7 @@ msgid "" "move so fast they appear to be nothing but blurs." msgstr "" "一个怪异的人形生物，却有着一双炯炯有神的眼睛。它的双手抽搐如此之快，几乎只能" -"看见残影……腐山无影手？" +"看见残影...腐山无影手？" #. ~ Description for blob #: lang/json/MONSTER_from_json.py @@ -40198,7 +40266,7 @@ msgstr "黑色扭曲的丧尸，肉块挂在其身上，不停的发出阴霾的 msgid "" "A blood red, gigantic razorclaw. Its sword like pincers serve as the " "keepers of the nest." -msgstr "" +msgstr "一只浑身血红色，体型巨大的利爪怪。它那剑一般的钳子用于守护巢穴。 " #. ~ Description for mosquito #: lang/json/MONSTER_from_json.py @@ -40206,7 +40274,7 @@ msgid "" "A blood-sucking fly with a needle-like proboscis. Its bite leaves behind " "itchy welts and can easily spread disease." msgstr "" -"会吸血的怪物，带有针状喙，就像蜂鸟一样，非常容易被伤到，小心它带来的传染病。" +"会吸血的怪物，带有针状喙，就像蜂鸟一样，非常容易被伤到，小心它带来的传染病." #. ~ Description for bluegill #: lang/json/MONSTER_from_json.py @@ -40254,7 +40322,8 @@ msgid "" "antennae seem almost aesthetic, or at the least not used for sensing . . ." msgstr "" "这种蚂蚁有一个长而且臃肿的胸腔，鼓鼓囊囊的全是数以百计的小蚂蚁卵。它移动缓" -"慢，倾向于在附近下更多的蚂蚁卵。它的触角似乎仅仅是美观用途，至少没有感知功能…" +"慢，倾向于在附近下更多的蚂蚁卵。它的触角似乎仅仅是美观用途，至少没有感知功" +"能..." #. ~ Description for crawler #: lang/json/MONSTER_from_json.py @@ -40273,7 +40342,7 @@ msgid "" "out of this monsters many bloated and oozing wounds.." msgstr "" "一个腐烂的尸体，即便它正在四处游荡猎杀。成群的苍蝇在这怪物许多臃肿和渗血的伤" -"口里进进出出…" +"口里进进出出..." #. ~ Description for mancubus #: lang/json/MONSTER_from_json.py @@ -40349,15 +40418,14 @@ msgid "" "A defiled human body, once living. Tortured to death long ago, it remains " "chained to the altar, the putrescent flays of its peeled skin quivering like " "so much flotsam upon a murky pond." -msgstr "" -"人形生物，被折磨至死很久了，被绑在祭坛，腐烂的躯体不停的在血泊之中颤抖着。" +msgstr "人形生物，被折磨至死很久了，被绑在祭坛，腐烂的躯体不停的颤抖着." #. ~ Description for scarred zombie #: lang/json/MONSTER_from_json.py msgid "" "A deformed human body, its skin has been transformed into one thick, " "calloused envelope of scar tissue." -msgstr "一个畸形丧尸，皮肤已经转变成为类似于伤疤的厚组织，可以抵御钝器攻击。" +msgstr "一个畸形丧尸，皮肤非常的厚，可以抵御钝器攻击." #. ~ Description for grabber zombie #: lang/json/MONSTER_from_json.py @@ -40381,7 +40449,9 @@ msgid "" "A distorted human body with sleek muscles. Its jaws have elongated into a " "ursine-like snout, dripping with foul smelling saliva." msgstr "" -"一个扭曲且长着滚圆肌肉的人体。它的颌已经长的巨熊的嘴一般，滴落着恶臭的唾液。" +"一个变软扭曲带着黏滑肌肉的人类尸体。它的下巴变软拉长,吊在颈前晃晃悠悠的样子让" +"你想起了海象,不不不,不是Jamie Hyneman,是真的海象...。而且还有恶臭的口水不断滴" +"下来." #. ~ Description for tentacle dog #: lang/json/MONSTER_from_json.py @@ -40435,7 +40505,7 @@ msgid "" "stealth. Its bite can be irritating even to large animals." msgstr "" "相当大的蜘蛛，远远地跟踪着猎物，有着与体型不符的敏捷度，其毒素甚至可以杀死一" -"些大型动物。" +"些大型动物." #. ~ Description for slimespring #: lang/json/MONSTER_from_json.py @@ -40456,7 +40526,7 @@ msgstr "" msgid "" "A fat white grub as big as a squirrel, with a pair of large, spadelike " "mandibles." -msgstr "一直犹如松鼠大小的肥大蠕虫，下颚非常锋利。" +msgstr "一直肥大的蠕虫，下颚非常锋利." #. ~ Description for Gallimimus #: lang/json/MONSTER_from_json.py @@ -40511,9 +40581,7 @@ msgstr "" msgid "" "A formless slime mold the size of a cow. Crusty bits of cytoplasm fall away " "as it oozes across the ground." -msgstr "" -"一种没有形体的菌类，有小牛大小，随着它在地上爬行，不断有细小的孢子在身后飘" -"落。" +msgstr "一种无形的菌类，有小牛大小，少量的细胞质消失，渗入地下." #. ~ Description for fungal shocker #: lang/json/MONSTER_from_json.py @@ -40521,6 +40589,8 @@ msgid "" "A fungal Zombie with bionic implants, it uses its energy to harm others " "despite the harm it can cause its own flesh." msgstr "" +"一只带有生化插件的真菌丧尸，使用能量为武器来伤害别人，丝毫不顾那些能量也能对" +"自身血肉造成伤害。" #. ~ Description for fungal sporeling #: lang/json/MONSTER_from_json.py @@ -40540,7 +40610,7 @@ msgid "" "mayhem around it." msgstr "" "核聚变驱动的无人机，有一个超高分辨率的相机镜头，经常在地面盘旋，拍摄目标的照" -"片。" +"片." #. ~ Description for shoggoth #: lang/json/MONSTER_from_json.py @@ -40560,21 +40630,21 @@ msgid "" "human bones." msgstr "" "一个有着半透明肉体的憔悴身影，这恶魔军队的中坚力量在每个肩膀上安装了一轮制导" -"火箭。它的拳头比任何人类都要强大得多。" +"火箭。它的拳头可以轻易击碎人类骨头。" #. ~ Description for giant black widow #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated black widow spider. A highly venomous nightmare come to " "life." -msgstr "一只巨大的突变体黑寡妇蜘蛛，且毒素更加猛烈，犹如噩梦来袭。" +msgstr "一只巨大的突变体黑寡妇蜘蛛，且毒素更加猛烈，犹如噩梦来袭." #. ~ Description for giant web spider #: lang/json/MONSTER_from_json.py msgid "" "A giant mutated grass spider, it waits for prey to become ensnared in the " "vast webs that it weaves between the trees." -msgstr "巨大的织网蜘蛛，在丛林树木间编织这死亡的蛛网，等待猎物的上门。" +msgstr "巨大的织网蜘蛛，在丛林树木间编织这死亡的蛛网，等待猎物的上门." #. ~ Description for giant jumping spider #: lang/json/MONSTER_from_json.py @@ -40628,14 +40698,14 @@ msgid "" "its abdomen. Its exoskeleton glowers with ominous red markings." msgstr "" "一只巨大的细长黄蜂，其巨大的尾刺从腹部伸出，全身是代表不详的红色斑纹，请赶紧" -"远离他。" +"远离他." #. ~ Description for giant trapdoor spider #: lang/json/MONSTER_from_json.py msgid "" "A gigantic spider with a bulbous thorax. It digs a deep underground burrow " "that serves as a pit to trap unwary prey." -msgstr "会掘土的神奇蜘蛛，会挖掘出一个大坑，等待粗心大意的猎物掉入陷阱。" +msgstr "会掘土的神奇蜘蛛，会挖掘出一个大坑，等待粗心大意的猎物掉入陷阱." #: lang/json/MONSTER_from_json.py msgid "" @@ -40659,7 +40729,7 @@ msgid "" "grotesquely stretched out, its limbs deformed to unrecognizable outgrowths." msgstr "" "犹如地狱出来的未知生物，类似人形，两层楼高，脸看上去完全畸变了，扭曲的四肢非" -"常慎人。" +"常慎人." #. ~ Description for horse #: lang/json/MONSTER_from_json.py @@ -40725,22 +40795,20 @@ msgid "" "A huge mutated worm found deep underground. It has a gaping round mouth " "lined with dagger-like teeth, and its flesh is slick with bubbling blue " "slime." -msgstr "" -"一只巨大的黑色蠕虫突变体，隐匿在地下深处。有一圈锋利的入刀刃般的搅齿，身体非" -"常光滑，血肉中闪着蓝色粘液的光。" +msgstr "蠕虫突变体，隐匿在地下，有一圈锋利的入刀刃般的搅齿，身体非常光滑." #. ~ Description for zombie cop #: lang/json/MONSTER_from_json.py msgid "" "A human body covered by a weather-beaten and badly damaged set of riot gear." -msgstr "饱经蹂躏的人体，翻开的皮肉上穿着严重损坏的防暴装备。" +msgstr "曾经的警察，身上披着经历了风吹雨打受损严重的防暴装备。" #. ~ Description for zombie hulk #: lang/json/MONSTER_from_json.py msgid "" "A human body now swollen to the size of six men, with arms as wide as a " "trash can." -msgstr "一个不知为何长到六个人大小的怪物，两臂比垃圾桶还健壮。" +msgstr "六个人大小的怪物，两臂比垃圾桶还健壮." #. ~ Description for hungry zombie #: lang/json/MONSTER_from_json.py @@ -40749,13 +40817,13 @@ msgid "" "dangerous. While it still stumbles around slowly, there is little doubt " "about what it would do to you if you let it." msgstr "" -"一个人的身体，似乎…收缩成某种更为危险的生物。虽然它看似缓慢的毫无目的的四处游" -"荡，但你清楚的知道对它会对你做什么事情，如果你让他靠近的话。" +"一个人的身体，似乎...收缩成某种更为危险的生物。虽然它看似缓慢的毫无目的的四处" +"游荡，但你清楚的知道对它会对你做什么事情，如果你让他靠近的话。" #. ~ Description for shocker zombie #: lang/json/MONSTER_from_json.py msgid "A human body with pale blue flesh, crackling with electrical energy." -msgstr "这具丧尸的尸体是淡蓝色的，并且周围不断有噼啪的电流环绕。" +msgstr "人型，龟裂的肉体上环绕着威力可怕的蓝色电能，小心." #. ~ Description for twisted body #: lang/json/MONSTER_from_json.py @@ -40763,7 +40831,7 @@ msgid "" "A human body, but with its limbs, neck, and hair impossibly twisted. It " "clambers around swiftly, making awful screeching sounds." msgstr "" -"一具人类的尸体，但是他的四肢、颈部、和头发均不可思议的扭曲。它飞快地在四处攀" +"有着人类的身体，但是他的四肢、颈部、和头发均不可思议的扭曲。它飞快地在四处攀" "爬，并发出可怕的尖叫声。" #. ~ Description for zombie @@ -40798,7 +40866,7 @@ msgid "" "of vascular tissue reach out to the surrounding root walls." msgstr "" "像毛细血管的树根流动着不明的血液，连接到中心的类似心脏的部位，周围的墙壁看上" -"去像是人体内。" +"去像是人体内." #. ~ Description for turkey #: lang/json/MONSTER_from_json.py @@ -40881,7 +40949,7 @@ msgid "" "another." msgstr "" "拥有发达纤细的前肢的小蜘蛛，移动非常迅速且，可以瞬间从一个地方跳跃到另一个地" -"方。" +"方." #. ~ Description for fungal tendril #: lang/json/MONSTER_from_json.py @@ -40921,6 +40989,8 @@ msgid "" "most horrible of shrieks. Often spotted near shipwrecks or other dark damp " "places, which it uses as nesting grounds." msgstr "" +"一只人型大小的甲壳类生物，浑身覆盖着铁一样甲壳，能发出最为恐怖的尖叫声。经常" +"在它用作筑巢地点沉船或其他黑暗潮湿的地方附近被发现。" #. ~ Description for hunting horror #: lang/json/MONSTER_from_json.py @@ -41008,7 +41078,7 @@ msgstr "一种身体覆盖有羽毛的中型两足恐龙。每只脚的尽头有 msgid "" "A meter-long centipede with a menacing pair of pincers, moving swiftly on " "dozens of spindly legs." -msgstr "一公尺长的蜈蚣，两对钳子的力度非常大，移动依靠几十条腿。" +msgstr "一公尺长的蜈蚣，两对钳子的力度非常大，移动依靠几十条腿." #. ~ Description for trapdoor spider #: lang/json/MONSTER_from_json.py @@ -41049,7 +41119,7 @@ msgid "" "hidden underground." msgstr "" "一只体型巨大的野兽，三瓣嘴，露出骇人的数百利齿与充满尖刺的舌头，他的大部分身" -"体隐藏在地下。" +"体隐藏在地下." #. ~ Description for giant cockroach #: lang/json/MONSTER_from_json.py @@ -41067,14 +41137,14 @@ msgstr "跟小狗一样大的变异蟑螂。它的腹部非常肿胀。" msgid "" "A mutant, terrestrial variety of the signal crayfish, this massive " "crustacean resembles a humongous lobster." -msgstr "一只突变陆生淡水蟹，长得像只无比巨大的龙虾。" +msgstr "一只突变陆生淡水龙虾，长着巨大的甲壳。" #. ~ Description for giant frog #: lang/json/MONSTER_from_json.py msgid "" "A mutated bullfrog taller than you are. It stares with amber eyes as it " "considers the easiest way to swallow you whole." -msgstr "突变的牛蛙，他的琥珀色眼睛一直盯着你，小心被吞掉。" +msgstr "突变的牛蛙，他的琥珀色眼睛一直盯着你，小心被吞掉." #. ~ Description for giant slug #: lang/json/MONSTER_from_json.py @@ -41107,7 +41177,7 @@ msgstr "" msgid "" "A mutated wasp nearly the size of a cat, with a barbed ovipositor extruding " "from the abdomen." -msgstr "普通猫咪大小的恐怖黄蜂，如果被其蛰到肯定不好受。" +msgstr "普通猫咪大小的恐怖黄蜂，如果被其蛰到肯定不好受." #. ~ Description for immature giant cellar spider #: lang/json/MONSTER_from_json.py @@ -41141,7 +41211,7 @@ msgid "" "A pale hairless man with an impressive athletic physique. Its lidless eyes " "are totally black, and seeping with blood." msgstr "" -"一个皮肤光滑无毛的人，躯体如同运动员一般健壮，眼睛纯黑色，渗出冰冷的鲜血。" +"一个皮肤光滑无毛的人，躯体入运动员一般健壮，眼睛纯黑色，渗出冰冷的鲜血." #. ~ Description for fungaloid #: lang/json/MONSTER_from_json.py @@ -41183,13 +41253,13 @@ msgid "" "from the stems like wary harpoons." msgstr "" "迅速蔓延的树木状花朵，巨大的红色花瓣里充满了孢子，两个带厚刺的蔓藤比鱼叉更具" -"危险性。" +"危险性." #. ~ Description for centipede #: lang/json/MONSTER_from_json.py msgid "" "A predatory segmented arthropod with dozens of legs and a venomous bite." -msgstr "拥有十数个腿的节肢动物，非常富有攻击性。" +msgstr "拥有十数个腿的节肢动物，非常富有攻击性." #. ~ Description for glowing biollante #: lang/json/MONSTER_from_json.py @@ -41207,7 +41277,7 @@ msgstr "" msgid "" "A pulsating sausage of glistening white flesh, the size of a large cat. On " "one end is a set of squirming mouth parts." -msgstr "浑身看起来像是白色果肉的蠕动香肠，体型像猫一样，一端是蠕动的锋利口器。" +msgstr "浑身看起来像是白色果肉的蠕动香肠，体型像猫一样，一端是蠕动的锋利口器." #. ~ Description for jabberwock #: lang/json/MONSTER_from_json.py @@ -41227,13 +41297,13 @@ msgid "" "about rapidly and the mouths form a chorus of groaning screams. Its coming " "for you" msgstr "" -"这个血肉傀儡是由腐烂的人类和动物躯体融合在一起组成，它飞快的移动着所有头上的" -"眼睛。口中发出尖叫和呻吟。它正朝你冲过来" +"这个肉傀儡由腐烂的人类和动物躯体融合在一起组成,它飞快的移动着所有头上的眼睛." +"口中发出尖叫和呻吟。它正朝你冲过来" #. ~ Description for fungal boil #: lang/json/MONSTER_from_json.py msgid "A quick-growing mass of spores, wafting around vague with purpose." -msgstr "" +msgstr "一团快速成长的孢子，漫无目的的四处飘拂。" #. ~ Description for cyclopean #: lang/json/MONSTER_from_json.py @@ -41260,7 +41330,7 @@ msgid "" "drips with a frothing gray sludge." msgstr "" "这具腐败的丧尸身上充满了浮肿的烂肉和发芽的真菌。更恐怖的是这货的嘴里流淌着污" -"泥。" +"泥..." #. ~ Description for dionaea #: lang/json/MONSTER_from_json.py @@ -41278,8 +41348,8 @@ msgid "" "A rotund human body, bloated beyond belief and layered in rolls of fat. It " "emits a horrible odor, and a putrid pink sludge dribbles from its mouth." msgstr "" -"臃肿的难以相信的躯体，脂肪堆积在一起，它发出一种令人恐惧的气味，粉红色的粘液" -"从它口中滴下来。" +"臃肿的难以相信的躯体，脂肪堆积在一起，它发出一种令人恐惧的气味，口中会喷出腐" +"烂的粉红色液体." #. ~ Description for salmon #: lang/json/MONSTER_from_json.py @@ -41302,6 +41372,8 @@ msgid "" "own flames it attacks with pyrokinesis and breathes life into its fallen " "allies." msgstr "" +"一个粘粘的黄色加长的人形怪物。几乎可以完全控制它身子周围的火焰，使用热能攻" +"击，并且把生命吹进倒下的同伴之中。" #. ~ Description for acidic zombie #: lang/json/MONSTER_from_json.py @@ -41318,8 +41390,9 @@ msgid "" "A slab of festering muscle the size of a well-toned bodybuilder. Seems " "eager to strangle the life from you." msgstr "" -"一大坨溃烂的肌肉，有着如身材结实的健美爱好者体型般大小。看起来急于把你活活掐" -"死。" +"一只肌肉溃烂的丧尸兄贵,威风犹在的健美经历让这货看起来仍然块头不小。看上去他迫" +"不及待的想把你弄死，如果你包里有肥皂的话,我建议你尽最大的可能将它保管好,别掉" +"了." #. ~ Description for wasp #: lang/json/MONSTER_from_json.py @@ -41392,7 +41465,7 @@ msgid "" "austerity, it is the mortal enemy of cat and dog alike." msgstr "" "一只小型食谷类啮齿动物，长有浓密毛发的尾巴，经常可以看到它在树枝间穿梭，表情" -"坚定又淘气，惧怕猫和狗。" +"坚定又淘气，惧怕猫和狗." #. ~ Description for raccoon #: lang/json/MONSTER_from_json.py @@ -41440,7 +41513,7 @@ msgstr "一个小的三尖树，只有几英尺高。尚未长出树皮，但是 msgid "" "A small, elegant black bird, famous for its distinctive call. An " "intelligent bird, there is a glitter of mischief behind its eyes." -msgstr "优雅蠢萌的小黑鸟，叫声奇特，非常聪明，喜欢恶作剧。" +msgstr "优雅蠢萌的小黑鸟，叫声奇特，非常聪明，喜欢恶作剧." #. ~ Description for exploder #: lang/json/MONSTER_from_json.py @@ -41462,20 +41535,19 @@ msgstr "" msgid "" "A snake-like, segmented robot built to tunnel into the ground and detonate " "landmines." -msgstr "蛇形分段机器人，设计用于探测并引爆地雷。" +msgstr "蛇形分段机器人，被建造用以探测地雷." #. ~ Description for bobcat #: lang/json/MONSTER_from_json.py msgid "" "A spotted wild cat living across much of North America. It is not a serious " "threat to humans, but it can be aggressive if not left alone." -msgstr "" -"一只生活于北美的野生猫。对人类不构成威胁，但当你打扰它时也会变得有攻击性。" +msgstr "一只生活于北美的野生猫，并不具有很强的攻击性，你甚至可以试图圈养它." #. ~ Description for half worm #: lang/json/MONSTER_from_json.py msgid "A squiggling severed portion of a wounded giant worm." -msgstr "吃苹果时看到几条虫最令人恐怖？半条被切断了的巨大蠕虫。" +msgstr "吃苹果时看到几条虫最令人恐怖？半条被切断了的巨大蠕虫." #: lang/json/MONSTER_from_json.py msgid "" @@ -41504,12 +41576,12 @@ msgid "" "A stout woody plant that can dig through the ground and flick spines from " "its branches. The thorns carry a fungicidal compound with paralytic effects." msgstr "" -"矮胖的草本植物，可以挖掘仙境和尖利的荆棘，荆棘上携带有真菌，具有麻痹效果。" +"矮胖的草本植物，可以挖掘仙境和尖利的荆棘，荆棘上携带有真菌，具有麻痹效果." #. ~ Description for shadow #: lang/json/MONSTER_from_json.py msgid "A strange moving darkness, bringing with it the softest of whispers." -msgstr "一团奇怪的黑影，带着某些听不清的呢喃。" +msgstr "一团奇怪的黑影，带着某些听不清的呢喃." #. ~ Description for Blinky #: lang/json/MONSTER_from_json.py @@ -41594,7 +41666,7 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "" "A thin-bodied insectoid predator with a large wingspan and big compound eyes." -msgstr "昆虫捕食者，具有巨大的苍蝇翅膀和复眼。" +msgstr "昆虫捕食者，具有巨大的苍蝇翅膀和复眼." #. ~ Description for creeper vine #: lang/json/MONSTER_from_json.py @@ -41620,6 +41692,8 @@ msgid "" "playground exercise. It does not need a face for you to feel bad about " "killing it." msgstr "" +"一具小小的被烧焦的尸体，跳跃、蹬踢并四处挥舞手臂宛如拙劣模仿着操场运动。它可" +"没长着一张让你杀了它后感到愧疚的脸。" #. ~ Description for squirrel #: lang/json/MONSTER_from_json.py @@ -41670,7 +41744,7 @@ msgstr "" #. ~ Description for shadow snake #: lang/json/MONSTER_from_json.py msgid "A translucent black snake, long and fearsome looking." -msgstr "一条半透明黑蛇，躯体非常长，长得很吓人。" +msgstr "半透明的乌蛇，躯体非常长." #. ~ Description for giant fly #: lang/json/MONSTER_from_json.py @@ -41789,8 +41863,8 @@ msgid "" "A worm-tailed rodent with long whiskers and beady eyes. The way it squeaks " "makes it sound... hungry." msgstr "" -"一只有着蠕虫一样尾巴的啮齿动物，眼睛像鹰一般锐利，他的叫声听起来像是……饿了，" -"快跑!" +"一只有着蠕虫一样尾巴的啮齿动物，眼睛像鹰一般锐利，他的叫声听起来像是........" +"饿了，快跑!" #. ~ Description for wrecked animatronic fox #: lang/json/MONSTER_from_json.py @@ -41871,7 +41945,7 @@ msgstr "异特龙" msgid "" "Also known as the woodchuck, this ground squirrel has no actual talent for " "chucking wood." -msgstr "被称为土拨鼠，这只生活在地面上的松鼠科动物喜欢掘土，神出鬼没。" +msgstr "被称为土拨鼠，喜欢掘土，神出鬼没。" #. ~ Description for zombie scrapper #: lang/json/MONSTER_from_json.py @@ -41898,9 +41972,7 @@ msgid "" "An aggressive mutant variety of the worm snake, turned pale yellow from its " "underground life. It swarms beneath the ground and is named for its habit " "of infesting sewer lines." -msgstr "" -"灼灼逼人的突变蛇，淡黄色躯体，喜欢在地下生活，尤其喜欢群聚在下水道，并因此得" -"名。" +msgstr "灼灼逼人的突变蛇，淡黄色躯体，喜欢在地下生活，尤其喜欢群聚在下水道." #. ~ Description for thing #: lang/json/MONSTER_from_json.py @@ -41930,8 +42002,7 @@ msgid "" "speed. The tangle is thick enough that the center from which they grow is " "concealed." msgstr "" -"地面充满了藤蔓和竞技，这些植物以惊人的速度像四周蔓延，他们成长的源头非常隐" -"蔽。" +"地面充满了藤蔓和竞技，这些植物以惊人的速度像四周蔓延，他们成长的源头非常隐蔽." #. ~ Description for vine beast #: lang/json/MONSTER_from_json.py @@ -42043,8 +42114,8 @@ msgstr "" #. ~ Description for giant mosquito #: lang/json/MONSTER_from_json.py msgid "" -"An enormous mutant mosquito, fluttering erratically, its face dominated by a " -"long, spear-tipped proboscis." +"An enormous mutant mosquito, fluttering erratically. Its face is dominated " +"by a long, spear-tipped proboscis." msgstr "" "一只巨大的蚊子，飞的飘忽不定，脸上长着一个又长又尖的细管，想不想被戳一下？" @@ -42071,9 +42142,7 @@ msgid "" "An enormous white flatworm that burrows beneath the earth. Its mouth is " "lined with pointed teeth, and it is covered in fine hairs which can be shed " "and fired like darts." -msgstr "" -"白色毛绒的鼻涕虫，在地下移动。它的嘴里长着锋利的尖牙，它体表覆盖的刚毛可以蜕" -"下甚至当成飞镖一样发射。" +msgstr "白色毛绒的鼻涕虫，在地下移动，他的牙齿甚至可以当成飞镖一样发射." #. ~ Description for giant worm #: lang/json/MONSTER_from_json.py @@ -42083,7 +42152,7 @@ msgid "" "shoulder, with even more surely hiding underground." msgstr "" "一只巨大的变异生物，你一度认为他可能是魔鬼，长有吸血鬼般的尖牙利齿和修长的体" -"格，边上肯定还有更多同类藏在地底下。" +"格，祝你好运.，他就在你身边。" #. ~ Description for flaming eye #: lang/json/MONSTER_from_json.py @@ -42164,8 +42233,8 @@ msgid "" "still alive. Clad in a tattered lab coat, it looks to have some measure of " "situational awareness and resourcefulness." msgstr "" -"若不是那双完全漆黑的眼睛，你还会认为他还活着。身穿破烂的白色研究院大衣，看起" -"来还有着一定的环境感知能力和智谋。" +"乌黑明亮的眼睛使你认为他可能还活着，神着破烂的白色研究院大衣.他生前一定足智多" +"谋." #. ~ Description for zombie hollow #: lang/json/MONSTER_from_json.py @@ -42200,6 +42269,7 @@ msgid "" "Charred zombie with bony plates, spikes and protursions. Moves stiffly, but " "swiftly." msgstr "" +"烧焦的丧尸，但是有着骨质的甲壳，尖刺和凸起。移动的虽然僵硬，但是很敏捷。" #: lang/json/MONSTER_from_json.py msgid "Compsognathus" @@ -42207,7 +42277,7 @@ msgstr "美颌龙" #: lang/json/MONSTER_from_json.py msgid "Crayfish" -msgstr "喇蛄" +msgstr "小龙虾" #: lang/json/MONSTER_from_json.py msgid "Deinonychus" @@ -42278,7 +42348,7 @@ msgstr "似鸡龙" msgid "" "Heavily burned zombie that still reeks of charred flesh. Its flesh has " "mended into a leathery shell." -msgstr "" +msgstr "严重烧伤的丧尸，烧焦的血肉散发着恶臭。它的肉已经融化为一层皮甲似的壳。" #. ~ Description for Crayfish #: lang/json/MONSTER_from_json.py @@ -42326,7 +42396,7 @@ msgstr "年纪轻轻就被变成丧尸的萝莉，看着她无神的瞳孔，你 #: lang/json/MONSTER_from_json.py msgid "" "Its entire body bulges with distended muscles and swollen, festering wounds." -msgstr "整个身体都是巨型肌肉的怪物，肿胀化脓的伤口，非常危险，不要硬拼。" +msgstr "整个身体都是巨型肌肉的怪物，肿胀化脓的伤口，非常危险，不要硬拼." #. ~ Description for zombie reaver #: lang/json/MONSTER_from_json.py @@ -42364,9 +42434,9 @@ msgid "" "always been kept under extremely tight control, so as to itself maintain " "extremely tight control of its area. And then the Cataclysm struck." msgstr "" -"Leadworks LLC公司的T-107A1截击者，装备着使用.50 BMG子弹的反器材自动步枪。因为" -"其数不胜数进行车辆爆破的尝试，它一直被极端严密的控制着，反过来它又极端严密的" -"控制着周围区域。就在这时候大灾变降临了。" +"Leadworks LLC公司的 T-107A1截击者，装备着使用.50 BMG子弹的反器材自动步枪。因" +"为其数不胜数进行车辆爆破的尝试，它一直被极端严密的控制着，反过来它又极端严密" +"的控制着周围区域。就在这时候大灾变降临了。" #. ~ Description for milspec turret #: lang/json/MONSTER_from_json.py @@ -42465,9 +42535,7 @@ msgstr "" msgid "" "Once human, fungal tendrils now sprout from its mouth, eyes, and other " "orifices, holding together a shambling mass of mold-covered flesh." -msgstr "" -"曾是个人类，但现在真菌从他们的口中、眼睛、耳朵处发芽而出，菌丝连接起蹒跚的被" -"霉菌覆盖的躯体。" +msgstr "真菌从他们的口中、眼睛、耳朵处发芽而出，蹒跚的移动着躯体." #. ~ Description for zombie master #: lang/json/MONSTER_from_json.py @@ -42489,8 +42557,7 @@ msgid "" "it maintains its programmed pursuit of law and order, propelled on a trio of " "omni wheels." msgstr "" -"在文明毁灭前的各类型号的装甲执法机器人之一。如同其他的机器人一样采用太阳能驱" -"动。它仍然保留了执法程序，追求着法律与秩序，采用三轮驱动。" +"在文明毁灭前的执法机器人，被非法改装程序之后非常具有威胁性，太阳能驱动，三轮." #. ~ Description for tardigrade #: lang/json/MONSTER_from_json.py @@ -42515,7 +42582,7 @@ msgid "" "navigate through tricky terrain at rapid speeds." msgstr "" "昼伏夜出的蝙蝠，可以飞行的哺乳动物，以昆虫为食，一般群居在山洞或者其他凹陷" -"处，使用超声波定位和导航，移动非常迅速。" +"处，使用超声波定位和导航，移动非常迅速." #. ~ Description for fant #: lang/json/MONSTER_from_json.py @@ -42530,7 +42597,7 @@ msgid "" "Pale, sickly gray in color, this giant ant's cracked exoskeleton is barely " "held together by coils of fungus erupting from every joint in its body." msgstr "" -"苍白色的躯体充满了真菌的巨大蚂蚁，真菌的尖刺把身体勉强组合在一起不让其散架。" +"苍白色的躯体充满了真菌的巨大蚂蚁，真菌的尖刺把身体勉强组合在一起不让其散架." #: lang/json/MONSTER_from_json.py msgid "Parasaurolophus" @@ -42573,7 +42640,7 @@ msgid "" "Somehow this brute hides in the dark like some kind of boogeyman. Very " "agile for such a large zombie." msgstr "" -"不知何故这只丧尸兽像某种恶灵一样躲在黑暗之中。相较于体型这么大的丧尸，其行动" +"不知何故这只丧尸兽像某种恶灵一样躲在黑暗之中。相较于体型这么大的僵尸，其行动" "十分敏捷。" #. ~ Description for charged hissing brood @@ -42661,7 +42728,7 @@ msgid "" "considerable threat, although most individuals are shy around humans." msgstr "" "美国黑熊，杂食性动物，强大的爪子和锋利的牙齿，可以有效的伏击猎人，造成的威胁" -"相当小，当然，那只是大灾变之前。" +"相当小，当然，那只是大灾变之前." #. ~ Description for bull frog #: lang/json/MONSTER_from_json.py @@ -42669,7 +42736,7 @@ msgid "" "The American bullfrog, in its natural habitat. It feeds on insects, mice, " "lizards and any other living thing it can stuff down its gullet." msgstr "" -"美国牛蛙，在自然栖息地生活，他捕食昆虫、老鼠、蜥蜴等，食道可以过滤掉残渣。" +"美国牛蛙，在自然栖息地生活，他捕食昆虫、老鼠、蜥蜴等，食道可以过滤掉残渣." #. ~ Description for mink #: lang/json/MONSTER_from_json.py @@ -42686,9 +42753,7 @@ msgstr "" msgid "" "The C.H.U.D. or Cannibalistic Humanoid Underground Dweller. A human being " "turned pale and mad from years of underground isolation." -msgstr "" -"C.H.U.D（Cannibalistic Humanoid Underground Dweller，寄居地下的食人者）食人" -"族，地下居住者，多年在地铁里脸色发白……它还是不是人呢？" +msgstr "食人族，地下居住者，多年在地铁里脸色发白...它还是不是人呢？" #. ~ Description for cougar #: lang/json/MONSTER_from_json.py @@ -42697,8 +42762,8 @@ msgid "" "region, conservation efforts were successful in restoring a thriving " "population." msgstr "" -"东部美洲狮，大型猫科食肉动物。曾经在这一地区被认为已经灭绝，但是经过保育，在" -"大灾变之后，成功的恢复了往日的荣光。" +"曾经被这一地区被认为已经灭绝的某种美洲狮，但是大灾变之后，成功的恢复了往日的" +"荣光." #. ~ Description for fungal cougar #: lang/json/MONSTER_from_json.py @@ -42760,7 +42825,7 @@ msgid "" "streams." msgstr "" "北美海狸，世上最大的啮齿动物，他的浆状尾巴可以帮其穿过湖面，其突出的门牙可以" -"咬断木头，喜欢在湖面与溪流建造大坝。" +"咬断木头，喜欢在湖面与溪流建造大坝." #. ~ Description for otter #: lang/json/MONSTER_from_json.py @@ -42817,7 +42882,7 @@ msgid "" msgstr "" "诺斯罗普ATSV型自行机器人，一种巨大的重型全装甲机器人，使用反关节机械腿行走，" "配备40MM反车辆手榴弹发射器和5.56反步兵枪，并且有足够的生存能力，是一种高效的" -"自动哨兵，由于法律纠纷所以产量有限。" +"自动哨兵，由于法律纠纷所以产量有限." #. ~ Description for tank drone #: lang/json/MONSTER_from_json.py @@ -42847,8 +42912,7 @@ msgid "" "About the size of a cat, it is hardy and adaptive, and a fairly common sight " "in urban areas." msgstr "" -"佛吉尼亚负鼠，原产于北美洲，大小犹如正常猫，耐寒，适应性极强，常见于城市附" -"近。" +"佛吉尼亚负鼠，原产于北美洲，大小犹如正常猫，耐寒，适应性极强，常见于城市附近." #. ~ Description for black rat #: lang/json/MONSTER_from_json.py @@ -42866,7 +42930,7 @@ msgid "" "The deformed, animated corpse of a canine, a sinewy beast which can easily " "outpace its two-legged friends." msgstr "" -"变异的丧尸犬，速度非常快的猛兽，相信我，他的四条脚绝对比你的两条腿跑的快。" +"变异的丧尸犬，速度非常快的猛兽，相信我，他的四条脚绝对比你的两条腿跑的快." #. ~ Description for cow #: lang/json/MONSTER_from_json.py @@ -42875,8 +42939,7 @@ msgid "" "and the males can have a violent streak to accompany their nasty-looking " "horns." msgstr "" -"被圈养的牛，一种坏脾气的反刍类农场动物。肌肉相当发达，雄性个体长着凶恶的角并" -"且相当易怒。" +"被圈养的牛，农场动物，但是不要小看他，非常强壮，其锋利的角非常具有威胁性." #. ~ Description for chipmunk #: lang/json/MONSTER_from_json.py @@ -42885,8 +42948,8 @@ msgid "" "coat. It spends much of the day patrolling its elaborate burrow and the " "precious stores of foraged food within." msgstr "" -"一只蠢萌蠢萌的小栗鼠。非常小巧的杂食性啮齿动物，它花了很多时间游荡在商店城镇" -"收集食物，也许在它的洞穴你会有大收获。" +"一只蠢萌蠢萌的小栗鼠.非常小巧的杂食性啮齿动物，它花了很多时间游荡在商店城镇收" +"集食物，也许在它的洞穴你会有大收获." #. ~ Description for zombie dancer #: lang/json/MONSTER_from_json.py @@ -42904,7 +42967,7 @@ msgstr "" "坟堆里的尸鬼，\n" "就将来完结你的性命！--迈克尔杰克逊《Thriller》\n" "\n" -"舞者丧尸根本没留意到你，它似乎被邻近的某个东西操纵著。" +"舞者僵尸根本没留意到你，它似乎被邻近的某个东西操纵著。" #. ~ Description for giant black widow spiderling #: lang/json/MONSTER_from_json.py @@ -42919,7 +42982,7 @@ msgid "" "The leopard slug, an omnivorous gastropod. It consumes decaying matter as " "well as planted crops, and will attack and eat other slugs that cross its " "path." -msgstr "巨型蛞蝓，食腐动物，甚至会吃掉同类，交叉行走。" +msgstr "巨型蛞蝓，食腐动物，甚至会吃掉同类，交叉行走." #. ~ Description for weasel #: lang/json/MONSTER_from_json.py @@ -42936,7 +42999,7 @@ msgstr "" msgid "" "The masked shrew, a mouse-like creature with a pointed, whiskery snout. It " "digs tunnels into the ground in search of bugs to eat." -msgstr "一种老鼠一样的生物，鼻子很尖，喜欢在地面上挖寻隧道来找虫子吃。" +msgstr "一种老鼠一样的生物，鼻子很尖，喜欢在地面上挖寻隧道来找虫子吃." #. ~ Description for evil multi-cooker #: lang/json/MONSTER_from_json.py @@ -42965,14 +43028,14 @@ msgstr "" msgid "" "The red fox, an omnivorous canine and largest of the true foxes, it is a " "wily hunter with a combative, suspicious temperament." -msgstr "棕红色的狐狸。杂食的犬齿是真正的狐狸，非常的狡猾且可疑.骁勇好战。" +msgstr "棕红色的狐狸。狐狸中体型最大的一种，性格狡猾多疑且骁勇好战。" #. ~ Description for jackrabbit #: lang/json/MONSTER_from_json.py msgid "" "The snowshoe hare, a small grass-eater with a brown fur coat that changes to " "white in the wintertime." -msgstr "居住在北美的野兔，全身是棕色的毛皮，喜欢吃草，冬天毛皮会变成白色。" +msgstr "居住在北美的野兔，全身是棕色的毛皮，喜欢吃草，冬天毛皮会变成白色." #. ~ Description for rattlesnake #: lang/json/MONSTER_from_json.py @@ -43036,7 +43099,7 @@ msgid "" "changed..." msgstr "" "这只丧尸全身膨胀，好像是快要爆炸似的，但是它的表皮已经被强化和硬化过了，没那" -"么容易打穿。等等，从它嘴里面溢出来的胆汁颜色好像在变……！" +"么容易打穿。等等，从它嘴里面溢出来的胆汁颜色好像也不太一样……！" #. ~ Description for skeletal dog #: lang/json/MONSTER_from_json.py @@ -43293,6 +43356,8 @@ msgid "" "Whether wolf or dog, this canine is clearly sick. The slavering of its " "mouth is consistent, at least." msgstr "" +"无论是狼还是狗，这只犬科动物显然得了病。至少它口里的唾液可是源源不断的往下" +"滴。" #. ~ Description for zombie snapper #: lang/json/MONSTER_from_json.py @@ -43300,7 +43365,7 @@ msgid "" "With a crocodile-like snout and rows of protuding teeth, this swimwear-clad " "zombie lurks in the water." msgstr "" -"长着和鳄鱼一样的吻和一排突出的牙齿，这个裹在游泳衣里的丧尸在水中潜伏着。" +"首先入眼的是一张鳄鱼般的大嘴和外突的牙齿，这种穿着泳衣的丧尸潜伏在水里." #. ~ Description for giant bee #: lang/json/MONSTER_from_json.py @@ -43355,7 +43420,7 @@ msgstr "" msgid "" "With mangy fur and hungry eyes, it's clear that this once domesticated dog " "has gone feral." -msgstr "肮脏的毛皮与饥饿的眼神，很明显，这只曾经被驯服的狗已经恢复了野性。" +msgstr "肮脏的毛皮与饥饿的眼神，很明显，这只曾经被驯服的狗已经恢复了野性." #. ~ Description for arachnotron #: lang/json/MONSTER_from_json.py @@ -43491,7 +43556,7 @@ msgstr "机械蜘蛛" #: lang/json/MONSTER_from_json.py msgid "archdemon" -msgstr "" +msgstr "大恶魔" #: lang/json/MONSTER_from_json.py msgid "archon" @@ -43499,7 +43564,7 @@ msgstr "执政官" #: lang/json/MONSTER_from_json.py msgid "archvile" -msgstr "" +msgstr "大邪魔" #: lang/json/MONSTER_from_json.py msgid "armored zombie" @@ -43781,7 +43846,7 @@ msgstr "眼球侦察机" #: lang/json/MONSTER_from_json.py msgid "fant" -msgstr "" +msgstr "真菌蚂蚁" #: lang/json/MONSTER_from_json.py msgid "fat zombie" @@ -43805,11 +43870,11 @@ msgstr "溃烂野猪" #: lang/json/MONSTER_from_json.py msgid "fiend" -msgstr "" +msgstr "恶魔丧尸" #: lang/json/MONSTER_from_json.py msgid "fionaea" -msgstr "" +msgstr "真菌捕蝇草" #: lang/json/MONSTER_from_json.py msgid "firefighter zombie" @@ -43833,7 +43898,7 @@ msgstr "盲目者" #: lang/json/MONSTER_from_json.py msgid "foose" -msgstr "" +msgstr "真菌驼鹿" #: lang/json/MONSTER_from_json.py msgid "forager ant" @@ -43858,7 +43923,7 @@ msgstr "真菌孢子树" #: lang/json/MONSTER_from_json.py msgid "fungal boil" -msgstr "真菌疖" +msgstr "真菌孢子团" #: lang/json/MONSTER_from_json.py msgid "fungal boomer" @@ -43866,7 +43931,7 @@ msgstr "真菌呕吐丧尸" #: lang/json/MONSTER_from_json.py msgid "fungal brood" -msgstr "" +msgstr "真菌孢子芽" #: lang/json/MONSTER_from_json.py msgid "fungal cougar" @@ -43882,7 +43947,7 @@ msgstr "真菌篱" #: lang/json/MONSTER_from_json.py msgid "fungal shocker" -msgstr "" +msgstr "真菌放电丧尸" #: lang/json/MONSTER_from_json.py msgid "fungal spire" @@ -43898,7 +43963,7 @@ msgstr "真菌幸存者" #: lang/json/MONSTER_from_json.py msgid "fungal tender" -msgstr "" +msgstr "真菌看护者" #: lang/json/MONSTER_from_json.py msgid "fungal tendril" @@ -43910,7 +43975,7 @@ msgstr "真菌塔" #: lang/json/MONSTER_from_json.py msgid "fungal vinebeast" -msgstr "" +msgstr "真菌藤蔓兽" #: lang/json/MONSTER_from_json.py lang/json/terrain_from_json.py msgid "fungal wall" @@ -44129,11 +44194,11 @@ msgstr "烈焰小鬼" #: lang/json/MONSTER_from_json.py msgid "infected survivor" -msgstr "" +msgstr "被感染的幸存者" #: lang/json/MONSTER_from_json.py msgid "infected tardigrade" -msgstr "" +msgstr "被感染的水熊虫" #: lang/json/MONSTER_from_json.py msgid "irradiated wanderer" @@ -44198,7 +44263,7 @@ msgstr "木偶" #: lang/json/MONSTER_from_json.py msgid "marloss man" -msgstr "" +msgstr "马洛斯人" #: lang/json/MONSTER_from_json.py msgid "mi-go" @@ -44336,7 +44401,7 @@ msgstr "响尾蛇" #: lang/json/MONSTER_from_json.py msgid "razorclaw" -msgstr "" +msgstr "利爪怪" #: lang/json/MONSTER_from_json.py msgid "revenant" @@ -44364,7 +44429,7 @@ msgstr "疤面丧尸" #: lang/json/MONSTER_from_json.py msgid "scorched zombie" -msgstr "" +msgstr "烧焦丧尸" #: lang/json/MONSTER_from_json.py msgid "screecher zombie" @@ -44511,7 +44576,7 @@ msgstr "小穴居者丧尸" #: lang/json/MONSTER_from_json.py msgid "squig" -msgstr "" +msgstr "史奎格" #: lang/json/MONSTER_from_json.py msgid "squirrel" @@ -44727,7 +44792,7 @@ msgstr "丧尸空壳" #: lang/json/MONSTER_from_json.py msgid "zombie kinderling" msgid_plural "zombie kinderlings" -msgstr[0] "" +msgstr[0] "柴薪丧尸" #: lang/json/MONSTER_from_json.py msgid "zombie lord" @@ -44771,7 +44836,7 @@ msgstr "丧尸奴仆" #: lang/json/MONSTER_from_json.py msgid "zombie snapper" -msgstr "丧尸撕咬者" +msgstr "类鱼丧尸" #: lang/json/MONSTER_from_json.py msgid "zombie soldier" @@ -45288,6 +45353,8 @@ msgid "" "An iv drip in a protective case. Inside, PRM brand chemicals are surging " "through the needle, providing incredible strength and agility to its user." msgstr "" +"一个放在保护盒内的静脉注射针剂。在里面，PRM牌的化合物正通过针头不断涌出，为它" +"的使用者提供超乎想象的力量和冥界。" #. ~ Description for berserker stimpack #: lang/json/TOOL_ARMOR_from_json.py @@ -45295,6 +45362,8 @@ msgid "" "An iv drip in a protective case. PRM patented stimulants will push the body " "to its limits for a brief period, making intense combat easier." msgstr "" +"一个放在保护盒内的静脉注射针剂。这款PRM拥有专利的针剂会在一小段时间内把身体推" +"向它的极限，让激烈战斗变得更容易。" #. ~ Use action noise_message for whistle. #: lang/json/TOOL_ARMOR_from_json.py @@ -45315,7 +45384,7 @@ msgid "" "power. Use it to turn it off." msgstr "" "这套流线造型的黑色军用装甲代表着Rivtech的柔性动力装甲技术的顶峰。使用钚燃料电" -"池供电，目前工作中，使用来关闭它。" +"池供电，目前工作中，使用来关闭它." #. ~ Description for RM13 combat armor #: lang/json/TOOL_ARMOR_from_json.py @@ -45325,7 +45394,7 @@ msgid "" "rigid powered armor technology. Use it to turn it on." msgstr "" "这套流线造型的黑色军用装甲代表着Rivtech的柔性动力装甲技术的顶峰。使用钚燃料电" -"池供电，使用来启动它。" +"池供电，使用来打开它." #: lang/json/TOOL_ARMOR_from_json.py msgid "RM13 combat armor" @@ -45762,17 +45831,17 @@ msgstr "你启动了护耳。" #. ~ Use action msg for head torch. #: lang/json/TOOL_ARMOR_from_json.py msgid "You turn the head torch on." -msgstr "你打开了头灯。" +msgstr "你打开了头灯." #. ~ Use action msg for mining helmet. #: lang/json/TOOL_ARMOR_from_json.py msgid "You turn the helmet on." -msgstr "你打开了头盔灯。" +msgstr "你打开了头盔灯." #. ~ Use action msg for survivor head torch. #: lang/json/TOOL_ARMOR_from_json.py msgid "You turn the survivor head torch on." -msgstr "你打开了幸存者头灯。" +msgstr "你打开了幸存者头灯." #. ~ Use action descriptions for harmonica with a holder. #: lang/json/TOOL_ARMOR_from_json.py @@ -45810,7 +45879,7 @@ msgstr "你裹紧你的%s。" #: lang/json/TOOL_ARMOR_from_json.py #, no-python-format msgid "Your %s deactivates." -msgstr "你关闭了 %s。" +msgstr "你关闭了 %s ." #. ~ Use action descriptions for bagpipes. #: lang/json/TOOL_ARMOR_from_json.py @@ -45835,12 +45904,12 @@ msgstr[0] "风笛" #: lang/json/TOOL_ARMOR_from_json.py msgid "berserker stimpack" msgid_plural "berserker stimpacks" -msgstr[0] "" +msgstr[0] "狂暴针剂" #: lang/json/TOOL_ARMOR_from_json.py msgid "berserker stimpack (active)" msgid_plural "berserker stimpack (active)s" -msgstr[0] "" +msgstr[0] "狂暴针剂（激活）" #: lang/json/TOOL_ARMOR_from_json.py msgid "emergency blanket" @@ -46192,23 +46261,23 @@ msgstr[0] "龙皮护甲" msgid "" "\"By order, we ascend beyond that of animals.\" You unroll the scroll of " "command..." -msgstr "\"因为命令，我们超越了那些动物。\"你展开了命令卷轴……" +msgstr "\"因为命令，我们超越了那些动物。\"你展开了命令卷轴..." #. ~ Use action msg for scroll of discord. #: lang/json/TOOL_from_json.py msgid "" "\"Cast aside the veil of reality.\" You unroll the scroll of discord..." -msgstr "\"抛开现实的面纱。\"你展开了不和卷轴……" +msgstr "\"抛开现实的面纱。\"你展开了不和卷轴..." #. ~ Use action msg for scroll of overgrowth. #: lang/json/TOOL_from_json.py msgid "\"Do not deny your instincts.\" You unroll the scroll of overgrowth..." -msgstr "\"不要抗拒你的本能。\"你展开了繁茂卷轴……" +msgstr "\"不要否认你的直觉。\"你展开了繁茂卷轴..." #. ~ Use action msg for scroll of darkness. #: lang/json/TOOL_from_json.py msgid "\"Do not fear the unknown.\" You unroll the scroll of darkness..." -msgstr "\"不要害怕未知的事物。\"你展开了黑暗卷轴……" +msgstr "\"不要害怕未知的事物。\"你展开了黑暗卷轴..." #. ~ Use action no_deactivate_msg for glowing hammer of the hunter. #: lang/json/TOOL_from_json.py @@ -46218,7 +46287,7 @@ msgstr "停下！锤子时间！（德语）（第三帝国梗）" #. ~ Use action msg for scroll of light. #: lang/json/TOOL_from_json.py msgid "\"Reveal that which is unseen.\" You unroll the scroll of light..." -msgstr "\"展现那些不可见之物吧。\"你展开了光明卷轴……" +msgstr "\"展现那些不可见之物吧。\"你展开了光明卷轴..." #. ~ Use action msg for scroll of sundering. #: lang/json/TOOL_from_json.py @@ -46306,7 +46375,7 @@ msgstr "一把源自古希腊的青铜剑，希腊长枪以外的副武器。" #. ~ Description for boil bomb #: lang/json/TOOL_from_json.py msgid "A canister with a wad of fungus inside. Activate to release it." -msgstr "" +msgstr "一个里面装满了孢子的大桶。使用它来释放孢子。" #. ~ Description for finished charcoal kiln #: lang/json/TOOL_from_json.py @@ -46339,7 +46408,7 @@ msgstr "一个将许多小工具整合进钳子握柄造就的多功能工具。 #. ~ Description for scissor jack #: lang/json/TOOL_from_json.py msgid "A compact scissor jack used for lifting vehicles." -msgstr "" +msgstr "紧凑的剪式千斤顶，用于起重车辆。" #. ~ Description for acetylene torch #: lang/json/TOOL_from_json.py @@ -46574,7 +46643,7 @@ msgid "" "abnormally cool to the touch." msgstr "" "一把长剑，由某种很暗几乎全黑的金属制成。似乎比普通钢刀有更大的锋利的边缘，手" -"感……也更舒适。虽然刀刃是用黑暗金属制成的，护手和剑柄由更明亮的材料制成，其手" +"感...也更舒适。虽然刀刃是用黑暗金属制成的，护手和剑柄由更明亮的材料制成，其手" "感异常凉爽。" #. ~ Description for syringe @@ -46614,7 +46683,7 @@ msgstr "" "一副电子手铐，警察和机器人用来限制嫌疑人行动的常用工具。它会持续的发出警报并" "且不停的呼叫警官过来将犯人带回警局关押。如果试图挣脱或者逃跑，手铐将主动电击" "疑犯。\n" -"鉴于目前的治安情况，请在被电击和被吃掉脑子之间选择一个吧。亲。" +"鉴于目前的治安情况...请在被电击和被吃掉脑子之间选择一个吧。亲。" #. ~ Description for rocket candy #: lang/json/TOOL_from_json.py @@ -46667,14 +46736,14 @@ msgid "" msgstr "" "一台使用传统电池的点拍式数码照相机，带有数字取景器，辅助的手动取景器以及闪光" "灯。你可以用它和浩克玩个自拍或者给丧尸拍张艳照什么的，保存在记忆卡上随时翻出" -"来撸。呃，丫口味真重。" +"来撸。呃...丫口味真重。" #. ~ Description for makeshift jack #: lang/json/TOOL_from_json.py msgid "" "A poorly constructed improvised scissor jack used for lifting vehicles if " "you're brave enough to use it." -msgstr "" +msgstr "粗制滥造的简易剪式千斤顶，用于起重车辆，如果你敢用它的话。" #. ~ Description for concrete mixer #: lang/json/TOOL_from_json.py @@ -46682,27 +46751,30 @@ msgid "" "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." msgstr "" -"一台便携式的水泥搅拌机。虽说便携，仍然庞大而笨重，但是它可以单独运行，并只由" -"电池组供电使用。里面也有一个内置的加热器。" +"一台相对来说是比较便携的混凝土搅拌器。对正常人来说这仍然是个又大又重的玩意" +"儿，但至少它只需要一个人就能用,而且还可以用电池供电。而且里边还有个内置的加热" +"器呢." #. ~ Description for bottle jack #: lang/json/TOOL_from_json.py msgid "A portable hydraulic bottle jack used for lifting vehicles." -msgstr "" +msgstr "便携式液压瓶式千斤顶，用于起重车辆。" #. ~ Description for hand drill #: lang/json/TOOL_from_json.py msgid "" "A primitive manual drill with a single drill bit. It is slow and it will " "exhaust you quickly." -msgstr "一种有着单一钻头的原始手工钻头。转速相当缓慢，但会迅速耗尽你的精力。" +msgstr "" +"本质是一根够坚固的铁条,弯弯曲曲之后就成了原始的手动钻孔器,还有一根钻头装在上" +"面。使用这东西钻孔是件需要耐心的事,而且会在短时间把你累趴." #. ~ Description for pro fishing rod #: lang/json/TOOL_from_json.py msgid "" "A professional fishing rod & reel combo. With this you should be able to " "catch 'em all." -msgstr "专业的带绕组钓鱼杆，用它你坑定能吊到大鱼！" +msgstr "专业的带绕组钓鱼杆，用它你肯定能吊到大鱼！" #. ~ Description for multi cooker #: lang/json/TOOL_from_json.py @@ -46771,6 +46843,7 @@ msgid "" "A revenant's rocket. Will home in on a target and explode for moderate " "damage and a small EMP blast." msgstr "" +"一个复仇者火箭。会自动锁定敌人并且造成中等和爆炸伤害和一个小型的电磁冲击。" #. ~ Description for large batch of curdling milk #: lang/json/TOOL_from_json.py @@ -47088,7 +47161,7 @@ msgid "" "A... seat made of goo with a framework of bone. Sitting in it makes the goo " "engulf parts of your body." msgstr "" -"一个……嗯，座位，由变形怪糊内衬骨质框架制成，你坐上去后就沉到了变形怪糊里面。" +"一个...嗯，座位，由变形怪糊内衬骨质框架制成，你坐上去后就沉到了变形怪糊里面。" #: lang/json/TOOL_from_json.py msgid "ANFO charge" @@ -47168,7 +47241,7 @@ msgstr "仅仅有财富的献祭并不足以安抚乌伯之神的仆人。这个 #. ~ Description for clarinet #: lang/json/TOOL_from_json.py msgid "An ornate clarinet made from wood." -msgstr "一只木制的管乐器。" +msgstr "一只木质的管乐器。" #. ~ Description for silver athame #: lang/json/TOOL_from_json.py @@ -47182,7 +47255,7 @@ msgstr "华丽的银色匕首，似乎是为了祭祀。它似乎比银该有的 msgid "" "An ornate silver dagger, seemingly made for ritual purposes. This seems " "like a stupid idea..." -msgstr "华丽的银色匕首，似乎是为了祭祀。那真是个愚蠢的主意……" +msgstr "华丽的银色匕首，似乎是为了祭祀。那真是个愚蠢的主意..." #. ~ Use action activation_message for offering chalice. #: lang/json/TOOL_from_json.py @@ -47201,7 +47274,7 @@ msgstr "当你在弦上拉琴弓时，它发出邪恶的嘶嘶声。" msgid "" "Attached to this grenade is a name tag with the name Kevin written on it. " "Does not seem to work like a grenade, handle with care." -msgstr "这颗手雷上挂着一个标签，上面有一个签名：Kevin。最好赶紧扔了它！" +msgstr "这颗手雷上挂着一个标签，上面有一个签名：Kevin。" #. ~ Description for active Granade #: lang/json/TOOL_from_json.py @@ -47337,11 +47410,6 @@ msgstr "嘶嘶。" msgid "Hsssss." msgstr "嘶嘶…" -#. ~ Description for fake UPS -#: lang/json/TOOL_from_json.py -msgid "If you can see this, it is a bug." -msgstr "如果你看见这条文字，出BUG了少年！" - #: lang/json/TOOL_from_json.py msgid "Kevlar plate" msgid_plural "Kevlar plates" @@ -47361,7 +47429,7 @@ msgstr "" #. ~ Use action sound_msg for active RDX charge. #: lang/json/TOOL_from_json.py msgid "Kshhh." -msgstr "滋啦…" +msgstr "滋..." #: lang/json/TOOL_from_json.py msgid "L-stick (off)" @@ -47424,12 +47492,12 @@ msgstr[0] "燃烧瓶（点燃）" #: lang/json/TOOL_from_json.py msgid "No. 9 (off)" msgid_plural "No. 9's (off)" -msgstr[0] "No. 9（关）" +msgstr[0] "No。9（关）" #: lang/json/TOOL_from_json.py msgid "No. 9 (on)" msgid_plural "No. 9's (on)" -msgstr[0] "No. 9（开）" +msgstr[0] "No。9（开）" #: lang/json/TOOL_from_json.py msgid "PDA" @@ -47541,7 +47609,7 @@ msgid "" "Steel core for weight, diamond-like carbon edge for sharpness. Wickedly " "sharp and nearly indestructible, it cleaves vegetation and the living dead " "with equal ease." -msgstr "钢质刀体，钻石刀刃，锋利无比，坚不可摧。砍丧尸就和割草一样轻松。" +msgstr "钢质刀体，钻石刀刃，锋利无比，坚不可摧。砍僵尸就和割草一样轻松。" #: lang/json/TOOL_from_json.py msgid "Swiss Army knife" @@ -47629,12 +47697,12 @@ msgstr "变形怪还在成长。\"以惊人的速度\"，你可以加上这句 #. ~ Use action hostile_msg for boil bomb. #: lang/json/TOOL_from_json.py msgid "The boil dances around you!" -msgstr "" +msgstr "孢子团在你身边四处飞舞！" #. ~ Use action friendly_msg for boil bomb. #: lang/json/TOOL_from_json.py msgid "The boil takes to the air and begins to grow exponentially." -msgstr "" +msgstr "孢子团发散到空中并开始指数级的成长。" #. ~ Use action msg for candle (lit). #: lang/json/TOOL_from_json.py @@ -47647,13 +47715,15 @@ msgid "" "The core of a revenant's rocket, exposed to the air. Seems stable enough at " "the moment, but will likely explode if you mess with it." msgstr "" +"复仇者火箭的核心，暴漏在空气中。看起来现在还很稳定，不过如果你手脚不干净它或" +"许也会爆的。" #. ~ Description for unstable revenant rocket core #: lang/json/TOOL_from_json.py msgid "" "The core of a revenant's rocket, exposed to the air. Will likely explode " "any moment now." -msgstr "" +msgstr "复仇者火箭的核心，暴漏在空气中。看起来是要爆炸给你看了。" #. ~ Description for diamond katana #: lang/json/TOOL_from_json.py @@ -47771,7 +47841,7 @@ msgstr "光棒失去了亮光。" #. ~ Use action need_charges_msg for oil lamp (off). #: lang/json/TOOL_from_json.py msgid "The lamp is empty." -msgstr "油灯没油了。" +msgstr "油灯没油了." #. ~ Use action need_charges_msg for electric lantern (off). #: lang/json/TOOL_from_json.py @@ -47783,7 +47853,7 @@ msgstr "电灯笼没电了。" #. ~ Use action msg for electric lantern (on). #: lang/json/TOOL_from_json.py msgid "The lantern is extinguished." -msgstr "灯笼熄灭了。" +msgstr "灯笼灭了." #. ~ Use action friendly_msg for inactive manhack. #: lang/json/TOOL_from_json.py @@ -47814,7 +47884,7 @@ msgstr "这台微型核弹无人机从你手上飞起，在附近区域自动寻 #. ~ Use action friendly_msg for revenant rocket. #: lang/json/TOOL_from_json.py msgid "The missile takes off uncertainly!" -msgstr "" +msgstr "导弹不确定的飞了出去！" #. ~ Description for wool staple #: lang/json/TOOL_from_json.py @@ -47880,7 +47950,7 @@ msgstr "警告：内含剧毒及极强腐蚀性物质，该物质活性极强， #. ~ Use action no_deactivate_msg for unstable revenant rocket core. #: lang/json/TOOL_from_json.py msgid "There's a hole in this core; it's gonna blow!" -msgstr "" +msgstr "这个核心的中间有个洞；它-就-要-炸-啦！" #. ~ Description for pair of scissors #: lang/json/TOOL_from_json.py @@ -47938,8 +48008,8 @@ msgid "" "field that damages robots and drains bionic energy. You may not want to be " "holding it much longer." msgstr "" -"很好，这个EMP手雷已经被激活了，很快就会引爆并产生电磁脉冲，这会破坏附近的机器" -"人并吸取生化插件能量。你需要做的就是把它用力丢出去，然后就等着瞧吧。" +"很好，这个EMP手雷已经被激活了，你需要做的就是把它用力丢出去，然后...就等着瞧" +"吧。" #. ~ Description for khopesh #: lang/json/TOOL_from_json.py @@ -48007,7 +48077,7 @@ msgstr "" msgid "" "This burning magnesium flare is producing light. It will last for about a " "half hour before burning out." -msgstr "这种镁制照明弹正在不停的燃烧，大约半小时后熄灭。" +msgstr "这种镁制照明弹正在不停的燃烧，大约半小时后熄灭." #. ~ Description for active tear gas grenade #: lang/json/TOOL_from_json.py @@ -48235,9 +48305,7 @@ msgstr "" msgid "" "This is a battery powered tool for welding metal pieces together. It is an " "indispensable tool for construction or repair." -msgstr "" -"这是一个电池供电的工具，用于将金属部件焊接在一起。这是一个建筑或维修时不可缺" -"少的工具。" +msgstr "用来焊接金属的工具，非常有用。" #. ~ Description for water purifier #: lang/json/TOOL_from_json.py @@ -48580,7 +48648,7 @@ msgid "" "This is a decent-sized chunk of worked copper affixed to a wooden shaft, to " "make a crude yet effective axe." msgstr "" -"一个足够大的经过加工的铜块被安装在一个木制的手柄上，成了一把粗糙但有效的斧" +"一个足够大的经过加工的铜块被安装在一个木质的手柄上，成了一把粗糙但有效的斧" "头。" #. ~ Description for hammer @@ -48887,7 +48955,7 @@ msgid "" "light for its size." msgstr "" "一把真正由名家锻造的大太刀，比一般武士刀要长得多，光是看那长度就够让人惊讶的" -"了，跟别说实战上的发挥" +"了，更别说实战上的发挥。" #. ~ Description for etched human skull #: lang/json/TOOL_from_json.py @@ -49182,7 +49250,7 @@ msgstr "" #: lang/json/TOOL_from_json.py msgid "" "This is a medical listening tool. Use it to listen to things. Closely." -msgstr "一个医用听诊工具。只能用来听比较接近的东西。靠近物体并使用。" +msgstr "一个听觉工具.只能用来听比较接近的东西。" #. ~ Description for combat knife #: lang/json/TOOL_from_json.py @@ -49695,8 +49763,7 @@ msgid "" "This is a slow-burning magnesium flare. Use it to strike the striker and " "light it. It will produce a bright light for about a half hour." msgstr "" -"这是一个缓慢燃烧的镁制照明弹，使用之后，他将会产生一个光源，大约能使用半小" -"时。" +"这是一个缓慢燃烧的镁制照明弹，使用之后，他将会产生一个光源，大约能使用半小时." #. ~ Description for glowstick #: lang/json/TOOL_from_json.py @@ -49945,7 +50012,7 @@ msgstr "" #: lang/json/TOOL_from_json.py msgid "" "This is a stick that has been cut into a trigger mechanism for a snare trap." -msgstr "一只木棍被切割成木制的机关，用于制作圈套陷阱。" +msgstr "一只木棍被切割成木质的机关，用于制作圈套陷阱。" #. ~ Description for still #: lang/json/TOOL_from_json.py @@ -49957,7 +50024,7 @@ msgstr "一个蒸馏器，用来提存酒精或更多其他更奇妙的物质。 #. ~ Description for stone adze #: lang/json/TOOL_from_json.py msgid "This is a stone adze, somewhat useful for cutting through wood objects." -msgstr "这是个石斧头，可以用来砍断木制物品。" +msgstr "这是个石斧头，可以用来砍断木质物品。" #. ~ Description for vortex stone #: lang/json/TOOL_from_json.py @@ -49981,8 +50048,7 @@ msgstr "这种结实的折叠铲常用于军队，不过也备受徒步旅行者 msgid "" "This is a stout metal box containing a complete tool kit suitable for most " "household maintenance and construction activities." -msgstr "" -"这是一个坚固的金属盒子，内含一套完整的工具，适用于大多数家居维护及建设活动。" +msgstr "装着家庭手工维修的重要工具的金属盒子。" #. ~ Description for drained offering chalice #: lang/json/TOOL_from_json.py @@ -49991,8 +50057,8 @@ msgid "" "unfamiliar text. It appears to be empty, but you get the feeling that " "something remains within it. If you knew the right ritual..." msgstr "" -"这是一个金子做的奇怪的酒杯，上面刻着一些陌生的文字。它似乎是空的，但你感觉还" -"有什么东西在里面。如果知道正确的仪式就好了…" +"这是一个金子做的奇怪的酒杯, 上面刻着一些陌生的文字. 它似乎是空的, 但你感觉还" +"有什么东西在里面. 如果知道正确的仪式就好了…" #. ~ Description for offering chalice #: lang/json/TOOL_from_json.py @@ -50002,8 +50068,8 @@ msgid "" "unable to pour out. You get the feeling that trying to drink it would be a " "bad idea." msgstr "" -"这是一个金子做的奇怪的酒杯，上面刻着一些陌生的文字。它盛满了厚厚的黑色液体，" -"你似乎无法把它倒出来。喝下这些液体会是个坏主意。" +"这是一个金子做的奇怪的酒杯, 上面刻着一些陌生的文字. 它盛满了厚厚的黑色液体, " +"你似乎无法把它倒出来. 喝下这些液体会是个坏主意. " #. ~ Description for offering chalice #: lang/json/TOOL_from_json.py @@ -50011,7 +50077,8 @@ msgid "" "This is a strange chalice made of gold, engraved all over with some " "unfamiliar text. Maybe you shouldn't be trying to drink from this..." msgstr "" -"这是一个金子做的奇怪的酒杯，上面刻着一些陌生的文字。也许你不该喝下这些玩意……" +"这是一个金子做的奇怪的酒杯，上面刻着一些陌生的文字。也许你真的不该喝下这些玩" +"意..." #. ~ Description for hacksaw #: lang/json/TOOL_from_json.py @@ -50042,14 +50109,19 @@ msgstr "" msgid "" "This is a test item for testing long action heal_actor on tools. It " "shouldn't spawn in normal game." -msgstr "" +msgstr "这是用来测试heal_actor的工具，不应该出现在游戏中。" #. ~ Description for short healing tool #: lang/json/TOOL_from_json.py msgid "" "This is a test item for testing short action heal_actor on tools. It " "shouldn't spawn in normal game." -msgstr "" +msgstr "这是用来测试heal_actor的工具，不应该出现在游戏中。" + +#. ~ Description for snowman +#: lang/json/TOOL_from_json.py +msgid "This is a test item for testing unicode support." +msgstr "这是测试UNICODE支持的物品。" #. ~ Description for candle (lit) #: lang/json/TOOL_from_json.py @@ -50343,8 +50415,8 @@ msgid "" "Use it to activate the timer. You guess that the explosion would be large " "enough to take out a small house." msgstr "" -"威力极强的武器——手持核弹。你可以激活它的计时器，10回合就会爆炸，威力足以摧毁" -"房屋，产生一个放射性弹坑。" +"威力极强的武器——手持核弹。你可以激活它的计时器，它的威力足以摧毁房屋，产生一" +"个放射性弹坑。" #. ~ Description for ice axe #: lang/json/TOOL_from_json.py @@ -50519,7 +50591,7 @@ msgid "" "anything but its intended purpose." msgstr "" "老式农业工具，专门用来割杂草，构造十分简单，一片巨大的片叶和棍子，但是令人难" -"以置信的好用。" +"以置信的好用." #. ~ Description for sickle #: lang/json/TOOL_from_json.py @@ -50529,7 +50601,7 @@ msgid "" "anything but its intended purpose." msgstr "" "老式农业工具，专门用来割杂草，构造十分简单，一片巨大的片叶和棍子，但是令人难" -"以置信的好用。" +"以置信的好用." #. ~ Description for soda can stove kit #: lang/json/TOOL_from_json.py @@ -50764,7 +50836,7 @@ msgid "" "(having an air pump in inventory) to inflate and launch." msgstr "" "这种物品平时都是放了气折起来存放的，需要时就给它充气，然后才能使用。当然你要" -"有打气筒在背囊里。" +"有打气筒在背囊里。呃...我说的是充气划艇，不是苍老师真人倒模的娃娃！" #. ~ Description for active scrambler grenade #: lang/json/TOOL_from_json.py @@ -50888,7 +50960,7 @@ msgid "" "uncertain sources like a river may be dirty." msgstr "" "这个物品专门用来吸取纯净水源，使用三层滤网，和活性木炭过滤，一旦木炭吸取了足" -"够的杂质，将变得无法使用，无法拆卸和回收，水源来自不确认是否被污染的河流。" +"够的杂质，将变得无法使用，无法拆卸和回收，水源来自不确认是否被污染的河流." #. ~ Description for growing blob harness #: lang/json/TOOL_from_json.py @@ -51025,7 +51097,7 @@ msgid "" "You hear a voice in your mind. \"Tekili ...l-li?\" Your mind exerts a " "strange influence upon the shoggoth." msgstr "" -"你脑海中听到了一个声音。\"Tekeli...li？\"你的意志向修格斯施加了奇特影响。" +"你脑海中听到了一个声音。\"Tekeli-li？\"你的意志向修格斯施加了奇特影响。" #. ~ Use action msg for blob feed fermenter. #: lang/json/TOOL_from_json.py @@ -51129,12 +51201,12 @@ msgstr "你点燃了引火物。" #. ~ Use action msg for torch. #: lang/json/TOOL_from_json.py msgid "You light the torch." -msgstr "你点燃了火把。" +msgstr "你点着了火把." #. ~ Use action msg for filled charcoal kiln. #: lang/json/TOOL_from_json.py msgid "You light the wood." -msgstr "你点燃了木头。" +msgstr "你点着了木头。" #. ~ Use action friendly_msg for glyph of the beholder. #: lang/json/TOOL_from_json.py @@ -51171,12 +51243,12 @@ msgstr "你没设好飞锯无人机的程序，它变成敌对的了！" #. ~ Use action hostile_msg for inactive mininuke hack. #: lang/json/TOOL_from_json.py msgid "You misprogram the mininuke hack. Pray." -msgstr "你没设好这台微型核弹无人机的程序，它现在是敌对的。赶快祈祷吧。" +msgstr "你没设好这台微型核弹无人机的程序，它现在是敌对的，你可以做祷告了..." #. ~ Use action hostile_msg for revenant rocket. #: lang/json/TOOL_from_json.py msgid "You misprogram the missile; it's hostile!" -msgstr "" +msgstr "你没设好导弹的程序，它变成敌对的了！" #. ~ Use action hostile_msg for inactive tear gas hack. #: lang/json/TOOL_from_json.py @@ -51329,7 +51401,7 @@ msgstr "你拉开了闪光弹的保险插销。" #. ~ Use action msg for incendiary grenade. #: lang/json/TOOL_from_json.py msgid "You pull the pin on the grenade." -msgstr "你拉开了手榴弹的保险插销。" +msgstr "你拉开了手榴弹的保险插销." #. ~ Use action msg for scrambler grenade. #: lang/json/TOOL_from_json.py @@ -51349,7 +51421,7 @@ msgstr "你拉开了催泪瓦斯罐的保险插梢" #. ~ Use action msg for revenant rocket core. #: lang/json/TOOL_from_json.py msgid "You puncture the rocket core!" -msgstr "" +msgstr "你穿刺了火箭核心！" #. ~ Use action friendly_msg for glyph of Yuggoth. #: lang/json/TOOL_from_json.py @@ -51405,34 +51477,34 @@ msgstr "你启动了圆锯。" #. ~ Use action msg for flashlight (on). #: lang/json/TOOL_from_json.py msgid "You turn the flashlight off." -msgstr "你关闭了手电筒。" +msgstr "你关闭了手电筒." #. ~ Use action msg for flashlight (off). #: lang/json/TOOL_from_json.py msgid "You turn the flashlight on." -msgstr "你打开了手电筒。" +msgstr "你打开了手电筒." #. ~ Use action msg for heavy duty flashlight (on). #: lang/json/TOOL_from_json.py msgid "You turn the heavy duty flashlight off." -msgstr "你关闭了耐用手电筒。" +msgstr "你关闭了耐用手电筒." #. ~ Use action msg for heavy duty flashlight (off). #: lang/json/TOOL_from_json.py msgid "You turn the heavy duty flashlight on." -msgstr "你打开了耐用手电筒。" +msgstr "你打开了耐用手电筒." #. ~ Use action msg for gasoline lantern (off). #. ~ Use action msg for oil lamp (off). #. ~ Use action msg for electric lantern (off). #: lang/json/TOOL_from_json.py msgid "You turn the lamp on." -msgstr "你点亮了油灯" +msgstr "你点亮了油灯." #. ~ Use action msg for smart lamp (off). #: lang/json/TOOL_from_json.py msgid "You turn the smart lamp on." -msgstr "你打开遥控灯。" +msgstr "你打开遥控灯." #. ~ Use action no_deactivate_msg for active makeshift gas grenade. #: lang/json/TOOL_from_json.py @@ -51530,7 +51602,7 @@ msgstr[0] "乙炔灯（开）" #: lang/json/TOOL_from_json.py msgid "acetylene torch" msgid_plural "acetylene torches" -msgstr[0] "乙炔焊炬" +msgstr[0] "乙炔焊灯" #: lang/json/TOOL_from_json.py msgid "acid bomb" @@ -51700,12 +51772,12 @@ msgstr[0] "生化开锁器" #: lang/json/TOOL_from_json.py msgid "bionic goggles" msgid_plural "bionic goggless" -msgstr[0] "" +msgstr[0] "生化护目镜" #: lang/json/TOOL_from_json.py msgid "bionic razor" msgid_plural "bionic razors" -msgstr[0] "" +msgstr[0] "生化剃刀" #: lang/json/TOOL_from_json.py msgid "black gunpowder bomb" @@ -51730,7 +51802,7 @@ msgstr[0] "变形怪食物发酵槽" #: lang/json/TOOL_from_json.py msgid "boil bomb" msgid_plural "boil bombs" -msgstr[0] "" +msgstr[0] "孢子团炸弹" #: lang/json/TOOL_from_json.py msgid "bone needle" @@ -51745,7 +51817,7 @@ msgstr[0] "诡雷" #: lang/json/TOOL_from_json.py msgid "bottle jack" msgid_plural "bottle jacks" -msgstr[0] "瓶式千斤顶" +msgstr[0] "便携千斤顶" #: lang/json/TOOL_from_json.py lang/json/trap_from_json.py msgid "brazier" @@ -52177,15 +52249,10 @@ msgid "extra battery mod" msgid_plural "extra battery mods" msgstr[0] "外接电池组" -#: lang/json/TOOL_from_json.py -msgid "fake UPS" -msgid_plural "fake UPS" -msgstr[0] "测试用UPS" - #: lang/json/TOOL_from_json.py msgid "fake item" msgid_plural "fake items" -msgstr[0] "伪物品" +msgstr[0] "虚假物品" #: lang/json/TOOL_from_json.py msgid "fertilizer bomb" @@ -52516,7 +52583,7 @@ msgstr[0] "手斧" #: lang/json/TOOL_from_json.py msgid "hand drill" msgid_plural "hand drills" -msgstr[0] "手摇钻" +msgstr[0] "曲柄手钻" #: lang/json/TOOL_from_json.py msgid "hand press & die set" @@ -52808,7 +52875,7 @@ msgstr[0] "撬锁工具" #: lang/json/TOOL_from_json.py msgid "long healing tool" msgid_plural "long healing tools" -msgstr[0] "" +msgstr[0] "长治疗工具。" #: lang/json/TOOL_from_json.py msgid "loose caltrops" @@ -52889,7 +52956,7 @@ msgstr[0] "简易真空封口机" #: lang/json/TOOL_from_json.py msgid "makeshift welder" msgid_plural "makeshift welders" -msgstr[0] "简易电焊枪" +msgstr[0] "简易焊枪" #: lang/json/TOOL_from_json.py msgid "match head bomb" @@ -53045,7 +53112,7 @@ msgstr[0] "老虎钳" #: lang/json/TOOL_from_json.py msgid "pair of metal tongs" msgid_plural "pairs of metal tongs" -msgstr[0] "" +msgstr[0] "铁钳" #: lang/json/TOOL_from_json.py msgid "pair of scissors" @@ -53105,7 +53172,7 @@ msgstr[0] "折叠刀" #: lang/json/TOOL_from_json.py msgid "polyplatic chunk" msgid_plural "polyplatic chunks" -msgstr[0] "" +msgstr[0] "复合塑料块" #: lang/json/TOOL_from_json.py msgid "portal generator" @@ -53185,12 +53252,12 @@ msgstr[0] "载具远程遥控器" #: lang/json/TOOL_from_json.py msgid "revenant rocket" msgid_plural "revenant rockets" -msgstr[0] "" +msgstr[0] "复仇者火箭" #: lang/json/TOOL_from_json.py msgid "revenant rocket core" msgid_plural "revenant rocket cores" -msgstr[0] "" +msgstr[0] "复仇者火箭核心" #: lang/json/TOOL_from_json.py msgid "rocket candy" @@ -53305,7 +53372,7 @@ msgstr[0] "串烧叉（开）" #: lang/json/TOOL_from_json.py msgid "short healing tool" msgid_plural "short healing tools" -msgstr[0] "" +msgstr[0] "短治疗工具" #: lang/json/TOOL_from_json.py lang/json/trap_from_json.py msgid "shotgun trap" @@ -53362,6 +53429,11 @@ msgid "snare trigger" msgid_plural "snare triggers" msgstr[0] "陷阱触发器" +#: lang/json/TOOL_from_json.py +msgid "snowman" +msgid_plural "snowmans" +msgstr[0] "雪人" + #: lang/json/TOOL_from_json.py msgid "soda can stove kit" msgid_plural "soda can stove kits" @@ -53388,7 +53460,7 @@ msgstr[0] "喷涂罐" #. ~ Use action sound_msg for fertilizer bomb (lit). #: lang/json/TOOL_from_json.py src/iuse.cpp msgid "ssss..." -msgstr "嘶……" +msgstr "嘶..." #: lang/json/TOOL_from_json.py msgid "steak knife" @@ -53603,7 +53675,7 @@ msgstr[0] "四弦琴" #: lang/json/TOOL_from_json.py msgid "unstable revenant rocket core" msgid_plural "unstable revenant rocket cores" -msgstr[0] "" +msgstr[0] "不稳定的复仇者火箭核心" #: lang/json/TOOL_from_json.py msgid "used heat pack" @@ -53653,7 +53725,7 @@ msgstr[0] "净水器" #: lang/json/TOOL_from_json.py msgid "welder" msgid_plural "welders" -msgstr[0] "电焊枪" +msgstr[0] "焊枪" #: lang/json/TOOL_from_json.py msgid "whistle multitool" @@ -53811,7 +53883,7 @@ msgstr "军用宽轮胎。" #. ~ Description for wide wheel #: lang/json/VAR_VEH_PART_from_json.py msgid "A wide wheel. \\o/ This wide." -msgstr "一个宽车轮。\\o/ 有这么宽。" +msgstr "一个宽车轮。\\o/ 有这么宽." #. ~ Description for boat board #: lang/json/VAR_VEH_PART_from_json.py lang/json/vehicle_part_from_json.py @@ -53973,7 +54045,7 @@ msgstr ".32" #: lang/json/ammunition_type_from_json.py msgid ".36 cap & ball" -msgstr ".36 实心弹" +msgstr ".36球帽弹" #: lang/json/ammunition_type_from_json.py msgid ".38" @@ -53989,7 +54061,7 @@ msgstr ".44" #: lang/json/ammunition_type_from_json.py msgid ".44 cap & ball" -msgstr ".44 实心弹" +msgstr ".44球帽弹" #: lang/json/ammunition_type_from_json.py msgid ".45" @@ -54001,7 +54073,7 @@ msgstr ".454" #: lang/json/ammunition_type_from_json.py msgid ".50 BMG" -msgstr ".50 BMG 弹" +msgstr ".50 BMG弹" #: lang/json/ammunition_type_from_json.py msgid ".500" @@ -54009,7 +54081,7 @@ msgstr ".500" #: lang/json/ammunition_type_from_json.py msgid ".700 Nitro Express" -msgstr ".700 Nitro Express 弹" +msgstr ".700 NE巨型弹" #: lang/json/ammunition_type_from_json.py msgid "120mm shell" @@ -54592,6 +54664,17 @@ msgstr "" "你的手掌心被嵌入了一只EMP发射器。使用该设备，你可以发射一次近程EMP冲击，摧毁" "电子产品及机器人。" +#. ~ Description for Telescopic Eyes +#: lang/json/bionic_from_json.py +msgid "" +"Much of the material in your inner eye has been removed and replaced with an " +"array of high-powered, auto-focusing lenses. You can now see much farther " +"and more clearly than before, any vision problems you might have had are now " +"gone." +msgstr "" +"你眼球内的大部分组织已被移除，并替换成一套高倍率的自动对焦透镜阵列。现在你可" +"以看得更远、更清晰，以前的视力问题都消失了。" + #: lang/json/bionic_from_json.py msgid "Muscle Augmentation" msgstr "人工肌肉纤维" @@ -55372,7 +55455,7 @@ msgstr "移除窗户上的胶带" #: lang/json/construction_from_json.py msgid "Repair Log Wall" -msgstr "修理原木墙" +msgstr "修理损坏原木墙" #: lang/json/construction_from_json.py msgid "Repair Wattle-and-Daub Wall" @@ -55384,7 +55467,7 @@ msgstr "修理木门" #: lang/json/construction_from_json.py msgid "Repair Wood Wall" -msgstr "修理木墙" +msgstr "修理损坏木墙" #: lang/json/construction_from_json.py msgid "Seal Crate" @@ -55447,7 +55530,7 @@ msgstr "啊，又是关于\"星球染色\"的梦。或许你应该吸收更多 #: lang/json/dream_from_json.py msgid "Ah, the wolf-slaying dream again. That's a good one..." -msgstr "哈，有一个杀光恶狼的梦。这个还不错……" +msgstr "哈，有一个狼性捕杀的梦，这个还不错..." #: lang/json/dream_from_json.py msgid "As you dream, your reflection looks rather catlike." @@ -55459,7 +55542,7 @@ msgstr "yooooo!你抓到了又一个美味的可怜虫。" #: lang/json/dream_from_json.py msgid "FIGHT. FEED. FORWARD." -msgstr "战斗。进食。前行。" +msgstr "战 斗、捕 食、前 行." #: lang/json/dream_from_json.py msgid "" @@ -55480,7 +55563,7 @@ msgstr "" #: lang/json/dream_from_json.py msgid "In a dream, you see a curiously birdlike reflection of yourself." -msgstr "在梦里，你看见自己奇怪的像鸟一样的身影。" +msgstr "在梦里，你看见自己奇怪的像鸟一样的身影." #: lang/json/dream_from_json.py msgid "In your dream you see a group of rats that look almost like yourself." @@ -55496,7 +55579,7 @@ msgstr "在你的梦中你发现自己的倒影是一团黏糊糊的奇怪生物 #: lang/json/dream_from_json.py msgid "In your dream, you see a strangely fishlike image of yourself." -msgstr "在梦里，你看见自己变得像鱼一样的奇异景象。" +msgstr "在梦里，你看见自己变得像鱼一样的奇异景象." #: lang/json/dream_from_json.py msgid "" @@ -55611,7 +55694,7 @@ msgstr "在梦里，你发现自己的倒影几乎就和一只章鱼一模一样 #: lang/json/dream_from_json.py msgid "" "While dreaming, you see a distinctively lizard-like reflection of yourself." -msgstr "梦里，你看见自己像蜥蜴一样的独特身影。" +msgstr "梦里，你看见自己像蜥蜴一样的独特身影." #: lang/json/dream_from_json.py msgid "" @@ -55621,7 +55704,7 @@ msgstr "在梦里，你看到自己穿着病号服，被强行治疗。" #: lang/json/dream_from_json.py msgid "Whilst dreaming, you see a disturbingly bestial version of yourself." -msgstr "在梦里，你看见了自己奇特的野兽般的第一视角。" +msgstr "在梦里，你看见了自己奇特的野兽般的第一视角." #: lang/json/dream_from_json.py msgid "You are confused by a plantlike image of yourself in a dream." @@ -55660,11 +55743,11 @@ msgstr "你愉快的梦到在太阳底下逗圈的日子。" #: lang/json/dream_from_json.py msgid "" "You can't quite work out what the dream is about...it just keeps changing." -msgstr "你无法表达出你的怪梦……它不停的在变幻。" +msgstr "你无法表达出你的怪梦...它不停的在变幻。" #: lang/json/dream_from_json.py msgid "You dream about the zoo, for some reason." -msgstr "你的梦和动物园有某些联系。。" +msgstr "你的梦和动物园有某些联系。" #: lang/json/dream_from_json.py msgid "You dream of a home in the forests." @@ -55699,7 +55782,7 @@ msgstr "你梦见自己在丛林中觅食……咬上去吗？" #: lang/json/dream_from_json.py msgid "You dream of grazing in an open field." -msgstr "你梦见自己在旷野中吃草。" +msgstr "你梦见自己在旷野中吃草." #: lang/json/dream_from_json.py msgid "" @@ -55737,7 +55820,7 @@ msgstr "在梦中，你悄悄地接近一群蜥蜴……喂，这是在做梦吧 #: lang/json/dream_from_json.py msgid "You dream of swimming in the open ocean" -msgstr "你梦见自己在海洋里遨游。" +msgstr "你梦见自己在海洋里遨游." #: lang/json/dream_from_json.py msgid "You dream of tearing into a fresh kill." @@ -55775,11 +55858,11 @@ msgstr "你兴奋地网住了一个闯入者，准备享用盛宴……呃，一 #: lang/json/dream_from_json.py msgid "You feel a yearning..." -msgstr "你感到一种向往……" +msgstr "你感到一种向往..." #: lang/json/dream_from_json.py msgid "You feel beautiful, and yet riven with worry..." -msgstr "你感到自己很漂亮，但又被担心所撕裂……" +msgstr "你感到自己很漂亮，但又很分裂..." #: lang/json/dream_from_json.py msgid "You feel like you're cracking a combination lock." @@ -55795,7 +55878,7 @@ msgstr "你感到暖和了。" #: lang/json/dream_from_json.py msgid "You feel...OK." -msgstr "你感觉……不错。" +msgstr "你感觉....不错。" #: lang/json/dream_from_json.py msgid "" @@ -55826,7 +55909,7 @@ msgstr "" #: lang/json/dream_from_json.py msgid "You have a disturbing dream of bathing in the sun on a rock." -msgstr "你做了一个让人心烦的梦，梦里你在岩石上晒太阳。" +msgstr "你做了一个让人心烦的梦，梦里你在岩石上晒太阳." #: lang/json/dream_from_json.py msgid "You have a disturbing dream of someone invading your territory." @@ -55893,19 +55976,19 @@ msgstr "你做了一个关于牛的奇怪的梦" #: lang/json/dream_from_json.py msgid "You have a strange dream about fish." -msgstr "你做了一个关于鱼的奇怪的梦。" +msgstr "你做了一个关于鱼的奇怪的梦." #: lang/json/dream_from_json.py msgid "You have a strange dream about insects." -msgstr "你做了一个关于昆虫的怪梦。" +msgstr "你做了一个关于昆虫的怪梦." #: lang/json/dream_from_json.py msgid "You have a strange dream about living in a cave." -msgstr "你做了一个关于生活在洞穴里的怪梦。" +msgstr "你做了一个关于生活在洞穴里的怪梦." #: lang/json/dream_from_json.py msgid "You have a strange dream about lizards." -msgstr "你做了一个关于蜥蜴的怪梦。" +msgstr "你做了一个关于蜥蜴的怪梦." #: lang/json/dream_from_json.py msgid "You have a strange dream about plants." @@ -55913,19 +55996,19 @@ msgstr "你做了一个梦，梦见了很多植物。" #: lang/json/dream_from_json.py msgid "You have a strange dream about rats." -msgstr "你做了一个关于老鼠的怪梦。" +msgstr "你做了一个关于老鼠的怪梦." #: lang/json/dream_from_json.py msgid "You have a strange dream about sea creatures." -msgstr "你做了一个关于海洋生物的怪梦。" +msgstr "你做了一个关于海洋生物的怪梦." #: lang/json/dream_from_json.py msgid "You have a strange dream about slime." -msgstr "你做了一个关于史莱姆的怪梦。" +msgstr "你做了一个关于史莱姆的怪梦." #: lang/json/dream_from_json.py msgid "You have a strange dream about spiders." -msgstr "你做了一个关于蜘蛛的怪梦。" +msgstr "你做了一个关于蜘蛛的怪梦." #: lang/json/dream_from_json.py msgid "You have a strange dream about wolves." @@ -55941,7 +56024,7 @@ msgstr "你做了一个奇怪的梦，梦见自己在吐丝做网。（蜘蛛精 #: lang/json/dream_from_json.py msgid "You have a strange dream." -msgstr "你做了一个奇怪的梦。" +msgstr "你做了一个奇怪的梦." #: lang/json/dream_from_json.py msgid "" @@ -55953,11 +56036,11 @@ msgstr "" #: lang/json/dream_from_json.py msgid "You have a vivid dream of hunting in the woods." -msgstr "你做了一个在树林里打猎的生动的梦。" +msgstr "你做了一个在树林里打猎的生动的梦." #: lang/json/dream_from_json.py msgid "You have strange dreams of soaring through the sky." -msgstr "你做了一个奇怪的梦，梦里你飞翔在天空中。" +msgstr "你做了一个奇怪的梦，梦里你飞翔在天空中." #: lang/json/dream_from_json.py msgid "You pant, terrified at the thought of that FUNGUS destroying your home!" @@ -56005,7 +56088,7 @@ msgstr "你很生动的梦见自己正在和伙伴们合作追捕一只猎物。 #: lang/json/dream_from_json.py msgid "You wish others could understand, and join your struggle..." -msgstr "你希望别人能理解，并和你一起奋斗……" +msgstr "你希望别人能理解，并和你一起奋斗..." #: lang/json/dream_from_json.py msgid "" @@ -56042,7 +56125,7 @@ msgstr "你梦见自己在黑暗中生活了很多很多年，这种感觉以假 msgid "" "Your dream of raiding a giant beehive has you licking your...muzzle in " "anticipation." -msgstr "梦中，你疯狂的跪舔着一个蜂巢……用你的口器……嗯？口器。" +msgstr "梦中，你疯狂的跪舔着一个蜂巢...用你的口器...嗯？口器。" #: lang/json/dream_from_json.py msgid "" @@ -56064,7 +56147,7 @@ msgstr "你梦见自己带着嘴套……等等，嘴套？" #: lang/json/dream_from_json.py msgid "Your dreams give a strange reclusive feeling." -msgstr "你的梦给你一种奇怪的与世隔绝的感觉。" +msgstr "你的梦给你一种奇怪的与世隔绝的感觉." #: lang/json/dream_from_json.py msgid "Your dreams give you a rough furry feeling." @@ -56076,15 +56159,15 @@ msgstr "你梦见自己变得毛茸茸的——好萌！" #: lang/json/dream_from_json.py msgid "Your dreams give you a strange chitinous feeling." -msgstr "你的梦给你一种奇怪的长出甲壳的感觉。" +msgstr "你的梦给你一种奇怪的长出甲壳的感觉." #: lang/json/dream_from_json.py msgid "Your dreams give you a strange content, furry feeling." -msgstr "你的梦给你一种莫名的满足和浑身长毛的感觉。" +msgstr "你的梦给你一种莫名的满足和浑身长毛的感觉." #: lang/json/dream_from_json.py msgid "Your dreams give you a strange feathered feeling." -msgstr "你梦到你长出了羽毛。" +msgstr "你梦到你长出了羽毛." #: lang/json/dream_from_json.py msgid "Your dreams give you a strange furry feeling." @@ -56092,15 +56175,15 @@ msgstr "这个梦让你感觉心里毛毛的。" #: lang/json/dream_from_json.py msgid "Your dreams give you a strange fuzzy feeling." -msgstr "你的梦给你一种奇怪的长毛的感觉。" +msgstr "你的梦给你一种奇怪的长毛的感觉." #: lang/json/dream_from_json.py msgid "Your dreams give you a strange plantlike feeling." -msgstr "你的梦给你一种奇怪的像植物一样的感觉。" +msgstr "你的梦给你一种奇怪的像植物一样的感觉." #: lang/json/dream_from_json.py msgid "Your dreams give you a strange scaly feeling." -msgstr "你的梦给予了你皮肤鳞片化的奇怪感觉。" +msgstr "你的梦给予了你皮肤鳞片化的奇怪感觉." #: lang/json/dream_from_json.py msgid "Your dreams give you a strange slimy feeling." @@ -56108,7 +56191,7 @@ msgstr "你的梦让你感觉浑身粘粘的。（爬满蜗牛的感觉么亲） #: lang/json/dream_from_json.py msgid "Your dreams give you a strange webbed feeling." -msgstr "你的梦给你一种奇怪的网状的感觉。" +msgstr "你的梦给你一种奇怪的网状的感觉." #: lang/json/dream_from_json.py msgid "Your dreams give you a strange wet feeling." @@ -56357,7 +56440,7 @@ msgstr "已获得的任务道具" #. ~ Description of effect 'Hypervitaminosis'. #: lang/json/effects_from_json.py msgid "An excess of vitamins has badly affected your metabolism." -msgstr "过量的维生素严重影响了你的新陈代谢。" +msgstr "维生素虽好,但你吃得太多了。过多的维生素影响了你的新陈代谢。" #. ~ Description of effect 'RX11 Stimulant Rush'. #: lang/json/effects_from_json.py @@ -56366,7 +56449,7 @@ msgstr "一种强烈的刺激像电流一样流遍你的全身。倍儿爽！" #: lang/json/effects_from_json.py msgid "Anemia" -msgstr "贫血症" +msgstr "缺铁性贫血" #: lang/json/effects_from_json.py msgid "Asked Info" @@ -56438,7 +56521,7 @@ msgstr "反弹" #: lang/json/effects_from_json.py msgid "Brittle bones" -msgstr "脆骨症" +msgstr "骨头变脆" #: lang/json/effects_from_json.py msgid "Bugs in skin" @@ -56457,37 +56540,37 @@ msgstr "被要求跟上" #: lang/json/effects_from_json.py msgctxt "memorial_female" msgid "Caught a cold." -msgstr "感冒了。" +msgstr "感冒了." #. ~ Male memorial apply log for effect(s) 'Common Cold'. #: lang/json/effects_from_json.py msgctxt "memorial_male" msgid "Caught a cold." -msgstr "感冒了。" +msgstr "感冒了." #. ~ Female memorial apply log for effect(s) 'On Fire'. #: lang/json/effects_from_json.py msgctxt "memorial_female" msgid "Caught on fire." -msgstr "着火了。" +msgstr "着火了." #. ~ Male memorial apply log for effect(s) 'On Fire'. #: lang/json/effects_from_json.py msgctxt "memorial_male" msgid "Caught on fire." -msgstr "着火了。" +msgstr "着火了." #. ~ Female memorial apply log for effect(s) 'Influenza'. #: lang/json/effects_from_json.py msgctxt "memorial_female" msgid "Caught the flu." -msgstr "得了流感。" +msgstr "得了流感." #. ~ Male memorial apply log for effect(s) 'Influenza'. #: lang/json/effects_from_json.py msgctxt "memorial_male" msgid "Caught the flu." -msgstr "得了流感。" +msgstr "得了流感." #: lang/json/effects_from_json.py msgid "Chilly" @@ -56595,7 +56678,7 @@ msgstr "体验曼陀罗" #: lang/json/effects_from_json.py msgid "Feared" -msgstr "" +msgstr "恐惧" #: lang/json/effects_from_json.py msgid "Food Poisoning" @@ -56637,13 +56720,13 @@ msgstr "感冒好了。" #: lang/json/effects_from_json.py msgctxt "memorial_female" msgid "Got over the flu." -msgstr "流感治愈了。" +msgstr "流感治愈了." #. ~ Male memorial remove log for effect(s) 'Influenza'. #: lang/json/effects_from_json.py msgctxt "memorial_male" msgid "Got over the flu." -msgstr "流感治愈了。" +msgstr "流感治愈了." #: lang/json/effects_from_json.py msgid "Grabbed" @@ -56687,7 +56770,7 @@ msgstr "热" #: lang/json/effects_from_json.py msgid "Hypervitaminosis" -msgstr "维生素过量症" +msgstr "维生素过多症" #: lang/json/effects_from_json.py msgid "Hypocalcemia" @@ -56979,7 +57062,7 @@ msgstr "沾满粘液的" #: lang/json/effects_from_json.py msgid "Slow healing" -msgstr "缓慢愈合" +msgstr "愈合缓慢" #: lang/json/effects_from_json.py msgid "Slowed" @@ -57305,7 +57388,7 @@ msgstr "你看的更清晰了。" #. ~ Apply message for effect(s) 'Asthma, Asthma, Asthma, Asthma, Heavy Asthma, Heavy Asthma'. #: lang/json/effects_from_json.py msgid "You can't breathe... asthma attack!" -msgstr "你无法呼吸……哮喘发作！" +msgstr "你无法呼吸......哮喘发作！" #. ~ Description of effect 'Deaf'. #: lang/json/effects_from_json.py @@ -57316,7 +57399,7 @@ msgstr "你听不见任何声音，噪音让你脑袋发疼，你无法与 NPC #: lang/json/effects_from_json.py msgid "You can't look away from the faultline..." -msgstr "你不能通过镜片的裂痕看到远方……" +msgstr "你的视线无法从断层上移开。。。" #. ~ Description of effect 'Stuck in a light snare'. #. ~ Description of effect 'Stuck in a heavy snare'. @@ -57396,7 +57479,7 @@ msgstr "你感觉有点恶心，觉得自己变得像老鼠一样。" #. ~ Description of effect 'Nausea'. #: lang/json/effects_from_json.py msgid "You feel nauseous. Even a thought of food makes you feel sick." -msgstr "" +msgstr "你感到一阵恶心。稍微有点食物的念头都让你感觉很难受。" #: lang/json/effects_from_json.py msgid "You feel sick inside." @@ -57452,7 +57535,7 @@ msgstr "" #. ~ Description of effect 'Feared'. #: lang/json/effects_from_json.py msgid "You have been paralyzed by the fear." -msgstr "" +msgstr "你被你的恐惧麻木了。" #. ~ Description of effect 'Poisoned'. #: lang/json/effects_from_json.py @@ -57491,7 +57574,7 @@ msgstr "你躺下来闭上眼试图睡觉……" #. ~ Remove message for effect(s) 'Iron deficiency, Early anemia, Anemia'. #: lang/json/effects_from_json.py msgid "You no longer feel anemic." -msgstr "你不再感到乏力。" +msgstr "贫血好了。应该来场大姨妈助助兴。" #. ~ Remove message for effect(s) 'Nausea'. #: lang/json/effects_from_json.py @@ -57510,7 +57593,7 @@ msgstr "你抽的有点多" #. ~ Apply message for effect(s) 'Early scurvy, Scurvy, Bad Scurvy'. #: lang/json/effects_from_json.py msgid "You start to develop symptoms of scurvy." -msgstr "" +msgstr "你的坏血病的症状加重了。" #: lang/json/effects_from_json.py msgid "" @@ -57751,7 +57834,7 @@ msgstr "你的骨头变得更强，因为你不再缺钙了。" #. ~ Remove message for effect(s) 'Hypocalcemia, Weak bones, Brittle bones'. #: lang/json/effects_from_json.py msgid "Your bones regain their usual strength." -msgstr "你的骨头恢复了往常的力量。" +msgstr "你的骨头恢复了正常的强度。" #. ~ Apply message for effect(s) 'Winded'. #: lang/json/effects_from_json.py @@ -57833,12 +57916,12 @@ msgstr "浓烟让你的肺很难受。" #. ~ Remove message for effect(s) 'Hypervitaminosis'. #: lang/json/effects_from_json.py msgid "Your metabolism becomes more stable." -msgstr "你的新陈代谢变得更稳定。" +msgstr "你的新陈代谢又稳定下来了。" #. ~ Apply message for effect(s) 'Hypervitaminosis'. #: lang/json/effects_from_json.py msgid "Your metabolism becomes unstable." -msgstr "你的新陈代谢变得不稳定。" +msgstr "你的新陈代谢开始变得不稳定。" #. ~ Description of effect 'Stunned'. #: lang/json/effects_from_json.py @@ -57848,17 +57931,17 @@ msgstr "你开始不自主的随意运动。" #. ~ Remove message for effect(s) 'VitA deficiency, Poor vision, Night blindness'. #: lang/json/effects_from_json.py msgid "Your normal visual accuity returns." -msgstr "你的视觉恢复正常。" +msgstr "你的夜盲症治好了,视力恢复了正常水平。" #. ~ Remove message for effect(s) 'Early scurvy, Scurvy, Bad Scurvy'. #: lang/json/effects_from_json.py msgid "Your scurvy has resolved." -msgstr "你的坏血病以痊愈。" +msgstr "坏血病的症状消失了。" #. ~ Decay message for effect(s) 'Early scurvy, Scurvy, Bad Scurvy'. #: lang/json/effects_from_json.py msgid "Your scurvy lessens as your Vitamin C deficiency improves." -msgstr "" +msgstr "随着你不再缺乏维生素C，你的坏血病开始好转。" #. ~ Remove message for effect(s) 'Blind'. #: lang/json/effects_from_json.py @@ -57868,7 +57951,7 @@ msgstr "你恢复了视力!" #. ~ Apply message for effect(s) 'Itchy skin, Writhing skin, Bugs in skin'. #: lang/json/effects_from_json.py msgid "Your skin feels extremely itchy!" -msgstr "你的皮肤感觉很痒！" +msgstr "你的皮肤感觉很痒." #. ~ Miss message for effect(s) 'Food Poisoning'. #: lang/json/effects_from_json.py @@ -57907,7 +57990,7 @@ msgstr "你的维生素B12缺乏症状快要解除了。" #. ~ Decay message for effect(s) 'Early scurvy, Scurvy, Bad Scurvy'. #: lang/json/effects_from_json.py msgid "Your vitamin C deficiency is starting to resolve." -msgstr "" +msgstr "你的维生素C缺乏症状快要解除了。" #. ~ Miss message for effect(s) 'Offering'. #: lang/json/effects_from_json.py @@ -57917,7 +58000,7 @@ msgstr "你斗争的意志失去了的一小会。" #. ~ Remove message for effect(s) 'B12 deficiency, Slow healing, No healing'. #: lang/json/effects_from_json.py msgid "Your wounds now heal normally." -msgstr "你的伤口现在正常愈合。" +msgstr "你的伤口愈合速度恢复正常了。" #: lang/json/effects_from_json.py msgid "Zapped" @@ -58018,48 +58101,48 @@ msgstr[0] "人类" #: lang/json/fault_from_json.py msgid "" "An expired filter reduces fuel efficiency and increases smoke production." -msgstr "" +msgstr "老旧的过滤器会降低燃料的效率，并产生更多的烟雾。" #. ~ Description for fuel filter #: lang/json/fault_from_json.py msgid "" "An expired filter reduces performance and increases the chance of backfires." -msgstr "" +msgstr "老旧的过滤器会降低性能并增加逆火的机会。" #. ~ Description for glow plugs #: lang/json/fault_from_json.py msgid "Help when starting an engine in low ambient temperatures." -msgstr "" +msgstr "帮助你在低温环境下启动发动机。" #. ~ Description for immobiliser #: lang/json/fault_from_json.py msgid "Prevents starting of the vehicle without the appropriate key." -msgstr "防止汽车被不正当的方式启动。" +msgstr "防止在没有插入正确钥匙的情况下发动车辆。" #. ~ Description for drive belt #: lang/json/fault_from_json.py msgid "Required for operation of an attached alternator." -msgstr "车载发电机正常工作时的必需品。" +msgstr "需要连接到一个可以运行的发动机。" #. ~ Description for starter motor #: lang/json/fault_from_json.py msgid "Required to initially start the engine." -msgstr "最初启动发动机所需。" +msgstr "需要连接到发动机来给其提供启动的动力。" #. ~ Description for diesel pump #: lang/json/fault_from_json.py msgid "Required to pump and pressurise diesel from a vehicles tank." -msgstr "将柴油从油箱中泵出并加压的必需品。" +msgstr "需要连接到车辆的柴油箱以泵动柴油。" #. ~ Description for fuel pump #: lang/json/fault_from_json.py msgid "Required to pump gasoline from a vehicles tank." -msgstr "将汽油从油箱中泵出的必需品。" +msgstr "需要连接车辆的汽油箱以泵动汽油。" #. ~ Description for water pump #: lang/json/fault_from_json.py msgid "Required to pump water to an external radiator or heatsink." -msgstr "将水泵入外部散热器或散热片的必需品。" +msgstr "需要连接到外置散热器或散热板以泵水。" #: lang/json/fault_from_json.py lang/json/terrain_from_json.py msgid "diesel pump" @@ -58067,23 +58150,23 @@ msgstr "柴油泵" #: lang/json/fault_from_json.py msgid "fuel filter" -msgstr "" +msgstr "燃料过滤器" #: lang/json/fault_from_json.py msgid "fuel pump" -msgstr "汽油泵" +msgstr "燃油泵" #: lang/json/fault_from_json.py msgid "glow plugs" -msgstr "火花塞" +msgstr "预热塞" #: lang/json/fault_from_json.py msgid "immobiliser" -msgstr "汽车防盗器" +msgstr "防盗装置" #: lang/json/fault_from_json.py msgid "starter motor" -msgstr "启动马达" +msgstr "启动电机" #: lang/json/fault_from_json.py lang/json/terrain_from_json.py msgid "water pump" @@ -58195,7 +58278,7 @@ msgstr "砖窑" #: lang/json/furniture_from_json.py msgid "coffin" -msgstr "" +msgstr "棺材" #: lang/json/furniture_from_json.py msgid "counter" @@ -58213,13 +58296,14 @@ msgstr "撞击声！" msgid "crate" msgstr "板条箱" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp msgid "crunch!" msgstr "嘎嚓！" #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py msgid "crunch." -msgstr "嘎吱。" +msgstr "嘎吱." #: lang/json/furniture_from_json.py msgid "cupboard" @@ -58309,8 +58393,8 @@ msgstr "壁炉" msgid "glass breaking" msgstr "玻璃破裂" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp -#: src/map.cpp src/ranged.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp src/map.cpp src/ranged.cpp msgid "glass breaking!" msgstr "玻璃破裂的声音！" @@ -58318,6 +58402,10 @@ msgstr "玻璃破裂的声音！" msgid "glass door fridge" msgstr "玻璃冰柜" +#: lang/json/furniture_from_json.py +msgid "gravestone" +msgstr "墓碑" + #: lang/json/furniture_from_json.py msgid "groundsheet" msgstr "防潮布" @@ -58334,6 +58422,10 @@ msgstr "可收获的植物" msgid "hay" msgstr "干草" +#: lang/json/furniture_from_json.py +msgid "headstone" +msgstr "墓碑" + #: lang/json/furniture_from_json.py msgid "heavy punching bag" msgstr "训练沙袋" @@ -58410,6 +58502,10 @@ msgstr "变异的仙人掌" msgid "mutated poppy flower" msgstr "变异罂粟花" +#: lang/json/furniture_from_json.py +msgid "obelisk" +msgstr "方尖碑" + #: lang/json/furniture_from_json.py msgid "open animalskin flap" msgstr "打开的兽皮帘子" @@ -58420,7 +58516,7 @@ msgstr "打开的帆布帘子" #: lang/json/furniture_from_json.py msgid "open coffin" -msgstr "" +msgstr "打开的棺材" #: lang/json/furniture_from_json.py msgid "open crate" @@ -58452,7 +58548,7 @@ msgstr "弹珠机" #: lang/json/furniture_from_json.py msgid "poof." -msgstr "噗。" +msgstr "噗." #: lang/json/furniture_from_json.py msgid "pool table" @@ -58510,10 +58606,6 @@ msgstr "沙袋墙" msgid "screeching metal!" msgstr "金属撕裂！" -#: lang/json/furniture_from_json.py -msgid "seed" -msgstr "种子" - #: lang/json/furniture_from_json.py msgid "seedling" msgstr "幼苗" @@ -58595,6 +58687,10 @@ msgstr "重击声!" msgid "thump." msgstr "重击声。" +#: lang/json/furniture_from_json.py +msgid "thunk!" +msgstr "咚！" + #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py msgid "thunk." msgstr "咚。" @@ -58671,6 +58767,10 @@ msgstr "火炉" msgid "wooden keg" msgstr "木制酒桶" +#: lang/json/furniture_from_json.py +msgid "worn gravestone" +msgstr "磨损的墓碑" + #: lang/json/furniture_from_json.py msgid "yellow indoor plant" msgstr "黄色室内植物" @@ -58738,17 +58838,17 @@ msgstr "栅栏门打开了！" #. ~ 'pull' action message of some gate object. #: lang/json/gates_from_json.py msgid "You pull the rope..." -msgstr "你拉了把绳子……" +msgstr "你拉了把绳子..." #. ~ 'pull' action message of some gate object. #: lang/json/gates_from_json.py msgid "You throw the lever..." -msgstr "你扳下开关……" +msgstr "你扳下开关..." #. ~ 'pull' action message of some gate object. #: lang/json/gates_from_json.py msgid "You turn the handle..." -msgstr "你转动了把手……" +msgstr "你转动了把手..." #: lang/json/hint_from_json.py msgid "" @@ -58818,7 +58918,7 @@ msgid "" "Carrying a lighter is something all veterans do. It takes up almost no " "space, and can easily save your life." msgstr "" -"几乎所有的退伍军人都会携带打火机，这占不了多少空间，但是偶尔可以救你一命。" +"几乎所有的退伍军人都会携带打火机，这占不了多少空间，但是偶尔可以挽救你的生命." #: lang/json/hint_from_json.py msgid "" @@ -58894,14 +58994,14 @@ msgid "" "might be even better..." msgstr "" "当做近战武器来使，大砍刀可是最好不过了。我曾经看见一个家伙拿着一把大砍刀干翻" -"了一只狂暴丧尸兽！当然，如果你能找到一把武士刀，那生活会更加美好……" +"了一只狂暴丧尸兽！当然，如果你能找到一把武士刀，那生活会更加美好..." #: lang/json/hint_from_json.py msgid "" "Have you heard about those queen triffids? You gotta keep your distance " "from them, unless you like having a tree grow right through your chest." msgstr "" -"你听说过三尖树皇后吗？你最好离它们远些，除非你喜欢树枝给你\"透心凉\"般的舒爽" +"你听说过三尖树女王吗？你最好离它们远些，除非你喜欢树枝给你\"透心凉\"般的舒爽" "体验。" #: lang/json/hint_from_json.py @@ -58926,8 +59026,8 @@ msgid "" "alcohol on fire. Then duck out the back door, and watch the zombies run " "into a burning building!" msgstr "" -"以下是一个逃脱丧尸大军的小把戏——冲进酒吧什么的，打碎酒瓶，让酒精燃烧起来，然" -"后看着后边的丧尸冲进火场，没有什么比这更愉♂悦的了！" +"以下是一个逃脱僵尸大军的小把戏——冲进酒吧什么的，打碎酒瓶，让酒精燃烧起来，然" +"后看着后边的僵尸冲进火场，没有什么比这更愉♂悦的了！" #: lang/json/hint_from_json.py msgid "" @@ -58957,7 +59057,7 @@ msgid "" "walls! He said it was some kind of huge triffid making it happen..." msgstr "" "我有一个哥们，有一次他在林中的小屋睡觉，当他突然醒来时，发现树枝和藤蔓从地板" -"和墙壁的缝隙中生长出来！他说：一定是某种巨大的三尖树搞的鬼……" +"和墙壁的缝隙中生长出来！他说：一定是某种巨大的三尖树搞的鬼..." #: lang/json/hint_from_json.py msgid "" @@ -58971,7 +59071,7 @@ msgstr "" msgid "" "I know grocery stores and stuff are full of fruit, but be careful, it's " "probably rotten." -msgstr "我知道食品杂货店里可能有很多水果，但是务必注意，很大可能是腐烂的。" +msgstr "我知道食品杂货店里可能有很多水果，但是务必注意，很大可能是腐烂的." #: lang/json/hint_from_json.py msgid "" @@ -58997,7 +59097,7 @@ msgid "" "He wound up asphyxiating on the smoke." msgstr "" "我曾经见过一个人，他想渡过一个温暖的晚上，于是他在地铁道里烧了一个火堆，呆在" -"里边，他最后被烟雾窒息而死。" +"里边，他最后死于窒息...." #: lang/json/hint_from_json.py msgid "" @@ -59011,8 +59111,8 @@ msgid "" "the perfect weapon... quiet, accurate, and deadly. But I've never found " "one, and I bet ammo is wicked scarce..." msgstr "" -"我见过威力恐怖的激光武器，那几乎是完美的武器……安静，准确，致命。但是我从来就" -"没找到过那玩意，我敢打赌那种枪子弹一定很稀少……" +"我见过威力恐怖的激光武器，那几乎是完美的，安静的，准确的，致命的，优雅的.但是" +"我打赌他的子弹一定很少" #: lang/json/hint_from_json.py msgid "" @@ -59038,7 +59138,7 @@ msgid "" "your gun. Be sure to aim at the zombie furthest away; you'll hit more of " "them that way." msgstr "" -"如果有一堆丧尸排成直线朝你过来，试着用你的枪打短点射。记着瞄准最远的丧尸，这" +"如果有一堆僵尸排成直线朝你过来，试着用你的枪打短点射。记着瞄准最远的僵尸，这" "样你能打中他们中的大部分。" #: lang/json/hint_from_json.py @@ -59058,8 +59158,12 @@ msgstr "有空间的话，最好带上灭火器。相信我，你不会想在大 #: lang/json/hint_from_json.py msgid "" "If you get a pair of night vision goggles, hold on to them! A flashlight " -"will give you away, but with goggles you can be sneaky." -msgstr "如果你有夜视仪，一定要牢牢抓紧！灯光会让你暴露，但夜视仪不会。" +"will give you away, but with goggles you can be sneaky. Beware that some " +"types of zombies are camouflaged against it, and require proper light to be " +"visible." +msgstr "" +"如果你有夜视仪，一定要牢牢抓紧！灯光会让你暴露，但夜视仪不会。但要当心，某些" +"丧尸已经进化出对抗它的伪装，需要正常的灯光才能发现。" #: lang/json/hint_from_json.py msgid "" @@ -59082,7 +59186,7 @@ msgid "" "fast as hell, but pretty dumb; they'll try to smash through obstacles rather " "than going around, and that slows them down a lot." msgstr "" -"如果你碰上了一只丧尸浩克，逃跑应该是个好主意。它们快的见鬼，虽然非常蠢；比起" +"如果你碰上了一只僵尸浩克，逃跑应该是个好主意。它们快的见鬼，虽然非常蠢；比起" "赶路来它们更喜欢将障碍物破坏的粉碎，这极大的减缓了它们的速度。" #: lang/json/hint_from_json.py @@ -59098,7 +59202,7 @@ msgid "" "If you shoot a zombie, but don't quite kill it, try to finish it off with a " "punch or something instead of wasting a bullet." msgstr "" -"如果你射中了丧尸，但不够杀死他，试着用你的拳头或其他东西解决他，而不是浪费你" +"如果你射中了僵尸，但不够杀死他，试着用你的拳头或其他东西解决他，而不是浪费你" "的子弹。" #: lang/json/hint_from_json.py @@ -59106,7 +59210,7 @@ msgid "" "If you're getting chased by a hoard of zombies, try ducking into the subways " "and traveling a block or two, then coming back up." msgstr "" -"当你被众多的丧尸追的屁滚尿流的时候，可以试着躲到下水道，过了一两个街区，就又" +"当你被众多的僵尸追的屁滚尿流的时候，可以试着躲到下水道，过了一两个街区，就又" "是一条好汉。" #: lang/json/hint_from_json.py @@ -59121,7 +59225,7 @@ msgid "" "you down it, try to wound the guy in front badly. He'll start moving slow " "and cause a serious traffic jam!" msgstr "" -"如果你在走廊或其他狭窄地形被一堆丧尸追，试着重创跑在最前排的那个。他会减慢速" +"如果你在走廊或其他狭窄地形被一堆僵尸追，试着重创跑在最前排的那个。他会减慢速" "度造成严重的交通堵塞！" #: lang/json/hint_from_json.py @@ -59168,15 +59272,14 @@ msgid "" "plan on eating them. I've seen these weird zombies bring their friends back " "from the dead!" msgstr "" -"在你有时间的时候去分解丧尸尸体吧，即使你不打算吃掉它们。我曾经看过某种奇怪的" -"丧尸能够复活它的同伴。" +"在你有时间的时候去分解僵尸尸体吧，即使你不打算吃掉它们。我曾经看过某种奇怪的" +"僵尸能够复活它的同伴。" #: lang/json/hint_from_json.py msgid "" "It's a good idea to carry around a couple of empty bottles. You can fill " "them up with water, gasoline, or whatever!" -msgstr "" -"随身携带一些空瓶，这是一个好主意，可以用来装水或者汽油饮料或者其他的东西！" +msgstr "随身携带一些空瓶，这是一个好主意，可以用来装水或者汽油饮料或者其他的." #: lang/json/hint_from_json.py msgid "" @@ -59227,7 +59330,7 @@ msgid "" "Oh man, have you gone down into the old subway systems? I'd be careful... " "there's these things down there that are like zombies, but tougher." msgstr "" -"哦伙计，你有没有进入以前的地铁里？我要小心些，那里有一些象丧尸，但要比丧尸更" +"哦伙计，你有没有进入以前的地铁里？我要小心些，那里有一些象僵尸，但要比僵尸更" "厉害的东西。" #: lang/json/hint_from_json.py @@ -59253,7 +59356,7 @@ msgid "" "can't smell you, unlike zombies, so if you turn your light off at night you " "can sneak right past." msgstr "" -"骷髅的骨头过于脆弱以至于不能打破门和窗户。它们也闻不到你，不像丧尸那样，所" +"骷髅的骨头过于脆弱以至于不能打破门和窗户。它们也闻不到你，不像僵尸那样，所" "以，如果你把你的光关掉，晚上你可以偷偷的绕过它们。" #: lang/json/hint_from_json.py @@ -59289,7 +59392,7 @@ msgid "" "Standing behind a window is a good tactic. It takes zombies a long time to " "crawl through, giving you lots of opportunities to hit them." msgstr "" -"站在窗后是个好战术。这会让丧尸们花很长时间才能爬进来，这样给了你很多攻击它们" +"站在窗后是个好战术。这会让僵尸们花很长时间才能爬进来，这样给了你很多攻击它们" "的机会。" #: lang/json/hint_from_json.py @@ -59313,9 +59416,7 @@ msgid "" "There's this type of zombie that can shoot bolts of lightning! Stay away " "from walls and stuff when they do... the electricity can travel along solid " "surfaces." -msgstr "" -"有一种可以放出高能闪电的丧尸！记住离墙和其他物品远点……因为电能可以通过其他固" -"体表面传导。" +msgstr "有一种可以放出高能闪电的丧尸!记住远离他们，不然你会后悔的." #: lang/json/hint_from_json.py msgid "" @@ -59339,8 +59440,7 @@ msgid "" "Those acid-spitting zombies are pretty nasty, but if you're smart, you can " "get other zombies to wade through the acid." msgstr "" -"那些会吐酸的丧尸非常令人讨厌，不过如果你足够聪明，你可以让其他丧尸趟进酸液" -"里。" +"那些吐酸僵尸非常令人讨厌，不过如果你足够聪明，你可以让其他僵尸趟进酸液里。" #: lang/json/hint_from_json.py msgid "" @@ -59421,7 +59521,7 @@ msgid "" "it might hurt your hands, too..." msgstr "" "你知道，一个玻璃瓶在紧要关头可以作为一个不错的武器。如果你用它暴击某物的头，" -"碎玻璃会对他造成额外的伤害。当然，它同样也会伤了你的手……" +"碎玻璃会对他造成额外的伤害。当然，它同样也会伤了你的手..." #: lang/json/hint_from_json.py msgid "" @@ -59433,14 +59533,14 @@ msgstr "要知道，突击步枪不用总是用全自动模式。单发点射更 msgid "" "Zombie brutes and hulks have really tough hide. Don't bother shooting at " "them with lower-caliber guns, the bullet will bounce right off!" -msgstr "狂暴尸兽和丧尸浩克有坚硬的外皮。小口径的枪对它们不管用，子弹会被弹开！" +msgstr "狂暴尸兽和僵尸浩克有坚硬的外皮。小口径的枪对它们不管用，子弹会被弹开！" #: lang/json/hint_from_json.py msgid "" "Zombie hulks are NASTY, but they're easy to outsmart. If there's other " "monsters between you and them, they'll kill the monster for you!" msgstr "" -"丧尸浩克极度惹人厌，不过它们很容易被智取。如果在你和它们之间有其他的怪物，浩" +"僵尸浩克极度惹人厌，不过它们很容易被智取。如果在你和它们之间有其他的怪物，浩" "克就会帮你杀掉那些。" #: lang/json/hint_from_json.py @@ -59448,7 +59548,7 @@ msgid "" "Zombies are pretty dumb... heck, most monsters are! If you can get a fire " "going between you and them, they'll just run straight through it." msgstr "" -"丧尸非常的愚蠢，如果你和他之间有堆火，他们会直直的走进火场来追杀你，大部分怪" +"僵尸非常的愚蠢，如果你和他之间有堆火，他们会直直的走进火场来追杀你，大部分怪" "物也是如此。" #: lang/json/item_action_from_json.py @@ -59561,7 +59661,7 @@ msgstr "服用抗痉挛药" #: lang/json/item_action_from_json.py msgid "Take vitamins" -msgstr "服用维生素" +msgstr "服用维他命" #: lang/json/item_action_from_json.py msgid "Taze something" @@ -59933,7 +60033,7 @@ msgstr "标注选取的物品" #: lang/json/keybinding_from_json.py msgid "Mend part" -msgstr "" +msgstr "修复汽车部件" #: lang/json/keybinding_from_json.py msgid "Mouse Move" @@ -60159,7 +60259,7 @@ msgstr "阅读" #: lang/json/keybinding_from_json.py msgid "Reassign invlet" -msgstr "重分配按键" +msgstr "重新分配快捷键" #: lang/json/keybinding_from_json.py msgid "Recraft last recipe" @@ -60183,7 +60283,7 @@ msgstr "移除键位绑定" #: lang/json/keybinding_from_json.py msgid "Remove bionic" -msgstr "移除仿生模块" +msgstr "移除仿生插件" #: lang/json/keybinding_from_json.py msgid "Remove custom color" @@ -60575,7 +60675,7 @@ msgstr "查看/激活变异" #: lang/json/keybinding_from_json.py msgid "Vitamins" -msgstr "维生素" +msgstr "维他命" #: lang/json/keybinding_from_json.py msgid "Wait for Several Minutes" @@ -60732,7 +60832,7 @@ msgid "" "methodology." msgstr "" "Dionne博士的研究小组研发出了一款更强力的变种药剂，代号PE065。尽管这款新药剂的" -"效果是那么的狂暴和不稳定，但这么说吧，只要有少数几个使用了PE065的变种体，就能" +"效果是那么的狂暴和不稳定...这么说吧，只要有少数几个使用了PE065的变种体，就能" "有效地全面阻止XE037的感染者们。我们还是很期待这款新药剂的临床应用以及实践。" #: lang/json/lab_note_from_json.py @@ -60742,8 +60842,8 @@ msgid "" "been reassigned. Further discussion of or attempts to carry on his work " "will be grounds for immediate termination." msgstr "" -"Maiar博士已经被禁止从事对人体进行的非人道研究。他的笔记已经被销毁，他团队的所" -"有研究人员被重新分配。进一步讨论或试图继续他的研究都将会被立刻终止。" +"Maiar博士已经因为参与对人体进行的禁忌研究而被终结。他的笔记被销毁，他团队的所" +"有研究人员被重新分配.任何继续他的研究的的讨论和尝试都将被立刻终结。" #: lang/json/lab_note_from_json.py msgid "" @@ -60823,7 +60923,7 @@ msgid "" "They whisper to me, at night, in the dark. Please, please, make them stop." msgstr "" "我发誓他们一定是在跟我说话，没有人相信我，也没有人理解我，他们在黑暗的夜晚向" -"我低语，求求你了，让他们停下吧。" +"我低语，求求你了，让他们停止吧." #: lang/json/lab_note_from_json.py msgid "" @@ -60927,7 +61027,7 @@ msgid "" "transfer no further than 30 meters." msgstr "" "我们的传送门研究陷入停滞，因为一些原因，无法建立远程传输设备，但是我们可以让" -"物体移动至多不超过30米。" +"物体移动至多不超过30米." #: lang/json/lab_note_from_json.py msgid "" @@ -61237,7 +61337,7 @@ msgid "" msgstr "" "我们有了一个惊奇的发现，创建了一个微型时空门，但是由于超低的稳定性和高消耗，" "仅仅只能让人切换到第四维度几毫秒就要立刻返回，回来的时候竟然移动了好几米，过" -"程是如此之快，以至于我们都没反应过来。" +"程是如此之快，以至于我们都没反应过来." #: lang/json/lab_note_from_json.py msgid "" @@ -61248,10 +61348,11 @@ msgid "" "a strategic redeployment to the underground complex known as the VAULT, and " "continuing production of PE062 there." msgstr "" -"XE037还原已经达到临界水平，正在压倒性地迅速占领所有的军事基地，以及中止了区域" -"里所有的警备资源活动。现场的每支部队在遇到敌对标本之后，各个频道都长时间没有" -"进行通信。萨维奇博士提出了一个战略，那就是将部队撤离到一个复杂的巨大地下建筑" -"\"拱顶\"，并在那里继续生产PE062。" +"XE037造成的(死人)复活量已经达到了临界水平,这场危机的威胁性正在快速增长,并且即" +"将超过军方和警方的压制能力. 每一组派出去的作战单位都遭遇了样本的明显带有敌意" +"的进攻,并且有几组人已经与我们失去了联系.。之前萨维奇博士提出了一套重新部署的" +"战略，那就是将部队撤离到一个复杂的巨大地下建筑\"避难所\"，并在那里继续生产" +"PE062。" #: lang/json/lab_note_from_json.py msgid "" @@ -61279,7 +61380,7 @@ msgstr " 拥有 在 " #. ~ Sign #: lang/json/mapgen_from_json.py msgid ", , and were here!" -msgstr "， 及 在这里！" +msgstr ", 及 在这里！" #. ~ Sign #: lang/json/mapgen_from_json.py @@ -61289,7 +61390,7 @@ msgstr "危险！狗屎雷区！" #. ~ Sign #: lang/json/mapgen_from_json.py msgid "Danger! Do not smoke! Risk of explosion!" -msgstr "危险！严禁吸烟！有爆炸危险！" +msgstr "易燃易爆! 严禁烟火!" #. ~ Sign #: lang/json/mapgen_from_json.py @@ -61299,7 +61400,7 @@ msgstr "遛狗公园：无狗链区" #. ~ Sign #: lang/json/mapgen_from_json.py msgid "Scoop the Poop!" -msgstr "请勿随地大小便！" +msgstr "请记得清理狗屎！" #. ~ Sign #: lang/json/mapgen_from_json.py @@ -61309,7 +61410,7 @@ msgstr "红龙茶馆" #. ~ Sign #: lang/json/mapgen_from_json.py msgid "Use park at your own risk." -msgstr "使用者后果自负。" +msgstr "使用本公园后果自负。" #. ~ Sign #: lang/json/mapgen_from_json.py @@ -61319,12 +61420,12 @@ msgstr "当心脚下！" #. ~ Sign #: lang/json/mapgen_from_json.py msgid "it works again." -msgstr "运行依然正常。" +msgstr "生成再次有效。" #. ~ Sign #: lang/json/mapgen_from_json.py msgid "it works." -msgstr "工作正常。" +msgstr "生成有效。" #. ~ Sign #: lang/json/mapgen_from_json.py @@ -61339,7 +61440,7 @@ msgstr "地址无法辨认" #. ~ Sign #: lang/json/mapgen_from_json.py msgid "the name is gone but a slogan remains: 'We'll repair you all the way'" -msgstr "名字已经无法辨认了，但口号仍然在：\"我们一路伴您修理！\"" +msgstr "名字已经无法辨认了，但口号仍然在：\"我们总会给您修理好！\"" #. ~ Description of buff for martial art 'Tai Chi' #: lang/json/martial_art_from_json.py @@ -61537,7 +61638,7 @@ msgstr "鹤之精准" #. ~ Description of buff 'Crane's Precision' for martial art 'Crane Kung Fu' #: lang/json/martial_art_from_json.py msgid "Damage bonus from dexterity at the cost of damage from strength." -msgstr "以敏捷值来计算追加伤害和破坏程度。" +msgstr "以敏捷值来计算追加伤害和破坏程度." #: lang/json/martial_art_from_json.py msgid "Debug Mastery" @@ -61712,6 +61813,14 @@ msgstr "" msgid "Niten Ichi-Ryu" msgstr "二刀流" +#. ~ Description for martial art 'Niten Ichi-Ryu' +#: lang/json/martial_art_from_json.py +msgid "" +"Niten Ichi-Ryu is an ancient school of combat, transmitting a style of " +"classical Japanese swordsmanship conceived by the warrior Miyamoto Musashi." +msgstr "" +"名为二天一流的二刀流流派，是一个由传奇的日本剑术名家“宫本武藏”所创立的流派。" + #. ~ Description for martial art 'Niten Ichi-Ryu' #: lang/json/martial_art_from_json.py msgid "" @@ -61907,7 +62016,7 @@ msgstr "格挡时依据力量减少伤害" #. ~ Description of buff 'Tiger Strength' for martial art 'Tiger Kung Fu' #: lang/json/martial_art_from_json.py msgid "Strength provides additional damage bonus." -msgstr "力量提供额外的伤害加成。" +msgstr "提供额外的伤害加成." #: lang/json/martial_art_from_json.py msgid "Taekwondo" @@ -62153,7 +62262,7 @@ msgstr "塑料" #: lang/json/material_from_json.py msgid "Poly Plastic" -msgstr "" +msgstr "复合塑料" #: lang/json/material_from_json.py msgid "Powder" @@ -62346,7 +62455,7 @@ msgstr "适应了穴居生活。" #. ~ Mutation class: Medical junkie_message #: lang/json/mutation_category_from_json.py msgid "Ahh, there it is. You can feel the mutagen again." -msgstr "啊，是的。你又能感受到诱变剂了。" +msgstr "啊...是的。你又能感受到诱变剂了。" #. ~ Mutation class name #: lang/json/mutation_category_from_json.py @@ -62366,7 +62475,7 @@ msgstr "当你将最后一滴诱变剂倒进嘴里，你问自己\"为什么\" #. ~ Mutation class: Troglobite iv_message #: lang/json/mutation_category_from_json.py msgid "As you press the plunger, it all goes so bright..." -msgstr "当你按下活塞，这一切都变得那么明亮……" +msgstr "当你按下活塞，这一切都变得那么明亮..." #. ~ Mutation class name #: lang/json/mutation_category_from_json.py lang/json/mutation_from_json.py @@ -62455,7 +62564,7 @@ msgstr "咿！" #: lang/json/mutation_category_from_json.py msgctxt "memorial_female" msgid "Embraced his bestial nature." -msgstr "回归野性。" +msgstr "回归自然的野性。" #. ~ Mutation class: Beast Male memorial messsage #: lang/json/mutation_category_from_json.py @@ -62516,13 +62625,13 @@ msgstr "明白了生存*才是*一切。" #: lang/json/mutation_category_from_json.py msgctxt "memorial_female" msgid "Gave up on rigid human norms." -msgstr "放弃了对人性道德的坚持。" +msgstr "放弃了对人类固体形态的坚持。" #. ~ Mutation class: Slime Male memorial messsage #: lang/json/mutation_category_from_json.py msgctxt "memorial_male" msgid "Gave up on rigid human norms." -msgstr "放弃了对人性道德的坚持。" +msgstr "放弃了对人类固体形态的坚持。" #. ~ Mutation class: Raptor Female memorial messsage #: lang/json/mutation_category_from_json.py @@ -62549,7 +62658,7 @@ msgstr "蜥蜴人" #. ~ Mutation class: Slime junkie_message #: lang/json/mutation_category_from_json.py msgid "Maybe if you drank enough, you'd become mutagen..." -msgstr "也许你喝的足够多，你就会变成诱变剂啦……" +msgstr "也许你喝的足够多，你就会变成诱变剂啦..." #. ~ Mutation class name #: lang/json/mutation_category_from_json.py @@ -62648,13 +62757,13 @@ msgstr "蜘蛛" #: lang/json/mutation_category_from_json.py msgctxt "memorial_female" msgid "Started representing." -msgstr "开始显示。" +msgstr "开始成为代表。" #. ~ Mutation class: Alpha Male memorial messsage #: lang/json/mutation_category_from_json.py msgctxt "memorial_male" msgid "Started representing." -msgstr "开始显示。" +msgstr "开始成为代表。" #. ~ Mutation class: Cattle Female memorial messsage #: lang/json/mutation_category_from_json.py @@ -62742,7 +62851,7 @@ msgstr "你感到血液急速通过你的血管，一种奇怪的感觉好像药 msgid "" "You distinctly smell the mutagen mixing with your blood ...and then it " "passes." -msgstr "你突然间可以闻到变异剂和你血液混合的滋味……然后它消失了。" +msgstr "你突然间可以闻到变异剂和你血液混合的滋味...然后它消失了。" #. ~ Mutation class: Rat mutagen_message #: lang/json/mutation_category_from_json.py @@ -62803,7 +62912,7 @@ msgstr "你因剧痛而狂吼着！" #. ~ Mutation class: Rat iv_message #: lang/json/mutation_category_from_json.py msgid "You squeak as the shot hits you." -msgstr "你被击中了，发出一声尖叫。" +msgstr "你注射是发出一声吱吱叫。" #. ~ Mutation class: Insect iv_message #: lang/json/mutation_category_from_json.py @@ -62825,7 +62934,7 @@ msgstr "你看着诱变剂在你体内的迷宫中流淌。你的身体慢慢的 #. ~ Mutation class: Cattle iv_message #: lang/json/mutation_category_from_json.py msgid "You wonder if this is what rBGH feels like..." -msgstr "你想：这就是rBGH的力量吗……" +msgstr "你想：这就是牛奶激素的力量吗……" #. ~ Mutation class: Troglobite mutagen_message #: lang/json/mutation_category_from_json.py @@ -62845,7 +62954,7 @@ msgstr "随着诱变剂起效，你的后背弓起。" #. ~ Mutation class: Lizard iv_message #: lang/json/mutation_category_from_json.py msgid "Your blood cools down. The feeling is... different." -msgstr "你的血液冷了下来。这种感觉……不寻常。" +msgstr "你的血液冷了下来。这种感觉......不寻常。" #. ~ Mutation class: Bird mutagen_message #: lang/json/mutation_category_from_json.py @@ -62876,7 +62985,7 @@ msgstr "你的思想和身体都慢了下来。你感觉平静祥和。" #: lang/json/mutation_category_from_json.py msgid "" "Your mind is overcome by images of eldritch horrors... and then they pass." -msgstr "各种光怪陆离的影像压向了你，你感到恐惧……但它们很快消失了。" +msgstr "各种光怪陆离的影像压向了你，你感到恐惧...但它们很快消失了。" #. ~ Mutation class: Fish iv_message #: lang/json/mutation_category_from_json.py @@ -63253,7 +63362,7 @@ msgstr "疼痛麻木" #: lang/json/mutation_from_json.py msgid "Debug CBM Slots Limits" -msgstr "测试用CBM空格限制" +msgstr "调试设置CBM插槽限制" #: lang/json/mutation_from_json.py msgid "Debug Deodorizer" @@ -63381,7 +63490,7 @@ msgid "" "nose, and you have a strong desire to try some seeds and...sap?" msgstr "" "自从你吃了马洛斯变异莓后，你永远无法忘怀它的味道，你十分想再吃一次，或者去试" -"试种子和……汁液？" +"试种子和...汁液？" #. ~ Description for Marloss Vector #: lang/json/mutation_from_json.py @@ -63399,7 +63508,7 @@ msgid "" "tongue, and you have a strong desire to try some berries and...sap?" msgstr "" "自从你吃了马洛斯种子后，你永远无法忘怀它的味道，你十分想再吃一次，或者去试试" -"变异莓和……汁液？" +"变异莓和...汁液？" #. ~ Description for Marloss Rejection #: lang/json/mutation_from_json.py @@ -63764,7 +63873,7 @@ msgstr "当你处于危险之中时，你有时可以获得一次短暂的加速 #. ~ Description for Debug Invisibility #: lang/json/mutation_from_json.py msgid "If you see this, you'd best be debugging something." -msgstr "如果你能看到介个，你最好正在Debug某些东西，否则就是作弊。" +msgstr "如果你能看到介个，你最好开始debug程序吧，如果你会的话..." #: lang/json/mutation_from_json.py msgid "Illiterate" @@ -63858,8 +63967,8 @@ msgid "" "It would be good to be a Queen, having workers constantly servicing your " "every need...but how would you keep them in line?" msgstr "" -"成为皇后，无数仆人为你的每一个需求进行服务的感觉非常好……但怎样让他们排好队" -"呢？" +"成为皇后，无数仆人为你的每一个需求进行服务的感觉非常好......但问题是你如何让" +"他们规规矩矩的呢？" #. ~ Description for Beast #: lang/json/mutation_from_json.py @@ -63922,8 +64031,8 @@ msgid "" "you thirsty. And you so love your new parts. You simply must have more " "mutagen!" msgstr "" -"只要一想到'诱变剂'你就会饥渴难耐，你是如此的迷恋你的变异……再来点诱变剂就好" -"了……" +"只要一想到'诱变剂'你就会饥渴难耐，你是如此的迷恋你的变异...再来点诱变剂就好" +"了..." #: lang/json/mutation_from_json.py src/morale.cpp msgid "Lactose Intolerance" @@ -63988,7 +64097,7 @@ msgstr "过敏体质" #: lang/json/mutation_from_json.py msgid "" "Limitate the number of bionics which you're able to install in your body." -msgstr "限制你可以安装在你体内的生化插件数量。" +msgstr "设定你最大可以往身体里装CBM的数量的限制." #. ~ Description for Mycus Bloom #: lang/json/mutation_from_json.py @@ -64093,7 +64202,7 @@ msgstr "诱变剂迷恋" #. ~ Description for Debug Mind Control #: lang/json/mutation_from_json.py msgid "Mind the bugs, would you kindly?." -msgstr "当心那些虫子，好吗？" +msgstr "当心那些BUG，好吗？" #: lang/json/mutation_from_json.py msgid "Minor Radioactivity" @@ -64319,7 +64428,7 @@ msgstr "心明眼亮" #: lang/json/mutation_from_json.py msgid "Phelloderm" -msgstr " 软木皮层" +msgstr "木质皮肤" #: lang/json/mutation_from_json.py msgid "Pointed Ears" @@ -64347,7 +64456,7 @@ msgstr "行动迟缓" #: lang/json/mutation_from_json.py msgid "Poor Hearing" -msgstr "耳背" +msgstr "耳背." #. ~ Description for Stylish #: lang/json/mutation_from_json.py @@ -64356,7 +64465,7 @@ msgid "" "wearing fashionable and attractive clothing." msgstr "" "对你来说，实用的重要性远远低于好看。即使是在末世，把自己打扮的光彩照人和是很" -"重要的。你的情绪会随时髦衣着而增加。" +"重要的。" #: lang/json/mutation_from_json.py msgid "Predator" @@ -64671,8 +64780,8 @@ msgid "" "So it's fermented? Whatever, it's still good drinking. You've developed " "the ability to metabolize alcohol as a food source." msgstr "" -"那么，这是发酵过吗？管它呢，还是很好喝。你已经拥有了可以代谢酒精并将其作为食" -"物的能力了。" +"大概是酒精在你肚子里继续发酵...管它呢。你已经拥有了可以从酒精中获取生物能量的" +"能力了。" #. ~ Description for Bear #: lang/json/mutation_from_json.py @@ -64719,7 +64828,7 @@ msgstr "斑点" #: lang/json/mutation_from_json.py msgid "Squeamish" -msgstr "" +msgstr "洁癖" #: lang/json/mutation_from_json.py msgid "Stainless Claws" @@ -65478,7 +65587,7 @@ msgstr "你有着惊人的美丽容貌，人们不禁被你的容貌所折服， msgid "" "You are less likely to throw up from food poisoning, alcohol, etc. If you " "throw up nevertheless, you won't suffer a residual nausea." -msgstr "" +msgstr "酒精和食物中毒很难使你呕吐。即便你呕吐了，也不会因此导致后续恶心。" #. ~ Description for Weak Stomach #: lang/json/mutation_from_json.py @@ -65626,7 +65735,7 @@ msgstr "你能从严酷的环境中存活下来，生命值上限额外加成20% msgid "" "You can't even think about putting filthy clothes on yourself, especially " "from zombies' corpses." -msgstr "" +msgstr "你根本无法容忍把脏衣服穿在身上，尤其是那些从丧尸尸体上拔下来的。" #. ~ Description for Slow Runner #: lang/json/mutation_from_json.py @@ -65956,8 +66065,8 @@ msgid "" "You have a long, thick, lizardlike tail. It helps you balance a bit but " "also makes a serviceable whip." msgstr "" -"你现在有了一根又长又厚的，蜥蜴一般的尾巴。它能够帮你在奔跑的时候增加一些平" -"衡，同时还能当做一根很犀利的鞭子。" +"你现在有了一根长长的、粗粗的...蜥蜴尾巴。它能够帮你在奔跑的时候增加一些平衡，" +"同时还能当做一根很犀利的鞭子。" #. ~ Description for Vomitous #: lang/json/mutation_from_json.py @@ -66190,7 +66299,7 @@ msgid "" "Unfortunately, they do prevent you from wearing footgear." msgstr "" "爪子已经代替你的大脚趾长的巨大，带有弯曲和锋利的爪子，幸运的是，他们并没有影" -"响你走路的方式，不幸的是，你无法穿戴鞋袜，可能会撑破，这可能会导致保暖缺失。" +"响你走路的方式，不幸的是，你无法穿戴鞋袜，可能会撑破，这可能会导致保暖缺失." #. ~ Description for Inconveniently Large #: lang/json/mutation_from_json.py @@ -66225,7 +66334,7 @@ msgid "" "Eskrima, Fencing, Pentjak Silat, or Medieval Swordsmanship." msgstr "" "你曾在当地道场接受过一套近身武器训练。你在开始的时候可以选择卡力十字棍术、击" -"剑术、班卡苏拉刀术及中世纪剑术之一。" +"剑术、班卡苏拉刀术及中世纪剑术之一." #. ~ Description for Meat Intolerance #: lang/json/mutation_from_json.py @@ -66287,7 +66396,7 @@ msgid "" "You hiss when speaking. Persuading NPCs will be more difficult, but " "threatening them will be easier." msgstr "" -"正常说话的时候会伴随嘶嘶声，虽然说服NPC会更为困难，但是威胁他们却轻而易举。" +"正常说话的时候会伴随嘶嘶声，虽然说服NPC会更为困难，但是威胁他们却轻而易举." #. ~ Description for Albino #: lang/json/mutation_from_json.py @@ -66296,6 +66405,8 @@ msgid "" "easily, and typically use an umbrella and a sunglasses when going out in the " "sun." msgstr "" +"由于基因缺陷，你缺乏皮肤色素沉着。你非常容易被阳光晒伤，外出时最好带上伞和太" +"阳镜。" #. ~ Description for Lactose Intolerance #: lang/json/mutation_from_json.py @@ -66342,7 +66453,7 @@ msgstr "你更加渴望睡眠，不过大多数时候还能保持清醒。" #. ~ Description for Illiterate #: lang/json/mutation_from_json.py msgid "You never learned to read! Books and computers are off-limits to you." -msgstr "你不识字！所以你不能阅读或使用电脑。" +msgstr "你不识字!所以你不能阅读或使用电脑." #. ~ Description for Shouter #: lang/json/mutation_from_json.py @@ -66569,7 +66680,7 @@ msgstr "长的丑不是你的错，出来吓人就是你不对了。" #: lang/json/mutation_from_json.py #, no-python-format msgid "You're just generally quick! You get a 10% bonus to action points." -msgstr "你比一般人要迅速！你比一般人行动快10%。" +msgstr "你比一般人要迅速！你比一般人行动快10%." #. ~ Description for Deformed #: lang/json/mutation_from_json.py @@ -66606,7 +66717,7 @@ msgstr "你擅长清除地上的障碍物，并且能够轻松穿梭于栏杆和 msgid "" "You're sure you'll fly someday. In the meantime, there's still nests to " "build." -msgstr "你确信你某天会飞起来，但在此之前还是先把窝做好的说。" +msgstr "你确信你某天会飞起来，但在此之前还是先把窝做好的说..." #. ~ Description for Wolf #: lang/json/mutation_from_json.py @@ -66747,7 +66858,9 @@ msgstr "" msgid "" "You've started blooming where your scalp used to be. Your blossoms have a " "pleasant aroma, are visually striking, and are quite sensitive." -msgstr "你的脑袋上开出了花朵……居然还挺好看，特喵的还香气怡人，而且还特别敏感。" +msgstr "" +"你的脑袋上开出了花朵...居然还挺好看，特喵的还香气怡人，你不得不告诉别人你的名" +"字是杨大车纳姆...." #. ~ Description for Hates Vegetables #: lang/json/mutation_from_json.py @@ -66907,6 +67020,7 @@ msgid "" "Your body is coated with a fine slime. Protects from long term effects of " "acid, though not short term ones. Greatly increases wet benefits." msgstr "" +"你的身上粘粘糊糊的，走过的地方都有痕迹（想像一下鼻涕虫）。大大提高了湿增益。" #. ~ Description for Quills #: lang/json/mutation_from_json.py @@ -67013,6 +67127,7 @@ msgid "" "Your body's slime output has become sticky and gel-like. Protects from acid " "somewhat. Greatly increases wet benefits." msgstr "" +"你身上的史莱姆状分泌物变得又粘又像凝胶。略微提高抗酸力，大大提高了湿增益。" #. ~ Description for Light Bones #: lang/json/mutation_from_json.py @@ -67187,7 +67302,7 @@ msgid "" "Your eyes have turned...green. It's tough to tell the exact shade as it " "seems to shift. The effect is ...pleasant." msgstr "" -"你的眼睛变成了……绿色。它似乎在不断地转动，你很难描述出它的形状，这效果棒极" +"你的眼睛变成了...绿色。它似乎在不断地转动，你很难描述出它的形状，这效果棒极" "了。" #. ~ Description for Cephalopod Eyes @@ -67241,8 +67356,8 @@ msgid "" "impossible to wear mouthgear and difficult to eat... but leave nasty wounds " "when you bite." msgstr "" -"你的牙又长又尖，以至于你不能带口罩，吃东西也很不方便……不过你的尖牙在咬人会留" -"下可怕的伤口。" +"你的牙又长又尖，以至于你不能带口罩，吃东西也很不方便...不过你可以用尖牙来\"咬" +"人\"造成伤害。" #. ~ Description for Hooves #: lang/json/mutation_from_json.py @@ -67755,8 +67870,8 @@ msgid "" "get in the way of your headgear, much. Unfortunately, they also don't seem " "to help your hearing any." msgstr "" -"你的耳朵像精灵一般，幸运的是，长长的耳垂并不影响你穿戴头饰，但不幸的是，即使" -"耳朵这么大也无法提高听力。" +"你的耳朵像精灵一般，幸运的是，这并不影响你穿戴头饰，比较不幸的是，即使耳朵这" +"么大也无法提高听力." #. ~ Description for Tentacle Rakes #: lang/json/mutation_from_json.py @@ -68365,7 +68480,7 @@ msgstr "导弹发射井" #: lang/json/overmap_terrain_from_json.py msgid "mortuary" -msgstr "" +msgstr "停尸间" #: lang/json/overmap_terrain_from_json.py msgid "motel" @@ -68473,7 +68588,7 @@ msgstr "鼠穴" #: lang/json/overmap_terrain_from_json.py msgid "razorclaw nest" -msgstr "" +msgstr "利爪怪巢穴" #: lang/json/overmap_terrain_from_json.py msgid "refugee center" @@ -68483,6 +68598,10 @@ msgstr "难民中心" msgid "regional school" msgstr "地区学校" +#: lang/json/overmap_terrain_from_json.py +msgid "religious cemetery" +msgstr "宗教墓地" + #: lang/json/overmap_terrain_from_json.py msgid "restaurant" msgstr "餐厅" @@ -68545,7 +68664,7 @@ msgstr "下水道？" #: lang/json/overmap_terrain_from_json.py msgid "shipwreck" -msgstr "" +msgstr "沉船" #: lang/json/overmap_terrain_from_json.py msgid "silo" @@ -69442,12 +69561,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" msgid "Camper" -msgstr "露营者" +msgstr "女驴友" #: lang/json/professions_from_json.py msgctxt "profession_male" msgid "Camper" -msgstr "露营者" +msgstr "男驴友" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -70008,8 +70127,8 @@ msgid "" "the Macedonean phalanx. Well-trained for combat in formation, but less " "effective when outmaneuvered or on broken ground." msgstr "" -"方阵兵起源于古希腊城邦，擅长马其顿方阵。他们受过良好的方阵战训练，但是被突破" -"后的单打上比较不利。" +"马其顿反正兴起前希腊城邦的重步兵。受过良好的方阵战训练，但是被突破后的单打上" +"比较不利。" #. ~ Profession (male Hoplite) description #: lang/json/professions_from_json.py @@ -70019,8 +70138,8 @@ msgid "" "the Macedonean phalanx. Well-trained for combat in formation, but less " "effective when outmaneuvered or on broken ground." msgstr "" -"方阵兵起源于古希腊城邦，擅长马其顿方阵。他们受过良好的方阵战训练，但是被突破" -"后的单打上比较不利。" +"马其顿反正兴起前希腊城邦的重步兵。受过良好的方阵战训练，但是被突破后的单打上" +"比较不利。" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -70132,7 +70251,7 @@ msgid "" msgstr "" "你打季后赛的时候，灾难来袭。丧尸开始攻击观众，只有少数人成功逃脱。多亏你快速" "的步法，你终于从一群丧尸啦啦队的追求中逃了出来，你发誓你再也不想看到那些sexy" -"的妹纸了。" +"的妹纸了..." #. ~ Profession (female Bionic Athlete) description #: lang/json/professions_from_json.py @@ -70521,8 +70640,8 @@ msgid "" "living off nature's bounties and what you could get outside the death traps " "of the large city." msgstr "" -"作为逃离大灾变的幸运儿之一，你通过远离充满死亡陷阱的大城市、依靠大自然的恩惠" -"成功的活了下来。" +"作为逃离大灾变的幸运儿之一，你依靠大自然的恩惠成功的建立了自己的崭新生活。远" +"离城市，远离那些妹纸和小鲜肉..." #. ~ Profession (male Hardened Survivor) description #: lang/json/professions_from_json.py @@ -70532,8 +70651,8 @@ msgid "" "living off nature's bounties and what you could get outside the death traps " "of the large city." msgstr "" -"作为逃离大灾变的幸运儿之一，你通过远离充满死亡陷阱的大城市、依靠大自然的恩惠" -"成功的活了下来。" +"作为逃离大灾变的幸运儿之一，你依靠大自然的恩惠成功的建立了自己的崭新生活。远" +"离城市，远离那些妹纸和小鲜肉..." #. ~ Profession (female Hardened Scavenger) description #: lang/json/professions_from_json.py @@ -71162,22 +71281,22 @@ msgstr "教师" msgctxt "prof_desc_female" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"感谢导（lao）师（ban）的压榨，你还能想起来那些实验是怎么做的。你跟着师兄师姐" -"逃了出来，不过只有你带了实验设备。" +"感谢导(lao)师(ban)的压榨，你还能想起来那些实验是怎么做的。现在世界已经终结，" +"只剩下一个问题：你能否将世界从你亲手导致的大灾变中恢复回来？" #. ~ Profession (male Lab Technician) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"感谢导（lao）师（ban）的压榨，你还能想起来那些实验是怎么做的。你跟着师兄师姐" -"逃了出来，不过只有你带了实验设备。" +"感谢导(lao)师(ban)的压榨，你还能想起来那些实验是怎么做的。现在世界已经终结，" +"只剩下一个问题：你能否将世界从你亲手导致的大灾变中恢复回来？" #. ~ Profession (Punk Rock Girl) description #: lang/json/professions_from_json.py @@ -71297,8 +71416,8 @@ msgid "" "born or of common blood. While knights traditionally were men-at-arms, not " "every man-at-arms was a knight." msgstr "" -"在欧洲各国中世纪重骑兵，无论出身贵贱。虽然骑士传统上都是重骑兵，但不是每个重" -"骑兵都是骑士。" +"在欧洲各国中世纪重骑兵, 无论出身贵贱. 虽然骑士传统上都是重骑兵, 但不是每个重" +"骑兵都是骑士. " #. ~ Profession (Man-at-Arms) description #: lang/json/professions_from_json.py @@ -71308,8 +71427,8 @@ msgid "" "born or of common blood. While knights traditionally were men-at-arms, not " "every man-at-arms was a knight." msgstr "" -"在欧洲各国中世纪重骑兵，无论出身贵贱。虽然骑士传统上都是重骑兵，但不是每个重" -"骑兵都是骑士。" +"在欧洲各国中世纪重骑兵, 无论出身贵贱. 虽然骑士传统上都是重骑兵, 但不是每个重" +"骑兵都是骑士. " #. ~ Profession (female Bionic Assassin) description #: lang/json/professions_from_json.py @@ -71514,7 +71633,7 @@ msgid "" "are all dead, you should probably find something more tangible to protect " "you." msgstr "" -"当灾难来袭，你动用你最擅长的能力来保护你的教区信徒。但他们都死了，显然光做祷" +"当灾难来袭，你动用你最擅长的能力来保护你的教区信徒。但他们都死了，说明...做祷" "告好像没多大用嘛！现在，是时候找些更切实的手段保护你自己了。" #. ~ Profession (male Priest) description @@ -71526,7 +71645,7 @@ msgid "" "are all dead, you should probably find something more tangible to protect " "you." msgstr "" -"当灾难来袭，你动用你最擅长的能力来保护你的教区信徒。但他们都死了，显然光做祷" +"当灾难来袭，你动用你最擅长的能力来保护你的教区信徒。但他们都死了，说明...做祷" "告好像没多大用嘛！现在，是时候找些更切实的手段保护你自己了。" #. ~ Profession (female Bionic Patient) description @@ -71611,8 +71730,9 @@ msgid "" "sounded. The world may be ruined, but you're prepared to make a home " "wherever you may find yourself." msgstr "" -"在一切都土崩瓦解之前，你总是喜欢徒步旅行和荒野露营，所以当警报响起你毫不犹豫" -"的背起包就跑。这个世界可能已经毁了，但无论你在哪里，你都准备好建立一个家了。" +"你总是喜欢去荒无人烟的地方野足和露营,至少在大灾变发生前是这样。当警报响起的那" +"一天,你想都没想就抓起露营包跑出了门。世界可能已经完蛋了,社会秩序分崩离析,但你" +"已经准备好,不论从废墟中发现什么东西,都尽可能的做一个让人待得下去的地方." #. ~ Profession (male Camper) description #: lang/json/professions_from_json.py @@ -71623,8 +71743,9 @@ msgid "" "sounded. The world may be ruined, but you're prepared to make a home " "wherever you may find yourself." msgstr "" -"在一切都土崩瓦解之前，你总是喜欢徒步旅行和荒野露营，所以当警报响起你毫不犹豫" -"的背起包就跑。这个世界可能已经毁了，但无论你在哪里，你都准备好建立一个家了。" +"你总是喜欢去荒无人烟的地方野足和露营,至少在大灾变发生前是这样。当警报响起的那" +"一天,你想都没想就抓起露营包跑出了门。世界可能已经完蛋了,社会秩序分崩离析,但你" +"已经准备好,不论从废墟中发现什么东西,都尽可能的做一个让人待得下去的地方." #. ~ Profession (female Commercial Cyborg) description #: lang/json/professions_from_json.py @@ -72650,8 +72771,8 @@ msgid "" "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"灾难来临之时，你靠着种庄稼来养活自己。现在，手握着可靠的锄头和一些种子，是时" -"候重建地球了，一棵棵的种过去。" +"你是种庄稼的能手。大灾变对你来说算个毛，握紧锄头，种子在手，找块泥地，天下我" +"有...呃...丧尸...那不是肥料吗？" #. ~ Profession (male Farmer) description #: lang/json/professions_from_json.py @@ -72661,8 +72782,8 @@ msgid "" "with your trusty hoe and some seeds it's time to rebuild the Earth, one " "plant at a time." msgstr "" -"灾难来临之时，你靠着种庄稼来养活自己。现在，手握着可靠的锄头和一些种子，是时" -"候重建地球了，一棵棵的种过去。" +"你是种庄稼的能手。大灾变对你来说算个毛，握紧锄头，种子在手，找块泥地，天下我" +"有...呃...丧尸...那不是肥料吗？" #. ~ Profession (female Broken Cyborg) description #: lang/json/professions_from_json.py @@ -72884,7 +73005,7 @@ msgid "" "gas, and you're on your last pair of batteries for your mining helmet..." msgstr "" "虽然你是矿工，但你不是无名之辈！（英语双关）你的水壶早已经干透，你的打桩机也" -"耗光了燃料，而你的矿工帽只剩下最后一对电池了……" +"耗光了燃料，而你的矿工帽只剩下最后一对电池了..." #. ~ Profession (male Miner) description #: lang/json/professions_from_json.py @@ -72894,7 +73015,7 @@ msgid "" "gas, and you're on your last pair of batteries for your mining helmet..." msgstr "" "虽然你是矿工，但你不是无名之辈！（英语双关）你的水壶早已经干透，你的打桩机也" -"耗光了燃料，而你的矿工帽只剩下最后一对电池了……" +"耗光了燃料，而你的矿工帽只剩下最后一对电池了..." #. ~ Profession (female Elementary Student) description #: lang/json/professions_from_json.py @@ -73597,13 +73718,13 @@ msgstr "" #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Ambush" -msgstr "陷入埋伏" +msgstr "被埋伏" #. ~ Name for scenario 'Ambush' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Ambush" -msgstr "陷入埋伏" +msgstr "被埋伏" #. ~ Starting location for scenario 'Infected'. #. ~ Starting location for scenario 'Burning Building'. @@ -73653,13 +73774,13 @@ msgstr "矿坑底部" #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Burning Building" -msgstr "烧着的房子" +msgstr "萌着的房子" #. ~ Name for scenario 'Burning Building' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Burning Building" -msgstr "烧着的房子" +msgstr "萌着的房子" #. ~ Name for scenario 'Challenge-Abandoned' for a female character #: lang/json/scenario_from_json.py @@ -73713,7 +73834,7 @@ msgstr "挑战-超级糟糕的一天" #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "Crash site" -msgstr "坠机地点" +msgstr "坠毁地" #. ~ Starting location for scenario 'Sheltered'. #: lang/json/scenario_from_json.py @@ -73797,7 +73918,7 @@ msgid "" "didn't get proper medical care, and now the wound has started turning green." msgstr "" "在混乱和恐慌的撤离行动中，你被什么东西给咬了！由于没有得到及时的医治，现在伤" -"口都TM开始变绿咧。你觉得你的脸仿佛也绿了……" +"口都TM开始变绿咧。你觉得你的脸仿佛也绿了..." #. ~ Description for scenario 'Infected' for a male character. #: lang/json/scenario_from_json.py @@ -73807,19 +73928,19 @@ msgid "" "didn't get proper medical care, and now the wound has started turning green." msgstr "" "在混乱和恐慌的撤离行动中，你被什么东西给咬了！由于没有得到及时的医治，现在伤" -"口都TM开始变绿咧。你觉得你的脸仿佛也绿了……" +"口都TM开始变绿咧。你觉得你的脸仿佛也绿了..." #. ~ Name for scenario 'Infected' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Infected" -msgstr "感染者" +msgstr "被感染" #. ~ Name for scenario 'Infected' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Infected" -msgstr "感染者" +msgstr "被感染" #. ~ Description for scenario 'Ambush' for a female character. #: lang/json/scenario_from_json.py @@ -73895,13 +74016,13 @@ msgstr "监狱" #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Prison Break" -msgstr "" +msgstr "越狱" #. ~ Name for scenario 'Prison Break' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Prison Break" -msgstr "" +msgstr "越狱" #. ~ Name for scenario 'School' for a female character #: lang/json/scenario_from_json.py @@ -74029,7 +74150,7 @@ msgctxt "scen_desc_female" msgid "" "The building you had chosen to reside in has suddenly caught fire! You " "might want to leave." -msgstr "你选择歇脚的房子突然失火了！你还是快逃吧。" +msgstr "你选择歇脚的房子真的好萌啊，是啊，萌的都越来越热了~" #. ~ Description for scenario 'Burning Building' for a male character. #: lang/json/scenario_from_json.py @@ -74037,7 +74158,7 @@ msgctxt "scen_desc_male" msgid "" "The building you had chosen to reside in has suddenly caught fire! You " "might want to leave." -msgstr "你选择歇脚的房子突然失火了！你还是快逃吧。" +msgstr "你选择歇脚的房子真的好萌啊，是啊，萌的都越来越热了~" #. ~ Description for scenario 'Sheltered' for a female character. #: lang/json/scenario_from_json.py @@ -74171,7 +74292,7 @@ msgid "" msgstr "" "大灾变来临的时候你正巧心情非常差，而且又喝到几乎不省人事。更别提现在光着屁" "股，伤口不但严重感染还得了流感。抬头一看，啊，运气真TM好爆了，你现在待的屋子" -"正在熊熊燃烧……今儿个真是走背字啊，对吧？" +"正在熊熊燃烧......。今儿个真是走背字啊，对吧？" #. ~ Description for scenario 'Challenge-Really Bad Day' for a male character. #: lang/json/scenario_from_json.py @@ -74183,7 +74304,7 @@ msgid "" msgstr "" "大灾变来临的时候你正巧心情非常差，而且又喝到几乎不省人事。更别提现在光着屁" "股，伤口不但严重感染还得了流感。抬头一看，啊，运气真TM好爆了，你现在待的屋子" -"正在熊熊燃烧……今儿个真是走背字啊，对吧？" +"正在熊熊燃烧......。今儿个真是走背字啊，对吧？" #. ~ Description for scenario 'Prison Break' for a female character. #: lang/json/scenario_from_json.py @@ -74193,6 +74314,8 @@ msgid "" "prisoners have turned into mindless horrors and the security bots are " "shooting on sight... you might need to expedite your escape plans." msgstr "" +"在这一切开始前，你是一个计划着越狱的重刑犯。现在所有的囚犯都变成了没头没脑的" +"怪物，保安机器人见人就射。。。你或许要加速你的越狱行动了。" #. ~ Description for scenario 'Prison Break' for a male character. #: lang/json/scenario_from_json.py @@ -74202,6 +74325,8 @@ msgid "" "prisoners have turned into mindless horrors and the security bots are " "shooting on sight... you might need to expedite your escape plans." msgstr "" +"在这一切开始前，你是一个计划着越狱的重刑犯。现在所有的囚犯都变成了没头没脑的" +"怪物，保安机器人见人就射。。。你或许要加速你的越狱行动了。" #. ~ Description for scenario 'School' for a female character. #: lang/json/scenario_from_json.py @@ -74254,7 +74379,7 @@ msgid "" "You were mining along when you found...something. You're not sure what, but " "it sure is dark down here." msgstr "" -"当你在采矿的时候，你发现了……某种东西。你不知道那是什么，但有一点肯定的是，这" +"当你在采矿的时候，你发现了...某种东西。你不知道那是什么，但有一点肯定的是，这" "底下真的很黑。" #. ~ Description for scenario 'Bottom of a Mine' for a male character. @@ -74264,7 +74389,7 @@ msgid "" "You were mining along when you found...something. You're not sure what, but " "it sure is dark down here." msgstr "" -"当你在采矿的时候，你发现了……某种东西。你不知道那是什么，但有一点肯定的是，这" +"当你在采矿的时候，你发现了...某种东西。你不知道那是什么，但有一点肯定的是，这" "底下真的很黑。" #. ~ Description for scenario 'Challenge-Lab' for a female character. @@ -74273,7 +74398,10 @@ msgctxt "scen_desc_female" msgid "" "You've been locked in a lab with no (obvious) way out! Find a way to escape " "or starve to death." -msgstr "你被锁在实验室里，找不到出去的路。在饿死之前想办法逃出去吧。" +msgstr "" +"好消息：你的主任离开实验室时为了保险启动了实验室自锁程序。坏消息：丫根本忘了" +"你还在里面帮他下载动作片！走一步算一步吧。欢迎在贴吧发表以此为主题的作死经历" +"投稿，记得配图！" #. ~ Description for scenario 'Challenge-Lab' for a male character. #: lang/json/scenario_from_json.py @@ -74281,7 +74409,10 @@ msgctxt "scen_desc_male" msgid "" "You've been locked in a lab with no (obvious) way out! Find a way to escape " "or starve to death." -msgstr "你被锁在实验室里，找不到出去的路。在饿死之前想办法逃出去吧。" +msgstr "" +"好消息：你的主任离开实验室时为了保险启动了实验室自锁程序。坏消息：丫根本忘了" +"你还在里面帮他下载动作片！走一步算一步吧。欢迎在贴吧发表以此为主题的作死经历" +"投稿，记得配图！" #. ~ Description for scenario 'Helicopter Crash' for a female character. #: lang/json/scenario_from_json.py @@ -74310,7 +74441,7 @@ msgid "" "You've survived for as long as you could inside of the mall you worked at as " "a security guard. Find a way out and try your best to survive." msgstr "" -"作为商场保安，你一直以为自己对付小偷小摸的人就可以圆满一生了，面对着满满一个" +"作为商场保安，你一直以为自己对付小偷小摸的贼就可以圆满一生了，面对着满满一个" "商场的恶性暴力袭击犯，保安？你能活这么久已经不错了。是时候用最大的努力逃出去" "了。" @@ -74321,7 +74452,7 @@ msgid "" "You've survived for as long as you could inside of the mall you worked at as " "a security guard. Find a way out and try your best to survive." msgstr "" -"作为商场保安，你一直以为自己对付小偷小摸的人就可以圆满一生了，面对着满满一个" +"作为商场保安，你一直以为自己对付小偷小摸的贼就可以圆满一生了，面对着满满一个" "商场的恶性暴力袭击犯，保安？你能活这么久已经不错了。是时候用最大的努力逃出去" "了。" @@ -74463,6 +74594,8 @@ msgid "" "effectively. This skill does not affect the evasion of traps that are " "triggered." msgstr "" +"你的技能令你安全有效的创建、 设置、 查找和解除陷阱。该技能并不影响触发陷阱时" +"的规避能力。" #. ~ Description for electronics #: lang/json/skill_from_json.py @@ -74730,8 +74863,8 @@ msgid "" "about wildlife!... And how to kill it. Classic BEAR TRAP returns in this " "issue!" msgstr "" -" ……你了解如何在野外生存吗？ 如果你没做过套索那你就根本不懂陷阱！阅读这本《陷" -"阱猎人的生活》来了解野生动物的习性……以及如何杀死它们。传统的“捕熊陷阱”也在这" +" ...你了解如何在野外生存吗？ 如果你没做过套索那你就根本不懂陷阱！阅读这本《陷" +"阱猎人的生活》来了解野生动物的习性...以及如何杀死它们。传统的“捕熊陷阱”也在这" "期中回归了！" #: lang/json/snippet_from_json.py @@ -74740,8 +74873,8 @@ msgid "" "snare you don't know TRAP! Hunt down a copy of TRAPPERS' LIFE and learn " "about wildlife!... And how to kill it. This week, a CROSSBOW TRAP!" msgstr "" -" ……你了解如何在野外生存吗？ 如果你没做过套索那你就根本不懂陷阱！阅读这本《陷" -"阱猎人的生活》来了解野生动物的习性……以及如何杀死它们。本周特辑，“十字弓陷" +" ...你了解如何在野外生存吗？ 如果你没做过套索那你就根本不懂陷阱！阅读这本《陷" +"阱猎人的生活》来了解野生动物的习性...以及如何杀死它们。本周特辑，“十字弓陷" "阱”！" #: lang/json/snippet_from_json.py @@ -74902,7 +75035,7 @@ msgid "" "\"I swear to God I've seen these plant things before! In a book, or " "something! I swear...\"" msgstr "" -"\"我向上帝发誓我以前看到过这些植物！在一本书里或者其他什么地方！我发誓……\"" +"“我向上帝发誓我以前看到过这些植物！在一本书里或者其他什么地方！我发誓...”" #: lang/json/snippet_from_json.py msgid "" @@ -74948,7 +75081,7 @@ msgstr "\"我听说某处有一个地下避难所\"" #: lang/json/snippet_from_json.py msgid "\"I... I just put a muffler onto a... nail gun.\"" -msgstr "\"我……我只是把消音器给……射钉枪装上。\"" +msgstr "“我...我刚把消音器给...射钉枪装上。”" #: lang/json/snippet_from_json.py msgid "" @@ -74985,8 +75118,8 @@ msgid "" "\"Local auto shop is full of the things. And to think I worked with them on " "repairing cars... now they're just... fucking corpses.\"" msgstr "" -"\"本地修理车间已经全是那些东西了。想想不久之前我还和他们一起修车……现在他们……" -"已经是丧尸了。\"" +"“地方自动车间已经全是那些东西了。想想不久之前我还和他们一起修车....现在他" +"们...已经是丧尸了。”" #: lang/json/snippet_from_json.py msgid "\"Make sure your car is REALLY stopped before you get out.\"" @@ -75023,7 +75156,7 @@ msgstr "\"我隔壁邻居在他的地下室藏了把武士刀！\"" #: lang/json/snippet_from_json.py msgid "" "\"My skin is crawling and I teleport every few minutes.. what is going o\"" -msgstr "\"我的皮肤在蠕动而且我每隔几分钟就要传送一次……到底怎……\"" +msgstr "“我的皮肤在蠕动而且我每隔几分钟就要传送一次...到底怎...”" #: lang/json/snippet_from_json.py msgid "" @@ -75036,7 +75169,7 @@ msgid "" "\"No wonder all the camps got overrun, they kept a goddamn zombie test " "subject! Each and every one of 'em!\"" msgstr "" -"“难怪每个避难营地都沦陷了，他们在里边该死的存放了丧尸实验样本！每个里边都是这" +"“难怪每个避难营地都沦陷了，他们在里边该死的存放了僵尸实验样本！每个里边都是这" "样！”" #: lang/json/snippet_from_json.py @@ -75112,8 +75245,8 @@ msgid "" "\"Something wrong, with cars..., ram, and,. my spedometer read six " "hundred.,.thousand can't feel lungs,\"" msgstr "" -"\"车子，出了点问题……撞了一下，好快，我的时速表上显示着600……000，好吧，要呼不" -"了气了。\"（旧版CDDA车辆bug的NETA）" +"\"车子，出了点问题...撞了一下，好快，我的时速表上显示着600...000，好吧，要呼" +"不了气了。\"（旧版CDDA车辆bug的NETA）" #: lang/json/snippet_from_json.py msgid "" @@ -75142,8 +75275,8 @@ msgid "" "\"The bricks of this bathroom look like a face. Haha... it's all I can " "focus on. At least let me shit before you break down the door. Please...\"" msgstr "" -"\"这间卫生间的砖墙看上去好像一张脸，哈哈……这是我唯一能转移注意的东西了。至少" -"在你破门而入之前让我把屎拉完，求求你了……\"" +"\"这间卫生间的砖墙看上去好像一张脸，哈哈...这是我唯一能转移注意的东西了。至少" +"在你破门而入之前让我把屎拉完，求求你了...\"" #: lang/json/snippet_from_json.py msgid "\"The gas the gas the green gas spreads forever\"" @@ -75179,12 +75312,12 @@ msgid "" "Two, keep your iron sights lined up or succumb. Three, stay FAR WAY from all" "\"" msgstr "" -"\"生存有五个基本准则。一、时刻准备并保持警惕。二、准星要么瞄准要么等死。三、" -"远离一切……\"" +"“生存有五个基本准则。一、时刻准备并保持警惕。二、准星要么瞄准要么等死。三、远" +"离一切...”" #: lang/json/snippet_from_json.py msgid "\"There's gotta be a better use of all this rebar...\"" -msgstr "\"这块钢筋应该有更好的用法……\"" +msgstr "“这块钢筋应该有更好的用法...”" #: lang/json/snippet_from_json.py msgid "\"They are NOT slow! They are NEVER slow!\"" @@ -75219,8 +75352,8 @@ msgid "" "\"Those evac shelters have basements. Remember when they were full of " "food? Every single one is fucking empty now...\"" msgstr "" -"\"那些隔离避难所都有地下室。还记得那里曾经满满的都是食物么？现在每一个都空空" -"如也……\"" +"“那些隔离避难所都有地下室。还记得那里曾经满满的都是食物么？现在每一个都空空如" +"也...”" #: lang/json/snippet_from_json.py msgid "" @@ -75265,7 +75398,7 @@ msgstr "" msgid "" "\"We shall bring forth our master. The old gods shall we swept away, as we " "cast aside the veil of reality...\"" -msgstr "\"我们将召唤出我们的主人。当我们抛开现实的面纱时，旧神将被清除……\"" +msgstr "“我们将召唤出我们的主人。当我们抛开现实的面纱时，旧神将被清除...”" #: lang/json/snippet_from_json.py msgid "\"What the hell are they mining for in these shafts?\"" @@ -75287,7 +75420,7 @@ msgstr "“为什么所有的割草机都TM坏了？！”" msgid "" "\"Why would you ever hide in a damn gun store? The owner... he was a moron " "alright.\"" -msgstr "\"为什么你会躲在一家该死的枪械店里？店主……他是个傻瓜吗？\"" +msgstr "\"为什么你会躲在一家该死的枪械店里？店主...他是个傻瓜吗？\"" #: lang/json/snippet_from_json.py msgid "" @@ -75361,11 +75494,11 @@ msgstr "*哈欠*" #: lang/json/snippet_from_json.py msgid ", " -msgstr "，" +msgstr "," #: lang/json/snippet_from_json.py msgid ", " -msgstr "， " +msgstr ", " #: lang/json/snippet_from_json.py msgid " if I don't drink something." @@ -75381,7 +75514,7 @@ msgstr "再不歇会儿！" #: lang/json/snippet_from_json.py msgid ", " -msgstr "，" +msgstr "," #: lang/json/snippet_from_json.py msgid "" @@ -75389,7 +75522,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid ", " -msgstr "，" +msgstr "," #: lang/json/snippet_from_json.py msgid "! Wait up!" @@ -75499,7 +75632,7 @@ msgid "" "discuss hardwood versus soft woods, whether to lacquer, oil or paint, and " "which type of nails you should use!" msgstr "" -"鸟笼月刊……啄木鸟比较喜欢啄哪种木头？这个月我们讨论软木与硬木，是否上漆或上" +"鸟笼月刊...啄木鸟比较喜欢啄哪种木头？这个月我们讨论软木与硬木，是否上漆或上" "油，以及你该用哪种钉子！" #: lang/json/snippet_from_json.py @@ -75553,7 +75686,7 @@ msgstr "跟上，！" #: lang/json/snippet_from_json.py msgid "Catch you later, !" -msgstr "回头见 ，！" +msgstr "回头见 ,！" #: lang/json/snippet_from_json.py msgid "" @@ -75562,9 +75695,9 @@ msgid "" "ATOMIC power! To make boiling hot coffee the MINUTE you want it! Atomic " "Coffeemaker." msgstr "" -" 咖啡的未来……就在这！没有人真正有时间来烹煮好咖啡，但是现在你不需要妥协了！" -"Rivtech带给你永不耗尽的原子之力！只需要一分钟就能做出你想要的热咖啡！原子咖啡" -"壶！ " +"咖啡的未來...就在這！沒有人真正有時間來烹煮好咖啡，但是現在你不需要妥協了！" +"Rivtech帶給你永不耗盡的原子之力！只需要一分鐘就能做出你想要的熱咖啡！原子咖啡" +"壺！" #: lang/json/snippet_from_json.py msgid "Come on, !" @@ -75586,8 +75719,8 @@ msgid "" "\"" msgstr "" "人艰勿拆：新英格兰一名男子日前使用胶带和废铁制造了一辆新车，证明了胶带车的可" -"行性。当被问及为什么这样做时，他回答：“我没有电焊枪。”--胶带**爱好者永远的五" -"美分为您报道" +"行性。当被问及为什么这样做时，他回答：“我没有焊枪。”--胶带**爱好者永远的五美" +"分为您报道" #: lang/json/snippet_from_json.py #, no-python-format @@ -75618,7 +75751,7 @@ msgstr "扔下！" #: lang/json/snippet_from_json.py msgid "Drop the , !" -msgstr "扔下 ，！" +msgstr "扔下 ,！" #: lang/json/snippet_from_json.py msgid "Drop your weapon!" @@ -75666,7 +75799,7 @@ msgid "" "GREENS Supermarket" msgstr "" "觉得忧郁？来\"Greens\"买点杂志吧！在你身边的超市！没啥比杂志更能提升士气的" -"了……除了垃圾食物！或是买个MP3 播放器或游戏主机。Greens超市，把忧郁统统赶走。" +"了...除了垃圾食物！或是买个MP3 播放器或游戏主机。Greens超市，把忧郁统统赶走。" "——（或者抄写忧郁的台湾乌龟一百遍）" #: lang/json/snippet_from_json.py @@ -75677,7 +75810,7 @@ msgid "" "GREENS Supermarket" msgstr "" "觉得忧郁？来\"Greens\"买点杂志吧！在你身边的超市！没啥比杂志更能提升士气的" -"了……除了垃圾食物！或是买个MP3 播放器或游戏主机。Greens超市，把忧郁统统赶走。" +"了...除了垃圾食物！或是买个MP3 播放器或游戏主机。Greens超市，把忧郁统统赶走。" "——（或者抄写忧郁的台湾乌龟一百遍）" #: lang/json/snippet_from_json.py @@ -75772,7 +75905,7 @@ msgstr "从我的火线上出去" #: lang/json/snippet_from_json.py msgid "Get out of my way, ," -msgstr "别挡我的路，，" +msgstr "别挡我的路，," #: lang/json/snippet_from_json.py msgid "Get out of the way" @@ -75843,7 +75976,7 @@ msgstr "把手放在我看得到的地方！" #: lang/json/snippet_from_json.py msgid "Hasta luego, !" -msgstr "再见 ， ！" +msgstr "再见 ，！" #: lang/json/snippet_from_json.py msgid "Hello, ." @@ -75907,7 +76040,7 @@ msgstr "我要吃点东西。" #: lang/json/snippet_from_json.py msgid "I need to get some water." -msgstr "我要喝点水。" +msgstr "我要喝点shui。" #: lang/json/snippet_from_json.py msgid "I need to rest." @@ -76007,7 +76140,7 @@ msgstr "我死定了" #: lang/json/snippet_from_json.py msgid "I'm dead, ," -msgstr "我就要死了，，" +msgstr "我就要死了，," #: lang/json/snippet_from_json.py msgid "I'm done for" @@ -76015,7 +76148,7 @@ msgstr "我就真的完了" #: lang/json/snippet_from_json.py msgid "I'm hungry..." -msgstr "我饿了……" +msgstr "我饿了..." #: lang/json/snippet_from_json.py msgid "I'm in serious trouble" @@ -76039,7 +76172,7 @@ msgstr "我口渴了，我需要喝点东西。" #: lang/json/snippet_from_json.py msgid "I'm thirsty..." -msgstr "我渴了……" +msgstr "我渴了..." #: lang/json/snippet_from_json.py msgid "I'm tired..." @@ -76120,8 +76253,8 @@ msgid "" "yourself, our troops have the technology and the training for military " "action. Loud gunfire may attract more enemy attention than you have ammo!\"" msgstr "" -"把活留给砖家干——将军：你们这群P民不要去打丧尸，咱的大军是受过专门训练的，不但" -"会用砖头，还会用菜刀。开枪打丧尸会引发尸潮，尸潮你懂吗？懂？---被揍的满头包的" +"把活留给砖家干——将军：你们这群P民不要去打僵尸，咱的大军是受过专门训练的，不但" +"会用砖头，还会用菜刀。开枪打僵尸会引发尸潮，尸潮你懂吗？懂？---被揍的满头包的" "记者土豆单挑地瓜为大家真情报道" #: lang/json/snippet_from_json.py @@ -76226,7 +76359,7 @@ msgstr "好啊，，扔掉你的武器！" #: lang/json/snippet_from_json.py msgid "Okay , hands up!" -msgstr "好吧 ， 举起手来！" +msgstr "好吧 ，举起手来！" #: lang/json/snippet_from_json.py msgid "Okay hands up!" @@ -76487,8 +76620,7 @@ msgstr "粉碎机器人！" msgid "" "Snippets should also support tags like , , " ", and " -msgstr "" -"摘录应该还支持标签，如，， 和 " +msgstr "摘录应该还支持标签，如,, 和 " #: lang/json/snippet_from_json.py msgid "So long, !" @@ -76767,8 +76899,8 @@ msgid "" "Model 28.tx Phoenix today!\" and \"Twenty8. See what you've been missing.\"" msgstr "" "这是一个Twenty8牌红外成像CBM的广告。广告背景是一只在火焰中栩栩如生的机械凤" -"凰，配图文字：\"即刻购买最新型28.tx凤凰模块！\"和\"Twenty8，看见您错过的一" -"切。\"" +"凰，配图文字：\"今天就来装上全新凤凰28.tx模块吧！\"和”Twenty8，看见您错过的一" +"切。“" #: lang/json/snippet_from_json.py msgid "" @@ -77088,9 +77220,9 @@ msgid "" "captions read: \"Get the new Model 28.xx Hawk-Eye!\" and \"Twenty8. See " "what you've been missing.\"" msgstr "" -"这是一个Twenty8品牌钻石角膜CBM的广告。它展示了一副画面，一个空中飞行的鹰在它" -"的嘴叼着一个生化插件模块。标题写着：\"即刻购买最新型28.xx鹰眼模块！\"和" -"\"Twenty8，看见您错过的一切。\"" +"这是一个Twenty8品牌钻石角膜CBM的广告。它展示了一副画面，一个飞行鹰在它的嘴叼" +"着一个网络模块。标题写着：“得到新的模型28.xx鹰！”和 ”Twenty8，来看看你还缺少" +"什么“" #: lang/json/snippet_from_json.py msgid "" @@ -77099,9 +77231,9 @@ msgid "" "captions read: \"Get the new Model 28.bx Eagle-Eye!\" and \"Twenty8. See " "what you've been missing.\"" msgstr "" -"这是一个Twenty8品牌钻石角膜CBM的广告。它展示了一副画面，一个空中飞行的鹰在它" -"的嘴里叼着一个生化插件模块。标题写着：\"即刻购买最新型28.bx鹰眼模块！\"和" -"\"Twenty8，看见您错过的一切。\"" +"这是一个Twenty8品牌钻石角膜CBM的广告。它展示了一副画面，一个飞行鹰在它的嘴里" +"叼着一个网络模块。标题写着：“得到新的模型28.xx鹰眼！”和“Twenty8”一直看到你消" +"失。”" #: lang/json/snippet_from_json.py msgid "" @@ -77110,9 +77242,9 @@ msgid "" "\"Get the new Model 28.hx Night-Owl!\" and \"Twenty8. See what you've been " "missing.\"" msgstr "" -"这是一个Twenty8品牌夜视CBM的广告。它展示了一副画面，一只猫头鹰带着这个生化插" -"件模块俯冲。标题写着：\"即刻购买最新型28.hx猫头鹰模块！\"和\"Twenty8，看见您" -"错过的一切。\"" +"这是一个Twenty8品牌夜视CBM的广告。它展示了一副画面，一只猫头鹰带着这个网络模" +"块在俯冲。标题写着：“得到新的模型28.hx的夜猫子！”和“Twenty8\"一直看到你消" +"失。”" #: lang/json/snippet_from_json.py msgid "" @@ -77121,9 +77253,9 @@ msgid "" "captions read: \"Get the new Model 28.vx Vulture today!\" and \"Twenty8. " "See what you've been missing.\"" msgstr "" -"这是一个Twenty8 品牌的气味视觉CBM的广告。画面上是一只秃鹰矗立于一堆头骨和生化" -"插件模块上。标题上写着：\"即刻购买最新型28.vx秃鹰组件！\"和\"Twenty8，看见您" -"错过的一切。\"" +"这是一个Twenty8 品牌的气味视觉CBM的广告。画面上是一只秃鹰矗立于一堆头骨和电脑" +"模块上。标题上写着：”立即获取新一代28.vx秃鹰组件！“ 和 ”Twenty8，来看看你还缺" +"少什么“" #: lang/json/snippet_from_json.py msgid "" @@ -77149,7 +77281,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "This should repeat the same city several times: , , " -msgstr "这应该会重复同一个城市几次：，，" +msgstr "这应该会重复同一个城市几次：,," #: lang/json/snippet_from_json.py msgid "" @@ -77226,7 +77358,7 @@ msgstr "等等，让我们谈谈！" #: lang/json/snippet_from_json.py msgid "Water... Is there an oasis nearby?" -msgstr "水……附近有绿洲吗？" +msgstr "水...附近有绿洲吗？" #: lang/json/snippet_from_json.py msgid "We want our old factory!" @@ -77278,7 +77410,7 @@ msgstr "你最好走开" #: lang/json/snippet_from_json.py msgid "You need to move, , ?" -msgstr "你需要动一动 ，，不是么？" +msgstr "你需要动一动 ,，不是么？" #: lang/json/snippet_from_json.py msgid "You okay, ?" @@ -77291,9 +77423,9 @@ msgid "" "they teamed up with Haiti to put hoodoo drugs in the water making people " "zombies.\"" msgstr "" -"丧尸毒品：事实或是虚构？——一个博客指出最近的骚动案例是源于中国的化学武器袭" +"僵尸毒品：事实或是虚构？： 一个博客指出最近的骚动案例是来自中国的化学武器袭" "击。\"他们忌妒我们在科学系统与架构上的突破，便联合海地把一些巫毒药丸放到水中" -"让人们变成丧尸。\"" +"让人们变成僵尸。\"" #: lang/json/snippet_from_json.py msgid "absolutely" @@ -77645,7 +77777,7 @@ msgstr "听你的" #: lang/json/snippet_from_json.py msgid "you see" -msgstr "你看到的" +msgstr "好的" #: lang/json/snippet_from_json.py msgid "you'll taste my " @@ -77758,15 +77890,15 @@ msgstr "“安静！”" #: lang/json/speech_from_json.py msgid "\"Call an ambulance.\"" -msgstr "\"叫救护车。\"" +msgstr "\"叫救护车.\"" #: lang/json/speech_from_json.py msgid "\"Call me.\"" -msgstr "\"联系我。\"" +msgstr "\"联系我.\"" #: lang/json/speech_from_json.py msgid "\"Call the police.\"" -msgstr "\"叫警察。\"" +msgstr "\"叫警察.\"" #: lang/json/speech_from_json.py msgid "\"Can I help you?\"" @@ -77794,7 +77926,7 @@ msgstr "“抛弃面纱，见证真相。”" #: lang/json/speech_from_json.py msgid "\"Cast aside...cast aside...\"" -msgstr "“放下……放下……”" +msgstr "“放下...放下...”" #: lang/json/speech_from_json.py msgid "\"Come closer.\"" @@ -77887,11 +78019,11 @@ msgstr "“叼爆了”" #: lang/json/speech_from_json.py msgid "\"Forget it.\"" -msgstr "\"别在意。\"" +msgstr "\"别在意.\"" #: lang/json/speech_from_json.py msgid "\"From time to time.\"" -msgstr "\"一直以来。\"" +msgstr "\"一直.\"" #: lang/json/speech_from_json.py msgid "\"Fuck!\"" @@ -77907,11 +78039,11 @@ msgstr "“该死的废物。”" #: lang/json/speech_from_json.py msgid "\"Get me the White House.\"" -msgstr "\"替我接转白宫。\"" +msgstr "\"把我送去白宫.\"" #: lang/json/speech_from_json.py msgid "\"Give me a call later.\"" -msgstr "\"等会联系我。\"" +msgstr "\"等会联系我.\"" #: lang/json/speech_from_json.py msgid "\"Go ahead.\"" @@ -77931,11 +78063,11 @@ msgstr "\"下午好。\"" #: lang/json/speech_from_json.py msgid "\"Good evening.\"" -msgstr "\"晚上好。\"" +msgstr "\"晚上好.\"" #: lang/json/speech_from_json.py msgid "\"Good luck.\"" -msgstr "\"祝你好运。\"" +msgstr "\"祝你好运.\"" #: lang/json/speech_from_json.py msgid "\"Good morning.\"" @@ -77943,7 +78075,7 @@ msgstr "\"早上好。\"" #: lang/json/speech_from_json.py msgid "\"Good night.\"" -msgstr "\"晚安。\"" +msgstr "\"晚安.\"" #: lang/json/speech_from_json.py msgid "\"Good.\"" @@ -78111,7 +78243,7 @@ msgstr "“我前几天得了奇怪的皮疹”" #: lang/json/speech_from_json.py msgid "\"I love the smell of napalm in the morning.\"" -msgstr "“我最爱在早上闻到凝固汽油弹的味道了！”" +msgstr "“我喜欢在早上闻到汽油弹的味道。”" #: lang/json/speech_from_json.py msgid "\"I love you too.\"" @@ -78127,11 +78259,11 @@ msgstr "“我需要一件新实验服。”" #: lang/json/speech_from_json.py msgid "\"I think I need to see a doctor.\"" -msgstr "\"我觉得我病了。\"" +msgstr "\"我觉得我病了.\"" #: lang/json/speech_from_json.py msgid "\"I think I'll live.\"" -msgstr "\"我想我还活着。\"" +msgstr "\"我想我还活着.\"" #: lang/json/speech_from_json.py msgid "\"I was once a man. A MAN!\"" @@ -78155,7 +78287,7 @@ msgstr "“我确信它正在尝试理解我们。”" #: lang/json/speech_from_json.py msgid "\"I'm fine.\"" -msgstr "\"我很好。\"" +msgstr "\"我很好.\"" #: lang/json/speech_from_json.py msgid "\"I'm heading to the pool after work.\"" @@ -78175,7 +78307,7 @@ msgstr "\"我并不相信它们可以确实的理解我们。“" #: lang/json/speech_from_json.py msgid "\"I'm okay, don't worry about me.\"" -msgstr "\"我很好，没事。\"" +msgstr "\"我很好，没事.\"" #: lang/json/speech_from_json.py msgid "\"I'ma cut those fuckin' tentacles off, bitch!\"" @@ -78187,7 +78319,7 @@ msgstr "“我到处找你呢。”" #: lang/json/speech_from_json.py msgid "\"I've got a headache.\"" -msgstr "\"我的脑袋要裂开了。\"" +msgstr "\"我的脑袋要裂开了.\"" #: lang/json/speech_from_json.py msgid "\"I've got family coming tomorrow.\"" @@ -78331,7 +78463,7 @@ msgstr "\"看，它有反应了！\"" #: lang/json/speech_from_json.py msgid "\"Master, this enemy I deliver unto you...\"" -msgstr "“主人，我为您献上的这个敌人……”" +msgstr "“主人，我为您献上的这个敌人...”" #: lang/json/speech_from_json.py msgid "\"Members of the species have some kind of neurocognitive link.\"" @@ -78417,7 +78549,7 @@ msgstr "“别！”" msgid "" "\"Please, kill me!\", followed by an electronic voice saying \"SELF " "PRESERVATION PROTOCOLS ACTIVATED\"" -msgstr "\"请杀了我吧！\"， 一个电子声响起\"自我保护设定已激活\"" +msgstr "\"请杀了我吧！\"，一个电子声响起\"自我保护设定已激活\"" #: lang/json/speech_from_json.py msgid "\"Please, take me with you.\"" @@ -78469,7 +78601,7 @@ msgstr "“我去。”" #: lang/json/speech_from_json.py msgid "\"Shows a noted preference for human brain tissue.\"" -msgstr "\"它明确表现出对人类大脑组织的偏好。\"" +msgstr "\"它明确表现出对人类大脑组织的偏好.\"" #: lang/json/speech_from_json.py msgid "\"So, what is this thing supposed to be, exactly?\"" @@ -78477,7 +78609,7 @@ msgstr "“好吧，这究竟是啥玩意？”" #: lang/json/speech_from_json.py msgid "\"Somehow, I doubt that.\"" -msgstr "\"真的？我很怀疑啊……\"" +msgstr "“真的？我很怀疑啊...”" #: lang/json/speech_from_json.py msgid "\"Soon, I will be free!\"" @@ -78507,7 +78639,7 @@ msgstr "“拿着这把枪，我们可能会用到。”" #: lang/json/speech_from_json.py msgid "\"Tekeli-li.\"" -msgstr "\"Tekeli-li。\"" +msgstr "\"Tekeli-li.\"" #: lang/json/speech_from_json.py msgid "\"That fuckin' thing is horrible, man, it gives me the creeps.\"" @@ -78551,7 +78683,7 @@ msgstr "“这件躯壳或许会死亡，但我们的主是永生的。”" #: lang/json/speech_from_json.py msgid "\"This body will not suffice, no...\"" -msgstr "“这个躯壳还不足够，不……”" +msgstr "“这个躯壳还不足够，不...”" #: lang/json/speech_from_json.py msgid "\"This is the way the fuckin' world ends.\"" @@ -78736,7 +78868,7 @@ msgstr "老大哥正在看着你……" #: lang/json/speech_from_json.py msgid "Blood... Delicious." -msgstr "鲜血……真美味。" +msgstr "鲜血...真美味。" #: lang/json/speech_from_json.py msgid "Die for me!" @@ -78788,7 +78920,7 @@ msgstr "让我们一起玩吧！" #: lang/json/speech_from_json.py msgid "Let's play... Russian roulette." -msgstr "让我们玩……俄罗斯轮盘赌。" +msgstr "让我们玩...俄罗斯轮盘赌。" #: lang/json/speech_from_json.py msgid "May I have a cookie?" @@ -78812,7 +78944,7 @@ msgstr "请带上我一起走！" #: lang/json/speech_from_json.py msgid "See you... IN HELL!" -msgstr "去地狱里……再见吧！" +msgstr "去地狱里...再见吧！" #: lang/json/speech_from_json.py msgid "Sing with me!" @@ -79064,11 +79196,11 @@ msgstr "……" #: lang/json/talk_topic_from_json.py src/npctalk.cpp msgid "About one of those jobs..." -msgstr "关于其中的一个任务……" +msgstr "关于其中的一个任务..." #: lang/json/talk_topic_from_json.py src/npctalk.cpp msgid "About that job..." -msgstr "关于那个任务……" +msgstr "关于那个任务..." #: lang/json/talk_topic_from_json.py msgid "Alright then." @@ -79166,7 +79298,7 @@ msgid "" msgstr "" "我不知道。我是说，如果你能帮上忙的话，应该就有戏。可现如今谁又能说得清谁行谁" "不行呢？关键在于你能不能找到管事的人。如果我不卖点什么，那个商人肯定会把我也" -"赶出去。 不过……似乎也有例外的家伙。" +"赶出去。 不过...似乎也有例外的家伙。" #: lang/json/talk_topic_from_json.py msgid "I don't like your attitude." @@ -79203,7 +79335,7 @@ msgid "" "stays to the basement to prevent it from happening again. Unless you really " "prove your worth I don't foresee any exceptions to that rule." msgstr "" -"说来话长，前不久一个生病的难民挂掉的时候变成了一具丧尸。此后我们不得不驱逐所" +"说来话长，前不久一个生病的难民挂掉的时候变成了一具僵尸。此后我们不得不驱逐所" "有的难民，我们大部分幸存的成员现在守在地下室防止它再跑出来。除非你能证明你的" "价值，否则我不觉得应该为你破例。" @@ -79303,7 +79435,7 @@ msgstr "没有考验吗？没什么“如果你做这个任务，然后我们会 #: lang/json/talk_topic_from_json.py msgid "So uhhh, why not?" -msgstr "那么……呃，为什么不？" +msgstr "那么...呃，为什么不？" #: lang/json/talk_topic_from_json.py msgid "So who is everyone around here?" @@ -79324,7 +79456,7 @@ msgstr "出门当心点。我可不喜欢在你死掉后再杀你一遍的感觉 #: lang/json/talk_topic_from_json.py msgid "Sucks..." -msgstr "真麻烦……" +msgstr "真麻烦..." #: lang/json/talk_topic_from_json.py msgid "Thanks for the heads-up." @@ -79358,7 +79490,7 @@ msgstr "那么快滚，你有脚。" #: lang/json/talk_topic_from_json.py msgid "This is a refugee center that we've made into a sort of trading hub." -msgstr "这里本来是个难民中心，现在已经让我们变成个贸易中心了。" +msgstr "这里本来是个难民中心，现在已经让我们变成个贸易中心了 ." #: lang/json/talk_topic_from_json.py msgid "" @@ -79387,7 +79519,7 @@ msgstr "好的，再见。" #: lang/json/talk_topic_from_json.py msgid "Well, then..." -msgstr "好的，那么……" +msgstr "好的，那么..." #: lang/json/talk_topic_from_json.py msgid "" @@ -79789,14 +79921,12 @@ msgstr "打击了%s" #: lang/json/technique_from_json.py #, python-format msgid " strikes %s with the slow power of flowing water" -msgstr "缓慢蓄力，然后对%s劈出了一套流水般的斩击舞。" +msgstr "对%s使用了流水斩。" #: lang/json/technique_from_json.py #, python-format msgid " strikes %s's weaknesses!" -msgstr "" -"脑中复刻着地形与双方的动作，冲折刺闪，身位移至%s侧防空门，拍柄折刺斜" -"挑拉，破防撕裂！" +msgstr "朝着%s的弱点一击。" #: lang/json/technique_from_json.py #, python-format @@ -79816,9 +79946,7 @@ msgstr "摔到了%s上。" #: lang/json/technique_from_json.py #, python-format msgid " stuns %s with the force of the blow!" -msgstr "" -"刃尖超音速摩擦空气，一击劈出了火石相击一般的电光，然后%s意识被刀刃动" -"能与音爆强行带走。" +msgstr "的强力一击击昏了%s。" #: lang/json/technique_from_json.py #, python-format @@ -79908,7 +80036,7 @@ msgstr " 用毒针般的踢技把 %s 踢飞到了空中。" #: lang/json/technique_from_json.py #, python-format msgid "'s strike knocks %s off balance" -msgstr "劲秋之风扫红叶，的旋风扫击到了%s下肢，让其失衡倒地。" +msgstr "的一击让%s失去了平衡。" #: lang/json/technique_from_json.py msgid "Block" @@ -80020,7 +80148,7 @@ msgstr "穿刺攻击" #: lang/json/technique_from_json.py msgid "In-One Timing" -msgstr "闪现突攻" +msgstr "一发" #: lang/json/technique_from_json.py msgid "Jab" @@ -80513,14 +80641,12 @@ msgstr "你打击了%s" #: lang/json/technique_from_json.py #, python-format msgid "You strike %s with the slow power of flowing water" -msgstr "你缓慢蓄力，然后对%s劈出了一套流水般的斩击舞。" +msgstr "你对%s使用了流水斩。" #: lang/json/technique_from_json.py #, python-format msgid "You strike at %s's weaknesses!" -msgstr "" -"脑中复刻着地形与双方的动作，你冲折刺闪，身位移至%s侧防空门，拍柄折刺斜挑拉，" -"破防撕裂！" +msgstr "你朝着%s的弱点一击。" #: lang/json/technique_from_json.py #, python-format @@ -80540,9 +80666,7 @@ msgstr "你摔到了%s上。" #: lang/json/technique_from_json.py #, python-format msgid "You stun %s with the force of the blow!" -msgstr "" -"刃尖超音速摩擦空气，你一击劈出了火石相击一般的电光，然后%s意识被刀刃动能与音" -"爆强行带走。" +msgstr "你的强力一击击昏了%s。" #: lang/json/technique_from_json.py #, python-format @@ -80636,7 +80760,7 @@ msgstr "你用毒针般的踢技把 %s 踢飞到了空中。" #: lang/json/technique_from_json.py #, python-format msgid "Your strike knocks %s off balance" -msgstr "劲秋之风扫红叶，你的旋风扫击到了%s下肢，让其失衡倒地。" +msgstr "你的一击让%s失去了平衡。" #: lang/json/technique_from_json.py msgid "arm lock" @@ -80852,15 +80976,15 @@ msgstr "蓝莓树" #: lang/json/terrain_from_json.py msgid "boarded up damaged door" -msgstr "木板封锁的门（损坏）" +msgstr "木板封锁的破门" #: lang/json/terrain_from_json.py msgid "boarded up damaged door with peephole" -msgstr "木板封锁的猫眼门（损坏）" +msgstr "木板封锁的猫眼破门" #: lang/json/terrain_from_json.py msgid "boarded up damaged reinforced door" -msgstr "木板封锁的强化门（损坏）" +msgstr "封死的强化门（损坏）" #: lang/json/terrain_from_json.py msgid "boarded up door" @@ -80872,7 +80996,7 @@ msgstr "木板封锁的猫眼门" #: lang/json/terrain_from_json.py msgid "boarded up reinforced door" -msgstr "木板封锁的强化门" +msgstr "封死的强化门" #: lang/json/terrain_from_json.py msgid "boarded up window" @@ -80916,7 +81040,7 @@ msgstr "破损的木骨泥墙" #: lang/json/terrain_from_json.py msgid "broken wood wall" -msgstr "破碎的木墙" +msgstr "破碎的木质门" #: lang/json/terrain_from_json.py msgid "brush." @@ -80952,7 +81076,7 @@ msgstr "缺口的原木墙" #: lang/json/terrain_from_json.py msgid "chipped wood wall" -msgstr "缺口的木墙" +msgstr "缺口的木质门" #: lang/json/terrain_from_json.py msgid "cloning vat" @@ -80960,7 +81084,7 @@ msgstr "克隆舱" #: lang/json/terrain_from_json.py msgid "closed bar door" -msgstr "栏杆门（关）" +msgstr "关闭的栏杆门" #: lang/json/terrain_from_json.py msgid "closed door curtain" @@ -80968,7 +81092,7 @@ msgstr "门帘（关）" #: lang/json/terrain_from_json.py msgid "closed glass door" -msgstr "玻璃门（关）" +msgstr "关闭的玻璃门" #: lang/json/terrain_from_json.py msgid "closed makeshift door" @@ -80976,7 +81100,7 @@ msgstr "简易门（关）" #: lang/json/terrain_from_json.py msgid "closed metal door" -msgstr "金属门（关）" +msgstr "关闭的金属门" #: lang/json/terrain_from_json.py msgid "closed metal door with peephole" @@ -80988,11 +81112,11 @@ msgstr "强化木门（关）" #: lang/json/terrain_from_json.py msgid "closed wire gate" -msgstr "铁丝大门（关）" +msgstr "关闭的铁丝大门" #: lang/json/terrain_from_json.py msgid "closed wood door" -msgstr "木门（关）" +msgstr "关闭的木门" #: lang/json/terrain_from_json.py msgid "closed wood door with peephole" @@ -81000,7 +81124,7 @@ msgstr "关闭的附带猫眼木门" #: lang/json/terrain_from_json.py msgid "closed wooden gate" -msgstr "木制大门（关）" +msgstr "关闭的木制大门" #: lang/json/terrain_from_json.py msgid "column" @@ -81032,11 +81156,11 @@ msgstr "传送带" #: lang/json/terrain_from_json.py msgid "corpse filled pit" -msgstr "万人塚" +msgstr "被尸体填满的坑" #: lang/json/terrain_from_json.py msgid "covered glass pit" -msgstr "伪装过的玻璃刺陷坑" +msgstr "伪装玻璃陷坑" #: lang/json/terrain_from_json.py msgid "covered pit" @@ -81200,7 +81324,7 @@ msgstr "玻璃发出嘎吱嘎吱的声音" #: lang/json/terrain_from_json.py lang/json/trap_from_json.py msgid "glass pit" -msgstr "玻璃刺陷坑" +msgstr "玻璃陷坑" #: lang/json/terrain_from_json.py msgid "glass wall" @@ -81228,35 +81352,35 @@ msgstr "防护栏" #: lang/json/terrain_from_json.py msgid "half-built brick wall" -msgstr "砖墙（半成品）" +msgstr "造了一半的砖墙" #: lang/json/terrain_from_json.py msgid "half-built reinforced concrete floor" -msgstr "加强混凝土地板（半成品）" +msgstr "加强混凝土地板半成品" #: lang/json/terrain_from_json.py msgid "half-built reinforced concrete wall" -msgstr "加强混凝土墙（半成品）" +msgstr "造了一半的加强混凝土墙" #: lang/json/terrain_from_json.py msgid "half-built simple concrete wall" -msgstr "简易混凝土墙（半成品）" +msgstr "造了一半的简易混凝土墙" #: lang/json/terrain_from_json.py msgid "half-built simple metal wall" -msgstr "简易金属墙（半成品）" +msgstr "造了一半的简易金属墙" #: lang/json/terrain_from_json.py msgid "half-built stone wall" -msgstr "石墙（半成品）" +msgstr "造了一半的石墙" #: lang/json/terrain_from_json.py msgid "half-built wall" -msgstr "墙（半成品）" +msgstr "造了一半的墙" #: lang/json/terrain_from_json.py msgid "half-built wattle-and-daub wall" -msgstr "木骨泥墙（半成品）" +msgstr "造了一半的木骨泥墙" #: lang/json/terrain_from_json.py msgid "heavy machinery" @@ -81328,7 +81452,7 @@ msgstr "矮柱" #: lang/json/terrain_from_json.py msgid "locked wire gate" -msgstr "铁丝大门（锁）" +msgstr "锁闭的铁丝大门" #: lang/json/terrain_from_json.py msgid "log wall" @@ -81424,7 +81548,7 @@ msgstr "旧机械" #: lang/json/terrain_from_json.py msgid "open bar door" -msgstr "栏杆门（开）" +msgstr "打开的栏杆门" #: lang/json/terrain_from_json.py msgid "open door curtain" @@ -81432,7 +81556,7 @@ msgstr "门帘（开）" #: lang/json/terrain_from_json.py msgid "open glass door" -msgstr "玻璃门（开）" +msgstr "打开的玻璃门" #: lang/json/terrain_from_json.py msgid "open makeshift door" @@ -81440,7 +81564,7 @@ msgstr "简易门（开）" #: lang/json/terrain_from_json.py msgid "open metal door" -msgstr "金属门（开）" +msgstr "打开的金属门" #: lang/json/terrain_from_json.py msgid "open metal door with peephole" @@ -81460,11 +81584,11 @@ msgstr "无窗帘的窗（开）" #: lang/json/terrain_from_json.py msgid "open wire gate" -msgstr "铁丝大门（开）" +msgstr "开放的铁丝大门" #: lang/json/terrain_from_json.py msgid "open wood door" -msgstr "木门（开）" +msgstr "开放的木门" #: lang/json/terrain_from_json.py msgid "open wood door with peephole" @@ -81472,7 +81596,7 @@ msgstr "开放的附带猫眼木门" #: lang/json/terrain_from_json.py msgid "open wooden gate" -msgstr "木制大门（开）" +msgstr "开放的木制大门" #: lang/json/terrain_from_json.py msgid "palisade gate" @@ -81520,7 +81644,7 @@ msgstr "李子树" #: lang/json/terrain_from_json.py msgid "plunk." -msgstr "砰砰声。" +msgstr "砰砰声." #: lang/json/terrain_from_json.py msgid "plutonium generator" @@ -81730,6 +81854,10 @@ msgstr "柴油泵（损坏）" msgid "smashed gas pump" msgstr "汽油泵（损坏）" +#: lang/json/terrain_from_json.py +msgid "smoothed rock" +msgstr "打磨过的石头" + #: lang/json/terrain_from_json.py lang/json/trap_from_json.py msgid "spiked pit" msgstr "尖刺陷坑" @@ -81824,7 +81952,7 @@ msgstr "蜡地板" #: lang/json/terrain_from_json.py msgid "wham." -msgstr "砰。" +msgstr "砰." #: lang/json/terrain_from_json.py msgid "white grass" @@ -81864,7 +81992,7 @@ msgstr "带金属栏的窗户" #: lang/json/terrain_from_json.py msgid "window without curtains" -msgstr "无窗帘的窗" +msgstr "没窗帘的窗" #: lang/json/terrain_from_json.py msgid "wire fence" @@ -81872,7 +82000,7 @@ msgstr "铁丝围栏" #: lang/json/terrain_from_json.py msgid "wooden wall" -msgstr "木墙" +msgstr "木质门" #: lang/json/terrain_from_json.py msgid "yellow pavement" @@ -81960,11 +82088,11 @@ msgstr "锤打" #: lang/json/tool_quality_from_json.py msgid "jacking" -msgstr "千斤顶" +msgstr "顶起中....." #: lang/json/tool_quality_from_json.py msgid "lifting" -msgstr "起重" +msgstr "吊起中...." #: lang/json/tool_quality_from_json.py msgid "metal sawing" @@ -82265,7 +82393,7 @@ msgid "" "simply move into it." msgstr "" "你刚捡起的物品是件好武器！按\"w\"并选择这个武器可以装备它。要玩徒手？那么按" -"\"d\"把你的武器扔在地上，或按\"w -\"收起它。一只丧尸在附近溜达。要攻击它就向" +"\"d\"把你的武器扔在地上，或按\"w -\"收起它。一个僵尸在附近溜达。要攻击它就向" "它所在的方向移动，干掉它！" #: lang/json/tutorial_messages_from_json.py @@ -82612,7 +82740,7 @@ msgstr "两厢车" #: lang/json/vehicle_from_json.py msgid "Hearse" -msgstr "" +msgstr "灵车" #: lang/json/vehicle_from_json.py msgid "Heavy Planter Tractor" @@ -82816,7 +82944,7 @@ msgstr "自定义_空" #: lang/json/vehicle_from_json.py msgid "engine crane" -msgstr "引擎吊机" +msgstr "起重机引擎" #: lang/json/vehicle_part_from_json.py msgid "120mm RWS" @@ -82904,7 +83032,7 @@ msgstr "骨板" #: lang/json/vehicle_part_from_json.py msgid "boom crane" -msgstr "吊杆起重机" +msgstr "吊臂起重机" #: lang/json/vehicle_part_from_json.py msgid "box" @@ -83232,7 +83360,7 @@ msgstr "车载M240通用机枪" #: lang/json/vehicle_part_from_json.py msgid "mounted M249" -msgstr "车载M249轻型机枪" +msgstr "车载M249机枪" #: lang/json/vehicle_part_from_json.py msgid "mounted M320" @@ -83524,7 +83652,7 @@ msgstr "可更换蓄电池箱" #: lang/json/vehicle_part_from_json.py msgid "telescopic crane" -msgstr "伸缩吊杆式起重机" +msgstr "可伸缩吊臂起重机" #: lang/json/vehicle_part_from_json.py msgid "tesla turret" @@ -83708,7 +83836,7 @@ msgstr "钙" #: lang/json/vitamin_from_json.py msgid "Vitamin A" -msgstr "维A视黄醇" +msgstr "维生素A" #: lang/json/vitamin_from_json.py msgid "Vitamin B12" @@ -83716,7 +83844,7 @@ msgstr "维生素B12" #: lang/json/vitamin_from_json.py msgid "Vitamin C" -msgstr "维C抗坏血酸" +msgstr "维生素C" #. ~ appended to "Close where?" "Pry where?" etc. #: src/action.cpp @@ -83734,8 +83862,8 @@ msgstr "返回" #: src/action.cpp src/activity_handlers.cpp src/color.cpp src/crafting.cpp #: src/editmap.cpp src/game.cpp src/iexamine.cpp src/inventory_ui.cpp #: src/item_action.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/mission_companion.cpp src/pickup.cpp src/player.cpp src/veh_interact.cpp -#: src/vehicle.cpp +#: src/mission_companion.cpp src/pickup.cpp src/player.cpp +#: src/veh_interact.cpp src/vehicle.cpp msgid "Cancel" msgstr "取消" @@ -83759,8 +83887,8 @@ msgid "" "Damage chance: %.1f%%" msgstr "" "%s\n" -"成功率：%.1f%%\n" -"损坏率：%.1f%%" +"成功率 %.1ff%%\n" +"损坏率 %.1f%%" #: src/activity_handlers.cpp msgid " finished pulping the corpse." @@ -83787,7 +83915,7 @@ msgstr "切克！切克！切克！" #: src/activity_handlers.cpp #, c-format msgid "Can't reload the %s." -msgstr "无法重新装填 %s 。" +msgstr "不能重新装填 %s 。" #: src/activity_handlers.cpp msgid "Feels like you're making good progress. Another half an hour, maybe?" @@ -83801,14 +83929,14 @@ msgstr "如果能保持这个速度，或许还需要一个小时才能搞定。 #, c-format msgctxt "memorial_female" msgid "Learned %s." -msgstr "%s已习得！" +msgstr "习得 %s ！" #. ~ %s is martial art #: src/activity_handlers.cpp #, c-format msgctxt "memorial_male" msgid "Learned %s." -msgstr "%s已习得！" +msgstr "习得 %s ！" #: src/activity_handlers.cpp src/player.cpp #, c-format @@ -83924,7 +84052,7 @@ msgstr "咣当一声，%s 泵随着一下振动停止了工作。" #: src/activity_handlers.cpp src/player.cpp #, c-format msgid "You are currently unable to mend the %s." -msgstr "你目前无法修复 %s。" +msgstr "目前你没法修好%s." #: src/activity_handlers.cpp src/game.cpp #, c-format @@ -84019,7 +84147,7 @@ msgstr "你收获了一些肉。" #: src/activity_handlers.cpp msgid "You harvest some fluid bladders!" -msgstr "你收获了一些存有流体的囊状物！" +msgstr "你收获了一些流体囊状物！" #: src/activity_handlers.cpp msgid "You harvest some gooey fat!" @@ -84031,7 +84159,7 @@ msgstr "你收获了一些植物纤维！" #: src/activity_handlers.cpp msgid "You harvest some salvageable bones!" -msgstr "你收获了一些无甚大用的骨头！" +msgstr "你收获了一些还算可用的骨头！" #: src/activity_handlers.cpp msgid "You harvest some usable bones!" @@ -84051,18 +84179,17 @@ msgstr "你收获了一个胃！" #: src/activity_handlers.cpp msgid "You have trouble breathing, and stop." -msgstr "" -"你换气被阻塞《《《 身体不能动了。" +msgstr "你呼吸有困难，然后...停止了。" #: src/activity_handlers.cpp #, c-format msgid "You insert a bolt into the %s." -msgstr "拉开弦，你为%s 扣上了一支弩箭。" +msgstr "你为 %s 重新上箭。" #: src/activity_handlers.cpp #, c-format msgid "You insert a cartridge into the %s." -msgstr "你为 %s 压填弹药。" +msgstr "你为 %s 重新上弹。" #: src/activity_handlers.cpp #, c-format @@ -84071,7 +84198,7 @@ msgstr "你学会了 %s 。" #: src/activity_handlers.cpp src/vehicle.cpp msgid "You let go of the controls." -msgstr "你放开了车辆的控制。" +msgstr "你放开了车辆的控制." #: src/activity_handlers.cpp #, c-format @@ -84086,7 +84213,7 @@ msgstr "你把 %1$s 倒在地上。" #: src/activity_handlers.cpp src/iexamine.cpp #, c-format msgid "You reload the %s." -msgstr "重新装填了 %s 。" +msgstr "你重新装填了 %s 。" #: src/activity_handlers.cpp msgid "" @@ -84102,7 +84229,7 @@ msgstr "你把 %1$s 成功的装到你的 %2$s 上。" #: src/activity_handlers.cpp #, c-format msgid "You successfully mended the %s." -msgstr "" +msgstr "你成功修复了 %s！" #: src/activity_handlers.cpp msgid "You're too tired to continue." @@ -84268,7 +84395,7 @@ msgstr "你想要服用一些安定片。" #: src/addiction.cpp msgid "You could use some new parts..." -msgstr "你想要长出一些新的部件……" +msgstr "你可以使用一些新的部件..." #: src/addiction.cpp msgid "You could use some nicotine." @@ -84301,7 +84428,7 @@ msgstr "你感到沮丧。兴奋剂（安非他命等）可以缓解这种情况 #: src/addiction.cpp msgid "You feel like you need a bump." -msgstr "你感觉你需要来一针管。" +msgstr "你感觉需要注射一支毒品。" #: src/addiction.cpp msgid "You haven't had any mutagen lately." @@ -84333,11 +84460,11 @@ msgstr "你是如此怀念人类毁灭后的美丽彩虹。" #: src/addiction.cpp msgid "You stop suddenly, feeling bewildered." -msgstr "你突然停了下来，感觉世界如此陌生。" +msgstr "你突然停了下来，感觉非常困惑。" #: src/addiction.cpp msgid "You want some caffeine." -msgstr "你想摄取点咖啡因。" +msgstr "你想要一些咖啡因来提提神。" #: src/addiction.cpp msgid "You're shaking... you need some diazepam!" @@ -84345,7 +84472,7 @@ msgstr "你的身体不受控制的颤抖着，你需要些安定片。" #: src/addiction.cpp msgid "You're shivering, you need some crack." -msgstr "你的身体不受控制的颤抖着，你需要来几颗“那个”。" +msgstr "你的身体不受控制的颤抖着，你需要毒品。" #: src/addiction.cpp msgid "" @@ -84357,23 +84484,23 @@ msgstr "" #: src/addiction.cpp msgid "Your body is SOO booorrrring. Just a little sip to liven things up?" -msgstr "你哒身体摊nnnnn软在地iiii.....。只需uuuu要来一小uuuu口就好！" +msgstr "你浑身乏力。来一小口助兴？" #: src/addiction.cpp msgid "Your hands start shaking... you need a drink bad!" -msgstr "你的双手开始颤抖……你迫切地需要酒！" +msgstr "你的双手开始颤抖...你迫切地需要酒！" #: src/addiction.cpp msgid "Your hands start shaking... you need a pick-me-up." -msgstr "你的手开始颤抖……你需要一些提神饮料（酒、咖啡、茶等）。" +msgstr "你的手开始颤抖...你需要一些提神饮料（酒、咖啡、茶等）。" #: src/addiction.cpp msgid "Your hands start shaking... you need it bad!" -msgstr "你的双手开始颤抖……你迫切地需要咖啡因！" +msgstr "你的双手开始颤抖...你迫切地需要它！" #: src/addiction.cpp msgid "Your hands start shaking... you need some painkillers." -msgstr "你的双手开始颤抖……你需要一些止痛剂。" +msgstr "你的双手开始颤抖...你需要一些止痛剂。" #: src/addiction.cpp msgid "alcohol" @@ -84459,7 +84586,7 @@ msgstr "容器" #: src/advanced_inv.cpp msgid "DN" -msgstr "正下" +msgstr "下" #: src/advanced_inv.cpp msgid "Destination area has too many items. Remove some first." @@ -84599,7 +84726,7 @@ msgstr "选择目的地" #: src/advanced_inv.cpp msgid "Sort by... " -msgstr "排序……" +msgstr "按照...排序 " #: src/advanced_inv.cpp #, c-format @@ -84652,7 +84779,7 @@ msgstr "西" #: src/advanced_inv.cpp msgid "WR" -msgstr "衣" +msgstr "WR" #: src/advanced_inv.cpp src/overmap.cpp msgid "West" @@ -84809,7 +84936,7 @@ msgstr "它可以被修改合身。" #: src/armor_layers.cpp msgid "It fits you well." -msgstr "它很合身。" +msgstr "它很合身." #: src/armor_layers.cpp msgid "It has a hood." @@ -84817,7 +84944,7 @@ msgstr "它有一个兜帽。" #: src/armor_layers.cpp msgid "It has pockets." -msgstr "它有口袋。" +msgstr "它有口袋." #: src/armor_layers.cpp msgid "It helps you to see clearly underwater." @@ -84833,7 +84960,7 @@ msgstr "它是透水的。" #: src/armor_layers.cpp msgid "It is waterproof." -msgstr "它是防水的。" +msgstr "它是防水的." #: src/armor_layers.cpp msgid "It looks fancy." @@ -84846,22 +84973,22 @@ msgstr "它看上去真心花哨。" #: src/armor_layers.cpp src/bodypart.cpp msgid "L. Arm" msgid_plural "Arms" -msgstr[0] "手臂" +msgstr[0] "左臂" #: src/armor_layers.cpp src/bodypart.cpp msgid "L. Foot" msgid_plural "Feet" -msgstr[0] "脚掌" +msgstr[0] "左脚" #: src/armor_layers.cpp src/bodypart.cpp msgid "L. Hand" msgid_plural "Hands" -msgstr[0] "手掌" +msgstr[0] "左手" #: src/armor_layers.cpp src/bodypart.cpp msgid "L. Leg" msgid_plural "Legs" -msgstr[0] "腿部" +msgstr[0] "左腿" #: src/armor_layers.cpp src/bodypart.cpp msgid "Mouth" @@ -84891,22 +85018,22 @@ msgstr "穿上：" #: src/armor_layers.cpp src/bodypart.cpp msgid "R. Arm" msgid_plural "Arms" -msgstr[0] "手臂" +msgstr[0] "右臂" #: src/armor_layers.cpp src/bodypart.cpp msgid "R. Foot" msgid_plural "Feet" -msgstr[0] "脚掌" +msgstr[0] "右脚" #: src/armor_layers.cpp src/bodypart.cpp msgid "R. Hand" msgid_plural "Hands" -msgstr[0] "手掌" +msgstr[0] "右手" #: src/armor_layers.cpp src/bodypart.cpp msgid "R. Leg" msgid_plural "Legs" -msgstr[0] "腿部" +msgstr[0] "右腿" #: src/armor_layers.cpp msgid "Reassign invlets for armor?" @@ -85094,7 +85221,7 @@ msgstr "%s之技艺" #: src/artifact.cpp #, c-format msgid "This %1$s %2$s." -msgstr " 这是 %1$s %2$s。" +msgstr " 这是 %1$s %2$s." #: src/artifact.cpp #, c-format @@ -85258,9 +85385,9 @@ msgid "" "It is the only one of its kind.\n" "It may have unknown powers; try activating them." msgstr "" -"这是%s。\n" -"这东西在世界上是独一无二的。\n" -"它也许拥有未知的力量；可以试试激活它们。" +"这是%s.\n" +"其相当稀有.\n" +"它也许拥有未知的力量;可以试试激活它们." #: src/artifact.cpp #, c-format @@ -85268,8 +85395,8 @@ msgid "" "This is the %s.\n" "They are the only ones of their kind." msgstr "" -"这是%s。\n" -"这东西在世界上是独一无二的。" +"这是%s.\n" +"它们相当稀有." #: src/artifact.cpp msgid "Undying" @@ -85281,7 +85408,7 @@ msgstr "无言" #: src/artifact.cpp msgid "artifact file" -msgstr "" +msgstr "神器文件" #: src/artifact.cpp msgid "beads" @@ -85712,7 +85839,8 @@ msgstr "请首先选择一个人物！" msgid "Rules" msgstr "规则" -#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp src/options.cpp +#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp +#: src/options.cpp msgid "Save changes?" msgstr "保存修改？" @@ -85734,7 +85862,7 @@ msgstr "[]" #: src/auto_pickup.cpp msgid "autopickup configuration" -msgstr "" +msgstr "自动拾取设置" #. ~ Name of a basecamp #: src/basecamp.cpp @@ -85750,13 +85878,13 @@ msgid "" "%s: %i more slot(s) needed." msgstr "" "\n" -"%s：需要 %i 个更多的空位。" +"%s:还需要%i 个槽位才能安装。" #. ~ ( slots); #: src/bionics.cpp #, c-format msgid "%s (%i slots);" -msgstr "%s（%i 个空位）；" +msgstr "在%s上(槽位还剩%i个;" #: src/bionics.cpp msgid "Adrenaline Spike" @@ -85918,7 +86046,7 @@ msgstr "没有效果。" #: src/bionics.cpp #, c-format msgid "Not enough space for bionic installation!%s" -msgstr "没有足够的生化插件空位！%s" +msgstr "在%s上没有足够的空间用来安装仿生模块." #: src/bionics.cpp src/iuse.cpp src/iuse_actor.cpp msgid "Nothing" @@ -86058,7 +86186,7 @@ msgid "" "WARNING: %i percent chance of failure and SEVERE bodily damage! Remove " "anyway?" msgstr "" -"警告：移除该生化插件有 %i% 的几率造成基因损害、失血或损坏你已有的生化插件！仍" +"警告：移除该生化插件有 %i 的几率造成基因损害、失血或损坏你已有的生化插件！仍" "要移除吗？" #: src/bionics.cpp @@ -86067,8 +86195,8 @@ msgid "" "WARNING: %i percent chance of genetic damage, blood loss, or damage to " "existing bionics! Continue anyway?" msgstr "" -"警告：安装该生化插件有 百分之%i 的几率造成基因损害、失血或损坏你已有的生化插" -"件！仍要安装吗？" +"警告：安装该生化插件有 %i 的几率造成基因损害、失血或损坏你已有的生化插件！仍" +"要安装吗？" #: src/bionics.cpp msgid "" @@ -86262,23 +86390,23 @@ msgstr "生化插件" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / %d turns" -msgstr "%d 能量 / %d 回合" +msgid "%d PU act" +msgstr "%d 能量 启动" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / turn" -msgstr "%d 能量 / 回合" +msgid "%d PU deact" +msgstr "%d 能量 关闭" #: src/bionics_ui.cpp #, c-format -msgid "%d PU act" -msgstr "%d 能量 启动" +msgid "%d PU/%d turns" +msgstr "%d 能量 / %d 回合" #: src/bionics_ui.cpp #, c-format -msgid "%d PU deact" -msgstr "%d 能量 关闭" +msgid "%d PU/turn" +msgstr "%d 能量 / 回合" #: src/bionics_ui.cpp src/mutation_ui.cpp #, c-format @@ -86318,7 +86446,7 @@ msgstr "" #: src/bionics_ui.cpp #, c-format msgid "ACTIVE (%i)" -msgstr "主动 (%i)" +msgstr "主动（%i）" #: src/bionics_ui.cpp #, c-format @@ -86350,12 +86478,12 @@ msgstr "开" #: src/bionics_ui.cpp #, c-format msgid "PASSIVE (%i)" -msgstr "被动 (%i)" +msgstr "被动（%i）" #: src/bionics_ui.cpp #, c-format msgid "Power usage: %s" -msgstr "能量消耗: %s" +msgstr "能量消耗： %s" #: src/bionics_ui.cpp #, c-format @@ -86372,7 +86500,7 @@ msgstr "" #: src/bionics_ui.cpp msgid "This bionic occupies the following body parts:" -msgstr "该生化插件被安装在以下的身体部位 ︰" +msgstr "这个CBM占据了以下身体部位:" #: src/bionics_ui.cpp #, c-format @@ -86532,19 +86660,19 @@ msgstr "躯干" #, c-format msgid " and %d hour" msgid_plural " and %d hours" -msgstr[0] "" +msgstr[0] "及 %d 小时" #: src/calendar.cpp #, c-format msgid " and %d minute" msgid_plural " and %d minutes" -msgstr[0] "" +msgstr[0] "及 %d 分" #: src/calendar.cpp #, c-format msgid " and %d second" msgid_plural " and %d seconds" -msgstr[0] "" +msgstr[0] "及 %d 秒" #. ~ hour:minute (24hr time display) #: src/calendar.cpp @@ -86645,7 +86773,7 @@ msgstr "星期三" #: src/cata_utility.cpp #, c-format msgid "Failed to write %1$s to \"%2$s\": %3$s" -msgstr "将 %1$s 写入到\"%2$s\"失败: %3$s" +msgstr "将%1$s写入\"%2$s\"失败： %3$s" #: src/cata_utility.cpp src/options.cpp msgid "kg" @@ -86884,7 +87012,7 @@ msgstr "区域名称：" #: src/clzones.cpp msgid "zones date" -msgstr "地区日期" +msgstr "区域数据" #: src/color.cpp msgid " COLOR MANAGER " @@ -87154,14 +87282,14 @@ msgid "" "INITIATING STANDARD TREMOR TEST..." msgstr "" "\n" -"矿场作业暂停; 控制权紧急转移至\n" +"矿场作业暂停; 控制权转移到紧急任务\n" " 阿米格拉计划下 2:07B\n" "裂痕探测深度已经到达30.09公里\n" -"裂痕伤害已探知；立即拘捕矿区成员\n" -" 违反条例87.08并转移89-C实验室\n" -" 作为测试样本使用\n" +"发现裂痕损坏;立即拘捕矿区成员\n" +" 违反条例87.08并\n" +" 使用研究对象转移89-C实验室\n" "裂痕质量没有受到损坏\n" -"启动标准震动测试……" +"启动标准震动测试..." #: src/computer.cpp msgid "" @@ -87357,7 +87485,7 @@ msgstr "" #, c-format msgid "%d OTHER FOUND..." msgid_plural "%d OTHERS FOUND..." -msgstr[0] "还发现了 %d 个其他的……" +msgstr[0] "%d 还发现了其他..." #: src/computer.cpp msgid "--ACCESS GRANTED--" @@ -87425,7 +87553,7 @@ msgstr "核导弹发射确认。" #: src/computer.cpp msgid "Containment shields opened. Press any key..." -msgstr "安全保护打开。请按任意键……" +msgstr "安全保护打开。按任意键……" #: src/computer.cpp msgid "Continue reading?" @@ -87457,7 +87585,7 @@ msgstr "解除核导弹发射。" #: src/computer.cpp msgid "Doors opened. Press any key..." -msgstr "门打开了。请按任意键……" +msgstr "门打开了。按任意键继续..." #: src/computer.cpp msgid "Download data?" @@ -87571,7 +87699,7 @@ msgstr "错误：记忆体已毁坏。" #: src/computer.cpp msgid "ERROR: Disruptive Spin" -msgstr "错误：旋转不稳定" +msgstr "错误：旋转不稳定." #: src/computer.cpp msgid "ERROR: Memory bank destroyed or not present." @@ -87611,7 +87739,7 @@ msgstr "错误：空的真空抽血管。" #: src/computer.cpp msgid "Elevator activated. Press any key..." -msgstr "电梯已启动。请按任意键……" +msgstr "电梯已启动。请按任意键..." #: src/computer.cpp msgid "Evacuate Immediately" @@ -87623,7 +87751,7 @@ msgstr "立即撤离！" #: src/computer.cpp msgid "FILE CORRUPTED, PRESS ANY KEY..." -msgstr "文件损坏，请按任意键……" +msgstr "文件损坏，按任意键继续..." #: src/computer.cpp msgid "" @@ -87641,12 +87769,12 @@ msgid "" msgstr "" "欢迎您。生物攻击已经发生，进入紧急状态。\n" "急救人员将会尽快帮助您。\n" -"为了确保您的安全，请遵守下列事项：\n" +"为了确保您的安全，请遵守下列事项:\n" "1.不要惊慌。 \n" "2.呆在建筑物内。 \n" "3.在地下室避难。 \n" "4.使用提供的防毒面具。 \n" -"5.等待下一步的指示。 \n" +"5.等待下一步的指示 \n" "\n" " \n" @@ -87691,24 +87819,24 @@ msgstr "已向 %s 发射核弹。" #: src/computer.cpp msgid "Local data-access error logged, alerting helpdesk. Press any key..." -msgstr "本地数据访问错误已记录，请联系技术支持。请按任意键……" +msgstr "本地数据访问错误已记录，请联系技术支持。按任意键继续..." #: src/computer.cpp msgid "Lock disabled. Press any key..." -msgstr "已解锁。请按任意键……" +msgstr "已解锁。请按任意键..." #: src/computer.cpp msgid "Lock enabled. Press any key..." -msgstr "已上锁。请按任意键……" +msgstr "已上锁。请按任意键..." #: src/computer.cpp #, c-format msgid "Logging into %s..." -msgstr "正在登录 %s……" +msgstr "正在登入%s..." #: src/computer.cpp msgid "Login successful. Press any key..." -msgstr "登录成功。请按任意键……" +msgstr "成功登录，请按任意键..." #: src/computer.cpp msgid "Manhacks drop from compartments in the ceiling." @@ -87716,7 +87844,7 @@ msgstr "飞锯从天花板的隔断中掉落下来。" #: src/computer.cpp msgid "Maximum login attempts exceeded. Press any key..." -msgstr "超过登录最大尝试次数。请按任意键……" +msgstr "超过登录最大尝试次数。请按任意键..." #: src/computer.cpp msgid "" @@ -87749,7 +87877,7 @@ msgstr "未发现数据。" #: src/computer.cpp msgid "Nuclear missile disarmed!" -msgstr "核导弹已经解除！" +msgstr "核导弹已经解除." #: src/computer.cpp msgid "Nuclear missile launch aborted." @@ -87766,12 +87894,12 @@ msgstr "核导弹保持激活。" #: src/computer.cpp msgctxt "memorial_female" msgid "Opened a portal." -msgstr "打开传送门。" +msgstr "打开入口." #: src/computer.cpp msgctxt "memorial_male" msgid "Opened a portal." -msgstr "打开传送门。" +msgstr "打开入口." #: src/computer.cpp msgid "PROCESSING DATA" @@ -87791,11 +87919,11 @@ msgstr "请与系统管理员联系。" #: src/computer.cpp msgid "Press any key to continue..." -msgstr "请按任意键……" +msgstr "按任意键继续..." #: src/computer.cpp msgid "Press any key..." -msgstr "请按任意键……" +msgstr "请按任意键..." #: src/computer.cpp msgid "Quit and shut down" @@ -87813,7 +87941,7 @@ msgstr "释放子空间样本。" #: src/computer.cpp msgid "Repeater mod installed..." -msgstr "中继器模组安装完成……" +msgstr "中继器模组安装完成..." #: src/computer.cpp msgid "Result: Human blood, no pathogens found." @@ -87825,7 +87953,7 @@ msgstr "分析结果：人类血液，检测到未知病原体。" #: src/computer.cpp msgid "Result: Unknown blood type. Unknown pathogen found." -msgstr "分析结果：未知生物血液。检测到未知病原体。" +msgstr "分析结果：未知生物血液。检测到未知病原体." #: src/computer.cpp msgid "Result: Unknown blood type. Test nonconclusive." @@ -87861,12 +87989,12 @@ msgstr "安保机器人从地板的隔间中冒了出来。" #: src/computer.cpp src/iexamine.cpp src/iuse.cpp src/map.cpp msgctxt "memorial_female" msgid "Set off an alarm." -msgstr "引发警报。" +msgstr "引发警报." #: src/computer.cpp src/iexamine.cpp src/iuse.cpp src/map.cpp msgctxt "memorial_male" msgid "Set off an alarm." -msgstr "引发警报。" +msgstr "引发警报." #: src/computer.cpp msgid "Sewage leaks!" @@ -87874,11 +88002,11 @@ msgstr "污水泄漏了！" #: src/computer.cpp msgid "Sewage map data downloaded. Press any key..." -msgstr "下水道地图数据已经下载。请按任意键……" +msgstr "下水道地图数据已经下载。请按任意键..." #: src/computer.cpp msgid "Shutting down... press any key." -msgstr "关闭中……请按任意键。" +msgstr "关闭中...请按任意键。" #: src/computer.cpp msgid "Software downloaded." @@ -87886,13 +88014,13 @@ msgstr "软件已下载。" #: src/computer.cpp msgid "Subjects terminated. Press any key..." -msgstr "目标被处决。请按任意键……" +msgstr "目标被处决。按任意键……" #: src/computer.cpp msgid "" "Surface map data downloaded. Local anomalous-access error logged. Press " "any key..." -msgstr "地表地图下载完成。异常读取错误已归档。请按任意键……" +msgstr "地表地图下载完成。异常读取错误已归档。按任意键继续..." #: src/computer.cpp msgid "Target acquisition canceled" @@ -87901,12 +88029,12 @@ msgstr "目标获取已取消" #: src/computer.cpp msgctxt "memorial_female" msgid "Terminated subspace specimens." -msgstr "消灭异空间样本。" +msgstr "终止子空间样本." #: src/computer.cpp msgctxt "memorial_male" msgid "Terminated subspace specimens." -msgstr "消灭异空间样本。" +msgstr "终止子空间样本." #: src/computer.cpp msgid "The console electrocutes you." @@ -87940,15 +88068,15 @@ msgstr "警告：串联共振会有严重危险！继续吗？" msgid "" "Warning: anomalous archive-access activity detected at this node. Press any " "key..." -msgstr "警告：在该节点检测到异常的存取活动。请按任意键……" +msgstr "警告：在该节点检测到异常的存取活动。按任意键继续..." #: src/computer.cpp msgid "You do not have a repeater mod to install..." -msgstr "你没有中继器模组用来安装……" +msgstr "你没有中继器模组用来安装..." #: src/computer.cpp msgid "You mark the refugee center..." -msgstr "您标记了难民中心的位置……" +msgstr "您标记了难民中心..." #: src/computer.cpp msgid "You're protected from electric shocks." @@ -87971,12 +88099,12 @@ msgstr "%1$s 和 %2$s" #: src/construction.cpp #, c-format msgid "%s assists you with the work..." -msgstr "%s 协助了你……" +msgstr "%s协助了你..." #: src/construction.cpp #, c-format msgid "%s watches you work..." -msgstr "%s 看着你干活……" +msgstr "%s看着你干活..." #: src/construction.cpp msgid "After boarding up the window the curtains and curtain rod are left." @@ -88196,7 +88324,7 @@ msgstr "你挖进一片原来就存在的空间，并且临时拼凑了一个梯 #: src/construction.cpp #, c-format msgid "You disassemble the %s." -msgstr "你拆解了 %s。" +msgstr "你拆解了 %s." #: src/construction.cpp msgid "You drill out a passage, heading deeper underground." @@ -88240,7 +88368,7 @@ msgstr "你深深的挖入——一条岩浆河之上。" #: src/construction.cpp msgid "You're not strong enough to pull yourself out..." -msgstr "你还没强壮到能把自己拉出来……" +msgstr "你还没强壮到能把自己拉出来..." #: src/construction.cpp msgid "You're quite sore from all that work, though." @@ -88313,7 +88441,7 @@ msgstr "呃——这%s尝起来不太好…" #. ~ Semantic difference, but greatly facilitates people being proud of their character. #: src/consumption.cpp msgid "It's too fresh, let it age a little first." -msgstr "喔，这玩意太TM新鲜鸟，也许应该正确的酿造它。 " +msgstr "喔...这玩意太TM新鲜鸟，还是放一放别吃了。 " #: src/consumption.cpp msgid "Meh. You've eaten worse." @@ -88322,7 +88450,7 @@ msgstr "嘛，你吃过比这更难吃的……" #: src/consumption.cpp #, c-format msgid "Mmm, this %s tastes delicious..." -msgstr "嗯，%s 真好吃啊……" +msgstr "Mmmm....%s 真好吃啊…" #: src/consumption.cpp msgid "" @@ -88337,7 +88465,7 @@ msgstr "真的要吃%s？你肚子会不好过。" #: src/consumption.cpp msgid "That doesn't look edible in its current form." -msgstr "这看起来目前还不能吃。" +msgstr "这玩意现在看起来不能吃啊." #: src/consumption.cpp msgid "That doesn't look edible." @@ -88367,7 +88495,7 @@ msgstr "要是你还有来世的话也许会遭报应吧。" #: src/consumption.cpp msgid "Ugh, you can't drink that!" -msgstr "呃，你喝不了那个东西！" +msgstr "呃...你不能饮用这个！" #: src/consumption.cpp msgid "We can't eat that. It's not right for us." @@ -88407,7 +88535,7 @@ msgstr "你尽情享用着人肉大餐，仿佛连同他们的灵魂一并吞噬 #: src/consumption.cpp msgid "You feast upon the human flesh." -msgstr "你尽情享用了一顿人肉大餐！" +msgstr "你尽情享用了一顿...人肉大餐！" #: src/consumption.cpp msgid "You feast upon the sweet honey." @@ -88458,7 +88586,7 @@ msgstr "你挑出了还能吃的部分。" #: src/consumption.cpp msgid "" "You still feel nauseous and will probably puke it all up again. Eat anyway?" -msgstr "" +msgstr "你仍然感到恶心，并且可能会吐。还要吃吗？" #: src/consumption.cpp msgid "You will not be able to finish it all. Consume it?" @@ -88479,7 +88607,7 @@ msgid "" "again, and you could eat a whole week's worth of food RIGHT NOW." msgstr "" "你开始为冬眠而囤积卡路里和水分。你有一种你准备好一张床的感觉，以防万一，但" -"是……你又开始饿了，你能够吃下约一个星期的食物，就在现在！" +"是...你又开始饿了，你能够吃下约一个星期的食物，就在现在！" #: src/consumption.cpp msgid "Your stomach begins gurgling and you feel bloated and ill." @@ -88530,17 +88658,17 @@ msgstr " （随身/附近）" #: src/crafting.cpp #, c-format msgid "%s assists with crafting..." -msgstr "%s 协助了你……" +msgstr "%s协助了你..." #: src/crafting.cpp #, c-format msgid "%s could assist you with a batch..." -msgstr "%s 可以协助你造一批……" +msgstr "%s可以协助你造一批..." #: src/crafting.cpp #, c-format msgid "%s watches you craft..." -msgstr "%s 看着你制作……" +msgstr "%s看着你制作..." #: src/crafting.cpp msgid "Craft something first" @@ -88617,7 +88745,7 @@ msgstr "用哪个工具？" #: src/crafting.cpp msgid "You can no longer make that craft!" -msgstr "你无法继续制造那件物品！" +msgstr "想制作那件物品但已经条件不足了." #: src/crafting.cpp msgid "You can't see to craft!" @@ -88666,7 +88794,7 @@ msgstr "你未能将 %1$s 从 %2$s 回收。" #: src/crafting.cpp #, c-format msgid "You fail to recover %s." -msgstr "你无法回收 %s。" +msgstr "你无法修复 %s ." #: src/crafting.cpp msgid "You learned a recipe from disassembling it!" @@ -88690,17 +88818,17 @@ msgstr "你需要 %s 才能拆解 %s。" #, c-format msgid "You need a %s with %d charge to disassemble %s." msgid_plural "You need a %s with %d charges to disassemble %s." -msgstr[0] "你需要 %s 并消耗 %d 电量来拆解 %s。" +msgstr[0] "你需要 %s 并消耗 %d 电量来拆解 %s." #: src/crafting.cpp #, c-format msgid "You need at least %d charge of %s to disassemble it." msgid_plural "You need at least %d charges of %s to disassemble it." -msgstr[0] "你需要至少%d单位的物品来拆解 %s。" +msgstr[0] "你需要至少%d单位的物品来拆解 %s." #: src/crafting.cpp src/iuse.cpp msgid "Your morale is too low to craft..." -msgstr "你的情绪低落无法制作东西……" +msgstr "你的情绪低落无法制作东西..." #: src/crafting_gui.cpp #, c-format @@ -88859,7 +88987,7 @@ msgstr "取消 [b]批量" #: src/crafting_gui.cpp #, c-format msgid "slow %d%%" -msgstr "" +msgstr "减慢 %d%%" #: src/crafting_gui.cpp msgid "too dark" @@ -89076,7 +89204,7 @@ msgstr "三尖树之日" #: src/defense.cpp msgid "Defend a bar against classic zombies. Easy and fun." -msgstr "在一个酒吧中抵抗经典的丧尸。简单又有趣。" +msgstr "在一个酒吧中抵抗经典的僵尸。简单又有趣。" #: src/defense.cpp msgid "Defend your mansion against the triffids." @@ -89708,11 +89836,11 @@ msgstr "陷阱：%s（%d）" #: src/effect.cpp msgid "... oh, there they go." -msgstr "……哦，他们去那里了。" +msgstr "..哦，他们去那里了。" #: src/effect.cpp msgid "...But never at dusk." -msgstr "……但是千万别在黄昏。" +msgstr "...但是千万别在黄昏" #: src/effect.cpp msgid "" @@ -89745,7 +89873,7 @@ msgstr "敏捷 +%d; " #: src/effect.cpp msgid "Eh... maybe not." -msgstr "呃……也许不是。" +msgstr "呃...也许不是。" #: src/effect.cpp msgid "" @@ -89759,7 +89887,7 @@ msgstr "常见：" #: src/effect.cpp msgid "I guess, maybe, without the cheese... yeah." -msgstr "我猜，也许，没有奶酪……耶。" +msgstr "我猜，也许，没有奶酪....耶。" #: src/effect.cpp msgid "I used to do drugs... I still do, but I used to, too." @@ -89807,13 +89935,13 @@ msgstr "哦，有时候在早些的～中午的～晚些的～早些的早上。 msgid "" "Oh, there's some crazy shit, man. There's a dude in the bushes. Has he got " "a gun? I dunno!" -msgstr "喔，还有件破事，伙计。有个人蹲在草丛里。他有枪么？我不知道！" +msgstr "喔...还有件破事，伙计。有个人蹲在草丛里。他有枪么？我不知道！" #: src/effect.cpp msgid "" "Okay, like, the scariest thing in the world would be... if like you went to " "grab something and it wasn't there!" -msgstr "好吧，世界上最恐怖的事情是……你想去抓住什么东西，但是那里根本没有！" +msgstr "好吧，世界上最恐怖的事情是...你想去抓住什么东西，但是那里根本没有！" #: src/effect.cpp #, c-format @@ -89871,7 +89999,7 @@ msgstr "力量 +%d; " #: src/effect.cpp msgid "That rug really tied the room together..." -msgstr "那个地毯和这个房间真搭配……" +msgstr "那个地毯和地板贴在一起了..." #: src/effect.cpp msgid "That weed was the shiz-nittlebam snip-snap-sack." @@ -89885,7 +90013,7 @@ msgstr "草药让你恢复了自我。" msgid "" "The scariest thing in the world would be... if all the air in the world " "turned to WOOD!" -msgstr "世界上最恐怖的事就是……所有的空气都变成木头！" +msgstr "世界上最恐怖的事就是....所有的空气都变成木头！" #: src/effect.cpp msgid "They call them fingers, but I never see them fing." @@ -89901,7 +90029,7 @@ msgstr "孤身独下小厅堂，五十个精灵和我一起，吸，大，麻！ #: src/effect.cpp msgid "You ever see the back of a twenty dollar bill... on weed?" -msgstr "你曾经在20美元钞票的背面看到过……大麻？" +msgstr "你曾经在20美元钞票的背面看到过...。大麻？" #: src/effect.cpp msgid "You have a sudden urge to flip your bible open to Genesis 1:29..." @@ -90050,12 +90178,12 @@ msgstr "水漫过膝。" #: src/event.cpp msgctxt "memorial_female" msgid "Water level reached the ceiling." -msgstr "水位到达上限。" +msgstr "水位到达上限." #: src/event.cpp msgctxt "memorial_male" msgid "Water level reached the ceiling." -msgstr "水位到达上限。" +msgstr "水位到达上限." #: src/event.cpp msgid "Water quickly floods up to your knees." @@ -90107,7 +90235,7 @@ msgstr " 他们名声来自于 " #: src/faction.cpp #, c-format msgid "%1$s have the ultimate goal of %2$s." -msgstr "%1$s 的终极目标是 %2$s。" +msgstr "%1$s的终极目标是%2$s." #: src/faction.cpp #, c-format @@ -90118,7 +90246,7 @@ msgstr "%2$s的%1$s" #: src/faction.cpp src/input.cpp src/item.cpp src/npc.cpp src/options.cpp #: src/player.cpp msgid ", " -msgstr "， " +msgstr "，" #: src/faction.cpp msgid ", and " @@ -91355,7 +91483,7 @@ msgstr "呃，闻着就像是橡胶烧着了。" #: src/field.cpp msgid "I don't know... should you really be smoking that stuff?" -msgstr "我不知道……你真的应该抽那玩意么？" +msgstr "我不知道...你真的应该抽那玩意么？" #: src/field.cpp msgid "Man, that smells like some good shit!" @@ -91462,7 +91590,7 @@ msgstr "啊，闻着一股子霉味。" #: src/field.cpp msgid "Whew... smells like skunk!" -msgstr "哇哦……闻起来像臭鼬！" +msgstr "哇哦...闻起来像臭鼬！" #: src/field.cpp msgid "You burn your legs and feet!" @@ -92012,7 +92140,7 @@ msgstr "%s 被卷入了冲击波！" #: src/game.cpp #, c-format msgid "%s moves out of the way." -msgstr "%s 让开了路。" +msgstr "%s 让开了路." #: src/game.cpp #, c-format @@ -92069,7 +92197,7 @@ msgstr "%s，%d天" #: src/game.cpp #, c-format msgid "%s. Auto-move canceled" -msgstr "%s。自动移动终止" +msgstr "%s.自动移动终止" #: src/game.cpp #, c-format @@ -92305,7 +92433,7 @@ msgstr "改变天气" #: src/game.cpp msgid "Check game state..." -msgstr "检查游戏状态……" +msgstr "检查游戏状态..." #: src/game.cpp msgid "Choose corpse to butcher / item to disassemble" @@ -92322,11 +92450,11 @@ msgstr "选择需要刷新的交通工具" #: src/game.cpp #, c-format msgid "Clearing out the %s would take forever." -msgstr "" +msgstr "清理 %s 将费时直到永远。" #: src/game.cpp msgid "Clearly visible." -msgstr "视野清晰。" +msgstr "清晰可见。" #: src/game.cpp msgid "Click directly on NPC to attack." @@ -92369,7 +92497,7 @@ msgstr "确认：" #: src/game.cpp msgid "Consume it" -msgstr "" +msgstr "使用物品" #: src/game.cpp msgid "Consume item:" @@ -92566,7 +92694,7 @@ msgstr "举例：black,flash,aid,band" #: src/game.cpp msgid "Example: {c:food},{m:iron}" -msgstr "例如：{c:食品}，{m:铁}" +msgstr "例如：{c:食品},{m:铁}" #: src/game.cpp msgid "Exit" @@ -92592,7 +92720,7 @@ msgstr "存储游戏数据失败" #: src/game.cpp #, c-format msgid "Failed to save the maps: %s" -msgstr "存储地图数据失败: %s" +msgstr "存储地图失败：%s" #: src/game.cpp msgid "Fatigue" @@ -92610,7 +92738,7 @@ msgstr "女性" #: src/game.cpp #, c-format msgid "Fill nearby vehicle %s" -msgstr "" +msgstr "倒入附近的车辆 %s" #: src/game.cpp msgid "Filter:" @@ -92647,7 +92775,7 @@ msgstr "高优先级" #: src/game.cpp msgid "Halfway down, the way down becomes blocked off." -msgstr "往下的路中途被挡住了。" +msgstr "往下的路中途被挡住了." #: src/game.cpp msgid "Health" @@ -92711,6 +92839,14 @@ msgstr "移开%s需要花点时间。" msgid "It takes some time to move the heavy %s." msgstr "%s有点沉，移动它需要花些时间。" +#: src/game.cpp +msgid "It takes you a long time to steer that vehicle!" +msgstr "让车辆转向花费了较长一段时间！" + +#: src/game.cpp +msgid "It takes you a very long time to steer that vehicle!" +msgstr "让车辆转向花费了很长一段时间！" + #: src/game.cpp msgid "It's too dangerous to tunnel that far!" msgstr "穿越那么远实在太危险了！" @@ -92849,11 +92985,11 @@ msgstr "发现了怪物！" #: src/game.cpp #, c-format msgid "Moon %s" -msgstr "月相%s" +msgstr "月亮 %s" #: src/game.cpp msgid "More items here..." -msgstr "更多物品……" +msgstr "更多物品..." #: src/game.cpp msgid "Move East" @@ -93013,7 +93149,7 @@ msgstr "我们的纤维随着怒火中烧而绷紧！" #: src/game.cpp msgid "Overmap editor" -msgstr "大地图编辑器" +msgstr "本地地图编辑器" #: src/game.cpp #, c-format @@ -93050,34 +93186,38 @@ msgid "" "Please wait while the world data loads...\n" "Finalizing and verifying..." msgstr "" -"请等待，世界数据载入中...\n" -"校验中..." +"请等待，世界数据载入中。。。\n" +"结束和分类。。。" #: src/game.cpp msgid "" "Please wait while the world data loads...\n" "Loading core JSON..." msgstr "" -"请等待，世界数据载入中...\n" -"加载核心JSON数据..." +"请等待，世界数据载入中。。。\n" +"载入核心JSON。。。" #: src/game.cpp msgid "" "Please wait while the world data loads...\n" "Loading mods..." msgstr "" -"请等待，世界数据载入中...\n" -"加载MOD..." +"请等待，世界数据载入中。。。\n" +"载入MOD。。。" #: src/game.cpp #, c-format msgid "Pour %s where?" msgstr "把 %s 倒在哪里？" +#: src/game.cpp +msgid "Pour into a container" +msgstr "倒入容器" + #: src/game.cpp #, c-format msgid "Pour into an adjacent keg (%s)" -msgstr "" +msgstr "倒入附近的桶（%s）" #: src/game.cpp msgid "Pour on the ground" @@ -93091,7 +93231,7 @@ msgstr "按下%s接受你的命运。。。" #: src/game.cpp #, c-format msgid "Press %s to list items and monsters" -msgstr "" +msgstr "按 %s 键来列出物品和怪物" #: src/game.cpp #, c-format @@ -93324,7 +93464,7 @@ msgstr "标记：%s" #: src/game.cpp #, c-format msgid "Sign: %s..." -msgstr "标记：%s……" +msgstr "标记：%s..." #: src/game.cpp msgid "Smash where?" @@ -93490,7 +93630,7 @@ msgstr "这是相同的容器!" #: src/game.cpp msgid "That's where you took it from!" -msgstr "" +msgstr "这和你拿走它的地方一样！" #: src/game.cpp #, c-format @@ -93541,7 +93681,7 @@ msgstr "%s 撞上了 %s。" #: src/game.cpp #, c-format msgid "The %s collides with something." -msgstr "%s 和什么东西撞上了。" +msgstr "%s 和什么东西撞上了." #: src/game.cpp #, c-format @@ -93577,7 +93717,7 @@ msgstr "%s 击打了你。" #: src/game.cpp #, c-format msgid "The %s hovers momentarily as it surveys the area." -msgstr "%s短暂徘徊，调查了该区域。" +msgstr "%s短暂徘徊，调查了该区域." #: src/game.cpp #, c-format @@ -93602,7 +93742,7 @@ msgstr "%s太重了，无法用手移动。" #: src/game.cpp #, c-format msgid "The %s is too heavy for you to budge." -msgstr "%s 太重你推不开。" +msgstr "%s 太重你推不开." #: src/game.cpp #, c-format @@ -93948,7 +94088,7 @@ msgstr "等待直到天气改变" #: src/game.cpp msgid "Watch the last moments of your life...?" -msgstr "看看死后的时刻……？" +msgstr "回顾一下最后飞升的时刻...？" #: src/game.cpp #, c-format @@ -93980,17 +94120,17 @@ msgstr "对%s做什么？" #: src/game.cpp #, c-format msgid "What to do with the %s from %s?" -msgstr "" +msgstr "对 %s（来自 %s）干什么？" #: src/game.cpp #, c-format msgid "What to do with the %s from the %s?" -msgstr "" +msgstr "对 %s（来自 %s）干什么？" #: src/game.cpp #, c-format msgid "What to do with the %s?" -msgstr "对%s做什么?" +msgstr "对 %s 做什么？" #: src/game.cpp src/player.cpp #, c-format @@ -94089,7 +94229,7 @@ msgstr "你不能阅读计算机屏幕！" #: src/game.cpp msgid "You can not see a computer screen!" -msgstr "你看不见计算机屏幕！" +msgstr "你看不见电脑屏幕在哪!" #: src/game.cpp msgid "You can see through everything!" @@ -94123,7 +94263,7 @@ msgstr "你不能攀爬这里——上面是天花板！" #: src/game.cpp msgid "You can't climb here - you need walls and/or furniture to brace against" -msgstr "你不能爬上这里 - 你需要墙或家具的支撑。" +msgstr "你不能爬上这里 - 你需要墙或家具的支撑." #: src/game.cpp msgid "You can't close things while you're in your shell." @@ -94184,7 +94324,7 @@ msgstr "你缩在龟壳里无法探视四周。" #: src/game.cpp msgid "You can't fire your weapon, it's too heavy..." -msgstr "你无法开火，武器太重了……" +msgstr "你无法开火，武器太重了..." #: src/game.cpp msgid "You can't go down here!" @@ -94213,7 +94353,7 @@ msgstr "你缩在龟壳里无法移动。先把你的小头小脚钻出来先。 #: src/game.cpp msgid "You can't muster up the effort to throw anything..." -msgstr "你无法振作起来投掷任何东西……" +msgstr "你无法振作起来投掷任何东西..." #: src/game.cpp msgid "You can't open things while you're in your shell." @@ -94282,7 +94422,7 @@ msgstr "你无法关上 %s。" #: src/game.cpp msgid "You cannot pull yourself away from the faultline..." -msgstr "你不能离开断层线……" +msgstr "你不能离开断层线..." #: src/game.cpp msgid "You cannot see what is inside of it." @@ -94322,7 +94462,7 @@ msgstr "你用你的藤蔓降落了下来，并留下了你身体的一部分藤 #: src/game.cpp #, c-format msgid "You disassemble your %s." -msgstr "你拆解了 %s。" +msgstr "你拆解了%s." #: src/game.cpp #, c-format @@ -94348,11 +94488,11 @@ msgstr "你手上没有尖锐的物品用来进行屠宰。" #: src/game.cpp msgid "You don't have any items to throw." -msgstr "" +msgstr "你没有可以投掷的物品。" #: src/game.cpp msgid "You don't have sided items worn." -msgstr "" +msgstr "你没有穿着可以穿在一侧的物品。" #: src/game.cpp msgid "You don't have that item." @@ -94364,7 +94504,7 @@ msgstr "你没有所需的工具，无法拆解任何物品。" #: src/game.cpp msgid "You don't know of any factions. Press Spacebar..." -msgstr "你不了解任何派系。按下空格……" +msgstr "你不了解任何派系。按下空格..." #: src/game.cpp msgid "You don't see any items around you!" @@ -94450,11 +94590,11 @@ msgstr "你感到一阵奇痒。" #: src/game.cpp msgid "You feel an evil presence..." -msgstr "你感觉到邪恶的存在……" +msgstr "你感觉一个恶魔降临了..." #: src/game.cpp msgid "You feel an otherworldly attention upon you..." -msgstr "你感受到来自异世界的关注……" +msgstr "你感受到来自异世界的关注..." #: src/game.cpp msgid "You feel hungry." @@ -94474,7 +94614,7 @@ msgstr "你感到口渴。" #: src/game.cpp msgid "You feel unwell." -msgstr "你感觉……不爽。" +msgstr "你感觉....不爽。" #: src/game.cpp msgid "You feel your body decaying." @@ -94484,6 +94624,11 @@ msgstr "你感到你的身体正在腐烂。" msgid "You feel your genetic makeup degrading." msgstr "你感到你的基因退化了。" +#: src/game.cpp +#, c-format +msgid "You fumble with the %s's controls." +msgstr "你笨手笨脚地操作着%s。" + #: src/game.cpp msgid "You get a hold of yourself." msgstr "你控制住了自己。" @@ -94495,7 +94640,7 @@ msgstr "你用你的藤蔓小心翼翼的降了下去。" #: src/game.cpp #, c-format msgid "You grab the %s." -msgstr "你抓住 %s。" +msgstr "你抓住 %s." #: src/game.cpp #, c-format @@ -94518,7 +94663,7 @@ msgstr "你没有激活任务！" #: src/game.cpp msgid "You have nothing to consume." -msgstr "" +msgstr "你没有可以消耗的物品。" #: src/game.cpp msgid "You have nothing to read." @@ -94526,7 +94671,7 @@ msgstr "你没有东西可以读。" #: src/game.cpp msgid "You have nothing to unload." -msgstr "" +msgstr "你没有可以清空的物品。" #: src/game.cpp msgid "You have nothing to wield." @@ -94645,7 +94790,7 @@ msgstr "你需要一条短绳子" #: src/game.cpp #, c-format msgid "You need at least one %s to reload the %s!" -msgstr "你至少需要一个 %s 来重新装填 %s 。" +msgstr "你至少需要一个%s才能重新装填%s!" #: src/game.cpp msgid "" @@ -94765,7 +94910,7 @@ msgstr "你重新获得了对%s的控制。" #: src/game.cpp #, c-format msgid "You release the %s." -msgstr "你放开 %s。" +msgstr "你放开 %s." #: src/game.cpp msgid "You securely web up and work your way down, lowering yourself safely." @@ -94836,7 +94981,7 @@ msgstr "你突然感觉到一阵莫名剧痛。" #: src/game.cpp msgid "You surface." -msgstr "你浮出了水面。" +msgstr "你浮出了水面." #: src/game.cpp #, c-format @@ -94924,7 +95069,7 @@ msgstr "你没有装备任何东西。" #: src/game.cpp msgid "You're too pacified to strike anything..." -msgstr "你太木愣了，无法打击任何物体……" +msgstr "你太木愣了，无法打击任何物体..." #: src/game.cpp #, c-format @@ -95086,7 +95231,7 @@ msgstr "小时" #: src/game.cpp msgctxt "action" msgid "mend" -msgstr "修复" +msgstr "修理（调试标记）" #: src/game.cpp msgid "minute" @@ -95111,7 +95256,7 @@ msgstr "新的默认绑定键为'^'。" #: src/game.cpp msgctxt "action" msgid "part reload" -msgstr "部分装填" +msgstr "部件装填（调试标记）" #: src/game.cpp msgid "player data" @@ -95119,7 +95264,7 @@ msgstr "玩家数据" #: src/game.cpp msgid "player memorial" -msgstr "" +msgstr "玩家纪念" #: src/game.cpp msgid "quit" @@ -95180,7 +95325,7 @@ msgstr "回合" #: src/game.cpp msgid "uistate data" -msgstr "" +msgstr "界面状态数据" #: src/game.cpp msgctxt "action" @@ -95208,7 +95353,7 @@ msgstr "年" #. ~ Sound of moving a remote controlled car #: src/game.cpp msgid "zzz..." -msgstr "嗞……" +msgstr "嗞..." #: src/gamemode.cpp msgid "Defense" @@ -95308,7 +95453,7 @@ msgstr "" #: src/help.cpp msgid ". Field - Empty grassland, occasional wild fruit." -msgstr ". 旷野 - 空旷的草地，偶尔会有野果。" +msgstr "。 旷野 - 空旷的草地，偶尔会有野果。" #: src/help.cpp #, c-format @@ -95322,7 +95467,7 @@ msgid "" msgstr "" "/ 大型武器\n" "; 小型武器或工具\n" -", 微型工具\n" +"， 微型工具\n" "\n" "这类物品通常都是近战武器或者工具，当然有些也有特殊的功能；当你查看物品栏时会" "显示在“工具”一栏，按下<%s>来使用。" @@ -95674,7 +95819,7 @@ msgstr "" "游戏中得到的生化插件通常都可以直接进行安装，但建议你把这项工作留给专业人士来" "做。然而游戏中你不是一直有机会能够遇到专业的人士，所以很多情况下你可以尝试着" "自己进行安装。这项工作需要角色具有高度的智力、急救能力、机械操作能力，最好还" -"有电子设备的知识，因为如果自行安装失败，会导致残废！游戏中要找到这些生化插件" +"有电子设备的知识，因为如果自行安装失败，会导致残废...游戏中要找到这些生化插件" "也是件不容易的事，不过偶尔你也可能从游荡者那里以很高的价格买到。" #: src/help.cpp @@ -95712,7 +95857,7 @@ msgid "" "have survived the original onslaught, but the future looks pretty grim." msgstr "" "《大灾变·劫后余生》是一款以末日为背景的Roguelike风格游戏，不知是幸运还是不" -"幸，你在毁灭世界的恐怖事件中活了下来，但是你还能活多久呢？" +"幸，你在毁灭世界的恐怖事件中活了下来，但是...你还能活多久呢？" #: src/help.cpp msgid "" @@ -95742,8 +95887,8 @@ msgid "" msgstr "" "现在可用的筛选符号:（译者注：中文SLD图形版似乎可以筛选，记得冒号用英文输入" "法）\n" -"\t c = category (books, food, etc) | {c:books}\n" -"\t m = material (cotton, kevlar, etc) | {m:iron}\n" +"\t c = category (books，food，etc) | {c:books}\n" +"\t m = material (cotton，kevlar，etc) | {m:iron}\n" "\t dgt = damage greater than (0-5) | {dgt:2}\n" "\t dlt = damage less than (0-5) | {dlt:1}" @@ -95829,7 +95974,7 @@ msgid "" "cause the effects to cease immediately, but may deepen your dependence." msgstr "" "当你药瘾发作的时候，你会痛苦不堪，虽然再次用药会立刻解除这种痛苦，但下一次的" -"药瘾会发作得更快……" +"药瘾会发作得更快......" #: src/help.cpp msgid "" @@ -95841,7 +95986,7 @@ msgid "" msgstr "" "如果体内积累的辐射量过高的话，你的角色甚至有可能发生突变，绝大多数情况下，突" "变都是恶性的，然而有些突变却能给你的角色带来意料之外的好处。所有的突变都会很" -"大程度上改变你今后的游戏方式，游戏中也能找到一些消除突变的方法，好吧……但愿你" +"大程度上改变你今后的游戏方式，游戏中也能找到一些消除突变的方法，好吧...但愿你" "能找到。" #: src/help.cpp @@ -95852,7 +95997,7 @@ msgid "" "damage. Items made of glass, ceramics, diamond or precious metals will be " "totally immune to acid." msgstr "" -"抵抗酸液伤害的衣服材料的抗性强度分别是：塑料>凯夫拉>皮革>布料。所以尽管皮革和" +"抵抗酸液伤害的衣服材料的抗性强度分别是：塑料>凯夫拉>皮革>布料.所以尽管皮革和" "凯夫拉材料衣物能从活跃的敌人中提供临时的防护，要对抗酸液伤害，高抗性的全套三" "防服和橡胶靴子才是最好的选择。另外，玻璃、陶瓷、钻石和其他贵金属等材料的制品" "能完全免疫酸液伤害。" @@ -95902,7 +96047,7 @@ msgid "" msgstr "" "行走在大灾变后的城市中，请尽可能地收集各种药物，止痛剂是最重要的，香烟等易上" "瘾的物品也请注意收集。当你武装到一定程度之后，请尽快离开城市，因为虽然这里物" -"资较丰富，但同样也有着数之不尽的丧尸群。" +"资较丰富，但同样也有着数之不尽的僵尸群。" #: src/help.cpp msgid "Item types:" @@ -95996,9 +96141,9 @@ msgid "" "below your health. Replenishing energy can be done in a variety of ways, but " "all require the installation of a special bionic just for fuel consumption." msgstr "" -"大部分的生化插件都需要一个稳定的能量源，它会被安装在你的体内（就像钢铁侠），" -"你当前的能量值会显示在HP值的下方，游戏中也有很多方式可以进行充能，但全都需要" -"先安装特殊的生化插件来充能。" +"大部分的生化插件都需要一个稳定的能量源，它会被安装在你的体内（就像钢铁" +"侠...），你当前的能量值会显示在HP值的下方，游戏中也有很多方式可以进行充能，但" +"全都需要先安装特殊的生化插件来充能。" #: src/help.cpp msgid "" @@ -96025,7 +96170,7 @@ msgid "" "- you may overdose and die!" msgstr "" "需要注意的是大多数止疼药的生效需要时间，如果你服用了一些氢可酮但是没有立刻生" -"效，请务必稍等片刻而不是急着再次服用，药物使用过量也是会致命的……" +"效，请务必稍等片刻而不是急着再次服用，药物使用过量也是会致命的..." #: src/help.cpp msgid "O Parking lot - Empty lot, few items. Mostly useless." @@ -96092,7 +96237,7 @@ msgid "" msgstr "" "问：睡觉的时候怎样才能防止被怪物侵袭？\n" "答：首先建议你选个安全的地方睡觉，比如建筑物内远离出入口的地方，在身边设几个" -"陷阱然后再生一堆火，这样基本就OK了。" +"陷阱然后再生一堆火，这样基本就OK了...吧。" #: src/help.cpp msgid "" @@ -96153,9 +96298,8 @@ msgid "" msgstr "" "问：为什么几乎我吃下去的所有东西都会让我生病？\n" "答：你懂的，食物放在那里的时候是会逐渐腐坏的，比如水果、牛奶都是最容易坏掉" -"的。而这腐坏的进程从你进入游戏中的第一天就开始了，所以如果你找不到新鲜的水果" -"和牛奶的话，试试不容易腐坏的罐装食品或者打猎吧。而且，你应该确保烹饪所有食物" -"并净化饮水，不然可能会有寄生虫或其他不安全的因素。" +"的。而这腐坏的进程从你进入游戏中的第一天就开始了，所以...如果你找不到新鲜的水" +"果和牛奶的话，试试不容易腐坏的罐装食品或者打猎吧..." #: src/help.cpp msgid "" @@ -96221,8 +96365,8 @@ msgid "" "confident that it will succeed." msgstr "" "问：为什么想制作些物品那么难呢？\n" -"答：检查一下配方的难度等级，你的技能等级需要在标识的难度等级的1.5倍以上才容易" -"成功。" +"答：检查一下想要制作的物品的难度等级，如果你所掌握的技能等级是其所标识的难度" +"等级的1.5倍，那你就必定能够制作成功。" #: src/help.cpp msgid "" @@ -96416,7 +96560,7 @@ msgid "" msgstr "" "要拆除陷阱，检查（%s）所在的位置。你的成功率取决于陷阱技能和敏捷。如果成功拆" "除，陷阱就会被移除并留下部分或全部它的组成零件；然而，如果你失败，有一定几率" -"你会触发陷阱，并承受相应后果。" +"你会受到陷阱伤害并使陷阱失效。" #: src/help.cpp #, c-format @@ -96522,22 +96666,22 @@ msgstr "" "一点牢骚：CDDA时隔这么久之后再一次加上汉化说明（汉化人员名单）。\n" "长期以来，CDDA大灾变的汉化始终是自愿的，兴趣的，模都精校也一样。但是奈何3DM某" -"些人的\"拿来主义\"，恐怕没有一丝对汉化人员的尊重。\n" -"我们汉化人员不是苦力，必须尊重自己，所以以后的模都精校汉化都会有这个汉化说" -"明，笑。\n" +"些人的“拿来主义”，恐怕没有一丝对汉化人员的尊重。\n" +"我们汉化人员不是苦力，必须尊重自己，所以以后的模都精校汉化都会有这个汉化说明," +"笑。\n" "\n" "相关汉化人员名单（可考）：\n" -"0.6本体： Azrael, qude, Emi. Artoria, tubro.鱼子酱, 姬伯牙, 月光伊伊, yes " -"icant, 轩辕娜娜, 诚实好青年 \n" +"0.6本体： Azrael，qude，Emi。Artoria，tubro.鱼子酱，姬伯牙，月光伊伊，yes " +"icant，轩辕娜娜，诚实好青年 \n" " \n" -"0.7模板： Antee, Jagdparrot, Kuniox, No.82-Lich, Pepper, Yuan Bo, baozite, " -"damondamo, emusilent, ginoside, kel, thzuard, moonwalk, s524797336, sayako, " -"vcd5m, wenxiao, wuxiaoquan wyf, wzj, yangquanheng,zhoujian, 东郭偃, 斯巴达, " -"王光河, 肖思扬, 银枫月 \n" +"0.7模板： Antee，Jagdparrot，Kuniox，No.82-Lich，Pepper，Yuan Bo，baozite，" +"damondamo，emusilent，ginoside，kel，thzuard，moonwalk，s524797336，sayako，" +"vcd5m，wenxiao，wuxiaoquan wyf，wzj，yangquanheng,zhoujian，东郭偃，斯巴达，" +"王光河，肖思扬，银枫月 \n" " \n" -"模都精校：675120997@qq.com, Devil, Jagdparrot, Nightoon, Primer238, Seven " -"Westie, baozite, cellxiecao, emusilent, hiro, nanodesu-u~, qude, tt9891, " -"vipches, wangjie, zhoujian, 继续求财神. \n" +"模都精校：675120997@qq.com，Devil，Jagdparrot，Nightoon，Primer238，Seven " +"Westie，baozite，cellxiecao，emusilent，hiro，nanodesu-u~，qude，tt9891，" +"vipches，wangjie，zhoujian，继续求财神。\n" "以上人员不论多寡皆对此汉化版本的文本翻译作出了贡献。" #: src/help.cpp @@ -96550,10 +96694,10 @@ msgid "" "start; after that, monsters everywhere will be spawned based on the noise " "you make." msgstr "" -"当使用默认的静态刷新选项时，城市里的丧尸会在游戏开始时生成。所有的怪物都用字" +"当使用默认的静态刷新选项时，城市里的僵尸会在游戏开始时生成。所有的怪物都用字" "母表现在你的屏幕上；一个怪物名称的列表，还有他们和你的相对位置，都会显示在屏" -"幕的右端。如果游戏设置为动态刷新模式，你有90分钟来在丧尸开始生成前武装自己；" -"在这之后，丧尸会随着你制造的噪音大小被刷新出来。" +"幕的右端。如果游戏设置为动态刷新模式，你有90分钟来在僵尸开始生成前武装自己；" +"在这之后，僵尸会随着你制造的噪音大小被刷新出来。" #: src/help.cpp msgid "" @@ -96574,7 +96718,7 @@ msgstr "" "某些场景中会有一些门（'+'），你可以按 %s 键来开门或按 %s 键来关门。游戏中有些" "门原本是锁着的，对于锁闭的门、窗或者其他障碍物你可以选择砸毁它们（先按 %s " "键，再选择要砸的方向），不过若真想轻松破坏成功的话，你需要强力的武器，或者强" -"壮的手臂力量。" +"壮的手臂力量..." #: src/help.cpp msgid "" @@ -96809,7 +96953,7 @@ msgstr "$%0.2f" #: src/iexamine.cpp #, c-format msgid "%1$s ripen in %2$s." -msgstr "%1$s 将在 %2$s 成熟。" +msgstr "%1$s 长成了 %2$s." #: src/iexamine.cpp #, c-format @@ -96824,7 +96968,7 @@ msgstr "在瓮里加点 %s？" #: src/iexamine.cpp #, c-format msgid "Add a container to receive the %s" -msgstr "添加一个容器来接收 %s" +msgstr "放一个容器来接%s" #: src/iexamine.cpp msgid "Add a message to the sign with spray paint?" @@ -96981,7 +97125,7 @@ msgstr "侵入电脑。" #: src/iexamine.cpp #, c-format msgid "Harvest current %s (%d)" -msgstr "收获当前的 %s （%d）" +msgstr "距离收获还有%s (%d)" #: src/iexamine.cpp #, c-format @@ -97004,11 +97148,11 @@ msgstr[0] "购买多少单位燃料？ 最大：%d 单位。（按 <0>取消） #: src/iexamine.cpp msgid "If only you had a crowbar..." -msgstr "要是有把撬棍就好了……" +msgstr "要是有把撬棍就好了..." #: src/iexamine.cpp msgid "If only you had a shovel to dig up those roots..." -msgstr "你要是有个铲子就能挖到它的根了……" +msgstr "你要是有个铲子就能挖到它的根了..." #: src/iexamine.cpp msgid "If only you had a shovel..." @@ -97060,11 +97204,11 @@ msgstr "它吐出了各式各样的小块零件。" #, c-format msgid "It will finish brewing in about %d hour." msgid_plural "It will finish brewing in about %d hours." -msgstr[0] "它将在 %d 小时的时间内完成酿造。" +msgstr[0] "还需要%d小时来完成酿造。" #: src/iexamine.cpp msgid "It will finish brewing in less than an hour." -msgstr "它将在不到一个小时的时间内完成酿造。" +msgstr "再有不到一小时,酿制就能完成了。" #: src/iexamine.cpp msgid "JACKPOT! You win $3000!" @@ -97097,7 +97241,7 @@ msgstr "剩余金额：%d" #: src/iexamine.cpp msgid "No container added. The sap will just spill on the ground." -msgstr "缺少容器。树汁将会洒在地上。" +msgstr "下边没放容器。树液只能流到地上浪费掉。" #: src/iexamine.cpp msgid "No win." @@ -97199,7 +97343,7 @@ msgstr "加油" #: src/iexamine.cpp msgid "Refund cash." -msgstr "退还现金。" +msgstr "退还现金." #: src/iexamine.cpp #, c-format @@ -97208,7 +97352,7 @@ msgstr "拆卸 %s？" #: src/iexamine.cpp msgid "Remove container" -msgstr "移除容器" +msgstr "拿走容器" #: src/iexamine.cpp msgid "Remove cover?" @@ -97220,7 +97364,7 @@ msgstr "再次烧制前请把窑炉清空。" #: src/iexamine.cpp msgid "Remove tap" -msgstr "移除插管" +msgstr "拿走树液管" #: src/iexamine.cpp msgid "Rope Fence" @@ -97251,7 +97395,7 @@ msgstr "滑过 %s？" #: src/iexamine.cpp msgid "Something's lying there..." -msgstr "什么东西躺在那儿……" +msgstr "什么东西躺在那儿..." #: src/iexamine.cpp #, c-format @@ -97381,7 +97525,7 @@ msgstr "种子绽放成一种花朵外形的真菌。" #: src/iexamine.cpp msgid "The seed blossoms rather rapidly..." -msgstr "种子的绽放更迅速了……" +msgstr "种子的绽放更迅速了..." #: src/iexamine.cpp msgid "The shrub offers up a fruit, then crumbles into a fungal bed." @@ -97490,7 +97634,7 @@ msgstr "本站储备已用完。对此我们深表歉意。" #: src/iexamine.cpp msgid "This toilet is empty." -msgstr "这个马桶没水了。" +msgstr "这个马桶没水了." #: src/iexamine.cpp msgid "" @@ -97508,11 +97652,11 @@ msgstr "这将自动从您的银行帐户中扣除100分。继续？" #: src/iexamine.cpp msgid "Three bells... you win $50!" -msgstr "三个铃铛……你赢了50元！" +msgstr "三个铃铛...你赢了50元！" #: src/iexamine.cpp msgid "Three cherries... you get your money back!" -msgstr "三个樱桃……你拿回了你的投注！" +msgstr "三个樱桃...你拿回了你的投注！" #: src/iexamine.cpp msgid "Three stars... you win $200!" @@ -97587,7 +97731,7 @@ msgid "" "Welcome to the C.C.B.o.t.T. ATM. What would you like to do?\n" "Your current balance is: $%ld.%02ld" msgstr "" -"欢迎来到C.C.B.o.t.T. ATM存取款机。请问您需要什么？\n" +"欢迎来到C.C.B.o.t.T。ATM存取款机。请问您需要什么？\n" "您目前的账户余额：$%ld.%02ld" #: src/iexamine.cpp @@ -97596,7 +97740,7 @@ msgstr "你想做什么？" #: src/iexamine.cpp msgid "Which container:" -msgstr "选择容器：" +msgstr "放在哪个容器里:" #: src/iexamine.cpp msgid "Wire Fence" @@ -97691,7 +97835,7 @@ msgstr "你喝了一些花蜜。" #: src/iexamine.cpp msgid "You fall asleep..." -msgstr "你陷入沉睡……" +msgstr "你陷入沉睡...." #: src/iexamine.cpp #, c-format @@ -97801,7 +97945,7 @@ msgstr "你需要2根6-英寸绳子" #: src/iexamine.cpp #, c-format msgid "You need a %s to tap this maple tree." -msgstr "你需要 %s 来获取枫树树汁。" +msgstr "你需要一个%s从枫树上收集树液。" #: src/iexamine.cpp msgid "You need a cash card before you can withdraw money!" @@ -97817,7 +97961,7 @@ msgstr "你需要一张现金卡来购买物品！" #: src/iexamine.cpp msgid "You need a hammering tool to remove the spile from the crust." -msgstr "你需要一个工具将插管锤出枫树。" +msgstr "你需要一个能拿来敲击的工具才能从树皮中把树液管拿下来." #: src/iexamine.cpp msgid "You need a lockpick to open this gun safe." @@ -97825,12 +97969,12 @@ msgstr "你需要一个开锁器来打开这个枪保险柜。" #: src/iexamine.cpp msgid "You need a tool to drill the crust to tap this maple tree." -msgstr "你需要一个工具来钻开这棵枫树的树皮。" +msgstr "你需要某种工具来插到树皮下方去才能从枫树中收集树液。" #: src/iexamine.cpp msgid "" "You need a tool to hammer the spile into the crust to tap this maple tree." -msgstr "你需要一个工具将插管锤进枫树里。" +msgstr "你需要用锤子才能把树液管钉到枫树的树皮下方去收集树液。" #: src/iexamine.cpp msgid "You need money in your account before you can withdraw money!" @@ -97848,7 +97992,7 @@ msgstr "转账需要两张现金卡！" #: src/iexamine.cpp msgid "You open the door." -msgstr "你打开了门。" +msgstr "你打开了门." #: src/iexamine.cpp msgid "You overwrite the previous message on the sign with your graffiti" @@ -97877,12 +98021,12 @@ msgstr "你迅速的翻过栅栏。" #: src/iexamine.cpp #, c-format msgid "You remove %s from the vat." -msgstr "你从瓮里移除了 %s。" +msgstr "你从发酵翁里拿走了%s。" #: src/iexamine.cpp #, c-format msgid "You remove the %s." -msgstr "你移除了 %s。" +msgstr "你拿走这个%s." #: src/iexamine.cpp msgid "You remove the plank." @@ -97908,7 +98052,7 @@ msgstr "你爬的时候滑了一下，结果又掉下来了" #: src/iexamine.cpp msgid "You slowly suck up the nectar." -msgstr "你慢慢吮吸花蜜……口活不错……" +msgstr "你慢慢吮吸花蜜...口活不错..." #: src/iexamine.cpp #, c-format @@ -98043,7 +98187,7 @@ msgstr "该按键已经被指派给 %s 命令，取消该指派并继续？" #: src/input.cpp #, c-format msgid "This key is already used for %s." -msgstr "这个按键已经被 %s 使用。" +msgstr "此键已被%s使用." #: src/input.cpp msgid "Unbound keys" @@ -98059,7 +98203,7 @@ msgstr "任意键" #: src/input.cpp msgid "key bindings configuration" -msgstr "按键绑定设置" +msgstr "键位绑定设置" #: src/input.cpp msgid "mouse movement" @@ -98131,7 +98275,7 @@ msgstr "切换 行囊/穿着" #: src/inventory_ui.cpp msgid "There are no items to compare." -msgstr "没有可比较的项目." +msgstr "没有可比较的项目。" #: src/inventory_ui.cpp msgid "To drop x items, type a number and then the item hotkey." @@ -98153,7 +98297,7 @@ msgstr "重量（%s）：" #: src/inventory_ui.cpp #, c-format msgid "You don't have %s-powered tools." -msgstr "" +msgstr "你没有由 %s 供电的物品。" #: src/inventory_ui.cpp #, c-format @@ -98163,7 +98307,7 @@ msgstr "你没有一个%s。" #: src/inventory_ui.cpp #, c-format msgid "You don't have a suitable container for carrying %s." -msgstr "" +msgstr "你没有合适的容器来承载 %s。" #: src/inventory_ui.cpp msgid "You don't have any items to wear." @@ -98175,7 +98319,7 @@ msgstr "你没有可以用的物品。" #: src/inventory_ui.cpp msgid "You don't have the necessary item at hand." -msgstr "" +msgstr "你手上没有所需的物品。" #: src/inventory_ui.cpp msgid "You don't have the necessary item." @@ -98207,7 +98351,7 @@ msgstr " （寒冷）" #: src/item.cpp msgid " (filthy)" -msgstr "" +msgstr " （肮脏）" #: src/item.cpp msgid " (fits)" @@ -98300,7 +98444,7 @@ msgstr "%s 装着 %s（%d 发）" #: src/item.cpp #, c-format msgid "* Faulty %1$s. %2$s" -msgstr "* 故障的 %1$s。%2$s" +msgstr "* %1$s出现故障。 %2$s (不可靠,调试标记11)" #: src/item.cpp msgid "" @@ -98312,7 +98456,7 @@ msgstr "" #: src/item.cpp #, c-format msgid "* Fermenting this will produce %s." -msgstr "* 该物品发酵后将产出 %s。" +msgstr "* 发酵这个将会产生%s." #: src/item.cpp msgid "" @@ -98382,7 +98526,7 @@ msgstr "* 这食物包含人肉成分。" #: src/item.cpp msgid "* This food is tainted and will poison you." -msgstr "* 这食物已经被感染，并且会让你中毒。" +msgstr "* 这食物被被污染,并且会让你中毒。" #: src/item.cpp msgid "" @@ -98428,7 +98572,7 @@ msgstr "" msgid "" "* This gear is fragile and won't protect you for long." -msgstr "* 这件物品相当脆弱，无法长久保护你。" +msgstr "* 这件物品相当脆弱,无法长久保护你。" #: src/item.cpp msgid "* This gear is strapped onto you." @@ -98573,7 +98717,7 @@ msgstr "* 这件衣物有缝上羊毛能够增加保暖度filthy." -msgstr "" +msgstr "*这件衣服十分肮脏。" #: src/item.cpp msgid "* This piece of clothing is fancy." @@ -98703,7 +98847,7 @@ msgstr "累赘：" #: src/item.cpp msgid "Fire modes: " -msgstr "" +msgstr "射击模式： " #: src/item.cpp msgid "Minimum requirements:" @@ -98719,7 +98863,7 @@ msgstr "营养：" #: src/item.cpp msgid "Rigid: " -msgstr "硬质：" +msgstr "硬质的：" #: src/item.cpp msgid "Volume: " @@ -98763,7 +98907,7 @@ msgstr "强化的 " #: src/item.cpp msgid "preserves spoiling, " -msgstr "防止腐坏，" +msgstr "防止腐坏," #: src/item.cpp #, c-format @@ -98845,7 +98989,7 @@ msgstr "腰部。" #: src/item.cpp #, c-format msgid "%2.1fL " -msgstr "%2.1fL " +msgstr "%2.1fL (调试标记13)" #. ~ inches, e.g. 20" wheel #: src/item.cpp @@ -99016,7 +99160,7 @@ msgstr "背着它的时候，一个 %s 复活了。" #, c-format msgid "" "Has level %1$d %2$s quality and is rated at %3$dkg" -msgstr "" +msgstr "具有 %1$d 级 %2$s 特性且承重上限为 %3$dkg" #: src/item.cpp #, c-format @@ -99136,7 +99280,7 @@ msgstr "价格： " #: src/item.cpp msgid "Protection: Bash: " -msgstr "防护：钝击：" +msgstr "钝击防护： " #: src/item.cpp msgid "Quench: " @@ -99334,7 +99478,7 @@ msgstr "该弹药是 手工复装 的型号" #: src/item.cpp msgid "This bionic is installed in the following body part(s):" -msgstr "该生化插件将被安装在以下的身体部位︰" +msgstr "这个仿生插件安装在以下部位:" #: src/item.cpp src/player.cpp #, c-format @@ -99356,7 +99500,7 @@ msgid "" "This food has started to rot. Eating it would be a " "very bad idea." msgstr "" -"这个食物已经开始腐烂，吃这东西是个坏主意。" +"这个食物已经开始腐烂,吃这东西是个坏主意。" #: src/item.cpp msgid "" @@ -99415,7 +99559,7 @@ msgstr[0] "每次射击消耗 %i 单位UPS能量" #: src/item.cpp src/iuse_actor.cpp msgid "Vitamins (RDA): " -msgstr "摄取成分:" +msgstr "维生素（RDA）:" #: src/item.cpp msgid "Warmth: " @@ -99450,6 +99594,11 @@ msgstr "你可以用它制作不同的物品。" msgid "You could use it to craft: %s" msgstr "你可以用它制作： %s" +#: src/item.cpp +#, c-format +msgid "You fall asleep and drop your %s." +msgstr "你睡着了并且丢下了 %s。" + #: src/item.cpp #, c-format msgid "You finish your %s." @@ -99466,12 +99615,12 @@ msgstr "该物品能使用以下招式：" #: src/item.cpp #, c-format msgid "You must unload your %s before installing this mod." -msgstr "" +msgstr "在安装这个组件前，你必须卸下你的%s。" #: src/item.cpp #, c-format msgid "You need a compatible magazine to reload the %s!" -msgstr "你需要一个兼容的弹夹来重新装填 %s 。" +msgstr "你需要一个可以兼容的弹匣才能重新装填 %s!" #: src/item.cpp #, c-format @@ -99566,7 +99715,7 @@ msgstr "热度： " #: src/item.cpp msgid "can be resealed, " -msgstr "能重新封装，" +msgstr "能重新封装," #: src/item.cpp #, c-format @@ -99579,7 +99728,7 @@ msgstr "敏捷" #: src/item.cpp msgid "faulty " -msgstr "已故障" +msgstr "故障（调试标记）" #: src/item.cpp msgid "fridge: " @@ -99591,7 +99740,7 @@ msgstr "智力" #: src/item.cpp msgid "is watertight, " -msgstr "水密，" +msgstr "水密," #: src/item.cpp msgid "last rot: " @@ -99782,23 +99931,23 @@ msgstr "*你的*没电了。" #: src/iuse.cpp msgid "...and a nearby zombie turns friendly!" -msgstr "……一个附近的丧尸变得友好了!" +msgstr "...一个附近的僵尸变得友好了!" #: src/iuse.cpp msgid "...and several nearby zombies turn friendly!" -msgstr "……几个附近的丧尸变得友好了!" +msgstr "...几个附近的僵尸变得友好了!" #: src/iuse.cpp msgid "...and turns friendly!" -msgstr "……而且变得友好了!" +msgstr "...而且变得友好了!" #: src/iuse.cpp msgid "...but nothing happens." -msgstr "……但什么也没发生。" +msgstr "...但什么也没发生." #: src/iuse.cpp msgid "...but the robot refuses to acknowledge you as an ally!" -msgstr "……但机器人拒绝承认你是盟友！" +msgstr "...但机器人拒绝承认你是盟友！" #: src/iuse.cpp msgid "" @@ -99807,9 +99956,9 @@ msgid "" "3: General S.O.S.\n" "0: Cancel" msgstr "" -"1:通知一个势力来求救……\n" -"2:呼叫熟人……\n" -"3:发出 S.O.S. \n" +"1:通知一个势力来求救..。\n" +"2:呼叫熟人..。\n" +"3:发出 S.O.S。\n" "0:取消" #: src/iuse.cpp @@ -99844,7 +99993,7 @@ msgstr " 电击了%s！" #: src/iuse.cpp msgid " squeezes the pheromone ball..." -msgstr "挤压信息素球……" +msgstr "挤压信息素球.." #: src/iuse.cpp msgid " suddenly collapses to the ground!" @@ -100028,11 +100177,11 @@ msgstr "确定要清除卡上的老旧数据吗？" #: src/iuse.cpp msgid "Are you sure you want to drink... this?" -msgstr "你确定真的想要……喝下这个东西吗？" +msgstr "你确定真的想要...喝下这个东西吗？" #: src/iuse.cpp msgid "Are you sure you want to eat this? It looks poisonous..." -msgstr "你确定要吃这个东西吗？这看起来有毒……" +msgstr "你确定要吃这个东西吗？这看起来有毒..." #: src/iuse.cpp msgid "Are you sure? You will not gain any materials back." @@ -100423,7 +100572,7 @@ msgstr "苍蝇围绕你。" #: src/iuse.cpp msgid "Food photos... your stomach rumbles!" -msgstr "食物的照片……你的胃开始蠢蠢欲动！" +msgstr "食物的照片...你的胃开始蠢蠢欲动！" #: src/iuse.cpp msgid "Gachunk!" @@ -100447,7 +100596,7 @@ msgstr "巨型黄蜂出现了！" #: src/iuse.cpp msgid "Ha-ha! An amusing cat photo." -msgstr "哈哈！一张不错的喵星人照片。" +msgstr "哈哈...一张不错的喵星人照片。" #: src/iuse.cpp msgid "Have a nice day!" @@ -100681,7 +100830,7 @@ msgstr "开启了马洛斯族群之门。" #: src/iuse.cpp msgid "Ouch, the cuffs shock you!" -msgstr "啊，手铐电击了你！" +msgstr "啊...手铐电击了你！" #: src/iuse.cpp msgid "Override IFF protocols" @@ -100817,7 +100966,7 @@ msgstr "铃！铃！" #: src/iuse.cpp msgid "RivOS v2.19 shutdown sequence initiated." -msgstr "RivOS v2.19 关机程序启动。" +msgstr "rivos v2.19 关机序列启动" #: src/iuse.cpp msgid "Rivtech Model 13 RivOS v2.19: ONLINE." @@ -100901,7 +101050,7 @@ msgstr "一些非常有趣的旅行照片。" #: src/iuse.cpp msgid "Something strains mightily for a moment...and then..you're...FREE!" -msgstr "有什么东西疯狂的拉扯了一会儿……然后……你……解脱了！" +msgstr "有什么东西疯狂的生长着...然后...你...解脱了！" #: src/iuse.cpp msgid "Spray where?" @@ -100933,7 +101082,7 @@ msgstr "存放哪种箭？" #: src/iuse.cpp msgid "Strange... there's nothing in the picture?" -msgstr "奇怪……照片里没有任何东西？" +msgstr "奇怪...照片里没有任何东西！" #: src/iuse.cpp msgctxt "memorial_female" @@ -101004,10 +101153,6 @@ msgstr "%s 太湿了无法再吸收更多液体。" msgid "That isn't a firearm!" msgstr "那货不是枪械！" -#: src/iuse.cpp -msgid "That item already has a rechargeable battery pack." -msgstr "这个物品已经安装了可充电池组。" - #: src/iuse.cpp msgid "That item has already had its battery capacity doubled." msgstr "那个物品已经倍增了自己的电池容量。" @@ -101152,7 +101297,7 @@ msgstr "%s 闪了几下熄灭了。" #: src/iuse.cpp #, c-format msgid "The %s's monitor slowly outputs the data..." -msgstr "%s 的监视器缓慢的输出了数据……" +msgstr "%s 的监视器缓慢的输出了数据..." #: src/iuse.cpp msgid "The Louisville Slaughterer burns out." @@ -101279,7 +101424,7 @@ msgstr "药物对痉挛无效。" #: src/iuse.cpp msgid "The mp3 player turns off." -msgstr "mp3播放器关掉了。" +msgstr "mp3播放器关掉了." #: src/iuse.cpp msgid "The mp3 player's batteries are dead." @@ -101289,11 +101434,11 @@ msgstr "mp3播放器没电了。" msgid "" "The multi-cooker argues with you about the taste preferences. You don't " "want to deal with it." -msgstr "多功能厨师机和你争辩饭菜的口味表现。你根本不想鸟它。" +msgstr "多功能厨师机和你争辩饭菜的口味表现。你根本不想理它。" #: src/iuse.cpp msgid "The multi-cooker boiled your head!" -msgstr "多功能厨师机水煮了你的脑袋！" +msgstr "多功能厨师机煮了你的脑袋！" #: src/iuse.cpp #, c-format @@ -101306,7 +101451,7 @@ msgstr "多功能厨师机逃跑了！" #: src/iuse.cpp msgid "The multi-cooker should be finishing shortly..." -msgstr "多功能厨师机很快就要完工了……" +msgstr "多功能厨师机很快就要完工了..." #: src/iuse.cpp msgid "The muscle spasms start to go away." @@ -101415,7 +101560,7 @@ msgstr "那里没有汽车。" #: src/iuse.cpp msgid "There's nothing particularly interesting there." -msgstr "这里实在没啥有意思的东东……" +msgstr "这里实在没啥有意思的东东..." #: src/iuse.cpp msgid "There's nothing to mop there." @@ -101452,7 +101597,7 @@ msgstr "这个%s可能曾经是对谁有重要意义的东西。" #: src/iuse.cpp msgid "This apple tastes really weird! You're not sure it's good for you..." -msgstr "这个果实尝起来怪怪的！你不确定它是不是有问题……" +msgstr "这个果实尝起来怪怪的！你不确定它是不是有问题..." #: src/iuse.cpp msgid "This berry is delicious, and very filling!" @@ -101578,7 +101723,7 @@ msgstr "开灯" #: src/iuse.cpp msgid "Ugh, too much nicotine... you feel nasty." -msgstr "擦，尼古丁太多了……你感到有点作呕。" +msgstr "擦，尼古丁太多了...你感到有点作呕。" #: src/iuse.cpp msgid "Ugh, too much smoke... you feel nasty." @@ -101586,7 +101731,7 @@ msgstr "我擦，呛死我了。" #: src/iuse.cpp msgid "Umm. No." -msgstr "呃。不。" +msgstr "呃呃...不。" #: src/iuse.cpp msgid "Upgrade multi-cooker" @@ -101801,7 +101946,7 @@ msgstr "你试图电击 %s，但被他闪避了。" #: src/iuse.cpp msgid "You blow your dog whistle." -msgstr "你吹了一下狗哨。" +msgstr "你吹了一下狗哨." #: src/iuse.cpp msgid "You break the glass." @@ -101822,7 +101967,7 @@ msgstr "你埋下了地雷。" #: src/iuse.cpp msgid "You can only purify water." -msgstr "你只能净化水。" +msgstr "你只能净化水." #: src/iuse.cpp msgid "You can only tailor your clothes!" @@ -101927,7 +102072,7 @@ msgstr "无法在此处使用%s。" #: src/iuse.cpp msgid "You cast your line and wait to hook something..." -msgstr "你把鱼线扔出，等待有什么东东上钩……" +msgstr "你把鱼线扔出，等待有什么东东上钩..." #: src/iuse.cpp #, c-format @@ -101954,7 +102099,7 @@ msgstr "你进一步破坏了%s！你毁了它！" #: src/iuse.cpp msgid "You decide not to flash yourself." -msgstr "你决定还是不要闪瞎自己眼睛了。" +msgstr "你决定还是不要自拍了。" #: src/iuse.cpp src/iuse_actor.cpp msgid "You destroy it!" @@ -101992,7 +102137,7 @@ msgstr "你没有足够的电池净化所有的水。" #: src/iuse.cpp msgid "You don't have guns with long barrels." -msgstr "" +msgstr "你没有长枪管的枪。" #: src/iuse.cpp msgid "You don't have water to purify." @@ -102069,14 +102214,14 @@ msgid "" "as you convulse, vomiting, and black out..." msgstr "" "你感到了熟悉的温暖，但那突然就激增成了难以忍受的灼烧感，你抽筋，呕吐，眼前一" -"黑……" +"黑..." #: src/iuse.cpp msgid "" "You feel a familiar warmth, but suddenly it surges into painful burning as " "you convulse and collapse to the ground..." msgstr "" -"你感到了熟悉的温暖，但那突然就激增成了痛楚的灼烧感，使你抽搐着倒在了地上……" +"你感到了熟悉的温暖，但那突然就激增成了痛楚的灼烧感，使你抽搐着倒在了地上..." #: src/iuse.cpp msgid "You feel a slight itching inside, but it passes." @@ -102128,7 +102273,7 @@ msgstr "你觉得很烦。" #: src/iuse.cpp msgid "You feel very sleepy..." -msgstr "你感到非常困倦……" +msgstr "你感到非常困倦..." #: src/iuse.cpp #, c-format @@ -102397,7 +102542,7 @@ msgstr "你撬开货箱。" #: src/iuse.cpp msgid "You pry open the door." -msgstr "你撬开了门。" +msgstr "你撬开了门." #: src/iuse.cpp msgid "You pry open the window." @@ -102445,7 +102590,7 @@ msgstr "你按下开关，但什么都没有发生。" #: src/iuse.cpp msgid "You put in the earbuds and start listening to music." -msgstr "你带上了耳塞开始听音乐。" +msgstr "你带上了耳塞开始听音乐." #: src/iuse.cpp #, c-format @@ -102458,7 +102603,7 @@ msgstr "你熟练的破解了安全系统！" #: src/iuse.cpp msgid "You quiver with anticipation..." -msgstr "你颤抖着期待……" +msgstr "你颤抖着期待......" #: src/iuse.cpp #, c-format @@ -102506,17 +102651,10 @@ msgstr "你完全修补好了你的 %s!" msgid "You repair your %s!" msgstr "你修补了%s!" -#: src/iuse.cpp -#, c-format -msgid "" -"You replace the battery compartment of your %s with a rechargeable battery " -"pack!" -msgstr "你用可充电池组替换了 %s 的电池组供能。" - #: src/iuse.cpp #, c-format msgid "You replace your current %s." -msgstr "你替换当前的%s。" +msgstr "你替换当前的%s." #: src/iuse.cpp msgid "" @@ -102532,12 +102670,12 @@ msgstr "你锯短了%s的枪管。" #: src/iuse.cpp msgid "" "You scarf down the delicious brownie. It tastes a little funny though..." -msgstr "你咽下了这美味的棕色液体。不过尝起来有点奇怪……" +msgstr "你咽下了这美味的棕色液体。不过尝起来有点奇怪..." #: src/iuse.cpp #, c-format msgid "You scatter the caltrops on the %s." -msgstr "你将铁蒺藜撒在 %s 上。" +msgstr "你将铁蒺藜撒在 %s 上." #: src/iuse.cpp msgid "You scream in agony!!" @@ -102587,7 +102725,7 @@ msgstr "你设置了圈套陷阱。" #: src/iuse.cpp #, c-format msgid "You set the timer to %d." -msgstr "你将计时器设定在 %d。" +msgstr "你将计时器设定在 %d." #: src/iuse.cpp #, c-format @@ -102618,7 +102756,7 @@ msgstr "你的 %s 溅了一地。" #: src/iuse.cpp msgid "You squeeze the pheromone ball..." -msgstr "你挤压信息素球……" +msgstr "你挤压信息素球.." #: src/iuse.cpp msgid "You stagger with a piercing headache!" @@ -102821,7 +102959,7 @@ msgstr "你使用了抗真菌剂。" #: src/iuse.cpp msgid "You used to have a dog like this..." -msgstr "你以前也有一条长成这样的狗狗……它叫旺财。" +msgstr "你以前也有一条长成这样的狗狗...它叫旺财。" #: src/iuse.cpp src/monattack.cpp msgid "" @@ -103119,7 +103257,7 @@ msgstr "但是，唉！你太吝啬。" #. ~Sound of a radio controlled car moving around #: src/iuse.cpp msgid "buzzz..." -msgstr "嘟嘟……" +msgstr "嘟嘟..." #: src/iuse.cpp msgid "chainsaw" @@ -103292,7 +103430,7 @@ msgstr[0] "可以使用并储存至多 %i 发" #: src/iuse_actor.cpp #, c-format msgid "Can be used to assemble: %s" -msgstr "可用于组装：%s" +msgstr "可以被用来组装: %s" #: src/iuse_actor.cpp #, c-format @@ -103341,11 +103479,11 @@ msgstr "雕刻哪一个？" #: src/iuse_actor.cpp #, c-format msgid "Insufficient %s to assemble %s" -msgstr "%s 的数目不足以组装 %s" +msgstr "%s不足以组装成%s (调试标记15)" #: src/iuse_actor.cpp msgid "It hurts like hell!" -msgstr "这太TM疼了！哥差点哭了……" +msgstr "这太TM疼了！哥差点哭了..." #: src/iuse_actor.cpp msgid "It itches a little." @@ -103400,12 +103538,12 @@ msgstr "选择将丧尸改造成丧奴？" #: src/iuse_actor.cpp msgid "Store ammo" -msgstr "存储弹药" +msgstr "装弹" #: src/iuse_actor.cpp #, c-format msgid "Store ammo in %s" -msgstr "存储弹药进 %s" +msgstr "装弹进 %s" #: src/iuse_actor.cpp #, c-format @@ -103435,7 +103573,7 @@ msgstr "那个需要枪械修理包。" #: src/iuse_actor.cpp #, c-format msgid "The %s emits an IFF beep as it scans you." -msgstr "%s 炮塔发出识别声，它扫描到你了。" +msgstr "%s炮塔发出识别声，它扫描到你了." #: src/iuse_actor.cpp #, c-format @@ -103481,7 +103619,7 @@ msgstr "你想打开门锁，结果门锁赢了。" msgid "" "The prospect of cutting up the copse and letting it rise again as a slave is " "too much for you to deal with right now." -msgstr "给尸体做手术让它复苏后成为你的奴隶现在对你来说太难了。" +msgstr "给尸体做手术让它复苏后成为你的奴隶对你来说太难了...谁让你读书少呢？" #: src/iuse_actor.cpp msgid "The wound is cleaned." @@ -103556,7 +103694,7 @@ msgstr "在哪儿使用开锁工具？" #: src/iuse_actor.cpp msgid "Well, it's more constructive than just chopping 'em into gooey meat..." -msgstr "嗯，这比把它们切成碎块有意思多了……" +msgstr "嗯...这比把它们切成碎块有意思多了..." #: src/iuse_actor.cpp msgid "With a satisfying click, the chain-link gate opens." @@ -103671,7 +103809,7 @@ msgstr "你停止使用 %s。" #: src/iuse_actor.cpp #, c-format msgid "You have no items that could be repaired with a %s." -msgstr "" +msgstr "你没有可以用 %s 来修理的物品。" #: src/iuse_actor.cpp #, c-format @@ -103702,7 +103840,7 @@ msgstr "你需要 %s 才能做这个!" #: src/iuse_actor.cpp msgid "You need a syringe to inject this drug" -msgstr "" +msgstr "你需要一根针管来注射这种药物" #: src/iuse_actor.cpp msgid "" @@ -103732,7 +103870,7 @@ msgstr "你需要穿着/握着 %s 来演奏它。" #: src/iuse_actor.cpp #, c-format msgid "You need to unwield your %s before using it." -msgstr "在使用%s前请先解除握持状态。" +msgstr "在使用%s前请先松开它。" #: src/iuse_actor.cpp msgid "You pick your nose and your sinuses swing open." @@ -103773,7 +103911,7 @@ msgstr "你将 %1$s 装进你的 %2$s " #: src/iuse_actor.cpp msgid "You successfully light a fire." -msgstr "你成功地生了火。" +msgstr "你成功地生了火." #: src/iuse_actor.cpp #, c-format @@ -103880,7 +104018,7 @@ msgstr "\"要是没了雨我还怎么能洗好我那该死的脖子？\"农夫AI #: src/iuse_software_kitten.cpp msgid "\"I pity the fool who mistakes me for kitten!\", sez Mr. T." -msgstr "\"我可怜那个把我误认为小猫的傻瓜！\"，T先生说。" +msgstr "\"我可怜那个把我误认为小猫的傻瓜！\"，sez Mr.T." #: src/iuse_software_kitten.cpp msgid "\"Lend us a fiver 'til Thursday\", pleas Andy Capp." @@ -103910,7 +104048,7 @@ msgstr "）。" #: src/iuse_software_kitten.cpp msgid "...thingy???" -msgstr "……一个物质？？？" +msgstr "...一个物质？？？" #: src/iuse_software_kitten.cpp msgid "A \"Get Out of Jail Free\" card." @@ -103944,7 +104082,7 @@ msgstr "一盒会跳舞的自动铅笔。它们正在载歌载舞！" #: src/iuse_software_kitten.cpp msgid "A box of fumigation pellets." -msgstr "一个装有已熏蒸杀菌的出口用木质托盘的箱子。" +msgstr "一盒熏蒸丸。" #: src/iuse_software_kitten.cpp msgid "A brain cell. Oddly enough, it seems to be functioning." @@ -103956,7 +104094,7 @@ msgstr "一听低热量午餐肉罐头" #: src/iuse_software_kitten.cpp msgid "A coat hanger hovers in thin air. Odd." -msgstr "衣架孤零零地漂浮在半空中。好诡异！" +msgstr "衣架孤独的悬挂在空气中。诡异啊。" #: src/iuse_software_kitten.cpp msgid "A copy of the Weekly World News. Watch out for the chambered nautilus!" @@ -103968,7 +104106,7 @@ msgstr "一个电子时钟。停止在 2:17 PM。" #: src/iuse_software_kitten.cpp msgid "A flamboyant feather boa. Now you can dress up like Carol Channing!" -msgstr "一根艳丽的羽毛。现在你可以打扮的像Carol Channing一样了！" +msgstr "一根艳丽的羽毛.现在你可以打扮的像Carol Channing一样了！" #: src/iuse_software_kitten.cpp msgid "A forgotten telephone switchboard operator." @@ -104182,7 +104320,7 @@ msgstr "Carlos Tarango站在这里，作着他最拿手的Pat Smear模仿秀。" #: src/iuse_software_kitten.cpp msgid "Could it be... a big ugly bowling trophy?" -msgstr "这难道是……一个又大又丑的保龄球奖杯？" +msgstr "这难道是......一个又大又丑的保龄球奖杯？" #: src/iuse_software_kitten.cpp msgid "Daily hunger conditioner from Australasia" @@ -104284,7 +104422,7 @@ msgstr "这是黑洞，不要掉下去！" #: src/iuse_software_kitten.cpp msgid "It's a burrito stand flyer. \"Taqueria El Ranchito\"." -msgstr "这是一张玉米煎饼站传单。\"Taqueria El Ranchito\"。" +msgstr "这是一张玉米煎饼站传单。\"Taqueria El Ranchito\"." #: src/iuse_software_kitten.cpp msgid "It's a charcoal briquette, smoking away." @@ -104368,7 +104506,7 @@ msgstr "这是一本老旧的艾灵顿公爵传纪。" #: src/iuse_software_kitten.cpp msgid "It's an ordinary bust of Beethoven... but why is it painted green?" -msgstr "一个普通的半身像贝多芬……但为什么他被漆成了绿色？" +msgstr "一个普通的半身像贝多芬......但为什么他被漆成了绿色？" #: src/iuse_software_kitten.cpp msgid "" @@ -104490,7 +104628,7 @@ msgstr "未曾但现已栽植的植物。" #: src/iuse_software_kitten.cpp msgid "Not kitten, just a packet of Kool-Aid(tm)." -msgstr "这不是猫咪，只是一包Kool-Aid™。（烂大街的廉价饮料粉）" +msgstr "这不是猫咪，只是一包Kool-Aid饮料。" #: src/iuse_software_kitten.cpp msgid "ONE HUNDRED THOUSAND CARPET FIBERS!!!!!" @@ -104526,7 +104664,7 @@ msgstr "空空如也。" #: src/iuse_software_kitten.cpp msgid "Press any key to start." -msgstr "按任意键开始。" +msgstr "按任意开始." #: src/iuse_software_kitten.cpp msgid "Pumpkin pie spice." @@ -105294,17 +105432,12 @@ msgstr "你成功解除了陷阱！" #: src/map.cpp msgid "You fail to disarm the trap, and you set it off!" -msgstr "你拆解陷阱失败，而且你把它触发了！" +msgstr "你拆解陷阱失败，但是你将它关闭了！" #: src/map.cpp msgid "You fail to disarm the trap." msgstr "你拆解陷阱失败。" -#: src/map.cpp -#, c-format -msgid "You fumble with the %s's controls." -msgstr "你笨手笨脚地操作着%s。" - #: src/map.cpp #, c-format msgid "You lose control of the %s." @@ -105337,7 +105470,7 @@ msgstr "你的 %s 搁浅了。" #: src/map.cpp #, c-format msgid "Your %s sank." -msgstr "你的 %s 沉下去了。" +msgstr "你的 %s 沉下去了." #: src/map.cpp msgid "an alarm go off!" @@ -105363,7 +105496,7 @@ msgstr "%s" #: src/mapbuffer.cpp #, c-format msgid "Please wait as the map saves [%d/%d]" -msgstr "地图保存中，请稍等[%d/%d]" +msgstr "地图保存中...请稍等..。[%d/%d]" #: src/mapgen.cpp msgid "Access Melchior" @@ -105503,7 +105636,7 @@ msgstr "演算数据分析仪 MK IV" #: src/mapgen.cpp msgid "Mr. Stem Cell" -msgstr "干细胞先生" +msgstr "Mr.干细胞" #: src/mapgen.cpp msgid "NEPowerOS" @@ -106216,7 +106349,7 @@ msgstr "你猛戳%s" #: src/melee.cpp #, c-format msgid "You have learnt %s from extensive practice with the CQB Bionic." -msgstr "借助于CQB生化插件的大量练习，你学会了 %s。" +msgstr "借助于CQB生化插件的大量练习，你学会了 %s." #: src/melee.cpp #, c-format @@ -106338,7 +106471,7 @@ msgstr "你用你的触手扑打 %s" #: src/melee.cpp #, c-format msgid "You run %s through" -msgstr "你跑过 %s" +msgstr "你贯穿%s" #: src/melee.cpp #, c-format @@ -106401,7 +106534,7 @@ msgstr "你用尾巴蛰刺 %s" #: src/melee.cpp msgid "You swing at the air." -msgstr "你打中了……一团空气！" +msgstr "你打中了...一团空气!" #: src/melee.cpp msgid "You swing wildly and miss." @@ -106511,7 +106644,7 @@ msgid "" "kill whatever it was. Can you lend a hand?" msgstr "" "前些时候我和另一个朋友都躲在远离城镇的树林里，晚上再出来觅食。这样做帮我们躲" -"过了普通丧尸的注意。但是有一天晚上有个怪物在路上截住了我们，追着我们跑了十多" +"过了普通僵尸的注意。但是有一天晚上有个怪物在路上截住了我们，追着我们跑了十多" "分钟，最后我们决定分头逃跑并在这里汇合。但是我的朋友却没能回来，我没办法杀掉" "那个怪物。你能帮忙吗？" @@ -106593,8 +106726,8 @@ msgid "" "of much use but I've got to hope in something." msgstr "" "随着整个世界似乎都在颠覆我们以往对现实的认识，那些曾经被我们抛弃的迷信所内含" -"的道理现在看来也变得让人可信。请帮我找到这样一个宗教遗迹……我虽然怀疑它能有多" -"大用处，但我必须将希望寄托在某事上。" +"的道理现在看来也变得让人可信。请帮我找到这样一个宗教遗迹......我虽然怀疑它能" +"有多大用处，但我必须将希望寄托在某事上。" #: src/mission.cpp msgid "Aspirin is pretty common in homes and convenience stores." @@ -106743,8 +106876,8 @@ msgstr "" "营养不良造成大家的免疫力都很差，一有传染病就会疯狂传播起来，可我却无计可施。" "食物太匮乏了，只要不被饿死，人们什么都吃的下去，谁还管健康不健康呢。如果我再" "不为哨站的膳食补充维生素，就会有越来越多营养不良间接造成的死亡。我知道要求的" -"可能有点过分，但如果有200单位的维他命，我就能在疾病蔓延之前给那些体质最差的人" -"平衡一下营养。" +"可能有点过分，但如果有200单位的复方维生素片，我就能在疾病蔓延之前给那些体质最" +"差的人平衡一下营养。" #: src/mission.cpp msgid "Do you have any better ideas?" @@ -106876,7 +107009,7 @@ msgstr "弄到双向无线电了吗？" #: src/mission.cpp msgid "Do you have the vitamins?" -msgstr "弄到维生素了吗？" +msgstr "弄到维他命了吗？" #: src/mission.cpp msgid "Do you have the wearable flashlights?" @@ -106884,7 +107017,7 @@ msgstr "弄到佩戴式手电了吗？" #: src/mission.cpp msgid "Do you have the welders?" -msgstr "弄到电焊枪了吗？" +msgstr "弄到焊枪了吗？" #: src/mission.cpp msgid "Do you have the yeast?" @@ -106937,8 +107070,8 @@ msgid "" "Excellent. Take this vacutainer; once you've produced a zombie corpse, use " "it to extract blood from the body, then take it to a hospital for analysis." msgstr "" -"干得好。用这个采血管，一旦你得到了丧尸尸体，用它来提从那东西的身体取血液，然" -"后把它带到医院进行分析。" +"干得好。用这个采血管，一旦你得到了僵尸的尸体，用它来提从那东西的身体取血液，" +"然后把它带到医院进行分析。" #: src/mission.cpp msgid "Factories or junk yards are the only places I know where to look." @@ -107011,7 +107144,7 @@ msgstr "干的不错，老二。我们现在是在做生意。" #: src/mission.cpp msgid "Great work, wasn't sure what I was sending you after." -msgstr "做得好 ! 我不确定怎样的东西才能报答你。" +msgstr "做得好 ! 我不确定怎样的东西才能报答你 ." #: src/mission.cpp msgid "" @@ -107041,8 +107174,8 @@ msgid "" "Great, let's see... uh... hmmm... Fine, I didn't even do my own taxes but " "I'm sure this will prove their guilt if we get an expert to examine it." msgstr "" -"很好，我们来看看……嗯……额……好吧，其实我自己也没填过税表，但我肯定如果我们能找" -"个专家来看的话，这表格能证明他们有罪。" +"很好，我们来看看...嗯......额.......好吧，其实我自己也没填过税表，但我肯定如" +"果我们能找个专家来看的话，这表格能证明他们有罪。" #: src/mission.cpp msgid "" @@ -107133,8 +107266,8 @@ msgid "" "most of us survivors won't make it unless someone decides to take the " "initiative." msgstr "" -"嗨，我知道我也不想自愿做这事儿……但我随即想到我们绝大多数人都不可能活下来，除" -"非我们中有人能站出来。" +"嗨，我知道我也不想自愿做这事儿......但我随即想到我们绝大多数人都不可能活下" +"来，除非我们中有人能站出来。" #: src/mission.cpp msgid "" @@ -107230,8 +107363,8 @@ msgid "" "all of them could have fallen." msgstr "" "我对你帮我带来这些病人记录真是感激不尽，但是我真的还有另一个请求。你看起来对" -"外面的环境颇为熟悉……能否请你带我去其中一个联邦应急营地？我知道有些营地已被摧" -"毁，但我还是无法相信他们全都沦陷了。" +"外面的环境颇为熟悉......能否请你带我去其中一个联邦应急营地？我知道有些营地已" +"被摧毁，但我还是无法相信他们全都沦陷了。" #: src/mission.cpp msgid "" @@ -107255,7 +107388,7 @@ msgstr "" msgid "" "I don't know why you would bother wasting your time down here if you can't " "handle a few small tasks..." -msgstr "我不知道你为什么在这种地方浪费时间，不过如果你可以帮点小忙的话……" +msgstr "我不知道你为什么在这种地方浪费时间，不过如果你可以帮点小忙的话..." #: src/mission.cpp msgid "" @@ -107272,7 +107405,7 @@ msgstr "" #: src/mission.cpp msgid "I don't think so..." -msgstr "我并不这么认为……" +msgstr "我并不这么认为..." #: src/mission.cpp msgid "I don't think that was quite a hundred dead zeds." @@ -107349,7 +107482,7 @@ msgstr "" "如果你愿意的话我还有另一个任务给你，牧师曾特别提到了一个囚犯，我想你能不能去" "调查下他发生了什么，或者他有没有在他的囚室留下什么东西。牧师承认，说的轻一" "点，那个人相当不稳定，但牧师个人认为那个人有某种忏悔的迹象。我现在还不能对该" -"囚犯发表任何看法……但看起来他之前关于星智慧教堂的预言都非常准确。" +"囚犯发表任何看法.....。但看起来他之前关于星智慧教堂的预言都非常准确。" #: src/mission.cpp msgid "" @@ -107364,15 +107497,15 @@ msgstr "" #: src/mission.cpp msgid "I hope I don't see many names I know..." -msgstr "希望不要看到太多我认识的名字……" +msgstr "我希望我没有看到很多名字，我知道..." #: src/mission.cpp msgid "" "I hope the bastard is packing heat... else we'll need to grab him a gun " "before we hit our next target." msgstr "" -"我希望那混蛋有自带武器……否则的话，在我们开始我们的下个目标之前我们还得给他找" -"把枪。" +"我希望那混蛋有自带武器......否则的话，在我们开始我们的下个目标之前我们还得给" +"他找把枪。" #: src/mission.cpp msgid "" @@ -107440,8 +107573,8 @@ msgid "" "sure what they would have decided to do with the inmates when they knew " "death was almost certain. " msgstr "" -"祝你好运，无论神请你指导你的路径……我可以想象到监狱将是一小片地狱。我不确定当" -"他们知道他们会死亡时他们成为囚犯。 " +"祝你好运，无论神请你指导你的路径..。我可以想象到监狱将是一小片地狱。我不确定" +"当他们知道他们会死亡时他们成为囚犯。 " #: src/mission.cpp msgid "" @@ -107451,9 +107584,9 @@ msgid "" "before and after the outbreak. The name of the cult is believed to be the " "Church of Starry Wisdom but it is noted that accounts differ." msgstr "" -"我祝你好运，愿你心中的神指引你的道路……你此行之艰辛将远超以往，只有更加坚定的" -"信仰才能给你继续前行的勇气。这有一个关于危机爆发前后几天时间内可能的人类献祭" -"的记录。据信该邪教的名字是星慧教堂，但也有人指出名字可能不同。" +"我祝你好运，愿你心中的神指引你的道路......你此行之艰辛将远超以往，只有更加坚" +"定的信仰才能给你继续前行的勇气。这有一个关于危机爆发前后几天时间内可能的人类" +"献祭的记录。据信该邪教的名字是星慧教堂，但也有人指出名字可能不同。" #: src/mission.cpp msgid "I wonder if a retreat might exist..." @@ -107517,7 +107650,7 @@ msgstr "我就指望你了。" msgid "" "I'm glad you came back alive... I wasn't sure if I had sent you to your " "death." -msgstr "我很高兴你能活着回来……我之前还担心是不是让你去送死呢。" +msgstr "我很高兴你能活着回来......我之前还担心是不是让你去送死呢。" #: src/mission.cpp msgid "I'm impressed with your abilities." @@ -107525,7 +107658,7 @@ msgstr "你的能力让我印象深刻。" #: src/mission.cpp msgid "I'm infected. Badly. I need you to get some antibiotics for me..." -msgstr "我被感染了，很严重。帮我拿点抗生素来，拜托……" +msgstr "我被感染了，很严重。帮我拿点抗生素来，拜托..." #: src/mission.cpp msgid "I'm not sure, maybe a news station would have what we are looking?" @@ -107581,9 +107714,9 @@ msgid "" "the first to go. I'd like to start over, just rebuild at one of the farms in " "the countryside. Can you help me secure one?" msgstr "" -"我承认我所认识的人都挂了……因为各种原因挂掉，但我真的希望我曾经能做什么来救我" -"的兄弟，苦逼的是他却是第一个挂掉的。我想重新开始，在乡下建立一个开心农场，你" -"能帮我吗？" +"我承认我所认识的人都挂了......因为各种原因挂掉，但我真的希望我曾经能做什么来" +"救我的兄弟，苦逼的是他却是第一个挂掉的。我想重新开始，在乡下建立一个开心农" +"场，你能帮我吗？" #: src/mission.cpp msgid "" @@ -107605,10 +107738,10 @@ msgid "" "prevent me from ever seeing it. I could use your help getting a few bottles " "of aspirin to start with." msgstr "" -"眼下我只有少的可怜的绷带和几个急救包……说白了， 只要有点儿什么医疗紧急情况，我" -"都只能干瞪眼。原本只要拾荒者们找到些医疗用品，他们有义务立刻拿来给我，但这些" -"天我连个影子也没见着，我猜这要感谢有黑市这么个地方。如果你愿意帮把手的话，能" -"给我找几瓶阿司匹林吗？没有它们我连兽医都算不上。" +"眼下我只有少的可怜的绷带和几个急救包...说白了， 只要有点儿什么医疗紧急情况，" +"我都只能干瞪眼。原本只要拾荒者们找到些医疗用品，他们有义务立刻拿来给我，但这" +"些天我连个影子也没见着，我猜这要感谢有黑市这么个地方。如果你愿意帮把手的话，" +"能给我找几瓶阿司匹林吗？没有它们我连兽医都算不上。" #: src/mission.cpp msgid "" @@ -107635,8 +107768,8 @@ msgid "" "hospital or doctor's office. I just want to know who might still be out " "there." msgstr "" -"我已经失去了这么多的朋友……请给我从区域医院或医生的办公室找到病人名单。我只是" -"想知道谁可能仍然在那里。" +"我已经失去了这么多的朋友..。请给我从区域医院或医生的办公室找到病人名单。我只" +"是想知道谁可能仍然在那里。" #: src/mission.cpp msgid "If only we could find a great valley or something." @@ -107659,7 +107792,7 @@ msgstr "" #: src/mission.cpp msgid "If they draw first blood their friends are less likely to blame you..." -msgstr "如果他们先动手，那么他们的朋友可能就不会责怪你……" +msgstr "如果他们先动手，那么他们的朋友可能就不会责怪你..." #: src/mission.cpp msgid "If you can do this for us our survival options would vastly increase." @@ -107698,7 +107831,7 @@ msgid "" "bother us again. We can't pay much but it would help us to reclaim the bay." msgstr "" "如果你真的想帮忙，请帮我们清理后院的丧尸。在大灾变的第一天，出于恐惧，我们把" -"所有尸体和杀死的丧尸都丢弃在封闭的后院里，里面甚至包括了我们当时的老大……但是" +"所有尸体和杀死的丧尸都丢弃在封闭的后院里，里面甚至包括了我们当时的老大...但是" "现在它们都复活成另外一种生物了。请把它们全部清理干净并确保不会再威胁到我们。" "尽管我们无法付出很多报酬，但这件事对我们重建基地意义很大。" @@ -107710,7 +107843,7 @@ msgstr "如果你能够用铁楸铲起废墟的话，你应该可以找到能够 #: src/mission.cpp msgid "It could be very informative to perform an analysis of zombie blood..." -msgstr "如果能对丧尸血液进行一次分析的话能提供不少的情报信息……" +msgstr "它可以提供大量进行分析的僵尸血的信息……" #: src/mission.cpp msgid "It may be easier to make them if you can't find a school or something." @@ -107750,7 +107883,7 @@ msgid "" "Man... you're a goddamn machine. It was a pleasure working with you. You " "know, you may just change our little neck of the world if you keep this up." msgstr "" -"伙计……你他妈就是一台机器。和你一起工作真是一件愉快的事，你知道吗，如果你坚持" +"伙计...你他妈就是一台机器。和你一起工作真是一件愉快的事，你知道吗，如果你坚持" "下去你将给我们的世界带来改变。" #: src/mission.cpp @@ -107846,7 +107979,7 @@ msgstr "" #: src/mission.cpp msgid "Oh dear, I thought Timmy would have made it..." -msgstr "哦，亲爱的，我想蒂米会撑过去的……" +msgstr "哦，亲爱的，我想蒂米会撑过去的..." #: src/mission.cpp msgid "Oh god, I can't believe it happened..." @@ -107995,7 +108128,7 @@ msgid "" "Rodger, if he's a no-show then any other gunslinger will do... but I doubt " "he'll quit before we even begin." msgstr "" -"了解，如果他没出现的话，那么其他的枪手会代替他……但我想恐怕在我们动身之前他就" +"了解，如果他没出现的话，那么其他的枪手会代替他...但我想恐怕在我们动身之前他就" "溜了。" #: src/mission.cpp @@ -108024,7 +108157,7 @@ msgstr "真的吗？天杀的共产党……" #: src/mission.cpp msgid "Seriously? It's an easy job..." -msgstr "困难吗？这是一个很简单的工作啊……" +msgstr "困难吗？这是一个很简单的工作啊..." #: src/mission.cpp msgid "Shall we keep looking for a farm house?" @@ -108096,7 +108229,7 @@ msgstr "谢谢你！请尽快回来！" #: src/mission.cpp msgid "Thank you, I need some time alone now..." -msgstr "谢谢你。现在我想一个人待会……" +msgstr "谢谢你。现在我想一个人待会..." #: src/mission.cpp msgid "" @@ -108120,7 +108253,7 @@ msgstr "谢谢你，这就是我要找的日记。" #: src/mission.cpp msgid "" "Thank you, having that big of a threat close to home was nerve wrecking." -msgstr "谢谢你，家附近有个那么大的威胁真是让人觉得提心吊胆。" +msgstr "谢谢你，家附近有个那么大的威胁真是让人觉得提心吊胆 ." #: src/mission.cpp msgid "Thank you, just bring me to the camp... I just want to see." @@ -108147,7 +108280,7 @@ msgid "" msgstr "" "谢谢你，少了他们这个世界会变得清净多了。你不在那会儿，我们的两个熟手接受了旧" "世守护者的援助去建立一个新哨站。我们别无选择，难民源源不断的涌入，天知道我们" -"的粮食储备还能坚持多久。如果有空的话，你最好看看他们今后需不需要搭把手……" +"的粮食储备还能坚持多久。如果有空的话，你最好看看他们今后需不需要搭把手..." #: src/mission.cpp msgid "" @@ -108156,9 +108289,9 @@ msgid "" "survivors of this cult... I don't known if they are responsible for the " "outbreak but they certainly know more about it than I do." msgstr "" -"谢谢你，为你所做的……这些恶魔般的生物证明教会的担心是有理由的。我们的首要任务" -"现在是找到这个邪教的任何幸存者……我不知道他们是否该对危机爆发负责，但他们肯定" -"比我知道的更多。" +"谢谢你，为你所做的......这些恶魔般的生物证明教会的担心是有理由的。我们的首要" +"任务现在是找到这个邪教的任何幸存者......我不知道他们是否该对危机爆发负责，但" +"他们肯定比我知道的更多。" #: src/mission.cpp msgid "Thank you. I couldn't rest until I knew that was finished." @@ -108170,7 +108303,7 @@ msgstr "谢谢你！她会一直想这样。" #: src/mission.cpp msgid "Thanks for trying... I guess." -msgstr "感谢你的努力……我猜。" +msgstr "感谢你的努力..。我猜。" #: src/mission.cpp msgid "Thanks so much, you may save both of us yet." @@ -108384,7 +108517,7 @@ msgid "" msgstr "" "你所完成的工作已经让难民中心的领导者们动摇，想要送一些人出去帮助找医疗物品" "了。我们的下一步是准备切割车床设备，以便我们开始回收破碎金属来制造碉堡和各种" -"装备。我们想要一对电焊枪，提供给我们的机械工人焊接零件。" +"装备。我们想要一对焊枪，提供给我们的机械工人焊接零件。" #: src/mission.cpp msgid "" @@ -108491,7 +108624,7 @@ msgstr "" #: src/mission.cpp msgid "Those twisted snakes..." -msgstr "这些扭曲的蛇……" +msgstr "这些互相残绕的蛇..." #: src/mission.cpp msgid "" @@ -108545,11 +108678,11 @@ msgid "" "get an electrical expansion working for a year or two. I know they are rare " "but running generators isn't a viable option in the basement." msgstr "" -"我们开始在这建造新的基础设施，并希望几个新的电气系统能上线工作……不幸的是我们" -"现有的系统由一种使用放射性同位素热力发电的核电池来供应能量。据我了解他们像巨" -"大的电池那样工作。我们有扩大动力系统的能力，但是要想成功做到，得需要足够的钚" -"才行。25个钚电池就足够我们的扩展电器工作上一到两年，我知道钚电池并非满大街都" -"是的寻常东西，但是在地下室重新安装巨大的发电机组也不可行。" +"我们开始在这建造新的基础设施，并希望几个新的电气系统能上线工作.....不幸的是我" +"们现有的系统由一种使用放射性同位素热力发电的核电池来供应能量。据我了解他们像" +"巨大的电池那样工作。我们有扩大动力系统的能力，但是要想成功做到，得需要足够的" +"钚才行。25个钚电池就足够我们的扩展电器工作上一到两年，我知道钚电池并非满大街" +"都是的寻常东西，但是在地下室重新安装巨大的发电机组也不可行。" #: src/mission.cpp msgid "" @@ -108592,7 +108725,7 @@ msgstr "" #: src/mission.cpp msgid "We need help..." -msgstr "我们需要帮助……" +msgstr "我们需要帮助..." #: src/mission.cpp msgid "" @@ -108620,7 +108753,8 @@ msgstr "你帮了我一个大忙。希望咱们能很快渡过难关。" msgid "" "We're also official... just hang in there and I'll show you what we can " "really do." -msgstr "我们也是官方的……你们在那儿再坚持会儿，我会让你们见识见识我们的厉害。" +msgstr "" +"我们也是官方的......你们在那儿再坚持会儿，我会让你们见识见识我们的厉害。" #: src/mission.cpp msgid "" @@ -108632,9 +108766,9 @@ msgid "" "there until we picked him up." msgstr "" "我们还有另一个麻烦需要解决，但光靠我们自己恐怕不行，所以我帮大家找了个志愿" -"者……算是志愿的吧。他自负的像个锤子，但却打得一手好枪，他将会去搜集那些有用的" -"东西然后在森林的小木屋里和我们碰头。因为不确定我们要多久才能去和他碰头，所以" -"我告诉他如果他到了小木屋就一直在那扎营等待我们的到来。" +"者......算是志愿的吧。他自负的像个锤子，但却打得一手好枪，他将会去搜集那些有" +"用的东西然后在森林的小木屋里和我们碰头。因为不确定我们要多久才能去和他碰头，" +"所以我告诉他如果他到了小木屋就一直在那扎营等待我们的到来。" #: src/mission.cpp msgid "We've got the flag, now we need to locate US forces." @@ -108656,7 +108790,7 @@ msgstr "" #: src/mission.cpp msgid "Well damn, you must be the guys here to pick me up..." -msgstr "太他妈好了，你一定就是来接我的人吧……" +msgstr "太他妈好了，你一定就是来接我的人吧..." #: src/mission.cpp msgid "Well, do you have the data yet?" @@ -108789,7 +108923,7 @@ msgstr "有了这个我们就能够说服其他人来建设农业合作社了。 #: src/mission.cpp msgid "With two, we should be able to repair one if it breaks." -msgstr "如果我们有了两支电焊枪，当其中一只坏了我们都可以用另一支来修理它。" +msgstr "我们如果有了两支焊枪，当其中一只哪里坏了我们都可以用另一支来帮忙修理。" #: src/mission.cpp msgid "Wow, you failed? All that work, down the drain..." @@ -108797,7 +108931,7 @@ msgstr "哇，你失败了？所有这些工作，都浪费了……" #: src/mission.cpp msgid "Ya, I guess the stress may just be getting to me..." -msgstr "呵，我想恐怕只有我来承担压力了……" +msgstr "呵，我想恐怕只有我来承担压力了." #: src/mission.cpp msgid "Ya, it was a long shot I admit." @@ -108816,8 +108950,8 @@ msgid "" "You give up? This country fell apart because no one could find agood man to " "rely on... might as well give up, I guess." msgstr "" -"你放弃了吗？我猜，这个国家土崩瓦解，因为没有人能找到一个可以依靠的人……还不如" -"放弃。" +"你放弃了吗？我猜，这个国家土崩瓦解，因为没有人能找到一个可以依靠的人..。还不" +"如放弃。" #: src/mission.cpp msgid "" @@ -108828,10 +108962,10 @@ msgid "" "location for me? I'm not sure what was going on here but the priest seemed " "fairly worried about it." msgstr "" -"你不知道这本日记是多么令人关注。我发现两个非常有希望的线索……先说重要的，天主" -"教教会已经开始自己对全球邪教现象的调查，最近以来教会似乎对一个当地的邪教很感" -"兴趣。你可以帮我找出它的位置吗？我不知道发生了什么事情，但牧师似乎对此相当担" -"心。" +"你不知道这本日记是多么令人关注。我发现两个非常有希望的线索......先说重要的，" +"天主教教会已经开始自己对全球邪教现象的调查，最近以来教会似乎对一个当地的邪教" +"很感兴趣。你可以帮我找出它的位置吗？我不知道发生了什么事情，但牧师似乎对此相" +"当担心。" #: src/mission.cpp msgid "" @@ -108878,7 +109012,7 @@ msgstr "你可以用你最基本的技能制造它。" #: src/mission.cpp msgid "You wouldn't believe what I found..." -msgstr "你不会相信我找到了神马……" +msgstr "你不会相信我找到了神马..." #: src/mission.cpp msgid "You'll see, I know I'm right." @@ -108894,9 +109028,9 @@ msgid "" "other beast. You, I, and a 100 regular zombies laid to rest, what do you " "say?" msgstr "" -"你的穿着比大多数人好……你对为我们创造一个更好的世界感兴趣么？这个小镇有足够的" -"储备能让我们安家，但是我们没人能有能力和设备去对付丧尸。我会尽我所能去帮你但" -"是你得真的像你说的那样把那些丧尸都赶出去。你，我，和100个普通丧尸安息，怎么" +"你的穿着比大多数人好...你对为我们创造一个更好的世界感兴趣么？这个小镇有足够的" +"储备能让我们安家，但是我们没人能有能力和设备去对付僵尸。我会尽我所能去帮你但" +"是你得真的像你说的那样把那些僵尸都赶出去。你，我，和100个普通僵尸安息，怎么" "样？" #: src/mission.cpp @@ -108953,7 +109087,7 @@ msgstr "%s 把美洲狮打得血肉模糊！" #: src/mission_companion.cpp #, c-format msgid "%s didn't make it out in time..." -msgstr "%s没能及时逃出来……" +msgstr "%s没能及时逃出来..." #: src/mission_companion.cpp #, c-format @@ -109514,7 +109648,7 @@ msgstr "" #: src/mission_companion.cpp #, c-format msgid "The %s are liquidated for $%d..." -msgstr "%s 被折算为 $%d……" +msgstr "%s 被折算为 $%d......" #: src/mission_companion.cpp #, c-format @@ -109553,18 +109687,19 @@ msgstr "凭藉机敏的思维，团队得以避开战斗！" #: src/mission_companion.cpp msgid "Unfortunately they were overpowered by the undead... I'm sorry." -msgstr "不幸的是他们被不死者击败了……我很遗憾。" +msgstr "不幸的是他们被不死者击败了......我很遗憾。" #: src/mission_companion.cpp msgid "Unfortunatly they were overpowered by the undead... I'm sorry." -msgstr "不幸的是他们被不死者击败了……我很遗憾。" +msgstr "不幸的是他们被不死者击败了......我很遗憾。" #: src/mission_companion.cpp #, c-format msgid "" "We... we don't know what exactly happened but we found %s's gear ripped and " "bloody..." -msgstr "我们……我们不知道发生了什么，但是我们看到 %s 的护甲被撕裂，沾满鲜血……" +msgstr "" +"我们......我们不知道发生了什么，但是我们看到 %s 的护甲被撕裂，沾满鲜血..." #: src/mission_companion.cpp msgid "Which bionic do you wish to have installed?" @@ -109613,7 +109748,7 @@ msgstr "你搞不定那个程序！" #: src/mission_companion.cpp msgid "You decide to hold off..." -msgstr "你决定再想想……" +msgstr "你决定暂缓..." #: src/mission_companion.cpp msgid "You decided to hold off for now..." @@ -109621,7 +109756,7 @@ msgstr "你决定暂缓……" #: src/mission_companion.cpp msgid "You don't have any bionics installed..." -msgstr "你没有任何已安装的生化插件……" +msgstr "你没有任何已安装的生化插件..." #: src/mission_companion.cpp msgid "You don't have any companions ready to return..." @@ -109652,7 +109787,7 @@ msgstr "没有种子可以种植！" #: src/mission_companion.cpp #, c-format msgid "You receive %d %s..." -msgstr "您收到 %d %s……" +msgstr "您收到 %d %s......" #: src/mission_companion.cpp msgid "but was rescued from the debris with only minor injuries!" @@ -109660,27 +109795,27 @@ msgstr "但幸好被从废墟中救了出来，仅受轻伤！" #: src/mission_companion.cpp msgid "departs on the scavenging patrol..." -msgstr "巡逻中……" +msgstr "巡逻中..." #: src/mission_companion.cpp msgid "departs on the scavenging raid..." -msgstr "拾荒中……" +msgstr "拾荒中..." #: src/mission_companion.cpp msgid "departs to forage for food..." -msgstr "搜寻食物中……" +msgstr "搜寻食物中..." #: src/mission_companion.cpp msgid "departs to work as a carpenter..." -msgstr "当木工中……" +msgstr "当木工中..." #: src/mission_companion.cpp msgid "departs to work as a laborer..." -msgstr "劳作中……" +msgstr "劳作中..." #: src/mission_companion.cpp msgid "joins the caravan team..." -msgstr "加入商队……" +msgstr "加入商队..." #: src/mission_end.cpp #, c-format @@ -109744,7 +109879,7 @@ msgstr "收集100单位阿司匹林" #: src/missiondef.cpp msgid "Collect 200 Multivitamin Pills" -msgstr "收集200单位复合维生素" +msgstr "收集200单位复方维生素片" #: src/missiondef.cpp msgid "Collect 3 Hotplates" @@ -109796,7 +109931,7 @@ msgstr "找到2个55加仑大桶" #: src/missiondef.cpp msgid "Find 2 Electric Welders" -msgstr "找到2个电焊枪" +msgstr "找到2个焊枪" #: src/missiondef.cpp msgid "Find 2 Scalpels" @@ -110060,7 +110195,7 @@ msgstr "魔法类模组" #: src/mod_manager.cpp msgid "MISC ADDITIONS" -msgstr "杂项类模组" +msgstr "杂类附件" #: src/mod_manager.cpp msgid "MONSTER EXCLUSION MODS" @@ -110090,18 +110225,18 @@ msgstr "车辆类模组" #: src/mod_manager.cpp msgid "list of default mods" -msgstr "默认MOD列表" +msgstr "默认模组列表" #: src/mod_manager.cpp msgid "list of mods" -msgstr "MOD列表" +msgstr "模组列表" #. ~ delimiter for mod dependency enumeration #. ~ delimiter for mod author enumeration #: src/mod_manager_ui.cpp msgctxt "mod manager" msgid ", " -msgstr "，" +msgstr "," #: src/mod_manager_ui.cpp #, c-format @@ -110731,7 +110866,7 @@ msgstr "%s 正在大量排放令人窒息的孢子 ! 看起来就像是在喷火 #: src/monattack.cpp #, c-format msgid "The %s does some fancy footwork!" -msgstr "%s 踩出了一些花式步法！" +msgstr "%s 踩出了一些花式步法." #: src/monattack.cpp #, c-format @@ -110917,7 +111052,7 @@ msgstr "%s 举起了胳膊！" #: src/monattack.cpp #, c-format msgid "The %s seems to wave you toward the tower..." -msgstr "%s 似乎在驱使你前往真菌塔……" +msgstr "%s 似乎在驱使你前往真菌塔..." #: src/monattack.cpp #, c-format @@ -111596,7 +111731,7 @@ msgstr "你后悔杀死 %s。" #: src/mondeath.cpp msgid "Your obsession with the fault fades away..." -msgstr "你从对故障的痴迷中恢复过来……" +msgstr "你从对故障的痴迷中恢复过来..." #: src/mondeath.cpp #, c-format @@ -111883,7 +112018,7 @@ msgstr "你躲避了不知来路的攻击。" #: src/monster.cpp msgid "You feel poison flood your body, wracking you with pain..." -msgstr "你感觉毒素涌入你的身体，让你痛不欲生……" +msgstr "你感觉毒素涌入你的身体，让你痛不欲生..." #: src/monster.cpp msgid "You're poisoned!" @@ -111956,7 +112091,7 @@ msgstr "坏脾气" #: src/morale.cpp msgid "Barfed" -msgstr "" +msgstr "呕吐过" #: src/morale.cpp msgid "Caffeine Craving" @@ -112006,7 +112141,7 @@ msgstr "猫科变异" #: src/morale.cpp msgid "Focus gain per minute" -msgstr "每分钟注意力获取" +msgstr "注意力加成: 每分钟" #: src/morale.cpp msgid "Found kitten <3" @@ -112094,7 +112229,7 @@ msgstr "尼古丁上瘾" #: src/morale.cpp msgid "Nothing affects your morale" -msgstr "没有什么能影响你的情绪" +msgstr "没有什么在影响你的情绪" #: src/morale.cpp msgid "Opiate Craving" @@ -112123,7 +112258,7 @@ msgstr "被鼓励" #: src/morale.cpp msgid "Total morale gain" -msgstr "总情绪加成" +msgstr "情绪加成总计" #. ~ You really don't like wearing the Uncomfy Gear #: src/morale.cpp @@ -112220,7 +112355,7 @@ msgstr "你感觉继续使用你的%s会弄死你！" #: src/mutation.cpp msgid "You feel something straining deep inside you, yearning to be free..." -msgstr "你觉得你内心深处有个东西渴望获得自由……" +msgstr "你觉得你内心深处有个东西渴望获得自由..." #: src/mutation.cpp msgid "" @@ -112324,22 +112459,22 @@ msgstr "变异" #: src/mutation_ui.cpp #, c-format msgid "%s to activate mutation, " -msgstr "" +msgstr "%s 激活变异，" #: src/mutation_ui.cpp #, c-format msgid "%s to assign the hotkeys." -msgstr "" +msgstr "%s 重新分配操作按键。" #: src/mutation_ui.cpp #, c-format msgid "%s to examine mutation, " -msgstr "" +msgstr "%s 查看变异，" #: src/mutation_ui.cpp #, c-format msgid "%s to reassign invlet, " -msgstr "" +msgstr "%s 重新分配变异按键，" #: src/mutation_ui.cpp msgid "Activating" @@ -112380,7 +112515,7 @@ msgstr "重分配" msgid "" "Select a mutation to reassign or press SPACE to " "cancel. " -msgstr "" +msgstr "选择一个变异重新分配按键，或按空格键取消。" #: src/mutation_ui.cpp #, c-format @@ -112421,10 +112556,10 @@ msgid "" " %s to increase the statistic.\n" " %s to decrease the statistic." msgstr "" -" %s / %s 选择属" -"性。\n" -" %s 增加数值。\n" -" %s 减少数值。" +" %s / %s 选择一个数" +"据.\n" +" %s 增加数值.\n" +" %s 减少数值." #: src/newcharacter.cpp #, c-format @@ -112651,17 +112786,19 @@ msgid "" "Points left: %d%c%d%c%d=%d" msgstr "" +"剩余点数： %d%c%d%c%d=%d" #. ~ Gender switch message. 1s - change key name, 2s - profession name. #: src/newcharacter.cpp #, c-format msgid "Press %1$s to switch to %2$s(female)." -msgstr "按 %1$s 切换到 %2$s（女）。" +msgstr "按 %1$s 切换到 %2$s（女）." #: src/newcharacter.cpp #, c-format msgid "Press %1$s to switch to %2$s(male)." -msgstr "按 %1$s 切换到 %2$s（男）。" +msgstr "按 %1$s 切换到 %2$s（男）." #: src/newcharacter.cpp #, c-format @@ -112908,13 +113045,13 @@ msgstr "缺少可分配的点数，请改变部分特征并重试。" #: src/newcharacter.cpp msgid "Too many stat points allocated, lower some stats and try again." -msgstr "" +msgstr "缺少可分配的属性点数，请降低部分属性并重试。" #: src/newcharacter.cpp msgid "" "Too many trait points allocated, change some traits or lower some stats and " "try again." -msgstr "" +msgstr "缺少可分配的特征点数，请改变部分特征或减少属性并重试。" #: src/newcharacter.cpp msgid "Traits: " @@ -112940,7 +113077,7 @@ msgstr "冬季开局" #: src/newcharacter.cpp msgid "You already picked a conflicting trait!" -msgstr "你已经选择了一个有冲突的特征！" +msgstr "你已经选择了一个有冲突的特征." #: src/newcharacter.cpp msgid "" @@ -112950,25 +113087,26 @@ msgstr "剩余的点会被清空，你确定你要继续下去吗？" #: src/newcharacter.cpp msgid "You cannot save a template with negative unused points." -msgstr "" +msgstr "你不能在剩余点数为负时保存为模板。" #: src/newcharacter.cpp msgid "" "You cannot save a template with this many points allocated, change some " "features and try again." -msgstr "" +msgstr "你不能在分配了过多点数时保存为模板，请改变部分特征并重试。" #: src/newcharacter.cpp msgid "" "You cannot save a template with this many stat points allocated, lower some " "stats and try again." -msgstr "" +msgstr "你不能在分配了过多的属性点时保存为模板，降低一些属性点，然后再试一次。" #: src/newcharacter.cpp msgid "" "You cannot save a template with this many trait points allocated, change " "some traits or lower some stats and try again." msgstr "" +"你不能在分配了过多的特征点时保存为模板，降低一些特征或属性点，然后再试一次。" #: src/newcharacter.cpp #, c-format @@ -112982,7 +113120,7 @@ msgstr "你的 %s 职业不允许你得到该特性。" #: src/newcharacter.cpp msgid "Zombies nearby" -msgstr "丧尸围困" +msgstr "僵尸围困" #: src/newcharacter.cpp msgid "______NO NAME ENTERED!!!______" @@ -113006,7 +113144,7 @@ msgstr "无筛选" #: src/newcharacter.cpp msgid "player template" -msgstr "玩家模板" +msgstr "玩家模板：" #: src/newcharacter.cpp msgid "points" @@ -113024,7 +113162,7 @@ msgstr "%1$s　正在说 \"%2$s\"" #: src/npc.cpp #, c-format msgid "%1$s says something but you can't hear it!" -msgstr "%1$s 说了些什么但你听不见！" +msgstr "%1$s看上去正在说什么,但是你听不到啊啊啊啊!!!" #: src/npc.cpp #, c-format @@ -113573,10 +113711,6 @@ msgstr " 不要动" msgid "Drop items" msgstr "丢弃物品" -#: src/npcmove.cpp -msgid "Fire a burst" -msgstr "烧了一阵" - #: src/npcmove.cpp msgid "Flee" msgstr "奔跑" @@ -113782,7 +113916,7 @@ msgstr " %s 将使用静音枪械。" #: src/npctalk.cpp msgid "!Calm down. I'm not going to hurt you." -msgstr "!冷静，我不打算伤害你。" +msgstr "!冷静。我不打算伤害你." #: src/npctalk.cpp msgid "!Drop your weapon!" @@ -113852,7 +113986,7 @@ msgstr "%s 无法携带全部物品。" #: src/npctalk.cpp #, c-format msgid "%s drops the logs off in the garage..." -msgstr "%s 把原木丢在车库里……" +msgstr "%s把原木丢在车库里..." #: src/npctalk.cpp #, c-format @@ -113862,32 +113996,32 @@ msgstr "%s 不再对你感到有威胁了。" #: src/npctalk.cpp #, c-format msgid "%s gave you a beer..." -msgstr "%s 给了你一杯啤酒……" +msgstr "%s给了你一杯啤酒..." #: src/npctalk.cpp #, c-format msgid "%s gave you a shot of brandy..." -msgstr "%s 给了你一杯白兰地……" +msgstr "%s给了你一杯白兰地..." #: src/npctalk.cpp #, c-format msgid "%s gave you a shot of rum..." -msgstr "%s 给了你一杯朗姆酒……" +msgstr "%s给了你一杯朗姆酒..." #: src/npctalk.cpp #, c-format msgid "%s gave you a shot of whiskey..." -msgstr "%s 给了你一杯威士忌……" +msgstr "%s给了你一杯威士忌..." #: src/npctalk.cpp #, c-format msgid "%s gives you a decent haircut..." -msgstr "%s 给你理了一个体面的发型……" +msgstr "%s给你理了一个体面的发型..." #: src/npctalk.cpp #, c-format msgid "%s gives you a decent shave..." -msgstr "%s 给你仔细修剪了一下胡须……" +msgstr "%s给你仔细修剪了一下胡须..." #: src/npctalk.cpp #, c-format @@ -113942,15 +114076,15 @@ msgstr "%s：%d -> %d （花费 $%d）" #: src/npctalk.cpp msgid "&Drop weapon." -msgstr "&丢下武器。" +msgstr "&丢放武器." #: src/npctalk.cpp msgid "&Put away weapon." -msgstr "&收起武器。" +msgstr "&拿开武器." #: src/npctalk.cpp msgid "&Put hands up." -msgstr "&举起手。" +msgstr "&举起手." #: src/npctalk.cpp msgid "&You are deaf and can't talk." @@ -114051,11 +114185,11 @@ msgstr "！" #: src/npctalk.cpp msgid "." -msgstr "。" +msgstr "." #: src/npctalk.cpp msgid "..." -msgstr "……" +msgstr "..." #: src/npctalk.cpp #, c-format @@ -114083,11 +114217,11 @@ msgstr "" #: src/npctalk.cpp msgid "About one of those missions..." -msgstr "关于任务之一……" +msgstr "关于任务之一..." #: src/npctalk.cpp msgid "About the mission..." -msgstr "关于任务……" +msgstr "关于任务..." #: src/npctalk.cpp msgid "Aim when it's convenient." @@ -114154,19 +114288,19 @@ msgstr "好歹我们还有个避难所可以呆。" #: src/npctalk.cpp msgid "Attack anything you want." -msgstr "随你怎么打。" +msgstr "随你怎么打." #: src/npctalk.cpp msgid "Attack enemies that get too close." -msgstr "攻击靠得太近的敌人。" +msgstr "攻击靠得太近的敌人." #: src/npctalk.cpp msgid "Attack enemies that you can kill easily." -msgstr "攻击那些你能轻易杀掉的敌人。" +msgstr "攻击那些你能轻易杀掉的敌人." #: src/npctalk.cpp msgid "Attack only enemies that I attack first." -msgstr "攻击我攻击的第一个敌人。" +msgstr "攻击我攻击的第一个敌人." #: src/npctalk.cpp msgid "Attack only enemies you can reach without moving." @@ -114256,7 +114390,7 @@ msgid "" "to buy, with no intention of it ever being used. From the passing " "scavengers I've heard nothing but prime loot'n spots and rumors of hordes." msgstr "" -"我们能得到的情报的也不多。这些避难所大部分只是设计来让人们觉得更安心……而不是" +"我们能得到的情报的也不多。这些避难所大部分只是设计来让人们觉得更安心...而不是" "帮助他们存活下去。我们的无线电设备简直就像一坨屎，而这坨屎又是某个货劝说政府" "买下的，谁都没想到这些东西会有用到的一天。从路过的拾荒者那里我们打听不到太多" "东西，大部分都是拾荒点和尸潮的传言。" @@ -114267,11 +114401,11 @@ msgstr "想要交易吗？" #: src/npctalk.cpp msgid "Change your aiming rules..." -msgstr "改一下你的瞄准方式吧……" +msgstr "改一下你的瞄准方式吧.." #: src/npctalk.cpp msgid "Change your engagement rules..." -msgstr "改一下你的作战方式吧……" +msgstr "改一下你的作战方式吧.." #: src/npctalk.cpp msgid "Changed your mind?" @@ -114279,11 +114413,11 @@ msgstr "改变主意了吗？" #: src/npctalk.cpp msgid "Citizen..." -msgstr "公民……" +msgstr "公民..." #: src/npctalk.cpp msgid "Combat commands..." -msgstr "作战指令……" +msgstr "作战指令..." #: src/npctalk.cpp msgid "Come back later, I need to take care of a few things first." @@ -114378,7 +114512,7 @@ msgstr "不要清除障碍。" #: src/npctalk.cpp msgid "Don't fight unless your life depends on it." -msgstr "生命受威胁时才去战斗。" +msgstr "生命受威胁时才去战斗." #: src/npctalk.cpp msgid "Don't have much time to talk." @@ -114390,7 +114524,7 @@ msgstr "忙你的吧。" #: src/npctalk.cpp msgid "Don't mind me..." -msgstr "忙你的吧……" +msgstr "忙你的吧..." #: src/npctalk.cpp msgid "Don't pick up items." @@ -114402,15 +114536,15 @@ msgstr "你没十分仔细的瞄准就别开枪。" #: src/npctalk.cpp msgid "Don't use grenades anymore." -msgstr "不要用手雷了。" +msgstr "不要用手雷了." #: src/npctalk.cpp msgid "Don't use guns anymore." -msgstr "不要用枪械了。" +msgstr "不要用枪械了." #: src/npctalk.cpp msgid "Don't worry about noise." -msgstr "别担心噪音问题。" +msgstr "别担心噪音问题." #: src/npctalk.cpp msgid "Don't worry, I'm not going to hurt you." @@ -114440,11 +114574,11 @@ msgstr "给一个人喂一条鱼，他一天都不会饿。喂他一发子弹， #: src/npctalk.cpp msgid "Fine..." -msgstr "好吧……" +msgstr "好吧..." #: src/npctalk.cpp msgid "Fine... *coughupyourscough*" -msgstr "好吧……咳嗽咳嗽" +msgstr "好吧...咳嗽咳嗽" #: src/npctalk.cpp msgid "For the right price could I borrow your services?" @@ -114456,7 +114590,7 @@ msgstr "献出菊花，叛徒！" #: src/npctalk.cpp msgid "Give it some time, I'll show you something new later..." -msgstr "给点时间，晚点我会给你看点新玩意……" +msgstr "给点时间，晚点我会给你看点新玩意..." #: src/npctalk.cpp msgid "Give it to me, or else!" @@ -114484,7 +114618,7 @@ msgstr "疯狂点吧，你不需要太花时间瞄准。" #: src/npctalk.cpp msgid "Good. Something else..." -msgstr "好的。还有别的事……" +msgstr "好的。还有别的事..." #: src/npctalk.cpp msgid "Goodbye." @@ -114512,7 +114646,7 @@ msgstr "有什么避免麻烦的秘诀？" #: src/npctalk.cpp msgid "Great, now my mouth is watering..." -msgstr "真棒，我都要流口水了……" +msgstr "真棒，我都要流口水了..." #: src/npctalk.cpp msgid "Guard this position." @@ -114520,11 +114654,11 @@ msgstr "在这个位置保持警卫。" #: src/npctalk.cpp msgid "Guess it works for you..." -msgstr "我猜它对你有用……" +msgstr "我猜它对你有用..." #: src/npctalk.cpp msgid "Guess shit's a mess everywhere..." -msgstr "我猜到处都是一团糟……" +msgstr "我猜到处都是一团糟..." #: src/npctalk.cpp msgid "" @@ -114554,7 +114688,7 @@ msgstr "你好!你愿意看我的商品？" #: src/npctalk.cpp msgid "Here I am." -msgstr "我在这里。" +msgstr "我在这里." #: src/npctalk.cpp msgid "Here it is!" @@ -114562,7 +114696,7 @@ msgstr "就是它了!" #: src/npctalk.cpp msgid "Here we go..." -msgstr "黑喂狗……" +msgstr "黑喂狗..." #: src/npctalk.cpp msgid "Here's what I can teach you..." @@ -114578,7 +114712,7 @@ msgstr "嘿，。" #: src/npctalk.cpp msgid "Hey, citizen... I'm not sure you belong here." -msgstr "嗨，市民……你不该在这里。" +msgstr "嗨，市民...你不该在这里。" #: src/npctalk.cpp msgid "Hmm, okay." @@ -114586,7 +114720,7 @@ msgstr "嗯，好吧。" #: src/npctalk.cpp msgid "Hmmm..." -msgstr "呣……" +msgstr "呣..." #: src/npctalk.cpp msgid "Hold on to this item" @@ -114598,7 +114732,7 @@ msgstr "希望你来这里是来交易的。" #: src/npctalk.cpp msgid "Hopefully moving out here was worth it..." -msgstr "希望没白来一趟……" +msgstr "希望没白来一趟..." #: src/npctalk.cpp msgid "Hordes?" @@ -114638,11 +114772,11 @@ msgstr "哈哈，我闻到了新来的家伙，我能帮你做点啥？" #: src/npctalk.cpp msgid "I brought'em." -msgstr "我带回来了。" +msgstr "我带回来了." #: src/npctalk.cpp msgid "I can keep you safe." -msgstr "我能保护你。" +msgstr "我能保护你." #: src/npctalk.cpp #, c-format @@ -114659,11 +114793,11 @@ msgstr "如果你和你的同伴受伤了，我会照料你们。" #: src/npctalk.cpp msgid "I can't imagine what I'd need your assistance with." -msgstr "眼下好像没什么需要你帮忙的。" +msgstr "眼下好像没什么需要你帮忙的..." #: src/npctalk.cpp msgid "I can't leave the shelter without equipment..." -msgstr "没有装备我不能离开这避难所……" +msgstr "没有装备我不能离开这避难所..." #: src/npctalk.cpp msgid "" @@ -114677,7 +114811,7 @@ msgstr "" #: src/npctalk.cpp msgid "I could use your medical assistance..." -msgstr "请给我些医疗救助……" +msgstr "请给我些医疗救助......" #: src/npctalk.cpp msgid "I didn't mean it!" @@ -114685,11 +114819,11 @@ msgstr "我不是那个意思！" #: src/npctalk.cpp msgid "I don't trust you enough to eat from your hand..." -msgstr "我才不相信你手上给我的食物……" +msgstr "我才不相信你手上给我的食物..." #: src/npctalk.cpp msgid "I don't care." -msgstr "我不在意。" +msgstr "我不在意." #: src/npctalk.cpp msgid "I don't have any jobs for you." @@ -114708,13 +114842,13 @@ msgid "" "serve as a federal employee for a few years." msgstr "" "我不太了解它怎样组建起来的，只知道它是巡弋在外海的军事或者商业船只组成的舰" -"队。他们从拖网渔船到超级油轮都有……甚至有一些北约组织的船。大部分撤离的平民愿" +"队。他们从拖网渔船到超级油轮都有...甚至有一些北约组织的船。大部分撤离的平民愿" "意作为联邦雇员工作几年，而报酬则是舰队的一个客舱小隔间。" #: src/npctalk.cpp msgid "" "I don't know what you could do. I've tried everything. Just give me time..." -msgstr "我不知道你能做什么。什么我都试过了。 给我点时间……" +msgstr "我不知道你能做什么。什么我都试过了。 给我点时间......" #: src/npctalk.cpp msgid "I don't know, look for supplies and other survivors I guess." @@ -114747,7 +114881,7 @@ msgstr "我觉得你似乎正在寻求帮助……" #: src/npctalk.cpp msgid "I guess I'll look somewhere else..." -msgstr "我想我还是到其他地方去看看……" +msgstr "我想我还是到其他地方去看看..." #: src/npctalk.cpp msgid "I guess you're the boss." @@ -114759,7 +114893,7 @@ msgstr "我有另一份活给你。想听听吗？" #: src/npctalk.cpp msgid "I have news." -msgstr "我有个消息。" +msgstr "我有个消息." #: src/npctalk.cpp msgid "I have no space to store it." @@ -114783,7 +114917,7 @@ msgstr "" #: src/npctalk.cpp msgid "I haven't done anything wrong..." -msgstr "我什么坏事都没有干……" +msgstr "我什么坏事都没有干..." #: src/npctalk.cpp msgid "I heard you were setting up an outpost out here..." @@ -114805,7 +114939,7 @@ msgstr "我有件事想要拜托你。你想听听吗？" msgid "" "I keep getting sick! At first I thought it was something I ate but now it " "seems like I can't keep anything down..." -msgstr "我一直在生病！起初我猜是不是我吃坏肚子了，可现在我吃什么吐什么……" +msgstr "我一直在生病！起初我猜是不是我吃坏肚子了，可现在我吃什么吐什么..." #: src/npctalk.cpp msgid "I killed it." @@ -114836,7 +114970,7 @@ msgid "" "we can't use helps keep us afloat with the traders. If you wanted to drop " "off a companion or two to assist in one of the runs, I'd appreciate it." msgstr "" -"我组织拾荒小队去找回些没法自制的补给品。我想尽办法鼓励移民们加入这些队伍……这" +"我组织拾荒小队去找回些没法自制的补给品。我想尽办法鼓励移民们加入这些队伍...这" "活计挺冒险，但没了它我们的哨站就很难保持运作。我们把所有用不上的东西拿去跟走" "私客交易。如果你能叫上一两个同伴帮一把某支拾荒小队的话，我会很感激的。" @@ -114854,7 +114988,7 @@ msgstr "" #: src/npctalk.cpp msgid "I really don't feel comfortable doing so..." -msgstr "这么做让我很不爽啊……" +msgstr "这么做让我很不爽啊..." #: src/npctalk.cpp msgid "I run the shop here." @@ -114862,15 +114996,15 @@ msgstr "我在这里经营商店。" #: src/npctalk.cpp msgid "I see." -msgstr "我明白。" +msgstr "我明白." #: src/npctalk.cpp msgid "I should be fine..." -msgstr "我不会有事的……" +msgstr "我不会有事的..." #: src/npctalk.cpp msgid "I should be going..." -msgstr "我该走了……" +msgstr "我该走了..." #: src/npctalk.cpp msgid "I should not be able to exist!" @@ -114888,7 +115022,7 @@ msgstr "也许该弄好一辆车了，这对我们从这里迅速撤离是很有 #: src/npctalk.cpp msgid "I thought I smelled a pig. I jest... please don't arrest me." -msgstr "我觉得我闻到了一头猪。呃，我只是开个……请别抓我。" +msgstr "我觉得我闻到了一头猪。呃，我只是开个....请别抓我。" #: src/npctalk.cpp msgid "" @@ -114930,7 +115064,7 @@ msgid "" "there and food was really becoming scarce when I left." msgstr "" "我是被派来加固哨站的第一批移民之一。为了离开难民中心，我可能稍稍夸大了一点我" -"的建造技能……你懂的，我离开的时候那儿已经不剩多少食物了。恐怕这里没什么活给" +"的建造技能...你懂的，我离开的时候那儿已经不剩多少食物了。恐怕这里没什么活给" "你，除非你有什么能交易的东西。" #: src/npctalk.cpp @@ -114981,11 +115115,11 @@ msgstr "我想雇你。" #: src/npctalk.cpp msgid "I'd like to know a bit more about you..." -msgstr "我想多了解你一点……" +msgstr "我想多了解你一点..." #: src/npctalk.cpp msgid "I'd like to lead for a while." -msgstr "让我来带路。" +msgstr "让我来带路." #: src/npctalk.cpp msgid "I'd prefer to keep that to myself." @@ -114993,7 +115127,7 @@ msgstr "我还是留着给自己吧。" #: src/npctalk.cpp msgid "I'll be back later..." -msgstr "我待会就来……" +msgstr "我待会就来..." #: src/npctalk.cpp msgid "I'll be back soon!" @@ -115001,7 +115135,7 @@ msgstr "我很快会回来的!" #: src/npctalk.cpp msgid "I'll be going..." -msgstr "我会去……" +msgstr "我会去..." #: src/npctalk.cpp msgid "I'll do it!" @@ -115021,19 +115155,19 @@ msgstr "我会记住的。" #: src/npctalk.cpp msgid "I'll talk to him then..." -msgstr "好吧我会去跟他谈谈……" +msgstr "好吧我会去跟他谈谈..." #: src/npctalk.cpp msgid "I'll talk with them then..." -msgstr "好吧我会去跟他们谈谈……" +msgstr "好吧我会去跟他们谈谈..." #: src/npctalk.cpp msgid "I'll try and find your commander then..." -msgstr "我会去找你的领导的……" +msgstr "我会去找你的领导的..." #: src/npctalk.cpp msgid "I'm a killer for hire." -msgstr "我是个寻求雇主的杀手。" +msgstr "我是个寻求雇主的杀手." #: src/npctalk.cpp msgid "I'm a local shopkeeper." @@ -115056,7 +115190,7 @@ msgstr "" #: src/npctalk.cpp msgid "I'm actually new..." -msgstr "我刚来……" +msgstr "我刚来..." #: src/npctalk.cpp msgid "I'm collecting gear and selling it." @@ -115067,12 +115201,12 @@ msgid "" "I'm currently waiting for a customer to return... I'll make you a deal " "though, $8,000 will cover my expenses if I get a small cut of the loot." msgstr "" -"我正在等另一个客户……不过如果你出的起钱我也会跟你做笔交易。$8000，外加我会顺手" -"捡点儿战利品，如果你不介意。" +"我正在等另一个客户...不过如果你出的起钱我也会跟你做笔交易。$8000，外加我会顺" +"手捡点儿战利品，如果你不介意。" #: src/npctalk.cpp msgid "I'm going to go my own way for a while." -msgstr "我想走自己的路。" +msgstr "我想走自己的路." #: src/npctalk.cpp msgid "I'm guarding this location." @@ -115114,7 +115248,7 @@ msgstr "我只是在试着活下去。" #: src/npctalk.cpp msgid "I'm just wandering." -msgstr "我只是四处流浪。" +msgstr "我在闲逛." #: src/npctalk.cpp msgid "I'm just watching the world burn." @@ -115143,7 +115277,7 @@ msgstr "我在找关于这些怪物起源的线索……" #: src/npctalk.cpp msgid "I'm looking for information..." -msgstr "我想打听点儿消息……" +msgstr "我想打听点儿消息..." #: src/npctalk.cpp msgid "I'm looking for new drink recipes." @@ -115163,11 +115297,11 @@ msgstr "执法官，我不是这里的主管。" #: src/npctalk.cpp msgid "I'm not in charge here, you're looking for someone else..." -msgstr "我在这只是个干活的，要谈事情的话找别人去吧……" +msgstr "我在这只是个干活的，要谈事情的话找别人去吧..." #: src/npctalk.cpp msgid "I'm not sure..." -msgstr "我不确定……" +msgstr "我不确定..." #: src/npctalk.cpp msgid "I'm on watch." @@ -115181,7 +115315,7 @@ msgid "" "then I'll be cutting wood from now till kingdom come." msgstr "" "我一到难民营就被分派来这个哨站。他们说我的块头非常适合挥斧头，所以我就变成了" -"个伐木工……我连说不的机会都没。如果我不想挨饿，我就得一直砍木头砍到下辈子。" +"个伐木工...我连说不的机会都没。如果我不想挨饿，我就得一直砍木头砍到下辈子。" #: src/npctalk.cpp msgid "" @@ -115208,7 +115342,7 @@ msgid "" msgstr "" "我很遗憾，但是我们能做的就是立刻关上大门。如果你还想去地下室探头探脑的话，我" "得提醒你，在地下室的守卫接到命令可以先斩后奏。我一直很奇怪是什么让外面有些拾" -"荒者变得毫无人性，直到那晚有个伙计不得不手刃自己的小孩……希望你别想打我们装备" +"荒者变得毫无人性，直到那晚有个伙计不得不手刃自己的小孩...希望你别想打我们装备" "的主意，我不想再看到那样的场面。" #: src/npctalk.cpp @@ -115217,15 +115351,15 @@ msgstr "对不起，我们宁愿保持现状，至少没有风险。" #: src/npctalk.cpp msgid "I'm sorry." -msgstr "对不起。" +msgstr "对不起." #: src/npctalk.cpp msgid "I'm sorry. I did what I could." -msgstr "对不起。我已经尽力了。" +msgstr "对不起。我已经尽力了." #: src/npctalk.cpp msgid "I'm sorry... I failed." -msgstr "对不起……我失败了。" +msgstr "对不起..。我失败了." #: src/npctalk.cpp msgid "I'm supposed to direct all questions to my leadership, marshal." @@ -115298,7 +115432,7 @@ msgstr "我没时间跟你聊天。如果你想交易或是找活干，去和工 #: src/npctalk.cpp msgid "I've got to go..." -msgstr "我该走了……" +msgstr "我该走了..." #: src/npctalk.cpp msgid "I've heard that cougars sometimes leap. Maybe it's just a myth." @@ -115306,7 +115440,7 @@ msgstr "我听说美洲狮有时候会朝你飞扑过来，也许只是个流言 #: src/npctalk.cpp msgid "I've taken care of it..." -msgstr "我能照顾它……" +msgstr "我能照顾它..." #: src/npctalk.cpp msgid "INTIMIDATE" @@ -115348,11 +115482,11 @@ msgstr "智 %d - %d" #: src/npctalk.cpp msgid "Interesting." -msgstr "有意思。" +msgstr "有意思..." #: src/npctalk.cpp msgid "Interesting..." -msgstr "有意思……" +msgstr "有意思..." #: src/npctalk.cpp msgid "Is there a catch?" @@ -115364,15 +115498,15 @@ msgstr "我可以加入“旧世守护者”吗？" #: src/npctalk.cpp msgid "It could be worse..." -msgstr "可能会更糟……" +msgstr "可能会更糟......" #: src/npctalk.cpp msgid "It doesn't look like a good idea to consume this.." -msgstr "看起来吃这个不是个好主意……" +msgstr "看起来吃这个不是个好主意..." #: src/npctalk.cpp msgid "It doesn't look like a good idea to consume this..." -msgstr "看起来吃这个不是个好主意……" +msgstr "看起来吃这个不是个好主意..." #: src/npctalk.cpp msgid "It is too heavy for me to carry." @@ -115436,31 +115570,31 @@ msgstr "别管尸体了。" #: src/npctalk.cpp msgid "Let me see what you keep behind the counter..." -msgstr "让我看看你有什么好货……" +msgstr "让我看看你有什么好货..." #: src/npctalk.cpp msgid "Let's go." -msgstr "一起走吧。" +msgstr "一起走吧." #: src/npctalk.cpp msgid "Let's keep moving." -msgstr "继续赶路吧。" +msgstr "继续赶路吧." #: src/npctalk.cpp msgid "Let's see what you've got..." -msgstr "看看你有些什么……" +msgstr "看看你有些什么..." #: src/npctalk.cpp msgid "Let's see what you've managed to find..." -msgstr "让我看看你都搞到些什么……" +msgstr "让我看看你都搞到些什么..." #: src/npctalk.cpp msgid "Let's trade items." -msgstr "让我们交易物品。" +msgstr "让我们交易物品." #: src/npctalk.cpp msgid "Let's trade then." -msgstr "那么让我们交易吧。" +msgstr "那么让我们交易吧." #: src/npctalk.cpp msgid "Like they could be working for someone else?" @@ -115476,7 +115610,7 @@ msgstr "女士" #: src/npctalk.cpp msgid "Ma'am you are not authorized to be here... you should leave." -msgstr "女士，您没有这里的授权……请离开。" +msgstr "女士，您没有这里的授权...请离开" #: src/npctalk.cpp msgid "" @@ -115507,15 +115641,15 @@ msgstr "执法官，能在这看到你真令人惊讶。" #: src/npctalk.cpp msgid "Marshal..." -msgstr "长官……" +msgstr "长官..." #: src/npctalk.cpp msgid "Maybe another time..." -msgstr "也许下次吧……" +msgstr "也许下次吧..." #: src/npctalk.cpp msgid "Maybe later..." -msgstr "下次再说吧……" +msgstr "下次再说吧..." #: src/npctalk.cpp msgid "Maybe we should start boarding up this place." @@ -115527,7 +115661,7 @@ msgstr "也许你可以教我些东西作报酬。" #: src/npctalk.cpp msgid "Miscellaneous rules..." -msgstr "一些杂项……" +msgstr "一些杂项..." #: src/npctalk.cpp msgid "Mission success! I don't know what else to say." @@ -115570,7 +115704,7 @@ msgstr "喏，刚才我只是开个玩笑。" #: src/npctalk.cpp msgid "Never mind then." -msgstr "那么别放在心上。" +msgstr "那么别放在心上." #: src/npctalk.cpp msgid "Never mind, I'll do without. Bye." @@ -115582,7 +115716,7 @@ msgstr "算了吧，我没什么兴趣。" #: src/npctalk.cpp msgid "Never mind..." -msgstr "没关系……" +msgstr "没关系..." #: src/npctalk.cpp msgid "Nevermind." @@ -115590,7 +115724,7 @@ msgstr "算了。" #: src/npctalk.cpp msgid "No rest for the weary..." -msgstr "麻烦事真多……" +msgstr "麻烦事真多..." #: src/npctalk.cpp msgid "No, just no..." @@ -115614,7 +115748,7 @@ msgstr "不是件好事。我还是留下吧！" #: src/npctalk.cpp msgid "Not a problem." -msgstr "没问题。" +msgstr "没问题." #: src/npctalk.cpp #, c-format @@ -115630,7 +115764,7 @@ msgstr "没有足够的现金！%s 有 $%.2f，但是价格是 $%.2f。按（T #: src/npctalk.cpp msgid "Not interested." -msgstr "不感兴趣。" +msgstr "不感兴趣." #: src/npctalk.cpp msgid "Not really, just trying to lead my life." @@ -115646,7 +115780,7 @@ msgstr "直到我得到一些抗生素……" #: src/npctalk.cpp msgid "Not yet." -msgstr "还没有。" +msgstr "还没有." #: src/npctalk.cpp msgid "Now get out of here, before I kill you." @@ -115658,7 +115792,7 @@ msgstr "现在赶紧离开这里。" #: src/npctalk.cpp msgid "O..kay..? " -msgstr "可……以吗？ " +msgstr "可...以吗？ " #: src/npctalk.cpp msgid "OBEY ME!" @@ -115666,7 +115800,7 @@ msgstr "服从我！" #: src/npctalk.cpp msgid "OK..." -msgstr "OK……" +msgstr "OK...." #: src/npctalk.cpp msgid "Offer what?" @@ -115694,7 +115828,7 @@ msgstr "好，就这样，再见。" #: src/npctalk.cpp msgid "Okay, fine." -msgstr "好的，算了。" +msgstr "好的." #: src/npctalk.cpp msgid "Okay, here you go." @@ -115722,11 +115856,11 @@ msgstr "OK，谢谢。" #: src/npctalk.cpp msgid "Okay." -msgstr "好的。" +msgstr "好的." #: src/npctalk.cpp msgid "Okay. Lead the way." -msgstr "好的，你带路吧。" +msgstr "好的。你带路吧." #: src/npctalk.cpp msgid "On second thought, never mind." @@ -115756,7 +115890,7 @@ msgstr "感 %d - %d" #: src/npctalk.cpp msgid "Please leave me alone..." -msgstr "我想静静，别问我静静是谁……" +msgstr "我想静静，别问我静静是谁..." #: src/npctalk.cpp msgid "Pleasure doing business!" @@ -115785,7 +115919,7 @@ msgstr "回头见。" #: src/npctalk.cpp msgid "Seems like a decent plan..." -msgstr "看起来是个不错的计划……" +msgstr "看起来是个不错的计划..." #: src/npctalk.cpp msgid "Seriously, give me more stuff!" @@ -115813,7 +115947,7 @@ msgstr "Shift+Y：叫喊" #: src/npctalk.cpp msgid "Sir you are not authorized to be here... you should leave." -msgstr "先生，您没有这里的授权……请离开。" +msgstr "先生，您没有这里的授权...你该离开" #: src/npctalk.cpp msgid "" @@ -115874,11 +116008,11 @@ msgstr "听起来不错，谢谢。" #: src/npctalk.cpp msgid "Sounds good." -msgstr "听起来不错。" +msgstr "听起来不错." #: src/npctalk.cpp msgid "Sounds good. Bye!" -msgstr "听起来不错。再见！" +msgstr "听起来不错。再见!" #: src/npctalk.cpp msgid "Spot your prey before something nastier spots you." @@ -115886,7 +116020,7 @@ msgstr "在更可怕的存在发现你之前，发现你的猎物 。" #: src/npctalk.cpp msgid "Stand still while I get my clippers..." -msgstr "请稍等，让我把剪刀拿过来……" +msgstr "请稍等，让我把剪刀拿过来..." #: src/npctalk.cpp msgid "Stay awake." @@ -115914,8 +116048,8 @@ msgid "" "Sure, just bagged a fresh batch of meat. You may want to grill it up before " "it gets too, uh... 'tender'. " msgstr "" -"当然，只是一批装在袋里的鲜肉而已，你可能在烤了它之前发现它变得，那个，嗯……" -"\"太嫩\" " +"当然，只是一批装在袋里的鲜肉而已，你可能在烤了它之前发现它变得，那个，" +"嗯......\"太嫩\" " #: src/npctalk.cpp msgid "" @@ -115932,7 +116066,7 @@ msgstr "花点时间，仔细瞄准。" #: src/npctalk.cpp msgid "Tell me about it." -msgstr "说来听听。" +msgstr "说来听听." #: src/npctalk.cpp msgid "Tell me about the footholds." @@ -115996,7 +116130,7 @@ msgstr "就这样，你死定了！" #: src/npctalk.cpp msgid "That's the best I can do on short notice..." -msgstr "短时间内我只能做这么多了……" +msgstr "短时间内我只能做这么多了..." #: src/npctalk.cpp msgid "The 2nd Fleet?" @@ -116086,7 +116220,7 @@ msgid "" "to run enough trade through here to keep us alive. Don't care who your " "goods come from or how you got them, just don't bring trouble." msgstr "" -"老实说，我们最开始有满满六卡车的办公室小白脸和家庭主妇……在一两天前的难民骚动" +"老实说，我们最开始有满满六卡车的办公室小白脸和家庭主妇...在一两天前的难民骚动" "之后，我们中间比较有勇气的那些都死了。现在我们只想保证有足够的贸易来让我们这" "的人都能活下去。我们不再乎你的货从哪来，怎么来，只要别惹麻烦就行。" @@ -116096,15 +116230,15 @@ msgstr "交易" #: src/npctalk.cpp msgid "Understood. I'll get those antibiotics." -msgstr "知道了。我会将抗生素拿回来的。" +msgstr "知道了。我会将抗生素拿回来的." #: src/npctalk.cpp msgid "Use only silent weapons." -msgstr "用静音武器。" +msgstr "用静音武器." #: src/npctalk.cpp msgid "Very well..." -msgstr "很好……" +msgstr "很好..." #: src/npctalk.cpp #, c-format @@ -116113,7 +116247,7 @@ msgstr "体积：%d，%s" #: src/npctalk.cpp msgid "Wait at this base." -msgstr "在这里等待。" +msgstr "在这里等待." #: src/npctalk.cpp msgid "Wake up!" @@ -116129,7 +116263,7 @@ msgstr "想和我一起走吗？" #: src/npctalk.cpp msgid "Was hoping for something more..." -msgstr "还以为有什么好东东……" +msgstr "还以为有什么好东东..." #: src/npctalk.cpp msgid "Watch your back out there." @@ -116141,7 +116275,7 @@ msgid "" "rather restricted in what I can release... go find my commander if you have " "any questions." msgstr "" -"我们正在保卫这座设施的外部通讯阵列。我受限不能透露太多信息……如果你有任何问" +"我们正在保卫这座设施的外部通讯阵列。我受限不能透露太多信息..。如果你有任何问" "题，去找我的指挥官。" #: src/npctalk.cpp @@ -116174,7 +116308,7 @@ msgstr "也许我们应该远离那些城市，即便那里有不少有用的东 #: src/npctalk.cpp msgid "We're friends, aren't we?" -msgstr "我们是朋友啊。" +msgstr "我们是朋友啊." #: src/npctalk.cpp msgid "We're here!" @@ -116187,15 +116321,15 @@ msgstr "重量：%.1f %s" #: src/npctalk.cpp msgid "Welcome marshal..." -msgstr "欢迎您，执法官……" +msgstr "欢迎您，执法官..." #: src/npctalk.cpp msgid "Welcome to the junk shop..." -msgstr "欢迎来到便宜货商店……" +msgstr "欢迎来到便宜货商店..。..." #: src/npctalk.cpp msgid "Welcome..." -msgstr "欢迎……" +msgstr "欢迎..." #: src/npctalk.cpp msgid "" @@ -116208,13 +116342,13 @@ msgid "" "partners that are accustomed to doing whatever is needed to survive." msgstr "" "难民们待在这里的一楼，直到他们其中有人试图透过装载区偷渡一个垂死之人。最后你" -"猜怎么着……我们被惨叫声吵醒。大约有二十多人死在当晚。剩下的难民在隔天被放逐，" +"猜怎么着...我们被惨叫声吵醒。大约有二十多人死在当晚。剩下的难民在隔天被放逐，" "一部分的人加入了拾荒者集团。我得说虽然我们只剩约20个可用的男女，但我们真正的" "力量来自于我们所有的事业伙伴以及做该做的事情来生存。" #: src/npctalk.cpp msgid "Well, I am helping you out..." -msgstr "那个，我正在帮你……" +msgstr "那个，我正在帮你..." #: src/npctalk.cpp msgid "Well, I guess it's just us." @@ -116254,10 +116388,10 @@ msgid "" "them. Since most survivors have have nothing they want, they are welcomed " "as champions." msgstr "" -"好吧……在守护者征召我之前，我一直就像是平民百姓，我就对你有话直说了。他们是我" -"们目前的最大希望。虽然现在力量薄弱，但他们会为了维持秩序不择手段。他们不在乎" -"小偷，因为他们明白大部分的人都死了，但是如果你有他们需要的东西……你 '理应' 给" -"他们。大部分的幸存者都已经没有他们要的，他们受欢迎的程度像得冠军一样。" +"好吧..。在守护者征召我之前，我一直就像是平民百姓，我就对你有话直说了。他们是" +"我们目前的最大希望。虽然现在力量薄弱，但他们会为了维持秩序不择手段。他们不在" +"乎小偷，因为他们明白大部分的人都死了，但是如果你有他们需要的东西..。你 '理" +"应' 给他们。大部分的幸存者都已经没有他们要的，他们受欢迎的程度像得冠军一样。" #: src/npctalk.cpp msgid "What about it?" @@ -116328,12 +116462,12 @@ msgid "" "What? I'm a barber... I cut hair. There's demand for cheap cuts and a " "shave out here." msgstr "" -"什么？呃，我是个理发师……我给人们理发。这里很多人愿意花点钱剪个头或者修剪胡" +"什么？呃，我是个理发师...我给人们理发。这里很多人愿意花点钱剪个头或者修剪胡" "须。" #: src/npctalk.cpp msgid "Whatever they did it must have worked since we are still alive..." -msgstr "不论他们做了什么，都一定成功了。因为我们还活着……" +msgstr "不论他们做了什么，都一定成功了。因为我们还活着..." #: src/npctalk.cpp msgid "Whatever. Bye." @@ -116408,7 +116542,7 @@ msgstr "你可以清除障碍了。" #: src/npctalk.cpp msgid "You can keep me safe." -msgstr "你能保护我。" +msgstr "你能保护我." #: src/npctalk.cpp msgid "You can pick up items now." @@ -116416,11 +116550,11 @@ msgstr "你现在可以捡拾物品了。" #: src/npctalk.cpp msgid "You can use grenades." -msgstr "你可以用手雷。" +msgstr "你可以用手雷." #: src/npctalk.cpp msgid "You can use guns." -msgstr "你可以用枪械。" +msgstr "你可以用枪械." #: src/npctalk.cpp msgid "" @@ -116438,7 +116572,7 @@ msgstr "如你所愿，我和你一起走！" #: src/npctalk.cpp msgid "You have no items to offer." -msgstr "" +msgstr "你没有可以提供的物品。" #: src/npctalk.cpp msgid "You just asked me for stuff; ask later." @@ -116446,7 +116580,7 @@ msgstr "你刚刚问我要过东西了，晚点再说吧。" #: src/npctalk.cpp msgid "You might be seeing more of me..." -msgstr "我们还会再见的……" +msgstr "我们还会再见的..." #: src/npctalk.cpp msgid "You mind?" @@ -116487,7 +116621,7 @@ msgstr "你真的要离开？" #: src/npctalk.cpp msgid "You... smelled me?" -msgstr "你……在闻我？" +msgstr "你...在闻我？" #: src/npctalk.cpp #, c-format @@ -116540,11 +116674,11 @@ msgstr "[$10] 来杯威士忌" #: src/npctalk.cpp msgid "[$20,1h] Sure, I could use a bit of help..." -msgstr "[$20，1小时] 是的，我需要个帮手……" +msgstr "[$20，1小时] 是的，我需要个帮手..." #: src/npctalk.cpp msgid "[$200, 30m] I need you to patch me up..." -msgstr "[$200，30分钟]我需要你搭把手……" +msgstr "[$200，30分钟]我需要你搭把手..." #: src/npctalk.cpp msgid "[$2000,1d] 10 logs" @@ -116560,7 +116694,7 @@ msgstr "[$5] 给我刮一下胡子" #: src/npctalk.cpp msgid "[$8000] You have a deal." -msgstr "[$8000] 成交。" +msgstr "[$8000] 做个交易吧." #: src/npctalk.cpp msgid "" @@ -116572,7 +116706,7 @@ msgstr "[智力 11] 我认为我能组织回收工作，增加拾荒者的收获 msgid "" "[INT 12] Wait, six buses and refugees... how many people do you still have " "crammed in here?" -msgstr "[智力 12] 等下，六卡车人还有原先的难民……你这儿现在还有多少人？" +msgstr "[智力 12] 等下，六卡车人还有原先的难民...你这儿现在还有多少人？" #: src/npctalk.cpp msgid "[MISSION] The captain sent me to get a frequency list from you." @@ -116749,7 +116883,7 @@ msgstr "行驶中视图自动转向" #: src/options.cpp msgid "Automatic Zombie Advancement" -msgstr "" +msgstr "自动丧尸前进" #: src/options.cpp msgid "Autumn" @@ -117018,6 +117152,8 @@ msgid "" "delay between each turn, in seconds. Works best with Safemode disabled. 0 = " "disabled." msgstr "" +"如果激活，丧尸会每隔一段时间自动前进。这个值是每回合之间的间隔，按秒计算。将" +"安全模式关闭效果更好。0为关闭。（调试标记）" #: src/options.cpp msgid "" @@ -117355,7 +117491,7 @@ msgstr "自动保存所需的游戏回合数" #: src/options.cpp msgid "Number of real time minutes between autosaves" -msgstr "自动保存所需的现实分钟数。" +msgstr "自动保存所需的现实分钟数." #: src/options.cpp msgid "" @@ -117624,7 +117760,7 @@ msgstr "初始即被包围" #: src/options.cpp msgid "Switch Language. Requires restart." -msgstr "切换语言。需要重启。" +msgstr "切换语言.需要重启." #: src/options.cpp msgid "Switch between Celsius and Fahrenheit." @@ -117632,7 +117768,7 @@ msgstr "在摄氏温度（C）与华氏（F）温度之间切换。" #: src/options.cpp msgid "Switch between a narrower or wider sidebar. Requires restart." -msgstr "切换侧栏为宽或窄。需要重启。" +msgstr "切换侧栏为宽或窄.需要重启." #: src/options.cpp msgid "Switch between kg and lbs." @@ -117645,7 +117781,7 @@ msgstr "Km/h与mph之间切换。" #: src/options.cpp msgid "" "Switch between sidebar on the left or on the right side. Requires restart." -msgstr "切换侧边栏为左侧或右侧。需要重启。" +msgstr "切换侧边栏为左侧或右侧.需要重启." #: src/options.cpp msgid "" @@ -117733,7 +117869,7 @@ msgstr "如果启用，安全模式会在驾驶过程中监测敌意生物并发 #: src/options.cpp msgid "Where new sidebar log messages should show." -msgstr "新的侧边栏日志在哪里出现。" +msgstr "新的侧边栏日志在哪里出现." #. ~ sidebar style #: src/options.cpp @@ -117754,7 +117890,7 @@ msgstr "默认世界" #: src/options.cpp msgid "options" -msgstr "选项" +msgstr " 选项 " #. ~ item health bars #: src/output.cpp @@ -117783,7 +117919,7 @@ msgstr "大小写敏感" #: src/output.cpp msgid "Press any key for more..." -msgstr "按任意键显示更多……" +msgstr "按任意更多..." #: src/output.cpp msgid "\\" @@ -117795,7 +117931,7 @@ msgstr "\\." #: src/output.cpp msgid "bright" -msgstr "明亮" +msgstr "光亮" #: src/output.cpp msgid "cloudy" @@ -118180,7 +118316,7 @@ msgstr "重量 %.1f" #: src/pickup.cpp #, c-format msgid "Wield %s" -msgstr "" +msgstr "手持 %s" #: src/pickup.cpp #, c-format @@ -118294,7 +118430,7 @@ msgstr "\"我想它开始起效了。\"" #: src/player.cpp msgid "\"Of course... it's all fractals!\"" -msgstr "\"当然……全是花花绿绿的！\"" +msgstr "\"当然..。全是花花绿绿的！\"" #: src/player.cpp msgid "\"Oh God, what's happening?\"" @@ -118326,7 +118462,7 @@ msgstr "在大灾变开始时，%1$s是一位%2$s。" #: src/player.cpp #, c-format msgid "%1$s was killed in a %2$s in %3$s." -msgstr "%1$s 被杀死在 %2$s 之中，在 %3$s。" +msgstr "%1$s 被杀死在 %2$s 之中，在 %3$s." #. ~ First parameter is a pronoun ("He"/"She"), second parameter is a terrain name. #: src/player.cpp @@ -118361,7 +118497,7 @@ msgstr "%1$s | %2$s | %3$s" #: src/player.cpp #, c-format msgid "%1$s's %2$s puncture %3$s in mid-attack!" -msgstr "%1$s的%2$s在几步距离外刺中了%3$s！" +msgstr "%1$s的%2$s在几步距离上刺中了%3$s！" #: src/player.cpp #, c-format @@ -118386,7 +118522,7 @@ msgstr "%c-一个空的 %s" #: src/player.cpp #, c-format msgid "%s could read this to you, if they were awake..." -msgstr "" +msgstr "%s 可以读给你听，要是他们醒着的话..." #: src/player.cpp #, c-format @@ -118413,11 +118549,11 @@ msgstr "*哈欠* 你真的该去躺会了。" #: src/player.cpp msgid "Skills:\n" -msgstr "技能：\n" +msgstr "技能:\n" #: src/player.cpp msgid "Time required:\n" -msgstr "" +msgstr "耗时：\n" #: src/player.cpp #, c-format @@ -118427,12 +118563,12 @@ msgstr "被%s抓住，但是挣脱了！" #: src/player.cpp #, c-format msgid " bounces off %s!" -msgstr "弹反了 %s！" +msgstr "反射了 %s！" #: src/player.cpp #, c-format msgid " bounces off a %s!" -msgstr "反弹了一个%s！" +msgstr "反射了一个%s！" #: src/player.cpp #, c-format @@ -118442,7 +118578,7 @@ msgstr "被%s抓住了！" #: src/player.cpp #, c-format msgid " is slammed against %s." -msgstr " 撞击 %s。" +msgstr " 撞击 %s." #: src/player.cpp msgid " loses some blood." @@ -118508,7 +118644,7 @@ msgstr[0] "这本书每个章节需要%d分钟来阅读。" #: src/player.cpp msgid "A fellow survivor reads aloud to you..." -msgstr "一个幸存者大声地念给你听……" +msgstr "一个幸存者大声地念给你听..." #: src/player.cpp msgid "A monster appears nearby!" @@ -118561,7 +118697,7 @@ msgstr "你很快醒来，你休息完之后身体反应更快了。" msgid "" "Awareness seems to only come with a battle... and your body seem to be on " "its side." -msgstr "你正在与睡神进行一场战斗……而你的身体站在你的敌人那边。" +msgstr "你正在与睡神进行一场战斗...而你的身体站在你的敌人那边。" #. ~Sound of buzzing Insect Wings #: src/player.cpp @@ -118609,7 +118745,7 @@ msgstr "半梦半醒之间，你认识到你这么做是出于自愿。" #: src/player.cpp msgid "Break" -msgstr "" +msgstr "损坏" #: src/player.cpp #, c-format @@ -118679,7 +118815,7 @@ msgstr "舒适%s" msgid "" "Covering your mouth will make it more difficult to breathe and catch your " "breath." -msgstr "口部累赘会让你呼吸和喘气变得更加困难。" +msgstr "带口罩会让你呼吸和喘气变得更加困难。" #: src/player.cpp msgid "Crafting Bonus:" @@ -118766,22 +118902,22 @@ msgstr "敏捷影响你的命中率（近战和远程），并与灵巧动作密 #: src/player.cpp msgctxt "memorial_female" msgid "Died of a drug overdose." -msgstr "死于药物过量。" +msgstr "死于药物过量." #: src/player.cpp msgctxt "memorial_male" msgid "Died of a drug overdose." -msgstr "死于药物过量。" +msgstr "死于药物过量." #: src/player.cpp msgctxt "memorial_female" msgid "Died of a healing stimulant overdose." -msgstr "一次啃血包太多，七孔喷血而死。" +msgstr "因医用兴奋剂过量而死。" #: src/player.cpp msgctxt "memorial_male" msgid "Died of a healing stimulant overdose." -msgstr "一次啃血包太多，七孔喷血而死。" +msgstr "因医用兴奋剂过量而死。" #: src/player.cpp msgctxt "memorial_female" @@ -118796,32 +118932,32 @@ msgstr "死于肾上腺素过量。" #: src/player.cpp msgctxt "memorial_female" msgid "Died of datura overdose." -msgstr "死于曼陀罗过量。" +msgstr "死于曼陀罗过量." #: src/player.cpp msgctxt "memorial_male" msgid "Died of datura overdose." -msgstr "死于曼陀罗过量。" +msgstr "死于曼陀罗过量." #: src/player.cpp msgctxt "memorial_female" msgid "Died of starvation." -msgstr "死于饥饿。" +msgstr "死于饥饿." #: src/player.cpp msgctxt "memorial_male" msgid "Died of starvation." -msgstr "死于饥饿。" +msgstr "死于饥饿." #: src/player.cpp msgctxt "memorial_female" msgid "Died of thirst." -msgstr "死于口渴。" +msgstr "渴死." #: src/player.cpp msgctxt "memorial_male" msgid "Died of thirst." -msgstr "死于口渴。" +msgstr "渴死." #: src/player.cpp #, c-format @@ -118969,10 +119105,6 @@ msgstr "几道光芒在你身边闪烁，你被传送了。" msgid "Good mood +%s%d%%" msgstr "好心情 +%s%d%%" -#: src/player.cpp -msgid "Gun:" -msgstr "射击模式：" - #: src/player.cpp msgid "He" msgstr "他" @@ -118980,7 +119112,7 @@ msgstr "他" #: src/player.cpp msgid "" "Head encumbrance has no effect; it simply limits how much you can put on." -msgstr "头部累赘没有任何效果；能穿的上就尽管穿。" +msgstr "头部负重没有任何影响；它仅限于你能穿多少。" #: src/player.cpp #, c-format @@ -119144,11 +119276,11 @@ msgstr "近战命中加成：" #: src/player.cpp msgid "Mend" -msgstr "" +msgstr "修复" #: src/player.cpp msgid "Mend which fault?" -msgstr "修复什么故障？" +msgstr "开始修理这个故障?" #: src/player.cpp msgid "Near starving" @@ -119505,22 +119637,22 @@ msgstr "死于哮喘发作。" #: src/player.cpp msgctxt "memorial_female" msgid "Succumbed to lack of sleep." -msgstr "生前你不睡觉故，死于长眠。" +msgstr "死于缺少睡眠。" #: src/player.cpp msgctxt "memorial_male" msgid "Succumbed to lack of sleep." -msgstr "生前你不睡觉故，死于长眠。" +msgstr "死于缺少睡眠。" #: src/player.cpp msgctxt "memorial_female" msgid "Succumbed to the infection." -msgstr "死于感染。" +msgstr "死于感染." #: src/player.cpp msgctxt "memorial_male" msgid "Succumbed to the infection." -msgstr "死于感染。" +msgstr "死于感染." #: src/player.cpp msgid "Suddenly, you can't hear anything!" @@ -119532,7 +119664,7 @@ msgstr "突然，你什么也看不到了！" #: src/player.cpp msgid "Survivor sleep now." -msgstr "这位幸存者总算睡着了…" +msgstr "这位幸存者总算睡着了。" #: src/player.cpp #, c-format @@ -119557,7 +119689,7 @@ msgstr "无法单手持有 %s。" #: src/player.cpp #, c-format msgid "The %s doesn't have any faults to mend." -msgstr "%s 没有故障可以修复。" +msgstr "%s上没有任何需要修的故障." #: src/player.cpp #, c-format @@ -119638,11 +119770,11 @@ msgstr "" #: src/player.cpp msgid "The sunlight is really irritating your eyes." -msgstr "" +msgstr "太阳光让你的眼睛不舒服。" #: src/player.cpp msgid "The sunlight is really irritating your skin." -msgstr "" +msgstr "太阳光让你的皮肤不舒服。" #: src/player.cpp #, c-format @@ -119749,7 +119881,7 @@ msgstr "打开技能训练" #: src/player.cpp msgid "Toggle which fault?" -msgstr "" +msgstr "切换什么故障？" #: src/player.cpp #, c-format @@ -119784,7 +119916,7 @@ msgstr "克服了%s上瘾。" #: src/player.cpp msgid "Trap detection level:" -msgstr "埋设物探测强度：" +msgstr "陷阱侦测水平：" #: src/player.cpp #, c-format @@ -119827,7 +119959,7 @@ msgstr "渴坏了" #: src/player.cpp msgctxt "movement-type" msgid "W" -msgstr "走" +msgstr "西" #: src/player.cpp #, c-format @@ -119955,12 +120087,12 @@ msgstr "你现在是拿着一个空的%s。" #: src/player.cpp #, c-format msgid "You are slammed against %s for %d damage." -msgstr "你撞击 %s 造成 %d 点伤害。" +msgstr "你撞击 %s 造成 %d 点伤害." #: src/player.cpp #, c-format msgid "You are slammed against %s." -msgstr "你撞击 %s。" +msgstr "你撞击 %s." #: src/player.cpp msgid "You are sweating profusely." @@ -119974,12 +120106,12 @@ msgstr "你太虚弱了，无法单手持有 %s。" #: src/player.cpp #, c-format msgid "You bounce off %s!" -msgstr "你弹反了 %s！" +msgstr "你反射了 %s！" #: src/player.cpp #, c-format msgid "You bounce off a %s!" -msgstr "你反弹了一个 %s！" +msgstr "你反射了一个 %s！" #: src/player.cpp #, c-format @@ -120043,11 +120175,11 @@ msgstr "你无法在其他衣物之上装备动力装甲！" #: src/player.cpp msgid "You can't wear that, it's filthy!" -msgstr "" +msgstr "你不能穿那个，太脏了！" #: src/player.cpp msgid "You can't wear that, it's made of wool!" -msgstr "你不能穿这个（痒……痒……），它是用羊毛制成的！" +msgstr "你不能穿这个（痒..痒..），它是用羊毛制成的！" #: src/player.cpp #, c-format @@ -120062,7 +120194,7 @@ msgstr "你不能卸下你的%s。" #: src/player.cpp #, c-format msgid "You cannot wear a helmet over your %s." -msgstr "你不能在你的 %s 之上戴头盔。" +msgstr "你不能在你的 %s 之上戴头盔." #: src/player.cpp #, c-format @@ -120085,7 +120217,7 @@ msgstr "你没有多余的手来穿它！" #: src/player.cpp msgid "You don't have compatible guns." -msgstr "" +msgstr "你没有适合的枪。" #: src/player.cpp msgid "You don't have that item. " @@ -120173,7 +120305,7 @@ msgstr "你感觉一阵胃痛。" msgid "" "You feel so sick, like you've been poisoned, but you need more. So much " "more." -msgstr "你感到很难受，好像中了毒似的，但你还渴求着更多、更加多。" +msgstr "你感到好难受，好像中了毒似的，但你还需要更多、非常多。" #: src/player.cpp #, c-format @@ -120233,7 +120365,7 @@ msgstr "你起床时感觉挺好，仿佛所有的小病痛都快速地褪去。 #: src/player.cpp msgid "You get up with a bit of a scratch in your throat." -msgstr "你起床时感觉喉咙有点儿卡。" +msgstr "你醒来后觉得喉咙有点疼。" #: src/player.cpp msgid "You have a sudden heart attack!" @@ -120285,7 +120417,7 @@ msgstr "你没有足够的%s来使用%s" #: src/player.cpp #, c-format msgid "You land on %s." -msgstr "你摔在 %s 上。" +msgstr "你摔在 %s 上." #: src/player.cpp #, c-format @@ -120314,7 +120446,7 @@ msgstr "你注意到身上有个大脓包，你戳破了它。" #: src/player.cpp msgid "You pass out!" -msgstr "你意识断片了！" +msgstr "你昏倒了！" #: src/player.cpp msgid "You pass out." @@ -120348,7 +120480,7 @@ msgstr "你恢复了你的工作。" #: src/player.cpp msgid "You retched, but your stomach is empty." -msgstr "" +msgstr "你干呕了一阵，但你的胃已经空了。" #: src/player.cpp msgid "You scream loudly!" @@ -120356,7 +120488,7 @@ msgstr "你大声尖叫!" #: src/player.cpp msgid "You shake with the excess stimulation." -msgstr "过度的刺激使你不由自主地颤抖。" +msgstr "过度的刺激使你不由自主地颤抖." #: src/player.cpp msgid "You shout loudly!" @@ -120386,7 +120518,7 @@ msgstr "你闻到股浓浓的蘑菇味儿，嘴巴里也满是蘑菇的味道。 #: src/player.cpp #, c-format msgid "You snuggle your %s to keep warm." -msgstr "你依偎着 %s 来保暖。" +msgstr "你依偎着%s来保暖." #: src/player.cpp msgid "You spasm suddenly!" @@ -120408,7 +120540,7 @@ msgstr "你开始疯狂抓挠自己的 %s！" #: src/player.cpp msgid "You start to shake uncontrollably." -msgstr "你开始不由自主地颤抖。" +msgstr "你开始不由自主地颤抖." #: src/player.cpp msgid "You stretch, but your muscles don't seem to be doing so good today." @@ -120449,7 +120581,7 @@ msgstr "你突然感到发麻。" #: src/player.cpp msgid "You suddenly feel so numb..." -msgstr "你突然感到麻木……" +msgstr "你突然感到麻木..." #: src/player.cpp msgid "You suddenly feel thirsty." @@ -120517,7 +120649,7 @@ msgstr "你关上了你的闹钟。" #: src/player.cpp #, c-format msgid "You use your %s to keep warm." -msgstr "你用 %s 来保暖。" +msgstr "你用%s来保暖." #: src/player.cpp #, c-format @@ -120527,7 +120659,7 @@ msgstr[0] "你使用了你的吸入剂。只剩下%d的存量了。" #: src/player.cpp msgid "You use your last inhaler charge." -msgstr "你使用了你最后的吸入剂。" +msgstr "你使用了你最后的吸入剂." #: src/player.cpp msgid "You use your pile of clothes for warmth." @@ -120671,7 +120803,7 @@ msgstr "你的%1$s在几步距离上刺中了%2$s！" #: src/player.cpp #, c-format msgid "Your %s HURTS!" -msgstr "你的 %s 剧痛到炸！！" +msgstr "你的 %s 疼屎了！！" #: src/player.cpp #, c-format @@ -120930,7 +121062,7 @@ msgstr "你的头部感到一阵阵热流冲击。" #: src/player.cpp msgid "Your heart spasms and stops." -msgstr "你的心脏痉挛了几下，然后停止了跳动。" +msgstr "你的心脏痉挛了几下停止了跳动。" #: src/player.cpp msgid "" @@ -121004,7 +121136,7 @@ msgstr "你双腿不可控制的在严寒中抖动。" #: src/player.cpp msgid "Your malfunctioning bionic causes you to spasm and fall to the floor!" -msgstr "你的生化插件失灵导致你一阵抽搐……扑街啦!" +msgstr "你的生化插件失灵导致你一阵抽搐...扑街啦!" #: src/player.cpp msgid "Your malfunctioning bionic itches!" @@ -121117,7 +121249,7 @@ msgstr "你的技能等级不会再提升了，但从 %s 里可以学习更多 #: src/player.cpp msgid "Your stomach feels so empty..." -msgstr "你胃空空如也……" +msgstr "你胃空空如也..." #: src/player.cpp msgid "" @@ -121140,7 +121272,7 @@ msgstr "你的思维开始紊乱。" #: src/player.cpp msgid "Your torso is freezing cold. You should put on a few more layers." -msgstr "你的躯体冻僵了。你需要多穿点在身上。" +msgstr "你的躯体冻僵了.你需要多穿点在身上." #: src/player.cpp msgid "Your veins itch." @@ -121152,7 +121284,7 @@ msgstr "你的视野变暗了。" #: src/player.cpp msgid "Your vision is filled with bright lights..." -msgstr "你的眼睛被闪了，眼前白晃晃的……" +msgstr "你的眼睛被闪了，眼前白晃晃的..." #: src/player.cpp msgid "Your vision is getting fuzzy." @@ -121164,7 +121296,7 @@ msgstr "你的视觉像素化了！" #: src/player.cpp msgid "Your visual centers must be acting up..." -msgstr "你的视觉中枢一定是逗比了……" +msgstr "你的视觉中枢一定是逗比了..." #: src/player.cpp msgid "Your webbed hands get in the way." @@ -121199,10 +121331,6 @@ msgstr "鹿角" msgid "armor" msgstr "装甲" -#: src/player.cpp -msgid "auto" -msgstr "自动" - #: src/player.cpp msgid "beep-beep-beep!" msgstr "哔-哔-哔！" @@ -121215,10 +121343,6 @@ msgstr "毛发" msgid "horns" msgstr "角" -#: src/player.cpp -msgid "off " -msgstr "关" - #: src/player.cpp msgid "quills" msgstr "刺" @@ -121253,7 +121377,7 @@ msgstr " 停止建造？" #: src/player_activity.cpp msgid " Stop cracking?" -msgstr "停止分馏？" +msgstr "停止破解？" #: src/player_activity.cpp msgid " Stop crafting?" @@ -121309,7 +121433,7 @@ msgstr " 停止生火？" #: src/player_activity.cpp msgid " Stop mending?" -msgstr "" +msgstr " 停止修复？" #: src/player_activity.cpp msgid " Stop mining?" @@ -121411,7 +121535,7 @@ msgstr "你结束了等待。" #: src/ranged.cpp #, c-format msgid "%c %c Cycle targets; %c to fire." -msgstr "'%c' %c 切换目标； %c 射击。" +msgstr "'%c' %c 循环目标瞄准，然后 %c 开火." #: src/ranged.cpp #, c-format @@ -121421,7 +121545,7 @@ msgstr "按‘%c‘选自己为目标，按'%c'切换到目标单元。" #: src/ranged.cpp #, c-format msgid "%c to aim and fire." -msgstr "'%c' 瞄准然后开火。" +msgstr "'%c' 仔细瞄准然后开火." #: src/ranged.cpp #, c-format @@ -121436,12 +121560,12 @@ msgstr "%c 切换瞄准模式。" #: src/ranged.cpp #, c-format msgid "%c to take careful aim and fire." -msgstr "'%c' 仔细瞄准然后开火。" +msgstr "'%c' 仔细瞄准然后开火." #: src/ranged.cpp #, c-format msgid "%c to take precise aim and fire." -msgstr "'%c' 精确瞄准然后开火。" +msgstr "'%c' 精确瞄准然后开火." #: src/ranged.cpp #, c-format @@ -121771,7 +121895,7 @@ msgstr "听到了一阵杂音！" #: src/sounds.cpp msgid "Something is making noise." -msgstr "某个东西正在制造噪音。" +msgstr "某个东西正在制造噪音." #: src/sounds.cpp msgid "Your eardrums suddenly ache!" @@ -122290,7 +122414,7 @@ msgstr "你避开了射击！" #: src/trapfunc.cpp msgid "You fail to attach it..." -msgstr "你什么也没够着……" +msgstr "你什么也没够着..." #: src/trapfunc.cpp msgid "You fall down a level!" @@ -122443,7 +122567,8 @@ msgid "" " You also need either lifting equipment or " "%3$d strength." msgstr "" -"你还需要 起重设备 或 %3$d 点力量。" +" 你还需要某种 起重工具 或 %3$d 的力" +"量来徒手抬起." #: src/veh_interact.cpp #, c-format @@ -122462,22 +122587,22 @@ msgstr " 你需要%2$d级的机械技能才能安装额外 #: src/veh_interact.cpp #, c-format msgid " and level %2$d skill in mechanics." -msgstr "和 %2$d 级机械技能。" +msgstr "和 %2$d 级的机械技能." #: src/veh_interact.cpp #, c-format msgid "* Faulty %1$s" -msgstr "" +msgstr "* 故障的 %1$s" #: src/veh_interact.cpp #, c-format msgid ", a screwdriver or duct tape" -msgstr "， 螺丝刀 及 强力胶带" +msgstr "，螺丝刀 或者 强力胶带" #: src/veh_interact.cpp #, c-format msgid ", a wrench or duct tape" -msgstr "， 扳手 或 强力胶带" +msgstr "，扳手 或 强力胶带" #: src/veh_interact.cpp #, c-format @@ -122485,8 +122610,8 @@ msgid "" ", a wrench, either a powered welder " "(and welding goggles) or duct tape" msgstr "" -"， 扳手 ， 有能量的焊枪 （及 电焊护目镜）或 强力胶带" +"，扳手,或 焊接工具 (和 焊" +"接护目镜) 或 强力胶带" #: src/veh_interact.cpp #, c-format @@ -122494,7 +122619,7 @@ msgid "" ", either nails and something to drive them or duct tape" msgstr "" -"， 钉子 及 钉钉子的工具 或 钉子 以及 某种敲打工具 或者 强力胶带" #: src/veh_interact.cpp @@ -122511,7 +122636,7 @@ msgstr "安装" #: src/veh_interact.cpp msgid "end" -msgstr "" +msgstr "修复" #: src/veh_interact.cpp msgid "epair" @@ -122599,7 +122724,7 @@ msgstr "选择一个新的车前灯方向。" #: src/veh_interact.cpp msgid "Choose a part here to mend:" -msgstr "" +msgstr "选择一个要修复的部件：" #: src/veh_interact.cpp msgid "Choose a part here to remove:" @@ -122718,7 +122843,7 @@ msgstr "名字： " #: src/veh_interact.cpp #, c-format msgid "Needs %2$s" -msgstr "需要 %2$s" +msgstr "需要%2$s" #: src/veh_interact.cpp msgid "New label:" @@ -122726,7 +122851,7 @@ msgstr "新标签：" #: src/veh_interact.cpp msgid "No faulty parts here." -msgstr "" +msgstr "这里没有故障的部件。" #: src/veh_interact.cpp msgid "No parts here." @@ -122814,8 +122939,8 @@ msgid "" "To change a wheel you need a wrench and either lifting equipment or %4$d strength." msgstr "" -"更换轮胎需要 扳手 和 起重设备 或 " -"%4$d 点力量。" +"想换轮胎你需要 扳手 以及 起重设备 或 " +"%4$d的力量来徒手抬起." #: src/veh_interact.cpp msgctxt "Vehicle Parts|" @@ -122888,7 +123013,7 @@ msgstr "目前在驾驶中，不能安装部件。" #: src/veh_interact.cpp msgid "You can't mend stuff while driving." -msgstr "" +msgstr "你在开车时不能同时修复部件。" #: src/veh_interact.cpp msgid "You can't refill the vehicle while driving." @@ -122923,7 +123048,7 @@ msgstr "你需要" #: src/veh_interact.cpp #, c-format msgid "You need a hammer and" -msgstr "你需要 锤子 及" +msgstr "你需要 锤子 和" #: src/veh_interact.cpp #, c-format @@ -122937,12 +123062,12 @@ msgstr "" #: src/veh_interact.cpp #, c-format msgid "You need a screwdriver and" -msgstr "你需要 螺丝刀 及" +msgstr "你需要 螺丝刀 和" #: src/veh_interact.cpp #, c-format msgid "You need a wrench and" -msgstr "你需要 扳手 及" +msgstr "你需要 扳手 和" #: src/veh_interact.cpp #, c-format @@ -122950,8 +123075,8 @@ msgid "" "You need a wrench and a hacksaw, cutting " "torch and welding goggles, or circular saw (off) and" msgstr "" -"你需要 扳手 和 钢锯，焊炬（及电焊护目镜）或者" -"圆锯（关） 及" +"你需要扳手 和某种 钢锯,割焊工具和护目镜,或圆" +"锯(关) 和" #: src/veh_interact.cpp #, c-format @@ -122959,8 +123084,8 @@ msgid "" "You need a wrench, either lifting equipment or %4$d strength and" msgstr "" -"你需要 扳手 和 起重设备 或 %4$d 点力量及" +"你需要 扳手，和 起重设备 或 %4$d 的力量徒手抬起，和" #: src/veh_interact.cpp msgid "You need a hose to siphon liquid fuel." @@ -122992,11 +123117,11 @@ msgstr "你情绪低落，没法干活。。。" #: src/veh_interact.cpp msgid "Your morale is too low to mend..." -msgstr "" +msgstr "你的情绪低落无法修复物品..." #: src/veh_interact.cpp msgid "Your morale is too low to repair..." -msgstr "你的情绪低落无法修理东西……" +msgstr "你的情绪低落无法修理东西..." #: src/veh_interact.cpp msgid "battered" @@ -123052,7 +123177,7 @@ msgstr "残破" #: src/vehicle.cpp msgid " (faulty)" -msgstr "（故障）" +msgstr " (错误的)" #. ~ used/total volume of a cargo vehicle part #: src/vehicle.cpp @@ -123070,11 +123195,6 @@ msgstr "%2.1fL " msgid "%d\"" msgstr "%d\"" -#: src/vehicle.cpp -#, c-format -msgid "%s failed to fire! It isn't loaded and/or powered." -msgstr "%s 无法射击！它没有装弹或者未充能。" - #: src/vehicle.cpp #, c-format msgid "%s points in your direction and emits an IFF warning beep." @@ -123110,10 +123230,6 @@ msgid "" "trying to fold the %s while riding it." msgstr "车下方的金属条就要夹到你了！你真的想在骑车的时候把 %s 折叠起来？" -#: src/vehicle.cpp -msgid "Auto" -msgstr "自动" - #. ~ backfire sound #: src/vehicle.cpp msgid "BANG!" @@ -123134,11 +123250,11 @@ msgstr "哔哔" #: src/vehicle.cpp msgid "BRRROARRR!!" -msgstr "砰砰！" +msgstr "BRRROARRR!!" #: src/vehicle.cpp msgid "BRUMBRUMBRUMBRUM!!!" -msgstr "突突突！" +msgstr "BRUMBRUMBRUMBRUM!!!" #: src/vehicle.cpp msgid "Camera system disabled" @@ -123176,10 +123292,6 @@ msgstr "铛！" msgid "Close" msgstr "关闭" -#: src/vehicle.cpp -msgid "Configure individual turrets" -msgstr "设置独立炮台" - #: src/vehicle.cpp msgid "Control individual engines" msgstr "控制独立引擎" @@ -123196,32 +123308,10 @@ msgstr "定速巡航打开了" msgid "Cugugugugug" msgstr "突！突突！" -#: src/vehicle.cpp -msgid "Cycle turret mode" -msgstr "切换炮塔模式" - -#: src/vehicle.cpp -msgid "Deactivating automatic target acquisition for this turret" -msgstr "停用炮塔自动目标捕获" - #: src/vehicle.cpp msgid "Disable cruise control" msgstr "关闭定速巡航" -#: src/vehicle.cpp -msgid "Disable turrets" -msgstr "停用炮塔" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling automatic target acquisition on %s" -msgstr "停用%s的自动目标锁定" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling turret %s." -msgstr "关闭炮塔 %s" - #: src/vehicle.cpp msgid "Do nothing" msgstr "什么都不做" @@ -123238,10 +123328,6 @@ msgstr "内顶灯打开了" msgid "Enable cruise control" msgstr "打开定速巡航" -#: src/vehicle.cpp -msgid "Enable turrets" -msgstr "启用炮塔" - #. ~ indicates that a vehicle part is outside #: src/vehicle.cpp msgid "Exterior" @@ -123318,7 +123404,7 @@ msgstr "超出距离，失去了对载具的连接！" #: src/vehicle.cpp msgid "More parts here..." -msgstr "更多部件……" +msgstr "更多部件..." #: src/vehicle.cpp msgid "NEEeu NEEeu NEEeu" @@ -123328,10 +123414,6 @@ msgstr "嘀——嘟——嘀——嘟——" msgid "No controls there." msgstr "那里没有控制器。" -#: src/vehicle.cpp -msgid "No target" -msgstr "无目标" - #: src/vehicle.cpp msgid "Open" msgstr "打开" @@ -123362,7 +123444,7 @@ msgstr "犁具已关闭" #: src/vehicle.cpp msgid "ROARRR!" -msgstr "呜～～！" +msgstr "ROARRR!" #: src/vehicle.cpp msgid "Reactor turned off" @@ -123397,19 +123479,16 @@ msgid "Select door to toggle" msgstr "选择门来开关" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to buggy mode." -msgstr "调节炮塔%s至BUG模式。" +msgid "Set turret firing modes" +msgstr "设置炮塔射击模式" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to burst mode." -msgstr "把炮塔 %s 切换到连发模式" +msgid "Set turret targeting" +msgstr "设置炮塔目标" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to single-fire mode." -msgstr "把炮塔 %s 切换到单发模式" +msgid "Set turret targeting modes" +msgstr "设置炮塔瞄准模式" #: src/vehicle.cpp msgid "Stop controlling" @@ -123456,6 +123535,11 @@ msgstr "%1$s 的 %s 从 %2$s 上压了过去。" msgid "The %s doesn't have enough wheels to move!" msgstr "%s轮胎不足，无法启动！" +#: src/vehicle.cpp +#, c-format +msgid "The %s is stuck." +msgstr "%s卡住了！" + #: src/vehicle.cpp #, c-format msgid "The %s is too leaky!" @@ -123464,7 +123548,7 @@ msgstr "这个 %s 漏的很厉害" #: src/vehicle.cpp #, c-format msgid "The %s makes a long beeping sound." -msgstr "%s 发出长久的蜂鸣声。" +msgstr "%s发出\"哔-----哔-----哔-----\"的长时间提示音." #: src/vehicle.cpp #, c-format @@ -123474,7 +123558,7 @@ msgstr "%s发出急促的喀喇声。" #: src/vehicle.cpp #, c-format msgid "The %s makes a single clicking sound." -msgstr "%s 发出一声喀喇声。" +msgstr "%s发出\"咔哒\"声." #: src/vehicle.cpp #, c-format @@ -123484,7 +123568,7 @@ msgstr "%s发出可怕的铿铿声。" #: src/vehicle.cpp #, c-format msgid "The %s quickly stutters out." -msgstr "%s 突突响了几下就挂了。" +msgstr "%s快速的熄火了。" #: src/vehicle.cpp #, c-format @@ -123591,14 +123675,6 @@ msgstr "音响没开！" msgid "The vehicle part you were working on has gone!" msgstr "你正在施工的载具部件不见啦！" -#: src/vehicle.cpp -msgid "This turret can't be aimed manually" -msgstr "这个炮塔无法手动瞄准" - -#: src/vehicle.cpp -msgid "This turret doesn't have enough ammo" -msgstr "这个炮台弹药不足" - #: src/vehicle.cpp msgid "This turret is not powered" msgstr "这个炮塔供能不足" @@ -123765,26 +123841,6 @@ msgstr "已打开风铃" msgid "Turned on music" msgstr "打开音乐" -#: src/vehicle.cpp -msgid "Turret system is on, but all turrets are configured not to shoot." -msgstr "炮塔系统已打开，但是所有炮塔被设置成禁止射击。" - -#: src/vehicle.cpp -msgid "Turrets have been configured, but the vehicle turret system is off." -msgstr "炮塔已设置完成，但炮塔系统整体关闭中。" - -#: src/vehicle.cpp -msgid "Turrets: Disabled" -msgstr "炮塔：已停用" - -#: src/vehicle.cpp -msgid "Turrets: Enabled" -msgstr "炮塔：已启用" - -#: src/vehicle.cpp -msgid "Unseen" -msgstr "未发现" - #: src/vehicle.cpp msgid "Vehicle controls" msgstr "车辆控制" @@ -123821,17 +123877,17 @@ msgstr "你损坏了控制器。" #: src/vehicle.cpp msgid "You destroy the controls..." -msgstr "你摧毁了控制器……" +msgstr "你摧毁了控制器..." #: src/vehicle.cpp #, c-format msgid "You don't find any keys in the %s." -msgstr "你没在 %s 里找到任何钥匙。" +msgstr "你没在%s里找到任何钥匙。" #: src/vehicle.cpp #, c-format msgid "You don't find any keys in the %s. Attempt to hotwire vehicle?" -msgstr "你没在 %s 里找到钥匙，想不想试着拔出来嚓嚓嚓一下？" +msgstr "你没在%s里找到钥匙，想不想试着拔出来嚓嚓嚓一下？" #: src/vehicle.cpp msgid "You honk the horn!" @@ -123915,6 +123971,10 @@ msgstr "你的发动机发出了很大的摩擦声。" msgid "a simple melody blaring from the loudspeakers." msgstr "一首简单的旋律从扬声器中响起。" +#: src/vehicle.cpp +msgid "auto" +msgstr "自动" + #. ~ Beeper sound #: src/vehicle.cpp msgid "beep!" @@ -123927,19 +123987,23 @@ msgstr "折叠了 %s" #: src/vehicle.cpp msgid "hummm!" -msgstr "嗡嗡嗡！" +msgstr "hummm!" + +#: src/vehicle.cpp +msgid "manual" +msgstr "手动" #: src/vehicle.cpp msgid "roarrr!" -msgstr "呜～！" +msgstr "roarrr!" #: src/vehicle.cpp msgid "vroom!" -msgstr "嗡～！" +msgstr "vroom!" #: src/vehicle.cpp msgid "whirrr!" -msgstr "吱～！" +msgstr "whirrr!" #: src/vehicle_group.cpp msgid "pile-up" @@ -124021,7 +124085,7 @@ msgstr "你的 %s 保护你免受酸雨的伤害。" #: src/weather.cpp msgid "Your clothing protects you from the acid rain." -msgstr "你的衣服可以保护你免受酸雨伤害。" +msgstr "你的衣服可以保护你免受酸雨伤害." #: src/weather.cpp msgid "Your clothing protects you from the acidic drizzle." @@ -124037,7 +124101,7 @@ msgstr "你的动力装甲保护你免受酸雨的伤害。" #: src/weather.cpp msgid "Your umbrella protects you from the acid rain." -msgstr "你的雨伞可以保护你免受酸雨伤害。" +msgstr "你的雨伞可以保护你免受酸雨伤害." #: src/weather.cpp msgid "middle of nowhere" @@ -124094,22 +124158,22 @@ msgstr "雷暴雨" #: src/weather_data.cpp msgctxt "season_name" msgid "autumn" -msgstr "秋季" +msgstr ".秋季" #: src/weather_data.cpp msgctxt "season_name" msgid "spring" -msgstr "春季" +msgstr ".春季" #: src/weather_data.cpp msgctxt "season_name" msgid "summer" -msgstr "夏季" +msgstr ".夏季" #: src/weather_data.cpp msgctxt "season_name" msgid "winter" -msgstr "冬季" +msgstr ".冬季" #: src/wish.cpp msgid " (contained)" @@ -124206,11 +124270,11 @@ msgstr "选择要修改的技能：" #: src/wish.cpp #, c-format msgid "Set '%s' to.." -msgstr "设置 '%s' 为……" +msgstr "设置 '%s' 为..." #: src/wish.cpp msgid "Set to 0" -msgstr "" +msgstr "设为0" #: src/wish.cpp msgid "Set to 10" From 30d754ef4d237927ee8fbaa00ca4691f63999b27 Mon Sep 17 00:00:00 2001 From: Vlasov Vitaly Date: Thu, 9 Jun 2016 21:04:37 +0300 Subject: [PATCH 102/110] Taiwan update --- lang/po/zh_TW.po | 3531 +++++++++++++++++++++++++--------------------- 1 file changed, 1888 insertions(+), 1643 deletions(-) diff --git a/lang/po/zh_TW.po b/lang/po/zh_TW.po index 0391b8b1533c1..0331548e96bff 100644 --- a/lang/po/zh_TW.po +++ b/lang/po/zh_TW.po @@ -33,9 +33,9 @@ msgid "" msgstr "" "Project-Id-Version: Cataclysm-DDA\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-30 09:53+0300\n" -"PO-Revision-Date: 2016-06-01 06:11+0000\n" -"Last-Translator: Hao JK \n" +"POT-Creation-Date: 2016-06-06 10:20+0300\n" +"PO-Revision-Date: 2016-06-06 08:46+0000\n" +"Last-Translator: Vlasov Vitaly \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/cataclysm-dda-" "translators/cataclysm-dda/language/zh_TW/)\n" "Language: zh_TW\n" @@ -444,7 +444,7 @@ msgstr[0] ".700 NX 彈殼" #: lang/json/AMMO_from_json.py msgid "00 shot" msgid_plural "00 shot" -msgstr[0] "獵鹿散彈" +msgstr[0] "獵鹿霰彈" #: lang/json/AMMO_from_json.py msgid "10mm Auto" @@ -821,7 +821,7 @@ msgstr[0] "7.62 NATO 曳光彈" #: lang/json/AMMO_from_json.py msgid "7.62x25mm FMJ hot load" msgid_plural "7.62x25mm FMJ hot load" -msgstr[0] "" +msgstr[0] "7.62x25mm FMJ hot load" #: lang/json/AMMO_from_json.py msgid "7.62x25mm JHP" @@ -831,7 +831,7 @@ msgstr[0] "7.62x25mm 空尖彈" #: lang/json/AMMO_from_json.py msgid "7.62x25mm Type P" msgid_plural "7.62x25mm Type P" -msgstr[0] "" +msgstr[0] "7.62x25mm Type P" #: lang/json/AMMO_from_json.py msgid "7.62x39mm M43" @@ -1049,6 +1049,8 @@ msgid "" "Eastern Bloc during the 20th century and remained in Russian military " "service into the 21st century." msgstr "" +"9x18mm 馬卡洛夫 SP-7 子彈。9x18mm 子彈在二十世紀的東歐相當普及，即使到了廿一" +"世紀時仍可見於俄國軍隊中。" #. ~ Description for 9x18mm 57-N-181S #: lang/json/AMMO_from_json.py @@ -1057,6 +1059,8 @@ msgid "" "round was very common in the Eastern Bloc during the 20th century and " "remained in Russian military service into the 21st century." msgstr "" +"9x18mm 馬卡洛夫子彈使用以金屬包覆鋼蕊的93格令彈頭。9x18mm 子彈在二十世紀的東" +"歐相當普及，即使到了廿一世紀時仍可見於俄國軍隊中。" #: lang/json/AMMO_from_json.py msgid "9x18mm RG028" @@ -1136,8 +1140,8 @@ msgid "" "amount of buckshot. Effectively similar to no-longer-produced canister " "shot, but of lower quality." msgstr "" -"一發安裝了新型電動底火的120釐米砲彈，砲彈內填充了大量的散彈。實際上與不再生產" -"的罐裝散彈相當相似，但質量比較低。" +"一發安裝了新型電動底火的120釐米砲彈，砲彈內填充了大量的霰彈。實際上與不再生產" +"的罐裝霰彈相當相似，但質量比較低。" #. ~ Description for makeshift 120mm slug #: lang/json/AMMO_from_json.py @@ -1145,7 +1149,7 @@ msgid "" "A 120mm shell with a new electric primer installed, loaded with a large " "handmade slug. While hardly ideal, it packs quite a punch." msgstr "" -"一發安裝了新型電動底火的120釐米砲彈，砲彈內填充了大量的手工製重擊散彈。雖然火" +"一發安裝了新型電動底火的120釐米砲彈，砲彈內填充了大量的手工製重擊霰彈。雖然火" "力來講不太理想，但是依舊非常有效。" #. ~ Description for 155mm HEAT @@ -1162,7 +1166,7 @@ msgid "" "amount of buckshot. Effectively turns a howitzer into a punt gun on " "steroids." msgstr "" -"一發安裝了新型電動底火的155釐米砲彈，砲彈內填充了巨量的散彈。實際上將一台自走" +"一發安裝了新型電動底火的155釐米砲彈，砲彈內填充了巨量的霰彈。實際上將一台自走" "砲轉變成一台打了類固醇的平底船槍。" #. ~ Description for reloaded 155mm slug @@ -1172,7 +1176,7 @@ msgid "" "handmade slug. Despite the lower effectiveness, whatever it hits is sure to " "feel it." msgstr "" -"一發安裝了新型電動底火的155釐米砲彈，砲彈內填充了巨量的手工製重擊散彈。雖然火" +"一發安裝了新型電動底火的155釐米砲彈，砲彈內填充了巨量的手工製重擊霰彈。雖然火" "力上來講很低效，但被其打中的生物絕對不會有這種想法。" #. ~ Description for long string @@ -1394,6 +1398,13 @@ msgstr "一盒鐵釘，通常和鎚子配合使用。" msgid "A box of small steel balls. They deal virtually no damage." msgstr "一盒小鋼球。幾乎沒有殺傷力。" +#. ~ Description for .44 FMJ +#: lang/json/AMMO_from_json.py +msgid "" +"A brass-jacketed variant of the .44 Magnum round. This increases " +"penetration slightly at the cost of reduced damage from expansion." +msgstr "" + #. ~ Description for blue paint #: lang/json/AMMO_from_json.py msgid "A can of blue paint." @@ -1678,7 +1689,7 @@ msgid "" "A heavy metal slug used with shotguns to give them the range capabilities of " "a rifle. Extremely damaging but rather inaccurate." msgstr "" -"單顆全金屬彈頭的設計能讓散彈槍擊中較遠的目標，能造成極大傷害但不甚準確。" +"單顆全金屬彈頭的設計能讓霰彈槍擊中較遠的目標，能造成極大傷害但不甚準確。" #. ~ Description for nuclear bolt #: lang/json/AMMO_from_json.py @@ -1748,6 +1759,7 @@ msgid "" "A high-pressure commercial version of the 7.62x25mm cartridge, loaded with a " "85 gr. FMJ bullet. It is more powerful than the original." msgstr "" +"高壓商業版的7.62x25mm彈匣，裝有85格令金屬包覆子彈，比原本的子彈更具威力。" #. ~ Description for denatured alcohol #: lang/json/AMMO_from_json.py @@ -2052,6 +2064,8 @@ msgid "" "sharpened on one end. Could be used as a projectile by a sufficiently " "powerful electromagnetic weapon." msgstr "" +"一小段被拉直的鐵磁螺紋鋼筋，末端被磨尖了。能夠利用電磁武器來將其拋射出去當做" +"子彈。" #. ~ Description for steel rail #: lang/json/AMMO_from_json.py @@ -2060,6 +2074,8 @@ msgid "" "Could be used as a projectile by a sufficiently powerful electromagnetic " "weapon." msgstr "" +"一小段被鍛造過的堅硬鋼筋，末端被磨尖了。能夠利用電磁武器來將其拋射出去當做子" +"彈。" #. ~ Description for makeshift shotgun slug #: lang/json/AMMO_from_json.py @@ -2068,7 +2084,7 @@ msgid "" "around. It is fairly inaccurate, and does little damage, but it works in a " "pinch." msgstr "" -"一個散彈殼隨便裝了一個東西當裝填物。命中率不高，並且傷害也不大，在緊要關頭就" +"一個霰彈殼隨便裝了一個東西當裝填物。命中率不高，並且傷害也不大，在緊要關頭就" "勉強使用吧。" #. ~ Description for flechette shell @@ -2131,9 +2147,8 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "A simple arrow shaft that has had a point carved into it and then fire-" -"hardened. Needs fletching to be worth firing from a bow." +"hardened. It needs fletching to be worth firing from a bow." msgstr "" -"一個簡易箭桿，前方己經削成一個箭頭，並且經過火燒碳化‧需要一個箭羽才可以發射" #. ~ Description for ammo belt linkage #: lang/json/AMMO_from_json.py @@ -2189,7 +2204,7 @@ msgstr "一團有著強烈脈動的氣團。這東西是從生物身上吸取而 msgid "" "A strange glowing mote of wispy vapor. It gives off a soothing warmth and " "feels surprisingly solid, almost alive even." -msgstr "" +msgstr "一團有著強烈脈動的氣團。感覺溫溫的而且有著固體觸感，好像生物一樣。" #. ~ Description for 7.62x25mm Type P #: lang/json/AMMO_from_json.py @@ -2198,6 +2213,8 @@ msgid "" "firearms. It offers good armor penetration at the cost of slightly less " "damage." msgstr "" +"從7.62x25mm衍生出的亞音速彈藥，專為無聲槍枝設計，提供良好的穿甲特性，但犧牲了" +"一點傷害能力。" #. ~ Description for lamp oil #: lang/json/AMMO_from_json.py @@ -2243,6 +2260,8 @@ msgid "" "A tiny pointy steel bolt. Can be fired from a nail gun or similar weapon. " "Much more effective as ammunition but useless for construction projects." msgstr "" +"一個微小尖頭的鋼製螺栓。可從釘槍或類似的武器發射。當成子彈更加有威力，但不能" +"用來施工。" #. ~ Description for sinew #: lang/json/AMMO_from_json.py @@ -2560,7 +2579,7 @@ msgstr "一個空的步槍子彈彈殼。" #. ~ Description for shotgun hull #: lang/json/AMMO_from_json.py msgid "An empty hull from a shotgun shell." -msgstr "一個空的散彈彈殼。" +msgstr "一個空的霰彈彈殼。" #. ~ Description for 5x50mm hull #: lang/json/AMMO_from_json.py @@ -2710,16 +2729,6 @@ msgstr "" "濃過氧化氫溶液是一種強大的氧化劑，與大部分還原劑接觸都會產生劇烈分解。可以用" "作火箭燃料或強烈炸藥。與任何有機物接觸都有可能點燃它們並產生劇烈燃燒。" -#. ~ Description for .22 CB -#: lang/json/AMMO_from_json.py -msgid "" -"Conical Ball .22 is a variety of .22 ammunition with a very small propellant " -"charge and generally lacks gunpowder. The end result is a subsonic round " -"that is so weak as to be nearly useless given your predicament." -msgstr "" -".22 CB (圓錐彈) 是 .22 口徑子彈的一種變體。它只有非常小量的火藥，使它成為一種" -"亞音速子彈。射擊時幾乎沒有聲音，但它貧弱的威力實在對你的困境沒有幫助。" - #. ~ Description for handloaded .22 CB #: lang/json/AMMO_from_json.py msgid "" @@ -3061,6 +3070,8 @@ msgid "" "6.54x42mm rifle cartridge for his new SVS-24 Assault Rifle. This one has " "been hand-reloaded." msgstr "" +"從改進型 .270 彈藥中獲得啟發， Alexander Sarafanov 為他的新型 SVS-24 突擊步槍" +"設計了6.54x42mm 步槍彈。這顆是手工裝配的重填彈。" #. ~ Description for fire lance shot #: lang/json/AMMO_from_json.py @@ -3255,12 +3266,11 @@ msgstr[0] "旋風炸藥" #. ~ Description for .22 rat-shot #: lang/json/AMMO_from_json.py msgid "" -"Rat-shot is extremely weak ammunition, designed for killing rats, snakes, or " -"other small vermin while being unable to damage walls. It has an extremely " -"short range and is unable to injure all but the smallest creatures." +"Rat-shot is an extremely weak .22 shotgun cartridge, designed for killing " +"rats, snakes, or other small vermin while being unable to damage walls. It " +"has an extremely short range and is unable to injure all but the smallest " +"creatures." msgstr "" -"鼠彈是一種非常弱的彈種，專門設計來射殺老鼠、蛇或其他小型害蟲，同時確保不會對" -"牆壁造成傷害。它只有非常短的射程，同時也只能傷害那些最小種類的生物。" #. ~ Description for handloaded .22 rat-shot #: lang/json/AMMO_from_json.py @@ -3386,6 +3396,14 @@ msgstr "" "邪惡小丑效果特好。雖然曾被用來提煉數種化學物質，由於其廣泛的商業用途，最普遍" "的應用仍為電池內的酸液。" +#. ~ Description for .22 CB +#: lang/json/AMMO_from_json.py +msgid "" +"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." +msgstr "" + #. ~ Description for reloaded .300 Winchester Magnum #: lang/json/AMMO_from_json.py msgid "" @@ -3453,6 +3471,8 @@ msgid "" "tungsten carbide core. Tungsten carbide was used in anti-tank rounds of the " "20th and 21st century." msgstr "" +"6.54x42mm 9N12 步槍彈內含一個碳化鎢彈芯，以致它擁有優秀的穿甲能力。碳化鎢曾用" +"於 20 至 21 世紀的反坦克子彈中。" #. ~ Description for H&K 12mm #: lang/json/AMMO_from_json.py @@ -3597,10 +3617,8 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "" "This metal shaft has been carefully sharpened so that it has a crude point " -"at the end. Needs fletching to be worth firing from a bow." +"at the end. It needs fletching to be worth firing from a bow." msgstr "" -"這根金屬箭桿被仔細的磨尖過，所以它帶有粗糙的尖端。還需要再裝上箭羽才能夠發" -"射。" #. ~ Description for sharpened metal arrow #: lang/json/AMMO_from_json.py @@ -3683,12 +3701,12 @@ msgstr "毛纱能夠用來織成羊毛服裝。" #. ~ Description for fireball #: lang/json/AMMO_from_json.py msgid "a fist-sized fireball, scorching the air around it." -msgstr "" +msgstr "一個拳頭大小的火球，灼燒周圍的空氣。" #. ~ Description for skullfire #: lang/json/AMMO_from_json.py msgid "a gout of flame." -msgstr "" +msgstr "一團火焰" #: lang/json/AMMO_from_json.py msgid "acetic acid" @@ -3748,7 +3766,7 @@ msgstr[0] "箭頭" #. ~ Description for plasma #: lang/json/AMMO_from_json.py msgid "baron-plasma." -msgstr "" +msgstr "男爵血漿" #: lang/json/AMMO_from_json.py msgid "battery" @@ -3763,7 +3781,7 @@ msgstr[0] "滾珠軸承" #: lang/json/AMMO_from_json.py msgid "birdshot" msgid_plural "birdshot" -msgstr[0] "獵鳥散彈" +msgstr[0] "獵鳥霰彈" #: lang/json/AMMO_from_json.py msgid "bismuth" @@ -3973,7 +3991,7 @@ msgstr[0] "自製炸藥火箭" #: lang/json/AMMO_from_json.py msgid "explosive slug" msgid_plural "explosive slug" -msgstr[0] "高爆散彈" +msgstr[0] "高爆霰彈" #: lang/json/AMMO_from_json.py msgid "feather" @@ -4008,7 +4026,7 @@ msgstr[0] "碳化木箭" #: lang/json/AMMO_from_json.py msgid "fireball" msgid_plural "fireballs" -msgstr[0] "" +msgstr[0] "火球" #: lang/json/AMMO_from_json.py msgid "fish bait - bread" @@ -4038,7 +4056,7 @@ msgstr[0] "火焰箭" #: lang/json/AMMO_from_json.py msgid "flechette shell" msgid_plural "flechette shell" -msgstr[0] "鋼鏢散彈" +msgstr[0] "鋼鏢霰彈" #: lang/json/AMMO_from_json.py msgid "fletching" @@ -4227,7 +4245,7 @@ msgstr[0] "鐵標槍" #. ~ Description for plasma #: lang/json/AMMO_from_json.py msgid "knight's plasma." -msgstr "" +msgstr "騎士血漿" #: lang/json/AMMO_from_json.py lang/json/ammunition_type_from_json.py msgid "lamp oil" @@ -4307,12 +4325,12 @@ msgstr[0] "120mm 粗製獨頭彈" #: lang/json/AMMO_from_json.py msgid "makeshift shotgun shot" msgid_plural "makeshift shotgun shot" -msgstr[0] "粗製散彈" +msgstr[0] "粗製霰彈" #: lang/json/AMMO_from_json.py msgid "makeshift shotgun slug" msgid_plural "makeshift shotgun slug" -msgstr[0] "粗製重擊散彈" +msgstr[0] "粗製重擊霰彈" #: lang/json/AMMO_from_json.py msgid "marble" @@ -4467,7 +4485,7 @@ msgstr[0] "植物纖維" #: lang/json/AMMO_from_json.py msgid "plasma" msgid_plural "plasmas" -msgstr[0] "" +msgstr[0] "血漿" #: lang/json/AMMO_from_json.py msgid "plastic arrow" @@ -4662,7 +4680,7 @@ msgstr[0] ".700 NX（重填彈）" #: lang/json/AMMO_from_json.py msgid "reloaded 00 shot" msgid_plural "reloaded 00 shot" -msgstr[0] "獵鹿散彈（重填彈）" +msgstr[0] "獵鹿霰彈（重填彈）" #: lang/json/AMMO_from_json.py msgid "reloaded 10mm Auto" @@ -4745,9 +4763,9 @@ msgid_plural "reloaded 7.62x39mm M43" msgstr[0] "7.62x39mm M43 子彈（重填彈）" #: lang/json/AMMO_from_json.py -msgid "reloaded 7.62x39mm M87" -msgid_plural "reloaded 7.62x39mm M87" -msgstr[0] "7.62x39mm M87 子彈 (重填彈)" +msgid "reloaded 7.62x39mm M67" +msgid_plural "reloaded 7.62x39mm M67" +msgstr[0] "" #: lang/json/AMMO_from_json.py msgid "reloaded 7.62x51mm" @@ -4802,17 +4820,17 @@ msgstr[0] "9x19mm 空尖彈（重填彈）" #: lang/json/AMMO_from_json.py msgid "reloaded birdshot" msgid_plural "reloaded birdshot" -msgstr[0] "獵鳥散彈（重填彈）" +msgstr[0] "獵鳥霰彈（重填彈）" #: lang/json/AMMO_from_json.py msgid "reloaded explosive slug" msgid_plural "reloaded explosive slug" -msgstr[0] "高爆散彈（重填彈）" +msgstr[0] "高爆霰彈（重填彈）" #: lang/json/AMMO_from_json.py msgid "reloaded flechette shell" msgid_plural "reloaded flechette shell" -msgstr[0] "鋼鏢散彈（重填彈）" +msgstr[0] "鋼鏢霰彈（重填彈）" #: lang/json/AMMO_from_json.py msgid "reloaded heavy rifle ammo" @@ -4877,7 +4895,7 @@ msgstr[0] "重填豆袋散彈" #: lang/json/AMMO_from_json.py msgid "reloaded shotgun slug" msgid_plural "reloaded shotgun slug" -msgstr[0] "重擊散彈（重填彈）" +msgstr[0] "重擊霰彈（重填彈）" #: lang/json/AMMO_from_json.py msgid "reloaded signal flare" @@ -4962,7 +4980,7 @@ msgstr[0] "" #: lang/json/AMMO_from_json.py msgid "shotgun beanbag" msgid_plural "shotgun beanbag" -msgstr[0] "散彈豆袋" +msgstr[0] "霰彈豆袋" #: lang/json/AMMO_from_json.py msgid "shotgun hull" @@ -4997,7 +5015,7 @@ msgstr[0] "筋" #: lang/json/AMMO_from_json.py msgid "skullfire" msgid_plural "skullfires" -msgstr[0] "" +msgstr[0] "骷髏火" #: lang/json/AMMO_from_json.py msgid "small electric primer" @@ -6326,13 +6344,9 @@ msgstr "一個大的布料罩單，可用來當作窗簾或是床單; 或是切 #: lang/json/ARMOR_from_json.py msgid "" "A large leather quiver trimmed with metal, worn on the back, that can hold " -"60 arrows.\n" -"Historically used by horse archers, rather than foot archers, but neither of " -"THEM had to fight zombies. Activate to store arrows." +"60 arrows. Historically used by horse archers, rather than foot archers, " +"but neither of THEM had to fight zombies. Activate to store arrows." msgstr "" -"一個鑲嵌了金屬的大型皮箭筒，穿戴在背後，能夠裝入 60 支箭矢。\n" -"歷史上是由馬弓兵所使用，而非步行的弓兵，但這兩者都不用對抗殭屍。啟用它來裝入" -"箭矢。" #. ~ Description for pair of ski goggles #: lang/json/ARMOR_from_json.py @@ -12987,9 +13001,8 @@ msgstr "" "在你的手掌中安置了小型的電磁脈衝產生器(EMP)。你能夠使用能量來發射短距離的電磁" "波來癱瘓電器以及機器人。" -#. ~ Description for Telescopic Eyes #. ~ Description for Telescopic Eyes CBM -#: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py +#: lang/json/BIONIC_ITEM_from_json.py msgid "" "Much of the material in your inner eye has been removed and replaced with an " "array of high-powered, auto-focusing lenses. You can now see much farther " @@ -14783,7 +14796,7 @@ msgstr[0] "兒童弓箭指南" #: lang/json/BOOK_from_json.py msgid "Arms and Armor of Imperial China" msgid_plural "Arms and Armor of Imperial China" -msgstr[0] "" +msgstr[0] "帝制中國的武器與盔甲" #: lang/json/BOOK_from_json.py msgid "Art and Science of Chemical Warfare" @@ -14898,7 +14911,7 @@ msgstr[0] "工匠季刊" #: lang/json/BOOK_from_json.py msgid "Cucina Italiana" msgid_plural "Cucina Italiana" -msgstr[0] "" +msgstr[0] "義大利廚房" #. ~ Description for TIME magazine #: lang/json/BOOK_from_json.py @@ -15034,7 +15047,7 @@ msgstr[0] "煉金術歷史" #: lang/json/BOOK_from_json.py msgid "How to Browse the Web" msgid_plural "How to Browse the Web" -msgstr[0] "" +msgstr[0] "如何開啟瀏覽器" #: lang/json/BOOK_from_json.py msgid "How to Succeed in Business" @@ -15044,7 +15057,7 @@ msgstr[0] "如何成為成功的企業家" #: lang/json/BOOK_from_json.py msgid "How to Trap Anything" msgid_plural "How to Trap Anything" -msgstr[0] "" +msgstr[0] "來做陷阱" #. ~ Description for corporate accounting ledger #: lang/json/BOOK_from_json.py @@ -15334,7 +15347,7 @@ msgstr[0] "金牌設計師的裁縫技巧" #: lang/json/BOOK_from_json.py msgid "Shotguns: The art and science" msgid_plural "Shotguns: The art and science" -msgstr[0] "散彈槍：科學與藝術" +msgstr[0] "霰彈槍：科學與藝術" #: lang/json/BOOK_from_json.py msgid "Spetsnaz Knife Techniques" @@ -16042,6 +16055,8 @@ msgid "" "details some of the equipment used by other cultures that came into conflict " "with the empire over various dynasties." msgstr "" +"這本教科書詳細介紹中國古代軍事史，尤其側重於歷史的武器和盔甲的性質。它還詳細" +"介紹了一些與帝國在各個朝代發生衝突的其他文明所使用的設備。" #: lang/json/BOOK_from_json.py msgid "Through the Lens" @@ -16056,7 +16071,7 @@ msgstr[0] "" #: lang/json/BOOK_from_json.py msgid "To Serve Man" msgid_plural "To Serve Man" -msgstr[0] "" +msgstr[0] "供餐人" #: lang/json/BOOK_from_json.py msgid "Top Gear magazine" @@ -16142,7 +16157,7 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Ye Scots Beuk o Cuikery" msgid_plural "copies of Ye Scots Beuk o Cuikery" -msgstr[0] "" +msgstr[0] "傳統蘇格蘭文化" #. ~ Description for Playboy #: lang/json/BOOK_from_json.py @@ -16709,7 +16724,7 @@ msgstr "" msgid "" "A cooked stalk from a cattail plant. Its fibrous outer leaves have been " "stripped away and now it is quite delicious." -msgstr "" +msgstr "煮熟的香蒲秸稈，外層纖維質葉子已經剝除，非常美味。" #. ~ Description for lettuce #: lang/json/COMESTIBLE_from_json.py @@ -16789,7 +16804,7 @@ msgstr "一個美味的烤起司三明治，因為融化的起司讓世界變得 #. ~ Description for honey sandwich #: lang/json/COMESTIBLE_from_json.py msgid "A delicious honey sandwich." -msgstr "" +msgstr "美味的蜂蜜三明治" #. ~ Description for jam sandwich #: lang/json/COMESTIBLE_from_json.py @@ -16986,7 +17001,7 @@ msgstr "巴掌大的紫色李子。對健康或消化都很好。" msgid "" "A handful of raw hard nuts from a hickory tree, their shells have been " "removed." -msgstr "" +msgstr "一把從山核桃樹摘下的硬堅果，已經去殼。" #. ~ Description for marshmallows #: lang/json/COMESTIBLE_from_json.py @@ -16996,7 +17011,7 @@ msgstr "數個柔軟、蓬鬆、美味的棉花糖。" #. ~ Description for handful of roasted hickory nut #: lang/json/COMESTIBLE_from_json.py msgid "A handful roasted nuts from a hickory tree." -msgstr "" +msgstr "從山核桃樹摘下，一把烘焙過的堅果。" #. ~ Description for boiled egg #: lang/json/COMESTIBLE_from_json.py @@ -17707,7 +17722,7 @@ msgstr "一根麝香草。聞起來很好吃。" msgid "" "A stiff green stalk from a cattail plant. It is starchy and fibrous, but it " "would be much better if you cooked it." -msgstr "" +msgstr "香蒲植物堅硬的綠色秸稈。由澱粉和纖維組成，如果煮熟了會更好吃。" #. ~ Description for cattail rhizome #: lang/json/COMESTIBLE_from_json.py @@ -17860,12 +17875,12 @@ msgstr "一個超濃縮物質。以容量來判斷，應該是要透過注射使 #. ~ Description for maple pie #: lang/json/COMESTIBLE_from_json.py msgid "A sweet and delicious baked pie with pure maple syrup." -msgstr "" +msgstr "香甜可口，用純楓糖烘焙的派。" #. ~ Description for sweet sausage #: lang/json/COMESTIBLE_from_json.py msgid "A sweet and delicious sausage." -msgstr "" +msgstr "香甜可口的香腸。" #. ~ Description for raspberry #: lang/json/COMESTIBLE_from_json.py @@ -18132,7 +18147,7 @@ msgstr "一個很甜，果肉又柔軟的熱帶水果。" #. ~ Description for maple sap #: lang/json/COMESTIBLE_from_json.py msgid "A water and sugar solution that has been extracted from a maple tree." -msgstr "" +msgstr "從楓樹抽出的水和糖的混合液。" #. ~ Description for tainted fat #: lang/json/COMESTIBLE_from_json.py @@ -18162,7 +18177,7 @@ msgstr "溫和抗發炎的乙酰水楊酸。服用後可緩解疼痛和腫脹。 #: lang/json/COMESTIBLE_from_json.py msgid "Adderall" msgid_plural "Adderall" -msgstr[0] "" +msgstr[0] "安非他命" #. ~ Description for fungicide #: lang/json/COMESTIBLE_from_json.py @@ -18212,6 +18227,8 @@ msgid "" "An assortment of edible-looking wild plants. Most are quite bitter-" "tasting. Some are inedible until cooked." msgstr "" +"大量看起來可以吃的野生植物，但是大多數都苦苦的不好吃，有些甚至煮熟了也不能" +"吃。" #. ~ Description for reptile egg #: lang/json/COMESTIBLE_from_json.py @@ -18888,7 +18905,7 @@ msgstr "美味的黃金蔬菜。" #. ~ Description for hickory nut ambrosia #: lang/json/COMESTIBLE_from_json.py msgid "Delicious hickory nut ambrosia. A drink worthy of the gods." -msgstr "" +msgstr "美味的山核桃香飲，不愧為神的飲品。" #. ~ Description for lunch meat #: lang/json/COMESTIBLE_from_json.py @@ -19051,6 +19068,8 @@ msgid "" "candy form. An option of last resort when a balanced diet is not possible. " "Excess use can cause hypervitaminosis." msgstr "" +"包裝成軟糖形式的必備膳食營養素。無法均衡飲食時的不得已選項。過多食用會導致維" +"生素過多症。" #. ~ Description for multivitamin #: lang/json/COMESTIBLE_from_json.py @@ -19059,6 +19078,8 @@ msgid "" "of last resort when a balanced diet is not possible. Excess use can cause " "hypervitaminosis." msgstr "" +"包裝成膠囊藥丸形式的必備膳食營養素。無法均衡飲食時的不得已選項。過多食用會導" +"致維生素過多症。" #: lang/json/COMESTIBLE_from_json.py msgid "European pilsner" @@ -19407,7 +19428,7 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "Irish coffee" msgid_plural "Irish coffee" -msgstr[0] "" +msgstr[0] "愛爾蘭咖啡" #. ~ Description for raw spaghetti #. ~ Description for raw lasagne @@ -19508,6 +19529,7 @@ msgid "" "Low-sodium preserved fish. It was boiled and canned. Contains most of the " "nutrition, but little of the savor of cooked fish." msgstr "" +"低鹽保存的魚肉。已被煮熟並作成罐頭。保留了全部的營養，熟魚肉保存的救星。 " #. ~ Description for soylent slice #: lang/json/COMESTIBLE_from_json.py @@ -19544,7 +19566,6 @@ msgid "Made from real Massachusetts cranberries. Delicious and nutritious." msgstr "由真正馬薩諸塞州蔓越莓所製成，美味又營養。" #. ~ Description for whiskey -#. ~ Description for test_whiskey #: lang/json/COMESTIBLE_from_json.py msgid "Made from, by, and for real Southern colonels!" msgstr "真正的南方上校專屬！" @@ -19716,7 +19737,7 @@ msgstr "你手上沒有比這更好的飲料了，不過嘛，嘿，裡面酒精 msgid "" "Not very nutritious. Warning: contains calories, unsuitable for " "breatharians." -msgstr "" +msgstr "不是很有營養。警告：含有卡路里，不適合食氣者。" #. ~ Description for canned tuna fish #: lang/json/COMESTIBLE_from_json.py @@ -19802,7 +19823,7 @@ msgstr[0] "花生果醬三明治" #: lang/json/COMESTIBLE_from_json.py msgid "PB&M sandwich" msgid_plural "PB&M sandwiches" -msgstr[0] "" +msgstr[0] "楓糖花生醬三明治" #. ~ Description for flu shot #: lang/json/COMESTIBLE_from_json.py @@ -20054,7 +20075,7 @@ msgstr "加鹽調味的玉米片並搭配了肉。要是再加上一些起司， #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted corn chips, with human flesh. Some cheese might make it even better." -msgstr "" +msgstr "加鹽調味的玉米片並搭配了人肉。要是再加上一些起司，就更棒了。" #. ~ Description for salted fish #: lang/json/COMESTIBLE_from_json.py @@ -20154,13 +20175,13 @@ msgstr "加上蔬菜的燉豆。好吃又有飽足感。" #: lang/json/COMESTIBLE_from_json.py msgid "" "Small vials of dark yellow liquid containing soluble iron for injection." -msgstr "" +msgstr "注射用含有水溶性鐵質暗黃色液體的小瓶。" #. ~ Description for injectable vitamin B #: lang/json/COMESTIBLE_from_json.py msgid "" "Small vials of pale yellow liquid containing soluble vitamin B for injection." -msgstr "" +msgstr "注射用含有水溶性維生素B淡黃色液體的小瓶。" #. ~ Description for datura seeds #: lang/json/COMESTIBLE_from_json.py @@ -20557,7 +20578,7 @@ msgstr "甜蜜蜜的糖。對你的牙齒不好並且不適合直接吃。" msgid "" "Sweetened coffee and whiskey topped with milk. Start your day the closeted " "alcoholic way!" -msgstr "" +msgstr "加糖的咖啡、威士忌加上牛奶。用酒來開始這一天！" #. ~ Description for Prussian blue tablet #: lang/json/COMESTIBLE_from_json.py @@ -20784,6 +20805,8 @@ msgid "" "This golden, translucent leaf candy is made with pure maple syrup and melt " "slowly as you savor the taste of real maple." msgstr "" +"這個金色、半透明薄片糖果是由純楓糖漿製成，吃起來慢慢融化，讓你品嚐真正的楓樹" +"的味道。" #. ~ Description for bobburger #: lang/json/COMESTIBLE_from_json.py @@ -20977,7 +21000,7 @@ msgstr "番茄醬，好吃。" msgid "" "Uncooked internal organs and entrails. Unappealing to eat but filled with " "essential vitamins." -msgstr "" +msgstr "未煮過的內部器官和內臟。你會不想吃它，但充滿了人體必需的維生素。" #. ~ Description for pomegranate #: lang/json/COMESTIBLE_from_json.py @@ -21152,7 +21175,7 @@ msgstr "當起司開始融化時，美味的通心麵就出現了。" msgid "" "Who knew you could mix maple syrup and peanut butter to create yet another " "different sandwich?" -msgstr "" +msgstr "誰知道，你可以混合楓糖漿和花生醬創造另一個不同的三明治？" #. ~ Description for powdered egg #: lang/json/COMESTIBLE_from_json.py @@ -21187,7 +21210,7 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "" "You drink the potion and feel a pleasant warmth spread through your body." -msgstr "" +msgstr "你喝下藥水，感覺有一股奇妙的暖流從你的身體流出。" #. ~ Use action activation_message for black potion. #: lang/json/COMESTIBLE_from_json.py @@ -21214,12 +21237,12 @@ msgstr "你吃了搖頭丸。" #. ~ Use action activation_message for injectable iron. #: lang/json/COMESTIBLE_from_json.py msgid "You inject some iron." -msgstr "" +msgstr "你注射了一些鐵質" #. ~ Use action activation_message for injectable vitamin B. #: lang/json/COMESTIBLE_from_json.py msgid "You inject some vitamin B." -msgstr "" +msgstr "你注射了一些維生素B" #. ~ Use action activation_message for heroin. #. ~ Use action activation_message for morphine. @@ -21281,7 +21304,7 @@ msgstr "你服用了一些曲馬多。" #: lang/json/COMESTIBLE_from_json.py #, no-python-format msgid "You take the %s." -msgstr "" +msgstr "你吃了 %s" #. ~ Use action activation_message for sewagas inhaler. #: lang/json/COMESTIBLE_from_json.py @@ -21378,7 +21401,7 @@ msgstr[0] "阿司匹林" #: lang/json/COMESTIBLE_from_json.py msgid "atomic coffee" msgid_plural "atomic coffee" -msgstr[0] "" +msgstr[0] "原子咖啡" #: lang/json/COMESTIBLE_from_json.py msgid "atomic energy drink" @@ -21518,7 +21541,7 @@ msgstr[0] "黑胡椒" #: lang/json/COMESTIBLE_from_json.py msgid "black potion" msgid_plural "black potions" -msgstr[0] "" +msgstr[0] "黑色藥水" #: lang/json/COMESTIBLE_from_json.py msgid "blackberry" @@ -21812,12 +21835,12 @@ msgstr[0] "胡蘿蔔種子" #: lang/json/COMESTIBLE_from_json.py msgid "cattail rhizome" msgid_plural "cattail rhizomes" -msgstr[0] "" +msgstr[0] "香蒲根莖" #: lang/json/COMESTIBLE_from_json.py msgid "cattail stalk" msgid_plural "cattail stalks" -msgstr[0] "" +msgstr[0] "香蒲秸稈" #: lang/json/COMESTIBLE_from_json.py msgid "cattle mutagen" @@ -21852,7 +21875,7 @@ msgstr[0] "頭足類血清" #: lang/json/COMESTIBLE_from_json.py msgid "chai tea" msgid_plural "chai tea" -msgstr[0] "" +msgstr[0] "印度奶茶" #: lang/json/COMESTIBLE_from_json.py msgid "chardonnay" @@ -22062,7 +22085,7 @@ msgstr[0] "淨水" #: lang/json/COMESTIBLE_from_json.py msgid "cloutie dumpling" msgid_plural "cloutie dumplings" -msgstr[0] "" +msgstr[0] "蘇格蘭乾果甜糕" #: lang/json/COMESTIBLE_from_json.py src/addiction.cpp msgid "cocaine" @@ -22122,7 +22145,7 @@ msgstr[0] "濃酸" #: lang/json/COMESTIBLE_from_json.py msgid "condensed milk" msgid_plural "condensed milk" -msgstr[0] "" +msgstr[0] "煉乳" #: lang/json/COMESTIBLE_from_json.py msgid "cooked TV dinner" @@ -22157,7 +22180,7 @@ msgstr[0] "熟捲餅" #: lang/json/COMESTIBLE_from_json.py msgid "cooked cattail stalk" msgid_plural "cooked cattail stalks" -msgstr[0] "" +msgstr[0] "煮熟的香蒲秸稈" #: lang/json/COMESTIBLE_from_json.py msgid "cooked corn dog" @@ -22212,7 +22235,7 @@ msgstr[0] "煮熟的燕麥片" #: lang/json/COMESTIBLE_from_json.py msgid "cooked offal" msgid_plural "cooked offal" -msgstr[0] "" +msgstr[0] "熟內臟" #: lang/json/COMESTIBLE_from_json.py msgid "cooked plant marrow" @@ -22356,7 +22379,7 @@ msgstr[0] "黃瓜種子" #: lang/json/COMESTIBLE_from_json.py msgid "cullen skink" msgid_plural "cullen skinks" -msgstr[0] "" +msgstr[0] "蘇格蘭鮮魚濃湯" #: lang/json/COMESTIBLE_from_json.py msgid "curdled milk" @@ -22366,7 +22389,7 @@ msgstr[0] "凝乳" #: lang/json/COMESTIBLE_from_json.py msgid "curdling milk" msgid_plural "curdling milks" -msgstr[0] "" +msgstr[0] "凝化乳" #: lang/json/COMESTIBLE_from_json.py msgid "curry" @@ -22429,7 +22452,7 @@ msgstr "曼陀羅" #: lang/json/COMESTIBLE_from_json.py msgid "datura seeds" msgid_plural "datura seeds" -msgstr[0] "" +msgstr[0] "曼陀羅花種子" #: lang/json/COMESTIBLE_from_json.py msgid "deep fried chicken" @@ -22484,7 +22507,7 @@ msgstr[0] "煮熟的豪華燕麥片" #: lang/json/COMESTIBLE_from_json.py msgid "deluxe sandwich" msgid_plural "deluxe sandwiches" -msgstr[0] "" +msgstr[0] "豪華三明治" #: lang/json/COMESTIBLE_from_json.py msgid "deluxe scrambled eggs" @@ -22499,12 +22522,12 @@ msgstr[0] "豪華什錦飯" #: lang/json/COMESTIBLE_from_json.py src/addiction.cpp msgid "diazepam" msgid_plural "diazepam" -msgstr[0] "" +msgstr[0] "安定劑" #: lang/json/COMESTIBLE_from_json.py msgid "diet pill" msgid_plural "diet pills" -msgstr[0] "" +msgstr[0] "減肥藥丸" #: lang/json/COMESTIBLE_from_json.py msgid "disinfectant" @@ -22549,12 +22572,12 @@ msgstr[0] "乾燥沙拉" #: lang/json/COMESTIBLE_from_json.py msgid "dudeluxe sandwich" msgid_plural "dudeluxe sandwiches" -msgstr[0] "" +msgstr[0] "豪華人肉三明治" #: lang/json/COMESTIBLE_from_json.py msgid "eggnog" msgid_plural "eggnogs" -msgstr[0] "" +msgstr[0] "蛋奶" #: lang/json/COMESTIBLE_from_json.py msgid "electronic cigarette" @@ -22569,7 +22592,7 @@ msgstr[0] "妖精血清" #: lang/json/COMESTIBLE_from_json.py msgid "elfa mutagen" msgid_plural "elfa mutagens" -msgstr[0] "" +msgstr[0] "妖精突變劑" #: lang/json/COMESTIBLE_from_json.py msgid "energy cola" @@ -22594,7 +22617,7 @@ msgstr[0] "泡麵" #: lang/json/COMESTIBLE_from_json.py msgid "fast-food French fries" msgid_plural "fast-food French fries" -msgstr[0] "" +msgstr[0] "速食薯條" #: lang/json/COMESTIBLE_from_json.py msgid "feline mutagen" @@ -22669,12 +22692,12 @@ msgstr[0] "森林蜜" #: lang/json/COMESTIBLE_from_json.py msgid "fortified protein shake" msgid_plural "fortified protein shakes" -msgstr[0] "" +msgstr[0] "強化蛋白奶昔" #: lang/json/COMESTIBLE_from_json.py msgid "fortified soylent green shake" msgid_plural "fortified soylent green shakes" -msgstr[0] "" +msgstr[0] "強化代餐奶昔" #: lang/json/COMESTIBLE_from_json.py msgid "fried SPAM" @@ -22699,7 +22722,7 @@ msgstr[0] "炒飯" #: lang/json/COMESTIBLE_from_json.py msgid "fried seeds" msgid_plural "fried seeds" -msgstr[0] "" +msgstr[0] "炒豆子" #: lang/json/COMESTIBLE_from_json.py msgid "fruit jam" @@ -22778,7 +22801,7 @@ msgstr[0] "大蒜丁香" #: lang/json/COMESTIBLE_from_json.py msgid "gelatin" msgid_plural "marloss gelatin" -msgstr[0] "" +msgstr[0] "馬洛斯果凝膠" #: lang/json/COMESTIBLE_from_json.py msgid "gin" @@ -22858,12 +22881,12 @@ msgstr[0] "蒲公英" #: lang/json/COMESTIBLE_from_json.py msgid "handful of roasted hickory nut" msgid_plural "handfuls of roasted hickory nuts" -msgstr[0] "" +msgstr[0] "烘焙山核桃" #: lang/json/COMESTIBLE_from_json.py msgid "handful of shelled hickory nuts" msgid_plural "handfuls of shelled hickory nuts" -msgstr[0] "" +msgstr[0] "去殼山核桃" #: lang/json/COMESTIBLE_from_json.py msgid "hard cheese" @@ -22893,7 +22916,7 @@ msgstr[0] "海洛因" #: lang/json/COMESTIBLE_from_json.py msgid "hickory nut ambrosia" msgid_plural "hickory nut ambrosias" -msgstr[0] "" +msgstr[0] "山核桃香飲" #: lang/json/COMESTIBLE_from_json.py msgid "hobo helper" @@ -22918,7 +22941,7 @@ msgstr[0] "蜂巢" #: lang/json/COMESTIBLE_from_json.py msgid "honey sandwich" msgid_plural "honey sandwiches" -msgstr[0] "" +msgstr[0] "蜂蜜三明治" #: lang/json/COMESTIBLE_from_json.py msgid "honeygold brew" @@ -22982,12 +23005,12 @@ msgstr[0] "帝國司陶特啤酒" #: lang/json/COMESTIBLE_from_json.py msgid "injectable iron" msgid_plural "injectable irons" -msgstr[0] "" +msgstr[0] "注射鐵質" #: lang/json/COMESTIBLE_from_json.py msgid "injectable vitamin B" msgid_plural "injectable vitamin Bs" -msgstr[0] "" +msgstr[0] "注射維生素B" #: lang/json/COMESTIBLE_from_json.py msgid "insect mutagen" @@ -23002,7 +23025,7 @@ msgstr[0] "昆蟲血清" #: lang/json/COMESTIBLE_from_json.py msgid "insta-salad" msgid_plural "insta-salads" -msgstr[0] "" +msgstr[0] "即食沙拉" #: lang/json/COMESTIBLE_from_json.py msgid "irradiated apple" @@ -23297,7 +23320,7 @@ msgstr[0] "檸檬水" #: lang/json/COMESTIBLE_from_json.py msgid "lemonade drink mix" msgid_plural "servings of lemonade drink mix" -msgstr[0] "" +msgstr[0] "檸檬水混合飲料" #: lang/json/COMESTIBLE_from_json.py msgid "lettuce" @@ -23372,12 +23395,12 @@ msgstr[0] "三人治" #: lang/json/COMESTIBLE_from_json.py msgid "maple pie" msgid_plural "maple pies" -msgstr[0] "" +msgstr[0] "楓糖派" #: lang/json/COMESTIBLE_from_json.py msgid "maple sap" msgid_plural "maple sap" -msgstr[0] "" +msgstr[0] "楓樹樹汁" #: lang/json/COMESTIBLE_from_json.py msgid "maple syrup" @@ -23387,7 +23410,7 @@ msgstr[0] "楓糖漿" #: lang/json/COMESTIBLE_from_json.py msgid "maple syrup candy" msgid_plural "maple syrup candies" -msgstr[0] "" +msgstr[0] "楓糖漿糖果" #: lang/json/COMESTIBLE_from_json.py msgid "marijuana" @@ -23462,7 +23485,7 @@ msgstr[0] "生肉手卷" #: lang/json/COMESTIBLE_from_json.py msgid "meat/fish" msgid_plural "meat/fishs" -msgstr[0] "" +msgstr[0] "肉/魚" #: lang/json/COMESTIBLE_from_json.py msgid "medical gauze" @@ -23482,7 +23505,7 @@ msgstr[0] "醫療血清" #: lang/json/COMESTIBLE_from_json.py msgid "medikit" msgid_plural "medikits" -msgstr[0] "" +msgstr[0] "醫藥包" #: lang/json/COMESTIBLE_from_json.py msgid "melon" @@ -23542,7 +23565,7 @@ msgstr[0] "羊肚菌" #: lang/json/COMESTIBLE_from_json.py msgid "morel mushroom spores" msgid_plural "morel mushroom spores" -msgstr[0] "" +msgstr[0] "羊肚菌孢子" #: lang/json/COMESTIBLE_from_json.py msgid "morphine" @@ -23567,7 +23590,7 @@ msgstr[0] "艾草種子" #: lang/json/COMESTIBLE_from_json.py msgid "multivitamin" msgid_plural "multivitamins" -msgstr[0] "" +msgstr[0] "綜合維他命" #: lang/json/COMESTIBLE_from_json.py msgid "mushroom" @@ -24056,7 +24079,7 @@ msgstr[0] "生通心粉" #: lang/json/COMESTIBLE_from_json.py msgid "raw offal" msgid_plural "raw offals" -msgstr[0] "" +msgstr[0] "生內臟" #: lang/json/COMESTIBLE_from_json.py msgid "raw pelt" @@ -24081,7 +24104,7 @@ msgstr[0] "" #: lang/json/COMESTIBLE_from_json.py msgid "red potion" msgid_plural "red potions" -msgstr[0] "" +msgstr[0] "紅色藥水" #: lang/json/COMESTIBLE_from_json.py msgid "red sauce" @@ -24293,6 +24316,11 @@ msgid "seasoned salt" msgid_plural "seasoned salt" msgstr[0] "調味鹽" +#: lang/json/COMESTIBLE_from_json.py lang/json/furniture_from_json.py +msgid "seed" +msgid_plural "seeds" +msgstr[0] "" + #: lang/json/COMESTIBLE_from_json.py msgid "seed potato" msgid_plural "seed potatoes" @@ -24366,7 +24394,7 @@ msgstr[0] "醬油" #: lang/json/COMESTIBLE_from_json.py msgid "soylent green" msgid_plural "soylent green drinks" -msgstr[0] "" +msgstr[0] "代餐飲料" #: lang/json/COMESTIBLE_from_json.py msgid "soylent green powder" @@ -24376,7 +24404,7 @@ msgstr[0] "" #: lang/json/COMESTIBLE_from_json.py msgid "soylent green shake" msgid_plural "soylent green shakes" -msgstr[0] "" +msgstr[0] "代餐奶昔" #: lang/json/COMESTIBLE_from_json.py msgid "soylent slice" @@ -24431,7 +24459,7 @@ msgstr[0] "蛛形血清" #: lang/json/COMESTIBLE_from_json.py msgid "spiked eggnog" msgid_plural "spiked eggnogs" -msgstr[0] "" +msgstr[0] "蛋奶酒" #: lang/json/COMESTIBLE_from_json.py msgid "sports drink" @@ -24441,7 +24469,7 @@ msgstr[0] "運動飲料" #: lang/json/COMESTIBLE_from_json.py msgid "stamina vial" msgid_plural "stamina vials" -msgstr[0] "" +msgstr[0] "耐力瓶" #: lang/json/COMESTIBLE_from_json.py msgid "starch" @@ -24530,7 +24558,7 @@ msgstr[0] "壽司米" #: lang/json/COMESTIBLE_from_json.py msgid "sweet sausage" msgid_plural "sweet sausages" -msgstr[0] "" +msgstr[0] "甜香腸" #: lang/json/COMESTIBLE_from_json.py msgid "sweet water" @@ -24540,7 +24568,7 @@ msgstr[0] "糖水" #: lang/json/COMESTIBLE_from_json.py msgid "syringe of adrenaline" msgid_plural "syringes of adrenaline" -msgstr[0] "" +msgstr[0] "腎上腺素注射器" #: lang/json/COMESTIBLE_from_json.py msgid "taco" @@ -24585,7 +24613,7 @@ msgstr[0] "腐敗龍捲風" #: lang/json/COMESTIBLE_from_json.py msgid "tainted veggie" msgid_plural "tainted veggies" -msgstr[0] "" +msgstr[0] "污染的蔬菜" #: lang/json/COMESTIBLE_from_json.py msgid "tallow" @@ -24607,11 +24635,6 @@ msgid "tequila" msgid_plural "tequilas" msgstr[0] "龍舌蘭" -#: lang/json/COMESTIBLE_from_json.py -msgid "test_whiskey" -msgid_plural "test_whiskey" -msgstr[0] "test_whiskey" - #: lang/json/COMESTIBLE_from_json.py msgid "thyme" msgid_plural "thymes" @@ -24855,7 +24878,7 @@ msgstr[0] "威士忌原液" #: lang/json/COMESTIBLE_from_json.py msgid "white potion" msgid_plural "white potions" -msgstr[0] "" +msgstr[0] "白色藥水" #: lang/json/COMESTIBLE_from_json.py msgid "wild apple" @@ -24903,12 +24926,12 @@ msgstr[0] "酵母" #: lang/json/COMESTIBLE_from_json.py msgid "yellow potion" msgid_plural "yellow potions" -msgstr[0] "" +msgstr[0] "黃色藥水" #: lang/json/COMESTIBLE_from_json.py msgid "yogurt" msgid_plural "yogurts" -msgstr[0] "" +msgstr[0] "酸奶" #: lang/json/COMESTIBLE_from_json.py msgid "zucchini" @@ -24923,7 +24946,7 @@ msgstr[0] "西葫蘆種子" #: lang/json/CONTAINER_from_json.py msgid "2.5L canteen" msgid_plural "2.5L canteens" -msgstr[0] "" +msgstr[0] "2.5L 水壺" #: lang/json/CONTAINER_from_json.py msgid "30 gallon barrel" @@ -24938,7 +24961,7 @@ msgstr[0] "30加侖桶" #: lang/json/CONTAINER_from_json.py msgid "3L glass jar" msgid_plural "3L glass jars" -msgstr[0] "" +msgstr[0] "3公升玻璃罐" #: lang/json/CONTAINER_from_json.py msgid "55 gallon drum" @@ -25006,6 +25029,9 @@ msgid "" "flowers, holding gift baskets, containing a fruit basket and herbs, loose " "item storage or as an ice bucket." msgstr "" +"鍍鋅的桶子，用於裝花生、冰鎮葡萄酒、冰鎮啤酒、龍蝦、蟹腿、薯條、飼料、養殖場" +"使用、停車場野餐派對、工藝製作、花卉種植、拿著禮品籃、裝水果籃和草藥，寬鬆的" +"物品的存儲或作為冰桶。" #. ~ Description for aluminum foil wrap #: lang/json/CONTAINER_from_json.py @@ -25044,7 +25070,7 @@ msgstr "" #. ~ Description for metal tank (60L) #: lang/json/CONTAINER_from_json.py msgid "A large metal tank for holding liquids. Useful for crafting." -msgstr "" +msgstr "用來裝液體的大型金屬桶。製作物品時很有用。" #. ~ Description for 2.5L canteen #: lang/json/CONTAINER_from_json.py @@ -25130,7 +25156,7 @@ msgstr "一個小紙盒。大概只能裝一雙鞋的大小。" #. ~ Description for metal tank (2L) #: lang/json/CONTAINER_from_json.py msgid "A small metal tank for gas or liquids. Useful for crafting." -msgstr "" +msgstr "用來裝瓦斯或液體的小型金屬桶。製作物品時很有用。" #. ~ Description for small metal tank #: lang/json/CONTAINER_from_json.py @@ -25169,7 +25195,7 @@ msgstr "用在裝牛奶或家用清潔化學藥品的標準塑膠罐。" msgid "" "A steel jerrycan, meant to carry fuel, but can carry other liquids in a " "pinch. It has a capacity of 20 liters." -msgstr "" +msgstr "一個鋼製油桶，主要用來裝燃料，但是也能用來裝其他液體。容量為20升。" #. ~ Description for 3L glass jar #: lang/json/CONTAINER_from_json.py @@ -25211,6 +25237,8 @@ msgid "" "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." msgstr "" +"用木頭做的水壺，用金屬帶固定，並用蠟或瀝青密封。容量1.5公升而且有簡單的便攜帶" +"子。" #. ~ Description for waterskin #: lang/json/CONTAINER_from_json.py @@ -25218,11 +25246,6 @@ msgid "" "A watertight leather bag with a carrying strap, can hold 3 liters of water." msgstr "一個有背帶的水密皮水袋，可容納3升的水。" -#. ~ Description for test glass bottle -#: lang/json/CONTAINER_from_json.py -msgid "An UNSEALABLE glass bottle, holds 750 ml of liquid." -msgstr "一個不能重新封口的玻璃瓶，能裝入 750 ml 的液體。" - #. ~ Description for aluminum can #: lang/json/CONTAINER_from_json.py msgid "An aluminum can, like what soda comes in." @@ -25276,7 +25299,7 @@ msgstr[0] "鋁罐" #: lang/json/CONTAINER_from_json.py msgid "aluminum foil wrap" msgid_plural "aluminum foil wraps" -msgstr[0] "" +msgstr[0] "鋁箔紙" #: lang/json/CONTAINER_from_json.py msgid "aluminum keg" @@ -25286,12 +25309,12 @@ msgstr[0] "鋁桶" #: lang/json/CONTAINER_from_json.py lang/json/vehicle_part_from_json.py msgid "blob core" msgid_plural "blob cores" -msgstr[0] "" +msgstr[0] "黏液核心" #: lang/json/CONTAINER_from_json.py msgid "bucket" msgid_plural "buckets" -msgstr[0] "" +msgstr[0] "水桶" #: lang/json/CONTAINER_from_json.py msgid "canvas bag" @@ -25381,12 +25404,12 @@ msgstr[0] "大水袋" #: lang/json/CONTAINER_from_json.py msgid "metal tank (2L)" msgid_plural "metal tank (2L)s" -msgstr[0] "" +msgstr[0] "鐵製油桶 (2公升)" #: lang/json/CONTAINER_from_json.py msgid "metal tank (60L)" msgid_plural "metal tank (60L)s" -msgstr[0] "" +msgstr[0] "鐵製油桶 (60公升)" #: lang/json/CONTAINER_from_json.py msgid "pack" @@ -25463,11 +25486,6 @@ msgid "steel jerrycan" msgid_plural "steel jerrycans" msgstr[0] "金屬油桶" -#: lang/json/CONTAINER_from_json.py -msgid "test glass bottle" -msgid_plural "test glass bottles" -msgstr[0] "測試玻璃瓶" - #: lang/json/CONTAINER_from_json.py msgid "tin can" msgid_plural "tin cans" @@ -25500,7 +25518,7 @@ msgstr[0] "木水壺" #: lang/json/ENGINE_from_json.py lang/json/vehicle_part_from_json.py msgid "1-cylinder engine" -msgstr "" +msgstr "單缸引擎" #. ~ Description for V-twin engine #: lang/json/ENGINE_from_json.py @@ -25565,43 +25583,43 @@ msgstr "" #: lang/json/ENGINE_from_json.py msgid "I6 diesel engine" -msgstr "" +msgstr " I6柴油引擎" #: lang/json/ENGINE_from_json.py msgid "Inline-4 engine" -msgstr "" +msgstr "直列四缸引擎" #: lang/json/ENGINE_from_json.py msgid "V-twin engine" -msgstr "" +msgstr " V型雙缸引擎" #: lang/json/ENGINE_from_json.py msgid "V12 engine" -msgstr "" +msgstr " V型十二缸引擎" #: lang/json/ENGINE_from_json.py msgid "V6 diesel engine" -msgstr "" +msgstr " V型六缸柴油引擎" #: lang/json/ENGINE_from_json.py msgid "V6 engine" -msgstr "" +msgstr " V型六缸引擎" #: lang/json/ENGINE_from_json.py msgid "V8 diesel engine" -msgstr "" +msgstr " V型八缸柴油引擎" #: lang/json/ENGINE_from_json.py msgid "V8 engine" -msgstr "" +msgstr " V型八缸引擎" #: lang/json/ENGINE_from_json.py msgid "base diesel engine" -msgstr "" +msgstr "基本柴油引擎" #: lang/json/ENGINE_from_json.py msgid "base gasoline engine" -msgstr "" +msgstr "基本汽油引擎" #: lang/json/ENGINE_from_json.py lang/json/vehicle_part_from_json.py msgid "blob grinder" @@ -25609,11 +25627,11 @@ msgstr "" #: lang/json/ENGINE_from_json.py msgid "internal combustion engine" -msgstr "" +msgstr "內燃式引擎" #: lang/json/ENGINE_from_json.py msgid "small 1-cylinder engine" -msgstr "" +msgstr "小型單缸引擎" #: lang/json/GENERIC_from_json.py msgid "10 plastic bags" @@ -25695,17 +25713,6 @@ msgstr "" "一種 '連敵人都退貨' 的熱狗餐，其中也附有給絕望的生存者所需的東西。當拆封後內" "容物將會開始腐爛。拆解它來取得內容物。" -#. ~ Description for car battery -#: lang/json/GENERIC_from_json.py -msgid "A 12v lead-acid battery used to power car electrical systems." -msgstr "一個12v的鉛酸電池，用來供電給車輛的電子系統。" - -#. ~ Description for motorbike battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A 12v lead-acid battery used to power smaller vehicles' electrical systems." -msgstr "一個12v的鉛酸電池，用來供電給小型車輛的電子系統。" - #. ~ Description for long rope #: lang/json/GENERIC_from_json.py msgid "" @@ -26453,7 +26460,7 @@ msgstr "" msgid "" "A forge rig made to run off a vehicle's storage battery with integrated tool " "storage for metalworking equipment." -msgstr "" +msgstr "一個能利用車輛電力的鑄造機。集成工具與儲物空間，可進行金屬加工。" #. ~ Description for fork #: lang/json/GENERIC_from_json.py @@ -26619,11 +26626,6 @@ msgstr "一個家用微波爐，可以看得出來有烤過豆子。拆了它取 msgid "A kiln full of wood that has been lit; better drop it!" msgstr "這個窯裡面滿滿的木柴已被點燃，你最好趕快把它放到地上！" -#. ~ Description for truck battery -#: lang/json/GENERIC_from_json.py -msgid "A large 12v lead-acid battery used to power truck electrical systems." -msgstr "一個12v的鉛酸電池，用來供電給卡車的電子系統。" - #. ~ Description for truck alternator #: lang/json/GENERIC_from_json.py msgid "A large alternator used to power truck electrical systems." @@ -26746,13 +26748,6 @@ msgstr "一大片玻璃。可以被輕易的切割。在重鑲窗戶時非常有 msgid "A large stone, roughly hollowed out into a pot." msgstr "一顆大石頭，中心被粗略的挖空做為鍋子使用。" -#. ~ Description for storage battery -#: lang/json/GENERIC_from_json.py -msgid "" -"A large storage battery. Could be installed into a storage battery case for " -"easy removal from a vehicle, or just welded straight in." -msgstr "一個大型的蓄電池。在蓄電池殼上裝拆非常容易，也可以直接焊在車上。" - #. ~ Description for folding wire basket #: lang/json/GENERIC_from_json.py msgid "A large wire basket from a shopping cart, modified to be foldable." @@ -26854,6 +26849,7 @@ msgid "" "A long piece of wood with several nails through one end; essentially a " "simple mace. Makes an acceptable melee weapon." msgstr "" +"一片尾端有許多鐵釘的木板；能當做簡易的釘頭鎚。能作為勉強可接受的近戰武器。" #. ~ Description for bullwhip #: lang/json/GENERIC_from_json.py @@ -26908,11 +26904,6 @@ msgstr "" "一件中世紀武器，有著木頭手柄，前端為沈重的鐵刺球。能夠造成毀滅性的傷害，以及" "一些穿刺傷害。" -#. ~ Description for medium storage battery -#: lang/json/GENERIC_from_json.py -msgid "A medium storage battery." -msgstr "一個中型的蓄電池。" - #. ~ Description for SD-Memory card #: lang/json/GENERIC_from_json.py msgid "A memory card, used. Might be worth a look." @@ -27072,7 +27063,7 @@ msgstr "一個醫學軟體。" msgid "" "A piece of paper with writing on it, edges scorched as if it was hastily " "rescued from the fireplace." -msgstr "" +msgstr "一張紙上面寫了一些字，邊緣燒焦了，就像是匆忙從壁爐中搶救出來一樣。" #. ~ Description for hard plating #: lang/json/GENERIC_from_json.py @@ -27229,7 +27220,7 @@ msgstr "" #. ~ Description for hickory root #: lang/json/GENERIC_from_json.py msgid "A root from a hickory tree. It has an earthy smell." -msgstr "" +msgstr "山核桃的根，帶有泥土的氣味。" #. ~ Description for blood-stained note #: lang/json/GENERIC_from_json.py @@ -27331,7 +27322,7 @@ msgstr "一支短而銳利的雙面匕首，抵住掌心來握持，而刀刃部 #. ~ Description for fungal fighter sting #: lang/json/GENERIC_from_json.py msgid "A short dart from a fungal fighter. Makes an poor melee weapon." -msgstr "" +msgstr "一個真菌鬥士掉的短針刺。能作為差勁的近戰武器。" #. ~ Description for silver glyph #: lang/json/GENERIC_from_json.py @@ -27454,7 +27445,7 @@ msgstr "一根六吋長的巨蜂刺。算是一件還可以的近戰武器。" #. ~ Description for wasp sting #: lang/json/GENERIC_from_json.py msgid "A six-inch stinger from a giant wasp. Makes a poor melee weapon." -msgstr "" +msgstr "一根六吋長的巨大黃蜂刺。能作為差勁的近戰武器。" #. ~ Description for cudgel #: lang/json/GENERIC_from_json.py @@ -27584,6 +27575,7 @@ msgid "" "A small shard of limestone. Pretty flimsy and not much of a weapon, but its " "alkaline properties may yet find some use." msgstr "" +"小石灰石碎片。相當脆弱，不太可能當作武器，但它是鹼性的，可能有些別的用途。" #. ~ Description for telescopic cantilever #: lang/json/GENERIC_from_json.py @@ -27592,11 +27584,6 @@ msgid "" "used to lift up to 1.5 metric tonnes." msgstr "" -#. ~ Description for small storage battery -#: lang/json/GENERIC_from_json.py -msgid "A small storage battery. Useful for crafting." -msgstr "一個小的蓄電池。製作物品時很有用。" - #. ~ Description for damaged tent #: lang/json/GENERIC_from_json.py msgid "" @@ -28101,12 +28088,15 @@ msgid "" "that space. The system can only be installed in existing storage " "compartments." msgstr "" +"一個使用車輛電力來運作的統一規格電力系統充電站。只需安裝在車輛的儲物空間，再" +"於車輛控制處啟動充電系統，將會慢慢地把該儲物空間內所有工具裡的充電電池充滿。" +"這個系統只能安裝在已有的車輛儲物空間上。" #. ~ Description for advanced reaper #: lang/json/GENERIC_from_json.py msgid "" "An advanced electronic device used to cut down, collect and store crops." -msgstr "" +msgstr "先進的電子設備，用於收割和儲存作物。" #. ~ Description for pitchfork #: lang/json/GENERIC_from_json.py @@ -28142,14 +28132,14 @@ msgstr "" msgid "" "An assembly of a blade, wheels, and a small lever for engaging/disengaging " "used to cut down crops prior to picking them up." -msgstr "" +msgstr "由刀刃、輪轂、以及一個控制開關的小槓桿組成，用於在撿起作物前切斷它們。" #. ~ Description for vehicle scoop #: lang/json/GENERIC_from_json.py msgid "" "An assembly of motors and sheet metal that allows a vehicle to clean the " "road surface by removing debris and contaminants." -msgstr "" +msgstr "由馬達和金屬片組成，能讓車輛去除碎屑和污染物來清潔路面。" #. ~ Description for seed drill #: lang/json/GENERIC_from_json.py @@ -28158,6 +28148,7 @@ msgid "" "ground, allows a vehicle to plant seeds automatically in suitably tilled " "land." msgstr "" +"由管子、尖刺、和輪轂組成，當沿著地面拖動，能讓車輛在適當的可耕地上自動播種。" #. ~ Description for advanced seed drill #: lang/json/GENERIC_from_json.py @@ -28167,6 +28158,8 @@ msgid "" "land. This one is equipped with an electronic control system and will avoid " "damaging itself when used on untilled land." msgstr "" +"由管子、尖刺、和輪轂組成，當沿著地面拖動，能讓車輛在適當的可耕地上自動播種。" +"這裝置配有一個電子操控系統，將會避免在不可耕地上使用時損傷自己。" #. ~ Description for scrap metal #: lang/json/GENERIC_from_json.py @@ -28994,6 +28987,8 @@ msgid "" "safety glasses. It might be used to craft some chemistry projects if you're " "so inclined, but you'll need a source of heat." msgstr "" +"這是個基本化學儀器套組。其中包括玻璃容器、軟管、與護目鏡。若你需要的話，能夠" +"用來製作一些化學物品，但是需要熱源。" #. ~ Description for rapier #: lang/json/GENERIC_from_json.py @@ -29048,7 +29043,7 @@ msgstr "這是一把經典的中世紀劍，適合單手使用。它是鈍的廉 msgid "" "This is a dull, cheaply made replica of a curved sword, associated with " "various Middle Eastern and Central Asian countries." -msgstr "" +msgstr "這把彎刀與不少中東及中亞國家有著關聯。它是鈍的廉價複製品。" #. ~ Description for zweihänder #: lang/json/GENERIC_from_json.py @@ -29105,6 +29100,8 @@ msgid "" "longsword. It requires a larger baldric or scabbard, compared to smaller " "swords." msgstr "" +"這是一把薄劍類似於長劍。相較於其他劍它的體積較大，需收納在大型的刀鞘中。它是" +"鈍的廉價複製品。" #. ~ Description for longsword #: lang/json/GENERIC_from_json.py @@ -29112,6 +29109,8 @@ msgid "" "This is a dull, cheaply-made replica of the classic medieval longsword. It " "requires a larger baldric or scabbard, compared to smaller swords." msgstr "" +"這是一把經典的中世紀長劍。相較於其他劍它的體積較大，需收納在大型的刀鞘中。它" +"是鈍的廉價複製品。" #. ~ Description for survivor's map #: lang/json/GENERIC_from_json.py @@ -29128,7 +29127,7 @@ msgstr "" msgid "" "This is a large blade attached to a long stick. It could do a considerable " "amount of damage." -msgstr "" +msgstr "將大刀刃連接在一根長棍子上。它能造成可觀的傷害。\"" #. ~ Description for digging stick #: lang/json/GENERIC_from_json.py @@ -29239,7 +29238,7 @@ msgstr "一個密封玻璃罐裝著一些混合蔬菜。使用它來開啟享用 msgid "" "This is a sealed glass jar containing mushroom soup. Use to open and eat to " "enjoy." -msgstr "" +msgstr "一個裝著蘑菇湯的密封玻璃罐。打開它來享用。" #. ~ Description for sealed jar of pickled fish #: lang/json/GENERIC_from_json.py @@ -29345,6 +29344,8 @@ msgid "" "rapier. It requires a larger baldric or scabbard, compared to smaller " "swords." msgstr "" +"這是一把薄劍類似於長劍，前身為護手刺劍。相較於其他劍它的體積較大，需收納在大" +"型的刀鞘中。" #. ~ Description for halberd #: lang/json/GENERIC_from_json.py @@ -29477,7 +29478,7 @@ msgstr "" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "UPS-compatible recharging station" msgid_plural "UPS-compatible recharging stations" -msgstr[0] "" +msgstr[0] "UPS相容的車載充電站" #: lang/json/GENERIC_from_json.py msgid "USB drive" @@ -29644,7 +29645,7 @@ msgstr "一個冒煙的裝置以及火源" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "advanced reaper" msgid_plural "advanced reapers" -msgstr[0] "" +msgstr[0] "高級收割機" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "advanced seed drill" @@ -29654,7 +29655,7 @@ msgstr[0] "進階播種機" #: lang/json/GENERIC_from_json.py lang/json/fault_from_json.py msgid "air filter" msgid_plural "air filters" -msgstr[0] "" +msgstr[0] "空氣過濾器" #: lang/json/GENERIC_from_json.py msgid "alarm clock" @@ -29699,7 +29700,7 @@ msgstr[0] "原子燈" #: lang/json/GENERIC_from_json.py msgid "atomic lamp (covered)" msgid_plural "atomic lamps (covered)" -msgstr[0] "" +msgstr[0] "原子燈（蓋上）" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "atomic nightlight" @@ -29709,12 +29710,12 @@ msgstr[0] "原子夜燈" #: lang/json/GENERIC_from_json.py msgid "atomic nightlight (covered)" msgid_plural "atomic nightlights (covered)" -msgstr[0] "" +msgstr[0] "原子夜燈（蓋上）" #: lang/json/GENERIC_from_json.py msgid "automotive filter" msgid_plural "automotive filters" -msgstr[0] "" +msgstr[0] "汽車濾清器" #: lang/json/GENERIC_from_json.py msgid "awl pike" @@ -29749,7 +29750,7 @@ msgstr[0] "棒球棍" #: lang/json/GENERIC_from_json.py msgid "basic chemistry set" msgid_plural "basic chemistry sets" -msgstr[0] "" +msgstr[0] "基本化學儀器套組" #: lang/json/GENERIC_from_json.py msgid "basketball" @@ -30079,18 +30080,13 @@ msgstr[0] "燭台" #: lang/json/GENERIC_from_json.py msgid "cannabis plant" msgid_plural "cannabis plants" -msgstr[0] "" +msgstr[0] "大麻植物" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "car alternator" msgid_plural "car alternators" msgstr[0] "汽車發電機" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "car battery" -msgid_plural "car batteries" -msgstr[0] "汽車電池" - #: lang/json/GENERIC_from_json.py msgid "carding paddles" msgid_plural "pairs of carding paddles" @@ -30149,7 +30145,7 @@ msgstr[0] "充滿的電容器" #: lang/json/GENERIC_from_json.py msgid "chime loudspeakers" msgid_plural "chime loudspeakerss" -msgstr[0] "" +msgstr[0] "音樂鈴擴音器" #: lang/json/GENERIC_from_json.py msgid "chitin armor kit" @@ -30323,7 +30319,7 @@ msgstr[0] "羽絨枕" #: lang/json/GENERIC_from_json.py lang/json/fault_from_json.py msgid "drive belt" msgid_plural "drive belts" -msgstr[0] "" +msgstr[0] "傳動帶" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "drive by wire controls" @@ -30543,7 +30539,7 @@ msgstr[0] "玻璃短刃" #: lang/json/GENERIC_from_json.py msgid "glow plug" msgid_plural "glow plugs" -msgstr[0] "" +msgstr[0] "電熱塞" #: lang/json/GENERIC_from_json.py msgid "gold bar" @@ -30618,7 +30614,7 @@ msgstr[0] "山核桃根" #: lang/json/GENERIC_from_json.py msgid "high-pressure pump" msgid_plural "high-pressure pumps" -msgstr[0] "" +msgstr[0] "高壓泵" #: lang/json/GENERIC_from_json.py msgid "high-quality lens" @@ -30773,12 +30769,12 @@ msgstr[0] "釘頭錘" #: lang/json/GENERIC_from_json.py msgid "makeshift air filter" msgid_plural "makeshift air filters" -msgstr[0] "" +msgstr[0] "粗製空氣過濾器" #: lang/json/GENERIC_from_json.py msgid "makeshift automotive filter" msgid_plural "makeshift automotive filters" -msgstr[0] "" +msgstr[0] "粗製汽車濾清器" #: lang/json/GENERIC_from_json.py msgid "makeshift copper pot" @@ -30788,7 +30784,7 @@ msgstr[0] "粗製銅鍋" #: lang/json/GENERIC_from_json.py msgid "makeshift drive belt" msgid_plural "makeshift drive belts" -msgstr[0] "" +msgstr[0] "粗製傳動帶" #: lang/json/GENERIC_from_json.py msgid "makeshift glaive" @@ -30815,11 +30811,6 @@ msgid "mechanical pump" msgid_plural "mechanical pumps" msgstr[0] "機械泵" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "medium storage battery" -msgid_plural "medium storage batteries" -msgstr[0] "中型蓄電池" - #: lang/json/GENERIC_from_json.py msgid "mess tin" msgid_plural "mess tins" @@ -30880,11 +30871,6 @@ msgid "motorbike alternator" msgid_plural "motorbike alternators" msgstr[0] "摩托車發電機" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "motorbike battery" -msgid_plural "motorbike batteries" -msgstr[0] "機車電池" - #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "muffler" msgid_plural "mufflers" @@ -30931,7 +30917,7 @@ msgstr[0] "一頁報紙" #: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py msgid "nodachi" msgid_plural "nodachi" -msgstr[0] "" +msgstr[0] "野太刀" #: lang/json/GENERIC_from_json.py msgid "nord" @@ -31201,7 +31187,7 @@ msgstr[0] "彎刀" #: lang/json/GENERIC_from_json.py msgid "scrap copper" msgid_plural "scrap copper" -msgstr[0] "" +msgstr[0] "銅碎" #: lang/json/GENERIC_from_json.py msgid "scrap metal" @@ -31271,7 +31257,7 @@ msgstr[0] "密封罐的肉湯" #: lang/json/GENERIC_from_json.py msgid "sealed jar of mushroom soup" msgid_plural "sealed jars of mushroom soup" -msgstr[0] "" +msgstr[0] "密封罐的蘑菇湯" #: lang/json/GENERIC_from_json.py msgid "sealed jar of pickled fish" @@ -31411,12 +31397,12 @@ msgstr[0] "銀條" #: lang/json/GENERIC_from_json.py msgid "silver glyph" msgid_plural "silver glyphs" -msgstr[0] "" +msgstr[0] "銀雕紋" #: lang/json/GENERIC_from_json.py msgid "singed note" msgid_plural "singed notes" -msgstr[0] "" +msgstr[0] "燒焦的筆記" #: lang/json/GENERIC_from_json.py msgid "skewer" @@ -31438,15 +31424,10 @@ msgid "small electric motor" msgid_plural "small electric motors" msgstr[0] "小型電力馬達" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "small storage battery" -msgid_plural "small storage batteries" -msgstr[0] "小型蓄電池" - #: lang/json/GENERIC_from_json.py msgid "software" msgid_plural "softwares" -msgstr[0] "" +msgstr[0] "軟體" #: lang/json/GENERIC_from_json.py msgid "solar cell" @@ -31461,7 +31442,7 @@ msgstr[0] "太陽能板" #: lang/json/GENERIC_from_json.py msgid "spare parts" msgid_plural "spare partss" -msgstr[0] "" +msgstr[0] "備品" #: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py msgid "spike" @@ -31506,7 +31487,7 @@ msgstr[0] "穩定的傳送門" #: lang/json/GENERIC_from_json.py msgid "steel boom" msgid_plural "steel booms" -msgstr[0] "" +msgstr[0] "鋼製吊桿" #: lang/json/GENERIC_from_json.py msgid "steel chain" @@ -31543,11 +31524,6 @@ msgid "stone spear" msgid_plural "stone spears" msgstr[0] "石矛" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "storage battery" -msgid_plural "storage batteries" -msgstr[0] "蓄電池" - #: lang/json/GENERIC_from_json.py msgid "storage battery case" msgid_plural "storage battery cases" @@ -31626,7 +31602,7 @@ msgstr[0] "泰迪熊" #: lang/json/GENERIC_from_json.py msgid "telescopic cantilever" msgid_plural "telescopic cantilevers" -msgstr[0] "" +msgstr[0] "伸縮式懸臂" #: lang/json/GENERIC_from_json.py msgid "telescoping umbrella" @@ -31678,11 +31654,6 @@ msgid "truck alternator" msgid_plural "truck alternators" msgstr[0] "卡車發電機" -#: lang/json/GENERIC_from_json.py lang/json/vehicle_part_from_json.py -msgid "truck battery" -msgid_plural "truck batteries" -msgstr[0] "卡車電池" - #: lang/json/GENERIC_from_json.py msgid "turret engine" msgid_plural "turret engines" @@ -31761,7 +31732,7 @@ msgstr[0] "車輛控制器" #: lang/json/GENERIC_from_json.py msgid "vehicle crafting rig" msgid_plural "vehicle crafting rigs" -msgstr[0] "" +msgstr[0] "車載手工電鑽機" #: lang/json/GENERIC_from_json.py msgid "vehicle curtain" @@ -31776,7 +31747,7 @@ msgstr[0] "車載鑄造機" #: lang/json/GENERIC_from_json.py msgid "vehicle scoop" msgid_plural "vehicle scoops" -msgstr[0] "" +msgstr[0] "車輛鏟勺" #: lang/json/GENERIC_from_json.py msgid "vehicle tracking device" @@ -31947,6 +31918,8 @@ msgid "" "shotgun, submachinegun or rifle, allowing a melee attack to deal piercing " "damage." msgstr "" +"刺刀是一種穿刺武器，能夠附掛在霰彈槍，衝鋒槍，或是步槍上，可進行近戰攻擊來造" +"成穿刺傷害。" #. ~ Description for leadworks magazine adaptor #: lang/json/GUNMOD_from_json.py @@ -32010,7 +31983,7 @@ msgstr "握把可以增加槍枝的穩定度與準確性，缺點是會增加額 msgid "" "A kit providing the necessary parts for permanently converting a firearm " "from magazine to belt-feed. Guaranteed to void your warranty." -msgstr "" +msgstr "一組工具能將進彈方式由彈匣改為彈鏈，這一定會讓你的保固失效。" #. ~ Description for rail-mounted crossbow #: lang/json/GUNMOD_from_json.py @@ -32057,6 +32030,7 @@ msgid "" "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." msgstr "" +"手槍刺刀是穿刺的武器，能夠附掛在手槍前緣，能夠在近戰攻擊中使出穿刺傷害。" #. ~ Description for ported barrel #: lang/json/GUNMOD_from_json.py @@ -32098,7 +32072,7 @@ msgstr "一套微調過的槍械內部組件，能增加其精度和可靠性。 msgid "" "A set of lightweight composite grips and furniture that reduces a firearm's " "weight, and as a consequence, its melee damage as well." -msgstr "" +msgstr "一組輕質複合材質的握把與附屬品，將同時降低槍枝重量以及進戰傷害。" #. ~ Description for firearm waterproofing #: lang/json/GUNMOD_from_json.py @@ -32146,6 +32120,7 @@ msgid "" "burst size of three rounds. However it reduces accuracy while increasing " "noise and recoil." msgstr "" +"讓手槍變成自動武器，可以一次發射三發。但是會降低準確性與增加噪音與後座力。" #. ~ Description for arrow rest #: lang/json/GUNMOD_from_json.py @@ -32204,6 +32179,8 @@ msgid "" "A sword bayonet is a large slashing weapon that can be attached to the front " "of a shotgun or rifle, allowing a melee attack to deal cutting damage." msgstr "" +"劍刺刀是大型的砍殺武器，能夠附掛在霰彈槍或步槍的前端，並使用近戰攻擊來造成砍" +"劈傷害。" #. ~ Description for underbarrel laser sight #: lang/json/GUNMOD_from_json.py @@ -32321,7 +32298,7 @@ msgstr[0] "M320 榴彈發射器" msgid "" "Mechanism that allows your CW-24 rifle to fire in fully automatic mode. It " "is handmade." -msgstr "" +msgstr "此改裝套件讓你的CW-24步槍以全自動射擊模式射擊。它是自製的。" #: lang/json/GUNMOD_from_json.py msgid "RM121 aux shotgun" @@ -32334,6 +32311,7 @@ msgid "" "Replacing several key parts flaregun to convert it to a .40 firearm. The " "conversion results in reduced accuracy and increased recoil." msgstr "" +"把信號槍改成.40口徑的槍枝，這些修改將會降低武器的準確度以及增加後座力。" #. ~ Description for 9mm caliber conversion kit #: lang/json/GUNMOD_from_json.py @@ -32360,6 +32338,8 @@ msgid "" "or .223 firearm converts it to a .22 firearm. The conversion results in a " "slight reduction to accuracy." msgstr "" +"將 9mm、.38、.40、5.7mm、4.6mm、7.62x39mm 或 .223 口徑的槍隻修改成使用 .22mm " +"子彈，會導致準確度輕微下降。" #. ~ Description for rifled barrel #: lang/json/GUNMOD_from_json.py @@ -32404,7 +32384,7 @@ msgid "" "caseless shotgun, which can be mounted under the barrel of many rifles. " "Accepts RMSA10 box magazines." msgstr "" -"Rivtech RM121 附掛武器系統是一個彈匣供彈的半自動無殼散彈槍，能夠被掛載於許多" +"Rivtech RM121 附掛武器系統是一個彈匣供彈的半自動無殼霰彈槍，能夠被掛載於許多" "步槍的槍管下。使用 RMSA10 盒狀彈匣。" #. ~ Description for diamond bayonet @@ -32428,6 +32408,8 @@ msgid "" "sniper rifle. It removes any automatic fire capabilities but also increases " "accuracy and damage." msgstr "" +"該模組會將步槍轉成狙擊步槍，缺點包括降低彈夾容量，只有半自動模式。優點則為增" +"加準確性與傷害。" #. ~ Description for battle rifle conversion #: lang/json/GUNMOD_from_json.py @@ -32436,6 +32418,8 @@ msgid "" "battle rifle. It reduces accuracy, and increases noise and recoil, but also " "increases damage and fire rate." msgstr "" +"該模組會將步槍修改成戰鬥步槍，缺點包括降低準確性，並增加噪音與後座力。優點則" +"為增加傷害、彈夾容量與開火速率。" #. ~ Description for 40mm pipe launcher #: lang/json/GUNMOD_from_json.py @@ -32474,6 +32458,8 @@ msgid "" "the popular and powerful .308 caliber. The conversion results in reduced " "ammo capacity and a slight reduction to accuracy." msgstr "" +"這個模組用來修改霰彈槍或 7.62x39mm、.223 或 .30-06 步槍，使它們可以使用較為普" +"遍且威力強大的 .308 口徑子彈。修改後會降低彈夾容量與輕微減少準確性。" #. ~ Description for .223 caliber conversion kit #: lang/json/GUNMOD_from_json.py @@ -32482,6 +32468,8 @@ msgid "" "the popular, accurate, and lighter .223 caliber. The conversion results in " "slight reductions to both accuracy and ammo capacity." msgstr "" +"這個模組用來修改霰彈槍或 7.62x39mm、.30-06 或 .308 步槍，使它們可以使用較為普" +"遍、準確且輕量的 .223 口徑子彈。修改後會輕微減少準確性與彈夾容量。" #. ~ Description for diamond pistol bayonet #: lang/json/GUNMOD_from_json.py @@ -32542,7 +32530,7 @@ msgstr[0] "刺刀" #: lang/json/GUNMOD_from_json.py msgid "belt feed adaptor" msgid_plural "belt feed adaptors" -msgstr[0] "" +msgstr[0] "帶式進彈調配器" #: lang/json/GUNMOD_from_json.py msgid "bipod" @@ -32551,7 +32539,7 @@ msgstr[0] "兩腳架" #: lang/json/GUNMOD_from_json.py msgid "bow" -msgstr "" +msgstr "弓" #: lang/json/GUNMOD_from_json.py msgid "bow sight" @@ -32655,7 +32643,7 @@ msgstr[0] "改進覘孔" #: lang/json/GUNMOD_from_json.py msgid "launcher" -msgstr "" +msgstr "發射器" #: lang/json/GUNMOD_from_json.py msgid "leadworks magazine adaptor" @@ -32689,7 +32677,7 @@ msgstr[0] "鋼管拼裝獵槍" #: lang/json/GUNMOD_from_json.py msgid "pistol" -msgstr "" +msgstr "手槍" #: lang/json/GUNMOD_from_json.py msgid "pistol bayonet" @@ -32738,7 +32726,7 @@ msgstr[0] "內紅點瞄準鏡" #: lang/json/GUNMOD_from_json.py msgid "rifle" -msgstr "" +msgstr "步槍" #: lang/json/GUNMOD_from_json.py msgid "rifle scope" @@ -32757,7 +32745,7 @@ msgstr[0] "縮短槍管" #: lang/json/GUNMOD_from_json.py msgid "shotgun" -msgstr "" +msgstr "霰彈槍" #: lang/json/GUNMOD_from_json.py msgid "shotgun suppressor" @@ -32771,7 +32759,7 @@ msgstr[0] "肩帶" #: lang/json/GUNMOD_from_json.py msgid "smg" -msgstr "" +msgstr "衝鋒槍" #: lang/json/GUNMOD_from_json.py msgid "sniper conversion" @@ -32816,7 +32804,7 @@ msgstr[0] "UPS 測試物品" #: lang/json/GUN_from_json.py msgid " XM34 EMP projector" msgid_plural " XM34 EMP projectors" -msgstr[0] "" +msgstr[0] "XM34 EMP 發射器" #: lang/json/GUN_from_json.py lang/json/vehicle_part_from_json.py msgid ".22 SMG turret" @@ -32866,7 +32854,7 @@ msgstr[0] "特製雙份烈酒" #: lang/json/GUN_from_json.py msgid "30mm autocannon" msgid_plural "30mm autocannons" -msgstr[0] "" +msgstr[0] "30mm 機砲" #: lang/json/GUN_from_json.py lang/json/vehicle_part_from_json.py msgid "9mm SMG turret" @@ -33343,7 +33331,7 @@ msgid "" "another for shotgun shells. It is simply two pipes attached to a stock, " "with a pair of hammers to strike the two rounds it holds." msgstr "" -"一把土炮的雙管槍械。其中一管的口徑是 .30-06，另一管能裝填散彈。它簡單地把二根" +"一把土炮的雙管槍械。其中一管的口徑是 .30-06，另一管能裝填霰彈。它簡單地把二根" "鐵管連結到了槍機與擊錘來發射兩發子彈。" #. ~ Description for double-barrel pipe shotgun @@ -33438,10 +33426,8 @@ msgstr "" #: lang/json/GUN_from_json.py msgid "" "A homemade triple-barrel 40mm grenade launcher. Capable of launching all " -"three grenades at once, it is extremely powerwul for a homemade weapon." +"three grenades at once, it is extremely powerful for a homemade weapon." msgstr "" -"自製的三管式 40mm 榴彈發射器。能夠一次發射全部三顆手榴彈，以自製武器來說非常" -"強大。" #. ~ Description for blunderbuss #: lang/json/GUN_from_json.py @@ -33689,6 +33675,8 @@ msgid "" "durability, it has been found to stay accurate even after being subjected to " "extreme abuse." msgstr "" +"一把受歡迎的 9mm 口徑手槍，通常為執法部門配槍。已受過廣泛的可靠性測試，即使受" +"到嚴重摧殘也能夠保持準確性。" #. ~ Description for SIG Mosquito #: lang/json/GUN_from_json.py @@ -33853,6 +33841,8 @@ msgid "" "accurate single-shot placement in a very robust frame. Several urban " "legends describe using it in ways that would have destroyed a lesser weapon." msgstr "" +"一把在2039年推出的半自動9mm手槍，型號L39，由Leadworks LLC生產，擁有堅固的框架" +"能提供良好的單發射擊精準度。另外有一些都市傳說記載著這把槍傑出的耐用性。" #. ~ Description for S&W 619 #: lang/json/GUN_from_json.py @@ -34170,7 +34160,7 @@ msgid "" "A well designed homemade lever-action shotgun. With a 8 round magazine, " "this is one of the better homemade weapons." msgstr "" -"一把設計良好的土製槓桿式散彈槍。配備 8 發裝彈夾，在土製武器中表現卓越。" +"一把設計良好的土製槓桿式霰彈槍。配備 8 發裝彈夾，在土製武器中表現卓越。" #. ~ Description for survivor carbine #: lang/json/GUN_from_json.py @@ -34810,7 +34800,7 @@ msgstr[0] "FTK-93 核融合槍" #: lang/json/GUN_from_json.py msgid "FiveO handcannon" msgid_plural "FiveO handcannons" -msgstr[0] "" +msgstr[0] "50口徑手砲" #. ~ Description for flintlock rifle #: lang/json/GUN_from_json.py @@ -34910,6 +34900,10 @@ msgid "" "to deliver precise long-range takedowns, utilizing the proprietary Rivtech " "8mm caseless round. Accepts stick magazines." msgstr "" +"為了滿足軍隊中長距離神槍手的武器需求，Rivtech公司製造的RM11B斥侯步槍研發概念" +"是希望能在惡劣情況下，達到耐用且精準。以無拖式設計、集成式滅音器、數位化瞄準" +"鏡，以及兩發連射模式，使得它能精確地遠距離擊倒敵人，使用Rivtech公司專利生產的" +"8mm無殼彈，使用條狀彈匣。" #. ~ Description for AN-94 #: lang/json/GUN_from_json.py @@ -34933,17 +34927,17 @@ msgstr "" #: lang/json/GUN_from_json.py msgid "Kel-Tec KSG" msgid_plural "Kel-Tec KSG" -msgstr[0] "" +msgstr[0] "Kel-Tec KSG" #: lang/json/GUN_from_json.py msgid "Kel-Tec SUB-2000" msgid_plural "Kel-Tec SUB-2000" -msgstr[0] "" +msgstr[0] "Kel-Tec SUB-2000" #: lang/json/GUN_from_json.py msgid "L.T. carbine" msgid_plural "L.T. carbines" -msgstr[0] "" +msgstr[0] "電跡卡賓槍" #: lang/json/GUN_from_json.py msgid "L12 Defender" @@ -35269,7 +35263,7 @@ msgid "" "chambered and re-bored for shotgun shells, and completely redesigned to be " "wielded unmounted by one user." msgstr "" -"改造自巨型的 M2 白朗寧重機槍，膛室經過改造以容納散彈，而且可以一個人手持使" +"改造自巨型的 M2 白朗寧重機槍，膛室經過改造以容納霰彈，而且可以一個人手持使" "用。" #. ~ Description for .50 caliber rifle @@ -35423,6 +35417,9 @@ msgid "" "with its considerable bulk minimized by a compact and ergonomic layout. " "Accepts box magazines." msgstr "" +"原本設計為軍事用途，Rivtech公司製造的RM51突擊步槍研發概念是希望能在惡劣情況" +"下，仍然耐用、易用。它的體積經緊湊式人體工學設計以達到最小化的樣式。使用盒狀" +"彈匣。" #. ~ Description for RM88 battle rifle #: lang/json/GUN_from_json.py @@ -35432,11 +35429,14 @@ msgid "" "circumstances, with a heavy ported barrel for maximum controllability. " "Accepts box and and RMD250 drum magazines." msgstr "" +"原本設計為軍事用途，Rivtech公司製造的RM88戰鬥步槍研發概念是希望能在惡劣情況" +"下，仍擁有可靠性能與強大火力，有著重型氣孔式槍管以達到最高的可控性。使用盒狀" +"彈匣或 RMD250 彈鼓。" #: lang/json/GUN_from_json.py msgid "PPSh-41" msgid_plural "PPSh-41s" -msgstr[0] "" +msgstr[0] "PPSh-41s" #. ~ Description for BB gun #: lang/json/GUN_from_json.py @@ -36730,7 +36730,7 @@ msgstr[0] "雪崩槍塔" #: lang/json/GUN_from_json.py msgid "bane staff" msgid_plural "bane staves" -msgstr[0] "" +msgstr[0] "災難法杖" #: lang/json/GUN_from_json.py msgid "barrel" @@ -36744,27 +36744,27 @@ msgstr[0] "" #: lang/json/GUN_from_json.py msgid "base flamethrower" msgid_plural "base flamethrowers" -msgstr[0] "" +msgstr[0] "基本火焰噴射器" #: lang/json/GUN_from_json.py msgid "base gun" msgid_plural "base guns" -msgstr[0] "" +msgstr[0] "基本槍械" #: lang/json/GUN_from_json.py msgid "base pistol" msgid_plural "base pistols" -msgstr[0] "" +msgstr[0] "基本手槍" #: lang/json/GUN_from_json.py msgid "base rifle" msgid_plural "base rifles" -msgstr[0] "" +msgstr[0] "基本步槍" #: lang/json/GUN_from_json.py msgid "base shotgun" msgid_plural "base shotguns" -msgstr[0] "" +msgstr[0] "基本霰彈槍" #: lang/json/GUN_from_json.py msgid "battle rifle" @@ -36843,12 +36843,12 @@ msgstr[0] "電磁加速槍" #: lang/json/GUN_from_json.py msgid "combat shotgun" msgid_plural "combat shotguns" -msgstr[0] "戰鬥散彈槍" +msgstr[0] "戰鬥霰彈槍" #: lang/json/GUN_from_json.py msgid "combination gun" msgid_plural "combination guns" -msgstr[0] "" +msgstr[0] "拼裝槍" #: lang/json/GUN_from_json.py msgid "composite bow" @@ -36867,7 +36867,7 @@ msgstr "改裝" #: lang/json/GUN_from_json.py msgid "demon claw" msgid_plural "demon claws" -msgstr[0] "" +msgstr[0] "惡魔爪" #: lang/json/GUN_from_json.py msgid "double barrel shotgun" @@ -36942,7 +36942,7 @@ msgstr[0] "" #: lang/json/GUN_from_json.py msgid "fully automatic rifle" msgid_plural "fully automatic rifles" -msgstr[0] "" +msgstr[0] "全自動步槍" #: lang/json/GUN_from_json.py msgid "fusion blaster" @@ -36971,12 +36971,12 @@ msgstr "握把" #: lang/json/GUN_from_json.py msgid "gunknife" msgid_plural "gunknives" -msgstr[0] "" +msgstr[0] "槍匕" #: lang/json/GUN_from_json.py msgid "gunsword" msgid_plural "gunswords" -msgstr[0] "" +msgstr[0] "槍刃" #: lang/json/GUN_from_json.py msgid "handheld laser cannon" @@ -37011,12 +37011,12 @@ msgstr[0] "" #: lang/json/GUN_from_json.py msgid "hellfire plasma gun" msgid_plural "hellfire plasma guns" -msgstr[0] "" +msgstr[0] "地獄火電漿槍" #: lang/json/GUN_from_json.py msgid "hellfire stave" msgid_plural "hellfire staves" -msgstr[0] "" +msgstr[0] "地獄火法杖" #: lang/json/GUN_from_json.py msgid "holdout pistol" @@ -37065,7 +37065,7 @@ msgstr "彈匣" #: lang/json/GUN_from_json.py msgid "makeshift lever shotgun" msgid_plural "makeshift lever shotguns" -msgstr[0] "土製槓桿式散彈槍" +msgstr[0] "土製槓桿式霰彈槍" #: lang/json/GUN_from_json.py msgid "manual autoshotgun" @@ -37193,7 +37193,7 @@ msgstr[0] "鐵釘步槍" #: lang/json/GUN_from_json.py msgid "napalm launcher" msgid_plural "napalm launchers" -msgstr[0] "" +msgstr[0] "凝固汽油發射器" #: lang/json/GUN_from_json.py lang/json/vehicle_part_from_json.py msgid "needler turret" @@ -37203,7 +37203,7 @@ msgstr[0] "" #: lang/json/GUN_from_json.py msgid "pepperbox pistol" msgid_plural "pepperbox pistols" -msgstr[0] "" +msgstr[0] "多管轉動式手槍" #: lang/json/GUN_from_json.py lang/json/vehicle_part_from_json.py msgid "perforator turret" @@ -37248,7 +37248,7 @@ msgstr[0] "單管步槍: 手槍彈" #: lang/json/GUN_from_json.py msgid "pipe gun: revolver ammo" msgid_plural "pipe guns: revolver ammo" -msgstr[0] "" +msgstr[0] "單管步槍: 左輪手槍子彈" #: lang/json/GUN_from_json.py msgid "pipe gun: rifle ammo" @@ -37417,7 +37417,7 @@ msgstr[0] "單弓" #: lang/json/GUN_from_json.py msgid "semi-automatic rifle" msgid_plural "semi-automatic rifles" -msgstr[0] "" +msgstr[0] "半自動步槍。" #: lang/json/GUN_from_json.py msgid "semiautomatic carbine" @@ -37447,7 +37447,7 @@ msgstr[0] "轉輪散彈槍" #: lang/json/GUN_from_json.py lang/json/vehicle_part_from_json.py msgid "shotgun turret" msgid_plural "shotgun turrets" -msgstr[0] "散彈槍塔" +msgstr[0] "霰彈槍塔" #: lang/json/GUN_from_json.py msgid "sights" @@ -37520,7 +37520,7 @@ msgstr[0] "生存者卡賓槍" #: lang/json/GUN_from_json.py msgid "survivor lever rifle" msgid_plural "survivor lever rifles" -msgstr[0] "" +msgstr[0] "生存者槓桿步槍" #: lang/json/GUN_from_json.py msgid "survivor's carbine" @@ -37607,7 +37607,7 @@ msgstr[0] "水砲" #: lang/json/GUN_from_json.py msgid "wraithslayer crossbow" msgid_plural "wraithslayer crossbows" -msgstr[0] "" +msgstr[0] "幽靈殺手十字弓" #. ~ Crafting recipes category name #: lang/json/ITEM_CATEGORY_from_json.py lang/json/recipe_category_from_json.py @@ -37633,7 +37633,7 @@ msgstr ".223 彈鏈" #. ~ Description for RMSA10 magazine #: lang/json/MAGAZINE_from_json.py msgid "A 10 round box magazine for use with the RM121 auxiliary shotgun." -msgstr "一個 10 發的盒型彈匣，適用於 RM121 附掛散彈槍。" +msgstr "一個 10 發的盒型彈匣，適用於 RM121 附掛霰彈槍。" #. ~ Description for RMGP10 magazine #: lang/json/MAGAZINE_from_json.py @@ -37658,10 +37658,21 @@ msgid "" "L39B-45 pistols." msgstr "一個 12 發的聚合物彈匣，適用於 Leadworks LLC L39-45 和 L39B-45 手槍。" +#. ~ Description for car battery +#: lang/json/MAGAZINE_from_json.py +msgid "A 12v lead-acid battery used to power car electrical systems." +msgstr "一個12v的鉛酸電池，用來供電給車輛的電子系統。" + +#. ~ Description for motorbike battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A 12v lead-acid battery used to power smaller vehicles' electrical systems." +msgstr "一個12v的鉛酸電池，用來供電給小型車輛的電子系統。" + #. ~ Description for RMSB20 magazine #: lang/json/MAGAZINE_from_json.py msgid "A 20 round box magazine for use with the RM20 caseless shotgun." -msgstr "一個 20 發的盒型彈匣，適用於 RM20 無殼散彈槍。" +msgstr "一個 20 發的盒型彈匣，適用於 RM20 無殼霰彈槍。" #. ~ Description for RMRB200 magazine #: lang/json/MAGAZINE_from_json.py @@ -37723,12 +37734,12 @@ msgstr "" #. ~ Description for PPSh 35-round magazine #: lang/json/MAGAZINE_from_json.py msgid "A 35-round box magazine for the PPSh-41." -msgstr "" +msgstr "一個 35 發盒狀彈匣，適用於 PPSh-41。" #. ~ Description for RMSB40 magazine #: lang/json/MAGAZINE_from_json.py msgid "A 40 round box magazine for use with the RM20 caseless shotgun." -msgstr "一個 40 發的盒型彈匣，適用於 RM20 無殼散彈槍。" +msgstr "一個 40 發的盒型彈匣，適用於 RM20 無殼霰彈槍。" #. ~ Description for AKM extended magazine #: lang/json/MAGAZINE_from_json.py @@ -37905,7 +37916,12 @@ msgstr "一個工廠規格的 8 發彈匣，適用於 SIG 紹爾 P230 手槍。" #. ~ Description for PPSh 71-round drum #: lang/json/MAGAZINE_from_json.py msgid "A high-capacity drum magazine for the PPSh-41." -msgstr "" +msgstr "PPSh-41 適用的高容量彈鼓。" + +#. ~ Description for truck battery +#: lang/json/MAGAZINE_from_json.py +msgid "A large 12v lead-acid battery used to power truck electrical systems." +msgstr "一個12v的鉛酸電池，用來供電給卡車的電子系統。" #. ~ Description for welding tank #: lang/json/MAGAZINE_from_json.py @@ -37914,6 +37930,13 @@ msgid "" "is marked with several faded and now unreadable symbols." msgstr "" +#. ~ Description for storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "" +"A large storage battery. Could be installed into a storage battery case for " +"easy removal from a vehicle, or just welded straight in." +msgstr "一個大型的蓄電池。在蓄電池殼上裝拆非常容易，也可以直接焊在車上。" + #. ~ Description for M1 Garand Clip #: lang/json/MAGAZINE_from_json.py msgid "" @@ -37926,6 +37949,11 @@ msgstr "" msgid "A lightweight aluminum box magazine for the H&K G3 rifle." msgstr "一個輕巧的鋁製盒狀彈匣，適用於 H&K G3 步槍。" +#. ~ Description for medium storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A medium storage battery." +msgstr "一個中型的蓄電池。" + #. ~ Description for M9 magazine #: lang/json/MAGAZINE_from_json.py msgid "" @@ -37959,13 +37987,18 @@ msgstr "一個由軍方配給的 7 發彈匣，適用於 M1911 手槍。" #: lang/json/MAGAZINE_from_json.py msgid "" "A removable plastic magazine for the Saiga-12 shotgun. Holds 10 rounds." -msgstr "一個可移除的塑料彈匣，適用於 Saiga-12 散彈槍，能容納 10 發子彈。" +msgstr "一個可移除的塑料彈匣，適用於 Saiga-12 霰彈槍，能容納 10 發子彈。" #. ~ Description for Saiga-12 drum magazine #: lang/json/MAGAZINE_from_json.py msgid "" "A removable plastic magazine for the Saiga-12 shotgun. Holds 30 rounds." -msgstr "一個可移除的塑料彈鼓，適用於 Saiga-12 散彈槍，能容納 30 發子彈。" +msgstr "一個可移除的塑料彈鼓，適用於 Saiga-12 霰彈槍，能容納 30 發子彈。" + +#. ~ Description for small storage battery +#: lang/json/MAGAZINE_from_json.py +msgid "A small storage battery. Useful for crafting." +msgstr "一個小的蓄電池。製作物品時很有用。" #. ~ Description for Battle rifle magazine #: lang/json/MAGAZINE_from_json.py @@ -38108,7 +38141,7 @@ msgstr "進階衝鋒槍彈匣" #: lang/json/MAGAZINE_from_json.py msgid "Ammo belt" -msgstr "" +msgstr "彈鏈" #. ~ Description for FN SCAR-H drum magazine #: lang/json/MAGAZINE_from_json.py @@ -38224,7 +38257,7 @@ msgstr "" msgid "" "An improvised magazine designed to be compatible with the STEN submachine " "gun, with a simplified feed system." -msgstr "" +msgstr "一個簡易彈匣設計兼容斯登衝鋒槍，有著簡單的進彈系統。" #. ~ Description for nail rifle magazine #: lang/json/MAGAZINE_from_json.py @@ -38233,6 +38266,8 @@ msgid "" "can, spring and some duct tape it is awkward to reload and not especially " "reliable." msgstr "" +"一個簡易的彈匣供鐵釘步槍使用。錫罐、彈簧與大力膠帶組成，有點難裝填，而且不是" +"特別可靠。" #. ~ Description for Imported drum magazine #: lang/json/MAGAZINE_from_json.py @@ -38347,7 +38382,7 @@ msgstr "H&K G3 彈匣" #: lang/json/MAGAZINE_from_json.py msgid "Heavy ammo belt" -msgstr "" +msgstr "重型彈鏈" #: lang/json/MAGAZINE_from_json.py msgid "Imported drum magazine" @@ -38375,15 +38410,15 @@ msgstr "LW-56 彈匣" #: lang/json/MAGAZINE_from_json.py msgid "Light amno belt" -msgstr "" +msgstr "輕型彈鏈" #: lang/json/MAGAZINE_from_json.py msgid "M1 Garand Clip" -msgstr "" +msgstr "M1 加蘭德步槍彈夾條" #: lang/json/MAGAZINE_from_json.py msgid "M13 7.62x51mm ammo belt" -msgstr "" +msgstr "M13 7.62x51mm 彈鏈" #: lang/json/MAGAZINE_from_json.py msgid "M14 compact magazine" @@ -38431,15 +38466,15 @@ msgstr "粗製 223 彈匣" #: lang/json/MAGAZINE_from_json.py msgid "Makeshift STEN magazine" -msgstr "" +msgstr "粗製STEN 彈匣" #: lang/json/MAGAZINE_from_json.py msgid "PPSh 35-round magazine" -msgstr "" +msgstr "PPSh 35 彈鼓" #: lang/json/MAGAZINE_from_json.py msgid "PPSh 71-round drum" -msgstr "" +msgstr "PPSh 71 彈鼓" #: lang/json/MAGAZINE_from_json.py msgid "Pistol magazine" @@ -38621,17 +38656,47 @@ msgstr "UZI 彈匣" msgid "Walther PPK magazine" msgstr "瓦爾特 PPK 彈匣" +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "car battery" +msgid_plural "car batteries" +msgstr[0] "汽車電池" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "medium storage battery" +msgid_plural "medium storage batteries" +msgstr[0] "中型蓄電池" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "motorbike battery" +msgid_plural "motorbike batteries" +msgstr[0] "機車電池" + #: lang/json/MAGAZINE_from_json.py msgid "nail rifle magazine" -msgstr "" +msgstr "鐵釘步槍彈匣" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "small storage battery" +msgid_plural "small storage batteries" +msgstr[0] "小型蓄電池" #: lang/json/MAGAZINE_from_json.py msgid "small welding tank" -msgstr "" +msgstr "小型焊接罐" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "storage battery" +msgid_plural "storage batteries" +msgstr[0] "蓄電池" + +#: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py +msgid "truck battery" +msgid_plural "truck batteries" +msgstr[0] "卡車電池" #: lang/json/MAGAZINE_from_json.py msgid "welding tank" -msgstr "" +msgstr "焊接罐" #. ~ Description for DeadLeaves' Fictional Guns #: lang/json/MOD_INFO_from_json.py @@ -38755,7 +38820,7 @@ msgstr "自製槍械包" #: lang/json/MOD_INFO_from_json.py msgid "Crazy Cataclysm" -msgstr "" +msgstr "瘋狂大災變" #: lang/json/MOD_INFO_from_json.py msgid "DeadLeaves' Fictional Guns" @@ -38780,7 +38845,7 @@ msgstr "沒有宗教內容" #. ~ Description for Simplified nutrition #: lang/json/MOD_INFO_from_json.py msgid "Disables vitamin requirements." -msgstr "" +msgstr "停用維他命的需求" #. ~ Description for Prevent Zombie Revivication #: lang/json/MOD_INFO_from_json.py @@ -38844,7 +38909,7 @@ msgstr "Icecoon武器包" #: lang/json/MOD_INFO_from_json.py msgid "Improved survivor weapons" -msgstr "" +msgstr "改善生存者武器" #. ~ Description for Folding Parts pack #: lang/json/MOD_INFO_from_json.py @@ -38929,7 +38994,7 @@ msgstr "" #: lang/json/MOD_INFO_from_json.py msgid "Perfect Reliability" -msgstr "" +msgstr "完美的可靠性" #: lang/json/MOD_INFO_from_json.py msgid "Prevent Zombie Revivication" @@ -39025,7 +39090,7 @@ msgstr "合拼同類的槍械，以通用類別取代二十世紀的槍支和彈 #: lang/json/MOD_INFO_from_json.py msgid "Simplified nutrition" -msgstr "" +msgstr "簡化營養素" #: lang/json/MOD_INFO_from_json.py msgid "Slow Zombies" @@ -39033,7 +39098,7 @@ msgstr "緩慢殭屍" #: lang/json/MOD_INFO_from_json.py msgid "StatsThoughSkills" -msgstr "" +msgstr "技能決定屬性" #: lang/json/MOD_INFO_from_json.py msgid "Tall Buildings" @@ -39078,7 +39143,7 @@ msgstr "預設" #: lang/json/MONSTER_from_json.py msgid " alpha razorclaw" -msgstr "" +msgstr "阿爾法利爪怪" #. ~ Description for bowfin #: lang/json/MONSTER_from_json.py @@ -39338,7 +39403,7 @@ msgstr "" msgid "" "A blood red, gigantic razorclaw. Its sword like pincers serve as the " "keepers of the nest." -msgstr "" +msgstr "血紅巨大的利爪怪，有著劍刃般的爪子，保護著巢穴。" #. ~ Description for mosquito #: lang/json/MONSTER_from_json.py @@ -39391,6 +39456,8 @@ msgid "" "deliberately, tending to nearby eggs and continually laying more. Its " "antennae seem almost aesthetic, or at the least not used for sensing . . ." msgstr "" +"這種螞蟻有一個長而臃腫的胸腔。移動很緩慢並且會產下許多的卵。觸角似乎只為美" +"型，至少並不用於探測..." #. ~ Description for crawler #: lang/json/MONSTER_from_json.py @@ -39800,6 +39867,8 @@ msgid "" "pincers extend from its jaws. This Earth native is comfortably adapted to " "its new size." msgstr "" +"體型幾乎是其他巨蟻兩倍大的毛茸茸紅蟻。從它的下顎伸出了粗壯的鉗子。這個地球原" +"生動物已經適應了它的新體型。" #. ~ Description for shocker brute #: lang/json/MONSTER_from_json.py @@ -40051,7 +40120,7 @@ msgstr "一團孢子聚集成拳頭大的霧氣，飄蕩在空中。" #: lang/json/MONSTER_from_json.py msgid "" "A massive animated conflagration, crackling like burning logs as it moves." -msgstr "" +msgstr "一團巨大興盛的大火，移動時劈啪作響像是正燒著木材一樣。" #. ~ Description for archdemon #: lang/json/MONSTER_from_json.py @@ -40397,7 +40466,7 @@ msgstr "" msgid "" "A slender-bodied flying insect, with a painful sting. They can be somewhat " "aggressive if disturbed." -msgstr "" +msgstr "一種細長身形的飛蟲，具有令人痛楚的刺針。當它感到不安時會發動攻擊。" #. ~ Description for swimmer zombie #: lang/json/MONSTER_from_json.py @@ -40521,7 +40590,7 @@ msgstr "從地板伸出的圓形小槍塔。裝配了雙管的衝鋒槍，能夠 msgid "" "A smoking husk is all that remains of this once proud bear. Its black eyes " "gaze at you with malice... and hunger." -msgstr "" +msgstr "這隻曾經驕傲的熊只剩下煙霧外表。它的黑眼注視著你...帶著惡意和飢餓。" #. ~ Description for miner bot #: lang/json/MONSTER_from_json.py @@ -40675,6 +40744,8 @@ msgid "" "playground exercise. It does not need a face for you to feel bad about " "killing it." msgstr "" +"小小的燒焦身體，又跳又踢，搖晃著做著滑稽地體操。即使不看到臉，你也會為了殺它" +"而感到內疚。" #. ~ Description for squirrel #: lang/json/MONSTER_from_json.py @@ -40890,7 +40961,7 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "Allosaurus" -msgstr "" +msgstr "異特龍" #. ~ Description for groundhog #: lang/json/MONSTER_from_json.py @@ -41057,9 +41128,9 @@ msgstr "" #. ~ Description for giant mosquito #: lang/json/MONSTER_from_json.py msgid "" -"An enormous mutant mosquito, fluttering erratically, its face dominated by a " -"long, spear-tipped proboscis." -msgstr "一隻飛舞的巨大蚊子，臉部是長型並帶有長矛狀的口器。" +"An enormous mutant mosquito, fluttering erratically. Its face is dominated " +"by a long, spear-tipped proboscis." +msgstr "" #. ~ Description for giant ant #: lang/json/MONSTER_from_json.py @@ -41075,6 +41146,8 @@ msgid "" "wriggling antennae and vicious-looking mandibles. This Earth native is " "comfortably adapted to its new size." msgstr "" +"一隻全身甲殼的紅色螞蟻。牠有一對扭動的觸角與有毒的下顎。這個地球原生動物已經" +"適應了它的新體型。" #. ~ Description for yugg #: lang/json/MONSTER_from_json.py @@ -41132,6 +41205,8 @@ msgid "" "repulsed to touch it. All you can make out is its shambling, human shaped " "outline." msgstr "" +"不可思議的陰影籠罩著這傢伙，好像光線本身也排斥觸摸它。你能認出的只有它蹣跚的" +"步履，人類外型的輪廓。" #. ~ Description for grappler zombie #: lang/json/MONSTER_from_json.py @@ -41156,7 +41231,7 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "Ankylosaurus" -msgstr "" +msgstr "甲龍" #. ~ Description for zombie scientist #: lang/json/MONSTER_from_json.py @@ -41185,11 +41260,11 @@ msgstr[0] "布林基魚" #: lang/json/MONSTER_from_json.py msgid "C-4 hack" -msgstr "" +msgstr "C-4 無人機" #: lang/json/MONSTER_from_json.py msgid "C.H.U.D." -msgstr "" +msgstr "C.H.U.D." #. ~ Description for fiend #: lang/json/MONSTER_from_json.py @@ -41200,15 +41275,15 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "Compsognathus" -msgstr "" +msgstr "美頜龍" #: lang/json/MONSTER_from_json.py msgid "Crayfish" -msgstr "" +msgstr "小龍蝦" #: lang/json/MONSTER_from_json.py msgid "Deinonychus" -msgstr "" +msgstr "恐爪龍" #. ~ Description for armored zombie #: lang/json/MONSTER_from_json.py @@ -41219,11 +41294,11 @@ msgstr "儘管重重包覆在牢不可破的動力裝甲裡面，某些東西還 #: lang/json/MONSTER_from_json.py msgid "Dilophosaurus" -msgstr "" +msgstr "雙脊龍" #: lang/json/MONSTER_from_json.py msgid "Dimorphodon" -msgstr "" +msgstr "雙型齒翼龍" #. ~ Description for shambling zombie #: lang/json/MONSTER_from_json.py @@ -41236,7 +41311,7 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "EMP hack" -msgstr "" +msgstr "電磁脈衝手榴彈無人機" #. ~ Description for albino penguin #: lang/json/MONSTER_from_json.py @@ -41246,7 +41321,7 @@ msgstr "八英尺高的陰森白企鵝。除非受到挑釁不然相當平靜。 #: lang/json/MONSTER_from_json.py msgid "Eoraptor" -msgstr "" +msgstr "始盜龍" #. ~ Description for imp #: lang/json/MONSTER_from_json.py @@ -41254,6 +41329,8 @@ msgid "" "Even for an imp, this figure has black skin. It attacks with fire and claw, " "and leads its brethren into battle." msgstr "" +"即使是一隻小惡魔，這個身形有著黑色的皮膚。用火和爪的攻擊，並帶領著兄弟們上" +"陣。" #. ~ Description for lost soul #: lang/json/MONSTER_from_json.py @@ -41264,7 +41341,7 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "Gallimimus" -msgstr "" +msgstr "似雞龍" #. ~ Description for scorched zombie #: lang/json/MONSTER_from_json.py @@ -41382,7 +41459,7 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "Lobster" -msgstr "" +msgstr "龍蝦" #. ~ Description for Tyrannosaurus rex #: lang/json/MONSTER_from_json.py @@ -41515,7 +41592,7 @@ msgstr "這個巨蟻呈現蒼白的灰色，其全身甲殼是由寄生的真菌 #: lang/json/MONSTER_from_json.py msgid "Parasaurolophus" -msgstr "" +msgstr "副櫛龍" #. ~ Description for zombie tank #: lang/json/MONSTER_from_json.py @@ -41532,7 +41609,7 @@ msgstr[0] "西亞李畢福" #: lang/json/MONSTER_from_json.py msgid "Smoky bear" -msgstr "" +msgstr "煙霧熊" #. ~ Description for zombie husk #: lang/json/MONSTER_from_json.py @@ -41575,7 +41652,7 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "Spinosaurus" -msgstr "" +msgstr "棘龍" #. ~ Description for zombie lord #: lang/json/MONSTER_from_json.py @@ -41588,7 +41665,7 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "Stegosaurus" -msgstr "" +msgstr "劍龍" #. ~ Description for zombie technician #: lang/json/MONSTER_from_json.py @@ -41768,6 +41845,8 @@ msgid "" "robots. Initially designed for military patrol and escort service, it rolls " "on a set of hydraulic treads and is armed with a 9x19mm SMG." msgstr "" +"諾斯羅普守望者 X-1 是重裝甲戰鬥機器人系列的產品之一。最初設計是用於軍事巡邏和" +"護送。它具有一套液壓履帶並裝備有一具 9x19mm 衝鋒槍。" #. ~ Description for chicken walker #: lang/json/MONSTER_from_json.py @@ -42056,6 +42135,8 @@ msgid "" "This horrifying little mutated wretch looks to have once been a child, but " "its massive gaping jaws are now far more suggestive of a predatory beast." msgstr "" +"這個可怕的小型變種怪看起來像是小孩，但是它的巨大下顎讓人覺得更像是掠食性野" +"獸。" #. ~ Description for crawling zombie #: lang/json/MONSTER_from_json.py @@ -42069,7 +42150,7 @@ msgstr "這具腿部已經殘破不堪的人型殭屍正用自己的手臂慢慢 msgid "" "This humanoid resembles a burnt cenobite. It attacks with fire and claw, " "and is the grunt of the demonic armies." -msgstr "" +msgstr "這酷似人形的燃燒修道士。用火和爪的攻擊，是惡魔軍隊的步兵。" #. ~ Description for blank body #: lang/json/MONSTER_from_json.py @@ -42131,6 +42212,8 @@ msgid "" "This swollen, gooey looking mutant child looks bad, even for a zombie. " "Maybe that's why it seems to want a hug so badly." msgstr "" +"這突變小孩看起來又腫又黏乎乎的，即使在殭屍群裡也顯得十分難看。或許這就是它這" +"麼渴望擁抱的原因吧..." #. ~ Description for giant carp #: lang/json/MONSTER_from_json.py @@ -42169,7 +42252,7 @@ msgstr "三個強力的探照燈被裝在一個機器上，擁有人工智慧， #: lang/json/MONSTER_from_json.py msgid "Thriller" -msgstr "" +msgstr "顫慄" #. ~ Description for hell hound #: lang/json/MONSTER_from_json.py @@ -42181,11 +42264,11 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "Titanis" -msgstr "" +msgstr "泰坦巨鳥" #: lang/json/MONSTER_from_json.py msgid "Triceratops" -msgstr "" +msgstr "三角龍" #. ~ Description for mininuke hack #: lang/json/MONSTER_from_json.py @@ -42198,7 +42281,7 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "Tyrannosaurus rex" -msgstr "" +msgstr "暴龍" #. ~ Description for howling waif #: lang/json/MONSTER_from_json.py @@ -42219,11 +42302,11 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "Utahraptor" -msgstr "" +msgstr "猶他盜龍" #: lang/json/MONSTER_from_json.py msgid "Velociraptor" -msgstr "" +msgstr "伶盜龍" #. ~ Description for creepy crawler #: lang/json/MONSTER_from_json.py @@ -42244,7 +42327,7 @@ msgstr "" msgid "" "With a crocodile-like snout and rows of protuding teeth, this swimwear-clad " "zombie lurks in the water." -msgstr "" +msgstr "有著鱷魚般的嘴與成排外突的尖牙，這種穿泳衣的殭屍潛伏在水中。" #. ~ Description for giant bee #: lang/json/MONSTER_from_json.py @@ -42324,7 +42407,7 @@ msgstr "你最珍惜的發電機，發出嗡嗡的噪音。不惜代價保護它 #: lang/json/MONSTER_from_json.py msgid "Z-9" -msgstr "" +msgstr "Z-9" #. ~ Description for hissing brood #: lang/json/MONSTER_from_json.py @@ -42335,59 +42418,59 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "acidic zombie" -msgstr "" +msgstr "酸液殭屍" #: lang/json/MONSTER_from_json.py msgid "albino penguin" -msgstr "" +msgstr "白化企鵝" #: lang/json/MONSTER_from_json.py msgid "amigara horror" -msgstr "" +msgstr "阿彌殼怪" #: lang/json/MONSTER_from_json.py msgid "amoebic mold" -msgstr "" +msgstr "阿米巴黏菌" #: lang/json/MONSTER_from_json.py msgid "animatronic bat" -msgstr "" +msgstr "蝙蝠機械布偶" #: lang/json/MONSTER_from_json.py msgid "animatronic beaver" -msgstr "" +msgstr "海貍機械布偶" #: lang/json/MONSTER_from_json.py msgid "animatronic cat" -msgstr "" +msgstr "貓咪機械布偶" #: lang/json/MONSTER_from_json.py msgid "animatronic child" -msgstr "" +msgstr "孩童機器布偶" #: lang/json/MONSTER_from_json.py msgid "animatronic chipmunk" -msgstr "" +msgstr "花栗鼠機械布偶" #: lang/json/MONSTER_from_json.py msgid "animatronic cow" -msgstr "" +msgstr "牛形機械布偶" #: lang/json/MONSTER_from_json.py msgid "animatronic coyote" -msgstr "" +msgstr "郊狼機械布偶" #: lang/json/MONSTER_from_json.py msgid "animatronic deer" -msgstr "" +msgstr "鹿形機械布偶" #: lang/json/MONSTER_from_json.py msgid "animatronic horse" -msgstr "" +msgstr "馬形機械布偶" #: lang/json/MONSTER_from_json.py msgid "animatronic pig" -msgstr "" +msgstr "豬形機械布偶" #: lang/json/MONSTER_from_json.py msgid "animatronic sheep" @@ -42396,31 +42479,31 @@ msgstr[0] "羊型機械布偶" #: lang/json/MONSTER_from_json.py msgid "animatronic squirrel" -msgstr "" +msgstr "松鼠機器布偶" #: lang/json/MONSTER_from_json.py msgid "animatronic wolf" -msgstr "" +msgstr "狼形機器布偶" #: lang/json/MONSTER_from_json.py msgid "anklebiter" -msgstr "" +msgstr "腳踝啃咬者" #: lang/json/MONSTER_from_json.py msgid "ant larva" -msgstr "" +msgstr "螞蟻幼蟲" #: lang/json/MONSTER_from_json.py msgid "ant larvae" -msgstr "" +msgstr "螞蟻幼蟲" #: lang/json/MONSTER_from_json.py msgid "antimateriel turret" -msgstr "" +msgstr "反物質砲塔" #: lang/json/MONSTER_from_json.py msgid "antlered horror" -msgstr "" +msgstr "恐怖鹿角" #: lang/json/MONSTER_from_json.py msgid "arachnotron" @@ -42440,35 +42523,35 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "armored zombie" -msgstr "" +msgstr "裝甲殭屍" #: lang/json/MONSTER_from_json.py msgid "bat" -msgstr "" +msgstr "蝙蝠" #: lang/json/MONSTER_from_json.py msgid "bear" -msgstr "" +msgstr "熊" #: lang/json/MONSTER_from_json.py msgid "beaver" -msgstr "" +msgstr "河狸" #: lang/json/MONSTER_from_json.py msgid "big blob" -msgstr "" +msgstr "大型黏液怪" #: lang/json/MONSTER_from_json.py msgid "biollante" -msgstr "" +msgstr "植物獸" #: lang/json/MONSTER_from_json.py msgid "black rat" -msgstr "" +msgstr "黑鼠" #: lang/json/MONSTER_from_json.py msgid "black widow spider" -msgstr "" +msgstr "黑寡婦蜘蛛" #: lang/json/MONSTER_from_json.py msgid "blank body" @@ -42477,15 +42560,15 @@ msgstr[0] "空白體" #: lang/json/MONSTER_from_json.py msgid "bloated zombie" -msgstr "" +msgstr "浮腫殭屍" #: lang/json/MONSTER_from_json.py msgid "blob" -msgstr "" +msgstr "黏球怪" #: lang/json/MONSTER_from_json.py msgid "blood sacrifice" -msgstr "" +msgstr "血腥的獻祭者" #: lang/json/MONSTER_from_json.py msgid "blue aurora" @@ -42493,55 +42576,55 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "bluegill" -msgstr "" +msgstr "藍鰓太陽魚" #: lang/json/MONSTER_from_json.py msgid "bobcat" -msgstr "" +msgstr "山貓" #: lang/json/MONSTER_from_json.py msgid "boomer" -msgstr "" +msgstr "嘔吐者" #: lang/json/MONSTER_from_json.py msgid "bowfin" -msgstr "" +msgstr "弓鰭魚" #: lang/json/MONSTER_from_json.py msgid "brain blob" -msgstr "" +msgstr "黏液球首腦" #: lang/json/MONSTER_from_json.py msgid "breather" -msgstr "" +msgstr "喘息者" #: lang/json/MONSTER_from_json.py msgid "broken cyborg" -msgstr "" +msgstr "壞掉的生化人" #: lang/json/MONSTER_from_json.py msgid "bull frog" -msgstr "" +msgstr "牛蛙" #: lang/json/MONSTER_from_json.py msgid "bullhead" -msgstr "" +msgstr "鲶鱼" #: lang/json/MONSTER_from_json.py msgid "cacodemon" -msgstr "" +msgstr "邪惡魔鬼" #: lang/json/MONSTER_from_json.py msgid "carp" -msgstr "" +msgstr "鯉魚" #: lang/json/MONSTER_from_json.py msgid "cat" -msgstr "" +msgstr "貓" #: lang/json/MONSTER_from_json.py msgid "centipede" -msgstr "" +msgstr "蜈蚣" #: lang/json/MONSTER_from_json.py msgid "charged hissing brood" @@ -42549,19 +42632,19 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "charred nightmare" -msgstr "" +msgstr "焦黑夢魘" #: lang/json/MONSTER_from_json.py msgid "chicken" -msgstr "" +msgstr "雞" #: lang/json/MONSTER_from_json.py msgid "chicken walker" -msgstr "" +msgstr "鳥足機器人" #: lang/json/MONSTER_from_json.py msgid "chipmunk" -msgstr "" +msgstr "花栗鼠" #: lang/json/MONSTER_from_json.py msgid "churle" @@ -42569,39 +42652,39 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "cleaner bot" -msgstr "" +msgstr "清潔機器人" #: lang/json/MONSTER_from_json.py msgid "corrosive zombie" -msgstr "" +msgstr "腐蝕殭屍" #: lang/json/MONSTER_from_json.py msgid "cougar" -msgstr "" +msgstr "美洲獅" #: lang/json/MONSTER_from_json.py msgid "cow" -msgstr "" +msgstr "牛" #: lang/json/MONSTER_from_json.py msgid "coyote" -msgstr "" +msgstr "郊狼" #: lang/json/MONSTER_from_json.py msgid "crawler" -msgstr "" +msgstr "爬行怪" #: lang/json/MONSTER_from_json.py msgid "crawling zombie" -msgstr "" +msgstr "爬行殭屍" #: lang/json/MONSTER_from_json.py msgid "creeper hub" -msgstr "" +msgstr "變種藤蔓中樞" #: lang/json/MONSTER_from_json.py msgid "creeper vine" -msgstr "" +msgstr "變種藤蔓莖" #: lang/json/MONSTER_from_json.py msgid "creeping grass" @@ -42613,11 +42696,11 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "creepy crawler" -msgstr "" +msgstr "恐怖爬行怪" #: lang/json/MONSTER_from_json.py msgid "crow" -msgstr "" +msgstr "烏鴉" #: lang/json/MONSTER_from_json.py msgid "crowned creeper" @@ -42629,47 +42712,47 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "cyclopean" -msgstr "" +msgstr "獨眼巨人" #: lang/json/MONSTER_from_json.py msgid "dark wyrm" -msgstr "" +msgstr "暗古龍" #: lang/json/MONSTER_from_json.py msgid "debug monster" -msgstr "" +msgstr "測試用怪物" #: lang/json/MONSTER_from_json.py msgid "decayed pouncer" -msgstr "" +msgstr "腐爛撲咬者" #: lang/json/MONSTER_from_json.py msgid "decayed zombie" -msgstr "" +msgstr "腐朽僵屍" #: lang/json/MONSTER_from_json.py msgid "deer" -msgstr "" +msgstr "鹿" #: lang/json/MONSTER_from_json.py msgid "deer mouse" -msgstr "" +msgstr "鹿鼠" #: lang/json/MONSTER_from_json.py msgid "dementia" -msgstr "" +msgstr "瘋狂者" #: lang/json/MONSTER_from_json.py msgid "demon" -msgstr "" +msgstr "惡魔" #: lang/json/MONSTER_from_json.py msgid "dermatik" -msgstr "" +msgstr "變異蜂" #: lang/json/MONSTER_from_json.py msgid "dermatik larva" -msgstr "" +msgstr "變異蜂幼蟲" #: lang/json/MONSTER_from_json.py msgid "dionaea" @@ -42681,7 +42764,7 @@ msgstr "" #: lang/json/MONSTER_from_json.py src/game.cpp msgid "dog" -msgstr "" +msgstr "狗" #: lang/json/MONSTER_from_json.py msgid "dracolich" @@ -42694,27 +42777,27 @@ msgstr[0] "蜻蜓" #: lang/json/MONSTER_from_json.py msgid "duck" -msgstr "" +msgstr "鴨子" #: lang/json/MONSTER_from_json.py msgid "encrusted zombie" -msgstr "" +msgstr "硬皮殭屍" #: lang/json/MONSTER_from_json.py msgid "ethereal zombie" -msgstr "" +msgstr "空靈殭屍" #: lang/json/MONSTER_from_json.py msgid "evil multi-cooker" -msgstr "" +msgstr "邪惡的大同電鍋" #: lang/json/MONSTER_from_json.py msgid "exploder" -msgstr "" +msgstr "雷管" #: lang/json/MONSTER_from_json.py msgid "eyebot" -msgstr "" +msgstr "眼球機器人" #: lang/json/MONSTER_from_json.py msgid "fant" @@ -42722,27 +42805,27 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "fat zombie" -msgstr "" +msgstr "肥胖疆屍" #: lang/json/MONSTER_from_json.py msgid "feral hunter" -msgstr "" +msgstr "凶暴狩獵者" #: lang/json/MONSTER_from_json.py msgid "feral predator" -msgstr "" +msgstr "凶暴掠食者" #: lang/json/MONSTER_from_json.py msgid "feral runner" -msgstr "" +msgstr "凶暴追逐者" #: lang/json/MONSTER_from_json.py msgid "festering boar" -msgstr "" +msgstr "潰爛的野豬" #: lang/json/MONSTER_from_json.py msgid "fiend" -msgstr "" +msgstr "惡魔" #: lang/json/MONSTER_from_json.py msgid "fionaea" @@ -42750,23 +42833,23 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "firefighter zombie" -msgstr "" +msgstr "消防員殭屍" #: lang/json/MONSTER_from_json.py msgid "flaming eye" -msgstr "" +msgstr "火焰之眼" #: lang/json/MONSTER_from_json.py msgid "flashbang hack" -msgstr "" +msgstr "閃光彈無人機" #: lang/json/MONSTER_from_json.py msgid "flesh angel" -msgstr "" +msgstr "血肉天使" #: lang/json/MONSTER_from_json.py msgid "flying polyp" -msgstr "" +msgstr "飛行息肉" #: lang/json/MONSTER_from_json.py msgid "foose" @@ -42774,7 +42857,7 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "forager ant" -msgstr "" +msgstr "覓食蟻" #: lang/json/MONSTER_from_json.py msgid "fox" @@ -42783,15 +42866,15 @@ msgstr[0] "狐狸" #: lang/json/MONSTER_from_json.py msgid "freshwater eel" -msgstr "" +msgstr "淡水鰻魚" #: lang/json/MONSTER_from_json.py msgid "fungal ant" -msgstr "" +msgstr "真菌蟻" #: lang/json/MONSTER_from_json.py msgid "fungal blossom" -msgstr "" +msgstr "真菌蓋" #: lang/json/MONSTER_from_json.py msgid "fungal boil" @@ -42799,7 +42882,7 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "fungal boomer" -msgstr "" +msgstr "真菌嘔吐者" #: lang/json/MONSTER_from_json.py msgid "fungal brood" @@ -42811,11 +42894,11 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "fungal fighter" -msgstr "" +msgstr "真菌鬥士" #: lang/json/MONSTER_from_json.py msgid "fungal hedgerow" -msgstr "" +msgstr "真菌灌木" #: lang/json/MONSTER_from_json.py msgid "fungal shocker" @@ -42823,11 +42906,11 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "fungal spire" -msgstr "" +msgstr "真菌尖塔" #: lang/json/MONSTER_from_json.py msgid "fungal sporeling" -msgstr "" +msgstr "真菌孢苗" #: lang/json/MONSTER_from_json.py msgid "fungal survivor" @@ -42839,11 +42922,11 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "fungal tendril" -msgstr "" +msgstr "真菌卷鬚" #: lang/json/MONSTER_from_json.py lang/json/overmap_terrain_from_json.py msgid "fungal tower" -msgstr "" +msgstr "真菌塔" #: lang/json/MONSTER_from_json.py msgid "fungal vinebeast" @@ -42851,59 +42934,59 @@ msgstr "" #: lang/json/MONSTER_from_json.py lang/json/terrain_from_json.py msgid "fungal wall" -msgstr "" +msgstr "真菌牆" #: lang/json/MONSTER_from_json.py msgid "fungal zombie" -msgstr "" +msgstr "真菌殭屍" #: lang/json/MONSTER_from_json.py msgid "fungaloid" -msgstr "" +msgstr "食人蕈" #: lang/json/MONSTER_from_json.py msgid "generator" -msgstr "" +msgstr "發電機" #: lang/json/MONSTER_from_json.py msgid "giant ant" -msgstr "" +msgstr "巨蟻" #: lang/json/MONSTER_from_json.py msgid "giant bee" -msgstr "" +msgstr "巨蜂" #: lang/json/MONSTER_from_json.py msgid "giant black widow" -msgstr "" +msgstr "巨大黑寡婦蜘蛛" #: lang/json/MONSTER_from_json.py msgid "giant black widow spiderling" -msgstr "" +msgstr "巨大黑寡婦幼蛛" #: lang/json/MONSTER_from_json.py msgid "giant carp" -msgstr "" +msgstr "巨鯉" #: lang/json/MONSTER_from_json.py msgid "giant cellar spider" -msgstr "" +msgstr "巨大地窖蜘蛛" #: lang/json/MONSTER_from_json.py msgid "giant centipede" -msgstr "" +msgstr "巨大蜈蚣" #: lang/json/MONSTER_from_json.py msgid "giant cockroach" -msgstr "" +msgstr "巨型蟑螂" #: lang/json/MONSTER_from_json.py msgid "giant cockroach nymph" -msgstr "" +msgstr "巨型蟑螂的蛹" #: lang/json/MONSTER_from_json.py msgid "giant crayfish" -msgstr "" +msgstr "巨大淡水龍蝦" #: lang/json/MONSTER_from_json.py msgid "giant dragonfly" @@ -42917,51 +43000,51 @@ msgstr[0] "巨蠅" #: lang/json/MONSTER_from_json.py msgid "giant frog" -msgstr "" +msgstr "巨大青蛙" #: lang/json/MONSTER_from_json.py msgid "giant fungal blossom" -msgstr "" +msgstr "巨大的真菌蓋" #: lang/json/MONSTER_from_json.py msgid "giant jumping spider" -msgstr "" +msgstr "巨大跳蛛" #: lang/json/MONSTER_from_json.py msgid "giant mosquito" -msgstr "" +msgstr "巨大蚊" #: lang/json/MONSTER_from_json.py msgid "giant rattlesnake" -msgstr "" +msgstr "巨大響尾蛇" #: lang/json/MONSTER_from_json.py msgid "giant salmon" -msgstr "" +msgstr "巨鮭" #: lang/json/MONSTER_from_json.py msgid "giant slug" -msgstr "" +msgstr "巨大蛞蝓" #: lang/json/MONSTER_from_json.py msgid "giant trapdoor spider" -msgstr "" +msgstr "巨大暗門蜘蛛" #: lang/json/MONSTER_from_json.py msgid "giant wasp" -msgstr "" +msgstr "巨黃蜂" #: lang/json/MONSTER_from_json.py msgid "giant web spider" -msgstr "" +msgstr "巨大網蛛" #: lang/json/MONSTER_from_json.py msgid "giant wolf spider" -msgstr "" +msgstr "巨大狼蛛" #: lang/json/MONSTER_from_json.py msgid "giant worm" -msgstr "" +msgstr "巨蟲" #: lang/json/MONSTER_from_json.py msgid "glowing biollante" @@ -42969,47 +43052,47 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "gozu" -msgstr "" +msgstr "牛頭人" #: lang/json/MONSTER_from_json.py msgid "grabber zombie" -msgstr "" +msgstr "長臂殭屍" #: lang/json/MONSTER_from_json.py msgid "graboid" -msgstr "" +msgstr "食人砂蟲" #: lang/json/MONSTER_from_json.py msgid "gracken" -msgstr "" +msgstr "格拉肯" #: lang/json/MONSTER_from_json.py msgid "grappler zombie" -msgstr "" +msgstr "抓鉤殭屍" #: lang/json/MONSTER_from_json.py msgid "grenade hack" -msgstr "" +msgstr "手榴彈無人機" #: lang/json/MONSTER_from_json.py msgid "grim howler" -msgstr "" +msgstr "猙獰咆哮者" #: lang/json/MONSTER_from_json.py msgid "groundhog" -msgstr "" +msgstr "土撥鼠" #: lang/json/MONSTER_from_json.py msgid "half worm" -msgstr "" +msgstr "半蟲" #: lang/json/MONSTER_from_json.py msgid "hazmat zombie" -msgstr "" +msgstr "防護衣殭屍" #: lang/json/MONSTER_from_json.py msgid "hell baron" -msgstr "" +msgstr "地獄男爵" #: lang/json/MONSTER_from_json.py msgid "hell hound" @@ -43017,7 +43100,7 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "hell knight" -msgstr "" +msgstr "地獄騎士" #: lang/json/MONSTER_from_json.py msgid "hissing brood" @@ -43030,39 +43113,39 @@ msgstr[0] "人造人" #: lang/json/MONSTER_from_json.py msgid "horse" -msgstr "" +msgstr "馬" #: lang/json/MONSTER_from_json.py msgid "howling waif" -msgstr "" +msgstr "嚎叫流浪兒" #: lang/json/MONSTER_from_json.py msgid "huge boomer" -msgstr "" +msgstr "巨大嘔吐者" #: lang/json/MONSTER_from_json.py msgid "human snail" -msgstr "" +msgstr "人面蝸" #: lang/json/MONSTER_from_json.py msgid "hungry zombie" -msgstr "" +msgstr "飢餓殭屍" #: lang/json/MONSTER_from_json.py msgid "hunting horror" -msgstr "" +msgstr "狩獵怪" #: lang/json/MONSTER_from_json.py msgid "immature giant cellar spider" -msgstr "" +msgstr "幼年期地窖蜘蛛" #: lang/json/MONSTER_from_json.py msgid "immature giant web spider" -msgstr "" +msgstr "幼年期巨大網蛛" #: lang/json/MONSTER_from_json.py msgid "imp" -msgstr "" +msgstr "小惡魔" #: lang/json/MONSTER_from_json.py msgid "infected survivor" @@ -43074,31 +43157,31 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "irradiated wanderer" -msgstr "" +msgstr "輻射遊蕩者" #: lang/json/MONSTER_from_json.py msgid "jabberwock" -msgstr "" +msgstr "變種人魔獸" #: lang/json/MONSTER_from_json.py msgid "jack ant" -msgstr "" +msgstr "傑克跳蟻" #: lang/json/MONSTER_from_json.py msgid "jackrabbit" -msgstr "" +msgstr "野兔" #: lang/json/MONSTER_from_json.py msgid "jawed terror" -msgstr "" +msgstr "恐怖的下顎" #: lang/json/MONSTER_from_json.py msgid "jumping spider" -msgstr "" +msgstr "跳蛛" #: lang/json/MONSTER_from_json.py msgid "kreck" -msgstr "" +msgstr "機械狗" #: lang/json/MONSTER_from_json.py msgid "kwama" @@ -43111,15 +43194,15 @@ msgstr[0] "大嘴鱸魚" #: lang/json/MONSTER_from_json.py msgid "laser turret" -msgstr "" +msgstr "雷射槍塔" #: lang/json/MONSTER_from_json.py msgid "lemming" -msgstr "" +msgstr "旅鼠" #: lang/json/MONSTER_from_json.py msgid "lost soul" -msgstr "" +msgstr "失落的靈魂" #: lang/json/MONSTER_from_json.py msgid "mancubus" @@ -43127,11 +43210,11 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "manhack" -msgstr "" +msgstr "鋸鳥" #: lang/json/MONSTER_from_json.py msgid "marionette" -msgstr "" +msgstr "木偶" #: lang/json/MONSTER_from_json.py msgid "marloss man" @@ -43139,31 +43222,31 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "mi-go" -msgstr "" +msgstr "米戈" #: lang/json/MONSTER_from_json.py msgid "milspec searchlight" -msgstr "" +msgstr "軍規探照燈" #: lang/json/MONSTER_from_json.py msgid "milspec turret" -msgstr "" +msgstr "軍規砲塔" #: lang/json/MONSTER_from_json.py msgid "miner bot" -msgstr "" +msgstr "礦工機器人" #: lang/json/MONSTER_from_json.py msgid "mininuke hack" -msgstr "" +msgstr "迷你核彈無人機" #: lang/json/MONSTER_from_json.py msgid "mink" -msgstr "" +msgstr "貂" #: lang/json/MONSTER_from_json.py msgid "moose" -msgstr "" +msgstr "駝鹿" #: lang/json/MONSTER_from_json.py msgid "moruboru" @@ -43171,55 +43254,55 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "mosquito" -msgstr "" +msgstr "蚊子" #: lang/json/MONSTER_from_json.py msgid "muskrat" -msgstr "" +msgstr "麝香鼠" #: lang/json/MONSTER_from_json.py msgid "mutilated zombie" -msgstr "" +msgstr "殘肢殭屍" #: lang/json/MONSTER_from_json.py msgid "new animatronic bear" -msgstr "" +msgstr "全新的熊形機械布偶" #: lang/json/MONSTER_from_json.py msgid "new animatronic bunny" -msgstr "" +msgstr "全新的兔子機械布偶" #: lang/json/MONSTER_from_json.py msgid "new animatronic chicken" -msgstr "" +msgstr "全新的雞形機械布偶" #: lang/json/MONSTER_from_json.py msgid "new animatronic fox" -msgstr "" +msgstr "全新的狐狸機械布偶" #: lang/json/MONSTER_from_json.py msgid "old animatronic bear" -msgstr "" +msgstr "老舊的熊形機械布偶" #: lang/json/MONSTER_from_json.py msgid "old animatronic bunny" -msgstr "" +msgstr "老舊的兔子機械布偶" #: lang/json/MONSTER_from_json.py msgid "old animatronic chicken" -msgstr "" +msgstr "老舊的雞形機械布偶" #: lang/json/MONSTER_from_json.py msgid "old animatronic fox" -msgstr "" +msgstr "老舊的狐狸機械布偶" #: lang/json/MONSTER_from_json.py msgid "opossum" -msgstr "" +msgstr "負鼠" #: lang/json/MONSTER_from_json.py msgid "otter" -msgstr "" +msgstr "水獺" #: lang/json/MONSTER_from_json.py msgid "perch" @@ -43233,83 +43316,83 @@ msgstr[0] "梭魚" #: lang/json/MONSTER_from_json.py msgid "pig" -msgstr "" +msgstr "豬" #: lang/json/MONSTER_from_json.py msgid "pike" -msgstr "" +msgstr "梭魚" #: lang/json/MONSTER_from_json.py msgid "police bot" -msgstr "" +msgstr "警察機器人" #: lang/json/MONSTER_from_json.py msgid "pregnant giant cockroach" -msgstr "" +msgstr "懷孕的巨型蟑螂" #: lang/json/MONSTER_from_json.py msgid "putrid zombie" -msgstr "" +msgstr "腐敗殭屍" #: lang/json/MONSTER_from_json.py msgid "queen ant" -msgstr "" +msgstr "蟻后" #: lang/json/MONSTER_from_json.py msgid "rabbit" -msgstr "" +msgstr "兔子" #: lang/json/MONSTER_from_json.py msgid "raccoon" -msgstr "" +msgstr "浣熊" #: lang/json/MONSTER_from_json.py msgid "rat king" -msgstr "" +msgstr "鼠王" #: lang/json/MONSTER_from_json.py msgid "rattlesnake" -msgstr "" +msgstr "響尾蛇" #: lang/json/MONSTER_from_json.py msgid "razorclaw" -msgstr "" +msgstr "利爪怪" #: lang/json/MONSTER_from_json.py msgid "revenant" -msgstr "" +msgstr "亡魂" #: lang/json/MONSTER_from_json.py msgid "riot control bot" -msgstr "" +msgstr "鎮暴機器人" #: lang/json/MONSTER_from_json.py msgid "rot-weiler" -msgstr "" +msgstr "腐爛犬屍" #: lang/json/MONSTER_from_json.py msgid "rotting zombie" -msgstr "" +msgstr "腐爛殭屍" #: lang/json/MONSTER_from_json.py msgid "salmon" -msgstr "" +msgstr "鮭魚" #: lang/json/MONSTER_from_json.py msgid "scarred zombie" -msgstr "" +msgstr "疤面殭屍" #: lang/json/MONSTER_from_json.py msgid "scorched zombie" -msgstr "" +msgstr "焦皮殭屍" #: lang/json/MONSTER_from_json.py msgid "screecher zombie" -msgstr "" +msgstr "尖嘯殭屍" #: lang/json/MONSTER_from_json.py msgid "security bot" -msgstr "" +msgstr "保全機器人" #: lang/json/MONSTER_from_json.py msgid "sewer gator" @@ -43317,31 +43400,31 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "sewer rat" -msgstr "" +msgstr "溝鼠" #: lang/json/MONSTER_from_json.py msgid "sewer snake" -msgstr "" +msgstr "水道蛇" #: lang/json/MONSTER_from_json.py msgid "seweranha" -msgstr "" +msgstr "水道食人魚" #: lang/json/MONSTER_from_json.py msgid "shadow" -msgstr "" +msgstr "暗影怪" #: lang/json/MONSTER_from_json.py msgid "shadow snake" -msgstr "" +msgstr "暗影蛇" #: lang/json/MONSTER_from_json.py msgid "shady zombie" -msgstr "" +msgstr "黑影殭屍" #: lang/json/MONSTER_from_json.py msgid "shambling zombie" -msgstr "" +msgstr "蹣跚殭屍" #: lang/json/MONSTER_from_json.py msgid "sheep" @@ -43350,51 +43433,51 @@ msgstr[0] "綿羊" #: lang/json/MONSTER_from_json.py msgid "shocker brute" -msgstr "" +msgstr "電擊獸" #: lang/json/MONSTER_from_json.py msgid "shocker zombie" -msgstr "" +msgstr "電擊殭屍" #: lang/json/MONSTER_from_json.py msgid "shoggoth" -msgstr "" +msgstr "修格斯" #: lang/json/MONSTER_from_json.py msgid "shrew" -msgstr "" +msgstr "鼩鼱" #: lang/json/MONSTER_from_json.py msgid "shrieker zombie" -msgstr "" +msgstr "尖叫殭屍" #: lang/json/MONSTER_from_json.py msgid "shriekling" -msgstr "" +msgstr "小尖叫殭屍" #: lang/json/MONSTER_from_json.py msgid "skeletal dog" -msgstr "" +msgstr "骷髏犬" #: lang/json/MONSTER_from_json.py msgid "skeleton" -msgstr "" +msgstr "骷髏怪" #: lang/json/MONSTER_from_json.py msgid "skitterbot" -msgstr "" +msgstr "爬蟲機器人" #: lang/json/MONSTER_from_json.py msgid "slave" -msgstr "" +msgstr "奴隸" #: lang/json/MONSTER_from_json.py msgid "slavering biter" -msgstr "" +msgstr "垂涎撕咬者" #: lang/json/MONSTER_from_json.py msgid "slimespring" -msgstr "" +msgstr "黏液蛞蝓" #: lang/json/MONSTER_from_json.py msgid "slithering root" @@ -43402,15 +43485,15 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "sludge crawler" -msgstr "" +msgstr "變種泥蟲" #: lang/json/MONSTER_from_json.py msgid "slug" -msgstr "" +msgstr "蛞蝓" #: lang/json/MONSTER_from_json.py msgid "small blob" -msgstr "" +msgstr "小黏球怪" #: lang/json/MONSTER_from_json.py msgid "smallmouth bass" @@ -43419,28 +43502,28 @@ msgstr[0] "小嘴鱸魚" #: lang/json/MONSTER_from_json.py msgid "smoker zombie" -msgstr "" +msgstr "煙霧殭屍" #: lang/json/MONSTER_from_json.py msgid "snotgobbler" -msgstr "" +msgstr "鼻涕貪吃者" #: lang/json/MONSTER_from_json.py msgid "soldier ant" -msgstr "" +msgstr "兵蟻" #: lang/json/MONSTER_from_json.py msgid "spirit of fire" msgid_plural "spirits of fire" -msgstr[0] "" +msgstr[0] "火靈" #: lang/json/MONSTER_from_json.py msgid "spitter zombie" -msgstr "" +msgstr "噴吐殭屍" #: lang/json/MONSTER_from_json.py msgid "spore cloud" -msgstr "" +msgstr "孢子霧" #: lang/json/MONSTER_from_json.py msgid "sproglodyte" @@ -43452,7 +43535,7 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "squirrel" -msgstr "" +msgstr "松鼠" #: lang/json/MONSTER_from_json.py msgid "striped bass" @@ -43466,15 +43549,15 @@ msgstr[0] "翻車魚" #: lang/json/MONSTER_from_json.py msgid "survivor zombie" -msgstr "" +msgstr "生存者殭屍" #: lang/json/MONSTER_from_json.py msgid "swimmer zombie" -msgstr "" +msgstr "水鬼殭屍" #: lang/json/MONSTER_from_json.py msgid "swimming zombie" -msgstr "" +msgstr "水鬼殭屍" #: lang/json/MONSTER_from_json.py msgid "tangela" @@ -43482,7 +43565,7 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "tank drone" -msgstr "" +msgstr "無人駕駛坦克" #: lang/json/MONSTER_from_json.py msgid "tardigrade" @@ -43490,23 +43573,23 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "tear gas hack" -msgstr "" +msgstr "催涙彈無人機" #: lang/json/MONSTER_from_json.py msgid "tentacle dog" -msgstr "" +msgstr "觸手狗" #: lang/json/MONSTER_from_json.py msgid "thing" -msgstr "" +msgstr "那東西" #: lang/json/MONSTER_from_json.py msgid "tough zombie" -msgstr "" +msgstr "強壯殭屍" #: lang/json/MONSTER_from_json.py msgid "trapdoor spider" -msgstr "" +msgstr "暗門蜘蛛" #: lang/json/MONSTER_from_json.py msgid "treunt" @@ -43514,35 +43597,35 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "tribot" -msgstr "" +msgstr "三腳機器人" #: lang/json/MONSTER_from_json.py msgid "triffid" -msgstr "" +msgstr "食人樹" #: lang/json/MONSTER_from_json.py lang/json/overmap_terrain_from_json.py msgid "triffid heart" -msgstr "" +msgstr "食人樹心臟" #: lang/json/MONSTER_from_json.py msgid "triffid queen" -msgstr "" +msgstr "食人樹王后" #: lang/json/MONSTER_from_json.py msgid "triffid sprout" -msgstr "" +msgstr "食人樹幼苗" #: lang/json/MONSTER_from_json.py msgid "trout" -msgstr "" +msgstr "鱒魚" #: lang/json/MONSTER_from_json.py msgid "turkey" -msgstr "" +msgstr "火雞" #: lang/json/MONSTER_from_json.py msgid "turret" -msgstr "" +msgstr "槍塔" #: lang/json/MONSTER_from_json.py msgid "twisted body" @@ -43551,7 +43634,7 @@ msgstr[0] "扭曲肢體" #: lang/json/MONSTER_from_json.py msgid "vine beast" -msgstr "" +msgstr "藤蔓獸" #: lang/json/MONSTER_from_json.py msgid "vortex" @@ -43560,11 +43643,11 @@ msgstr[0] "渦流怪" #: lang/json/MONSTER_from_json.py msgid "wasp" -msgstr "" +msgstr "黃蜂" #: lang/json/MONSTER_from_json.py msgid "weasel" -msgstr "" +msgstr "黃鼠狼" #: lang/json/MONSTER_from_json.py msgid "whitefish" @@ -43578,47 +43661,47 @@ msgstr[0] "狼" #: lang/json/MONSTER_from_json.py msgid "wolf spider" -msgstr "" +msgstr "狼蛛" #: lang/json/MONSTER_from_json.py msgid "wraith" -msgstr "" +msgstr "幽靈" #: lang/json/MONSTER_from_json.py msgid "wrecked animatronic fox" -msgstr "" +msgstr "殘骸般的狐狸機械布偶" #: lang/json/MONSTER_from_json.py msgid "young queen ant" -msgstr "" +msgstr "年輕蟻后" #: lang/json/MONSTER_from_json.py msgid "your mother" -msgstr "" +msgstr "你媽" #: lang/json/MONSTER_from_json.py msgid "yugg" -msgstr "" +msgstr "尤格" #: lang/json/MONSTER_from_json.py msgid "zombear" -msgstr "" +msgstr "殭屍熊" #: lang/json/MONSTER_from_json.py msgid "zombie" -msgstr "" +msgstr "殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie bio-operator" -msgstr "" +msgstr "生化殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie brute" -msgstr "" +msgstr "殭屍獸" #: lang/json/MONSTER_from_json.py msgid "zombie chaser" -msgstr "" +msgstr "追逐者殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie child" @@ -43627,48 +43710,48 @@ msgstr[0] "殭屍小孩" #: lang/json/MONSTER_from_json.py msgid "zombie cop" -msgstr "" +msgstr "警察殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie dancer" -msgstr "" +msgstr "舞者殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie dog" -msgstr "" +msgstr "殭屍狗" #: lang/json/MONSTER_from_json.py msgid "zombie elite grenadier" -msgstr "" +msgstr "精英擲彈兵殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie grenadier" -msgstr "" +msgstr "擲彈兵殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie hollow" -msgstr "" +msgstr "空靈殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie hulk" -msgstr "" +msgstr "殭屍浩克" #: lang/json/MONSTER_from_json.py msgid "zombie hunting dog" -msgstr "" +msgstr "殭屍獵犬" #: lang/json/MONSTER_from_json.py msgid "zombie husk" -msgstr "" +msgstr "乾皮殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie kinderling" msgid_plural "zombie kinderlings" -msgstr[0] "" +msgstr[0] "殭屍小子" #: lang/json/MONSTER_from_json.py msgid "zombie lord" -msgstr "" +msgstr "貴族殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie mangler" @@ -43676,31 +43759,31 @@ msgstr "" #: lang/json/MONSTER_from_json.py msgid "zombie master" -msgstr "" +msgstr "殭屍王" #: lang/json/MONSTER_from_json.py msgid "zombie nadir" -msgstr "" +msgstr "霉運殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie necromancer" -msgstr "" +msgstr "死靈殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie nightstalker" -msgstr "" +msgstr "夜行者殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie reaver" -msgstr "" +msgstr "掠奪者殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie scientist" -msgstr "" +msgstr "科學家殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie scrapper" -msgstr "" +msgstr "抗爭者殭屍" #: lang/json/MONSTER_from_json.py src/game.cpp msgid "zombie slave" @@ -43708,23 +43791,23 @@ msgstr "屍奴 " #: lang/json/MONSTER_from_json.py msgid "zombie snapper" -msgstr "" +msgstr "啃咬殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie soldier" -msgstr "" +msgstr "軍人殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie tank" -msgstr "" +msgstr "殭屍坦克" #: lang/json/MONSTER_from_json.py msgid "zombie technician" -msgstr "" +msgstr "技工殭屍" #: lang/json/MONSTER_from_json.py msgid "zombie wrestler" -msgstr "" +msgstr "摔跤手殭屍" #. ~ Description for tuba #: lang/json/TOOL_ARMOR_from_json.py @@ -43745,7 +43828,7 @@ msgstr "" msgid "" "A brass-plated alto saxophone with a neck strap, so you can wear it while " "playing." -msgstr "" +msgstr "鍍銅的中音薩克斯風，附有頸帶，因此你可以穿戴著它演奏。" #. ~ Description for XL survivor divemask (on) #: lang/json/TOOL_ARMOR_from_json.py @@ -43805,7 +43888,7 @@ msgstr "" #. ~ Description for harmonica with a holder #: lang/json/TOOL_ARMOR_from_json.py msgid "A harmonica with a holder, so that you can play it without a free hand." -msgstr "" +msgstr "附有支拖架的口琴，因此你可以不用手就能演奏。" #. ~ Description for pair of thunder gauntlets #: lang/json/TOOL_ARMOR_from_json.py @@ -44131,7 +44214,7 @@ msgstr "" #. ~ Description for whistle #: lang/json/TOOL_ARMOR_from_json.py msgid "A simple metal whistle, with a cord to wear it around your neck." -msgstr "" +msgstr "一個簡單的金屬哨子，附有繩子，可穿掛在脖子上。" #. ~ Description for ring of the fallen angel #: lang/json/TOOL_ARMOR_from_json.py @@ -44146,7 +44229,7 @@ msgstr "" msgid "" "A simple wooden acoustic guitar with a strap so you can wear it around, even " "when not playing." -msgstr "" +msgstr "簡單的木吉他，附有皮帶，所以你即使不演奏也可以穿戴在身上。" #. ~ Description for radiation biomonitor #: lang/json/TOOL_ARMOR_from_json.py @@ -44648,17 +44731,17 @@ msgstr "你用大號吹了一段進行曲。" #. ~ Use action descriptions for saxophone. #: lang/json/TOOL_ARMOR_from_json.py msgid "You play a quick, energetic ditty on your sax." -msgstr "" +msgstr "你用薩克斯風演奏輕快、活力的小曲。" #. ~ Use action descriptions for acoustic guitar. #: lang/json/TOOL_ARMOR_from_json.py msgid "You play a slow blues-y tune on your guitar." -msgstr "" +msgstr "你用吉他彈奏了slow blues-y的曲調。" #. ~ Use action descriptions for saxophone. #: lang/json/TOOL_ARMOR_from_json.py msgid "You play a soulful jazz piece on your sax." -msgstr "" +msgstr "你用薩克斯風演奏一曲深情地爵士。" #. ~ Use action descriptions for acoustic guitar. #: lang/json/TOOL_ARMOR_from_json.py @@ -44822,7 +44905,7 @@ msgstr[0] "髮簪" #: lang/json/TOOL_ARMOR_from_json.py msgid "harmonica with a holder" msgid_plural "harmonicas with holders" -msgstr[0] "" +msgstr[0] "附拖架的口琴" #: lang/json/TOOL_ARMOR_from_json.py msgid "head torch" @@ -45270,7 +45353,7 @@ msgstr "一把巧妙設計的多合一工具，它的把手就是一隻鉗子， #. ~ Description for scissor jack #: lang/json/TOOL_from_json.py msgid "A compact scissor jack used for lifting vehicles." -msgstr "" +msgstr "一個牢固的剪式千斤頂，用於抬起車輛。" #. ~ Description for acetylene torch #: lang/json/TOOL_from_json.py @@ -45281,6 +45364,9 @@ msgid "" "appropriate welding gas before use. In addition to its metalworking uses, " "you can activate it in order to destroy metal barriers." msgstr "" +"一個用來焊接或切割金屬的複雜工具，這個手提的氧乙炔噴槍有一個握把、切割頭，裝" +"在一個易於攜帶的手提包中。使用前需要連接到裝有焊接氣體的加壓氣瓶上。除了金屬" +"加工外，你還可以用他來破壞金屬類的障礙物。" #. ~ Description for blob feed fermenter #: lang/json/TOOL_from_json.py @@ -45322,6 +45408,8 @@ msgid "" "stitches that only pierce one side of the material. While unsuitable for " "most tailoring projects, it's a necessity for stitching neoprene." msgstr "" +"鋼製的彎曲尖銳的針。其圓弧的形狀讓它能夠使針僅刺穿材料的一側。雖然不適合大多" +"數裁縫的項目，但它卻是縫合橡膠的必需品。" #. ~ Description for firecracker (lit) #: lang/json/TOOL_from_json.py @@ -45367,6 +45455,8 @@ msgid "" "weapon scope, but carrying this item in your inventory will double the " "distance that is mapped around you during your travels." msgstr "" +"一個自製的可摺疊望遠鏡。它的體積太大也不夠準確，無法當成槍械鏡頭使用。但你只" +"需要將它放在你的物品欄裡，就可以讓你旅途中的能見距離加倍。" #. ~ Description for survivor mess kit #: lang/json/TOOL_from_json.py @@ -45551,7 +45641,7 @@ msgstr "一個塑膠製氣壓計可以用來偵測大氣壓力。" #. ~ Description for pet carrier #: lang/json/TOOL_from_json.py msgid "A plastic container meant to hold pets for transport." -msgstr "" +msgstr "用來攜帶寵物的塑膠容器。" #. ~ Description for hygrometer #: lang/json/TOOL_from_json.py @@ -45578,7 +45668,7 @@ msgstr "" msgid "" "A poorly constructed improvised scissor jack used for lifting vehicles if " "you're brave enough to use it." -msgstr "" +msgstr "構造不良的簡易剪式千斤頂，如果你夠勇敢的話，你可以用它來抬起車輛。" #. ~ Description for concrete mixer #: lang/json/TOOL_from_json.py @@ -45586,18 +45676,20 @@ msgid "" "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." msgstr "" +"一台攜帶式的混凝土攪拌機。雖然又大又笨重，但是它可以依靠電池獨立運作。內建加" +"熱器。" #. ~ Description for bottle jack #: lang/json/TOOL_from_json.py msgid "A portable hydraulic bottle jack used for lifting vehicles." -msgstr "" +msgstr "便攜式液壓瓶式千斤頂，用於抬起車輛。" #. ~ Description for hand drill #: lang/json/TOOL_from_json.py msgid "" "A primitive manual drill with a single drill bit. It is slow and it will " "exhaust you quickly." -msgstr "" +msgstr "一個基本的手動鑽頭，運作很慢而且很快耗盡你的體力。" #. ~ Description for pro fishing rod #: lang/json/TOOL_from_json.py @@ -46050,7 +46142,7 @@ msgstr "" msgid "" "As you drink from the chalice, you feel your breath being drawn from your " "lungs!" -msgstr "" +msgstr "當你喝下聖杯的內的液體，你感覺你的氣息從肺裡被抽了出來!" #. ~ Use action descriptions for golden fiddle. #: lang/json/TOOL_from_json.py @@ -46200,11 +46292,6 @@ msgstr "嘶嘶。" msgid "Hsssss." msgstr "嘶嘶…" -#. ~ Description for fake UPS -#: lang/json/TOOL_from_json.py -msgid "If you can see this, it is a bug." -msgstr "看到這個的話就是有 bug。" - #: lang/json/TOOL_from_json.py msgid "Kevlar plate" msgid_plural "Kevlar plates" @@ -46411,7 +46498,7 @@ msgstr[0] "瑞士刀" #: lang/json/TOOL_from_json.py #, no-python-format msgid "The %s is extinguished" -msgstr "" +msgstr "%s 熄滅了" #. ~ Use action need_charges_msg for acetylene lamp (off). #: lang/json/TOOL_from_json.py @@ -46758,7 +46845,7 @@ msgstr "" msgid "" "These are long, metal tongs. They are commonly used for cooking or in " "metalworking fabrication recipes." -msgstr "" +msgstr "是一把長鐵鉗。它通常用於烹飪或在金屬加工製造上。" #. ~ Description for nailboard trap #: lang/json/TOOL_from_json.py @@ -46934,6 +47021,8 @@ msgid "" "little skill, it can be used to crack passwords and more. It requires 25 " "charges of battery power per use." msgstr "" +"這個裝置上面有許多連接埠，讓它可以連結許多控制板或電子儀器 (電腦除外)，也許只" +"要一點點小技巧，它就可以破解密碼以及做更多事情。每次使用需要耗用 25 電量。" #. ~ Description for UPS conversion mod #: lang/json/TOOL_from_json.py @@ -46942,6 +47031,8 @@ msgid "" "power cell that runs off of a Unified Power System. Having the UPS on or " "placing a tool in a special recharging station will slowly charge it." msgstr "" +"這個裝置把常規電池替換成以統一規格電力系統運作的可充電電池。當你身上有啟動中" +"的UPS或是把工具放入特定的充電站中，就可以緩慢地幫工具充電。" #. ~ Description for noise emitter (off) #: lang/json/TOOL_from_json.py @@ -47161,6 +47252,8 @@ msgid "" "This is a broad saber known for its use by sailors and pirates. This sword " "appears to be made very poorly, but it should still stand up to a few swings." msgstr "" +"這是一把寬闊的軍刀，因為水手和海盜常用而出名。這劍的作工很糟糕，但是應該還能" +"承受得起揮舞一下。" #. ~ Description for lightstrip (dead) #: lang/json/TOOL_from_json.py @@ -47267,6 +47360,8 @@ msgid "" "later two-handed swords in size. You feel like the pommel could just snap " "off if you used it." msgstr "" +"這是一把經典的中世紀長劍，體積介乎於騎士劍和後期的雙手劍之間。你覺得劍柄圓頭" +"似乎一用就會折斷的樣子。" #. ~ Description for arming sword #: lang/json/TOOL_from_json.py @@ -47279,7 +47374,7 @@ msgstr "這是一把經典的中世紀劍，適合單手使用。" msgid "" "This is a classic medieval sword, just the right size to use one-handed. " "This one doesn't seem to have been made right." -msgstr "" +msgstr "這是一把經典的中世紀劍，適合單手使用。這把看起來做得不太對。" #. ~ Description for firebrand (on) #: lang/json/TOOL_from_json.py @@ -47323,7 +47418,7 @@ msgstr "這是一種比較常見的日本短劍。體積更小，比武士刀輕 msgid "" "This is a comparatively-common Japanese short sword. There's something not " "quite right about this sword." -msgstr "" +msgstr "這是一種比較常見的日本短劍。這劍感覺不太好。" #. ~ Description for gunsmith repair kit #: lang/json/TOOL_from_json.py @@ -47409,13 +47504,15 @@ msgid "" "Asian countries. Designed for slashing, and quite deadly against unarmored " "targets." msgstr "" +"這把彎刀與不少中東及中亞國家有著關聯。專為劈砍而設定，而且對沒護甲的目標相當" +"致命。" #. ~ Description for scimitar #: lang/json/TOOL_from_json.py msgid "" "This is a curved sword associated with various Middle Eastern and Central " "Asian countries. This one seems oddly dull and worn." -msgstr "" +msgstr "這把彎刀與不少中東及中亞國家有著關聯。這把看起來很頓而且破損。" #. ~ Description for copper axe #: lang/json/TOOL_from_json.py @@ -47674,6 +47771,9 @@ msgid "" "double the amount of batteries it can hold. Doing so will increase the " "item's volume proportionally to the increased battery capacity." msgstr "" +"是一個自製的電子組件用於增加電器的電池容量。有了足夠的電子技能，你可以將它裝" +"上任何的電器用品，能讓該電器用品的電池容量加倍。這麼做的話會按造電量增加比例" +"而增加物品的體積。" #. ~ Description for match head bomb #: lang/json/TOOL_from_json.py @@ -47707,7 +47807,7 @@ msgstr "" msgid "" "This is a huge axe designed for warfare. You notice that the axe heads " "aren't seated properly at all." -msgstr "" +msgstr "這是一把巨大的戰斧。你注意到斧頭的位置不太正確。" #. ~ Description for zweihänder #: lang/json/TOOL_from_json.py @@ -47719,7 +47819,7 @@ msgstr "一把雙手持的巨劍，源自於德國。具有真正的衝擊力。 msgid "" "This is a huge two-handed sword from Germany. You're not quite sure it's " "supposed to be that bendy." -msgstr "" +msgstr "一把雙手持的巨劍，源自於德國。你不太確定它是否該如此容易彎曲。" #. ~ Description for nodachi #: lang/json/TOOL_from_json.py @@ -47820,20 +47920,22 @@ msgid "" "plastic funnels, but collects more water. Use it outside and place a " "container beneath it to collect water when it rains." msgstr "" +"這是用來收集雨水的大型金屬漏斗。比塑膠漏斗難攜帶，但是可以蒐集更多的雨水。在" +"室外使用後並且在下方放個容器就能夠收集雨水。" #. ~ Description for brazier #: lang/json/TOOL_from_json.py msgid "" "This is a large metal stand with slots on the side. Use it to place it " "somewhere then set fires in it with no risk of spreading." -msgstr "" +msgstr "側邊有孔的大金屬盆。把它放在某處，在裡面點火可以防止火勢蔓延。" #. ~ Description for pair of bolt cutters #: lang/json/TOOL_from_json.py msgid "" "This is a large pair of bolt cutters. You could use them to cut padlocks or " "heavy gauge wire." -msgstr "" +msgstr "一把大型的剪線鉗，可以用它來剪斷掛鎖或鐵絲網。" #. ~ Description for active ANFO charge #: lang/json/TOOL_from_json.py @@ -47865,7 +47967,7 @@ msgstr "這是一把大鐵鎬，適用於擊碎堅硬的東西 (需有足夠的 msgid "" "This is a large stick, wrapped in rags that are soaked with a flammable " "material. It is burning, producing plenty of light." -msgstr "" +msgstr "吸飽易燃物的布料纏繞在這大木棍上。點燃它可以發出很高的亮度。" #. ~ Description for torch #: lang/json/TOOL_from_json.py @@ -47874,6 +47976,8 @@ msgid "" "material. When lit, produces a fair amount of light. You'll need a lighter " "or matches to light it." msgstr "" +"吸飽易燃物的布料纏繞在這大木棍上。點燃它可以發出一定的光源。只是你得要有個打" +"火機或是火柴才能點燃。" #. ~ Description for fire axe #: lang/json/TOOL_from_json.py @@ -47942,7 +48046,7 @@ msgstr "這是一個翻蓋式的可充填打火機。它現在是點燃的。" msgid "" "This is a little metal tank for holding charcoal with a pilot light " "attached. You could use it for cooking food." -msgstr "" +msgstr "附帶點火器的小型儲煤金屬罐，你可以用它來煮食。" #. ~ Description for locksmith kit #: lang/json/TOOL_from_json.py @@ -48142,6 +48246,7 @@ msgid "" "it to cut your hair if it's supplied with batteries. It requires 10 " "batteries per use." msgstr "" +"這袖珍版的剪毛器主要用於剪頭髮，你可以用它來剪頭髮。每次修剪需耗用 10 電量。" #. ~ Description for charcoal smoker #: lang/json/TOOL_from_json.py @@ -48264,6 +48369,8 @@ msgid "" "This is a rare sword from Japan. While it's got the right edge and weight, " "the pommel just snaps off, and the blade seems pretty worn." msgstr "" +"這是從日本來的罕見刀刃，儘管有著正確的刀鋒與重量，但是刀柄圓頭已折斷，而且鋒" +"刃看起來似乎很破舊。" #. ~ Description for portal generator #: lang/json/TOOL_from_json.py @@ -48813,6 +48920,8 @@ msgid "" "This is a stout metal box containing a complete tool kit suitable for most " "household maintenance and construction activities." msgstr "" +"這是一個巨大的金屬盒子，裡面裝了齊全的工具，可以用來應付大多數的家庭修繕與建" +"築活動。" #. ~ Description for drained offering chalice #: lang/json/TOOL_from_json.py @@ -48830,6 +48939,8 @@ msgid "" "unable to pour out. You get the feeling that trying to drink it would be a " "bad idea." msgstr "" +"一個金子做成的奇怪酒杯，上面刻滿了一些陌生的文字。它充滿了你似乎無法倒出來的" +"濃稠黑色液體。你覺得嘗試喝它是一個壞主意。" #. ~ Description for offering chalice #: lang/json/TOOL_from_json.py @@ -48837,6 +48948,8 @@ msgid "" "This is a strange chalice made of gold, engraved all over with some " "unfamiliar text. Maybe you shouldn't be trying to drink from this..." msgstr "" +"一個金子做成的奇怪酒杯，上面刻滿了一些陌生的文字。或許你不應該去喝它裝的東" +"西..." #. ~ Description for hacksaw #: lang/json/TOOL_from_json.py @@ -48868,6 +48981,8 @@ msgid "" "This is a test item for testing long action heal_actor on tools. It " "shouldn't spawn in normal game." msgstr "" +"這是對工具進行測試長期行動heal_actor的一個測試項目。它不應該在正常遊戲中產" +"生。" #. ~ Description for short healing tool #: lang/json/TOOL_from_json.py @@ -48875,6 +48990,13 @@ msgid "" "This is a test item for testing short action heal_actor on tools. It " "shouldn't spawn in normal game." msgstr "" +"這是對工具進行測試短期行動heal_actor的一個測試項目。它不應該在正常遊戲中產" +"生。" + +#. ~ Description for snowman +#: lang/json/TOOL_from_json.py +msgid "This is a test item for testing unicode support." +msgstr "" #. ~ Description for candle (lit) #: lang/json/TOOL_from_json.py @@ -48966,6 +49088,7 @@ msgid "" "flashlight will turn it on and provide light, assuming it is charged with " "batteries." msgstr "" +"一支塑膠握把的典型家用手電筒。[使用] 它就能用來照明，前提是它要裝有電池。" #. ~ Description for UPS #: lang/json/TOOL_from_json.py @@ -49041,7 +49164,7 @@ msgstr "這是一顆插銷被拔掉的燃燒手榴彈，隨時會引爆。快點 msgid "" "This is an active nail_bomb, likely to explode any second now. Better throw " "it!" -msgstr "" +msgstr "這個鐵釘炸彈已經啟動，隨時都會爆炸。你最好趕快投擲出去！" #. ~ Description for wrench #: lang/json/TOOL_from_json.py @@ -49058,6 +49181,8 @@ msgid "" "well as to consume plutonium fuel cells rather than batteries. Sadly, it's " "plutonium reactor can't be charged in UPS charging station." msgstr "" +"一個高階版的統一規格電力系統(UPS)。重新設計的規格讓它可以使用更有效率地鈽元" +"素，而不是傳統電池。遺憾的是它的鈽反應器無法在UPS相容的車載充電站內充電。" #. ~ Description for RDX charge #: lang/json/TOOL_from_json.py @@ -49067,6 +49192,8 @@ msgid "" "detonates completely and delivers its entire destructive power to everything " "in sight." msgstr "" +"這是一個鋁桶，裝滿相當於50公升的RDX炸藥和廢金屬。其中包含了主要爆炸核心，它用" +"來確保填充物會完全爆炸，且將全部爆炸力都傳播到視線所及的地方。" #. ~ Description for active RDX charge #: lang/json/TOOL_from_json.py @@ -49075,6 +49202,8 @@ msgid "" "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." msgstr "" +"這是一個鋁桶，裝滿相當於50公升的RDX炸藥和廢金屬。它的引信已經點燃了，一旦它燒" +"至主要的爆炸物，它就會爆炸並向視線所及的地方下起火雨及金屬破片。" #. ~ Description for jian #: lang/json/TOOL_from_json.py @@ -49117,13 +49246,15 @@ msgid "" "centuries. This sword appears to be made very poorly, but it should still " "stand up to a few swings." msgstr "" +"一把仿 16 , 17, 18 世紀的古劍。這劍的作工很糟糕，但是應該還能承受得起揮舞一" +"下。" #. ~ Description for large fire extinguisher #: lang/json/TOOL_from_json.py msgid "" "This is an emergency fire extinguisher containing three gallons of fire " "retardant foam. It would be useful for putting out adjacent fires." -msgstr "" +msgstr "這是一把內含三加侖阻燃泡沫的緊急滅火器。用來撲滅附近的火勢很有用。" #. ~ Description for anvil #: lang/json/TOOL_from_json.py @@ -49141,6 +49272,8 @@ msgid "" "the amount of plutonium it can hold. Note that this device is incompatible " "with the atomic battery mod." msgstr "" +"這是針對鈽供電裝備的擴充設備。有足夠的電子技能的話，你就可以把它附加到原子工" +"具中來加倍工具能填裝的鈽容量。要注意這設備與原子電池模組不相容。" #. ~ Description for teleporter #: lang/json/TOOL_from_json.py @@ -49879,7 +50012,7 @@ msgstr "你點燃了炸藥。" #: lang/json/TOOL_from_json.py #, no-python-format msgid "You light the fuse on the %s." -msgstr "" +msgstr "你點燃了 %s 的引信。" #. ~ Use action msg for ANFO charge. #: lang/json/TOOL_from_json.py @@ -49995,7 +50128,7 @@ msgstr "你需要打火機或火源來點燃它。" #: lang/json/TOOL_from_json.py #, no-python-format msgid "You need a source of fire to light the %s" -msgstr "" +msgstr "你需要一個火源來點燃 %s 。" #. ~ Use action need_fire_msg for filled charcoal kiln. #: lang/json/TOOL_from_json.py @@ -50247,7 +50380,7 @@ msgstr "你已經啟動了 %s，試試看丟擲出去吧。" #: lang/json/TOOL_from_json.py #, no-python-format msgid "You've already lit the %s's fuse, try throwing it instead." -msgstr "" +msgstr "你已經點燃了 %s 的引信，試著把它投出去看看。" #. ~ Use action no_deactivate_msg for dynamite (lit). #. ~ Use action no_deactivate_msg for match head bomb (lit). @@ -50323,17 +50456,17 @@ msgstr "" #: lang/json/TOOL_from_json.py msgid "acetylene lamp (off)" msgid_plural "acetylene lamps (off)" -msgstr[0] "" +msgstr[0] "乙炔燈 (關)" #: lang/json/TOOL_from_json.py msgid "acetylene lamp (on)" msgid_plural "acetylene lamps (on)" -msgstr[0] "" +msgstr[0] "乙炔燈 (開)" #: lang/json/TOOL_from_json.py msgid "acetylene torch" msgid_plural "acetylene torches" -msgstr[0] "" +msgstr[0] "乙炔噴槍" #: lang/json/TOOL_from_json.py msgid "acid bomb" @@ -50418,7 +50551,7 @@ msgstr[0] "啟動中的粗製毒氣彈" #: lang/json/TOOL_from_json.py msgid "active nail bomb" msgid_plural "active nail bombs" -msgstr[0] "" +msgstr[0] "啟動中的鐵釘炸彈" #: lang/json/TOOL_from_json.py msgid "active pipe bomb" @@ -50503,12 +50636,12 @@ msgstr[0] "生物開鎖工具" #: lang/json/TOOL_from_json.py msgid "bionic goggles" msgid_plural "bionic goggless" -msgstr[0] "" +msgstr[0] "生化護目鏡" #: lang/json/TOOL_from_json.py msgid "bionic razor" msgid_plural "bionic razors" -msgstr[0] "" +msgstr[0] "生化刀刃" #: lang/json/TOOL_from_json.py msgid "black gunpowder bomb" @@ -50548,7 +50681,7 @@ msgstr[0] "詭雷" #: lang/json/TOOL_from_json.py msgid "bottle jack" msgid_plural "bottle jacks" -msgstr[0] "" +msgstr[0] "瓶式千斤頂" #: lang/json/TOOL_from_json.py lang/json/trap_from_json.py msgid "brazier" @@ -50778,7 +50911,7 @@ msgstr[0] "" #: lang/json/TOOL_from_json.py msgid "curved needle" msgid_plural "curved needles" -msgstr[0] "" +msgstr[0] "彎針" #: lang/json/TOOL_from_json.py msgid "damaged shelter kit" @@ -50918,7 +51051,7 @@ msgstr[0] "電力鍛造爐" #: lang/json/TOOL_from_json.py msgid "electric hair trimmer" msgid_plural "electric hair trimmers" -msgstr[0] "" +msgstr[0] "電動理髮器" #: lang/json/TOOL_from_json.py msgid "electric jackhammer" @@ -50980,15 +51113,10 @@ msgid "extra battery mod" msgid_plural "extra battery mods" msgstr[0] "電量強化模組" -#: lang/json/TOOL_from_json.py -msgid "fake UPS" -msgid_plural "fake UPS" -msgstr[0] "假的 UPS" - #: lang/json/TOOL_from_json.py msgid "fake item" msgid_plural "fake items" -msgstr[0] "" +msgstr[0] "贗品" #: lang/json/TOOL_from_json.py msgid "fertilizer bomb" @@ -51314,12 +51442,12 @@ msgstr[0] "" #: lang/json/TOOL_from_json.py msgid "hand axe" msgid_plural "hand axes" -msgstr[0] "" +msgstr[0] "手斧" #: lang/json/TOOL_from_json.py msgid "hand drill" msgid_plural "hand drills" -msgstr[0] "" +msgstr[0] "手動鑽頭" #: lang/json/TOOL_from_json.py msgid "hand press & die set" @@ -51374,7 +51502,7 @@ msgstr[0] "修枝機（啟動）" #: lang/json/TOOL_from_json.py msgid "hexamine stove" msgid_plural "hexamine stoves" -msgstr[0] "" +msgstr[0] "烏洛托品爐" #: lang/json/TOOL_from_json.py msgid "hobo stove" @@ -51560,7 +51688,7 @@ msgstr[0] "" #: lang/json/TOOL_from_json.py msgid "large fire extinguisher" msgid_plural "large fire extinguishers" -msgstr[0] "" +msgstr[0] "大型滅火器" #: lang/json/TOOL_from_json.py msgid "large tent" @@ -51611,7 +51739,7 @@ msgstr[0] "鎖匠工具" #: lang/json/TOOL_from_json.py msgid "long healing tool" msgid_plural "long healing tools" -msgstr[0] "" +msgstr[0] "長期癒合工具" #: lang/json/TOOL_from_json.py msgid "loose caltrops" @@ -51662,7 +51790,7 @@ msgstr[0] "粗製鎚子" #: lang/json/TOOL_from_json.py msgid "makeshift jack" msgid_plural "makeshift jacks" -msgstr[0] "" +msgstr[0] "粗製千斤頂" #: lang/json/TOOL_from_json.py msgid "makeshift knife" @@ -51718,7 +51846,7 @@ msgstr[0] "野炊用具組" #: lang/json/vehicle_part_from_json.py msgid "metal funnel" msgid_plural "metal funnels" -msgstr[0] "" +msgstr[0] "金屬集雨器" #: lang/json/TOOL_from_json.py msgid "metallic smoother" @@ -51778,7 +51906,7 @@ msgstr[0] "多功能工具" #: lang/json/TOOL_from_json.py msgid "nail bomb" msgid_plural "nail bombs" -msgstr[0] "" +msgstr[0] "鐵釘炸彈" #: lang/json/TOOL_from_json.py msgid "nailboard trap" @@ -51798,7 +51926,7 @@ msgstr[0] "噪音發射器（啟動）" #: lang/json/TOOL_from_json.py msgid "offering chalice" msgid_plural "offering chalices" -msgstr[0] "" +msgstr[0] "供餐聖杯" #: lang/json/TOOL_from_json.py msgid "oil lamp (off)" @@ -51848,7 +51976,7 @@ msgstr[0] "剪線鉗" #: lang/json/TOOL_from_json.py msgid "pair of metal tongs" msgid_plural "pairs of metal tongs" -msgstr[0] "" +msgstr[0] "鐵鉗" #: lang/json/TOOL_from_json.py msgid "pair of scissors" @@ -51963,7 +52091,7 @@ msgstr[0] "布條" #: lang/json/TOOL_from_json.py msgid "reactor core expansion device" msgid_plural "reactor core expansion devices" -msgstr[0] "" +msgstr[0] "反應堆芯擴充設備" #: lang/json/TOOL_from_json.py msgid "rechargeable battery mod" @@ -52028,7 +52156,7 @@ msgstr[0] "手術刀" #: lang/json/TOOL_from_json.py msgid "scissor jack" msgid_plural "scissor jacks" -msgstr[0] "" +msgstr[0] "剪式千斤頂" #: lang/json/TOOL_from_json.py msgid "scrambler grenade" @@ -52048,7 +52176,7 @@ msgstr[0] "螺絲起子套裝" #: lang/json/TOOL_from_json.py msgid "scroll of command" msgid_plural "scrolls of command" -msgstr[0] "" +msgstr[0] "命令卷軸" #: lang/json/TOOL_from_json.py msgid "scroll of darkness" @@ -52068,12 +52196,12 @@ msgstr[0] "光明捲軸" #: lang/json/TOOL_from_json.py msgid "scroll of overgrowth" msgid_plural "scrolls of overgrowth" -msgstr[0] "" +msgstr[0] "繁茂卷軸" #: lang/json/TOOL_from_json.py msgid "scroll of sundering" msgid_plural "scrolls of sundering" -msgstr[0] "" +msgstr[0] "毀天滅地卷軸" #: lang/json/TOOL_from_json.py msgid "scythe" @@ -52108,7 +52236,7 @@ msgstr[0] "火焰刀（啟動）" #: lang/json/TOOL_from_json.py msgid "short healing tool" msgid_plural "short healing tools" -msgstr[0] "" +msgstr[0] "短期癒合工具" #: lang/json/TOOL_from_json.py lang/json/trap_from_json.py msgid "shotgun trap" @@ -52165,10 +52293,15 @@ msgid "snare trigger" msgid_plural "snare triggers" msgstr[0] "觸發陷阱" +#: lang/json/TOOL_from_json.py +msgid "snowman" +msgid_plural "snowmans" +msgstr[0] "" + #: lang/json/TOOL_from_json.py msgid "soda can stove kit" msgid_plural "soda can stove kits" -msgstr[0] "" +msgstr[0] "鋁罐爐具組" #: lang/json/TOOL_from_json.py msgid "soldering iron" @@ -52996,7 +53129,7 @@ msgstr "渦旋力" #: lang/json/ammunition_type_from_json.py msgid "welding gas" -msgstr "" +msgstr "焊接瓦斯" #. ~ Description for Itchy Metal Thing #: lang/json/bionic_from_json.py @@ -53380,6 +53513,17 @@ msgid "" "You may use power to fire a short-ranged blast which will disable " "electronics and robots." msgstr "" +"在你的手掌中嵌入了小型的拋物線形電磁脈衝(EMP)力場產生器。你能夠使用能量來發射" +"短距離的脈衝來癱瘓電器以及機器人。" + +#. ~ Description for Telescopic Eyes +#: lang/json/bionic_from_json.py +msgid "" +"Much of the material in your inner eye has been removed and replaced with an " +"array of high-powered, auto-focusing lenses. You can now see much farther " +"and more clearly than before, any vision problems you might have had are now " +"gone." +msgstr "" #: lang/json/bionic_from_json.py msgid "Muscle Augmentation" @@ -53414,7 +53558,7 @@ msgstr "" #: lang/json/bionic_from_json.py msgid "Optical Dampers" -msgstr "" +msgstr "視覺阻絕器" #: lang/json/bionic_from_json.py msgid "Plutonium Filter" @@ -53748,6 +53892,8 @@ msgid "" "use or carry two-handed items, and your strength limits what you can use " "with your one hand." msgstr "" +"你的左臂被改造成重型核融合砲！你能夠耗用體內的能量庫來發射破壞性熱能射線；然" +"而你無法使用或攜帶雙手物品，而且你力量受限成只用單手的狀態。" #. ~ Description for Infrared Vision #: lang/json/bionic_from_json.py @@ -53790,7 +53936,7 @@ msgstr "建設磚牆" #: lang/json/construction_from_json.py msgid "Build Bulletin Board" -msgstr "" +msgstr "建設公佈欄" #: lang/json/construction_from_json.py msgid "Build Chair" @@ -53898,11 +54044,11 @@ msgstr "建設鐵架" #: lang/json/construction_from_json.py msgid "Build Metal Roof" -msgstr "" +msgstr "建設金屬屋頂" #: lang/json/construction_from_json.py msgid "Build Metal Wall" -msgstr "" +msgstr "建設金屬牆" #: lang/json/construction_from_json.py msgid "Build Palisade Gate" @@ -53914,7 +54060,7 @@ msgstr "構建柵欄牆" #: lang/json/construction_from_json.py msgid "Build Pine Lean-To" -msgstr "" +msgstr "建設松樹棚舍" #: lang/json/construction_from_json.py msgid "Build Pontoon Bridge" @@ -53990,11 +54136,11 @@ msgstr "建設桌子" #: lang/json/construction_from_json.py msgid "Build Tarp Lean-To" -msgstr "" +msgstr "建設篷布棚舍" #: lang/json/construction_from_json.py msgid "Build Tarp Rain-Catcher" -msgstr "" +msgstr "建設篷布雨水收集器" #: lang/json/construction_from_json.py msgid "Build Thatched Roof" @@ -54198,7 +54344,7 @@ msgstr "夯實地板" #: lang/json/construction_from_json.py msgid "Tape Up Window" -msgstr "" +msgstr "窗戶貼上膠帶" #: lang/json/construction_from_json.py msgid "Till Soil" @@ -54459,7 +54605,7 @@ msgstr "你夢見了一個在森林的家。" #: lang/json/dream_from_json.py msgid "You dream of a strange quest for a bush that grows gray apples." -msgstr "" +msgstr "你妄想著能種出可以長出灰色蘋果的灌木" #: lang/json/dream_from_json.py msgid "" @@ -54948,26 +55094,26 @@ msgstr "你夢到你浮誇的石灰建築變成了刻版無聊的建築，嚇死 #: lang/json/effects_from_json.py msgid "" "A lack of calcium in your diet will make your bones progressively weaker." -msgstr "" +msgstr "你的飲食中缺乏鈣質，導致你的骨頭逐漸脆弱。" #: lang/json/effects_from_json.py msgid "" "A lack of iron in your diet will result in progressively worsening anemia." -msgstr "" +msgstr "你的飲食中缺乏鐵質，導致你的貧血逐漸惡化。" #: lang/json/effects_from_json.py msgid "A lack of vitamin A in your diet will progressively worsen your vision." -msgstr "" +msgstr "你的飲食中缺乏維生素A，導致你的視力逐漸惡化。" #: lang/json/effects_from_json.py msgid "A lack of vitamin B12 in your diet will affect your ability to heal." -msgstr "" +msgstr "你的飲食中缺乏維生素B12，影響了你的癒合能力。" #: lang/json/effects_from_json.py msgid "" "A lack of vitamin C in your diet will result in progressively worse symptoms " "of scurvy." -msgstr "" +msgstr "你的飲食中缺乏維生素C，導致你的壞血病症狀逐漸惡化。" #. ~ Description of effect 'Laser-targeted'. #: lang/json/effects_from_json.py @@ -55124,7 +55270,7 @@ msgstr "腎上腺素激增" #: lang/json/effects_from_json.py msgid "Aegis Cure" -msgstr "" +msgstr "宙斯盾癒" #: lang/json/effects_from_json.py msgid "Allow to Sleep" @@ -55137,16 +55283,16 @@ msgstr "已給予任務物品" #. ~ Description of effect 'Hypervitaminosis'. #: lang/json/effects_from_json.py msgid "An excess of vitamins has badly affected your metabolism." -msgstr "" +msgstr "維生素過量已經嚴重影響你的新陳代謝。" #. ~ Description of effect 'RX11 Stimulant Rush'. #: lang/json/effects_from_json.py msgid "An intense surge of stimulants pulses through your body." -msgstr "" +msgstr "一股興奮劑脈衝強烈地通透你的身體。" #: lang/json/effects_from_json.py msgid "Anemia" -msgstr "" +msgstr "貧血症" #: lang/json/effects_from_json.py msgid "Asked Info" @@ -55174,7 +55320,7 @@ msgstr "氣喘" #: lang/json/effects_from_json.py msgid "B12 deficiency" -msgstr "" +msgstr "維生素B12缺乏症" #: lang/json/effects_from_json.py msgid "Bad Bleeding" @@ -55182,7 +55328,7 @@ msgstr "大量流血" #: lang/json/effects_from_json.py msgid "Bad Scurvy" -msgstr "" +msgstr "嚴重壞血病" #: lang/json/effects_from_json.py msgid "Badly Infected" @@ -55218,7 +55364,7 @@ msgstr "反彈" #: lang/json/effects_from_json.py msgid "Brittle bones" -msgstr "" +msgstr "脆骨症" #: lang/json/effects_from_json.py msgid "Bugs in skin" @@ -55335,7 +55481,7 @@ msgstr "忙碌中" #: lang/json/effects_from_json.py msgid "Dazed" -msgstr "" +msgstr "迷惘" #: lang/json/effects_from_json.py msgid "Deaf" @@ -55359,15 +55505,15 @@ msgstr "喝醉" #: lang/json/effects_from_json.py msgid "Early anemia" -msgstr "" +msgstr "早期貧血" #: lang/json/effects_from_json.py msgid "Early scurvy" -msgstr "" +msgstr "早期壞血病" #: lang/json/effects_from_json.py msgid "Elixir" -msgstr "" +msgstr "仙丹" #: lang/json/effects_from_json.py msgid "Experiencing Datura" @@ -55375,7 +55521,7 @@ msgstr "嘗試著曼陀羅草" #: lang/json/effects_from_json.py msgid "Feared" -msgstr "" +msgstr "恐懼" #: lang/json/effects_from_json.py msgid "Food Poisoning" @@ -55467,11 +55613,11 @@ msgstr "熱" #: lang/json/effects_from_json.py msgid "Hypervitaminosis" -msgstr "" +msgstr "維生素過多症" #: lang/json/effects_from_json.py msgid "Hypocalcemia" -msgstr "" +msgstr "低鈣血症" #. ~ Description of effect 'Aegis Cure'. #: lang/json/effects_from_json.py @@ -55501,11 +55647,11 @@ msgstr "流感" #: lang/json/effects_from_json.py msgid "Intense Numbness" -msgstr "" +msgstr "強烈的麻痺" #: lang/json/effects_from_json.py msgid "Iron deficiency" -msgstr "" +msgstr "鐵質缺乏" #: lang/json/effects_from_json.py msgid "Itchy skin" @@ -55555,7 +55701,7 @@ msgstr "尼古丁" #: lang/json/effects_from_json.py msgid "Night blindness" -msgstr "" +msgstr "夜盲症" #: lang/json/effects_from_json.py msgid "No ammo" @@ -55563,16 +55709,16 @@ msgstr "無彈藥" #: lang/json/effects_from_json.py msgid "No healing" -msgstr "" +msgstr "無法癒合" #. ~ Description of effect 'Elixir'. #: lang/json/effects_from_json.py msgid "Not immortality, but it still feels nice." -msgstr "" +msgstr "沒有長生不老，但還是覺得很不錯。" #: lang/json/effects_from_json.py msgid "Offering" -msgstr "" +msgstr "提供" #: lang/json/effects_from_json.py msgid "On Fire" @@ -55615,7 +55761,7 @@ msgstr "中毒" #: lang/json/effects_from_json.py msgid "Poor vision" -msgstr "" +msgstr "視力不良" #. ~ Description of effect 'Ward Against Evil'. #: lang/json/effects_from_json.py @@ -55652,11 +55798,11 @@ msgstr "RX11 興奮劑高昂" #: lang/json/effects_from_json.py msgid "RX12 Healing Comedown" -msgstr "" +msgstr "RX12 治療素消退" #: lang/json/effects_from_json.py msgid "RX12 Healing Rush" -msgstr "" +msgstr "RX12 治療素激增" #. ~ Description of effect 'Blind'. #: lang/json/effects_from_json.py @@ -55718,7 +55864,7 @@ msgstr "放鬆瓦斯" #: lang/json/effects_from_json.py msgid "Revenant Hunger" -msgstr "" +msgstr "亡魂飢餓" #: lang/json/effects_from_json.py msgid "Ringing ears" @@ -55738,7 +55884,7 @@ msgstr "酷熱" #: lang/json/effects_from_json.py msgid "Scurvy" -msgstr "" +msgstr "壞血病" #: lang/json/effects_from_json.py msgid "Shakes" @@ -55751,7 +55897,7 @@ msgstr "尖叫中" #. ~ Apply message for effect(s) 'B12 deficiency, Slow healing, No healing'. #: lang/json/effects_from_json.py msgid "Simple wounds are starting to concern you more than usual." -msgstr "" +msgstr "你比平常更擔心簡單的傷口。" #: lang/json/effects_from_json.py msgid "Slimed" @@ -55759,7 +55905,7 @@ msgstr "沾滿黏液" #: lang/json/effects_from_json.py msgid "Slow healing" -msgstr "" +msgstr "癒合緩慢" #: lang/json/effects_from_json.py msgid "Slowed" @@ -55776,11 +55922,11 @@ msgstr "煙霧" #. ~ Description of effect 'Offering'. #: lang/json/effects_from_json.py msgid "Something is sapping the life from your body." -msgstr "" +msgstr "有東西從你體內消耗你的生命。" #: lang/json/effects_from_json.py msgid "Speedy" -msgstr "" +msgstr "迅速" #: lang/json/effects_from_json.py msgid "Spore coated" @@ -55810,7 +55956,7 @@ msgstr "" #: lang/json/effects_from_json.py msgid "Strengthed" -msgstr "" +msgstr "強化" #: lang/json/effects_from_json.py msgid "Stuck in Pit" @@ -55862,7 +56008,7 @@ msgstr "天花板砸到你了！" #. ~ Remove message for effect(s) 'Elixir'. #: lang/json/effects_from_json.py msgid "The healing effect fades." -msgstr "" +msgstr "治療效果變弱了。" #. ~ Decay message for effect(s) 'RX12 Healing Comedown, RX12 Healing Rush'. #: lang/json/effects_from_json.py @@ -55872,7 +56018,7 @@ msgstr "注射槍的化學物質逐漸地減少。你感到太糟了！" #. ~ Remove message for effect(s) 'Intense Numbness'. #: lang/json/effects_from_json.py msgid "The numbness fades." -msgstr "" +msgstr "麻痺消退了。" #. ~ Remove message for effect(s) 'Ward Against Evil'. #: lang/json/effects_from_json.py @@ -55887,7 +56033,7 @@ msgstr "這個樹脂太黏了讓你很難戰鬥。" #. ~ Apply message for effect(s) 'Dazed'. #: lang/json/effects_from_json.py msgid "The scream dazes you!" -msgstr "" +msgstr "尖叫聲使你暈眩!" #. ~ Remove message for effect(s) 'Relaxation gas'. #: lang/json/effects_from_json.py @@ -55897,7 +56043,7 @@ msgstr "你的肌肉被放鬆了。" #. ~ Decay message for effect(s) 'RX11 Stimulant Comedown, RX11 Stimulant Rush'. #: lang/json/effects_from_json.py msgid "The stimulant combo is wearing off. You feel sluggish." -msgstr "" +msgstr "興奮劑的效果逐漸減少，你感到呆滯。" #. ~ Description of effect 'Glare'. #: lang/json/effects_from_json.py @@ -55912,7 +56058,7 @@ msgstr "太陽光太強導致你看不清四周。" #. ~ Remove message for effect(s) 'Strengthed'. #: lang/json/effects_from_json.py msgid "The unnatural strength leaves your body." -msgstr "" +msgstr "非自然力量離開你的身體。" #. ~ Miss message for effect(s) 'Webbed'. #: lang/json/effects_from_json.py @@ -55954,11 +56100,11 @@ msgstr "站不穩" #: lang/json/effects_from_json.py msgid "VitA deficiency" -msgstr "" +msgstr "維生素A缺乏症" #: lang/json/effects_from_json.py msgid "Ward Against Evil" -msgstr "" +msgstr "辟邪" #: lang/json/effects_from_json.py msgid "Warm" @@ -55975,7 +56121,7 @@ msgstr "我們需要根據，我們的纖維就要用光了..." #: lang/json/effects_from_json.py msgid "Weak bones" -msgstr "" +msgstr "骨骼脆弱" #: lang/json/effects_from_json.py msgid "Wearing earphones" @@ -56056,12 +56202,12 @@ msgstr "你正戴著耳機，不太聽到來自外界的聲音。" #. ~ Apply message for effect(s) 'Iron deficiency, Early anemia, Anemia'. #: lang/json/effects_from_json.py msgid "You beging feeling increasingly tired and listless." -msgstr "" +msgstr "你開始感覺越來越疲憊，無精打采。" #. ~ Apply message for effect(s) 'VitA deficiency, Poor vision, Night blindness'. #: lang/json/effects_from_json.py msgid "You beging struggling to make out the finer details." -msgstr "" +msgstr "你開始很難辨認出細節。" #. ~ Description of effect 'Ringing ears'. #: lang/json/effects_from_json.py @@ -56113,7 +56259,7 @@ msgstr "你無法相信你看到的所有事物。" #. ~ Remove message for effect(s) 'Winded'. #: lang/json/effects_from_json.py msgid "You catch your breath." -msgstr "" +msgstr "你恢復正常呼吸" #. ~ Miss message for effect(s) 'Lacking Sleep'. #: lang/json/effects_from_json.py @@ -56143,7 +56289,7 @@ msgstr "你覺得腎上腺素激增！" #. ~ Apply message for effect(s) 'RX11 Stimulant Comedown, RX11 Stimulant Rush'. #: lang/json/effects_from_json.py msgid "You feel an intense surge of stimulants pulse through your body!" -msgstr "" +msgstr "一股興奮劑脈衝強烈地通透你的身體。" #. ~ Miss message for effect(s) 'Poisoned'. #. ~ Miss message for effect(s) 'Badly Poisoned'. @@ -56166,17 +56312,17 @@ msgstr "你覺得頭昏眼花。" #. ~ Description of effect 'Strengthed'. #: lang/json/effects_from_json.py msgid "You feel mighty, like you could take on the world." -msgstr "" +msgstr "你覺得非常強大，就像自己能接管這個世界一樣。" #. ~ Description of effect 'Ratting'. #: lang/json/effects_from_json.py msgid "You feel nauseous and rat-like." -msgstr "" +msgstr "你覺得噁心的跟老鼠一樣。" #. ~ Description of effect 'Nausea'. #: lang/json/effects_from_json.py msgid "You feel nauseous. Even a thought of food makes you feel sick." -msgstr "" +msgstr "你覺得噁心，即使只是想到食物也會讓你感到不舒服。" #: lang/json/effects_from_json.py msgid "You feel sick inside." @@ -56232,7 +56378,7 @@ msgstr "" #. ~ Description of effect 'Feared'. #: lang/json/effects_from_json.py msgid "You have been paralyzed by the fear." -msgstr "" +msgstr "你被恐懼癱瘓。" #. ~ Description of effect 'Poisoned'. #: lang/json/effects_from_json.py @@ -56271,12 +56417,12 @@ msgstr "你躺下並開始睡覺…" #. ~ Remove message for effect(s) 'Iron deficiency, Early anemia, Anemia'. #: lang/json/effects_from_json.py msgid "You no longer feel anemic." -msgstr "" +msgstr "你不再感到貧血。" #. ~ Remove message for effect(s) 'Nausea'. #: lang/json/effects_from_json.py msgid "You no longer feel nauseous." -msgstr "" +msgstr "你不再覺得噁心了。" #. ~ Apply message for effect(s) 'Stem cell treatment'. #: lang/json/effects_from_json.py @@ -56290,7 +56436,7 @@ msgstr "你抽太多煙了" #. ~ Apply message for effect(s) 'Early scurvy, Scurvy, Bad Scurvy'. #: lang/json/effects_from_json.py msgid "You start to develop symptoms of scurvy." -msgstr "" +msgstr "你的壞血病症狀開始加重。" #: lang/json/effects_from_json.py msgid "" @@ -56406,7 +56552,7 @@ msgstr "你吃太飽了讓你很難戰鬥。" msgid "" "You're visibly shaken up, and are having a hard time focusing on what's " "going on around you." -msgstr "" +msgstr "你很明顯地被搞得心神不寧，很難專心注意正發生在自己身旁的事物。" #. ~ Miss message for effect(s) 'Asthma, Asthma, Asthma, Asthma, Heavy Asthma, Heavy Asthma'. #: lang/json/effects_from_json.py @@ -56496,7 +56642,7 @@ msgstr "你的 %s 長時間暴露在寒冷之中。" #. ~ Decay message for effect(s) 'B12 deficiency, Slow healing, No healing'. #: lang/json/effects_from_json.py msgid "Your ability to heal returns as your Vitamin B12 deficiency improves." -msgstr "" +msgstr "隨著你的維生素B12缺乏情況改善，你的癒合能力逐漸回復中。" #. ~ Decay message for effect(s) 'Adrenaline Comedown, Adrenaline Rush'. #: lang/json/effects_from_json.py @@ -56516,32 +56662,32 @@ msgstr "你的水泡讓你分心" #. ~ Description of effect 'Intense Numbness'. #: lang/json/effects_from_json.py msgid "Your body feels incredibly numb." -msgstr "" +msgstr "你的身體感覺不可思議的麻痺。" #. ~ Apply message for effect(s) 'Hypocalcemia, Weak bones, Brittle bones'. #: lang/json/effects_from_json.py msgid "Your bones are becoming more brittle." -msgstr "" +msgstr "你的骨頭變得更脆弱了。" #. ~ Decay message for effect(s) 'Hypocalcemia, Weak bones, Brittle bones'. #: lang/json/effects_from_json.py msgid "Your bones become stronger as your calcium deficiency improves." -msgstr "" +msgstr "隨著你的缺鈣情況改善，你的骨頭逐漸變強中。" #. ~ Remove message for effect(s) 'Hypocalcemia, Weak bones, Brittle bones'. #: lang/json/effects_from_json.py msgid "Your bones regain their usual strength." -msgstr "" +msgstr "你的骨頭恢復原本的強度。" #. ~ Apply message for effect(s) 'Winded'. #: lang/json/effects_from_json.py msgid "Your breath gives out!" -msgstr "" +msgstr "你氣喘吁吁!" #. ~ Decay message for effect(s) 'Hypocalcemia, Weak bones, Brittle bones'. #: lang/json/effects_from_json.py msgid "Your calcium deficiency is nearly resolved." -msgstr "" +msgstr "你的鈣質缺乏已經快要解決了。" #. ~ Miss message for effect(s) 'Adrenaline Comedown, Adrenaline Rush'. #: lang/json/effects_from_json.py @@ -56566,7 +56712,7 @@ msgstr "你的眼睛被催淚瓦斯弄得很痛" #. ~ Decay message for effect(s) 'Iron deficiency, Early anemia, Anemia'. #: lang/json/effects_from_json.py msgid "Your feel stronger as your anemia starts to improve." -msgstr "" +msgstr "隨著你的缺鐵情況改善，你的貧血逐漸恢復中。" #. ~ Description of effect 'Unstable footing'. #: lang/json/effects_from_json.py @@ -56587,12 +56733,12 @@ msgstr "您的聽力受到損害。" #. ~ Description of effect 'Speedy'. #: lang/json/effects_from_json.py msgid "Your heart feels like it's beating dangerously fast." -msgstr "" +msgstr "你的心臟感到他正危險地快速跳動著。" #. ~ Remove message for effect(s) 'Speedy'. #: lang/json/effects_from_json.py msgid "Your heartbeat slows back down to a normal pace." -msgstr "" +msgstr "你的心跳減慢回落到正常的速度。" #. ~ Description of effect 'Stem cell treatment'. #: lang/json/effects_from_json.py @@ -56603,7 +56749,7 @@ msgstr "你的身體隨著治療發生奇怪的轉變。" #. ~ Decay message for effect(s) 'Iron deficiency, Early anemia, Anemia'. #: lang/json/effects_from_json.py msgid "Your iron deficiency is nearly resolved." -msgstr "" +msgstr "你的鐵質缺乏已經快要解決了。" #. ~ Miss message for effect(s) 'Smoke'. #: lang/json/effects_from_json.py @@ -56613,12 +56759,12 @@ msgstr "你的肺部被煙灼傷" #. ~ Remove message for effect(s) 'Hypervitaminosis'. #: lang/json/effects_from_json.py msgid "Your metabolism becomes more stable." -msgstr "" +msgstr "你的新陳代謝變得更加穩定。" #. ~ Apply message for effect(s) 'Hypervitaminosis'. #: lang/json/effects_from_json.py msgid "Your metabolism becomes unstable." -msgstr "" +msgstr "你的新陳代謝變得不穩定。" #. ~ Description of effect 'Stunned'. #: lang/json/effects_from_json.py @@ -56628,17 +56774,17 @@ msgstr "你的移動變得錯亂了。" #. ~ Remove message for effect(s) 'VitA deficiency, Poor vision, Night blindness'. #: lang/json/effects_from_json.py msgid "Your normal visual accuity returns." -msgstr "" +msgstr "你的視力恢復正常。" #. ~ Remove message for effect(s) 'Early scurvy, Scurvy, Bad Scurvy'. #: lang/json/effects_from_json.py msgid "Your scurvy has resolved." -msgstr "" +msgstr "你的壞血病已經痊癒。" #. ~ Decay message for effect(s) 'Early scurvy, Scurvy, Bad Scurvy'. #: lang/json/effects_from_json.py msgid "Your scurvy lessens as your Vitamin C deficiency improves." -msgstr "" +msgstr "隨著你的維生素C缺乏情況改善，你的壞血病逐漸減輕中。" #. ~ Remove message for effect(s) 'Blind'. #: lang/json/effects_from_json.py @@ -56667,7 +56813,7 @@ msgstr "你看東西開始閃爍並且變灰了！" #. ~ Decay message for effect(s) 'VitA deficiency, Poor vision, Night blindness'. #: lang/json/effects_from_json.py msgid "Your vision improves as your Vitamin A deficiency improves." -msgstr "" +msgstr "隨著你的維生素A缺乏情況改善，你的視力逐漸改善中。" #. ~ Remove message for effect(s) 'Contact Lenses'. #: lang/json/effects_from_json.py @@ -56677,27 +56823,27 @@ msgstr "你的視線開始變得模糊。" #. ~ Decay message for effect(s) 'VitA deficiency, Poor vision, Night blindness'. #: lang/json/effects_from_json.py msgid "Your vitamin A deficiency is nearly resolved." -msgstr "" +msgstr "你的維生素A缺乏症已經快要解決了。" #. ~ Decay message for effect(s) 'B12 deficiency, Slow healing, No healing'. #: lang/json/effects_from_json.py msgid "Your vitamin B12 deficiency is starting to resolve." -msgstr "" +msgstr "你的維生素B12缺乏症已經開始改善了。" #. ~ Decay message for effect(s) 'Early scurvy, Scurvy, Bad Scurvy'. #: lang/json/effects_from_json.py msgid "Your vitamin C deficiency is starting to resolve." -msgstr "" +msgstr "你的維生素C缺乏症已經開始改善了。" #. ~ Miss message for effect(s) 'Offering'. #: lang/json/effects_from_json.py msgid "Your will to fight fades for a moment." -msgstr "" +msgstr "你的戰鬥意志消失了一會兒。" #. ~ Remove message for effect(s) 'B12 deficiency, Slow healing, No healing'. #: lang/json/effects_from_json.py msgid "Your wounds now heal normally." -msgstr "" +msgstr "你的傷口現在能正常癒合了。" #: lang/json/effects_from_json.py msgid "Zapped" @@ -56727,7 +56873,7 @@ msgstr "" #: lang/json/faction_from_json.py msgid "Captives" -msgstr "" +msgstr "俘虜" #: lang/json/faction_from_json.py msgid "Hell's Raiders" @@ -56797,48 +56943,48 @@ msgstr[0] "人類" #: lang/json/fault_from_json.py msgid "" "An expired filter reduces fuel efficiency and increases smoke production." -msgstr "" +msgstr "過期的過濾器降低燃油效率並增加產煙量。" #. ~ Description for fuel filter #: lang/json/fault_from_json.py msgid "" "An expired filter reduces performance and increases the chance of backfires." -msgstr "" +msgstr "過期的過濾器會降低性能並增加回火的機會。" #. ~ Description for glow plugs #: lang/json/fault_from_json.py msgid "Help when starting an engine in low ambient temperatures." -msgstr "" +msgstr "有助於低溫環境下發動引擎。" #. ~ Description for immobiliser #: lang/json/fault_from_json.py msgid "Prevents starting of the vehicle without the appropriate key." -msgstr "" +msgstr "防止沒有正確的鑰匙就啟動車輛。" #. ~ Description for drive belt #: lang/json/fault_from_json.py msgid "Required for operation of an attached alternator." -msgstr "" +msgstr "需要連接交流發電機來運行。" #. ~ Description for starter motor #: lang/json/fault_from_json.py msgid "Required to initially start the engine." -msgstr "" +msgstr "用於起動引擎的必備零件。" #. ~ Description for diesel pump #: lang/json/fault_from_json.py msgid "Required to pump and pressurise diesel from a vehicles tank." -msgstr "" +msgstr "從汽車油箱內抽取柴油的必備零件。" #. ~ Description for fuel pump #: lang/json/fault_from_json.py msgid "Required to pump gasoline from a vehicles tank." -msgstr "" +msgstr "從汽車油箱內抽取汽油的必備零件。" #. ~ Description for water pump #: lang/json/fault_from_json.py msgid "Required to pump water to an external radiator or heatsink." -msgstr "" +msgstr "把水抽到外部散熱器或散熱片的必備零件。" #: lang/json/fault_from_json.py lang/json/terrain_from_json.py msgid "diesel pump" @@ -56846,23 +56992,23 @@ msgstr "柴油泵" #: lang/json/fault_from_json.py msgid "fuel filter" -msgstr "" +msgstr "油料過濾器" #: lang/json/fault_from_json.py msgid "fuel pump" -msgstr "" +msgstr "汽油泵" #: lang/json/fault_from_json.py msgid "glow plugs" -msgstr "" +msgstr "電熱塞" #: lang/json/fault_from_json.py msgid "immobiliser" -msgstr "" +msgstr "防盜器" #: lang/json/fault_from_json.py msgid "starter motor" -msgstr "" +msgstr "起動馬達" #: lang/json/fault_from_json.py lang/json/terrain_from_json.py msgid "water pump" @@ -56966,7 +57112,7 @@ msgstr "鐺！" #: lang/json/furniture_from_json.py msgid "clatter! The sword topples over." -msgstr "" +msgstr "噠！劍倒了。" #: lang/json/furniture_from_json.py msgid "clay kiln" @@ -56974,7 +57120,7 @@ msgstr "陶製碳化爐" #: lang/json/furniture_from_json.py msgid "coffin" -msgstr "" +msgstr "棺材" #: lang/json/furniture_from_json.py msgid "counter" @@ -56992,7 +57138,8 @@ msgstr "轟隆！" msgid "crate" msgstr "木箱" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp msgid "crunch!" msgstr "匡噹！" @@ -57088,8 +57235,8 @@ msgstr "壁爐" msgid "glass breaking" msgstr "玻璃破掉了" -#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py src/iuse.cpp -#: src/map.cpp src/ranged.cpp +#: lang/json/furniture_from_json.py lang/json/terrain_from_json.py +#: src/iuse.cpp src/map.cpp src/ranged.cpp msgid "glass breaking!" msgstr "玻璃破碎聲！" @@ -57097,6 +57244,10 @@ msgstr "玻璃破碎聲！" msgid "glass door fridge" msgstr "玻璃門冰箱" +#: lang/json/furniture_from_json.py +msgid "gravestone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "groundsheet" msgstr "地墊" @@ -57113,13 +57264,17 @@ msgstr "可採集的植物" msgid "hay" msgstr "乾草" +#: lang/json/furniture_from_json.py +msgid "headstone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "heavy punching bag" msgstr "重拳擊沙袋" #: lang/json/furniture_from_json.py msgid "hooked spike" -msgstr "" +msgstr "鉤狀尖刺" #: lang/json/furniture_from_json.py msgid "indoor plant" @@ -57189,6 +57344,10 @@ msgstr "突變仙人掌" msgid "mutated poppy flower" msgstr "變種罌粟花" +#: lang/json/furniture_from_json.py +msgid "obelisk" +msgstr "" + #: lang/json/furniture_from_json.py msgid "open animalskin flap" msgstr "打開的獸皮簾" @@ -57199,7 +57358,7 @@ msgstr "打開的帆布簾" #: lang/json/furniture_from_json.py msgid "open coffin" -msgstr "" +msgstr "打開棺材" #: lang/json/furniture_from_json.py msgid "open crate" @@ -57289,10 +57448,6 @@ msgstr "沙袋牆" msgid "screeching metal!" msgstr "金屬嘎嘎聲！" -#: lang/json/furniture_from_json.py -msgid "seed" -msgstr "種子" - #: lang/json/furniture_from_json.py msgid "seedling" msgstr "幼苗" @@ -57352,7 +57507,7 @@ msgstr "雕像" #: lang/json/furniture_from_json.py msgid "stone slab" -msgstr "" +msgstr "石板" #: lang/json/furniture_from_json.py msgid "straw bed" @@ -57374,6 +57529,10 @@ msgstr "咚！" msgid "thump." msgstr "咚。" +#: lang/json/furniture_from_json.py +msgid "thunk!" +msgstr "" + #: lang/json/furniture_from_json.py lang/json/terrain_from_json.py msgid "thunk." msgstr "咚。" @@ -57396,7 +57555,7 @@ msgstr "" #: lang/json/furniture_from_json.py msgid "upright weapon" -msgstr "" +msgstr "直立武器" #: lang/json/furniture_from_json.py msgid "vending machine" @@ -57450,6 +57609,10 @@ msgstr "柴爐" msgid "wooden keg" msgstr "木桶" +#: lang/json/furniture_from_json.py +msgid "worn gravestone" +msgstr "" + #: lang/json/furniture_from_json.py msgid "yellow indoor plant" msgstr "黃色室內植物" @@ -57457,7 +57620,7 @@ msgstr "黃色室內植物" #. ~ 'fail' action message of some gate object. #: lang/json/gates_from_json.py msgid "The barn doors can't be closed!" -msgstr "" +msgstr "倉庫門無法關起來!" #. ~ 'close' action message of some gate object. #: lang/json/gates_from_json.py @@ -57472,7 +57635,7 @@ msgstr "倉庫的門打開了！" #. ~ 'fail' action message of some gate object. #: lang/json/gates_from_json.py msgid "The door can't be closed!" -msgstr "" +msgstr "門無法關起來!" #. ~ 'open' action message of some gate object. #: lang/json/gates_from_json.py @@ -57487,7 +57650,7 @@ msgstr "" #. ~ 'fail' action message of some gate object. #: lang/json/gates_from_json.py msgid "The gate can't be closed!" -msgstr "" +msgstr "大門無法關起來!" #. ~ 'close' action message of some gate object. #: lang/json/gates_from_json.py @@ -57502,7 +57665,7 @@ msgstr "大門已打開！" #. ~ 'fail' action message of some gate object. #: lang/json/gates_from_json.py msgid "The palisade gate can't be closed!" -msgstr "" +msgstr "柵欄門無法關起來!" #. ~ 'close' action message of some gate object. #: lang/json/gates_from_json.py @@ -57826,8 +57989,10 @@ msgstr "假如你能騰出空間，你也許會想帶支滅火器。被困在失 #: lang/json/hint_from_json.py msgid "" "If you get a pair of night vision goggles, hold on to them! A flashlight " -"will give you away, but with goggles you can be sneaky." -msgstr "要是你拿到夜視鏡，好好留著！手電筒會暴露你的位置，夜視鏡卻能讓你潛行。" +"will give you away, but with goggles you can be sneaky. Beware that some " +"types of zombies are camouflaged against it, and require proper light to be " +"visible." +msgstr "" #: lang/json/hint_from_json.py msgid "" @@ -58537,7 +58702,7 @@ msgstr "顯示說明" #: lang/json/keybinding_from_json.py msgid "Display Usage Help" -msgstr "" +msgstr "顯示使用說明" #: lang/json/keybinding_from_json.py msgid "Drop Item" @@ -58693,7 +58858,7 @@ msgstr "標記選擇的物品" #: lang/json/keybinding_from_json.py msgid "Mend part" -msgstr "" +msgstr "修補零件" #: lang/json/keybinding_from_json.py msgid "Mouse Move" @@ -58879,11 +59044,11 @@ msgstr "撿起物品" #: lang/json/keybinding_from_json.py msgid "Place Overmap Special" -msgstr "" +msgstr "放置大地圖特殊" #: lang/json/keybinding_from_json.py msgid "Place Overmap Terrain" -msgstr "" +msgstr "放置大地圖地形" #: lang/json/keybinding_from_json.py msgid "Precise Shot" @@ -58919,7 +59084,7 @@ msgstr "閱讀" #: lang/json/keybinding_from_json.py msgid "Reassign invlet" -msgstr "" +msgstr "重新指定穿著層次" #: lang/json/keybinding_from_json.py msgid "Recraft last recipe" @@ -58943,7 +59108,7 @@ msgstr "移除建築物" #: lang/json/keybinding_from_json.py msgid "Remove bionic" -msgstr "" +msgstr "移除生化插件" #: lang/json/keybinding_from_json.py msgid "Remove custom color" @@ -59043,7 +59208,7 @@ msgstr "選擇徒手招式" #: lang/json/keybinding_from_json.py msgid "Select all" -msgstr "" +msgstr "全選" #: lang/json/keybinding_from_json.py msgid "Select armor for moving" @@ -59167,7 +59332,7 @@ msgstr "在自己和目標之間切換" #: lang/json/keybinding_from_json.py msgid "Switch Aiming Mode" -msgstr "" +msgstr "切換瞄準模式" #: lang/json/keybinding_from_json.py msgid "Switch Sidebar Style" @@ -59287,7 +59452,7 @@ msgstr "清空手持的物品" #: lang/json/keybinding_from_json.py msgid "Unmark selected item" -msgstr "" +msgstr "取消標記選擇的物品" #: lang/json/keybinding_from_json.py msgid "View Factions" @@ -60030,12 +60195,12 @@ msgstr "" #. ~ Sign #: lang/json/mapgen_from_json.py msgid " owned at " -msgstr "" +msgstr " 佔有 在 " #. ~ Sign #: lang/json/mapgen_from_json.py msgid ", , and were here!" -msgstr "" +msgstr ", , 和 在此!" #. ~ Sign #: lang/json/mapgen_from_json.py @@ -60045,7 +60210,7 @@ msgstr "" #. ~ Sign #: lang/json/mapgen_from_json.py msgid "Danger! Do not smoke! Risk of explosion!" -msgstr "" +msgstr "危險！禁止吸煙！可能會爆炸！" #. ~ Sign #: lang/json/mapgen_from_json.py @@ -60070,32 +60235,32 @@ msgstr "" #. ~ Sign #: lang/json/mapgen_from_json.py msgid "Watch your step!" -msgstr "" +msgstr "小心台階！" #. ~ Sign #: lang/json/mapgen_from_json.py msgid "it works again." -msgstr "" +msgstr "還是有用。" #. ~ Sign #: lang/json/mapgen_from_json.py msgid "it works." -msgstr "" +msgstr "有用。" #. ~ Sign #: lang/json/mapgen_from_json.py msgid "the address has been defaced" -msgstr "" +msgstr "地址被污損了" #. ~ Sign #: lang/json/mapgen_from_json.py msgid "the address is unreadable" -msgstr "" +msgstr "地址已經看不出來了" #. ~ Sign #: lang/json/mapgen_from_json.py msgid "the name is gone but a slogan remains: 'We'll repair you all the way'" -msgstr "" +msgstr "名稱已經消失，但是標語還在: \"我們會一直修好你\"" #. ~ Description of buff for martial art 'Tai Chi' #: lang/json/martial_art_from_json.py @@ -60295,7 +60460,7 @@ msgstr "傷害加成和敏捷而非力量成正比。" #: lang/json/martial_art_from_json.py msgid "Debug Mastery" -msgstr "" +msgstr "除蟲大師" #: lang/json/martial_art_from_json.py msgid "Dragon Kung Fu" @@ -60307,7 +60472,7 @@ msgstr "神龍式" #: lang/json/martial_art_from_json.py msgid "Elemental resistance" -msgstr "" +msgstr "元素抗性" #: lang/json/martial_art_from_json.py msgid "Eskrima" @@ -60464,6 +60629,13 @@ msgstr "" msgid "Niten Ichi-Ryu" msgstr "二天一流" +#. ~ Description for martial art 'Niten Ichi-Ryu' +#: lang/json/martial_art_from_json.py +msgid "" +"Niten Ichi-Ryu is an ancient school of combat, transmitting a style of " +"classical Japanese swordsmanship conceived by the warrior Miyamoto Musashi." +msgstr "" + #. ~ Description for martial art 'Niten Ichi-Ryu' #: lang/json/martial_art_from_json.py msgid "" @@ -60898,7 +61070,7 @@ msgstr "塑膠" #: lang/json/material_from_json.py msgid "Poly Plastic" -msgstr "" +msgstr "聚合塑料" #: lang/json/material_from_json.py msgid "Powder" @@ -60962,7 +61134,7 @@ msgstr "刮傷的" #: lang/json/material_from_json.py msgid "budget steel" -msgstr "" +msgstr "低價鋼材" #: lang/json/material_from_json.py msgid "chipped" @@ -61299,7 +61471,7 @@ msgstr "也許你喝夠多，就會出現突變..." #. ~ Mutation class name #: lang/json/mutation_category_from_json.py msgid "Medical" -msgstr "" +msgstr "醫療" #. ~ Mutation class: Insect Female memorial messsage #: lang/json/mutation_category_from_json.py @@ -61999,7 +62171,7 @@ msgstr "疼痛終結" #: lang/json/mutation_from_json.py msgid "Debug CBM Slots Limits" -msgstr "" +msgstr "測試的 CBM 插槽限制" #: lang/json/mutation_from_json.py msgid "Debug Deodorizer" @@ -62727,7 +62899,7 @@ msgstr "不勝酒力" #: lang/json/mutation_from_json.py msgid "" "Limitate the number of bionics which you're able to install in your body." -msgstr "" +msgstr "限制你能裝到身上的生化插件數量。" #. ~ Description for Mycus Bloom #: lang/json/mutation_from_json.py @@ -63452,7 +63624,7 @@ msgstr "斑點" #: lang/json/mutation_from_json.py msgid "Squeamish" -msgstr "" +msgstr "潔癖" #: lang/json/mutation_from_json.py msgid "Stainless Claws" @@ -64212,6 +64384,8 @@ msgid "" "You are less likely to throw up from food poisoning, alcohol, etc. If you " "throw up nevertheless, you won't suffer a residual nausea." msgstr "" +"你不容易受到食物中毒或酒精的影響造成嘔吐。即使你噁吐了，你也不會持續感到噁" +"心。" #. ~ Description for Weak Stomach #: lang/json/mutation_from_json.py @@ -64360,7 +64534,7 @@ msgstr "" msgid "" "You can't even think about putting filthy clothes on yourself, especially " "from zombies' corpses." -msgstr "" +msgstr "你甚至無法想像拿取髒衣服，尤其是殭屍屍體上的。" #. ~ Description for Slow Runner #: lang/json/mutation_from_json.py @@ -64892,6 +65066,8 @@ msgid "" "perform fine tasks such as crafting and reading in darkness. Activate to " "toggle NV-visible areas on or off." msgstr "" +"現在你擁有很強的微暗視力，但無法讓你進行精細的工作，例如在黑暗中做手工藝、閱" +"讀。啟動以切換夜視範圍或關閉。" #. ~ Description for Shell #: lang/json/mutation_from_json.py @@ -65023,6 +65199,8 @@ msgid "" "easily, and typically use an umbrella and a sunglasses when going out in the " "sun." msgstr "" +"你的皮膚缺乏色素，幾乎是透明的。你若受到陽光直射會容易造成曬傷，出門時帶把傘" +"和戴上太陽眼鏡吧。" #. ~ Description for Lactose Intolerance #: lang/json/mutation_from_json.py @@ -65602,7 +65780,7 @@ msgstr "" msgid "" "Your body has become radioactive! You continuously emit heavy levels of " "radiation, making your surroundings unlivable." -msgstr "" +msgstr "你的身體已經輻射化了！你持續散發大量的輻射，使你四周的環境無法生存。" #. ~ Description for Minor Radioactivity #: lang/json/mutation_from_json.py @@ -65632,6 +65810,8 @@ msgid "" "Your body is coated with a fine slime. Protects from long term effects of " "acid, though not short term ones. Greatly increases wet benefits." msgstr "" +"你的身體會滲出一層薄黏液並覆蓋全身。保護你對抗長效的酸蝕，卻無法對抗短效的酸" +"蝕。大幅增加濕潤的好處。" #. ~ Description for Quills #: lang/json/mutation_from_json.py @@ -65741,6 +65921,8 @@ msgid "" "Your body's slime output has become sticky and gel-like. Protects from acid " "somewhat. Greatly increases wet benefits." msgstr "" +"你身體類似膠狀的分泌物變得更為黏滑。保護你對抗任何酸蝕。大幅增加於潮濕狀態的" +"好處。" #. ~ Description for Light Bones #: lang/json/mutation_from_json.py @@ -65761,6 +65943,8 @@ msgid "" "Additionally, combat skills, which you use to hunt, are easer to learn and " "maintain." msgstr "" +"你的大腦比起人來更像是掠食性動物，因此你更容易在獵物死亡時失控。此外，你狩獵" +"使用的戰鬥技能會更容易學習成長。" #. ~ Description for Cephalopod Vision #: lang/json/mutation_from_json.py @@ -66046,6 +66230,8 @@ msgid "" "causing problems with gloves. However, you can swim much faster. Slightly " "decreases wet penalties." msgstr "" +"你的手掌與腳掌長出厚厚的蹼，讓你的敏捷下降 1 點，並且無法戴手套。但是你能夠游" +"泳遊的更快。稍微增加防水能力。" #. ~ Description for Paws #: lang/json/mutation_from_json.py @@ -66090,6 +66276,8 @@ msgid "" "an increased chance for bad wounds and infections to heal on their own, and " "only suffer reduced penalties from them." msgstr "" +"你的免疫系統對抵抗感染特別有用。你有額外的機會讓傷口與感染自行治療，而且只會" +"遭受到減低的懲罰。" #. ~ Description for Large Talons #: lang/json/mutation_from_json.py @@ -66611,7 +66799,7 @@ msgstr "避難所 - 生命體研究所" #: lang/json/overmap_terrain_from_json.py msgid "Vault - Maint. Bay" -msgstr "" +msgstr "避難所 - 維修區" #: lang/json/overmap_terrain_from_json.py msgid "Vault - Motor Pool" @@ -66707,7 +66895,7 @@ msgstr "電動間" #: lang/json/overmap_terrain_from_json.py msgid "attached garage" -msgstr "" +msgstr "附屬車庫" #: lang/json/overmap_terrain_from_json.py msgid "bank" @@ -66759,15 +66947,15 @@ msgstr "小屋地下室" #: lang/json/overmap_terrain_from_json.py msgid "campsite" -msgstr "" +msgstr "營地" #: lang/json/overmap_terrain_from_json.py msgid "campsites" -msgstr "" +msgstr "營地" #: lang/json/overmap_terrain_from_json.py msgid "car corner" -msgstr "" +msgstr "汽車角落" #: lang/json/overmap_terrain_from_json.py msgid "cathedral" @@ -66803,11 +66991,11 @@ msgstr "彈坑" #: lang/json/overmap_terrain_from_json.py msgid "curious structure" -msgstr "" +msgstr "奇怪的結構" #: lang/json/overmap_terrain_from_json.py msgid "curious underground structure" -msgstr "" +msgstr "奇怪的地底結構" #: lang/json/overmap_terrain_from_json.py msgid "dirt lot" @@ -66827,7 +67015,7 @@ msgstr "電子商店" #: lang/json/overmap_terrain_from_json.py msgid "errie cavern" -msgstr "" +msgstr "陰森恐怖的洞穴" #: lang/json/overmap_terrain_from_json.py msgid "evac shelter" @@ -66859,7 +67047,7 @@ msgstr "平地" #: lang/json/overmap_terrain_from_json.py msgid "field campsite" -msgstr "" +msgstr "田野營地" #: lang/json/overmap_terrain_from_json.py msgid "fire station" @@ -66931,7 +67119,7 @@ msgstr "危險廢料石棺" #: lang/json/overmap_terrain_from_json.py msgid "hell castle" -msgstr "" +msgstr "地獄城堡" #: lang/json/overmap_terrain_from_json.py msgid "hellmouth" @@ -66979,11 +67167,11 @@ msgstr "房屋" #: lang/json/overmap_terrain_from_json.py msgid "house basement" -msgstr "" +msgstr "房子的地下室" #: lang/json/overmap_terrain_from_json.py msgid "house roof" -msgstr "" +msgstr "房屋頂蓋" #: lang/json/overmap_terrain_from_json.py msgid "impact site" @@ -66991,7 +67179,7 @@ msgstr "撞擊地點" #: lang/json/overmap_terrain_from_json.py msgid "incomplete cabin" -msgstr "" +msgstr "未完成的小屋" #: lang/json/overmap_terrain_from_json.py msgid "jewelry store" @@ -67083,7 +67271,7 @@ msgstr "導彈發射井" #: lang/json/overmap_terrain_from_json.py msgid "mortuary" -msgstr "" +msgstr "停屍間" #: lang/json/overmap_terrain_from_json.py msgid "motel" @@ -67131,7 +67319,7 @@ msgstr "當舖" #: lang/json/overmap_terrain_from_json.py msgid "peculiar shrine" -msgstr "" +msgstr "奇特的神社" #: lang/json/overmap_terrain_from_json.py msgid "pharmacy" @@ -67159,7 +67347,7 @@ msgstr "監獄" #: lang/json/overmap_terrain_from_json.py msgid "public washroom" -msgstr "" +msgstr "公廁" #: lang/json/overmap_terrain_from_json.py msgid "public works" @@ -67179,7 +67367,7 @@ msgstr "廣播電塔" #: lang/json/overmap_terrain_from_json.py msgid "ramp testing area" -msgstr "" +msgstr "坡道試驗區" #: lang/json/overmap_terrain_from_json.py msgid "ranch" @@ -67191,7 +67379,7 @@ msgstr "鼠道" #: lang/json/overmap_terrain_from_json.py msgid "razorclaw nest" -msgstr "" +msgstr "利爪怪巢穴" #: lang/json/overmap_terrain_from_json.py msgid "refugee center" @@ -67201,6 +67389,10 @@ msgstr "難民中心" msgid "regional school" msgstr "公立學校" +#: lang/json/overmap_terrain_from_json.py +msgid "religious cemetery" +msgstr "" + #: lang/json/overmap_terrain_from_json.py msgid "restaurant" msgstr "餐廳" @@ -67227,11 +67419,11 @@ msgstr "人孔蓋" #: lang/json/overmap_terrain_from_json.py msgid "roadside foodcart" -msgstr "" +msgstr "路邊攤" #: lang/json/overmap_terrain_from_json.py msgid "roadstop" -msgstr "" +msgstr "路邊小吃店" #: lang/json/overmap_terrain_from_json.py msgid "ruined cabin" @@ -67263,11 +67455,11 @@ msgstr "下水道？" #: lang/json/overmap_terrain_from_json.py msgid "shipwreck" -msgstr "" +msgstr "海難" #: lang/json/overmap_terrain_from_json.py msgid "silo" -msgstr "" +msgstr "穀倉" #: lang/json/overmap_terrain_from_json.py msgid "slime pit" @@ -67347,7 +67539,7 @@ msgstr "地下寺廟" #: lang/json/overmap_terrain_from_json.py msgid "veterinarian clinic" -msgstr "" +msgstr "獸醫診所" #: lang/json/overmap_terrain_from_json.py msgid "wildlife field office" @@ -67810,6 +68002,8 @@ msgid "" "is winter, and you hope your guns and the skills you have acquired can help " "you survive." msgstr "" +"在災變開始之時，你便躲進了防空避難所之中。冬日到來，希望你從書上學到的那些技" +"能足夠幫助你生存。" #. ~ Profession (male Sheltered Militia) description #: lang/json/professions_from_json.py @@ -67819,6 +68013,8 @@ msgid "" "is winter, and you hope your guns and the skills you have acquired can help " "you survive." msgstr "" +"在災變開始之時，你便躲進了防空避難所之中。冬日到來，希望你從書上學到的那些技" +"能足夠幫助你生存。" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -68085,12 +68281,12 @@ msgstr "弓獵人" #: lang/json/professions_from_json.py msgctxt "profession_female" msgid "Brave of the King" -msgstr "" +msgstr "國王的勇士" #: lang/json/professions_from_json.py msgctxt "profession_male" msgid "Brave of the King" -msgstr "" +msgstr "國王的勇士" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -68151,12 +68347,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" msgid "Camper" -msgstr "" +msgstr "露營者" #: lang/json/professions_from_json.py msgctxt "profession_male" msgid "Camper" -msgstr "" +msgstr "露營者" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -69052,7 +69248,7 @@ msgstr "商城保全" #: lang/json/professions_from_json.py msgctxt "profession_male" msgid "Man-at-Arms" -msgstr "" +msgstr "重裝士兵" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -69077,12 +69273,12 @@ msgstr "駐院醫師" #: lang/json/professions_from_json.py msgctxt "profession_female" msgid "Military Holdout" -msgstr "" +msgstr "不屈軍人" #: lang/json/professions_from_json.py msgctxt "profession_male" msgid "Military Holdout" -msgstr "" +msgstr "不屈軍人" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -69604,12 +69800,12 @@ msgstr "你是一名武僧，奉守著苦行的紀律，對赤手搏鬥具有廣 #: lang/json/professions_from_json.py msgctxt "profession_female" msgid "Sheltered Militia" -msgstr "" +msgstr "民兵避難所" #: lang/json/professions_from_json.py msgctxt "profession_male" msgid "Sheltered Militia" -msgstr "" +msgstr "民兵避難所" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -69854,22 +70050,18 @@ msgstr "老師" msgctxt "prof_desc_female" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"感謝妳花在實驗室的時間，妳對一些基本的科學原理相當熟悉。妳跟一些平民幸運的逃" -"脫，還帶了一些實驗室的裝備。" #. ~ Profession (male Lab Technician) description #: lang/json/professions_from_json.py msgctxt "prof_desc_male" msgid "" "Thanks to your time in the lab, you're familiar with the basics of " -"conducting science. You escaped along with the lucky civilians, but at " -"least you kept your lab gear." +"conducting science. Now that the world has ended, only one question " +"remains: Can you undo the very Cataclysm you helped create?" msgstr "" -"感謝你花在實驗室的時間，你對一些基本的科學原理相當熟悉。你跟一些平民幸運的逃" -"脫，還帶了一些實驗室的裝備。" #. ~ Profession (Punk Rock Girl) description #: lang/json/professions_from_json.py @@ -69987,6 +70179,8 @@ msgid "" "born or of common blood. While knights traditionally were men-at-arms, not " "every man-at-arms was a knight." msgstr "" +"歐洲各國的中世紀重騎兵，無論是否為貴族出生。雖然騎士傳統上都是重裝士兵，但不" +"是每個重裝士兵都是騎士。" #. ~ Profession (Man-at-Arms) description #: lang/json/professions_from_json.py @@ -69996,6 +70190,8 @@ msgid "" "born or of common blood. While knights traditionally were men-at-arms, not " "every man-at-arms was a knight." msgstr "" +"歐洲各國的中世紀重騎兵，無論是否為貴族出生。雖然騎士傳統上都是重裝士兵，但不" +"是每個重裝士兵都是騎士。" #. ~ Profession (female Bionic Assassin) description #: lang/json/professions_from_json.py @@ -70070,12 +70266,12 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_male" msgid "Traceur" -msgstr "" +msgstr "跑酷專家" #: lang/json/professions_from_json.py msgctxt "profession_female" msgid "Traceuse" -msgstr "" +msgstr "女跑酷專家" #: lang/json/professions_from_json.py msgctxt "profession_female" @@ -70140,12 +70336,12 @@ msgstr "自願突變者-男性" #: lang/json/professions_from_json.py msgctxt "profession_female" msgid "Wanderer" -msgstr "" +msgstr "流浪者" #: lang/json/professions_from_json.py msgctxt "profession_male" msgid "Wanderer" -msgstr "" +msgstr "流浪者" #. ~ Profession (female Samurai) description #: lang/json/professions_from_json.py @@ -70154,6 +70350,7 @@ msgid "" "Warrior nobility of feudal Japan. Known originally as masters of the horse " "and bow, they become famous for their swordsmanship in later eras." msgstr "" +"日本封建時代的武士貴族。初期的武士是馬術和弓術大師，到了後來以劍術聞名於世。" #. ~ Profession (male Samurai) description #: lang/json/professions_from_json.py @@ -70162,6 +70359,7 @@ msgid "" "Warrior nobility of feudal Japan. Known originally as masters of the horse " "and bow, they become famous for their swordsmanship in later eras." msgstr "" +"日本封建時代的武士貴族。初期的武士是馬術和弓術大師，到了後來以劍術聞名於世。" #. ~ Profession (female Churl) description #: lang/json/professions_from_json.py @@ -70284,7 +70482,7 @@ msgstr "" #: lang/json/professions_from_json.py msgctxt "profession_female" msgid "Woman-at-Arms" -msgstr "" +msgstr "女性重裝士兵" #. ~ Profession (female Camper) description #: lang/json/professions_from_json.py @@ -70295,6 +70493,8 @@ msgid "" "sounded. The world may be ruined, but you're prepared to make a home " "wherever you may find yourself." msgstr "" +"在這一切土崩瓦解前，你總是喜歡在荒野遠足和露營。無腦者搶你的包並在警報器響起" +"時逃跑。世界可能毀了，但你準備建立家園，無論如何你可能會找到自我。" #. ~ Profession (male Camper) description #: lang/json/professions_from_json.py @@ -70305,6 +70505,8 @@ msgid "" "sounded. The world may be ruined, but you're prepared to make a home " "wherever you may find yourself." msgstr "" +"在這一切土崩瓦解前，你總是喜歡在荒野遠足和露營。無腦者搶你的包並在警報器響起" +"時逃跑。世界可能毀了，但你準備建立家園，無論如何你可能會找到自我。" #. ~ Profession (female Commercial Cyborg) description #: lang/json/professions_from_json.py @@ -70338,6 +70540,8 @@ msgid "" "of modern life. Though from the looks of it, things have changed since last " "time you've been anywhere near civilization." msgstr "" +"你總是喜歡開闊天空的舒適，遠離現代生活的複雜性。從你最後接觸文明的時候看來，" +"現在所有事情已經改變了。" #. ~ Profession (male Wanderer) description #: lang/json/professions_from_json.py @@ -70347,6 +70551,8 @@ msgid "" "of modern life. Though from the looks of it, things have changed since last " "time you've been anywhere near civilization." msgstr "" +"你總是喜歡開闊天空的舒適，遠離現代生活的複雜性。從你最後接觸文明的時候看來，" +"現在所有事情已經改變了。" #. ~ Profession (female Bionic Soldier) description #: lang/json/professions_from_json.py @@ -70617,6 +70823,8 @@ msgid "" "command and find yourself in this predicament. The only mission left now is " "to survive." msgstr "" +"你一定很注重在新兵訓練營的生存訓練，否則你就不會活得比指揮鏈還要長久，並發現" +"自己處於這種困境。現在剩下的唯一任務就是生存。" #. ~ Profession (male Military Holdout) description #: lang/json/professions_from_json.py @@ -70627,6 +70835,8 @@ msgid "" "command and find yourself in this predicament. The only mission left now is " "to survive." msgstr "" +"你一定很注重在新兵訓練營的生存訓練，否則你就不會活得比指揮鏈還要長久，並發現" +"自己處於這種困境。現在剩下的唯一任務就是生存。" #. ~ Profession (female Juvenile Delinquent) description #: lang/json/professions_from_json.py @@ -70770,6 +70980,8 @@ msgid "" "life. Despite the tutelage of a master alchemist, you never got any closer " "to finishing the great work." msgstr "" +"你在一個學院內，尋找著不死靈藥的做法。看來，你現在有了最完美且最接近的鍊金術" +"成品可以給你參考了。" #. ~ Profession (male Alchemist) description #: lang/json/professions_from_json.py @@ -70779,6 +70991,8 @@ msgid "" "life. Despite the tutelage of a master alchemist, you never got any closer " "to finishing the great work." msgstr "" +"你在一個學院內，尋找著不死靈藥的做法。看來，你現在有了最完美且最接近的鍊金術" +"成品可以給你參考了。" #. ~ Profession (female Burglar) description #: lang/json/professions_from_json.py @@ -71507,6 +71721,8 @@ msgid "" "You're a miner, not a minor! Your canteen is dry, your jackhammer is out of " "gas, and you're on your last pair of batteries for your mining helmet..." msgstr "" +"你是個礦工，不是小人物! 你的水壺沒水了、你的手持式鑿岩機沒油了，而你將最後一" +"組電池放入你的採礦帽裡..." #. ~ Profession (male Miner) description #: lang/json/professions_from_json.py @@ -71515,6 +71731,8 @@ msgid "" "You're a miner, not a minor! Your canteen is dry, your jackhammer is out of " "gas, and you're on your last pair of batteries for your mining helmet..." msgstr "" +"你是個礦工，不是小人物! 你的水壺沒水了、你的手持式鑿岩機沒油了，而你將最後一" +"組電池放入你的採礦帽裡..." #. ~ Profession (female Elementary Student) description #: lang/json/professions_from_json.py @@ -71614,6 +71832,8 @@ msgid "" "playground. It wouldn't be a lie to say that running is your life. Which " "is good, because now that the end has come, you're running for your life." msgstr "" +"你已練習跑酷許多年，這世界已是你的遊樂場。說跑步是你的生命一點也不為過。這是" +"好事，因為末日已經來臨，你開始為你的生命奔跑。" #. ~ Profession (Traceur) description #: lang/json/professions_from_json.py @@ -71623,6 +71843,8 @@ msgid "" "playground. It wouldn't be a lie to say that running is your life. Which " "is good, because now that the end has come, you're running for your life." msgstr "" +"你已練習跑酷許多年，這世界已是你的遊樂場。說跑步是你的生命一點也不為過。這是" +"好事，因為末日已經來臨，你開始為你的生命奔跑。" #. ~ Profession (female Backpacker) description #: lang/json/professions_from_json.py @@ -71951,68 +72173,68 @@ msgstr "彈藥" #. ~ Crafting recipes subcategory of 'ARMOR' category #: lang/json/recipe_category_from_json.py msgid "ARMS" -msgstr "" +msgstr "手臂" #. ~ Crafting recipes subcategory of 'AMMO' category #: lang/json/recipe_category_from_json.py msgid "ARROWS" -msgstr "" +msgstr "箭矢" #. ~ Crafting recipes subcategory of 'WEAPON' category #: lang/json/recipe_category_from_json.py msgid "BASHING" -msgstr "" +msgstr "鈍擊" #. ~ Crafting recipes subcategory of 'FOOD' category #: lang/json/recipe_category_from_json.py msgid "BREAD" -msgstr "" +msgstr "麵包" #. ~ Crafting recipes subcategory of 'FOOD' category #: lang/json/recipe_category_from_json.py msgid "BREW" -msgstr "" +msgstr "釀造" #. ~ Crafting recipes subcategory of 'AMMO' category #: lang/json/recipe_category_from_json.py msgid "BULLETS" -msgstr "" +msgstr "子彈" #. ~ Crafting recipes subcategory of 'ELECTRONIC' category #: lang/json/recipe_category_from_json.py msgid "CBMS" -msgstr "" +msgstr "生化插件" #. ~ Crafting recipes category name #: lang/json/recipe_category_from_json.py msgid "CHEM" -msgstr "" +msgstr "化學" #. ~ Crafting recipes subcategory of 'CHEM' category #: lang/json/recipe_category_from_json.py msgid "CHEMICALS" -msgstr "" +msgstr "化學製品" #. ~ Crafting recipes subcategory of 'AMMO' category #. ~ Crafting recipes subcategory of 'ELECTRONIC' category #: lang/json/recipe_category_from_json.py msgid "COMPONENTS" -msgstr "" +msgstr "元件" #. ~ Crafting recipes subcategory of 'OTHER' category #: lang/json/recipe_category_from_json.py msgid "CONTAINERS" -msgstr "" +msgstr "容器" #. ~ Crafting recipes subcategory of 'WEAPON' category #: lang/json/recipe_category_from_json.py msgid "CUTTING" -msgstr "" +msgstr "砍劈" #. ~ Crafting recipes subcategory of 'FOOD' category #: lang/json/recipe_category_from_json.py msgid "DRINKS" -msgstr "" +msgstr "飲料" #. ~ Crafting recipes subcategory of 'CHEM' category #: lang/json/recipe_category_from_json.py src/item_factory.cpp @@ -72022,22 +72244,22 @@ msgstr "藥物" #. ~ Crafting recipes subcategory of 'FOOD' category #: lang/json/recipe_category_from_json.py msgid "DRY" -msgstr "" +msgstr "脫水" #. ~ Crafting recipes category name #: lang/json/recipe_category_from_json.py msgid "ELECTRONIC" -msgstr "" +msgstr "電子" #. ~ Crafting recipes subcategory of 'WEAPON' category #: lang/json/recipe_category_from_json.py msgid "EXPLOSIVE" -msgstr "" +msgstr "爆裂" #. ~ Crafting recipes subcategory of 'ARMOR' category #: lang/json/recipe_category_from_json.py msgid "FEET" -msgstr "" +msgstr "腳掌" #. ~ Crafting recipes category name #: lang/json/recipe_category_from_json.py src/item_factory.cpp @@ -72047,12 +72269,12 @@ msgstr "食物" #. ~ Crafting recipes subcategory of 'CHEM' category #: lang/json/recipe_category_from_json.py msgid "FUEL" -msgstr "" +msgstr "燃料" #. ~ Crafting recipes subcategory of 'ARMOR' category #: lang/json/recipe_category_from_json.py msgid "HANDS" -msgstr "" +msgstr "手掌" #. ~ Crafting recipes subcategory of 'ARMOR' category #: lang/json/recipe_category_from_json.py src/game.cpp @@ -72062,27 +72284,27 @@ msgstr "頭部" #. ~ Crafting recipes subcategory of 'ARMOR' category #: lang/json/recipe_category_from_json.py msgid "LEGS" -msgstr "" +msgstr "腿部" #. ~ Crafting recipes subcategory of 'ELECTRONIC' category #: lang/json/recipe_category_from_json.py msgid "LIGHTING" -msgstr "" +msgstr "燈具" #. ~ Crafting recipes subcategory of 'OTHER' category #: lang/json/recipe_category_from_json.py msgid "MATERIALS" -msgstr "" +msgstr "材料" #. ~ Crafting recipes subcategory of 'FOOD' category #: lang/json/recipe_category_from_json.py msgid "MEAT" -msgstr "" +msgstr "肉類" #. ~ Crafting recipes subcategory of 'OTHER' category #: lang/json/recipe_category_from_json.py msgid "MEDICAL" -msgstr "" +msgstr "醫藥" #. ~ Crafting recipes subcategory of 'WEAPON' category #: lang/json/recipe_category_from_json.py src/item_factory.cpp @@ -72110,37 +72332,37 @@ msgstr "其他" #. ~ Crafting recipes subcategory of 'OTHER' category #: lang/json/recipe_category_from_json.py msgid "PARTS" -msgstr "" +msgstr "零件" #. ~ Crafting recipes subcategory of 'FOOD' category #: lang/json/recipe_category_from_json.py msgid "PASTA" -msgstr "" +msgstr "麵食" #. ~ Crafting recipes subcategory of 'WEAPON' category #: lang/json/recipe_category_from_json.py msgid "PIERCING" -msgstr "" +msgstr "穿刺" #. ~ Crafting recipes subcategory of 'WEAPON' category #: lang/json/recipe_category_from_json.py msgid "RANGED" -msgstr "" +msgstr "遠程" #. ~ Crafting recipes subcategory of 'FOOD' category #: lang/json/recipe_category_from_json.py msgid "SNACK" -msgstr "" +msgstr "零食" #. ~ Crafting recipes subcategory of 'ARMOR' category #: lang/json/recipe_category_from_json.py msgid "STORAGE" -msgstr "" +msgstr "儲物" #. ~ Crafting recipes subcategory of 'ARMOR' category #: lang/json/recipe_category_from_json.py msgid "SUIT" -msgstr "" +msgstr "裝束" #. ~ Crafting recipes subcategory of 'ELECTRONIC' category #. ~ Crafting recipes subcategory of 'OTHER' category @@ -72156,12 +72378,12 @@ msgstr "軀幹" #. ~ Crafting recipes subcategory of 'OTHER' category #: lang/json/recipe_category_from_json.py msgid "TRAPS" -msgstr "" +msgstr "陷阱" #. ~ Crafting recipes subcategory of 'FOOD' category #: lang/json/recipe_category_from_json.py msgid "VEGGI" -msgstr "" +msgstr "蔬菜" #. ~ Crafting recipes subcategory of 'OTHER' category #: lang/json/recipe_category_from_json.py src/inventory_ui.cpp @@ -72171,17 +72393,17 @@ msgstr "車輛" #. ~ Crafting recipes category name #: lang/json/recipe_category_from_json.py msgid "WEAPON" -msgstr "" +msgstr "武器" #: lang/json/recipe_from_json.py msgid "Stuff THE MAN doesn't want you to know" -msgstr "" +msgstr "\"祂\"不想讓你知道的東西" #. ~ Starting location for scenario 'Ambush'. #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "Abandoned Cabin" -msgstr "" +msgstr "廢棄的小屋" #. ~ Description for scenario 'The Last Firefighter' for a female character. #: lang/json/scenario_from_json.py @@ -72190,7 +72412,7 @@ msgid "" "Against all odds, you managed to make it back to the station house in one " "piece. Now the reanimated husks of your former comrades want to make sure " "you never leave it again." -msgstr "" +msgstr "克服萬難，你總算安全回到局裡。現在，你的前同事們要讓你永遠離不開。" #. ~ Description for scenario 'The Last Firefighter' for a male character. #: lang/json/scenario_from_json.py @@ -72199,19 +72421,19 @@ msgid "" "Against all odds, you managed to make it back to the station house in one " "piece. Now the reanimated husks of your former comrades want to make sure " "you never leave it again." -msgstr "" +msgstr "克服萬難，你總算安全回到局裡。現在，你的前同事們要讓你永遠離不開。" #. ~ Name for scenario 'Ambush' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Ambush" -msgstr "" +msgstr "十面埋伏" #. ~ Name for scenario 'Ambush' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Ambush" -msgstr "" +msgstr "十面埋伏" #. ~ Starting location for scenario 'Infected'. #. ~ Starting location for scenario 'Burning Building'. @@ -72219,151 +72441,151 @@ msgstr "" #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "Anywhere" -msgstr "" +msgstr "任何地方" #. ~ Starting location for scenario 'Seeker of the Arcane'. #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "Arcanist Enclave" -msgstr "" +msgstr "奧術師領地" #. ~ Name for scenario 'Assault on Precinct Z' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Assault on Precinct Z" -msgstr "" +msgstr "殲滅Z分局" #. ~ Name for scenario 'Assault on Precinct Z' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Assault on Precinct Z" -msgstr "" +msgstr "殲滅Z分局" #. ~ Name for scenario 'Bottom of a Mine' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Bottom of a Mine" -msgstr "" +msgstr "礦坑底層" #. ~ Name for scenario 'Bottom of a Mine' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Bottom of a Mine" -msgstr "" +msgstr "礦坑底層" #. ~ Starting location for scenario 'Bottom of a Mine'. #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "Bottom of a mine" -msgstr "" +msgstr "礦坑底層" #. ~ Name for scenario 'Burning Building' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Burning Building" -msgstr "" +msgstr "火燒厝" #. ~ Name for scenario 'Burning Building' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Burning Building" -msgstr "" +msgstr "火燒厝" #. ~ Name for scenario 'Challenge-Abandoned' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Challenge-Abandoned" -msgstr "" +msgstr "挑戰－被遺棄" #. ~ Name for scenario 'Challenge-Abandoned' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Challenge-Abandoned" -msgstr "" +msgstr "挑戰－被遺棄" #. ~ Name for scenario 'Challenge-Lab' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Challenge-Lab" -msgstr "" +msgstr "挑戰－實驗室" #. ~ Name for scenario 'Challenge-Lab' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Challenge-Lab" -msgstr "" +msgstr "挑戰－實驗室" #. ~ Name for scenario 'Challenge-Medieval Peasant' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Challenge-Medieval Peasant" -msgstr "" +msgstr "挑戰－中世紀農民" #. ~ Name for scenario 'Challenge-Medieval Peasant' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Challenge-Medieval Peasant" -msgstr "" +msgstr "挑戰－中世紀農民" #. ~ Name for scenario 'Challenge-Really Bad Day' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Challenge-Really Bad Day" -msgstr "" +msgstr "挑戰－衰尾道人" #. ~ Name for scenario 'Challenge-Really Bad Day' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Challenge-Really Bad Day" -msgstr "" +msgstr "挑戰－衰尾道人" #. ~ Starting location for scenario 'Helicopter Crash'. #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "Crash site" -msgstr "" +msgstr "墜機地點" #. ~ Starting location for scenario 'Sheltered'. #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "Enclosed Shelter" -msgstr "" +msgstr "封閉的避難所" #. ~ Starting location for scenario 'Evacuee'. #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "Evac Shelter" -msgstr "" +msgstr "避難所" #. ~ Name for scenario 'Evacuee' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Evacuee" -msgstr "" +msgstr "撤離者" #. ~ Name for scenario 'Evacuee' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Evacuee" -msgstr "" +msgstr "撤離者" #. ~ Name for scenario 'Experiment' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Experiment" -msgstr "" +msgstr "實驗" #. ~ Name for scenario 'Experiment' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Experiment" -msgstr "" +msgstr "實驗" #. ~ Starting location for scenario 'The Last Firefighter'. #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "Fire Station" -msgstr "" +msgstr "消防局" #. ~ Starting location for scenario 'Challenge-Medieval Peasant'. #. ~ Starting location for scenario 'Experiment'. @@ -72371,31 +72593,31 @@ msgstr "" #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "Forest" -msgstr "" +msgstr "森林" #. ~ Name for scenario 'Helicopter Crash' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Helicopter Crash" -msgstr "" +msgstr "直升機墜毀" #. ~ Name for scenario 'Helicopter Crash' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Helicopter Crash" -msgstr "" +msgstr "直升機墜毀" #. ~ Starting location for scenario 'Challenge-Abandoned'. #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "Hospital" -msgstr "" +msgstr "醫院" #. ~ Starting location for scenario 'Missed'. #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "In Town" -msgstr "" +msgstr "在鎮上" #. ~ Description for scenario 'Infected' for a female character. #: lang/json/scenario_from_json.py @@ -72404,6 +72626,8 @@ msgid "" "In the chaos and panic of evacuation, you got bitten by something! You " "didn't get proper medical care, and now the wound has started turning green." msgstr "" +"在撤離行動的慌亂之中，你被某個東西咬到了！你沒有做好醫療處置，傷口開始感染變" +"綠。" #. ~ Description for scenario 'Infected' for a male character. #: lang/json/scenario_from_json.py @@ -72412,18 +72636,20 @@ msgid "" "In the chaos and panic of evacuation, you got bitten by something! You " "didn't get proper medical care, and now the wound has started turning green." msgstr "" +"在撤離行動的慌亂之中，你被某個東西咬到了！你沒有做好醫療處置，傷口開始感染變" +"綠。" #. ~ Name for scenario 'Infected' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Infected" -msgstr "" +msgstr "感染" #. ~ Name for scenario 'Infected' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Infected" -msgstr "" +msgstr "感染" #. ~ Description for scenario 'Ambush' for a female character. #: lang/json/scenario_from_json.py @@ -72433,6 +72659,8 @@ msgid "" "cabin for the night. The next morning, you awoke to the sound of lots of " "movement in the woods." msgstr "" +"現在是冬季的午夜，寒冷和疲倦的你躲到一個小屋過夜。隔天早上，你被樹林中的動靜" +"所驚醒。" #. ~ Description for scenario 'Ambush' for a male character. #: lang/json/scenario_from_json.py @@ -72442,108 +72670,110 @@ msgid "" "cabin for the night. The next morning, you awoke to the sound of lots of " "movement in the woods." msgstr "" +"現在是冬季的午夜，寒冷和疲倦的你躲到一個小屋過夜。隔天早上，你被樹林中的動靜" +"所驚醒。" #. ~ Starting location for scenario 'Challenge-Lab'. #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "Locked Lab" -msgstr "" +msgstr "上鎖的實驗室" #. ~ Starting location for scenario 'Mall Cop'. #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "Mall" -msgstr "" +msgstr "購物中心" #. ~ Name for scenario 'Mall Cop' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Mall Cop" -msgstr "" +msgstr "百貨戰警" #. ~ Name for scenario 'Mall Cop' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Mall Cop" -msgstr "" +msgstr "百貨戰警" #. ~ Name for scenario 'Missed' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Missed" -msgstr "" +msgstr "錯失先機" #. ~ Name for scenario 'Missed' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Missed" -msgstr "" +msgstr "錯失先機" #. ~ Starting location for scenario 'Assault on Precinct Z'. #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "Police Station" -msgstr "" +msgstr "警察局" #. ~ Starting location for scenario 'Prison Break'. #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "Prison" -msgstr "" +msgstr "監獄" #. ~ Name for scenario 'Prison Break' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Prison Break" -msgstr "" +msgstr "越獄" #. ~ Name for scenario 'Prison Break' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Prison Break" -msgstr "" +msgstr "越獄" #. ~ Name for scenario 'School' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "School" -msgstr "" +msgstr "學校" #. ~ Name for scenario 'School' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "School" -msgstr "" +msgstr "學校" #. ~ Starting location for scenario 'School'. #: lang/json/scenario_from_json.py msgctxt "start_name" msgid "School" -msgstr "" +msgstr "學校" #. ~ Name for scenario 'Seeker of the Arcane' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Seeker of the Arcane" -msgstr "" +msgstr "奧術的探索者" #. ~ Name for scenario 'Seeker of the Arcane' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Seeker of the Arcane" -msgstr "" +msgstr "奧術的探索者" #. ~ Name for scenario 'Sheltered' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Sheltered" -msgstr "" +msgstr "曾經被庇護的" #. ~ Name for scenario 'Sheltered' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Sheltered" -msgstr "" +msgstr "曾經被庇護的" #. ~ Description for scenario 'Challenge-Abandoned' for a female character. #: lang/json/scenario_from_json.py @@ -72553,6 +72783,8 @@ msgid "" "the hospital. When yours was evacuated, you were left behind because you " "were a lost cause. You awaken to the sound of movement around the hospital." msgstr "" +"你在醫院裡度過大部分的人生，因為你自幼體弱多病。當進行疏散時，因為你是拖油" +"瓶，所以被拋棄了。你被醫院中的動靜所驚醒。" #. ~ Description for scenario 'Challenge-Abandoned' for a male character. #: lang/json/scenario_from_json.py @@ -72562,6 +72794,8 @@ msgid "" "the hospital. When yours was evacuated, you were left behind because you " "were a lost cause. You awaken to the sound of movement around the hospital." msgstr "" +"你在醫院裡度過大部分的人生，因為你自幼體弱多病。當進行疏散時，因為你是拖油" +"瓶，所以被拋棄了。你被醫院中的動靜所驚醒。" #. ~ Description for scenario 'Experiment' for a female character. #: lang/json/scenario_from_json.py @@ -72571,6 +72805,8 @@ msgid "" "science, willingly or not. Once the cataclysm struck, you left the lab, and " "wandered aimlessly, ending up in a forest." msgstr "" +"自你出世以來，你的用途就是用來進行基因科學的實驗，不管你願不願意。當災變爆" +"發，你離開了實驗室，漫無目的的在森林遊蕩。" #. ~ Description for scenario 'Experiment' for a male character. #: lang/json/scenario_from_json.py @@ -72580,6 +72816,8 @@ msgid "" "science, willingly or not. Once the cataclysm struck, you left the lab, and " "wandered aimlessly, ending up in a forest." msgstr "" +"自你出世以來，你的用途就是用來進行基因科學的實驗，不管你願不願意。當災變爆" +"發，你離開了實驗室，漫無目的的在森林遊蕩。" #. ~ Description for scenario 'Challenge-Medieval Peasant' for a female character. #: lang/json/scenario_from_json.py @@ -72601,13 +72839,13 @@ msgstr "" #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "The Last Firefighter" -msgstr "" +msgstr "最後消防員" #. ~ Name for scenario 'The Last Firefighter' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "The Last Firefighter" -msgstr "" +msgstr "最後消防員" #. ~ Description for scenario 'Burning Building' for a female character. #: lang/json/scenario_from_json.py @@ -72615,7 +72853,7 @@ msgctxt "scen_desc_female" msgid "" "The building you had chosen to reside in has suddenly caught fire! You " "might want to leave." -msgstr "" +msgstr "你正決定要在這個建築定居的時候就突然失火了！你最好快逃吧。" #. ~ Description for scenario 'Burning Building' for a male character. #: lang/json/scenario_from_json.py @@ -72623,7 +72861,7 @@ msgctxt "scen_desc_male" msgid "" "The building you had chosen to reside in has suddenly caught fire! You " "might want to leave." -msgstr "" +msgstr "你正決定要在這個建築定居的時候就突然失火了！你最好快逃吧。" #. ~ Description for scenario 'Sheltered' for a female character. #: lang/json/scenario_from_json.py @@ -72634,6 +72872,8 @@ msgid "" "hurt you. Supplies are running low, and for the first time since the " "cataclysm, you will be forced to face the outside world." msgstr "" +"在末日災情爆發時，你躲到一個附近的避難所。你在這裡生活，從未離開過，與世隔" +"絕。隨著補給減少，你不得不被迫到外面的世界。" #. ~ Description for scenario 'Sheltered' for a male character. #: lang/json/scenario_from_json.py @@ -72644,6 +72884,8 @@ msgid "" "hurt you. Supplies are running low, and for the first time since the " "cataclysm, you will be forced to face the outside world." msgstr "" +"在末日災情爆發時，你躲到一個附近的避難所。你在這裡生活，從未離開過，與世隔" +"絕。隨著補給減少，你不得不被迫到外面的世界。" #. ~ Description for scenario 'Missed' for a female character. #: lang/json/scenario_from_json.py @@ -72652,6 +72894,8 @@ msgid "" "Whether due to stubbornness, ignorance, or just plain bad luck, you missed " "the evacuation, and are stuck in a city full of the risen dead." msgstr "" +"不論是固執、無知、或只是運氣不好的原因，你就是錯過了疏散行動，並困在一個滿是" +"活死人的城市。" #. ~ Description for scenario 'Missed' for a male character. #: lang/json/scenario_from_json.py @@ -72660,18 +72904,20 @@ msgid "" "Whether due to stubbornness, ignorance, or just plain bad luck, you missed " "the evacuation, and are stuck in a city full of the risen dead." msgstr "" +"不論是固執、無知、或只是運氣不好的原因，你就是錯過了疏散行動，並困在一個滿是" +"活死人的城市。" #. ~ Name for scenario 'Wilderness' for a female character #: lang/json/scenario_from_json.py msgctxt "scenario_female" msgid "Wilderness" -msgstr "" +msgstr "荒野" #. ~ Name for scenario 'Wilderness' for a male character #: lang/json/scenario_from_json.py msgctxt "scenario_male" msgid "Wilderness" -msgstr "" +msgstr "荒野" #. ~ Description for scenario 'Wilderness' for a female character. #: lang/json/scenario_from_json.py @@ -72680,6 +72926,8 @@ msgid "" "You find yourself amongst trees. The screaming and the moaning is fainter " "this far from civilization, but you'd better know what you're doing out here." msgstr "" +"你發現你身處在樹林之間。在這遠離文明之地，那些尖叫與呻吟聲似乎都與你無關，但" +"你最好知道你是為了做什麼而來到這裡。" #. ~ Description for scenario 'Wilderness' for a male character. #: lang/json/scenario_from_json.py @@ -72688,6 +72936,8 @@ msgid "" "You find yourself amongst trees. The screaming and the moaning is fainter " "this far from civilization, but you'd better know what you're doing out here." msgstr "" +"你發現你身處在樹林之間。在這遠離文明之地，那些尖叫與呻吟聲似乎都與你無關，但" +"你最好知道你是為了做什麼而來到這裡。" #. ~ Description for scenario 'Evacuee' for a female character. #: lang/json/scenario_from_json.py @@ -72695,7 +72945,7 @@ msgctxt "scen_desc_female" msgid "" "You have survived the initial wave of panic, and have achieved (relative) " "safety in one of the many government evac shelters." -msgstr "" +msgstr "你在疫情爆發之初存活，並且在其中一所（相對）安全的政府避難所生活。" #. ~ Description for scenario 'Evacuee' for a male character. #: lang/json/scenario_from_json.py @@ -72703,7 +72953,7 @@ msgctxt "scen_desc_male" msgid "" "You have survived the initial wave of panic, and have achieved (relative) " "safety in one of the many government evac shelters." -msgstr "" +msgstr "你在疫情爆發之初存活，並且在其中一所（相對）安全的政府避難所生活。" #. ~ Description for scenario 'Assault on Precinct Z' for a female character. #: lang/json/scenario_from_json.py @@ -72713,6 +72963,7 @@ msgid "" "getting eaten by a perp before you even had coffee. The scene back at the " "station house looks bad, real bad. This is going to be an all-nighter." msgstr "" +"你才正準備喝口咖啡時，夥伴就被嫌犯吃了。這狀況看起來真糟，看來沒得睡了。" #. ~ Description for scenario 'Assault on Precinct Z' for a male character. #: lang/json/scenario_from_json.py @@ -72722,6 +72973,7 @@ msgid "" "getting eaten by a perp before you even had coffee. The scene back at the " "station house looks bad, real bad. This is going to be an all-nighter." msgstr "" +"你才正準備喝口咖啡時，夥伴就被嫌犯吃了。這狀況看起來真糟，看來沒得睡了。" #. ~ Description for scenario 'Challenge-Really Bad Day' for a female character. #: lang/json/scenario_from_json.py @@ -72730,7 +72982,7 @@ msgid "" "You start drunk to the point of incapacitation, depressed, infected, " "surrounded by fire, naked, and sick with the flu. This day went downhill " "really fast." -msgstr "" +msgstr "你開始時酒醉、沮喪、感染、被火包圍、全裸並且感冒。今天真不好過。" #. ~ Description for scenario 'Challenge-Really Bad Day' for a male character. #: lang/json/scenario_from_json.py @@ -72739,7 +72991,7 @@ msgid "" "You start drunk to the point of incapacitation, depressed, infected, " "surrounded by fire, naked, and sick with the flu. This day went downhill " "really fast." -msgstr "" +msgstr "你開始時酒醉、沮喪、感染、被火包圍、全裸並且感冒。今天真不好過。" #. ~ Description for scenario 'Prison Break' for a female character. #: lang/json/scenario_from_json.py @@ -72817,7 +73069,7 @@ msgctxt "scen_desc_female" msgid "" "You've been locked in a lab with no (obvious) way out! Find a way to escape " "or starve to death." -msgstr "" +msgstr "你被鎖在實驗室而且（看似）無路可逃！尋找逃生的路徑或是在裡面餓死。" #. ~ Description for scenario 'Challenge-Lab' for a male character. #: lang/json/scenario_from_json.py @@ -72825,7 +73077,7 @@ msgctxt "scen_desc_male" msgid "" "You've been locked in a lab with no (obvious) way out! Find a way to escape " "or starve to death." -msgstr "" +msgstr "你被鎖在實驗室而且（看似）無路可逃！尋找逃生的路徑或是在裡面餓死。" #. ~ Description for scenario 'Helicopter Crash' for a female character. #: lang/json/scenario_from_json.py @@ -72849,7 +73101,7 @@ msgctxt "scen_desc_female" msgid "" "You've survived for as long as you could inside of the mall you worked at as " "a security guard. Find a way out and try your best to survive." -msgstr "" +msgstr "你在百貨商城的警衛經驗讓你在商城裡存活許久。找到出路並盡力生存吧。" #. ~ Description for scenario 'Mall Cop' for a male character. #: lang/json/scenario_from_json.py @@ -72857,7 +73109,7 @@ msgctxt "scen_desc_male" msgid "" "You've survived for as long as you could inside of the mall you worked at as " "a security guard. Find a way out and try your best to survive." -msgstr "" +msgstr "你在百貨商城的警衛經驗讓你在商城裡存活許久。找到出路並盡力生存吧。" #. ~ Description for submachine guns #: lang/json/skill_from_json.py @@ -72897,7 +73149,7 @@ msgid "" "effectiveness and accuracy decline rapidly with range. Slugs can be loaded " "into shotguns to provide greater range, though they are somewhat inaccurate." msgstr "" -"散彈槍是操作簡單又能造成大量傷害的槍械，但是其有效性與準確度隨著距離大大下" +"霰彈槍是操作簡單又能造成大量傷害的槍械，但是其有效性與準確度隨著距離大大下" "降。可裝填單顆金屬彈頭來增加有效距離，但準確度不是太好。" #. ~ Description for dodging @@ -72990,6 +73242,8 @@ msgid "" "effectively. This skill does not affect the evasion of traps that are " "triggered." msgstr "" +"你能有效且安全地製造、安裝、找尋、拆卸陷阱的技巧。這個技巧不能夠讓你偵測到隱" +"藏的陷阱，或是躲避觸發的陷阱。" #. ~ Description for electronics #: lang/json/skill_from_json.py @@ -73138,7 +73392,7 @@ msgstr "" #: lang/json/skill_from_json.py msgid "arcana" -msgstr "" +msgstr "奧秘" #: lang/json/skill_from_json.py msgid "archery" @@ -73887,11 +74141,11 @@ msgstr ", " #: lang/json/snippet_from_json.py msgid " if I don't drink something." -msgstr "" +msgstr "如果我不喝點東西的話。" #: lang/json/snippet_from_json.py msgid " if I don't get some food." -msgstr "" +msgstr "如果我不吃點食物的話。" #: lang/json/snippet_from_json.py msgid " if we don't stop for a moment." @@ -74056,7 +74310,7 @@ msgstr "我們可以休息一下嗎，？" #: lang/json/snippet_from_json.py msgid "Can you give me something to drink, ?" -msgstr "" +msgstr "可以給我點喝的東西嗎，？" #: lang/json/snippet_from_json.py msgid "Catch up!" @@ -74091,7 +74345,7 @@ msgstr "來啦，跟我聊聊！" #: lang/json/snippet_from_json.py msgid "Consider this idea: you give me food and I eat it." -msgstr "" +msgstr "不如：你給我食物，而我把它吃光。" #: lang/json/snippet_from_json.py msgid "" @@ -74117,7 +74371,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "Did you know that lack of food kills faster than chain smoking?" -msgstr "" +msgstr "你知道缺乏飲食比經常抽菸死得更快嗎？" #: lang/json/snippet_from_json.py msgid "Did you know that lack of rest kills faster than lack of food?" @@ -74125,7 +74379,7 @@ msgstr "你能告訴我有關這個設施？" #: lang/json/snippet_from_json.py msgid "Did you know that lack of water kills faster than lack of rest?" -msgstr "" +msgstr "你知道缺水比缺乏休息死得更快嗎？" #: lang/json/snippet_from_json.py msgid "Drop the !" @@ -74408,11 +74662,11 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "I need to eat something." -msgstr "" +msgstr "我 需要吃點東西。" #: lang/json/snippet_from_json.py msgid "I need to get some water." -msgstr "" +msgstr "我 需要喝點水." #: lang/json/snippet_from_json.py msgid "I need to rest." @@ -74456,7 +74710,7 @@ msgstr "我獨自工作，。" #: lang/json/snippet_from_json.py msgid "I'd eat a burger if I had one." -msgstr "" +msgstr "如果我有漢堡的話我會吃掉。" #: lang/json/snippet_from_json.py msgid "I'll kill you" @@ -74480,11 +74734,11 @@ msgstr "我要殺了你" #: lang/json/snippet_from_json.py msgid "I'm hungry." -msgstr "" +msgstr "我 餓了." #: lang/json/snippet_from_json.py msgid "I'm thirsty." -msgstr "" +msgstr "我渴了。" #: lang/json/snippet_from_json.py msgid "I'm tired." @@ -74520,7 +74774,7 @@ msgstr "我就完蛋了" #: lang/json/snippet_from_json.py msgid "I'm hungry..." -msgstr "" +msgstr "我餓了..." #: lang/json/snippet_from_json.py msgid "I'm in serious trouble" @@ -74540,11 +74794,11 @@ msgstr "我要閃了！" #: lang/json/snippet_from_json.py msgid "I'm parched, I need to drink something." -msgstr "" +msgstr "我口乾舌燥，我需要喝的東西。" #: lang/json/snippet_from_json.py msgid "I'm thirsty..." -msgstr "" +msgstr "我渴了..." #: lang/json/snippet_from_json.py msgid "I'm tired..." @@ -74807,7 +75061,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "Perfect time for a lunch break." -msgstr "" +msgstr "午休的完美時機。" #: lang/json/snippet_from_json.py msgid "Put down the !" @@ -74975,7 +75229,7 @@ msgstr "再見啦，！" #: lang/json/snippet_from_json.py msgid "So, , when we eatin'?" -msgstr "" +msgstr "所以，，我們什麼時候吃飯？" #: lang/json/snippet_from_json.py msgid "Stay close!" @@ -75680,7 +75934,7 @@ msgstr "等等，我們談談！" #: lang/json/snippet_from_json.py msgid "Water... Is there an oasis nearby?" -msgstr "" +msgstr "水...附近是不是有個綠洲？" #: lang/json/snippet_from_json.py msgid "We want our old factory!" @@ -75700,19 +75954,19 @@ msgstr "怎麼了，？" #: lang/json/snippet_from_json.py msgid "When was the last time I had a drink?" -msgstr "" +msgstr "我多久沒喝東西了？" #: lang/json/snippet_from_json.py msgid "When we drinkin'?" -msgstr "" +msgstr "我們什麼時候喝東西？" #: lang/json/snippet_from_json.py msgid "When we eatin'?" -msgstr "" +msgstr "我們什麼時候吃飯？" #: lang/json/snippet_from_json.py msgid "When we sleepin'?" -msgstr "" +msgstr "我們什麼時候睡覺？" #: lang/json/snippet_from_json.py msgid "Where are you?!" @@ -77406,7 +77660,7 @@ msgstr "小屋" #: lang/json/start_location_from_json.py msgid "Curious Structure" -msgstr "" +msgstr "奇怪的結構" #: lang/json/start_location_from_json.py msgid "Deep-frozen science lab" @@ -77482,7 +77736,7 @@ msgstr "警察局" #: lang/json/start_location_from_json.py msgid "Prison" -msgstr "" +msgstr "監獄" #: lang/json/start_location_from_json.py msgid "School" @@ -77965,7 +78219,7 @@ msgstr " 對 %s 使出了完美的反攻刺" #: lang/json/technique_from_json.py #, python-format msgid " disarm %s using their whip!" -msgstr "" +msgstr " 用鞭子讓 %s 繳械了！" #: lang/json/technique_from_json.py #, python-format @@ -77975,7 +78229,7 @@ msgstr " 繳械了 %s" #: lang/json/technique_from_json.py #, python-format msgid " displaces and counters %s" -msgstr "" +msgstr " 移位並反擊 %s" #: lang/json/technique_from_json.py #, python-format @@ -78034,7 +78288,7 @@ msgstr " 下段攻擊讓 %s 倒在地上！" #: lang/json/technique_from_json.py #, python-format msgid " hack at %s with a vicious strike" -msgstr "" +msgstr " 用狠毒攻擊劈砍了 %s" #: lang/json/technique_from_json.py #, python-format @@ -78113,7 +78367,7 @@ msgstr " 使出鶴拳展翅！" #: lang/json/technique_from_json.py #, python-format msgid " phase-strikes %s" -msgstr "" +msgstr " 對 %s 發動 相位打擊!" #: lang/json/technique_from_json.py #, python-format @@ -78207,7 +78461,7 @@ msgstr " 滑走了！" #: lang/json/technique_from_json.py #, python-format msgid " slowly strikes %s" -msgstr "" +msgstr " 用滴水穿石的力量攻擊 %s" #: lang/json/technique_from_json.py #, python-format @@ -78322,7 +78576,7 @@ msgstr " 絆倒 %s" #: lang/json/technique_from_json.py #, python-format msgid " trips %s with a sweeping strike" -msgstr "" +msgstr " 的橫掃揮擊絆倒了 %s" #: lang/json/technique_from_json.py #, python-format @@ -78624,7 +78878,7 @@ msgstr "你毒蛇咬 %s" #: lang/json/technique_from_json.py #, python-format msgid "You Viper Strike %s!" -msgstr "" +msgstr "你對 %s 發動 毒蛇攻擊!" #: lang/json/technique_from_json.py #, python-format @@ -78704,7 +78958,7 @@ msgstr "你用鞭子讓 %s 繳械了！" #: lang/json/technique_from_json.py #, python-format msgid "You displace and counter %s" -msgstr "" +msgstr "你移位並反擊 %s" #: lang/json/technique_from_json.py #, python-format @@ -78759,7 +79013,7 @@ msgstr "你下段攻擊讓 %s 倒在地上！" #: lang/json/technique_from_json.py #, python-format msgid "You hack at %s with a vicious strike" -msgstr "" +msgstr "你用狠毒攻擊劈砍了 %s" #: lang/json/technique_from_json.py #, python-format @@ -78824,7 +79078,7 @@ msgstr "你格擋 %s" #: lang/json/technique_from_json.py #, python-format msgid "You phase-strike %s" -msgstr "" +msgstr "你對 %s 發動 相位打擊!" #: lang/json/technique_from_json.py #, python-format @@ -78927,7 +79181,7 @@ msgstr "你使出蛇形滑步！" #: lang/json/technique_from_json.py #, python-format msgid "You slowly strike %s" -msgstr "" +msgstr "你用滴水穿石的力量攻擊 %s" #: lang/json/technique_from_json.py #, python-format @@ -79041,7 +79295,7 @@ msgstr "你絆倒 %s" #: lang/json/technique_from_json.py #, python-format msgid "You trip %s with a sweeping strike" -msgstr "" +msgstr "你的橫掃揮擊絆倒了 %s" #: lang/json/technique_from_json.py #, python-format @@ -79103,7 +79357,7 @@ msgstr "繳械" #: lang/json/technique_from_json.py msgid "displace and counter" -msgstr "" +msgstr "移位並反擊" #: lang/json/technique_from_json.py msgid "dodge throw" @@ -79151,7 +79405,7 @@ msgstr "膝擊" #: lang/json/technique_from_json.py msgid "phasing strike" -msgstr "" +msgstr "相位打擊" #: lang/json/technique_from_json.py msgid "precise strike" @@ -79175,7 +79429,7 @@ msgstr "側踢" #: lang/json/technique_from_json.py msgid "slow strike" -msgstr "" +msgstr "滴水穿石的力量" #: lang/json/technique_from_json.py msgid "surprise attack" @@ -79187,7 +79441,7 @@ msgstr "掃踢" #: lang/json/technique_from_json.py msgid "sweeping strike" -msgstr "" +msgstr "橫掃揮擊" #: lang/json/technique_from_json.py msgid "throw" @@ -79195,7 +79449,7 @@ msgstr "投擲" #: lang/json/technique_from_json.py msgid "vicious strike" -msgstr "" +msgstr "狠毒攻擊" #: lang/json/technique_from_json.py msgid "wide strike" @@ -79215,7 +79469,7 @@ msgstr "化學氣相沉積機" #: lang/json/terrain_from_json.py msgid "Critical failure imminent, self destruct activated. Have a nice day!" -msgstr "" +msgstr "瀕臨嚴重故障，自毀裝置啟動。祝你有美好的一天！" #: lang/json/terrain_from_json.py msgid "HV oil circuit breaker" @@ -79375,7 +79629,7 @@ msgstr "花紋開關" #: lang/json/terrain_from_json.py msgid "chemical mixer" -msgstr "" +msgstr "化工攪拌機" #: lang/json/terrain_from_json.py msgid "cherry tree" @@ -79527,7 +79781,7 @@ msgstr "枯死的松子樹" #: lang/json/terrain_from_json.py msgid "dead tree" -msgstr "" +msgstr "枯死的樹" #: lang/json/terrain_from_json.py msgid "deep water" @@ -79555,7 +79809,7 @@ msgstr "下坡" #: lang/json/terrain_from_json.py msgid "electro furnace" -msgstr "" +msgstr "電子爐" #: lang/json/terrain_from_json.py msgid "electronic machinery" @@ -79699,7 +79953,7 @@ msgstr "重型機械" #: lang/json/terrain_from_json.py msgid "heavy pipe" -msgstr "" +msgstr "重型管" #: lang/json/terrain_from_json.py msgid "hickory tree" @@ -79771,11 +80025,11 @@ msgstr "原木牆" #: lang/json/terrain_from_json.py msgid "low stairs (beginning section)" -msgstr "" +msgstr "矮梯(開頭部分)" #: lang/json/terrain_from_json.py msgid "low stairs (end section)" -msgstr "" +msgstr "矮梯(結尾部分)" #: lang/json/terrain_from_json.py msgid "makeshift portcullis" @@ -79887,11 +80141,11 @@ msgstr "開啟的強化木門" #: lang/json/terrain_from_json.py msgid "open window with curtains" -msgstr "" +msgstr "打開有窗簾的窗戶" #: lang/json/terrain_from_json.py msgid "open window without curtains" -msgstr "" +msgstr "打開無窗簾的窗戶" #: lang/json/terrain_from_json.py msgid "open wire gate" @@ -79939,7 +80193,7 @@ msgstr "柵欄" #: lang/json/terrain_from_json.py msgid "pine lean-to" -msgstr "" +msgstr "松木棚" #: lang/json/terrain_from_json.py msgid "pine tree" @@ -80165,6 +80419,10 @@ msgstr "損壞的柴油泵" msgid "smashed gas pump" msgstr "損壞的汽油泵" +#: lang/json/terrain_from_json.py +msgid "smoothed rock" +msgstr "" + #: lang/json/terrain_from_json.py lang/json/trap_from_json.py msgid "spiked pit" msgstr "尖刺坑" @@ -80183,7 +80441,7 @@ msgstr "鋼製壓縮機" #: lang/json/terrain_from_json.py msgid "stone rock" -msgstr "" +msgstr "石岩" #: lang/json/terrain_from_json.py msgid "stone wall" @@ -80203,11 +80461,11 @@ msgstr "貼膠帶的窗戶" #: lang/json/terrain_from_json.py msgid "tarp lean-to" -msgstr "" +msgstr "篷布棚" #: lang/json/terrain_from_json.py msgid "tarp raincatcher" -msgstr "" +msgstr "蓬布集雨器" #: lang/json/terrain_from_json.py msgid "telecom cabinet" @@ -80287,11 +80545,11 @@ msgstr "鐵條窗框" #: lang/json/terrain_from_json.py msgid "window with closed curtains" -msgstr "" +msgstr "窗簾關閉的窗戶" #: lang/json/terrain_from_json.py msgid "window with curtains" -msgstr "" +msgstr "有窗簾的窗戶" #: lang/json/terrain_from_json.py msgid "window with metal bars" @@ -80299,7 +80557,7 @@ msgstr "鐵條窗" #: lang/json/terrain_from_json.py msgid "window without curtains" -msgstr "" +msgstr "無窗簾的窗戶" #: lang/json/terrain_from_json.py msgid "wire fence" @@ -80359,7 +80617,7 @@ msgstr "挖掘" #: lang/json/tool_quality_from_json.py msgid "distilling" -msgstr "" +msgstr "蒸餾" #: lang/json/tool_quality_from_json.py msgid "drilling" @@ -80395,11 +80653,11 @@ msgstr "敲擊" #: lang/json/tool_quality_from_json.py msgid "jacking" -msgstr "" +msgstr "頂重" #: lang/json/tool_quality_from_json.py msgid "lifting" -msgstr "" +msgstr "起重" #: lang/json/tool_quality_from_json.py msgid "metal sawing" @@ -80993,7 +81251,7 @@ msgstr "電動跑車" #: lang/json/vehicle_from_json.py msgid "Excavator" -msgstr "" +msgstr "挖掘機" #: lang/json/vehicle_from_json.py msgid "FBI, Emergency" @@ -81009,7 +81267,7 @@ msgstr "消防車" #: lang/json/vehicle_from_json.py msgid "Flaming Electric Car" -msgstr "" +msgstr "燃燒的電動車" #: lang/json/vehicle_from_json.py msgid "Flatbed Truck" @@ -81041,7 +81299,7 @@ msgstr "掀背車" #: lang/json/vehicle_from_json.py msgid "Hearse" -msgstr "" +msgstr "靈車" #: lang/json/vehicle_from_json.py msgid "Heavy Planter Tractor" @@ -81209,7 +81467,7 @@ msgstr "滾輪椅" #: lang/json/vehicle_from_json.py msgid "Technical" -msgstr "" +msgstr "技術" #: lang/json/vehicle_from_json.py msgid "Truck Trailer" @@ -81245,7 +81503,7 @@ msgstr "custom_empty" #: lang/json/vehicle_from_json.py msgid "engine crane" -msgstr "" +msgstr "引擎起重機" #: lang/json/vehicle_part_from_json.py msgid "120mm RWS" @@ -81317,7 +81575,7 @@ msgstr "單車輪胎（轉向輪）" #: lang/json/vehicle_part_from_json.py msgid "blob roller" -msgstr "" +msgstr "黏液輥" #: lang/json/vehicle_part_from_json.py msgid "blue light" @@ -81333,7 +81591,7 @@ msgstr "骨板" #: lang/json/vehicle_part_from_json.py msgid "boom crane" -msgstr "" +msgstr "吊桿起重機" #: lang/json/vehicle_part_from_json.py msgid "box" @@ -81345,7 +81603,7 @@ msgstr "攝影控制系統" #: lang/json/vehicle_part_from_json.py msgid "cargo dimension" -msgstr "" +msgstr "貨物尺寸" #: lang/json/vehicle_part_from_json.py msgid "cargo rack" @@ -81361,7 +81619,7 @@ msgstr "滑輪" #: lang/json/vehicle_part_from_json.py msgid "chimes" -msgstr "" +msgstr "音樂鈴" #: lang/json/vehicle_part_from_json.py msgid "chitin plating" @@ -81369,15 +81627,15 @@ msgstr "甲殼板" #: lang/json/vehicle_part_from_json.py msgid "clean water tank (10L)" -msgstr "" +msgstr "淨水箱（10公升）" #: lang/json/vehicle_part_from_json.py msgid "clean water tank (2L)" -msgstr "" +msgstr "淨水箱（2公升）" #: lang/json/vehicle_part_from_json.py msgid "clean water tank (60L)" -msgstr "" +msgstr "淨水箱（60公升）" #: lang/json/vehicle_part_from_json.py msgid "cloth board" @@ -81385,7 +81643,7 @@ msgstr "布隔板" #: lang/json/vehicle_part_from_json.py msgid "cloth quarterpanel" -msgstr "" +msgstr "布製側擋板" #: lang/json/vehicle_part_from_json.py msgid "cloth roof" @@ -81401,15 +81659,15 @@ msgstr "布簾" #: lang/json/vehicle_part_from_json.py msgid "diesel tank (10L)" -msgstr "" +msgstr "柴油油箱（10公升）" #: lang/json/vehicle_part_from_json.py msgid "diesel tank (2L)" -msgstr "" +msgstr "柴油油箱（2公升）" #: lang/json/vehicle_part_from_json.py msgid "diesel tank (60L)" -msgstr "" +msgstr "柴油油箱（60公升）" #: lang/json/vehicle_part_from_json.py msgid "diesel tank (little)" @@ -81421,15 +81679,15 @@ msgstr "污水箱" #: lang/json/vehicle_part_from_json.py msgid "dirty water tank (10L)" -msgstr "" +msgstr "污水箱（10公升）" #: lang/json/vehicle_part_from_json.py msgid "dirty water tank (2L)" -msgstr "" +msgstr "污水箱（2公升）" #: lang/json/vehicle_part_from_json.py msgid "dirty water tank (60L)" -msgstr "" +msgstr "污水箱（60公升）" #: lang/json/vehicle_part_from_json.py msgid "door" @@ -81485,7 +81743,7 @@ msgstr "超輕側擋板" #: lang/json/vehicle_part_from_json.py msgid "flame turret" -msgstr "" +msgstr "火焰槍塔" #: lang/json/vehicle_part_from_json.py msgid "floor trunk" @@ -81529,15 +81787,15 @@ msgstr "車架" #: lang/json/vehicle_part_from_json.py msgid "gasoline tank (10L)" -msgstr "" +msgstr "汽油油箱（10公升）" #: lang/json/vehicle_part_from_json.py msgid "gasoline tank (2L)" -msgstr "" +msgstr "汽油油箱（2公升）" #: lang/json/vehicle_part_from_json.py msgid "gasoline tank (60L)" -msgstr "" +msgstr "汽油油箱（60公升）" #: lang/json/vehicle_part_from_json.py msgid "gasoline tank (little)" @@ -81589,7 +81847,7 @@ msgstr "氫氣罐" #: lang/json/vehicle_part_from_json.py msgid "inboard mirror" -msgstr "" +msgstr "車內後視鏡" #: lang/json/vehicle_part_from_json.py msgid "internal door" @@ -81705,7 +81963,7 @@ msgstr "車載 RM802" #: lang/json/vehicle_part_from_json.py msgid "mounted automatic shotgun" -msgstr "車載自動散彈槍" +msgstr "車載自動霰彈槍" #: lang/json/vehicle_part_from_json.py msgid "mounted avalanche" @@ -81721,7 +81979,7 @@ msgstr "車載火焰噴射器" #: lang/json/vehicle_part_from_json.py msgid "mounted flamethrower (S)" -msgstr "" +msgstr "車載火焰噴射器 (S)" #: lang/json/vehicle_part_from_json.py msgid "mounted fusion gun" @@ -81761,11 +82019,11 @@ msgstr "車載迷你砲" #: lang/json/vehicle_part_from_json.py msgid "mounted needler" -msgstr "" +msgstr "車載縫衣針" #: lang/json/vehicle_part_from_json.py msgid "mounted perforator" -msgstr "" +msgstr "車載鑽孔機" #: lang/json/vehicle_part_from_json.py msgid "mounted plasma gun" @@ -81789,7 +82047,7 @@ msgstr "車載 rm451" #: lang/json/vehicle_part_from_json.py msgid "mounted rotary cannon" -msgstr "" +msgstr "車載旋轉炮" #: lang/json/vehicle_part_from_json.py msgid "mounted scorpion" @@ -81817,7 +82075,7 @@ msgstr "車載電磁炮" #: lang/json/vehicle_part_from_json.py msgid "mounted thundergun" -msgstr "" +msgstr "車載電擊槍" #: lang/json/vehicle_part_from_json.py msgid "mounted turbolaser" @@ -81825,7 +82083,7 @@ msgstr "車載渦輪雷射" #: lang/json/vehicle_part_from_json.py msgid "napalm tank (60L)" -msgstr "" +msgstr "凝固汽油箱 ( 60公升 )" #: lang/json/vehicle_part_from_json.py msgid "null part" @@ -81837,11 +82095,11 @@ msgstr "不透明門" #: lang/json/vehicle_part_from_json.py msgid "opaque hatch" -msgstr "" +msgstr "不透明艙門" #: lang/json/vehicle_part_from_json.py msgid "opaque heavy duty hatch" -msgstr "" +msgstr "不透明重載艙門" #: lang/json/vehicle_part_from_json.py msgid "opaque wooden door" @@ -81885,7 +82143,7 @@ msgstr "旋轉式魚叉槍" #: lang/json/vehicle_part_from_json.py msgid "scoop" -msgstr "" +msgstr "鏟勺" #: lang/json/vehicle_part_from_json.py msgid "seatbelt" @@ -81913,11 +82171,11 @@ msgstr "小輪胎（轉向輪）" #: lang/json/vehicle_part_from_json.py msgid "smokelayer" -msgstr "" +msgstr "煙氣層" #: lang/json/vehicle_part_from_json.py msgid "smokescreen" -msgstr "" +msgstr "煙幕" #: lang/json/vehicle_part_from_json.py msgid "spiked ram" @@ -81929,7 +82187,7 @@ msgstr "鋼保險桿" #: lang/json/vehicle_part_from_json.py msgid "storage bag" -msgstr "" +msgstr "儲物袋" #: lang/json/vehicle_part_from_json.py msgid "stow board" @@ -81953,7 +82211,7 @@ msgstr "可更換式蓄電池殼" #: lang/json/vehicle_part_from_json.py msgid "telescopic crane" -msgstr "" +msgstr "伸縮臂起重機" #: lang/json/vehicle_part_from_json.py msgid "tesla turret" @@ -82133,19 +82391,19 @@ msgstr "有車的公路" #: lang/json/vitamin_from_json.py msgid "Calcium" -msgstr "" +msgstr "鈣" #: lang/json/vitamin_from_json.py msgid "Vitamin A" -msgstr "" +msgstr "維生素A" #: lang/json/vitamin_from_json.py msgid "Vitamin B12" -msgstr "" +msgstr "維生素B12" #: lang/json/vitamin_from_json.py msgid "Vitamin C" -msgstr "" +msgstr "維生素C" #. ~ appended to "Close where?" "Pry where?" etc. #: src/action.cpp @@ -82163,8 +82421,8 @@ msgstr "返回" #: src/action.cpp src/activity_handlers.cpp src/color.cpp src/crafting.cpp #: src/editmap.cpp src/game.cpp src/iexamine.cpp src/inventory_ui.cpp #: src/item_action.cpp src/iuse.cpp src/iuse_actor.cpp -#: src/mission_companion.cpp src/pickup.cpp src/player.cpp src/veh_interact.cpp -#: src/vehicle.cpp +#: src/mission_companion.cpp src/pickup.cpp src/player.cpp +#: src/veh_interact.cpp src/vehicle.cpp msgid "Cancel" msgstr "取消" @@ -82187,11 +82445,14 @@ msgid "" "Success chance: %.1f%%\n" "Damage chance: %.1f%%" msgstr "" +"%s\n" +"成功機率: %.1f%%\n" +"損傷機率: %.1f%%" #: src/activity_handlers.cpp msgid " finished pulping the corpse." msgid_plural " finished pulping the corpses." -msgstr[0] "" +msgstr[0] " 把屍體打爛了" #: src/activity_handlers.cpp msgid "About an hour left to go." @@ -82213,7 +82474,7 @@ msgstr "鏘！鏘！鏘！" #: src/activity_handlers.cpp #, c-format msgid "Can't reload the %s." -msgstr "" +msgstr "無法裝填 %s." #: src/activity_handlers.cpp msgid "Feels like you're making good progress. Another half an hour, maybe?" @@ -82308,7 +82569,7 @@ msgstr[0] "屍體已經完全變肉醬了。" #: src/activity_handlers.cpp msgid "The corpse moved before you could finish smashing it!" -msgstr "" +msgstr "在你完全打碎屍體前，屍體移動了!" #: src/activity_handlers.cpp msgid "The red wire always starts the engine, doesn't it?" @@ -82350,7 +82611,7 @@ msgstr "%s 隨著機械的空響聲就停止運作了。" #: src/activity_handlers.cpp src/player.cpp #, c-format msgid "You are currently unable to mend the %s." -msgstr "" +msgstr "你目前無法修補 %s" #: src/activity_handlers.cpp src/game.cpp #, c-format @@ -82389,17 +82650,17 @@ msgstr "你發現了一個 %s！" #: src/activity_handlers.cpp #, c-format msgid "You failed at installing the %s and damaged your %s!" -msgstr "" +msgstr "你安裝 %s 失敗了，而且還損傷了你的 %s" #: src/activity_handlers.cpp #, c-format msgid "You failed at installing the %s and destroyed your %s!" -msgstr "" +msgstr "你安裝 %s 失敗了，而且還損毀了你的 %s" #: src/activity_handlers.cpp #, c-format msgid "You failed at installing the %s." -msgstr "" +msgstr "你安裝 %s 失敗了" #: src/activity_handlers.cpp msgid "You figure it'll take about an hour and a half at this rate." @@ -82440,7 +82701,7 @@ msgstr "你採集了一些毛！" #: src/activity_handlers.cpp msgid "You harvest some flesh." -msgstr "" +msgstr "你割取了一些肉塊。" #: src/activity_handlers.cpp msgid "You harvest some fluid bladders!" @@ -82481,12 +82742,12 @@ msgstr "你無法呼吸，呼吸中止了。" #: src/activity_handlers.cpp #, c-format msgid "You insert a bolt into the %s." -msgstr "" +msgstr "你把弩箭裝入了 %s." #: src/activity_handlers.cpp #, c-format msgid "You insert a cartridge into the %s." -msgstr "" +msgstr "你把彈藥裝入了 %s." #: src/activity_handlers.cpp #, c-format @@ -82505,7 +82766,7 @@ msgstr "你剝了 %s 的皮！" #: src/activity_handlers.cpp #, c-format msgid "You pour %1$s onto the ground." -msgstr "" +msgstr "你把 %1$s 倒在地上" #: src/activity_handlers.cpp src/iexamine.cpp #, c-format @@ -82522,12 +82783,12 @@ msgstr "" #: src/activity_handlers.cpp #, c-format msgid "You successfully attached the %1$s to your %2$s." -msgstr "" +msgstr "你成功地把 %1$s 裝上了你的 %2$s。" #: src/activity_handlers.cpp #, c-format msgid "You successfully mended the %s." -msgstr "" +msgstr "你成功地修補了 %s" #: src/activity_handlers.cpp msgid "You're too tired to continue." @@ -82540,7 +82801,7 @@ msgstr "你的 %s 電量耗盡了。" #: src/activity_handlers.cpp msgid "Your clumsy butchering destroys the flesh!" -msgstr "" +msgstr "你笨拙的屠宰技術破壞了肉！" #: src/activity_handlers.cpp msgid "hissssssssss!" @@ -83092,7 +83353,7 @@ msgstr "你只能把液體類的物品倒入目標容器。" #: src/advanced_inv.cpp msgid "You can't partially unload liquids from unsealable container." -msgstr "" +msgstr "你無法從不能密封的容器中取出部分液體。" #: src/advanced_inv.cpp msgid "You can't pick up a liquid." @@ -83104,7 +83365,7 @@ msgstr "你不能把物品放到那" #: src/advanced_inv.cpp msgid "You can't wear any more of that!" -msgstr "" +msgstr "你無法再穿上一件它!" #: src/advanced_inv.cpp msgid "You don't have enough room for that!" @@ -83169,7 +83430,7 @@ msgstr "重量" #: src/armor_layers.cpp #, c-format msgid "%s says: I don't trust you enough to let you do that!" -msgstr "" +msgstr "%s 說: 我還沒那麼相信你，不准你這麼做。" #: src/armor_layers.cpp msgid "(Innermost)" @@ -83193,7 +83454,7 @@ msgstr "鈍擊: " #: src/armor_layers.cpp msgid "Can't put this on" -msgstr "" +msgstr "無法穿上這個" #: src/armor_layers.cpp msgid "Coverage:" @@ -83270,22 +83531,22 @@ msgstr "它看起來真好看。" #: src/armor_layers.cpp src/bodypart.cpp msgid "L. Arm" msgid_plural "Arms" -msgstr[0] "" +msgstr[0] "手臂" #: src/armor_layers.cpp src/bodypart.cpp msgid "L. Foot" msgid_plural "Feet" -msgstr[0] "" +msgstr[0] "腳掌" #: src/armor_layers.cpp src/bodypart.cpp msgid "L. Hand" msgid_plural "Hands" -msgstr[0] "" +msgstr[0] "手掌" #: src/armor_layers.cpp src/bodypart.cpp msgid "L. Leg" msgid_plural "Legs" -msgstr[0] "" +msgstr[0] "腿部" #: src/armor_layers.cpp src/bodypart.cpp msgid "Mouth" @@ -83298,7 +83559,7 @@ msgstr "這裡沒有什麼東西好看的！" #: src/armor_layers.cpp #, c-format msgid "Press %s for help. Press %s to change keybindings." -msgstr "" +msgstr "按 %s 獲取輔助訊息。按 %s 更改按鍵綁定。" #: src/armor_layers.cpp msgid "Properties" @@ -83315,22 +83576,22 @@ msgstr "穿上:" #: src/armor_layers.cpp src/bodypart.cpp msgid "R. Arm" msgid_plural "Arms" -msgstr[0] "" +msgstr[0] "手臂" #: src/armor_layers.cpp src/bodypart.cpp msgid "R. Foot" msgid_plural "Feet" -msgstr[0] "" +msgstr[0] "腳掌" #: src/armor_layers.cpp src/bodypart.cpp msgid "R. Hand" msgid_plural "Hands" -msgstr[0] "" +msgstr[0] "手掌" #: src/armor_layers.cpp src/bodypart.cpp msgid "R. Leg" msgid_plural "Legs" -msgstr[0] "" +msgstr[0] "腿部" #: src/armor_layers.cpp msgid "Reassign invlets for armor?" @@ -83396,6 +83657,18 @@ msgid "" "The sum of these values is the effective encumbrance value your character " "has for that bodypart." msgstr "" +"使用方向鍵或是九宮格數字鍵來瀏覽左方列表。\n" +"按下[%s] 來選擇反白的護甲來重新排序。\n" +"使用[%s] / [%s] 來捲動右方列表。\n" +"按下[%s] 為衣物指定物品代碼。\n" +"按下[%s] 把選取的裝備穿在身上另一側。\n" +"使用[%s] 穿戴物品欄中的裝備。\n" +"按下[%s] 移除所選的裝甲。\n" +" \n" +"[累贅與保暖] 的解釋：\n" +"第一個數字是該身體部位所有衣物累贅值的總和。\n" +"第二個數字是該身體部位所穿戴衣物的件數造成的累贅值。\n" +"這兩個數值的總和就是該身體部位的累贅值。" #: src/armor_layers.cpp msgid "Warmth:" @@ -83693,7 +83966,7 @@ msgstr "無語" #: src/artifact.cpp msgid "artifact file" -msgstr "" +msgstr "神器文件" #: src/artifact.cpp msgid "beads" @@ -84124,7 +84397,8 @@ msgstr "請讀取一個角色才能使用這個頁面！" msgid "Rules" msgstr "規則" -#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp src/options.cpp +#: src/auto_pickup.cpp src/color.cpp src/game.cpp src/input.cpp +#: src/options.cpp msgid "Save changes?" msgstr "是否儲存變更？" @@ -84146,7 +84420,7 @@ msgstr "[<綜覽>]" #: src/auto_pickup.cpp msgid "autopickup configuration" -msgstr "" +msgstr "自動拾取設定" #. ~ Name of a basecamp #: src/basecamp.cpp @@ -84161,12 +84435,14 @@ msgid "" "\n" "%s: %i more slot(s) needed." msgstr "" +"\n" +"%s: %i 需要更多的插槽." #. ~ ( slots); #: src/bionics.cpp #, c-format msgid "%s (%i slots);" -msgstr "" +msgstr "%s (%i 插槽);" #: src/bionics.cpp msgid "Adrenaline Spike" @@ -84328,7 +84604,7 @@ msgstr "沒有影響。" #: src/bionics.cpp #, c-format msgid "Not enough space for bionic installation!%s" -msgstr "" +msgstr "沒有足夠的空間用於安裝生化插件！%s" #: src/bionics.cpp src/iuse.cpp src/iuse_actor.cpp msgid "Nothing" @@ -84423,7 +84699,7 @@ msgstr "自動對焦透鏡已經成了你眼睛的一部分。移除它們會令 #: src/bionics.cpp msgid "The bionic refuses to activate!" -msgstr "" +msgstr "生化插件無法啟動!" #: src/bionics.cpp msgid "The installation fails without incident." @@ -84475,6 +84751,7 @@ msgid "" "WARNING: %i percent chance of genetic damage, blood loss, or damage to " "existing bionics! Continue anyway?" msgstr "" +"警告：有 %i ％機率造成基因損傷、失血、或損傷已安裝的生化插件！是否繼續？" #: src/bionics.cpp msgid "" @@ -84563,7 +84840,7 @@ msgstr "你搞砸了這次移除。" msgid "" "You must remove the Anti-glare Compensators bionic to remove the Optical " "Dampers." -msgstr "" +msgstr "你必須先移除防眩光補償器插件，才能拆除視覺阻絕器。" #: src/bionics.cpp msgid "" @@ -84664,27 +84941,27 @@ msgstr "你的訓練幫助你把併發症減到最少。" #: src/bionics_ui.cpp msgid " BIONICS " -msgstr "" +msgstr "生化插件" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / %d turns" -msgstr "%d 能量 / %d 回合" +msgid "%d PU act" +msgstr "啟動需 %d 能量" #: src/bionics_ui.cpp #, c-format -msgid "%d PU / turn" -msgstr "%d 能量 / 回合" +msgid "%d PU deact" +msgstr "關閉需 %d 能量 " #: src/bionics_ui.cpp #, c-format -msgid "%d PU act" -msgstr "啟動需 %d 能量" +msgid "%d PU/%d turns" +msgstr "" #: src/bionics_ui.cpp #, c-format -msgid "%d PU deact" -msgstr "關閉需 %d 能量 " +msgid "%d PU/turn" +msgstr "" #: src/bionics_ui.cpp src/mutation_ui.cpp #, c-format @@ -84724,7 +85001,7 @@ msgstr "" #: src/bionics_ui.cpp #, c-format msgid "ACTIVE (%i)" -msgstr "" +msgstr "主動 (%i)" #: src/bionics_ui.cpp #, c-format @@ -84733,6 +85010,9 @@ msgid "" "\n" "%s" msgstr "" +"無效的字母。只有這些字母有效：\n" +"\n" +"%s" #: src/bionics_ui.cpp msgid "No activatable bionics installed." @@ -84753,12 +85033,12 @@ msgstr "開啟" #: src/bionics_ui.cpp #, c-format msgid "PASSIVE (%i)" -msgstr "" +msgstr "被動 (%i)" #: src/bionics_ui.cpp #, c-format msgid "Power usage: %s" -msgstr "" +msgstr "能量消耗: %s" #: src/bionics_ui.cpp #, c-format @@ -84775,7 +85055,7 @@ msgstr "" #: src/bionics_ui.cpp msgid "This bionic occupies the following body parts:" -msgstr "" +msgstr "此仿生插件佔據了以下的身體部位：" #: src/bionics_ui.cpp #, c-format @@ -84935,19 +85215,19 @@ msgstr "軀幹" #, c-format msgid " and %d hour" msgid_plural " and %d hours" -msgstr[0] "" +msgstr[0] "%d 時" #: src/calendar.cpp #, c-format msgid " and %d minute" msgid_plural " and %d minutes" -msgstr[0] "" +msgstr[0] "%d 分" #: src/calendar.cpp #, c-format msgid " and %d second" msgid_plural " and %d seconds" -msgstr[0] "" +msgstr[0] "%d 秒" #. ~ hour:minute (24hr time display) #: src/calendar.cpp @@ -85048,7 +85328,7 @@ msgstr "星期三" #: src/cata_utility.cpp #, c-format msgid "Failed to write %1$s to \"%2$s\": %3$s" -msgstr "" +msgstr "將 %1$s 寫入至 \"%2$s\": %3$s 失敗" #: src/cata_utility.cpp src/options.cpp msgid "kg" @@ -85072,15 +85352,15 @@ msgstr "mph" #: src/cata_utility.cpp msgid "opening file failed" -msgstr "" +msgstr "開啟檔案失敗" #: src/cata_utility.cpp msgid "writing to file failed" -msgstr "" +msgstr "寫入檔案失敗" #: src/catalua.cpp msgid "This binary was not compiled with Lua support." -msgstr "" +msgstr "此二進位檔並沒有編譯成支援Lua" #: src/catalua.cpp src/player.cpp #, c-format @@ -85150,7 +85430,7 @@ msgstr "右腿" #: src/character.cpp msgid "Some items tumble to the ground." -msgstr "" +msgstr "一些物品滾落到地面。" #. ~ %1$s - transport name, %2$s liquid fuel name #: src/character.cpp @@ -85287,7 +85567,7 @@ msgstr "區域名稱:" #: src/clzones.cpp msgid "zones date" -msgstr "" +msgstr "地區日期" #: src/color.cpp msgid " COLOR MANAGER " @@ -85307,7 +85587,7 @@ msgstr "顏色模板:" #: src/color.cpp msgid "Colorname" -msgstr "" +msgstr "顏色名稱" #: src/color.cpp #, c-format @@ -85340,7 +85620,7 @@ msgstr "棕色" #: src/color.cpp msgid "custom colors" -msgstr "" +msgstr "自訂顏色" #: src/color.cpp msgid "cyan" @@ -86721,7 +87001,7 @@ msgstr "噁，%s 嚐起來味道不是很好..." #. ~ Semantic difference, but greatly facilitates people being proud of their character. #: src/consumption.cpp msgid "It's too fresh, let it age a little first." -msgstr "" +msgstr "還不夠成熟，再等一下吧。" #: src/consumption.cpp msgid "Meh. You've eaten worse." @@ -86745,7 +87025,7 @@ msgstr "真的要吃 %s？你的胃可能會不太開心。" #: src/consumption.cpp msgid "That doesn't look edible in its current form." -msgstr "" +msgstr "以它目前的狀態，看似不能食用。" #: src/consumption.cpp msgid "That doesn't look edible." @@ -86823,7 +87103,7 @@ msgstr "你享受一頓蜂蜜盛宴。" #: src/consumption.cpp msgid "You feel as though you're going to split open! In a good way?" -msgstr "" +msgstr "你感覺身體似乎要爆開! 卻不是件壞事??" #: src/consumption.cpp msgid "You feel horrible for eating a person." @@ -86866,7 +87146,7 @@ msgstr "你挑出可以食用的部分，並把剩餘的扔掉。" #: src/consumption.cpp msgid "" "You still feel nauseous and will probably puke it all up again. Eat anyway?" -msgstr "" +msgstr "你還是覺得噁心，很可能會再把它全吐出來了。要吃嗎？" #: src/consumption.cpp msgid "You will not be able to finish it all. Consume it?" @@ -86921,7 +87201,7 @@ msgstr "否" #: src/craft_command.cpp msgid "Some components used previously are missing. Continue?" -msgstr "" +msgstr "以前使用的一些元件將遺失。要繼續嗎？" #: src/craft_command.cpp msgid "Tool(s): " @@ -87048,7 +87328,7 @@ msgstr "你把 %s 拆解成數個零件。" #: src/crafting.cpp msgid "You don't have any items to disassemble." -msgstr "" +msgstr "你沒有可拆解的物品。" #: src/crafting.cpp #, c-format @@ -87104,7 +87384,7 @@ msgstr[0] "你需要 %s 有著 %d 電量才能拆解 %s。" #, c-format msgid "You need at least %d charge of %s to disassemble it." msgid_plural "You need at least %d charges of %s to disassemble it." -msgstr[0] "" +msgstr[0] "%s 至少要有 %d 電量才能拆解它。" #: src/crafting.cpp src/iuse.cpp msgid "Your morale is too low to craft..." @@ -87206,6 +87486,20 @@ msgid "" " s:cooking\n" " Q:fine bolt turning" msgstr "" +"對於需求的特定前綴：\n" +" [t] 搜尋 工具需求\n" +" [c] 搜尋 元件需求\n" +" [q] 搜尋 特性(切割、挖掘、屠宰...)\n" +" [s] 搜尋 技能需求\n" +" [S] 搜尋 使用到的技能\n" +"對於成品的特定前綴：\n" +" [Q] 搜尋 特性(切割、挖掘、屠宰...)\n" +"例如：\n" +" t:電烙鐵\n" +" c:銅管\n" +" q:切割\n" +" s:烹飪\n" +" Q:螺絲轉動" #: src/crafting_gui.cpp msgid "You can't do that!" @@ -87253,7 +87547,7 @@ msgstr "取消[b]批量" #: src/crafting_gui.cpp #, c-format msgid "slow %d%%" -msgstr "" +msgstr "緩慢 %d%%" #: src/crafting_gui.cpp msgid "too dark" @@ -90340,7 +90634,7 @@ msgstr[0] "尚存 %d 個怪物。\n" #, c-format msgctxt "%s is the name of the item. %d is the quantity of that item." msgid "%s [%d]" -msgstr "" +msgstr "%s [%d]" #: src/game.cpp #, c-format @@ -90724,7 +91018,7 @@ msgstr "" #: src/game.cpp msgid "Clearly visible." -msgstr "" +msgstr "清晰可見。" #: src/game.cpp msgid "Click directly on NPC to attack." @@ -90767,7 +91061,7 @@ msgstr "確認:" #: src/game.cpp msgid "Consume it" -msgstr "" +msgstr "喝了它" #: src/game.cpp msgid "Consume item:" @@ -90882,7 +91176,7 @@ msgstr "顯示屍潮" #: src/game.cpp msgid "Display overmap scents" -msgstr "" +msgstr "顯示氣味大地圖" #: src/game.cpp msgid "Display weather" @@ -90988,7 +91282,7 @@ msgstr "無法儲存遊戲資料" #: src/game.cpp #, c-format msgid "Failed to save the maps: %s" -msgstr "" +msgstr "無法儲存地圖: %s" #: src/game.cpp msgid "Fatigue" @@ -91006,7 +91300,7 @@ msgstr "女性" #: src/game.cpp #, c-format msgid "Fill nearby vehicle %s" -msgstr "" +msgstr "加滿鄰近的車輛 %s" #: src/game.cpp msgid "Filter:" @@ -91089,6 +91383,9 @@ msgid "" "\n" "%s" msgstr "" +"無效的字母。只有這些字母有效：\n" +"\n" +"%s" #: src/game.cpp msgid "It is empty." @@ -91104,6 +91401,14 @@ msgstr "移動 %s 花費了不少時間。" msgid "It takes some time to move the heavy %s." msgstr "移動這沉重 %s 花費了不少時間。" +#: src/game.cpp +msgid "It takes you a long time to steer that vehicle!" +msgstr "" + +#: src/game.cpp +msgid "It takes you a very long time to steer that vehicle!" +msgstr "" + #: src/game.cpp msgid "It's too dangerous to tunnel that far!" msgstr "要傳送這麼遠實在太危險了！！" @@ -91180,7 +91485,7 @@ msgstr "光源:" #: src/game.cpp msgid "Lighting: " -msgstr "" +msgstr "光源:" #: src/game.cpp #, c-format @@ -91376,7 +91681,7 @@ msgstr "沒有東西在 (%d,%d) 可以擊退！" #: src/game.cpp #, c-format msgid "Nothing at grabbed point %d,%d,%d or bad grabbed object type." -msgstr "" +msgstr "沒有東西在抓取點 %d,%d,%d 或是不良的抓取物件類型" #: src/game.cpp src/gates.cpp src/iexamine.cpp msgid "Nothing happens." @@ -91406,7 +91711,7 @@ msgstr "我們的纖維隨著憤怒而繃緊！" #: src/game.cpp msgid "Overmap editor" -msgstr "" +msgstr "大地圖編輯器" #: src/game.cpp #, c-format @@ -91443,32 +91748,42 @@ msgid "" "Please wait while the world data loads...\n" "Finalizing and verifying..." msgstr "" +"世界資料讀取中...\n" +"確認與驗證中..." #: src/game.cpp msgid "" "Please wait while the world data loads...\n" "Loading core JSON..." msgstr "" +"世界資料讀取中...\n" +"載入核心JSON中..." #: src/game.cpp msgid "" "Please wait while the world data loads...\n" "Loading mods..." msgstr "" +"世界資料讀取中...\n" +"載入模組中..." #: src/game.cpp #, c-format msgid "Pour %s where?" msgstr "把 %s 倒在哪？" +#: src/game.cpp +msgid "Pour into a container" +msgstr "" + #: src/game.cpp #, c-format msgid "Pour into an adjacent keg (%s)" -msgstr "" +msgstr "倒入相鄰的桶子(%s)" #: src/game.cpp msgid "Pour on the ground" -msgstr "" +msgstr "倒在地上" #: src/game.cpp #, c-format @@ -91478,7 +91793,7 @@ msgstr "按 %s 來接受你的命運..." #: src/game.cpp #, c-format msgid "Press %s to list items and monsters" -msgstr "" +msgstr "按 %s 來列出物品及怪物" #: src/game.cpp #, c-format @@ -91522,7 +91837,7 @@ msgstr "確定殺掉屍奴？" #: src/game.cpp #, c-format msgid "Really step into: %s?" -msgstr "" +msgstr "確定踏入: %s ？" #: src/game.cpp #, c-format @@ -91934,7 +92249,7 @@ msgstr "%s 似乎碰撞到其他東西。" #, c-format msgid "" "The %s does not need to be reloaded, it reloads and fires in a single motion." -msgstr "" +msgstr "你的 %s 不需要手動裝填，它的裝填和開火動作會連貫進行。" #: src/game.cpp src/monmove.cpp #, c-format @@ -91969,7 +92284,7 @@ msgstr "%s 短暫的來回調查區域。" #: src/game.cpp #, c-format msgid "The %s is already fully loaded!" -msgstr "" +msgstr "%s 已經裝填完畢！" #: src/game.cpp #, c-format @@ -92194,7 +92509,7 @@ msgstr "有什麼東西在這裡，但你看不到它。" #: src/game.cpp msgid "There's something there, but you can't see what it is." -msgstr "" +msgstr "有什麼東西在這裡，但你看不到它。" #: src/game.cpp msgid "There's stuff in the way." @@ -92206,7 +92521,7 @@ msgstr "口渴" #: src/game.cpp msgid "This binary was not compiled with tiles support." -msgstr "" +msgstr "此二進位檔並沒有編譯成支援圖像" #: src/game.cpp msgid "This vehicle has no steering system installed, you can't turn it." @@ -92377,7 +92692,7 @@ msgstr "" #: src/game.cpp #, c-format msgid "What to do with the %s?" -msgstr "" +msgstr "要對 %s 做什麼？" #: src/game.cpp src/player.cpp #, c-format @@ -92476,7 +92791,7 @@ msgstr "你看不懂電腦螢幕上寫什麼！" #: src/game.cpp msgid "You can not see a computer screen!" -msgstr "" +msgstr "你無法看到電腦螢幕!" #: src/game.cpp msgid "You can see through everything!" @@ -92616,7 +92931,7 @@ msgstr "你在殼中的時候不能窺視轉角。" #: src/game.cpp msgid "You can't place items here!" -msgstr "" +msgstr "你不能把物品放到那！" #: src/game.cpp msgid "You can't place items there!" @@ -92709,7 +93024,7 @@ msgstr "你使用了你的藤蔓下降，雖然留下了一陣刺痛。" #: src/game.cpp #, c-format msgid "You disassemble your %s." -msgstr "" +msgstr "你拆解了你的 %s." #: src/game.cpp #, c-format @@ -92735,7 +93050,7 @@ msgstr "你沒有鋒利的物品來進行屠宰。" #: src/game.cpp msgid "You don't have any items to throw." -msgstr "" +msgstr "你沒有可投擲的物品。" #: src/game.cpp msgid "You don't have sided items worn." @@ -92871,6 +93186,11 @@ msgstr "你覺得你的身體正在腐壞。" msgid "You feel your genetic makeup degrading." msgstr "你覺得你的基因正在退化。" +#: src/game.cpp +#, c-format +msgid "You fumble with the %s's controls." +msgstr "你摸索著 %s 的控制方法。" + #: src/game.cpp msgid "You get a hold of yourself." msgstr "" @@ -92905,19 +93225,19 @@ msgstr "你沒有進行中的任務！" #: src/game.cpp msgid "You have nothing to consume." -msgstr "" +msgstr "你沒東西可吃。" #: src/game.cpp msgid "You have nothing to read." -msgstr "" +msgstr "你沒東西可讀。" #: src/game.cpp msgid "You have nothing to unload." -msgstr "" +msgstr "你沒東西可卸下。" #: src/game.cpp msgid "You have nothing to wield." -msgstr "" +msgstr "你沒東西可拿。" #: src/game.cpp msgid "You haven't completed any missions!" @@ -92977,7 +93297,7 @@ msgstr "你留下空的 %s。" #: src/game.cpp #, c-format msgid "You let go of the %1$s as it slides past %2$s" -msgstr "" +msgstr "你放開了 %1$s ，當他滑過 %2$s 時" #: src/game.cpp #, c-format @@ -93032,7 +93352,7 @@ msgstr "你需要一條短繩索" #: src/game.cpp #, c-format msgid "You need at least one %s to reload the %s!" -msgstr "" +msgstr "你需要至少一個 %s 才能重新裝填 %s！" #: src/game.cpp msgid "" @@ -93057,7 +93377,7 @@ msgstr "你必須重新裝填！" #: src/game.cpp #, c-format msgid "You need two free hands to fire your %s." -msgstr "" +msgstr "你需要雙手並用才能發射 %s" #: src/game.cpp msgid "You now know a lot more than just 10 styles of kung fu." @@ -93350,7 +93670,7 @@ msgstr "當你想起最近的狩獵，你的心跳加速。" #: src/game.cpp #, c-format msgid "Your local position: %d, %d, %d" -msgstr "" +msgstr "你的區域位置: %d, %d, %d" #: src/game.cpp msgid "Your mental state feels protected." @@ -93363,7 +93683,7 @@ msgstr "你的移動警報器響起來了！" #: src/game.cpp #, c-format msgid "Your overmap position: %d, %d, %d" -msgstr "" +msgstr "你的大地圖位置: %d, %d, %d" #: src/game.cpp #, c-format @@ -93457,7 +93777,7 @@ msgstr "進食" #: src/game.cpp msgid "factions data" -msgstr "" +msgstr "派系資料" #: src/game.cpp msgid "filter it." @@ -93470,7 +93790,7 @@ msgstr "小時" #: src/game.cpp msgctxt "action" msgid "mend" -msgstr "" +msgstr "修補" #: src/game.cpp msgid "minute" @@ -93495,15 +93815,15 @@ msgstr "新的預設按鍵是 '^'." #: src/game.cpp msgctxt "action" msgid "part reload" -msgstr "" +msgstr "部分裝填" #: src/game.cpp msgid "player data" -msgstr "" +msgstr "玩家資料" #: src/game.cpp msgid "player memorial" -msgstr "" +msgstr "玩家墓誌銘" #: src/game.cpp msgid "quit" @@ -93564,7 +93884,7 @@ msgstr "回合" #: src/game.cpp msgid "uistate data" -msgstr "" +msgstr "使用者介面資料" #: src/game.cpp msgctxt "action" @@ -93578,7 +93898,7 @@ msgstr "穿戴" #: src/game.cpp msgid "weather state" -msgstr "" +msgstr "天氣狀態" #: src/game.cpp msgctxt "action" @@ -94706,6 +95026,9 @@ msgid "" "more and more. While in radiation-free areas, your radiation level will " "slowly decrease. Taking Prussian blue tablets will help speed the process." msgstr "" +"儘管這狀況比較少見，某些地區可能會被輻射所污染。輻射線會慢慢的在你的身體累積" +"並讓你漸漸衰弱。當你回到無輻射地區，你體內的輻射含量會緩慢的下降。服用普魯士" +"藍藥片能夠讓這個過程加速。" #: src/help.cpp msgid "" @@ -95136,7 +95459,7 @@ msgstr "增加 %s 到池中？" #: src/iexamine.cpp #, c-format msgid "Add a container to receive the %s" -msgstr "" +msgstr "增加一個容器來裝 %s" #: src/iexamine.cpp msgid "Add a message to the sign with spray paint?" @@ -95293,7 +95616,7 @@ msgstr "駭入控制台。" #: src/iexamine.cpp #, c-format msgid "Harvest current %s (%d)" -msgstr "" +msgstr "採收 %s (%d)" #: src/iexamine.cpp #, c-format @@ -95353,7 +95676,7 @@ msgstr "插入卡片。" #: src/iexamine.cpp #, c-format msgid "It contains %s (%d), %0.f%% full." -msgstr "" +msgstr "它裝著 %s (%d)， %0.f%% 滿。" #: src/iexamine.cpp src/mission_companion.cpp src/vehicle.cpp msgid "It is too cold to plant anything now." @@ -95372,11 +95695,11 @@ msgstr "它吐出了各式各樣的殘渣。" #, c-format msgid "It will finish brewing in about %d hour." msgid_plural "It will finish brewing in about %d hours." -msgstr[0] "" +msgstr[0] "它將在大約 %d 小時完成釀造。" #: src/iexamine.cpp msgid "It will finish brewing in less than an hour." -msgstr "" +msgstr "它將在一小時內完成釀造。" #: src/iexamine.cpp msgid "JACKPOT! You win $3000!" @@ -95395,7 +95718,7 @@ msgstr[0] "看起來有 %d 層高。要跳下去嗎？" #: src/iexamine.cpp #, c-format msgid "Looks like you need a %s, or a tool to hack it with." -msgstr "" +msgstr "看來你需要 %s，或是工具以破解它" #: src/iexamine.cpp #, c-format @@ -95409,7 +95732,7 @@ msgstr "剩餘現金: %d" #: src/iexamine.cpp msgid "No container added. The sap will just spill on the ground." -msgstr "" +msgstr "沒有添加容器。樹汁將灑落地面。" #: src/iexamine.cpp msgid "No win." @@ -95520,7 +95843,7 @@ msgstr "移除 %s？" #: src/iexamine.cpp msgid "Remove container" -msgstr "" +msgstr "移除容器" #: src/iexamine.cpp msgid "Remove cover?" @@ -95532,7 +95855,7 @@ msgstr "再次點燃爐子前要先移除。" #: src/iexamine.cpp msgid "Remove tap" -msgstr "" +msgstr "移除龍頭" #: src/iexamine.cpp msgid "Rope Fence" @@ -95619,7 +95942,7 @@ msgstr "%1$s 由 %2$d 個 %3$s 構成。" #, c-format msgid "" "The %s already contains some %s, you can't add a different liquid to it." -msgstr "" +msgstr "%s 已經裝有一些 %s，你無法加入不同的液體。" #: src/iexamine.cpp #, c-format @@ -95634,7 +95957,7 @@ msgstr "%s 完全滿了。" #: src/iexamine.cpp #, c-format msgid "The %s is full." -msgstr "" +msgstr "%s 滿了。" #: src/iexamine.cpp #, c-format @@ -95907,7 +96230,7 @@ msgstr "請問您想做什麼？" #: src/iexamine.cpp msgid "Which container:" -msgstr "" +msgstr "哪個容器: " #: src/iexamine.cpp msgid "Wire Fence" @@ -96047,7 +96370,7 @@ msgstr "你沒有發酵釀造用的原料。" #: src/iexamine.cpp #, c-format msgid "You have no fertilizer for the %s." -msgstr "" +msgstr "你無肥料可施於 %s。" #: src/iexamine.cpp msgid "You have no seeds to plant." @@ -96112,7 +96435,7 @@ msgstr "你需要 2 段 6 英尺長的短繩索才能這樣做" #: src/iexamine.cpp #, c-format msgid "You need a %s to tap this maple tree." -msgstr "" +msgstr "你需要 %s 才能對此楓樹進行抽液。" #: src/iexamine.cpp msgid "You need a cash card before you can withdraw money!" @@ -96128,7 +96451,7 @@ msgstr "你需要一張已儲值的現金卡來買東西！" #: src/iexamine.cpp msgid "You need a hammering tool to remove the spile from the crust." -msgstr "" +msgstr "你需要工具將小插管從樹皮裡移除。" #: src/iexamine.cpp msgid "You need a lockpick to open this gun safe." @@ -96136,12 +96459,12 @@ msgstr "你需要一個開鎖器來打開這個槍櫃。" #: src/iexamine.cpp msgid "You need a tool to drill the crust to tap this maple tree." -msgstr "" +msgstr "你需要工具鑽穿樹皮才能對此楓樹進行抽液。" #: src/iexamine.cpp msgid "" "You need a tool to hammer the spile into the crust to tap this maple tree." -msgstr "" +msgstr "你需要工具把小插管敲入樹皮才能對此楓樹進行抽液。" #: src/iexamine.cpp msgid "You need money in your account before you can withdraw money!" @@ -96188,12 +96511,12 @@ msgstr "你迅速的翻過柵欄。" #: src/iexamine.cpp #, c-format msgid "You remove %s from the vat." -msgstr "" +msgstr "你從桶子移除了 %s" #: src/iexamine.cpp #, c-format msgid "You remove the %s." -msgstr "" +msgstr "你將 %s 移除。" #: src/iexamine.cpp msgid "You remove the plank." @@ -96354,7 +96677,7 @@ msgstr "這個指定的案件和 %s 衝突，你要把相互衝突的按鍵取 #: src/input.cpp #, c-format msgid "This key is already used for %s." -msgstr "" +msgstr "這個按鍵已經指配給 %s 。" #: src/input.cpp msgid "Unbound keys" @@ -96370,7 +96693,7 @@ msgstr "任意鍵" #: src/input.cpp msgid "key bindings configuration" -msgstr "" +msgstr "按鍵綁定設定" #: src/input.cpp msgid "mouse movement" @@ -96442,7 +96765,7 @@ msgstr "切換物品/穿著" #: src/inventory_ui.cpp msgid "There are no items to compare." -msgstr "" +msgstr "沒東西可比較。" #: src/inventory_ui.cpp msgid "To drop x items, type a number and then the item hotkey." @@ -96464,45 +96787,45 @@ msgstr "重量 (%s): " #: src/inventory_ui.cpp #, c-format msgid "You don't have %s-powered tools." -msgstr "" +msgstr "你沒有已經充電的 %s 。" #: src/inventory_ui.cpp #, c-format msgid "You don't have a %s." -msgstr "" +msgstr "你沒有 %s。" #: src/inventory_ui.cpp #, c-format msgid "You don't have a suitable container for carrying %s." -msgstr "" +msgstr "你沒有適合的容器來裝 %s。" #: src/inventory_ui.cpp msgid "You don't have any items to wear." -msgstr "" +msgstr "你沒東西可穿。" #: src/inventory_ui.cpp msgid "You don't have any items you can use." -msgstr "" +msgstr "你沒有可用的東西。" #: src/inventory_ui.cpp msgid "You don't have the necessary item at hand." -msgstr "" +msgstr "你手上沒有所需的東西。" #: src/inventory_ui.cpp msgid "You don't have the necessary item." -msgstr "" +msgstr "你沒有所需的物品。" #: src/inventory_ui.cpp msgid "You don't wear anything." -msgstr "" +msgstr "你身上沒穿任何東西。" #: src/inventory_ui.cpp msgid "You have nothing to drop." -msgstr "" +msgstr "你沒東西可丟。" #: src/inventory_ui.cpp msgid "Your inventory is empty." -msgstr "" +msgstr "你的物品欄裡沒東西。" #: src/item.cpp msgid " (UPS)" @@ -96518,7 +96841,7 @@ msgstr " (冷)" #: src/item.cpp msgid " (filthy)" -msgstr "" +msgstr " (骯髒)" #: src/item.cpp msgid " (fits)" @@ -96589,7 +96912,7 @@ msgstr "%d 砍劈 (%d 爆擊)" #: src/item.cpp #, c-format msgid "%d moves per attack" -msgstr "" +msgstr "每次攻擊耗用 %d 行動點" #: src/item.cpp #, c-format @@ -96605,13 +96928,13 @@ msgstr "%d x %s" #: src/item.cpp #, c-format msgid "%s with %s (%d)" -msgstr "" +msgstr "%s 含 %s (%d)" #. ~ %1$s is the name of a fault and %2$s is the description of the fault #: src/item.cpp #, c-format msgid "* Faulty %1$s. %2$s" -msgstr "" +msgstr "* 故障%1$s. %2$s" #: src/item.cpp msgid "" @@ -96623,7 +96946,7 @@ msgstr "" #: src/item.cpp #, c-format msgid "* Fermenting this will produce %s." -msgstr "" +msgstr "* 將它發酵可產生 %s。" #: src/item.cpp msgid "" @@ -96685,15 +97008,15 @@ msgstr "* 在徽章上的色帶顯示 %s。" #: src/item.cpp msgid "* This food contains human flesh." -msgstr "" +msgstr "* 這食物包含 人肉。" #: src/item.cpp msgid "* This food contains human flesh." -msgstr "" +msgstr "* 這食物包含 人肉。" #: src/item.cpp msgid "* This food is tainted and will poison you." -msgstr "" +msgstr "* 這食物 已受汙染 將會使你中毒。" #: src/item.cpp msgid "" @@ -96714,7 +97037,7 @@ msgstr "* 這件裝備能完全保護你不受放電影響reduces the volume of sounds to a safe " "level." -msgstr "" +msgstr "* 這件裝備會 降低 音量 到安全範圍。" #: src/item.cpp msgid "" @@ -96845,7 +97168,7 @@ msgstr "* 這件衣物讓你在水下看得更遠。" #: src/item.cpp msgid "* This piece of clothing can be used to block attacks when worn." -msgstr "" +msgstr "* 穿戴這件衣物可以格檔攻擊。" #: src/item.cpp msgid "" @@ -96883,7 +97206,7 @@ msgstr "* 這件衣物有縫上羊毛能夠增加保暖度filthy." -msgstr "" +msgstr "* 這件衣物是 骯髒的。" #: src/item.cpp msgid "* This piece of clothing is fancy." @@ -96935,12 +97258,16 @@ msgid "" "charge it with standard batteries, but unloading it is " "impossible." msgstr "" +"* 這個工具已被改造成使用充電電池並且可在任何UPS相容的車" +"載充電站充電，你能用一般電池填入進行充電，但無法移出。" #: src/item.cpp msgid "" "* This tool has a rechargeable power cell and is not " "compatible with standard batteries." msgstr "" +"* 這個工具裝配 充電電池 並且與一般電池 不" +"相容。" #: src/item.cpp msgid "" @@ -96959,7 +97286,7 @@ msgstr "" #: src/item.cpp msgid "* This weapon needs two free hands to fire." -msgstr "" +msgstr "* 這件武器需要雙手並用才能射擊。" #: src/item.cpp msgid "" @@ -96988,7 +97315,7 @@ msgstr "*%s*" #: src/item.cpp msgid "Capacity: " -msgstr "" +msgstr "容量: " #: src/item.cpp #, c-format @@ -97009,11 +97336,11 @@ msgstr "累贅: " #: src/item.cpp msgid "Fire modes: " -msgstr "" +msgstr "射擊模式: " #: src/item.cpp msgid "Minimum requirements:" -msgstr "" +msgstr "最低需求:" #: src/item.cpp msgid "Mods: " @@ -97126,7 +97453,7 @@ msgstr " 每回合" #, c-format msgid " round of %s" msgid_plural " rounds of %s" -msgstr[0] "" +msgstr[0] " 發裝的 %s" #: src/item.cpp msgid "Close to skin. " @@ -97151,7 +97478,7 @@ msgstr "腰部。" #: src/item.cpp #, c-format msgid "%2.1fL " -msgstr "" +msgstr "%2.1f 公升" #. ~ inches, e.g. 20" wheel #: src/item.cpp @@ -97203,7 +97530,7 @@ msgstr "藍）" #: src/item.cpp msgid "Barter value: " -msgstr "" +msgstr "以物易物的價值: " #: src/item.cpp msgid "Bash: " @@ -97287,7 +97614,7 @@ msgstr "左腿/右腿。" #: src/item.cpp #, c-format msgid "Eject %s from %s?" -msgstr "" +msgstr "退出 %s 自 %s？" #: src/item.cpp msgid "Enjoyability: " @@ -97409,7 +97736,7 @@ msgstr "攻擊所需行動點: " #: src/item.cpp msgid "No (contents increase volume)" -msgstr "" +msgstr "否 (包含可增加的數量)" #: src/item.cpp src/options.cpp msgid "Note: " @@ -97467,7 +97794,7 @@ msgstr "後座力: " #: src/item.cpp #, c-format msgid "Reload %s" -msgstr "" +msgstr "重新填裝 %s" #: src/item.cpp msgid "Reload time: " @@ -97531,7 +97858,7 @@ msgstr "%1$s 無法容納 %2$s。" #: src/item.cpp #, c-format msgid "That %s cannot be attached to a %s" -msgstr "" +msgstr "%s 無法加裝在 %s 上。" #: src/item.cpp #, c-format @@ -97628,19 +97955,19 @@ msgstr "這個 %s 是絕對可靠的。你無法以這種方式改良它。" #: src/item.cpp msgid "This ammo never misfires" -msgstr "" +msgstr "此彈藥 絕不走火" #: src/item.cpp msgid "This ammo starts fires" -msgstr "" +msgstr "此彈藥 會點燃火焰" #: src/item.cpp msgid "This ammo has been hand-loaded" -msgstr "" +msgstr "此彈藥 為手工重填" #: src/item.cpp msgid "This bionic is installed in the following body part(s):" -msgstr "" +msgstr "此仿生插件安裝在以下的身體部位：" #: src/item.cpp src/player.cpp #, c-format @@ -97717,11 +98044,11 @@ msgstr "使用在: " #, c-format msgid "Uses %i charge of UPS per shot" msgid_plural "Uses %i charges of UPS per shot" -msgstr[0] "" +msgstr[0] "使用UPS %i 的電量來發射一槍。" #: src/item.cpp src/iuse_actor.cpp msgid "Vitamins (RDA): " -msgstr "" +msgstr "維生素 (RDA): " #: src/item.cpp msgid "Warmth: " @@ -97756,6 +98083,11 @@ msgstr "你可用它來製作數個其它物品。" msgid "You could use it to craft: %s" msgstr "你可用它來製作: %s" +#: src/item.cpp +#, c-format +msgid "You fall asleep and drop your %s." +msgstr "" + #: src/item.cpp #, c-format msgid "You finish your %s." @@ -97772,17 +98104,17 @@ msgstr "本物品能配合你熟習的武術招式：" #: src/item.cpp #, c-format msgid "You must unload your %s before installing this mod." -msgstr "" +msgstr "你必須先清空 %s 才能安裝這個模組。" #: src/item.cpp #, c-format msgid "You need a compatible magazine to reload the %s!" -msgstr "" +msgstr "你需要相容的彈匣來重新填裝 %s ！" #: src/item.cpp #, c-format msgid "You need an UPS to run the %s!" -msgstr "" +msgstr "你需要一個UPS讓 %s 運作！" #: src/item.cpp msgid "You need to read this book to see its contents." @@ -97824,7 +98156,7 @@ msgstr "你的 %1$s 已經有了 %2$s。" #: src/item.cpp #, c-format msgid "Your %1$s doesn't have enough room for another %2$s mod." -msgstr "" +msgstr "你的 %1$s 沒有足夠的空間來安裝 %2$s 模組。" #: src/item.cpp #, c-format @@ -97881,11 +98213,11 @@ msgstr "能夠儲存 %.2f 公升。" #: src/item.cpp msgid "dexterity" -msgstr "" +msgstr "敏捷" #: src/item.cpp msgid "faulty " -msgstr "" +msgstr "故障" #: src/item.cpp msgid "fridge: " @@ -97893,7 +98225,7 @@ msgstr "冷藏: " #: src/item.cpp msgid "intelligence" -msgstr "" +msgstr "智力" #: src/item.cpp msgid "is watertight, " @@ -97918,7 +98250,7 @@ msgstr "橙" #: src/item.cpp msgid "perception" -msgstr "" +msgstr "感知" #: src/item.cpp msgid "right" @@ -97930,7 +98262,7 @@ msgstr "削短型" #: src/item.cpp msgid "strength" -msgstr "" +msgstr "力量" #: src/item.cpp msgid "temp rot: " @@ -97942,19 +98274,19 @@ msgstr "黃" #: src/item.cpp msgid "| Amount " -msgstr "" +msgstr "| 數量" #: src/item.cpp msgid "| Damage | Pierce " -msgstr "" +msgstr "| 傷害 | 穿刺" #: src/item.cpp msgid "| Location " -msgstr "" +msgstr "| 地點" #: src/item.cpp msgid "| Moves " -msgstr "" +msgstr "| 移動數" #: src/item_action.cpp msgid "Execute which action?" @@ -98052,7 +98384,7 @@ msgstr "" #: src/iuse.cpp #, c-format msgid "%s holding %s" -msgstr "" +msgstr "%s 拿著 %s" #: src/iuse.cpp #, c-format @@ -98141,7 +98473,7 @@ msgstr " 嘗試電擊%s ，但是失手了。" #: src/iuse.cpp msgid " injects themselves with adrenaline." -msgstr "" +msgstr " 對自己注射腎上腺素。" #: src/iuse.cpp #, c-format @@ -98162,7 +98494,7 @@ msgstr " 突然倒下了！" #: src/iuse.cpp msgid " suddenly falls over!" -msgstr "" +msgstr " 突然倒下了！" #: src/iuse.cpp msgid " takes some antibiotics." @@ -98641,7 +98973,7 @@ msgstr "分離並重整電纜" #: src/iuse.cpp msgid "Detach power mods from what?" -msgstr "" +msgstr "從什麼卸除電力模組？" #: src/iuse.cpp msgid "Do what with quiver?" @@ -98821,12 +99153,12 @@ msgstr "伸手不見五指..." #: src/iuse.cpp msgid "It says I'm not irradiated" -msgstr "" +msgstr "它顯示我並未受輻射汙染。" #: src/iuse.cpp #, c-format msgid "It says here that my radiation level is %d" -msgstr "" +msgstr "它顯示我的輻射指數是 %d" #: src/iuse.cpp msgid "" @@ -99272,7 +99604,7 @@ msgstr "噠~噠~噠~噠~" #: src/iuse.cpp msgid "Tablet's batteries are dead." -msgstr "" +msgstr "平板電腦沒電了。" #: src/iuse.cpp msgid "Take a photo" @@ -99309,10 +99641,6 @@ msgstr "%s 已經濕透而不能再吸水了！" msgid "That isn't a firearm!" msgstr "這不是一把槍械！" -#: src/iuse.cpp -msgid "That item already has a rechargeable battery pack." -msgstr "這個物品已經有了充電電池組。" - #: src/iuse.cpp msgid "That item has already had its battery capacity doubled." msgstr "這個物品已經擴充了雙倍的電池容量。" @@ -99347,7 +99675,7 @@ msgstr "這水裡不會有魚的，去河邊試試吧。" #: src/iuse.cpp #, c-format msgid "The %1$s avoids your attempts to put it in the %2$s." -msgstr "" +msgstr "%1$s 讓你無法把它放在 %2$s。" #: src/iuse.cpp #, c-format @@ -99695,7 +100023,7 @@ msgstr "這附近沒有魚。試試其他地方。" #: src/iuse.cpp #, c-format msgid "There is no place to put the %s." -msgstr "" +msgstr "沒有空間可放 %s。" #: src/iuse.cpp msgid "There isn't anything to erase here." @@ -99781,7 +100109,7 @@ msgstr "這並非相容的記憶卡。" #: src/iuse.cpp msgid "This item has been modified this way already." -msgstr "" +msgstr "此物品已被如此修改過。" #: src/iuse.cpp msgid "This jelly is delicious, and very filling!" @@ -99987,7 +100315,7 @@ msgstr "要對車輛遙控器作什麼:" #: src/iuse.cpp msgid "Which signal should activate the item?:" -msgstr "" +msgstr "哪個信號能啟動此物？:" #: src/iuse.cpp msgid "Why would you do that?" @@ -100089,7 +100417,7 @@ msgstr "你把你的遙控車裝備上 %s。" #: src/iuse.cpp #, c-format msgid "You attack the %1$s with your %2$s." -msgstr "" +msgstr "你用 %2$s 攻擊了 %1$s。" #: src/iuse.cpp msgid "You attempt to pry open your wallet" @@ -100284,7 +100612,7 @@ msgstr "你沒有能點燃的東西！" #: src/iuse.cpp msgid "You don't have appropriate food to heat up." -msgstr "" +msgstr "你沒有適合的食物可加熱。" #: src/iuse.cpp msgid "" @@ -100293,11 +100621,11 @@ msgstr "你的淨水器沒有足夠的電來淨化所有的水。" #: src/iuse.cpp msgid "You don't have guns with long barrels." -msgstr "" +msgstr "你沒有長槍管的槍枝。" #: src/iuse.cpp msgid "You don't have water to purify." -msgstr "" +msgstr "你沒有水可淨化。" #: src/iuse.cpp #, c-format @@ -100680,7 +101008,7 @@ msgstr "你設置了粗製集雨器，準備收集雨水。" #: src/iuse.cpp msgid "You place the metal funnel, waiting to collect rain." -msgstr "" +msgstr "你設置了金屬集雨器，準備收集雨水。" #: src/iuse.cpp msgid "You place the telepad." @@ -100806,13 +101134,6 @@ msgstr "你完全修復了%s" msgid "You repair your %s!" msgstr "你修理了%s" -#: src/iuse.cpp -#, c-format -msgid "" -"You replace the battery compartment of your %s with a rechargeable battery " -"pack!" -msgstr "你把 %s 的電池槽更換為充電電池模組！" - #: src/iuse.cpp #, c-format msgid "You replace your current %s." @@ -100827,7 +101148,7 @@ msgstr "你一本正經的檢查與分析大同電鍋，但還是一事無成。 #: src/iuse.cpp #, c-format msgid "You saw down the barrel of your %s" -msgstr "" +msgstr "你鋸短了 %s 的槍管。" #: src/iuse.cpp msgid "" @@ -100858,7 +101179,7 @@ msgstr "你在兩格遠的地方設置刀刃陷阱。" #: src/iuse.cpp #, c-format msgid "You set the board trap on the %s, nails facing up." -msgstr "" +msgstr "你在 %s 上設置了釘板陷阱，釘尖朝上。" #: src/iuse.cpp msgid "You set the booby trap up and activate the grenade." @@ -101329,7 +101650,7 @@ msgstr "你的心臟劇烈地跳動！" #: src/iuse.cpp msgid "Your heart spasms!" -msgstr "" +msgstr "你的心臟痙攣！" #: src/iuse.cpp msgid "Your hedge trimmer rumbles." @@ -101397,7 +101718,7 @@ msgstr "令人沉醉的吉他獨奏！" #: src/iuse.cpp msgid "an agonized scream!" -msgstr "" +msgstr "痛苦的尖叫聲！" #: src/iuse.cpp msgid "awful" @@ -101523,7 +101844,7 @@ msgstr "你停止了挖掘。" #: src/iuse_actor.cpp msgid " Limbs: " -msgstr "" +msgstr "肢體:" #: src/iuse_actor.cpp msgid " Torso: " @@ -101532,7 +101853,7 @@ msgstr "軀幹: " #: src/iuse_actor.cpp #, c-format msgid "%s (repaired using %s)" -msgstr "" +msgstr "%s (用 %s 修理)" #: src/iuse_actor.cpp #, c-format @@ -101541,31 +101862,31 @@ msgstr "%s 代表？" #: src/iuse_actor.cpp msgid "Actual healing: " -msgstr "" +msgstr "實際癒合: " #: src/iuse_actor.cpp msgid "Base healing: " -msgstr "" +msgstr "基本癒合:" #: src/iuse_actor.cpp msgid "Bite:" -msgstr "" +msgstr "咬傷：" #: src/iuse_actor.cpp msgid "Bleeding:" -msgstr "" +msgstr "流血:" #: src/iuse_actor.cpp msgid "Chance to heal (percent): " -msgstr "" +msgstr "治癒機率(％):" #: src/iuse_actor.cpp msgid "Infection:" -msgstr "" +msgstr "感染：" #: src/iuse_actor.cpp msgid "Moves to use:" -msgstr "" +msgstr "使用所需行動點：" #: src/iuse_actor.cpp msgid "A flashing LED on the laser turret appears to indicate low light." @@ -101584,12 +101905,12 @@ msgstr "但你內心已經夠火熱了，不需要連外表也上火。" #, c-format msgid "Can be activated to store a single round of " msgid_plural "Can be activated to store up to %i rounds of " -msgstr[0] "" +msgstr[0] "啟動後可儲存多達 %i 發" #: src/iuse_actor.cpp #, c-format msgid "Can be used to assemble: %s" -msgstr "" +msgstr "可用於組裝: %s" #: src/iuse_actor.cpp #, c-format @@ -101617,7 +101938,7 @@ msgstr "收納物品" #: src/iuse_actor.cpp #, c-format msgid "I need a %1$s to consume %2$s!" -msgstr "" +msgstr "你需要 %1$s 才能食用 %2$s！" #: src/iuse_actor.cpp #, c-format @@ -101638,7 +101959,7 @@ msgstr "雕刻哪個物品？" #: src/iuse_actor.cpp #, c-format msgid "Insufficient %s to assemble %s" -msgstr "" +msgstr "沒有足夠的 %s 來組裝 %s" #: src/iuse_actor.cpp msgid "It hurts like hell!" @@ -101675,11 +101996,11 @@ msgstr "切割前請先清空 %s。" #: src/iuse_actor.cpp msgid "Practicing" -msgstr "" +msgstr "練習" #: src/iuse_actor.cpp msgid "Refiting" -msgstr "" +msgstr "修改" #: src/iuse_actor.cpp msgid "Repair what?" @@ -101697,17 +102018,17 @@ msgstr "將倒地的殭屍屠宰成屍奴？" #: src/iuse_actor.cpp msgid "Store ammo" -msgstr "" +msgstr "裝子彈" #: src/iuse_actor.cpp #, c-format msgid "Store ammo in %s" -msgstr "" +msgstr "把子彈裝進 %s" #: src/iuse_actor.cpp #, c-format msgid "That %1$s isn't ammo!" -msgstr "" +msgstr "%1$s 不是子彈！" #: src/iuse_actor.cpp msgid "That arm is broken. It needs surgical attention or a splint." @@ -101737,7 +102058,7 @@ msgstr "%s 對著你的方向發出了識別敵我的警報聲。" #: src/iuse_actor.cpp #, c-format msgid "The %s is empty!" -msgstr "" +msgstr "%s 是空的！" #: src/iuse_actor.cpp #, c-format @@ -101822,7 +102143,7 @@ msgstr "這張 %s 沒有任何新地點。" msgid "" "There's a brazier there but you haven't set it up to contain the fire. " "Continue?" -msgstr "" +msgstr "有個火盆在那，但你還沒設置它來防止火焰蔓延。繼續嗎？" #: src/iuse_actor.cpp msgid "There's nothing to light there." @@ -101840,7 +102161,7 @@ msgstr "嘗試拆解 %s 來代替。" #: src/iuse_actor.cpp #, c-format msgid "Unload %s" -msgstr "" +msgstr "清空 %s" #: src/iuse_actor.cpp #, c-format @@ -101901,7 +102222,7 @@ msgstr "你無法在水下演奏音樂。" #: src/iuse_actor.cpp #, c-format msgid "You can't put your %1$s in your %2$s" -msgstr "" +msgstr "你無法把 %1$s 放到 %2$s 裡。" #: src/iuse_actor.cpp msgid "You can't see to do that!" @@ -101968,7 +102289,7 @@ msgstr "你使用 %s 完畢。" #: src/iuse_actor.cpp #, c-format msgid "You have no items that could be repaired with a %s." -msgstr "" +msgstr "你沒有可用來修理 %s 的物品。" #: src/iuse_actor.cpp #, c-format @@ -101999,7 +102320,7 @@ msgstr "你需要 %s 才行！" #: src/iuse_actor.cpp msgid "You need a syringe to inject this drug" -msgstr "" +msgstr "你需要 注射器 來注射這藥物。" #: src/iuse_actor.cpp msgid "" @@ -102024,7 +102345,7 @@ msgstr "你的 %s 需要電力來源 (簡單的UPS就行了) 。" #: src/iuse_actor.cpp #, c-format msgid "You need to hold or wear %s to play it" -msgstr "" +msgstr "你需要拿著或穿著 %s 才能演奏它。" #: src/iuse_actor.cpp #, c-format @@ -102037,7 +102358,7 @@ msgstr "你挖鼻孔使你的鼻道暢通。" #: src/iuse_actor.cpp msgid "You produce an annoying sound" -msgstr "" +msgstr "你發出一個討人厭的聲音。" #: src/iuse_actor.cpp #, c-format @@ -102066,7 +102387,7 @@ msgstr "你止血了。" #: src/iuse_actor.cpp #, c-format msgid "You store the %1$s in your %2$s" -msgstr "" +msgstr "你把 %1$s 裝入 %2$s" #: src/iuse_actor.cpp msgid "You successfully light a fire." @@ -102098,32 +102419,32 @@ msgstr "你已經設定 %s 的定時裝置，你也許會想要跑遠一點。" #: src/iuse_actor.cpp #, c-format msgid "Your %1$s already contains a different type of ammo" -msgstr "" +msgstr "%1$s 已經裝了不同類型的子彈" #: src/iuse_actor.cpp #, c-format msgid "Your %1$s can't store that type of ammo" -msgstr "" +msgstr "%1$s 無法裝入這類型的子彈" #: src/iuse_actor.cpp #, c-format msgid "Your %1$s is already full" -msgstr "" +msgstr "%1$s 已經滿了" #: src/iuse_actor.cpp #, c-format msgid "Your %1$s is too big to fit in your %2$s" -msgstr "" +msgstr "%1$s 太大，不適合 %2$s" #: src/iuse_actor.cpp #, c-format msgid "Your %1$s is too heavy to fit in your %2$s" -msgstr "" +msgstr "%1$s 太重，不適合 %2$s" #: src/iuse_actor.cpp #, c-format msgid "Your %1$s is too small to fit in your %2$s" -msgstr "" +msgstr "%1$s 太小，不適合 %2$s" #: src/iuse_actor.cpp #, c-format @@ -103485,7 +103806,7 @@ msgstr "特殊遊戲無法使用共享地圖。" #: src/main_menu.cpp msgid "This world requires the game to be compiled with Lua." -msgstr "" +msgstr "這個世界需要遊戲編譯成支援Lua" #: src/main_menu.cpp msgid "Unable to make config directory. Check permissions." @@ -103595,11 +103916,6 @@ msgstr "你解除陷阱失敗，並觸發了！" msgid "You fail to disarm the trap." msgstr "你解除陷阱失敗。" -#: src/map.cpp -#, c-format -msgid "You fumble with the %s's controls." -msgstr "你摸索著 %s 的控制方法。" - #: src/map.cpp #, c-format msgid "You lose control of the %s." @@ -104404,7 +104720,7 @@ msgstr "%s 割了你的手！" #: src/melee.cpp #, c-format msgid "The bugs attack %s" -msgstr "" +msgstr "臭蟲攻擊 %s" #: src/melee.cpp msgid "The ground shifts beneath your feet!" @@ -104696,7 +105012,7 @@ msgstr "你用尾巴螫 %s" #: src/melee.cpp msgid "You swing at the air." -msgstr "" +msgstr "你揮空了。" #: src/melee.cpp msgid "You swing wildly and miss." @@ -105348,7 +105664,7 @@ msgstr "你覺得你會好運到成功弄出這玩意？" #: src/mission.cpp msgid "Have you had any luck finding a radio tower?" -msgstr "" +msgstr "你覺得你有那個運氣找到廣播塔嗎？" #: src/mission.cpp msgid "Have you had any luck severing the connection?" @@ -105776,7 +106092,7 @@ msgstr "我很肯定那裏一定會有什麼... 一定有，你有消息嗎？" #: src/mission.cpp msgid "I'm sure the motorpool has a truck battery you could salvage." -msgstr "" +msgstr "我確定那堆汽車裡一定有顆卡車電池你可以回收。" #: src/mission.cpp msgid "I'm sure the outpost will expand quickly with your assistance." @@ -105911,7 +106227,7 @@ msgstr "要是可能的話，帶一兩個朋友幫忙你。" msgid "" "If you could make some sort of directional antenna, it might help locating " "the radio stations." -msgstr "" +msgstr "如果你做一些定向天線，它可以幫助定位電台。" #: src/mission.cpp msgid "" @@ -107327,7 +107643,7 @@ msgstr "" #: src/mission_companion.cpp #, c-format msgid "Do you wish to liquidate the crop of %d %s for a profit of $%d?" -msgstr "" +msgstr "你想要把 %d 個 %s 以 $%d 的價格變賣嗎？" #: src/mission_companion.cpp #, c-format @@ -107511,7 +107827,7 @@ msgstr "" #: src/mission_companion.cpp #, c-format msgid "The %s are liquidated for $%d..." -msgstr "" +msgstr "%s 變賣獲得 $%d..." #: src/mission_companion.cpp #, c-format @@ -107573,7 +107889,7 @@ msgstr "你想移除哪一個生化插件？" #: src/mission_companion.cpp msgid "Which plants do you want to have harvested?" -msgstr "" +msgstr "你想收穫那些作物？" #: src/mission_companion.cpp msgid "Which seeds do you wish to have planted?" @@ -107614,7 +107930,7 @@ msgstr "你決定再想一想…" #: src/mission_companion.cpp msgid "You decided to hold off for now..." -msgstr "" +msgstr "你想暫緩一下..." #: src/mission_companion.cpp msgid "You don't have any bionics installed..." @@ -107632,7 +107948,7 @@ msgstr "" msgid "" "You don't have enough to pay the workers to harvest the crop so you are " "forced to liquidate..." -msgstr "" +msgstr "你付不起工人的薪水來幫你收割作物，所以你必須變賣它..." #: src/mission_companion.cpp msgid "You have no bionics to install!" @@ -107649,7 +107965,7 @@ msgstr "你沒有能供種植的種子！" #: src/mission_companion.cpp #, c-format msgid "You receive %d %s..." -msgstr "" +msgstr "你收到 %d %s..." #: src/mission_companion.cpp msgid "but was rescued from the debris with only minor injuries!" @@ -107741,7 +108057,7 @@ msgstr "收集 100 顆阿司匹林" #: src/missiondef.cpp msgid "Collect 200 Multivitamin Pills" -msgstr "" +msgstr "收集 200 顆維他命藥丸" #: src/missiondef.cpp msgid "Collect 3 Hotplates" @@ -107753,7 +108069,7 @@ msgstr "收集 30 塊玻璃片" #: src/missiondef.cpp msgid "Cull Nightmares" -msgstr "" +msgstr "撲殺惡夢" #: src/missiondef.cpp msgid "Cut 200 2x4's" @@ -108045,7 +108361,7 @@ msgstr "預設值" #: src/mod_manager.cpp msgid "ITEM ADDITION MODS" -msgstr "" +msgstr "增加物品的模組" #: src/mod_manager.cpp msgid "ITEM EXCLUSION MODS" @@ -108087,11 +108403,11 @@ msgstr "車輛模組" #: src/mod_manager.cpp msgid "list of default mods" -msgstr "" +msgstr "預設模組列表" #: src/mod_manager.cpp msgid "list of mods" -msgstr "" +msgstr "模組列表" #. ~ delimiter for mod dependency enumeration #. ~ delimiter for mod author enumeration @@ -108424,12 +108740,12 @@ msgstr "" #: src/monattack.cpp #, c-format msgid "The %1$s barfs acid on 's %2$s for %3$d damage!" -msgstr "" +msgstr "%1$s 吐出的酸液射中的 %2$s 上，造成 %3$d 傷害！" #: src/monattack.cpp #, c-format msgid "The %1$s barfs acid on your %2$s for %3$d damage!" -msgstr "" +msgstr "%1$s 吐出的酸液射中你的 %2$s 上，造成 %3$d 傷害！" #: src/monattack.cpp #, c-format @@ -108683,12 +108999,12 @@ msgstr "%s 將你認為是警官。並環顧在旁觀看。" #: src/monattack.cpp #, c-format msgid "The %s barfs acid at , but they dodge!" -msgstr "" +msgstr "%s 向吐出酸液，但是他們躲開了！" #: src/monattack.cpp #, c-format msgid "The %s barfs acid at you, but you dodge!" -msgstr "" +msgstr "%s 向你吐出酸液，但是你躲開了！" #: src/monattack.cpp #, c-format @@ -110940,7 +111256,7 @@ msgstr "" #: src/newcharacter.cpp msgid "You cannot save a template with negative unused points." -msgstr "" +msgstr "你不能在點數為負的狀況下把角色存成模板！" #: src/newcharacter.cpp msgid "" @@ -110996,7 +111312,7 @@ msgstr "沒有篩選" #: src/newcharacter.cpp msgid "player template" -msgstr "" +msgstr "玩家模板" #: src/newcharacter.cpp msgid "points" @@ -111014,7 +111330,7 @@ msgstr "%1$s 正說著 \"%2$s\"" #: src/npc.cpp #, c-format msgid "%1$s says something but you can't hear it!" -msgstr "" +msgstr "%1$s 說了什麼，但是你聽不到!!" #: src/npc.cpp #, c-format @@ -111526,7 +111842,7 @@ msgstr "%s 躺下並開始睡覺。" #: src/npcmove.cpp #, c-format msgid "%s looks around nervously, as if searching for something." -msgstr "" +msgstr "%s 緊張地四處張望，彷彿在尋找什麼東西。" #: src/npcmove.cpp #, c-format @@ -111540,7 +111856,7 @@ msgstr "%s 拿走了你的錢！" #: src/npcmove.cpp msgid "" -msgstr "" +msgstr "<飢餓>" #: src/npcmove.cpp #, c-format @@ -111549,7 +111865,7 @@ msgstr " 這樣我才能射到那個 %s！" #: src/npcmove.cpp msgid "" -msgstr "" +msgstr "<口渴>" #: src/npcmove.cpp msgid "Avoid friendly fire" @@ -111563,10 +111879,6 @@ msgstr "別想亂動..." msgid "Drop items" msgstr "丟棄物品" -#: src/npcmove.cpp -msgid "Fire a burst" -msgstr "連發射擊" - #: src/npcmove.cpp msgid "Flee" msgstr "逃跑" @@ -111599,7 +111911,7 @@ msgstr "等等，我要去撿那個 %s。" #: src/npcmove.cpp #, c-format msgid "Hold on, I want to pulp that %s." -msgstr "" +msgstr "等等，我要把 %s 搗爛。" #: src/npcmove.cpp msgid "Hold still, I can heal you more." @@ -111703,12 +112015,12 @@ msgstr " %s 會打壞障礙物。" #: src/npctalk.cpp #, c-format msgid " %s will complain about wounds and needs." -msgstr "" +msgstr "%s 會抱怨傷口跟需求。" #: src/npctalk.cpp #, c-format msgid " %s will leave zombie corpses intact." -msgstr "" +msgstr "%s 將保持殭屍屍體完整" #: src/npctalk.cpp #, c-format @@ -111733,7 +112045,7 @@ msgstr " %s不會使用榴彈。" #: src/npctalk.cpp #, c-format msgid " %s will only complain in an emergency." -msgstr "" +msgstr "%s 只有在緊急情況下才會抱怨。" #: src/npctalk.cpp #, c-format @@ -111753,7 +112065,7 @@ msgstr " %s 累的時候會睡的。" #: src/npctalk.cpp #, c-format msgid " %s will smash nearby zombie corpses." -msgstr "" +msgstr "%s 將砸碎附近的殭屍屍體" #: src/npctalk.cpp #, c-format @@ -111842,7 +112154,7 @@ msgstr "%s 無法拿取所有物品" #: src/npctalk.cpp #, c-format msgid "%s drops the logs off in the garage..." -msgstr "" +msgstr "%s 把原木放進車庫..." #: src/npctalk.cpp #, c-format @@ -111975,7 +112287,7 @@ msgstr "*會攻擊視線內所有敵人。" #: src/npctalk.cpp msgid "*is engaging enemies close enough to attack without moving." -msgstr "" +msgstr "*進犯的敵人是否靠近到不用移動就可以攻擊到。" #: src/npctalk.cpp msgid "*is engaging enemies you attack." @@ -112429,7 +112741,7 @@ msgstr "沒事... *咳去死咳*" #: src/npctalk.cpp msgid "For the right price could I borrow your services?" -msgstr "" +msgstr "我能用適當的價錢租用你的服務嗎?" #: src/npctalk.cpp msgid "Get bent, traitor!" @@ -112578,7 +112890,7 @@ msgstr "希望你來這是要交易的。" #: src/npctalk.cpp msgid "Hopefully moving out here was worth it..." -msgstr "" +msgstr "希望離開這裡是值得的..." #: src/npctalk.cpp msgid "Hordes?" @@ -112594,7 +112906,7 @@ msgstr "有什麼可以幫您的嗎？" #: src/npctalk.cpp msgid "How many refugees are you expecting?" -msgstr "" +msgstr "你預期有多少難民?" #: src/npctalk.cpp msgid "How much further?" @@ -112602,7 +112914,7 @@ msgstr "還有多遠？" #: src/npctalk.cpp msgid "How should I aim?" -msgstr "" +msgstr "我該如何瞄準?" #: src/npctalk.cpp msgid "How?" @@ -112639,7 +112951,7 @@ msgstr "" #: src/npctalk.cpp msgid "I can't imagine what I'd need your assistance with." -msgstr "" +msgstr "想不到我需要你的幫助。" #: src/npctalk.cpp msgid "I can't leave the shelter without equipment..." @@ -112719,7 +113031,7 @@ msgstr "" #: src/npctalk.cpp msgid "I figured you might be looking for some help..." -msgstr "" +msgstr "我想你可能會要一些幫助..." #: src/npctalk.cpp msgid "I guess I'll look somewhere else..." @@ -112762,7 +113074,7 @@ msgstr "我從來沒犯錯過..." #: src/npctalk.cpp msgid "I heard you were setting up an outpost out here..." -msgstr "" +msgstr "我聽說你在這裡建立了一個前哨..." #: src/npctalk.cpp msgid "I hope you are here to do business." @@ -112797,7 +113109,7 @@ msgstr "我需要 %s 來使用它!" #: src/npctalk.cpp msgid "I need help removing an implant..." -msgstr "" +msgstr "幫助我移除植入的插件..." #: src/npctalk.cpp msgid "I need you to come with me." @@ -112856,7 +113168,7 @@ msgstr "我想我應該要雇用一個團隊？" msgid "" "I suppose getting a car up and running should really be useful if we have to " "disappear quickly from here." -msgstr "" +msgstr "如果我們要迅速從這裡消失，我想取得一輛車來行駛應該是很有幫助。" #: src/npctalk.cpp msgid "I thought I smelled a pig. I jest... please don't arrest me." @@ -112930,11 +113242,11 @@ msgstr "" #: src/npctalk.cpp msgid "I was wondering if you could install a cybernetic implant..." -msgstr "" +msgstr "你能否安裝生化插件..." #: src/npctalk.cpp msgid "I'd like to hire your services." -msgstr "" +msgstr "我想雇用你的服務。" #: src/npctalk.cpp msgid "I'd like to know a bit more about you..." @@ -112978,7 +113290,7 @@ msgstr "我會銘記在心。" #: src/npctalk.cpp msgid "I'll talk to him then..." -msgstr "" +msgstr "我會和他交談，然後..." #: src/npctalk.cpp msgid "I'll talk with them then..." @@ -112986,7 +113298,7 @@ msgstr "我會和他們交談，然後..." #: src/npctalk.cpp msgid "I'll try and find your commander then..." -msgstr "" +msgstr "我會嘗試找到你的指揮官，然後..." #: src/npctalk.cpp msgid "I'm a killer for hire." @@ -113045,7 +113357,7 @@ msgstr "我在這裡維護安全。" #: src/npctalk.cpp msgid "I'm interested in investing in agriculture..." -msgstr "" +msgstr "我感興趣的是投資農業..." #: src/npctalk.cpp msgid "I'm just a hired hand. Someone pays me and I do what needs to be done." @@ -113092,11 +113404,11 @@ msgstr "我正在尋找這些怪物的源頭線索..." #: src/npctalk.cpp msgid "I'm looking for information..." -msgstr "" +msgstr "我在找情報..." #: src/npctalk.cpp msgid "I'm looking for new drink recipes." -msgstr "" +msgstr "我在找新的飲料配方。" #: src/npctalk.cpp msgid "I'm looking for some choice systems to hack." @@ -113210,7 +113522,7 @@ msgstr "" #: src/npctalk.cpp msgid "I'm tracking game." -msgstr "" +msgstr "我在跟蹤遊戲。" #: src/npctalk.cpp #, c-format @@ -113221,6 +113533,7 @@ msgid_plural "" "I'm willing to pay $%.2f per batch. You have %d servings for a total of $" "%.2f. No questions asked, here is your cash." msgstr[0] "" +"每批量我會支付 $%.2f。你提供了 %d 次，總值 $%.2f 。不要問問題，這是你的錢。" #: src/npctalk.cpp msgid "" @@ -113372,7 +113685,7 @@ msgstr "不理會屍體" #: src/npctalk.cpp msgid "Let me see what you keep behind the counter..." -msgstr "" +msgstr "讓我來看看你藏了什麼在櫃檯後面..." #: src/npctalk.cpp msgid "Let's go." @@ -113388,7 +113701,7 @@ msgstr "我們來看看你有什麼..." #: src/npctalk.cpp msgid "Let's see what you've managed to find..." -msgstr "" +msgstr "我們來看看你成功發現了什麼..." #: src/npctalk.cpp msgid "Let's trade items." @@ -113717,7 +114030,7 @@ msgstr "待會見。" #: src/npctalk.cpp msgid "Seems like a decent plan..." -msgstr "" +msgstr "似乎是個不俗的計畫..." #: src/npctalk.cpp msgid "Seriously, give me more stuff!" @@ -113816,7 +114129,7 @@ msgstr "你應該在獵物瞄準你以前先發制人。" #: src/npctalk.cpp msgid "Stand still while I get my clippers..." -msgstr "" +msgstr "站在原地當我拿消波器時..." #: src/npctalk.cpp msgid "Stay awake." @@ -113869,7 +114182,7 @@ msgstr "跟我說說據點的情況。" #: src/npctalk.cpp msgid "Tell me more about the scavenging runs..." -msgstr "" +msgstr "跟我說更多關於拾荒者的運作..." #: src/npctalk.cpp msgid "Tell me when you need something." @@ -114067,7 +114380,7 @@ msgstr "" msgid "" "We could look for one of those farms out here. They can provide plenty of " "food and aren't close to the cities." -msgstr "" +msgstr "我們可以找個這樣的農場，他們可以提供大量的食物，而且遠離城市。" #: src/npctalk.cpp msgid "" @@ -114085,7 +114398,7 @@ msgstr "" msgid "" "We should probably stay away from those cities, even if there's plenty of " "useful stuff there." -msgstr "" +msgstr "我們最好遠離那些城市，即使有許多實用的東西在那裡。" #: src/npctalk.cpp msgid "We're friends, aren't we?" @@ -114180,7 +114493,7 @@ msgstr "這樣如何？" #: src/npctalk.cpp msgid "What are you doing down here?" -msgstr "" +msgstr "你在做什麼？" #: src/npctalk.cpp msgid "What are you doing?" @@ -114196,7 +114509,7 @@ msgstr "" #: src/npctalk.cpp msgid "What do you need done?" -msgstr "" +msgstr "你需要什麼呢？" #: src/npctalk.cpp msgid "What is it?" @@ -114212,7 +114525,7 @@ msgstr "你有什麼類型的工作可以給我做？" #: src/npctalk.cpp msgid "What kind of tasks do you have for me?" -msgstr "" +msgstr "你有什麼類型的任務可以給我做？" #: src/npctalk.cpp msgid "What should I do?" @@ -114242,7 +114555,7 @@ msgstr "你在這裡的工作是什麼？" msgid "" "What? I'm a barber... I cut hair. There's demand for cheap cuts and a " "shave out here." -msgstr "" +msgstr "什麼? 我是個理髮師...我剪頭髮。這裡有便宜理髮跟刮鬍子的需求。" #: src/npctalk.cpp msgid "Whatever they did it must have worked since we are still alive..." @@ -114441,7 +114754,7 @@ msgstr "[$10] 我要一份蘭姆酒" #: src/npctalk.cpp msgid "[$12000,7d] 100 logs" -msgstr "" +msgstr "[$12000, 7天] 100 原木" #: src/npctalk.cpp msgid "[$12] I'll take a shot of whiskey" @@ -114449,19 +114762,19 @@ msgstr "[$12] 我要一份威士忌" #: src/npctalk.cpp msgid "[$20,1h] Sure, I could use a bit of help..." -msgstr "" +msgstr "[$20, 1小時] 當然, 我要一點幫助..." #: src/npctalk.cpp msgid "[$200, 30m] I need you to patch me up..." -msgstr "" +msgstr "[$200, 30分] 我需要你醫療我..." #: src/npctalk.cpp msgid "[$2000,1d] 10 logs" -msgstr "" +msgstr "[$2000, 1天] 10 原木" #: src/npctalk.cpp msgid "[$500, 1h] Could you look at me and my companions?" -msgstr "" +msgstr "[$500, 1小時] 你能看顧我跟我的同伴嗎?" #: src/npctalk.cpp msgid "[$5] I'll have a shave" @@ -114485,7 +114798,7 @@ msgstr "[智力 12] 等等，六輛公車跟難民... 你們有多少人還擠 #: src/npctalk.cpp msgid "[MISSION] The captain sent me to get a frequency list from you." -msgstr "" +msgstr "[任務] 隊長派我來向你取得頻率列表" #: src/npctalk.cpp msgid "" @@ -115073,6 +115386,7 @@ msgid "" "crosshair (in tiles version) at distance 10 from the center will display its " "current facing." msgstr "" +"設定為 是，當控制車輛時，將會在距離車輛中心點前方第10格上顯示白色的'X'符號。" #: src/options.cpp msgid "" @@ -115183,7 +115497,7 @@ msgstr "左" #. ~ An algorithm for image scaling. #: src/options.cpp msgid "Linear filtering" -msgstr "" +msgstr "Linear filtering" #: src/options.cpp #, c-format @@ -115248,7 +115562,7 @@ msgstr "狹長" #. ~ An algorithm for image scaling. #: src/options.cpp msgid "Nearest neighbor" -msgstr "" +msgstr "Nearest neighbor" #: src/options.cpp msgid "Never" @@ -115800,11 +116114,11 @@ msgstr " - 註記列表" #: src/overmap.cpp msgid " - Place Overmap Special" -msgstr "" +msgstr "- 放置大地圖特殊:" #: src/overmap.cpp msgid " - Place Overmap Terrain" -msgstr "" +msgstr "- 放置大地圖地形:" #: src/overmap.cpp msgid " - Return to game" @@ -115861,7 +116175,7 @@ msgstr "尋找地點:" #: src/overmap.cpp msgid "Fixed" -msgstr "" +msgstr "固定" #: src/overmap.cpp msgid "Head West. All survivors, head West. Help is waiting." @@ -115890,11 +116204,11 @@ msgstr "備註：" #: src/overmap.cpp msgid "Place overmap special:" -msgstr "" +msgstr "放置大地圖特殊:" #: src/overmap.cpp msgid "Place overmap terrain:" -msgstr "" +msgstr "放置大地圖地形:" #: src/overmap.cpp msgid "Press letter to center on note" @@ -115995,7 +116309,7 @@ msgstr "" #: src/pickup.cpp #, c-format msgid "Dispose of %s and wield %s" -msgstr "" +msgstr "丟棄 %s 並手持 %s" #: src/pickup.cpp msgid "Enter 2 letters (case sensitive):" @@ -116028,7 +116342,7 @@ msgstr "下一頁" #: src/pickup.cpp #, c-format msgid "Not enough capacity to stash %s" -msgstr "" +msgstr "沒有足夠的容量儲存 %s" #: src/pickup.cpp msgid "PICK UP" @@ -116088,7 +116402,7 @@ msgstr "負重 %.1f" #: src/pickup.cpp #, c-format msgid "Wield %s" -msgstr "" +msgstr "手持 %s" #: src/pickup.cpp #, c-format @@ -116198,7 +116512,7 @@ msgstr "“咦？那是什麼？”" #: src/player.cpp msgid "\"I think it's starting to kick in.\"" -msgstr "" +msgstr "\"我想它開始起作用了。\"" #: src/player.cpp msgid "\"Of course... it's all fractals!\"" @@ -116211,7 +116525,7 @@ msgstr "“哦，天啊，發生了什麼事？”" #: src/player.cpp #, c-format msgid "%1$s died on %2$s of year %3$d, day %4$d, at %5$s." -msgstr "" +msgstr "%1$s 死於 %2$s 年 %3$d, %4$d 日, %5$s." #: src/player.cpp #, c-format @@ -116228,7 +116542,7 @@ msgstr "%1$s 開始搔他的 %2$s！" #: src/player.cpp #, c-format msgid "%1$s was %2$s when the apocalypse began." -msgstr "" +msgstr " %1$s 是 %2$s 當大災變發生時。" #. ~ First parameter is a pronoun ("He"/"She"), second parameter is a terrain name, third parameter is a city name. #: src/player.cpp @@ -116269,7 +116583,7 @@ msgstr "%1$s | %2$s | %3$s" #: src/player.cpp #, c-format msgid "%1$s's %2$s puncture %3$s in mid-attack!" -msgstr "" +msgstr "%1$s 的 %2$s 對 %3$s 穿刺攻擊！" #: src/player.cpp #, c-format @@ -116321,11 +116635,11 @@ msgstr "*呵啊* 你真的應該要睡了。" #: src/player.cpp msgid "Skills:\n" -msgstr "" +msgstr "技能:\n" #: src/player.cpp msgid "Time required:\n" -msgstr "" +msgstr "所需時間:\n" #: src/player.cpp #, c-format @@ -116438,12 +116752,12 @@ msgstr "啊啊啊啊啊啊啊！" msgid "" "Alertness comes somewhat fast, and your muscles stretch easier than before " "you went to bed." -msgstr "" +msgstr "你很快地醒來，而且肌肉伸展比睡前還要輕鬆。" #: src/player.cpp msgid "" "Alertness seems flighty today, and your body argues when you move towards it." -msgstr "" +msgstr "今天的警覺性反覆無常，當你前進時你的身體向你抗議著。" #: src/player.cpp msgid "Anywhere would be a good place to sleep..." @@ -116463,18 +116777,18 @@ msgstr "%1$s 附加到你的 %2$s 上?" #: src/player.cpp msgid "" "Awareness comes fast, your body coming quickly to attention after your rest." -msgstr "" +msgstr "很快醒來，休息後你的身體意興高昂。" #: src/player.cpp msgid "" "Awareness seems to only come with a battle... and your body seem to be on " "its side." -msgstr "" +msgstr "似乎只有戰鬥的意識...你的身體好像在另一端" #. ~Sound of buzzing Insect Wings #: src/player.cpp msgid "BZZZZZ" -msgstr "" +msgstr "BZZZZZ" #: src/player.cpp msgid "Base HP:" @@ -116513,11 +116827,11 @@ msgstr "生化插件:" #: src/player.cpp msgid "" "Bleary-eyed and half-asleep, you consider why you are doing this to yourself." -msgstr "" +msgstr "睡眼惺忪半夢半醒間，你思考著為何這樣對待自己。" #: src/player.cpp msgid "Break" -msgstr "" +msgstr "打斷" #: src/player.cpp #, c-format @@ -116696,12 +117010,12 @@ msgstr "死於興奮劑過量。" #: src/player.cpp msgctxt "memorial_female" msgid "Died of adrenaline overdose." -msgstr "" +msgstr "死於腎上腺素過量。" #: src/player.cpp msgctxt "memorial_male" msgid "Died of adrenaline overdose." -msgstr "" +msgstr "死於腎上腺素過量。" #: src/player.cpp msgctxt "memorial_female" @@ -116852,23 +117166,23 @@ msgstr "遊戲歷史" #: src/player.cpp msgid "" "Getting out of bed doesn't seem too hard today. You could get used to this!" -msgstr "" +msgstr "今天很容易起床。你會習慣的!" #: src/player.cpp msgid "" "Getting out of bed only comes with great difficulty, and your muscles resist " "the movement." -msgstr "" +msgstr "你非常不想起床，而且你的身體不想動。" #: src/player.cpp msgid "Getting up comes easy to you, your muscles revitalized after your rest." -msgstr "" +msgstr "你很輕鬆地起床，休息後肌肉恢復活力。" #: src/player.cpp msgid "" "Getting up seems like it should be easy, but all you want to do is go back " "to bed." -msgstr "" +msgstr "起床看似很容易，但你只想繼續睡。" #: src/player.cpp msgid "Glowing lights surround you, and you teleport." @@ -116879,10 +117193,6 @@ msgstr "你被光束圍繞，然後被傳送走了。" msgid "Good mood +%s%d%%" msgstr "好心情 +%s%d%%" -#: src/player.cpp -msgid "Gun:" -msgstr "槍:" - #: src/player.cpp msgid "He" msgstr "他" @@ -117058,7 +117368,7 @@ msgstr "修補" #: src/player.cpp msgid "Mend which fault?" -msgstr "" +msgstr "修補哪個故障?" #: src/player.cpp msgid "Near starving" @@ -117238,7 +117548,7 @@ msgstr "真的要吃 %s？" #: src/player.cpp msgid "Reduces the speed at which you can handle or manipulate items\n" -msgstr "" +msgstr "降低你處理或操控物品的速度\n" #: src/player.cpp #, c-format @@ -117317,7 +117627,7 @@ msgstr "當這東西死掉時，你的內心翻騰。" #: src/player.cpp msgid "Something you are wearing hinders the use of both hands." -msgstr "" +msgstr "你穿戴的東西阻礙了使用雙手" #: src/player.cpp #, c-format @@ -117460,7 +117770,7 @@ msgstr[0] "技巧:" #: src/player.cpp msgid "Thats a LOT of plutonium. Are you sure you want that much?" -msgstr "" +msgstr "那可是很多的鈽，你確定你要那麼多？" #: src/player.cpp #, c-format @@ -117470,7 +117780,7 @@ msgstr "你僅有的一支手拿不了 %s。" #: src/player.cpp #, c-format msgid "The %s doesn't have any faults to mend." -msgstr "" +msgstr "%s 沒有任何故障可供修補。" #: src/player.cpp #, c-format @@ -117551,11 +117861,11 @@ msgstr "" #: src/player.cpp msgid "The sunlight is really irritating your eyes." -msgstr "" +msgstr "陽光非常刺眼!" #: src/player.cpp msgid "The sunlight is really irritating your skin." -msgstr "" +msgstr "陽光非常強烈，刺激你的皮膚。" #: src/player.cpp #, c-format @@ -117653,7 +117963,7 @@ msgstr "時間好像慢了下來一樣而你本能地躲開了！" msgid "" "Tired hands rub at your eyes, the little aches of yesterday protesting your " "stretches." -msgstr "" +msgstr "疲憊的雙手揉著眼，伸展時能感受到昨天的疼痛。" #: src/player.cpp msgid "Toggle skill training" @@ -117661,7 +117971,7 @@ msgstr "切換技能訓練" #: src/player.cpp msgid "Toggle which fault?" -msgstr "" +msgstr "切換哪個故障?" #: src/player.cpp #, c-format @@ -117838,7 +118148,7 @@ msgstr "你已經穿戴了。" #: src/player.cpp #, c-format msgid "You are being grabbed by %s, but you bat it away!" -msgstr "" +msgstr "你被%s抓住，但是你把它打飛了。" #: src/player.cpp #, c-format @@ -117934,7 +118244,7 @@ msgstr "你穿著其他動力裝甲部件時無法直接脫下動力裝甲。" #: src/player.cpp #, c-format msgid "You can't wear %i or more %s at once." -msgstr "" +msgstr "你無法一次穿上 %i 或更多的 %s" #: src/player.cpp #, c-format @@ -117955,7 +118265,7 @@ msgstr "你不能把動力裝甲穿在其他裝備之上！" #: src/player.cpp msgid "You can't wear that, it's filthy!" -msgstr "" +msgstr "你無法穿戴它，它很髒!" #: src/player.cpp msgid "You can't wear that, it's made of wool!" @@ -117964,12 +118274,12 @@ msgstr "你無法穿戴羊毛製品！" #: src/player.cpp #, c-format msgid "You cannot swap the side on which your %s is worn." -msgstr "" +msgstr "你不能在穿著 %s 時將它換邊。" #: src/player.cpp #, c-format msgid "You cannot unwield your %s" -msgstr "" +msgstr "你不能放開你的 %s 。" #: src/player.cpp #, c-format @@ -117993,7 +118303,7 @@ msgstr "你分解成了美麗的陣陣能量。你的生命漸漸消逝。" #: src/player.cpp msgid "You don't have a hand free to wear that." -msgstr "" +msgstr "你的手沒空來穿它" #: src/player.cpp msgid "You don't have compatible guns." @@ -118022,11 +118332,11 @@ msgstr "你身上的輻射感測器傳來一陣反常的感覺。" #: src/player.cpp msgid "You feel awful, and every ache from yesterday is still there." -msgstr "" +msgstr "你覺得很糟糕，而且昨天的所有疼痛都依然存在。" #: src/player.cpp msgid "You feel cruddy. Maybe you should consider eating a bit healthier." -msgstr "" +msgstr "你感到難受。或許你應該吃得健康點。" #: src/player.cpp msgid "You feel dizzy for a moment." @@ -118048,12 +118358,12 @@ msgstr "你感覺很不錯，健康的生活似乎會有一些回饋。" msgid "" "You feel great! It doesn't seem like wounds could even slow you down for " "more than a day." -msgstr "" +msgstr "你覺得好極了! 就像傷口無法減慢你的速度。" #: src/player.cpp msgid "" "You feel like a rubber ball; whatever hits you, you'll just bounce back!" -msgstr "" +msgstr "你覺得自己像顆皮球，不論甚麼打了你，只會反彈回去。" #: src/player.cpp msgid "You feel like you haven't slept in days." @@ -118135,17 +118445,17 @@ msgstr "你覺得你的 %s 變得溫熱。" #: src/player.cpp msgid "" "You get up feeling horrible, as if something was messing with your body." -msgstr "" +msgstr "你起床的感覺糟透了，像似有甚麼東西攪亂了你的身體。" #: src/player.cpp msgid "" "You get up feeling pretty good, as if all your little aches were fading " "faster." -msgstr "" +msgstr "起床後你感覺非常棒，似乎你所有的小痠痛都快速地消失了。" #: src/player.cpp msgid "You get up with a bit of a scratch in your throat." -msgstr "" +msgstr "你喉嚨有些搔癢地起床了。" #: src/player.cpp msgid "You have a sudden heart attack!" @@ -118187,12 +118497,12 @@ msgstr "你已經學會了這本書的所有配方。" #: src/player.cpp #, c-format msgid "You lack the %s to use the %s" -msgstr "" +msgstr "你缺少%s來使用%s" #: src/player.cpp #, c-format msgid "You lack the skill in %s to use the %s" -msgstr "" +msgstr "你沒有足夠的%s技能來使用%s" #: src/player.cpp #, c-format @@ -118260,7 +118570,7 @@ msgstr "你繼續工作。" #: src/player.cpp msgid "You retched, but your stomach is empty." -msgstr "" +msgstr "你乾嘔，但你的胃是空的。" #: src/player.cpp msgid "You scream loudly!" @@ -118324,12 +118634,12 @@ msgstr "你開始不由自主的顫抖。" #: src/player.cpp msgid "You stretch, but your muscles don't seem to be doing so good today." -msgstr "" +msgstr "你伸展身體，但是今天你的肌肉似乎狀況不佳。" #: src/player.cpp msgid "" "You struggle to awareness. Being awake seems somewhat harder to reach today." -msgstr "" +msgstr "你掙扎著醒來，今天似乎很難保持清醒。" #: src/player.cpp msgid "You succumb to the infection." @@ -118386,7 +118696,7 @@ msgstr "你遭受放電時的疼痛！" #: src/player.cpp #, c-format msgid "You swap the side on which your %s is worn." -msgstr "" +msgstr "你將穿著的 %s 換邊。" #: src/player.cpp #, c-format @@ -118533,19 +118843,19 @@ msgstr "你累得一直打哈欠。" msgid "" "You're up and going rather quickly, and all the little aches from yesterday " "are gone." -msgstr "" +msgstr "你很快地起床，而且昨天所有的小痠痛都消失了。" #: src/player.cpp msgid "" "You're up and you feel fantastic. No sickness is going to keep you down " "today!" -msgstr "" +msgstr "你起床，你覺得太棒了! 今天沒有病痛拖累你!" #: src/player.cpp msgid "" "You're up and your little pains from before seem to have faded away rather " "quickly." -msgstr "" +msgstr "你起來而且之前的小傷痛很快地消失了。" #: src/player.cpp msgid "You're up, but your body seems like it would rather stay in bed." @@ -118562,7 +118872,7 @@ msgstr "你因口渴而變得虛弱。" #: src/player.cpp #, c-format msgid "You've spotted a %1$s to the %2$s!" -msgstr "" +msgstr "你發現 %1$s 在你的 %2$s！" #: src/player.cpp #, c-format @@ -118694,7 +119004,7 @@ msgstr "你被自己的蛛肢妨礙到。" #: src/player.cpp msgid "Your asthma attack stops." -msgstr "" +msgstr "你的哮喘發作停止。" #: src/player.cpp msgid "" @@ -118738,7 +119048,7 @@ msgstr "你的身體被超重拖累！" #: src/player.cpp msgid "Your body stretches with ease, and you feel ready to take on the world." -msgstr "" +msgstr "你的身體伸展自如，你準備好迎接這個世界。" #: src/player.cpp msgid "Your bones feel like rubber as they melt and remend." @@ -118786,13 +119096,13 @@ msgstr "你的服裝限制了你蟲肢的行動。" msgid "" "Your eyes open and your entire body feels like it is just bursting with " "energy to burn!" -msgstr "" +msgstr "你睜開眼睛而起整個身體充滿了能量!" #: src/player.cpp msgid "" "Your eyes struggle to open, and your muscles ache like you didn't sleep at " "all." -msgstr "" +msgstr "你的眼睛勉強張開，你的身體好像沒睡過一樣痠痛。" #: src/player.cpp msgid "Your eyes won't focus without reading glasses." @@ -118944,7 +119254,7 @@ msgstr "你抽筋了。" #: src/player.cpp #, c-format msgid "Your mutation %s prevents you from wearing that %s." -msgstr "" +msgstr "你的突變 %s 不允許你穿戴 %s" #: src/player.cpp #, c-format @@ -119110,10 +119420,6 @@ msgstr "鹿角" msgid "armor" msgstr "裝甲" -#: src/player.cpp -msgid "auto" -msgstr "自動" - #: src/player.cpp msgid "beep-beep-beep!" msgstr "嗶-嗶-嗶！" @@ -119126,10 +119432,6 @@ msgstr "毛髮" msgid "horns" msgstr "牛角" -#: src/player.cpp -msgid "off " -msgstr "關" - #: src/player.cpp msgid "quills" msgstr "硬刺" @@ -120370,7 +120672,7 @@ msgstr "以及機械技能 %2$d 級" #: src/veh_interact.cpp #, c-format msgid "* Faulty %1$s" -msgstr "" +msgstr "* 故障 %1$s" #: src/veh_interact.cpp #, c-format @@ -120502,7 +120804,7 @@ msgstr "選擇新車頭燈的照射方向。" #: src/veh_interact.cpp msgid "Choose a part here to mend:" -msgstr "" +msgstr "選擇要修補的零件:" #: src/veh_interact.cpp msgid "Choose a part here to remove:" @@ -120579,12 +120881,12 @@ msgstr "內部" #: src/veh_interact.cpp #, c-format msgid "K aerodynamics: %3d%%" -msgstr "" +msgstr "氣體力學: %3d%%" #: src/veh_interact.cpp #, c-format msgid "K friction: %3d%%" -msgstr "" +msgstr "摩擦: %3d%%" #: src/veh_interact.cpp #, c-format @@ -120629,7 +120931,7 @@ msgstr "新標籤：" #: src/veh_interact.cpp msgid "No faulty parts here." -msgstr "" +msgstr "這裡沒有故障的零件。" #: src/veh_interact.cpp msgid "No parts here." @@ -120717,6 +121019,8 @@ msgid "" "To change a wheel you need a wrench and either lifting equipment or %4$d strength." msgstr "" +"你需要扳手，以及起重裝置 或是%4$d 點力量才可替換輪胎。" #: src/veh_interact.cpp msgctxt "Vehicle Parts|" @@ -120853,6 +121157,8 @@ msgid "" "You need a wrench and a hacksaw, cutting " "torch and welding goggles, or circular saw (off) and" msgstr "" +"你需要 扳手，鋼鋸、焊槍及焊接護目鏡，或 圓鋸" +"機 (關)，以及" #: src/veh_interact.cpp #, c-format @@ -120953,7 +121259,7 @@ msgstr "破損" #: src/vehicle.cpp msgid " (faulty)" -msgstr "" +msgstr "(故障)" #. ~ used/total volume of a cargo vehicle part #: src/vehicle.cpp @@ -120964,17 +121270,12 @@ msgstr " (容量: %d/%d)" #: src/vehicle.cpp #, c-format msgid "%2.1fL " -msgstr "" +msgstr "%2.1fL" #: src/vehicle.cpp #, c-format msgid "%d\"" -msgstr "" - -#: src/vehicle.cpp -#, c-format -msgid "%s failed to fire! It isn't loaded and/or powered." -msgstr "%s 無法射擊！尚未裝填彈藥或充電。" +msgstr "%d\"" #: src/vehicle.cpp #, c-format @@ -121011,10 +121312,6 @@ msgid "" "trying to fold the %s while riding it." msgstr "車輛下方的金屬條就要夾到你了。你最好不要在搭乘的時候把 %s 折疊起來。" -#: src/vehicle.cpp -msgid "Auto" -msgstr "自動" - #. ~ backfire sound #: src/vehicle.cpp msgid "BANG!" @@ -121027,19 +121324,19 @@ msgstr "嗶嗶！" #: src/vehicle.cpp msgid "BEEEThump" -msgstr "" +msgstr "BEEEThump" #: src/vehicle.cpp msgid "BLEEEEEEP" -msgstr "" +msgstr "BLEEEEEEP" #: src/vehicle.cpp msgid "BRRROARRR!!" -msgstr "" +msgstr "BRRROARRR!!" #: src/vehicle.cpp msgid "BRUMBRUMBRUMBRUM!!!" -msgstr "" +msgstr "BRUMBRUMBRUMBRUM!!!" #: src/vehicle.cpp msgid "Camera system disabled" @@ -121059,7 +121356,7 @@ msgstr "無法目標瞄準： 所有槍塔離線中" #: src/vehicle.cpp msgid "Clanggggg!" -msgstr "" +msgstr "Clanggggg!" #: src/vehicle.cpp msgid "Clank!" @@ -121071,16 +121368,12 @@ msgstr "淨空目標中" #: src/vehicle.cpp msgid "Clink" -msgstr "" +msgstr "叮噹聲" #: src/vehicle.cpp msgid "Close" msgstr "關閉" -#: src/vehicle.cpp -msgid "Configure individual turrets" -msgstr "設定單一槍塔" - #: src/vehicle.cpp msgid "Control individual engines" msgstr "控制各別引擎" @@ -121095,34 +121388,12 @@ msgstr "定速駕駛啟動" #: src/vehicle.cpp msgid "Cugugugugug" -msgstr "" - -#: src/vehicle.cpp -msgid "Cycle turret mode" -msgstr "切換槍塔模式" - -#: src/vehicle.cpp -msgid "Deactivating automatic target acquisition for this turret" -msgstr "正在關閉槍塔的自動索敵裝置。" +msgstr "Cugugugugug" #: src/vehicle.cpp msgid "Disable cruise control" msgstr "關閉定速駕駛" -#: src/vehicle.cpp -msgid "Disable turrets" -msgstr "停用槍塔" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling automatic target acquisition on %s" -msgstr "關閉 %s 的自動索敵裝置" - -#: src/vehicle.cpp -#, c-format -msgid "Disabling turret %s." -msgstr "停用槍塔 %s。" - #: src/vehicle.cpp msgid "Do nothing" msgstr "不做任何事" @@ -121139,10 +121410,6 @@ msgstr "車頂燈啟動" msgid "Enable cruise control" msgstr "啟動定速駕駛" -#: src/vehicle.cpp -msgid "Enable turrets" -msgstr "啟動槍塔" - #. ~ indicates that a vehicle part is outside #: src/vehicle.cpp msgid "Exterior" @@ -121197,7 +121464,7 @@ msgstr "內部" #: src/vehicle.cpp msgid "Ker-chunk" -msgstr "" +msgstr "Ker-chunk" #: src/vehicle.cpp #, c-format @@ -121223,16 +121490,12 @@ msgstr "這裡有更多的零件..." #: src/vehicle.cpp msgid "NEEeu NEEeu NEEeu" -msgstr "" +msgstr "NEEeu NEEeu NEEeu" #: src/vehicle.cpp msgid "No controls there." msgstr "沒有控制器在那." -#: src/vehicle.cpp -msgid "No target" -msgstr "無目標" - #: src/vehicle.cpp msgid "Open" msgstr "開啟" @@ -121263,7 +121526,7 @@ msgstr "犁具已關閉" #: src/vehicle.cpp msgid "ROARRR!" -msgstr "" +msgstr "ROARRR!" #: src/vehicle.cpp msgid "Reactor turned off" @@ -121298,19 +121561,16 @@ msgid "Select door to toggle" msgstr "選擇要切換的門" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to buggy mode." -msgstr "設定槍塔 %s 為臭蟲模式。" +msgid "Set turret firing modes" +msgstr "" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to burst mode." -msgstr "設定槍塔 %s 為連發模式。" +msgid "Set turret targeting" +msgstr "" #: src/vehicle.cpp -#, c-format -msgid "Setting turret %s to single-fire mode." -msgstr "設定槍塔 %s 為單發模式。" +msgid "Set turret targeting modes" +msgstr "" #: src/vehicle.cpp msgid "Stop controlling" @@ -121326,7 +121586,7 @@ msgstr "咻！" #: src/vehicle.cpp msgid "Swish" -msgstr "" +msgstr "沙沙聲" #: src/vehicle.cpp #, c-format @@ -121357,6 +121617,11 @@ msgstr "%1$s 的 %s 輾過了 %2$s。" msgid "The %s doesn't have enough wheels to move!" msgstr "%s 沒有足夠的輪子無法移動！" +#: src/vehicle.cpp +#, c-format +msgid "The %s is stuck." +msgstr "" + #: src/vehicle.cpp #, c-format msgid "The %s is too leaky!" @@ -121446,7 +121711,7 @@ msgstr "警報聲停止了。" #: src/vehicle.cpp msgid "The chimes won't come on!" -msgstr "" +msgstr "音樂鈴發不出聲音!" #: src/vehicle.cpp msgid "The dome lights won't come on!" @@ -121492,14 +121757,6 @@ msgstr "音響發不出聲音！" msgid "The vehicle part you were working on has gone!" msgstr "你在處理的車輛零件消失了！" -#: src/vehicle.cpp -msgid "This turret can't be aimed manually" -msgstr "這座槍塔不能以手動方式瞄準" - -#: src/vehicle.cpp -msgid "This turret doesn't have enough ammo" -msgstr "這座槍塔沒有足夠的彈藥。" - #: src/vehicle.cpp msgid "This turret is not powered" msgstr "這座槍塔沒有電" @@ -121666,37 +121923,17 @@ msgstr "開啟音樂鈴" msgid "Turned on music" msgstr "啟動音樂" -#: src/vehicle.cpp -msgid "Turret system is on, but all turrets are configured not to shoot." -msgstr "槍塔系統已啟動，但是所有槍塔皆設定為停止開火。" - -#: src/vehicle.cpp -msgid "Turrets have been configured, but the vehicle turret system is off." -msgstr "槍塔已設定，但是車輛槍塔系統是關閉的。" - -#: src/vehicle.cpp -msgid "Turrets: Disabled" -msgstr "槍塔: 停用" - -#: src/vehicle.cpp -msgid "Turrets: Enabled" -msgstr "槍塔: 啟動" - -#: src/vehicle.cpp -msgid "Unseen" -msgstr "看不見。" - #: src/vehicle.cpp msgid "Vehicle controls" msgstr "車輛控制" #: src/vehicle.cpp msgid "WHOOP WHOOP" -msgstr "" +msgstr "WHOOP WHOOP" #: src/vehicle.cpp msgid "WREEP" -msgstr "" +msgstr "WREEP" #: src/vehicle.cpp msgid "Whirrrr" @@ -121790,7 +122027,7 @@ msgstr "你的 %1$s's %2$s 撞到了 %3$s 並且卡住了!" #: src/vehicle.cpp #, c-format msgid "Your %1$s's %2$s rams into %3$s with a %4$s" -msgstr "" +msgstr "你 %1$s 的 %2$s 撞到了 %3$s，發出 %4$s 的聲響。" #. ~ 1$s - vehicle name, 2$s - part name, 3$s - NPC or monster #: src/vehicle.cpp @@ -121802,7 +122039,7 @@ msgstr "你的 %1$s's %2$s 撞到了 %3$s!。" #: src/vehicle.cpp #, c-format msgid "Your %1$s's %2$s rams into %3$s." -msgstr "" +msgstr "你的 %1$s's %2$s 撞到了 %3$s。" #: src/vehicle.cpp msgid "Your engine emits a high pitched whine." @@ -121816,6 +122053,10 @@ msgstr "你的引擎發出很大的摩擦聲。" msgid "a simple melody blaring from the loudspeakers." msgstr "喇叭發出響亮刺耳的簡單旋律" +#: src/vehicle.cpp +msgid "auto" +msgstr "自動" + #. ~ Beeper sound #: src/vehicle.cpp msgid "beep!" @@ -121828,19 +122069,23 @@ msgstr "摺疊的 %s" #: src/vehicle.cpp msgid "hummm!" +msgstr "hummm!" + +#: src/vehicle.cpp +msgid "manual" msgstr "" #: src/vehicle.cpp msgid "roarrr!" -msgstr "" +msgstr "roarrr!" #: src/vehicle.cpp msgid "vroom!" -msgstr "" +msgstr "vroom!" #: src/vehicle.cpp msgid "whirrr!" -msgstr "" +msgstr "whirrr!" #: src/vehicle_group.cpp msgid "pile-up" @@ -122111,7 +122356,7 @@ msgstr "設定 '%s' 為.." #: src/wish.cpp msgid "Set to 0" -msgstr "" +msgstr "設為 0" #: src/wish.cpp msgid "Set to 10" From 44b430858b0ea94641c736a05430d3bc97e3907f Mon Sep 17 00:00:00 2001 From: illi-kun Date: Thu, 9 Jun 2016 22:57:21 +0300 Subject: [PATCH 103/110] Displayed where? --- src/help.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/help.cpp b/src/help.cpp index 836212c5feb1d..b14f3bee890d8 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -388,7 +388,7 @@ constantly working, whereas others need to be toggled on and off as needed." ) ) text.push_back( _( "\ Most bionics require a source of power, and you will need an internal battery \ -to store energy for them. Your current amount of energy is displayed below \ +to store energy for them. Your current amount of energy is displayed in the sidebar right below \ your health. Replenishing energy can be done in a variety of ways, but all \ require the installation of a special bionic just for fuel consumption." ) ); From 65befe43fdd41e609099191b859cf36198feeaa7 Mon Sep 17 00:00:00 2001 From: illi-kun Date: Thu, 9 Jun 2016 23:17:44 +0300 Subject: [PATCH 104/110] Describe bodypart slots and possibility of CBMs removing --- src/help.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/help.cpp b/src/help.cpp index b14f3bee890d8..1714a118a9406 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -399,6 +399,12 @@ requires high levels of intelligence, first aid, mechanics, and electronics. Bew cripple you! Many bionic canisters are difficult to find, but may be purchased from certain \ wandering vagabonds for a very high price." ) ); + text.push_back( _( "\ +As you may note, all of your body parts have only limited space for containing bionics, \ +so you should choose bionics for installation wisely. Of course, any bionic can be removed \ +from your body but it's not any easier than its installation; \ +this non-trivial surgical procedure requires special tools (and many, many painkillers)." ) ); + return text; } From 5c29f686ef8567529cf04c4503e5dd53ccf61a19 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Tue, 7 Jun 2016 23:46:52 +0000 Subject: [PATCH 105/110] Revert "Add simplified nutrition mod" This reverts commit aa0b805a1f9dc5dea2b46aa1c753afb360c2d757. --- data/mods/No_Magazines/modinfo.json | 2 +- data/mods/novitamins/modinfo.json | 16 ---------- src/consumption.cpp | 4 --- src/game.cpp | 11 ------- src/game.h | 9 ------ src/init.cpp | 5 ++- src/item_factory.cpp | 49 +++++++++++++++-------------- src/item_factory.h | 6 ++++ 8 files changed, 34 insertions(+), 68 deletions(-) delete mode 100644 data/mods/novitamins/modinfo.json diff --git a/data/mods/No_Magazines/modinfo.json b/data/mods/No_Magazines/modinfo.json index 9525560d07b65..898e13f91e599 100644 --- a/data/mods/No_Magazines/modinfo.json +++ b/data/mods/No_Magazines/modinfo.json @@ -9,7 +9,7 @@ "category": "item_exclude", "path": "modinfo.json" },{ - "type": "GAME_OPTION", + "type": "ITEM_OPTION", "options": [ "blacklist_magazines" ] } ] diff --git a/data/mods/novitamins/modinfo.json b/data/mods/novitamins/modinfo.json deleted file mode 100644 index ab98348361e21..0000000000000 --- a/data/mods/novitamins/modinfo.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "type": "MOD_INFO", - "mod-type": "SUPPLEMENTAL", - "ident": "novitamins", - "name": "Simplified nutrition", - "author": "Mugling", - "description": "Disables vitamin requirements.", - "category": "rebalance", - "path": "modinfo.json" - }, - { - "type": "GAME_OPTION", - "options": [ "no_vitamins" ] - } -] diff --git a/src/consumption.cpp b/src/consumption.cpp index 3c291c20dd32d..b7300e6ad4249 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -124,10 +124,6 @@ int player::vitamin_mod( const vitamin_id &vit, int qty, bool capped ) int player::vitamin_get( const vitamin_id &vit ) const { - if( g->has_option( "no_vitamins" ) ) { - return 0; - } - const auto &v = vitamin_levels.find( vit ); return v != vitamin_levels.end() ? v->second : 0; } diff --git a/src/game.cpp b/src/game.cpp index 651cd2761cfd6..a4455e15882ad 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -14779,14 +14779,3 @@ overmap &game::get_cur_om() const const tripoint pos_om = sm_to_om_copy( sm ); return overmap_buffer.get( pos_om.x, pos_om.y ); } - -void game::load_game_option( JsonObject &jo ) -{ - auto arr = jo.get_array( "options" ); - if( arr.empty() ) { - jo.throw_error( "no options specified", "options" ); - } - while( arr.has_more() ) { - options.emplace( arr.next_string() ); - } -} diff --git a/src/game.h b/src/game.h index 14c3c35683ab0..16f47d0a16a68 100644 --- a/src/game.h +++ b/src/game.h @@ -945,15 +945,6 @@ class game void move_save_to_graveyard(); bool save_player_data(); - - /** Options can be specified by mods from JSON using GAME_OPTION */ - void load_game_option( JsonObject& jo ); - std::set options; - - public: - bool has_option( const std::string& opt ) { - return options.count( opt ); - } }; #endif diff --git a/src/init.cpp b/src/init.cpp index 262567edddd80..2c4c134191706 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -203,8 +203,8 @@ void DynamicDataLoader::initialize() &Item_factory::load_item_blacklist); type_function_map["ITEM_WHITELIST"] = new ClassFunctionAccessor(item_controller, &Item_factory::load_item_whitelist); - - type_function_map[ "GAME_OPTION" ] = new ClassFunctionAccessor( g, &game::load_game_option ); + type_function_map["ITEM_OPTION"] = new ClassFunctionAccessor(item_controller, + &Item_factory::load_item_option); // ...unimplemented? type_function_map["INSTRUMENT"] = new StaticFunctionAccessor(&load_ingored_type); @@ -366,7 +366,6 @@ void DynamicDataLoader::unload_data() scenario::reset(); gates::reset(); reset_overlay_ordering(); - g->options.clear(); // TODO: // NameGenerator::generator().clear_names(); diff --git a/src/item_factory.cpp b/src/item_factory.cpp index 2a3e0e6ae2be6..baecec552692d 100644 --- a/src/item_factory.cpp +++ b/src/item_factory.cpp @@ -21,13 +21,10 @@ #include "catacharset.h" #include "init.h" #include "generic_factory.h" -#include "game.h" #include #include -extern class game *g; - static const std::string category_id_guns("guns"); static const std::string category_id_ammo("ammo"); static const std::string category_id_weapons("weapons"); @@ -48,6 +45,8 @@ static t_string_set item_blacklist; static t_string_set item_whitelist; static bool item_whitelist_is_exclusive = false; +static std::set item_options; + std::unique_ptr item_controller( new Item_factory() ); static void set_allergy_flags( itype &item_template ); @@ -147,25 +146,21 @@ void Item_factory::finalize() { set_allergy_flags( *e.second ); hflesh_to_flesh( *e.second ); - if( obj.comestible ) { - if( g->has_option( "no_vitamins" ) ) { - obj.comestible->vitamins.clear(); - - } else if( obj.comestible->vitamins.empty() && obj.comestible->healthy >= 0 ) { - // default vitamins of healthy comestibles to their edible base materials if none explicitly specified - auto healthy = std::max( obj.comestible->healthy, 1 ) * 10; - - auto mat = obj.materials; - mat.erase( std::remove_if( mat.begin(), mat.end(), []( const string_id &m ) { - return !m.obj().edible(); // @todo migrate inedible comestibles to appropriate alternative types - } ), mat.end() ); - - // for comestibles composed of multiple edible materials we calculate the average - for( const auto &v : vitamin::all() ) { - if( obj.comestible->vitamins.find( v.first ) == obj.comestible->vitamins.end() ) { - for( const auto &m : mat ) { - obj.comestible->vitamins[ v.first ] += ceil( m.obj().vitamin( v.first ) * healthy / mat.size() ); - } + // default vitamins of healthy comestibles to their edible base materials if none explicitly specified + if( obj.comestible && obj.comestible->vitamins.empty() && obj.comestible->healthy >= 0 ) { + + auto healthy = std::max( obj.comestible->healthy, 1 ) * 10; + + auto mat = obj.materials; + mat.erase( std::remove_if( mat.begin(), mat.end(), []( const string_id &m ) { + return !m.obj().edible(); // @todo migrate inedible comestibles to appropriate alternative types + } ), mat.end() ); + + // for comestibles composed of multiple edible materials we calculate the average + for( const auto &v : vitamin::all() ) { + if( obj.comestible->vitamins.find( v.first ) == obj.comestible->vitamins.end() ) { + for( const auto &m : mat ) { + obj.comestible->vitamins[ v.first ] += ceil( m.obj().vitamin( v.first ) * healthy / mat.size() ); } } } @@ -196,7 +191,7 @@ void Item_factory::finalize_item_blacklist() // Can't be part of the blacklist loop because the magazines might be // deleted before the guns are processed. - const bool magazines_blacklisted = g->has_option( "blacklist_magazines" ); + const bool magazines_blacklisted = item_options.count("blacklist_magazines"); if( magazines_blacklisted ) { for( auto& e : m_templates ) { @@ -266,6 +261,11 @@ void Item_factory::load_item_whitelist( JsonObject &json ) add_to_set( item_whitelist, json, "items" ); } +void Item_factory::load_item_option( JsonObject &json ) +{ + add_to_set( item_options, json, "options" ); +} + Item_factory::~Item_factory() { clear(); @@ -767,7 +767,7 @@ void Item_factory::check_definitions() const main_stream.str(std::string()); } } - if( !g->has_option( "blacklist_magazines" ) ) { + if( item_options.count( "blacklist_magazines" ) == 0 ) { for( auto &mag : magazines_defined ) { // some vehicle parts (currently batteries) are implemented as magazines if( magazines_used.count( mag ) == 0 && find_template( mag )->category->id != category_id_veh_parts ) { @@ -1641,6 +1641,7 @@ void Item_factory::clear() item_blacklist.clear(); item_whitelist.clear(); item_whitelist_is_exclusive = false; + item_options.clear(); } Item_group *make_group_or_throw(Item_spawn_data *&isd, Item_group::Type t) diff --git a/src/item_factory.h b/src/item_factory.h index 02ec4d3818bd1..a70d9d8867ab6 100644 --- a/src/item_factory.h +++ b/src/item_factory.h @@ -224,6 +224,12 @@ class Item_factory void load_item_blacklist( JsonObject &jo ); void load_item_whitelist( JsonObject &jo ); + /** + * Load a json blob of type item option. + * @param jo a JsonObject of type ITEM_OPTION to load. + */ + void load_item_option( JsonObject &jo ); + /** * A list of *all* known item type ids. Each is suitable as input to * @ref find_template or as parameter to @ref item::item. From daf5cc66071b75fc08ffdf74e3fcda7a6f1a00fc Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Thu, 9 Jun 2016 20:27:53 +0000 Subject: [PATCH 106/110] Replace item options with world options, integrated with existing options system. --- data/mods/No_Faults/modinfo.json | 4 +- data/mods/No_Magazines/modinfo.json | 4 +- data/mods/novitamins/modinfo.json | 16 ++++++ src/consumption.cpp | 20 +++++--- src/init.cpp | 4 +- src/item_factory.cpp | 80 ++++++++++++++--------------- src/item_factory.h | 6 --- src/options.cpp | 31 +++++++++-- src/options.h | 4 +- src/worldfactory.cpp | 11 ++++ src/worldfactory.h | 5 +- 11 files changed, 120 insertions(+), 65 deletions(-) create mode 100644 data/mods/novitamins/modinfo.json diff --git a/data/mods/No_Faults/modinfo.json b/data/mods/No_Faults/modinfo.json index 2544d9e3b6170..47f820f68445c 100644 --- a/data/mods/No_Faults/modinfo.json +++ b/data/mods/No_Faults/modinfo.json @@ -10,7 +10,7 @@ "path": "modinfo.json" }, { - "type": "GAME_OPTION", - "options": [ "no_faults" ] + "type": "WORLD_OPTION", + "options": [ "NO_FAULTS" ] } ] diff --git a/data/mods/No_Magazines/modinfo.json b/data/mods/No_Magazines/modinfo.json index 898e13f91e599..11def7ead7d22 100644 --- a/data/mods/No_Magazines/modinfo.json +++ b/data/mods/No_Magazines/modinfo.json @@ -9,7 +9,7 @@ "category": "item_exclude", "path": "modinfo.json" },{ - "type": "ITEM_OPTION", - "options": [ "blacklist_magazines" ] + "type": "WORLD_OPTION", + "options": [ "BLACKLIST_MAGAZINES" ] } ] diff --git a/data/mods/novitamins/modinfo.json b/data/mods/novitamins/modinfo.json new file mode 100644 index 0000000000000..8590c207c36b1 --- /dev/null +++ b/data/mods/novitamins/modinfo.json @@ -0,0 +1,16 @@ +[ + { + "type": "MOD_INFO", + "mod-type": "SUPPLEMENTAL", + "ident": "novitamins", + "name": "Simplified nutrition", + "author": "Mugling", + "description": "Disables vitamin requirements.", + "category": "rebalance", + "path": "modinfo.json" + }, + { + "type": "WORLD_OPTION", + "options": [ "NO_VITAMINS" ] + } +] diff --git a/src/consumption.cpp b/src/consumption.cpp index b7300e6ad4249..1e84513983943 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -1,17 +1,19 @@ #include "player.h" -#include "monster.h" + +#include "addiction.h" +#include "cata_utility.h" +#include "debug.h" #include "game.h" +#include "itype.h" #include "map.h" #include "map_iterator.h" -#include "morale_types.h" -#include "itype.h" -#include "messages.h" #include "material.h" -#include "addiction.h" +#include "messages.h" +#include "monster.h" +#include "morale_types.h" #include "mutation.h" +#include "options.h" #include "translations.h" -#include "cata_utility.h" -#include "debug.h" #include #include @@ -124,6 +126,10 @@ int player::vitamin_mod( const vitamin_id &vit, int qty, bool capped ) int player::vitamin_get( const vitamin_id &vit ) const { + if( ACTIVE_WORLD_OPTIONS[ "NO_VITAMINS" ] ) { + return 0; + } + const auto &v = vitamin_levels.find( vit ); return v != vitamin_levels.end() ? v->second : 0; } diff --git a/src/init.cpp b/src/init.cpp index 2c4c134191706..f5ca0ae7b8acb 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -52,6 +52,7 @@ #include "sounds.h" #include "gates.h" #include "overlay_ordering.h" +#include "worldfactory.h" #include #include @@ -203,8 +204,7 @@ void DynamicDataLoader::initialize() &Item_factory::load_item_blacklist); type_function_map["ITEM_WHITELIST"] = new ClassFunctionAccessor(item_controller, &Item_factory::load_item_whitelist); - type_function_map["ITEM_OPTION"] = new ClassFunctionAccessor(item_controller, - &Item_factory::load_item_option); + type_function_map["WORLD_OPTION"] = new StaticFunctionAccessor(&load_world_option); // ...unimplemented? type_function_map["INSTRUMENT"] = new StaticFunctionAccessor(&load_ingored_type); diff --git a/src/item_factory.cpp b/src/item_factory.cpp index baecec552692d..af43e930ae1d2 100644 --- a/src/item_factory.cpp +++ b/src/item_factory.cpp @@ -1,26 +1,28 @@ #include "item_factory.h" -#include "enums.h" -#include "json.h" + #include "addiction.h" -#include "translations.h" -#include "item_group.h" +#include "artifact.h" +#include "bionics.h" +#include "catacharset.h" +#include "construction.h" #include "crafting.h" -#include "recipe_dictionary.h" -#include "iuse_actor.h" +#include "debug.h" +#include "enums.h" +#include "generic_factory.h" +#include "init.h" #include "item.h" +#include "item_group.h" +#include "iuse_actor.h" +#include "json.h" #include "mapdata.h" -#include "debug.h" -#include "construction.h" +#include "material.h" +#include "options.h" +#include "recipe_dictionary.h" +#include "skill.h" +#include "translations.h" #include "text_snippets.h" #include "ui.h" -#include "skill.h" -#include "bionics.h" -#include "material.h" -#include "artifact.h" #include "veh_type.h" -#include "catacharset.h" -#include "init.h" -#include "generic_factory.h" #include #include @@ -45,8 +47,6 @@ static t_string_set item_blacklist; static t_string_set item_whitelist; static bool item_whitelist_is_exclusive = false; -static std::set item_options; - std::unique_ptr item_controller( new Item_factory() ); static void set_allergy_flags( itype &item_template ); @@ -93,7 +93,7 @@ void Item_factory::finalize() { for( auto& e : m_templates ) { itype& obj = *e.second; - if( obj.engine && g->has_option( "no_faults" ) ) { + if( obj.engine && ACTIVE_WORLD_OPTIONS[ "NO_FAULTS" ] ) { obj.engine->faults.clear(); } @@ -146,21 +146,25 @@ void Item_factory::finalize() { set_allergy_flags( *e.second ); hflesh_to_flesh( *e.second ); - // default vitamins of healthy comestibles to their edible base materials if none explicitly specified - if( obj.comestible && obj.comestible->vitamins.empty() && obj.comestible->healthy >= 0 ) { - - auto healthy = std::max( obj.comestible->healthy, 1 ) * 10; - - auto mat = obj.materials; - mat.erase( std::remove_if( mat.begin(), mat.end(), []( const string_id &m ) { - return !m.obj().edible(); // @todo migrate inedible comestibles to appropriate alternative types - } ), mat.end() ); - - // for comestibles composed of multiple edible materials we calculate the average - for( const auto &v : vitamin::all() ) { - if( obj.comestible->vitamins.find( v.first ) == obj.comestible->vitamins.end() ) { - for( const auto &m : mat ) { - obj.comestible->vitamins[ v.first ] += ceil( m.obj().vitamin( v.first ) * healthy / mat.size() ); + if( obj.comestible ) { + if( ACTIVE_WORLD_OPTIONS[ "NO_VITAMINS" ] ) { + obj.comestible->vitamins.clear(); + } else if( obj.comestible->vitamins.empty() && obj.comestible->healthy >= 0 ) { + // Default vitamins of healthy comestibles to their edible base materials if none explicitly specified. + auto healthy = std::max( obj.comestible->healthy, 1 ) * 10; + auto mat = obj.materials; + + // @todo migrate inedible comestibles to appropriate alternative types. + mat.erase( std::remove_if( mat.begin(), mat.end(), []( const string_id &m ) { + return !m.obj().edible(); + } ), mat.end() ); + + // For comestibles composed of multiple edible materials we calculate the average. + for( const auto &v : vitamin::all() ) { + if( obj.comestible->vitamins.find( v.first ) == obj.comestible->vitamins.end() ) { + for( const auto &m : mat ) { + obj.comestible->vitamins[ v.first ] += ceil( m.obj().vitamin( v.first ) * healthy / mat.size() ); + } } } } @@ -191,7 +195,7 @@ void Item_factory::finalize_item_blacklist() // Can't be part of the blacklist loop because the magazines might be // deleted before the guns are processed. - const bool magazines_blacklisted = item_options.count("blacklist_magazines"); + const bool magazines_blacklisted = ACTIVE_WORLD_OPTIONS[ "BLACKLIST_MAGAZINES" ]; if( magazines_blacklisted ) { for( auto& e : m_templates ) { @@ -261,11 +265,6 @@ void Item_factory::load_item_whitelist( JsonObject &json ) add_to_set( item_whitelist, json, "items" ); } -void Item_factory::load_item_option( JsonObject &json ) -{ - add_to_set( item_options, json, "options" ); -} - Item_factory::~Item_factory() { clear(); @@ -767,7 +766,7 @@ void Item_factory::check_definitions() const main_stream.str(std::string()); } } - if( item_options.count( "blacklist_magazines" ) == 0 ) { + if( !ACTIVE_WORLD_OPTIONS[ "BLACKLIST_MAGAZINES" ] ) { for( auto &mag : magazines_defined ) { // some vehicle parts (currently batteries) are implemented as magazines if( magazines_used.count( mag ) == 0 && find_template( mag )->category->id != category_id_veh_parts ) { @@ -1641,7 +1640,6 @@ void Item_factory::clear() item_blacklist.clear(); item_whitelist.clear(); item_whitelist_is_exclusive = false; - item_options.clear(); } Item_group *make_group_or_throw(Item_spawn_data *&isd, Item_group::Type t) diff --git a/src/item_factory.h b/src/item_factory.h index a70d9d8867ab6..02ec4d3818bd1 100644 --- a/src/item_factory.h +++ b/src/item_factory.h @@ -224,12 +224,6 @@ class Item_factory void load_item_blacklist( JsonObject &jo ); void load_item_whitelist( JsonObject &jo ); - /** - * Load a json blob of type item option. - * @param jo a JsonObject of type ITEM_OPTION to load. - */ - void load_item_option( JsonObject &jo ); - /** * A list of *all* known item type ids. Each is suitable as input to * @ref find_template or as parameter to @ref item::item. diff --git a/src/options.cpp b/src/options.cpp index cadb06f4b88e9..204081b47fa95 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -267,7 +267,7 @@ options_manager::cOpt::cOpt(const std::string sPageIn, const std::string sMenuTe //helper functions bool options_manager::cOpt::is_hidden() { - switch(hide) { + switch( hide ) { case COPT_NO_HIDE: return false; @@ -300,9 +300,11 @@ bool options_manager::cOpt::is_hidden() return false; #endif - default: - return false; // No hide on default + case COPT_ALWAYS_HIDE: + return true; } + // Make compiler happy, this is unreachable. + return false; } void options_manager::cOpt::setSortPos(const std::string sPageIn) @@ -1359,6 +1361,29 @@ void options_manager::init() false ); + mOptionsSort["world_default"]++; + + OPTIONS["NO_FAULTS"] = cOpt("world_default", _("Disables vehicle part faults."), + _("If true, disables vehicle part faults, vehicle parts will be totally reliable unless destroyed, and can only be repaired via replacement."), + false, COPT_ALWAYS_HIDE + ); + + mOptionsSort["world_default"]++; + + OPTIONS["BLACKLIST_MAGAZINES"] = cOpt("world_default", _("Disables removable gun magaziones."), + _("If true, disables removeable gun magazines, guns will all act as if they have integral magazines."), + false, COPT_ALWAYS_HIDE + ); + + mOptionsSort["world_default"]++; + + OPTIONS["NO_VITAMINS"] = cOpt("world_default", _("Disables tracking vitamins in food items."), + _("If true, disables vitamin tracking and vitamin disorders."), + false, COPT_ALWAYS_HIDE + ); + + + for (unsigned i = 0; i < vPages.size(); ++i) { mPageItems[i].resize(mOptionsSort[vPages[i].first]); } diff --git a/src/options.h b/src/options.h index a4b01cb8a72c9..bcfc457a6691d 100644 --- a/src/options.h +++ b/src/options.h @@ -42,7 +42,9 @@ class options_manager : public JsonSerializer, public JsonDeserializer /** Hide this option in non-Windows Curses builds */ COPT_POSIX_CURSES_HIDE, /** Hide this option in builds without sound support */ - COPT_NO_SOUND_HIDE + COPT_NO_SOUND_HIDE, + /** Hide this option always, it is set as a mod. **/ + COPT_ALWAYS_HIDE }; class cOpt diff --git a/src/worldfactory.cpp b/src/worldfactory.cpp index fa188e6f0f4c8..ca25031799cf2 100644 --- a/src/worldfactory.cpp +++ b/src/worldfactory.cpp @@ -1502,6 +1502,17 @@ bool worldfactory::load_world_options(WORLDPTR &world) return true; } +void load_world_option( JsonObject &jo ) +{ + auto arr = jo.get_array( "options" ); + if( arr.empty() ) { + jo.throw_error( "no options specified", "options" ); + } + while( arr.has_more() ) { + ACTIVE_WORLD_OPTIONS[ arr.next_string() ].setValue( "true" ); + } +} + mod_manager *worldfactory::get_mod_manager() { return mman.get(); diff --git a/src/worldfactory.h b/src/worldfactory.h index 7dae69121d7bb..81af29004ad2b 100644 --- a/src/worldfactory.h +++ b/src/worldfactory.h @@ -1,9 +1,10 @@ #ifndef WORLDFACTORY_H #define WORLDFACTORY_H -#include "options.h" #include "cursesdef.h" #include "enums.h" +#include "json.h" +#include "options.h" #include #include @@ -93,6 +94,8 @@ class worldfactory std::vector tab_strings; }; +void load_world_option( JsonObject &jo ); + extern worldfactory *world_generator; #endif From 58049ae93d32103fe044764cd8b4ab9313906719 Mon Sep 17 00:00:00 2001 From: BorkBorkGoesTheCode Date: Thu, 9 Jun 2016 21:12:16 -0500 Subject: [PATCH 107/110] Removed the rail rifles again after rebase bug --- data/json/items/ranged.json | 59 ------------------------------------- 1 file changed, 59 deletions(-) diff --git a/data/json/items/ranged.json b/data/json/items/ranged.json index b541d504d98c3..8e52107ae689a 100644 --- a/data/json/items/ranged.json +++ b/data/json/items/ranged.json @@ -881,65 +881,6 @@ "reload": 150, "valid_mod_locations": [[ "accessories", 4 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "sights", 1 ]] }, - { - "id": "rebar_rifle", - "type": "GUN", - "symbol": "(", - "color": "brown", - "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.", - "price": 550000, - "material": ["steel", "wood"], - "ammo_effects": ["INCENDIARY", "TRAIL"], - "flags": ["RELOAD_ONE"], - "ups_charges": 40, - "skill": "rifle", - "ammo": "metal_rail", - "weight": 4213, - "volume": 10, - "bashing": 10, - "cutting": 0, - "to_hit": -3, - "dispersion": 90, - "sight_dispersion": 150, - "aim_speed" : 0, - "recoil": 60, - "durability": 6, - "clip_size": 1, - "reload": 200, - "valid_mod_locations": [[ "grip", 1 ],[ "stock", 1 ],[ "sights", 1 ]] - }, - { - "id": "heavy_rail_rifle", - "type": "GUN", - "symbol": "(", - "color": "dark_gray", - "name": "heavy rail rifle", - "name_plural": "heavy rail rifles", - "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.", - "price": 900000, - "material": ["steel", "plastic"], - "ammo_effects": ["INCENDIARY", "TRAIL"], - "flags": ["RELOAD_ONE"], - "ups_charges": 100, - "skill": "rifle", - "ammo": "metal_rail", - "weight": 11500, - "volume": 18, - "bashing": 12, - "cutting": 0, - "to_hit": -1, - "ranged_damage" : 40, - "range" : 40, - "dispersion": 100, - "sight_dispersion": 150, - "aim_speed" : 6, - "recoil": 300, - "durability": 7, - "clip_size": 10, - "reload": 200, - "valid_mod_locations": [["accessories", 4],["grip", 1],["rail", 1],["sights", 1],["stock", 1],["underbarrel", 1]] - }, { "id": "m107a1", "type": "GUN", From f91e253707f273a37eb7cbd6d5d88f3d184a3518 Mon Sep 17 00:00:00 2001 From: Coolthulhu Date: Fri, 10 Jun 2016 19:58:15 +0200 Subject: [PATCH 108/110] Fix night vision range bug --- src/creature.cpp | 8 +++++--- src/monster.cpp | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/creature.cpp b/src/creature.cpp index b061426c580ed..31c0e9409d80d 100644 --- a/src/creature.cpp +++ b/src/creature.cpp @@ -230,12 +230,14 @@ bool Creature::sees( const tripoint &t, bool is_player ) const return false; } - const int range_cur = sight_range( g->m.ambient_light_at(t) ); + const int range_cur = sight_range( g->m.ambient_light_at( pos() ) ); const int range_day = sight_range( DAYLIGHT_LEVEL ); - const int range_min = std::min( range_cur, range_day ); + const int range_night = sight_range( 0 ); + const int range_max = std::max( range_day, range_night ); + const int range_min = std::min( range_cur, range_max ); const int wanted_range = rl_dist( pos(), t ); if( wanted_range <= range_min || - ( wanted_range <= range_day && + ( wanted_range <= range_max && g->m.ambient_light_at( t ) > g->natural_light_level( t.z ) ) ) { int range = 0; if( g->m.ambient_light_at( t ) > g->natural_light_level( t.z ) ) { diff --git a/src/monster.cpp b/src/monster.cpp index 4a9e1450849e0..fe52d5764b982 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -535,11 +535,11 @@ int monster::sight_range( const int light_level ) const return 1; } - int range = ( light_level * type->vision_day ) + - ( ( DAYLIGHT_LEVEL - light_level ) * type->vision_night ); + float range = ( light_level * type->vision_day ) + + ( ( DAYLIGHT_LEVEL - light_level ) * type->vision_night ); range /= DAYLIGHT_LEVEL; - return range; + return (int)std::round( range ); } bool monster::made_of( const material_id &m ) const From 8a6aae7227326519852fa313163c3adbe73fc26a Mon Sep 17 00:00:00 2001 From: Coolthulhu Date: Fri, 10 Jun 2016 20:00:13 +0200 Subject: [PATCH 109/110] Floats aren't needed --- src/monster.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/monster.cpp b/src/monster.cpp index fe52d5764b982..4a9e1450849e0 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -535,11 +535,11 @@ int monster::sight_range( const int light_level ) const return 1; } - float range = ( light_level * type->vision_day ) + - ( ( DAYLIGHT_LEVEL - light_level ) * type->vision_night ); + int range = ( light_level * type->vision_day ) + + ( ( DAYLIGHT_LEVEL - light_level ) * type->vision_night ); range /= DAYLIGHT_LEVEL; - return (int)std::round( range ); + return range; } bool monster::made_of( const material_id &m ) const From 8007d2d315ed6f69bdd383bed100f4e64fbb54f9 Mon Sep 17 00:00:00 2001 From: Coolthulhu Date: Fri, 10 Jun 2016 20:05:41 +0200 Subject: [PATCH 110/110] Wait, that looks intended... --- src/creature.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/creature.cpp b/src/creature.cpp index 31c0e9409d80d..d6e80df9e8dd8 100644 --- a/src/creature.cpp +++ b/src/creature.cpp @@ -230,7 +230,7 @@ bool Creature::sees( const tripoint &t, bool is_player ) const return false; } - const int range_cur = sight_range( g->m.ambient_light_at( pos() ) ); + const int range_cur = sight_range( g->m.ambient_light_at( t ) ); const int range_day = sight_range( DAYLIGHT_LEVEL ); const int range_night = sight_range( 0 ); const int range_max = std::max( range_day, range_night );