diff --git a/Base/Entities/Industry/CTFShops/Quarters/Quarters.as b/Base/Entities/Industry/CTFShops/Quarters/Quarters.as index ea54e7ba..90c51277 100755 --- a/Base/Entities/Industry/CTFShops/Quarters/Quarters.as +++ b/Base/Entities/Industry/CTFShops/Quarters/Quarters.as @@ -100,7 +100,7 @@ void onInit(CBlob@ this) AddHurtRequirement(s.requirements); } { - ShopItem@ s = addShopItem(this, Names::mealitem, "$quarters_meal$", "meal", Descriptions::meal, false); + ShopItem@ s = addShopItem(this, Names::mealitem, "$quarters_meal$", "meal", Descriptions::mealtext, false); s.spawnNothing = true; s.customButton = true; s.buttonwidth = 2; @@ -113,7 +113,7 @@ void onInit(CBlob@ this) AddRequirement(s.requirements, "coin", "", "Coins", CTFCosts::egg); } { - ShopItem@ s = addShopItem(this, Names::burgeritem, "$quarters_burger$", "food", Descriptions::burger, true); + ShopItem@ s = addShopItem(this, Names::burgeritem, "$quarters_burger$", "food", Descriptions::burgertext, true); AddRequirement(s.requirements, "coin", "", "Coins", CTFCosts::burger); } { diff --git a/Base/Entities/Industry/CTFShops/Quarters/Quarters.png b/Base/Entities/Industry/CTFShops/Quarters/Quarters.png index 20ceb909..f34f4bd1 100755 Binary files a/Base/Entities/Industry/CTFShops/Quarters/Quarters.png and b/Base/Entities/Industry/CTFShops/Quarters/Quarters.png differ diff --git a/Base/Entities/Items/Common/Food/EatCommon.as b/Base/Entities/Items/Food/Common/EatCommon.as similarity index 100% rename from Base/Entities/Items/Common/Food/EatCommon.as rename to Base/Entities/Items/Food/Common/EatCommon.as diff --git a/Base/Entities/Items/Common/ItemNerf.as b/Base/Entities/Items/Food/Common/ItemNerf.as similarity index 100% rename from Base/Entities/Items/Common/ItemNerf.as rename to Base/Entities/Items/Food/Common/ItemNerf.as diff --git a/Base/Entities/Items/Food/Food.cfg b/Base/Entities/Items/Food/Food.cfg new file mode 100755 index 00000000..305b39dd --- /dev/null +++ b/Base/Entities/Items/Food/Food.cfg @@ -0,0 +1,63 @@ +# Food.cfg + +$sprite_factory = generic_sprite +@$sprite_scripts = +$sprite_texture = Food.png +s32_sprite_frame_width = 16 +s32_sprite_frame_height = 16 +f32 sprite_offset_x = 0 +f32 sprite_offset_y = 0 + +$sprite_gibs_start = *start* +$sprite_gibs_end = *end* + +$sprite_animation_start = *start* + $sprite_animation_default_name = default + u16 sprite_animation_default_time = 0 + u8_sprite_animation_default_loop = 0 + @u16 sprite_animation_default_frames = 0; 1; 2; 3; 4; 5; 6; 7; 8; 9; 10; 11; 12; +$sprite_animation_end = *end* + +$shape_factory = box2d_shape +@$shape_scripts = +f32 shape_mass = 3.0 +f32 shape_radius = 3.5 +f32 shape_friction = 0.3 +f32 shape_elasticity = 0.1 +f32 shape_buoyancy = 0.9 +f32 shape_drag = 0.6 +bool shape_collides = yes +bool shape_ladder = no +bool shape_platform = no +@f32 verticesXY = +u8 block_support = 0 +bool block_background = no +bool block_lightpasses = no +bool block_snaptogrid = no + +$movement_factory = + +$brain_factory = + +$attachment_factory = generic_attachment +@$attachment_scripts = +@$attachment_points = PICKUP; 0; 0; 1; 0; 0; + +$inventory_factory = + +$name = food +@$scripts = IgnoreDamage.as; + Food.as; + Eatable.as; + NoPlayerCollision.as; + NoCollisionOnGround.as; + SetDamageToCarrier.as +f32 health = 1.0 +$inventory_name = Pear tart +$inventory_icon = - +u8 inventory_icon_frame = 6 +u8 inventory_icon_frame_width = 16 +u8 inventory_icon_frame_height = 16 +u8 inventory_used_width = 1 +u8 inventory_used_height = 1 +u8 inventory_max_stacks = 0 diff --git a/Base/Entities/Items/Food/Food.png b/Base/Entities/Items/Food/Food.png new file mode 100755 index 00000000..ac9feed4 Binary files /dev/null and b/Base/Entities/Items/Food/Food.png differ diff --git a/Modules/CaptainsModule/Commands/PickingCommands.as b/Modules/CaptainsModule/Commands/PickingCommands.as index 7c3bfb4c..48c4c947 100644 --- a/Modules/CaptainsModule/Commands/PickingCommands.as +++ b/Modules/CaptainsModule/Commands/PickingCommands.as @@ -61,18 +61,18 @@ class AppointCommand : ChatCommand CPlayer@ red_leader = getPlayerByNamePart(RED_LEADER_NAME); if (blue_leader is null) { - error("blue leader doesn't not exists! try again"); + error("[CAPTAINS SYSTEM] blue leader doesn't not exists! try again"); return; } if (red_leader is null) { - error("red leader doesn't not exists! try again"); + error("[CAPTAINS SYSTEM] red leader doesn't not exists! try again"); return; } // if admin accidentally wrote the same player's name twice if (blue_leader.getUsername() == red_leader.getUsername() || red_leader.getUsername() == blue_leader.getUsername()) { - error("One player cannot be a leader in two teams at the same time!"); + error("[CAPTAINS SYSTEM] One player cannot be a leader in two teams at the same time!"); return; } @@ -141,7 +141,7 @@ class PickPlayerCommand : ChatCommand u8 first_team_picking = 0; return ( - rules.get_string("team_"+caller_team+"_leader")==player.getUsername() + rules.get_string("team_" + caller_team + "_leader") == player.getUsername() && !isPickingEnded() //&& ((getSmallestTeam(core.teams)==caller_team || getTeamDifference(core.teams) == 0) && caller_team == first_team_picking) ); diff --git a/Translations/TranslationsSystem.as b/Translations/TranslationsSystem.as index 2c618680..8fd34094 100644 --- a/Translations/TranslationsSystem.as +++ b/Translations/TranslationsSystem.as @@ -137,6 +137,9 @@ namespace Names // Other pressdelete = Translate(en::n_pressdelete+"\\"+ru::n_pressdelete), + // Food.as + burgerinv = Translate(en::n_burgerinv+"\\"+ru::n_burgerinv), + // ScoreboardCommon.as modsettingsbutton = Translate(en::n_modsettingsbutton+"\\"+ru::n_modsettingsbutton), diff --git a/Translations/language_en.as b/Translations/language_en.as index a2d92e4d..6a498a2f 100644 --- a/Translations/language_en.as +++ b/Translations/language_en.as @@ -67,7 +67,7 @@ namespace en // Quarters.as d_beertext = "A cup of refreshing kvass.", d_mealtext = "A rich and delicious borsch.", - d_burgertext = "Sausage sandwich on the go for a quick snack.", + d_burgertext = "Pear tart on the go for a quick snack.", d_peartext = "A juicy and sweet pear.", d_sleeptext = "Sleep. Free!", @@ -120,6 +120,9 @@ namespace en // Other n_pressdelete = "Choose a bind and press [DELETE] to remove key", + // Food.as + n_burgerinv = "Pear tart", + // ScoreboardCommon.as n_modsettingsbutton = " Settings", @@ -129,11 +132,11 @@ namespace en // Quarters.as n_beeritem = "Kvass - 1 Heart", //n_beeritem = "Beer - 1 Heart", - n_mealitem = "Meal - Full Health", - //n_mealitem = "Borsch - Full Health", + n_mealitem = "Borsch - Full Health", + //n_mealitem = "Meal - Full Health", n_eggitem = "Egg - Full Health", - n_burgeritem = "Burger - Full Health", - //n_burgeritem = "Sausage Sandwitch - Full Health", + n_burgeritem = "Pear Tart - Full Health", + //n_burgeritem = "Burger - Full Health", n_pearitem = "Pear - 2 Hearts", n_sleepaction = "Sleep", diff --git a/Translations/language_ru.as b/Translations/language_ru.as index 911fb18e..1230709f 100644 --- a/Translations/language_ru.as +++ b/Translations/language_ru.as @@ -67,7 +67,7 @@ namespace ru // Quarters.as d_beertext = "Кружка освежающего кваса.", d_mealtext = "Нажористый и вкусный борщ.", - d_burgertext = "Бутерброд с колбасой в дорогу для быстрого перекуса.", + d_burgertext = "Пирожок с грушами с собой в дорогу.", d_peartext = "Сочная и сладкая груша.", d_sleeptext = "Прилечь поспать. Бесплатно!", @@ -120,6 +120,9 @@ namespace ru // Other n_pressdelete = "Выбери клавишу и нажми [DELETE] для очистки хоткея!", + // Food.as + n_burgerinv = "Пирожок с грушами", + // ScoreboardCommon.as n_modsettingsbutton = "Настройки", @@ -129,11 +132,11 @@ namespace ru // Quarters.as n_beeritem = "Квас - 1 Сердце", //n_beeritem = "Пиво - 1 Сердце", - //n_mealitem = "Борщ - Полное здоровье", - n_mealitem = "Мясное блюдо - Полное здоровье", + n_mealitem = "Борщ - Полное здоровье", + //n_mealitem = "Мясное блюдо - Полное здоровье", n_eggitem = "Яйцо - Полное здоровье", - //n_burgeritem = "Бутерброд с колбасой - Полное здоровье", - n_burgeritem = "Бургер - Полное здоровье", + n_burgeritem = "Пирожок с грушами - Полное здоровье", + //n_burgeritem = "Бургер - Полное здоровье", n_pearitem = "Груша - 2 Сердца", n_sleepaction = "Лечь спать",