Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-04-28 12:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tr2/object/names: tidy switch names

Browse source
This commit is contained in:
Marcin Kurczewski 2024-10-10 00:39:52 +02:00
parent 197b03d9b5
commit 14c81503f7
No known key found for this signature in database
GPG key ID: CC65E6FD28CAE42A
6 changed files with 34 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
data/tr2/ship/cfg/TR2X_gameflow.json5
View file

@ -175,8 +175,8 @@
"O_WATER_SPRITE": "Boat Wake",
"O_SNOW_SPRITE": "Snowmobile Wale",
"O_SKIDOO_LARA": "Snowmobile Animation",
"O_SWITCH_TYPE_1": "Switch 1",
"O_SWITCH_TYPE_2": "Switch 2",
"O_SWITCH_TYPE_AIRLOCK": "Airlock Switch",
"O_SWITCH_TYPE_SMALL": "Small Switch",
"O_PROPELLER_2": "Underwater Propeller",
"O_PROPELLER_3": "Air Fan",
"O_PENDULUM_2": "Swinging Box",
@ -186,9 +186,9 @@
"O_TEXT_BOX": "UI Frame",
"O_ROLLING_BALL_3": "Boulder 3",
"O_DEATH_SLIDE": "Zipline Handle",
"O_SWITCH_TYPE_3": "Switch 3",
"O_SWITCH_TYPE_4": "Switch 4",
"O_SWITCH_TYPE_5": "Switch 5",
"O_SWITCH_TYPE_BUTTON": "Switch Button",
"O_SWITCH_TYPE_NORMAL": "Lever/Switch",
"O_SWITCH_TYPE_UW": "Underwater Lever/Switch",
"O_DOOR_TYPE_1": "Door 1",
"O_DOOR_TYPE_2": "Door 2",
"O_DOOR_TYPE_3": "Door 3",

6
docs/tr2/CHANGELOG.md
View file

@ -1,5 +1,11 @@
## [Unreleased](https://github.com/LostArtefacts/TRX/compare/tr2-0.5...develop) - ××××-××-××
- fixed `/give` not working with weapons (regression from 0.5)
- improved switch object names
- Switch Type 1 renamed to "Airlock Switch"
- Switch Type 2 renamed to "Small Switch"
- Switch Type 3 renamed to "Switch Button"
- Switch Type 4 renamed to "Lever/Switch"
- Switch Type 5 renamed to "Underwater Lever/Switch"
## [0.5](https://github.com/LostArtefacts/TRX/compare/afaf12a...tr2-0.5) - 2024-10-08
- added `/sfx` command

10
docs/tr2/progress.txt
View file

