Skip to content

Commit

Permalink
Merge branch 'master' into wip-translator
Browse files Browse the repository at this point in the history
  • Loading branch information
@Wohlstand
Wohlstand committed Dec 17, 2024
2 parents 052cd9b + bfb01cb commit c798264
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
24 changes: 14 additions & 10 deletions Editor/editing/_scenes/level/items/item_water.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,16 +133,17 @@ void ItemPhysEnv::contextMenu(QGraphicsSceneMouseEvent *mouseEvent)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("Gravity Field"), m_data.env_type == LevelPhysEnv::ENV_GRAVITATIONAL_FIELD)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("Touch Event (Once)"), m_data.env_type == LevelPhysEnv::ENV_TOUCH_EVENT_ONCE_PLAYER)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("Touch Event (Every frame)"), m_data.env_type == LevelPhysEnv::ENV_TOUCH_EVENT_PLAYER)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("NPC/Player Touch Event (Once)"), m_data.env_type == LevelPhysEnv::ENV_TOUCH_EVENT_ONCE_NPC)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("NPC/Player Touch Event (Every frame)"), m_data.env_type == LevelPhysEnv::ENV_TOUCH_EVENT_NPC)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("NPC/Player Touch Event (Once)"), m_data.env_type == LevelPhysEnv::ENV_TOUCH_EVENT_ONCE_ANY)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("NPC/Player Touch Event (Every frame)"), m_data.env_type == LevelPhysEnv::ENV_TOUCH_EVENT_ANY)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("Mouse click Event"), m_data.env_type == LevelPhysEnv::ENV_CLICK_EVENT)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("Collision script"), m_data.env_type == LevelPhysEnv::ENV_COLLISION_SCRIPT)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("Mouse click Script"), m_data.env_type == LevelPhysEnv::ENV_CLICK_SCRIPT)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("Collision script function"), m_data.env_type == LevelPhysEnv::ENV_COLLISION_SCRIPT)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("Mouse click Script function"), m_data.env_type == LevelPhysEnv::ENV_CLICK_SCRIPT)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("Collision Event"), m_data.env_type == LevelPhysEnv::ENV_COLLISION_EVENT)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("Air chamber"), m_data.env_type == LevelPhysEnv::ENV_AIR)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("NPC Touch Event (Once)"), m_data.env_type == LevelPhysEnv::ENV_TOUCH_EVENT_ONCE_NPC1)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("NPC Touch Event (Every frame)"), m_data.env_type == LevelPhysEnv::ENV_TOUCH_EVENT_NPC1)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("NPC Touch Event (Once)"), m_data.env_type == LevelPhysEnv::ENV_TOUCH_EVENT_ONCE_NPC)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("NPC Touch Event (Every frame)"), m_data.env_type == LevelPhysEnv::ENV_TOUCH_EVENT_NPC)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("NPC Hurting Field"), m_data.env_type == LevelPhysEnv::ENV_NPC_HURTING_FIELD)
CONTEXT_MENU_ITEM_CHK(envTypes[typeID], enable_new_types, show_new_types, tr("Sub-Area"), m_data.env_type == LevelPhysEnv::ENV_SUBAREA)

#undef CONTEXT_MENU_ITEM_CHK

Expand Down Expand Up @@ -422,10 +423,10 @@ void ItemPhysEnv::updateColor()
case LevelPhysEnv::ENV_TOUCH_EVENT_PLAYER:
m_color = QColor(Qt::red);
break;
case LevelPhysEnv::ENV_TOUCH_EVENT_ONCE_NPC:
case LevelPhysEnv::ENV_TOUCH_EVENT_ONCE_ANY:
m_color = QColor(Qt::darkMagenta);
break;
case LevelPhysEnv::ENV_TOUCH_EVENT_NPC:
case LevelPhysEnv::ENV_TOUCH_EVENT_ANY:
m_color = QColor(Qt::magenta);
break;
case LevelPhysEnv::ENV_CLICK_EVENT:
Expand All @@ -440,15 +441,18 @@ void ItemPhysEnv::updateColor()
case LevelPhysEnv::ENV_COLLISION_SCRIPT:
m_color = QColor(Qt::darkCyan);
break;
case LevelPhysEnv::ENV_TOUCH_EVENT_ONCE_NPC1:
case LevelPhysEnv::ENV_TOUCH_EVENT_ONCE_NPC:
m_color = QColor(Qt::darkGray);
break;
case LevelPhysEnv::ENV_TOUCH_EVENT_NPC1:
case LevelPhysEnv::ENV_TOUCH_EVENT_NPC:
m_color = QColor(Qt::gray);
break;
case LevelPhysEnv::ENV_NPC_HURTING_FIELD:
m_color = QColor(Qt::darkYellow);
break;
case LevelPhysEnv::ENV_SUBAREA:
m_color = QColor(Qt::darkBlue);
break;
}

m_pen.setColor(m_color);
Expand Down
2 changes: 1 addition & 1 deletion _common/PGE_File_Formats
Submodule PGE_File_Formats updated 8 files
+ − docs/PGE-X/LVLX file description.odt
+ − docs/PGE-X/LVLX file description.pdf
+ − docs/SMBX-38A/smbx-38A File specifications (LVL WLD WLS).odt
+14 −26 docs/SMBX-38A/smbx-38A File specifications (LVL WLD WLS).txt
+1,074 −524 docs/SMBX-38A/smbx-38A v68 File specifications (LVL WLD WLS).rtf
+633 −629 docs/SMBX-38A/smbx-38A v69 File specifications (LVL WLD WLS).rtf
+8 −6 lvl_filedata.h
+93 −81 src/pgex/file_rw_lvlx.cpp

0 comments on commit c798264

Please sign in to comment.