Skip to content

Commit c25d7b9

Browse files
TerminalHashTerminalHash
committed
russified food
also update kvass texture
1 parent 1659246 commit c25d7b9

File tree

10 files changed

+88
-16
lines changed

10 files changed

+88
-16
lines changed

‎Base/Entities/Industry/CTFShops/Quarters/Quarters.as‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void onInit(CBlob@ this)
100100
AddHurtRequirement(s.requirements);
101101
}
102102
{
103-
ShopItem@ s = addShopItem(this, Names::mealitem, "$quarters_meal$", "meal", Descriptions::meal, false);
103+
ShopItem@ s = addShopItem(this, Names::mealitem, "$quarters_meal$", "meal", Descriptions::mealtext, false);
104104
s.spawnNothing = true;
105105
s.customButton = true;
106106
s.buttonwidth = 2;
@@ -113,7 +113,7 @@ void onInit(CBlob@ this)
113113
AddRequirement(s.requirements, "coin", "", "Coins", CTFCosts::egg);
114114
}
115115
{
116-
ShopItem@ s = addShopItem(this, Names::burgeritem, "$quarters_burger$", "food", Descriptions::burger, true);
116+
ShopItem@ s = addShopItem(this, Names::burgeritem, "$quarters_burger$", "food", Descriptions::burgertext, true);
117117
AddRequirement(s.requirements, "coin", "", "Coins", CTFCosts::burger);
118118
}
119119
{

‎Base/Entities/Industry/CTFShops/Quarters/Quarters.png‎

457 Bytes
Loading

Base/Entities/Items/Common/Food/EatCommon.as renamed to Base/Entities/Items/Food/Common/EatCommon.as

File renamed without changes.

Base/Entities/Items/Common/ItemNerf.as renamed to Base/Entities/Items/Food/Common/ItemNerf.as

File renamed without changes.

‎Base/Entities/Items/Food/Food.cfg‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Food.cfg
2+
3+
$sprite_factory = generic_sprite
4+
@$sprite_scripts =
5+
$sprite_texture = Food.png
6+
s32_sprite_frame_width = 16
7+
s32_sprite_frame_height = 16
8+
f32 sprite_offset_x = 0
9+
f32 sprite_offset_y = 0
10+
11+
$sprite_gibs_start = *start*
12+
$sprite_gibs_end = *end*
13+
14+
$sprite_animation_start = *start*
15+
$sprite_animation_default_name = default
16+
u16 sprite_animation_default_time = 0
17+
u8_sprite_animation_default_loop = 0
18+
@u16 sprite_animation_default_frames = 0; 1; 2; 3; 4; 5; 6; 7; 8; 9; 10; 11; 12;
19+
$sprite_animation_end = *end*
20+
21+
$shape_factory = box2d_shape
22+
@$shape_scripts =
23+
f32 shape_mass = 3.0
24+
f32 shape_radius = 3.5
25+
f32 shape_friction = 0.3
26+
f32 shape_elasticity = 0.1
27+
f32 shape_buoyancy = 0.9
28+
f32 shape_drag = 0.6
29+
bool shape_collides = yes
30+
bool shape_ladder = no
31+
bool shape_platform = no
32+
@f32 verticesXY =
33+
u8 block_support = 0
34+
bool block_background = no
35+
bool block_lightpasses = no
36+
bool block_snaptogrid = no
37+
38+
$movement_factory =
39+
40+
$brain_factory =
41+
42+
$attachment_factory = generic_attachment
43+
@$attachment_scripts =
44+
@$attachment_points = PICKUP; 0; 0; 1; 0; 0;
45+
46+
$inventory_factory =
47+
48+
$name = food
49+
@$scripts = IgnoreDamage.as;
50+
Food.as;
51+
Eatable.as;
52+
NoPlayerCollision.as;
53+
NoCollisionOnGround.as;
54+
SetDamageToCarrier.as
55+
f32 health = 1.0
56+
$inventory_name = Pear tart
57+
$inventory_icon = -
58+
u8 inventory_icon_frame = 6
59+
u8 inventory_icon_frame_width = 16
60+
u8 inventory_icon_frame_height = 16
61+
u8 inventory_used_width = 1
62+
u8 inventory_used_height = 1
63+
u8 inventory_max_stacks = 0

‎Base/Entities/Items/Food/Food.png‎

866 Bytes
Loading

‎Modules/CaptainsModule/Commands/PickingCommands.as‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,18 @@ class AppointCommand : ChatCommand
6161
CPlayer@ red_leader = getPlayerByNamePart(RED_LEADER_NAME);
6262

6363
if (blue_leader is null) {
64-
error("blue leader doesn't not exists! try again");
64+
error("[CAPTAINS SYSTEM] blue leader doesn't not exists! try again");
6565
return;
6666
}
6767
if (red_leader is null) {
68-
error("red leader doesn't not exists! try again");
68+
error("[CAPTAINS SYSTEM] red leader doesn't not exists! try again");
6969
return;
7070
}
7171

7272
// if admin accidentally wrote the same player's name twice
7373
if (blue_leader.getUsername() == red_leader.getUsername() || red_leader.getUsername() == blue_leader.getUsername())
7474
{
75-
error("One player cannot be a leader in two teams at the same time!");
75+
error("[CAPTAINS SYSTEM] One player cannot be a leader in two teams at the same time!");
7676
return;
7777
}
7878

@@ -141,7 +141,7 @@ class PickPlayerCommand : ChatCommand
141141
u8 first_team_picking = 0;
142142

143143
return (
144-
rules.get_string("team_"+caller_team+"_leader")==player.getUsername()
144+
rules.get_string("team_" + caller_team + "_leader") == player.getUsername()
145145
&& !isPickingEnded()
146146
//&& ((getSmallestTeam(core.teams)==caller_team || getTeamDifference(core.teams) == 0) && caller_team == first_team_picking)
147147
);

‎Translations/TranslationsSystem.as‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@ namespace Names
137137
// Other
138138
pressdelete = Translate(en::n_pressdelete+"\\"+ru::n_pressdelete),
139139

140+
// Food.as
141+
burgerinv = Translate(en::n_burgerinv+"\\"+ru::n_burgerinv),
142+
140143
// ScoreboardCommon.as
141144
modsettingsbutton = Translate(en::n_modsettingsbutton+"\\"+ru::n_modsettingsbutton),
142145

‎Translations/language_en.as‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ namespace en
6767
// Quarters.as
6868
d_beertext = "A cup of refreshing kvass.",
6969
d_mealtext = "A rich and delicious borsch.",
70-
d_burgertext = "Sausage sandwich on the go for a quick snack.",
70+
d_burgertext = "Pear tart on the go for a quick snack.",
7171
d_peartext = "A juicy and sweet pear.",
7272
d_sleeptext = "Sleep. Free!",
7373

@@ -120,6 +120,9 @@ namespace en
120120
// Other
121121
n_pressdelete = "Choose a bind and press [DELETE] to remove key",
122122

123+
// Food.as
124+
n_burgerinv = "Pear tart",
125+
123126
// ScoreboardCommon.as
124127
n_modsettingsbutton = " Settings",
125128

@@ -129,11 +132,11 @@ namespace en
129132
// Quarters.as
130133
n_beeritem = "Kvass - 1 Heart",
131134
//n_beeritem = "Beer - 1 Heart",
132-
n_mealitem = "Meal - Full Health",
133-
//n_mealitem = "Borsch - Full Health",
135+
n_mealitem = "Borsch - Full Health",
136+
//n_mealitem = "Meal - Full Health",
134137
n_eggitem = "Egg - Full Health",
135-
n_burgeritem = "Burger - Full Health",
136-
//n_burgeritem = "Sausage Sandwitch - Full Health",
138+
n_burgeritem = "Pear Tart - Full Health",
139+
//n_burgeritem = "Burger - Full Health",
137140
n_pearitem = "Pear - 2 Hearts",
138141
n_sleepaction = "Sleep",
139142

‎Translations/language_ru.as‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ namespace ru
6767
// Quarters.as
6868
d_beertext = "Кружка освежающего кваса.",
6969
d_mealtext = "Нажористый и вкусный борщ.",
70-
d_burgertext = "Бутерброд с колбасой в дорогу для быстрого перекуса.",
70+
d_burgertext = "Пирожок с грушами с собой в дорогу.",
7171
d_peartext = "Сочная и сладкая груша.",
7272
d_sleeptext = "Прилечь поспать. Бесплатно!",
7373

@@ -120,6 +120,9 @@ namespace ru
120120
// Other
121121
n_pressdelete = "Выбери клавишу и нажми [DELETE] для очистки хоткея!",
122122

123+
// Food.as
124+
n_burgerinv = "Пирожок с грушами",
125+
123126
// ScoreboardCommon.as
124127
n_modsettingsbutton = "Настройки",
125128

@@ -129,11 +132,11 @@ namespace ru
129132
// Quarters.as
130133
n_beeritem = "Квас - 1 Сердце",
131134
//n_beeritem = "Пиво - 1 Сердце",
132-
//n_mealitem = "Борщ - Полное здоровье",
133-
n_mealitem = "Мясное блюдо - Полное здоровье",
135+
n_mealitem = "Борщ - Полное здоровье",
136+
//n_mealitem = "Мясное блюдо - Полное здоровье",
134137
n_eggitem = "Яйцо - Полное здоровье",
135-
//n_burgeritem = "Бутерброд с колбасой - Полное здоровье",
136-
n_burgeritem = "Бургер - Полное здоровье",
138+
n_burgeritem = "Пирожок с грушами - Полное здоровье",
139+
//n_burgeritem = "Бургер - Полное здоровье",
137140
n_pearitem = "Груша - 2 Сердца",
138141
n_sleepaction = "Лечь спать",
139142

0 commit comments

Comments
 (0)