@ -2135,8 +2135,8 @@ typedef enum { // decompiled
O_WATER_SPRITE = 89,
O_SNOW_SPRITE = 90,
O_SKIDOO_LARA = 91,
O_SWITCH_TYPE_1 = 92,
O_SWITCH_TYPE_2 = 93,
O_SWITCH_TYPE_AIRLOCK = 92,
O_SWITCH_TYPE_SMALL = 93,
O_PROPELLER_2 = 94,
O_PROPELLER_3 = 95,
O_PENDULUM_2 = 96,
@ -2146,9 +2146,9 @@ typedef enum { // decompiled
O_TEXT_BOX = 100,
O_ROLLING_BALL_3 = 101,
O_DEATH_SLIDE = 102,
O_SWITCH_TYPE_3 = 103,
O_SWITCH_TYPE_4 = 104,
O_SWITCH_TYPE_5 = 105,
O_SWITCH_TYPE_BUTTON = 103,
O_SWITCH_TYPE_NORMAL = 104,
O_SWITCH_TYPE_UW = 105,
O_DOOR_TYPE_1 = 106,
O_DOOR_TYPE_2 = 107,
O_DOOR_TYPE_3 = 108,

10
src/libtrx/include/libtrx/game/objects/ids_tr2.def
View file

@ -90,8 +90,8 @@ OBJ_ID_DEFINE(O_BELL, 88)
OBJ_ID_DEFINE(O_WATER_SPRITE, 89)
OBJ_ID_DEFINE(O_SNOW_SPRITE, 90)
OBJ_ID_DEFINE(O_SKIDOO_LARA, 91)
OBJ_ID_DEFINE(O_SWITCH_TYPE_1, 92)
OBJ_ID_DEFINE(O_SWITCH_TYPE_2, 93)
OBJ_ID_DEFINE(O_SWITCH_TYPE_AIRLOCK, 92)
OBJ_ID_DEFINE(O_SWITCH_TYPE_SMALL, 93)
OBJ_ID_DEFINE(O_PROPELLER_2, 94)
OBJ_ID_DEFINE(O_PROPELLER_3, 95)
OBJ_ID_DEFINE(O_PENDULUM_2, 96)
@ -101,9 +101,9 @@ OBJ_ID_DEFINE(O_LARA_SWAP, 99)
OBJ_ID_DEFINE(O_TEXT_BOX, 100)
OBJ_ID_DEFINE(O_ROLLING_BALL_3, 101)
OBJ_ID_DEFINE(O_DEATH_SLIDE, 102)
OBJ_ID_DEFINE(O_SWITCH_TYPE_3, 103)
OBJ_ID_DEFINE(O_SWITCH_TYPE_4, 104)
OBJ_ID_DEFINE(O_SWITCH_TYPE_5, 105)
OBJ_ID_DEFINE(O_SWITCH_TYPE_BUTTON, 103)
OBJ_ID_DEFINE(O_SWITCH_TYPE_NORMAL, 104)
OBJ_ID_DEFINE(O_SWITCH_TYPE_UW, 105)
OBJ_ID_DEFINE(O_DOOR_TYPE_1, 106)
OBJ_ID_DEFINE(O_DOOR_TYPE_2, 107)
OBJ_ID_DEFINE(O_DOOR_TYPE_3, 108)

10
src/libtrx/include/libtrx/game/objects/names_tr2.def
View file

@ -90,8 +90,8 @@ OBJ_NAME_DEFINE(O_BELL, "Bell")
OBJ_NAME_DEFINE(O_WATER_SPRITE, "Boat Wake")
OBJ_NAME_DEFINE(O_SNOW_SPRITE, "Snowmobile Wale")
OBJ_NAME_DEFINE(O_SKIDOO_LARA, "Snowmobile Animation")
OBJ_NAME_DEFINE(O_SWITCH_TYPE_1, "Switch 1")
OBJ_NAME_DEFINE(O_SWITCH_TYPE_2, "Switch 2")
OBJ_NAME_DEFINE(O_SWITCH_TYPE_AIRLOCK, "Airlock Switch")
OBJ_NAME_DEFINE(O_SWITCH_TYPE_SMALL, "Small Switch")
OBJ_NAME_DEFINE(O_PROPELLER_2, "Underwater Propeller")
OBJ_NAME_DEFINE(O_PROPELLER_3, "Air Fan")
OBJ_NAME_DEFINE(O_PENDULUM_2, "Swinging Box")
@ -101,9 +101,9 @@ OBJ_NAME_DEFINE(O_LARA_SWAP, "Lara Mesh Swap")
OBJ_NAME_DEFINE(O_TEXT_BOX, "UI Frame")
OBJ_NAME_DEFINE(O_ROLLING_BALL_3, "Boulder 3")
OBJ_NAME_DEFINE(O_DEATH_SLIDE, "Zipline Handle")
OBJ_NAME_DEFINE(O_SWITCH_TYPE_3, "Switch 3")
OBJ_NAME_DEFINE(O_SWITCH_TYPE_4, "Switch 4")
OBJ_NAME_DEFINE(O_SWITCH_TYPE_5, "Switch 5")
OBJ_NAME_DEFINE(O_SWITCH_TYPE_BUTTON, "Switch Button")
OBJ_NAME_DEFINE(O_SWITCH_TYPE_NORMAL, "Lever/Switch")
OBJ_NAME_DEFINE(O_SWITCH_TYPE_UW, "Underwater Lever/Switch")
OBJ_NAME_DEFINE(O_DOOR_TYPE_1, "Door 1")
OBJ_NAME_DEFINE(O_DOOR_TYPE_2, "Door 2")
OBJ_NAME_DEFINE(O_DOOR_TYPE_3, "Door 3")

16
src/tr2/game/objects/general/switch.c
View file

@ -17,18 +17,18 @@ static void M_SwitchOff(ITEM *switch_item, ITEM *lara_item);
static void M_AlignLara(ITEM *const lara_item, ITEM *const switch_item)
{
switch (switch_item->object_id) {
case O_SWITCH_TYPE_1:
case O_SWITCH_TYPE_AIRLOCK:
if (switch_item->current_anim_state == SWITCH_STATE_ON) {
return;
}
Item_AlignPosition(&g_AirlockPosition, switch_item, lara_item);
break;
case O_SWITCH_TYPE_2:
case O_SWITCH_TYPE_SMALL:
Item_AlignPosition(&g_SmallSwitchPosition, switch_item, lara_item);
break;
case O_SWITCH_TYPE_3:
case O_SWITCH_TYPE_BUTTON:
Item_AlignPosition(&g_PushSwitchPosition, switch_item, lara_item);
break;
}
@ -41,11 +41,11 @@ static void M_SwitchOn(ITEM *const switch_item, ITEM *const lara_item)
lara_item->anim_num = g_Objects[O_LARA].anim_idx + LA_WALL_SWITCH_DOWN;
break;
case O_SWITCH_TYPE_2:
case O_SWITCH_TYPE_SMALL:
lara_item->anim_num = g_Objects[O_LARA].anim_idx + LA_SWITCH_SMALL_DOWN;
break;
case O_SWITCH_TYPE_3:
case O_SWITCH_TYPE_BUTTON:
lara_item->anim_num = g_Objects[O_LARA].anim_idx + LA_BUTTON_PUSH;
break;
}
@ -59,7 +59,7 @@ static void M_SwitchOff(ITEM *const switch_item, ITEM *const lara_item)
lara_item->current_anim_state = LS_SWITCH_OFF;
switch (switch_item->object_id) {
case O_SWITCH_TYPE_1:
case O_SWITCH_TYPE_AIRLOCK:
lara_item->anim_num = g_Objects[O_LARA_EXTRA].anim_idx;
lara_item->frame_num = g_Anims[lara_item->anim_num].frame_base;
lara_item->current_anim_state = LA_EXTRA_BREATH;
@ -68,11 +68,11 @@ static void M_SwitchOff(ITEM *const switch_item, ITEM *const lara_item)
g_Lara.extra_anim = 1;
break;
case O_SWITCH_TYPE_2:
case O_SWITCH_TYPE_SMALL:
lara_item->anim_num = g_Objects[O_LARA].anim_idx + LA_SWITCH_SMALL_UP;
break;
case O_SWITCH_TYPE_3:
case O_SWITCH_TYPE_BUTTON:
lara_item->anim_num = g_Objects[O_LARA].anim_idx + LA_BUTTON_PUSH;
break;