Skip to content

Commit

Permalink
[core] Map>Various P thru S files: Russian to English
Browse files Browse the repository at this point in the history
  • Loading branch information
@EpicTaru
EpicTaru committed Oct 11, 2023
1 parent 9e02ca2 commit 61932a3
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 106 deletions.
2 changes: 1 addition & 1 deletion src/map/party.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ enum PARTYFLAG

/************************************************************************
* *
* Класс группы персонажей *
* Character group class *
* *
************************************************************************/

Expand Down
26 changes: 7 additions & 19 deletions src/map/recast_container.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@
#include "item_container.h"
#include "recast_container.h"

/************************************************************************
* *
* *
* *
************************************************************************/

CRecastContainer::CRecastContainer(CBattleEntity* PEntity)
: m_PEntity(PEntity)
{
Expand All @@ -48,7 +42,7 @@ CRecastContainer::CRecastContainer(CBattleEntity* PEntity)

/************************************************************************
* *
* Получаем указатель на указанный RecastList *
* Get a pointer to the specified RecastList *
* *
************************************************************************/

Expand All @@ -68,12 +62,6 @@ RecastList_t* CRecastContainer::GetRecastList(RECASTTYPE type)
return nullptr;
}

/************************************************************************
* *
* Get Recast *
* *
************************************************************************/

Recast_t* CRecastContainer::GetRecast(RECASTTYPE type, uint16 id)
{
RecastList_t* list = GetRecastList(type);
Expand All @@ -89,7 +77,7 @@ Recast_t* CRecastContainer::GetRecast(RECASTTYPE type, uint16 id)

/************************************************************************
* *
* Добавляем запись в контейнер *
* Adding an entry to the container *
* *
************************************************************************/

Expand Down Expand Up @@ -142,7 +130,7 @@ Recast_t* CRecastContainer::Load(RECASTTYPE type, uint16 id, uint32 duration, ui

/************************************************************************
* *
* Удаляем все элементы указанного типа *
* Remove all elements of the specified type *
* *
************************************************************************/

Expand All @@ -164,7 +152,7 @@ void CRecastContainer::Del(RECASTTYPE type)

/************************************************************************
* *
* Удаляем указанный элемент указанного типа *
* Remove the specified element of the specified type *
* *
************************************************************************/

Expand All @@ -189,7 +177,7 @@ void CRecastContainer::Del(RECASTTYPE type, uint16 id)

/************************************************************************
* *
* Deletes a recast by index *
* Delete a recast by index *
* *
************************************************************************/

Expand All @@ -208,7 +196,7 @@ void CRecastContainer::DeleteByIndex(RECASTTYPE type, uint8 index)

/************************************************************************
* *
* Проверяем наличие элемента с указанным ID *
* Check for the presence of an element with the specified ID *
* *
************************************************************************/

Expand Down Expand Up @@ -265,7 +253,7 @@ bool CRecastContainer::HasRecast(RECASTTYPE type, uint16 id, uint32 recast)

/************************************************************************
* *
* Проверяем список на устаревшие записи *
* Check the list for outdated entries *
* *
************************************************************************/

Expand Down
38 changes: 19 additions & 19 deletions src/map/status_effect.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ enum EFFECTFLAG
EFFECTFLAG_ATTACK = 0x00000004, // disappears upon attacking
EFFECTFLAG_EMPATHY = 0X00000008, // effect can be copied to wyvern by use of merited Spirit Link
EFFECTFLAG_DAMAGE = 0x00000010, // disappears upon being attacked
EFFECTFLAG_DEATH = 0x00000020, // disappears upon death/ko
EFFECTFLAG_DEATH = 0x00000020, // disappears upon death/KO
EFFECTFLAG_MAGIC_BEGIN = 0x00000040, // disappears upon spellcasting start
EFFECTFLAG_MAGIC_END = 0x00000080, // disappears upon spellcasting complete
EFFECTFLAG_ON_ZONE = 0x00000100,
EFFECTFLAG_NO_LOSS_MESSAGE = 0x00000200, // Suppress effect worn off message.
EFFECTFLAG_INVISIBLE = 0x00000400, // invisible effect
EFFECTFLAG_DETECTABLE = 0x00000800, // invisible, sneak, deo
EFFECTFLAG_NO_REST = 0x00001000, // prevents resting, curse II, plague, disease
EFFECTFLAG_PREVENT_ACTION = 0x00002000, // sleep, lullaby, stun, petro. Not implemented
EFFECTFLAG_PREVENT_ACTION = 0x00002000, // sleep, lullaby, stun, petrify
EFFECTFLAG_WALTZABLE = 0x00004000, // for healing waltzable spells
EFFECTFLAG_FOOD = 0x00008000,
EFFECTFLAG_SONG = 0x00010000, // bard songs
Expand Down Expand Up @@ -755,10 +755,10 @@ enum EFFECT

/************************************************************************
* *
* Нерешенные задачи: *
* Unsolved problems: *
* *
* - сохранение ID сущности, добавившей эффект *
* - обновление эффекта (например перезапись protect 1 на protect 2) *
* - saving the ID of the entity that added the effect *
* - updating the effect (e.g., rewriting Protect I to Protect II) *
* *
************************************************************************/

Expand Down Expand Up @@ -806,32 +806,32 @@ class CStatusEffect

const std::string& GetName();

std::vector<CModifier> modList; // список модификаторов
std::vector<CModifier> modList; // List of modifiers
bool deleted{ false };

CStatusEffect(EFFECT id, uint16 icon, uint16 power, uint32 tick, uint32 duration, uint32 subid = 0, uint16 subPower = 0, uint16 tier = 0, uint32 flags = 0);

~CStatusEffect();

private:
CBattleEntity* m_POwner{ nullptr }; // владелец
CBattleEntity* m_POwner{ nullptr };

EFFECT m_StatusID{ EFFECT_NONE }; // основной тип эффекта
uint32 m_SubID{ 0 }; // дополнительный тип эффекта
uint16 m_Icon{ 0 }; // иконка эффекта
uint16 m_Power{ 0 }; // сила эффекта
EFFECT m_StatusID{ EFFECT_NONE }; // Main effect type
uint32 m_SubID{ 0 }; // Additional effect type
uint16 m_Icon{ 0 }; // Effect icon
uint16 m_Power{ 0 }; // Strength of effect
uint16 m_SubPower{ 0 }; // Secondary power of the effect
uint16 m_Tier{ 0 }; // Tier of the effect
uint32 m_Flags{ 0 }; // флаг эффекта (условия его исчезновения)
uint16 m_Type{ 0 }; // used to enforce only one
uint8 m_Slot{ 0 }; // used to determine slot order for songs/rolls
uint32 m_Flags{ 0 }; // Effect flags (conditions for its disappearance)
uint16 m_Type{ 0 }; // Used to enforce only one
uint8 m_Slot{ 0 }; // Used to determine slot order for songs/rolls

uint32 m_TickTime{ 0 }; // время повторения эффекта (млс)
uint32 m_Duration{ 0 }; // продолжительность эффекта (млс)
time_point m_StartTime; // время получения эффекта (млс)
int m_tickCount{ 0 }; // премя последнего выполнения эффекта (млс)
uint32 m_TickTime{ 0 }; // Effect repetition time (ms)
uint32 m_Duration{ 0 }; // Duration of effect (ms)
time_point m_StartTime; // Time to obtain effect (ms)
int m_tickCount{ 0 }; // Time of last effect execution (ms)

std::string m_Name; // имя эффекта для скриптов
std::string m_Name; // Effect name for scripts
};

#endif
Loading

0 comments on commit 61932a3

Please sign in to comment.