Remove Enums.lua (it's now redundant), update Gameflow.lua and Settings.lua.

This commit is contained in:
hispidence 2022-02-14 23:10:29 +00:00
parent bea61e4df1
commit 48e018f7fb
3 changed files with 9 additions and 256 deletions

View file

@ -1,250 +0,0 @@
InventorySlots = {
PISTOLS_ITEM = 0,
PISTOLS_AMMO_ITEM = 1,
UZI_ITEM = 2,
UZI_AMMO_ITEM = 3,
SHOTGUN_ITEM = 4,
SHOTGUN_AMMO1_ITEM = 5,
SHOTGUN_AMMO2_ITEM = 6,
REVOLVER_ITEM = 7,
REVOLVER_AMMO_ITEM = 8,
--LARA_REVOLVER_LASER_ITEM = 9,
CROSSBOW_ITEM = 10,
--CROSSBOW_LASER_ITEM = 11,
CROSSBOW_AMMO1_ITEM = 12,
CROSSBOW_AMMO2_ITEM = 13,
CROSSBOW_AMMO3_ITEM = 14,
HK_ITEM = 15,
--HK_SILENCER_ITEM = 16,
HK_AMMO_ITEM = 17,
GRENADE_AMMO_ITEM = 18,
GRENADE_AMMO1_ITEM = 19,
GRENADE_AMMO2_ITEM = 20,
GRENADE_AMMO3_ITEM = 21,
HARPOON_ITEM = 22,
HARPOON_AMMO_ITEM = 23,
ROCKET_LAUNCHER_ITEM = 24,
ROCKET_LAUNCHER_AMMO_ITEM = 25,
LASERSIGHT_ITEM = 26,
SILENCER_ITEM = 27,
BIGMEDI_ITEM = 28,
SMALLMEDI_ITEM = 29,
BINOCULARS_ITEM = 30,
FLARE_INV_ITEM = 31,
TIMEX_ITEM = 32,
PC_LOAD_INV_ITEM = 33,
PC_LOAD_SAVE_ITEM = 34,
BURNING_TORCH_ITEM = 35,
CROWBAR_ITEM = 36,
DIARY_ITEM = 37,
COMPASS_ITEM = 38,
CLOCKWORK_BEETLE = 39,
CLOCKWORK_BEETLE_COMBO1 = 40,
CLOCKWORK_BEETLE_COMBO2 = 41,
WATERSKIN1_EMPTY = 42,
WATERSKIN1_EMPTY_1 = 43,
WATERSKIN1_EMPTY_2 = 44,
WATERSKIN1_EMPTY_3 = 45,
WATERSKIN2_EMPTY = 46,
WATERSKIN2_EMPTY_1 = 47,
WATERSKIN2_EMPTY_2 = 48,
WATERSKIN2_EMPTY_3 = 49,
WATERSKIN2_EMPTY_4 = 50,
WATERSKIN2_EMPTY_5 = 51,
OPEN_DIARY_ITEM = 52,
GOLDROSE_ITEM = 53,
PUZZLE_ITEM1 = 54,
PUZZLE_ITEM2 = 55,
PUZZLE_ITEM3 = 56,
PUZZLE_ITEM4 = 57,
PUZZLE_ITEM5 = 58,
PUZZLE_ITEM6 = 59,
PUZZLE_ITEM7 = 60,
PUZZLE_ITEM8 = 61,
PUZZLE_ITEM9 = 62,
PUZZLE_ITEM10 = 63,
PUZZLE_ITEM11 = 64,
PUZZLE_ITEM12 = 65,
PUZZLE_ITEM13 = 66,
PUZZLE_ITEM14 = 67,
PUZZLE_ITEM15 = 68,
PUZZLE_ITEM16 = 69,
PUZZLE_ITEM1_COMBO1 = 70,
PUZZLE_ITEM1_COMBO2 = 71,
PUZZLE_ITEM2_COMBO1 = 72,
PUZZLE_ITEM2_COMBO2 = 73,
PUZZLE_ITEM3_COMBO1 = 74,
PUZZLE_ITEM3_COMBO2 = 75,
PUZZLE_ITEM4_COMBO1 = 76,
PUZZLE_ITEM4_COMBO2 = 77,
PUZZLE_ITEM5_COMBO1 = 78,
PUZZLE_ITEM5_COMBO2 = 79,
PUZZLE_ITEM6_COMBO1 = 80,
PUZZLE_ITEM6_COMBO2 = 81,
PUZZLE_ITEM7_COMBO1 = 82,
PUZZLE_ITEM7_COMBO2 = 83,
PUZZLE_ITEM8_COMBO1 = 84,
PUZZLE_ITEM8_COMBO2 = 85,
PUZZLE_ITEM9_COMBO1 = 86,
PUZZLE_ITEM9_COMBO2 = 87,
PUZZLE_ITEM10_COMBO1 = 88,
PUZZLE_ITEM10_COMBO2 = 89,
PUZZLE_ITEM11_COMBO1 = 90,
PUZZLE_ITEM11_COMBO2 = 91,
PUZZLE_ITEM12_COMBO1 = 92,
PUZZLE_ITEM12_COMBO2 = 93,
PUZZLE_ITEM13_COMBO1 = 94,
PUZZLE_ITEM13_COMBO2 = 95,
PUZZLE_ITEM14_COMBO1 = 96,
PUZZLE_ITEM14_COMBO2 = 97,
PUZZLE_ITEM15_COMBO1 = 98,
PUZZLE_ITEM15_COMBO2 = 99,
PUZZLE_ITEM16_COMBO1 = 100,
PUZZLE_ITEM16_COMBO2 = 101,
KEY_ITEM1 = 102,
KEY_ITEM2 = 103,
KEY_ITEM3 = 104,
KEY_ITEM4 = 105,
KEY_ITEM5 = 106,
KEY_ITEM6 = 107,
KEY_ITEM7 = 108,
KEY_ITEM8 = 109,
KEY_ITEM9 = 110,
KEY_ITEM10 = 111,
KEY_ITEM11 = 112,
KEY_ITEM12 = 113,
KEY_ITEM13 = 114,
KEY_ITEM14 = 115,
KEY_ITEM15 = 116,
KEY_ITEM16 = 117,
KEY_ITEM1_COMBO1 = 118,
KEY_ITEM1_COMBO2 = 119,
KEY_ITEM2_COMBO1 = 120,
KEY_ITEM2_COMBO2 = 121,
KEY_ITEM3_COMBO1 = 122,
KEY_ITEM3_COMBO2 = 123,
KEY_ITEM4_COMBO1 = 124,
KEY_ITEM4_COMBO2 = 125,
KEY_ITEM5_COMBO1 = 126,
KEY_ITEM5_COMBO2 = 127,
KEY_ITEM6_COMBO1 = 128,
KEY_ITEM6_COMBO2 = 129,
KEY_ITEM7_COMBO1 = 130,
KEY_ITEM7_COMBO2 = 131,
KEY_ITEM8_COMBO1 = 132,
KEY_ITEM8_COMBO2 = 133,
KEY_ITEM9_COMBO1 = 134,
KEY_ITEM9_COMBO2 = 135,
KEY_ITEM10_COMBO1 = 136,
KEY_ITEM10_COMBO2 = 137,
KEY_ITEM11_COMBO1 = 138,
KEY_ITEM11_COMBO2 = 139,
KEY_ITEM12_COMBO1 = 140,
KEY_ITEM12_COMBO2 = 141,
KEY_ITEM13_COMBO1 = 142,
KEY_ITEM13_COMBO2 = 143,
KEY_ITEM14_COMBO1 = 144,
KEY_ITEM14_COMBO2 = 145,
KEY_ITEM15_COMBO1 = 146,
KEY_ITEM15_COMBO2 = 147,
KEY_ITEM16_COMBO1 = 148,
KEY_ITEM16_COMBO2 = 149,
PICKUP_ITEM1 = 150,
PICKUP_ITEM2 = 151,
PICKUP_ITEM3 = 152,
PICKUP_ITEM4 = 153,
PICKUP_ITEM5 = 154,
PICKUP_ITEM6 = 155,
PICKUP_ITEM7 = 156,
PICKUP_ITEM8 = 157,
PICKUP_ITEM9 = 158,
PICKUP_ITEM10 = 159,
PICKUP_ITEM11 = 160,
PICKUP_ITEM12 = 161,
PICKUP_ITEM13 = 162,
PICKUP_ITEM14 = 163,
PICKUP_ITEM15 = 164,
PICKUP_ITEM16 = 165,
PICKUP_ITEM1_COMBO1 = 166,
PICKUP_ITEM1_COMBO2 = 167,
PICKUP_ITEM2_COMBO1 = 168,
PICKUP_ITEM2_COMBO2 = 169,
PICKUP_ITEM3_COMBO1 = 170,
PICKUP_ITEM3_COMBO2 = 171,
PICKUP_ITEM4_COMBO1 = 172,
PICKUP_ITEM4_COMBO2 = 173,
PICKUP_ITEM5_COMBO1 = 174,
PICKUP_ITEM5_COMBO2 = 175,
PICKUP_ITEM6_COMBO1 = 176,
PICKUP_ITEM6_COMBO2 = 177,
PICKUP_ITEM7_COMBO1 = 178,
PICKUP_ITEM7_COMBO2 = 179,
PICKUP_ITEM8_COMBO1 = 180,
PICKUP_ITEM8_COMBO2 = 181,
PICKUP_ITEM9_COMBO1 = 182,
PICKUP_ITEM9_COMBO2 = 183,
PICKUP_ITEM10_COMBO1 = 184,
PICKUP_ITEM10_COMBO2 = 185,
PICKUP_ITEM11_COMBO1 = 186,
PICKUP_ITEM11_COMBO2 = 187,
PICKUP_ITEM12_COMBO1 = 188,
PICKUP_ITEM12_COMBO2 = 189,
PICKUP_ITEM13_COMBO1 = 190,
PICKUP_ITEM13_COMBO2 = 191,
PICKUP_ITEM14_COMBO1 = 192,
PICKUP_ITEM14_COMBO2 = 193,
PICKUP_ITEM15_COMBO1 = 194,
PICKUP_ITEM15_COMBO2 = 195,
PICKUP_ITEM16_COMBO1 = 196,
PICKUP_ITEM16_COMBO2 = 197,
EXAMINE_ITEM1 = 198,
EXAMINE_ITEM2 = 199,
EXAMINE_ITEM3 = 200,
EXAMINE_ITEM4 = 201,
EXAMINE_ITEM5 = 202,
EXAMINE_ITEM6 = 203,
EXAMINE_ITEM7 = 204,
EXAMINE_ITEM8 = 205,
EXAMINE_ITEM1_COMBO1 = 206,
EXAMINE_ITEM1_COMBO2 = 207,
EXAMINE_ITEM2_COMBO1 = 208,
EXAMINE_ITEM2_COMBO2 = 209,
EXAMINE_ITEM3_COMBO1 = 210,
EXAMINE_ITEM3_COMBO2 = 211,
EXAMINE_ITEM4_COMBO1 = 212,
EXAMINE_ITEM4_COMBO2 = 213,
EXAMINE_ITEM5_COMBO1 = 214,
EXAMINE_ITEM5_COMBO2 = 215,
EXAMINE_ITEM6_COMBO1 = 216,
EXAMINE_ITEM6_COMBO2 = 217,
EXAMINE_ITEM7_COMBO1 = 218,
EXAMINE_ITEM7_COMBO2 = 219,
EXAMINE_ITEM8_COMBO1 = 220,
EXAMINE_ITEM8_COMBO2 = 221
};
InventoryRotationFlags = {
ROT_X = 1,
ROT_Y = 2,
ROT_Z = 4
};
InventoryObjectAction = {
EQUIP = 2,
USE = 4
};
WeatherType = {
NONE = 0,
RAIN = 1,
SNOW = 2
};
LaraType = {
LARA_NORMAL = 1,
LARA_YOUNG = 2,
LARA_BUNHEAD = 3,
LARA_CATSUIT = 4,
LARA_DIVESUIT = 5,
LARA_INVISIBLE = 7
};

View file

@ -6,6 +6,9 @@ local Level = Flow.Level
local Color = TEN.Color
local Rotation = TEN.Rotation
local InventoryItem = Flow.InventoryItem
local InvID = Flow.InvID
local RotationAxis = Flow.RotationAxis
local ItemAction = Flow.ItemAction
-- Title level
Flow.SetIntroImagePath("SCREENS\\MAIN.PNG")
@ -39,7 +42,7 @@ test.layer1 = Flow.SkyLayer.new(Color.new(255, 0, 0), 15)
test.objects = {
InventoryItem.new(
"tut1_ba_cartouche1",
InvItem.PUZZLE_ITEM3_COMBO1,
InvID.PUZZLE_ITEM3_COMBO1,
0,
0.5,
Rotation.new(0, 0, 0),
@ -50,7 +53,7 @@ test.objects = {
myObj,
InventoryItem.new(
"tut1_ba_cartouche2",
InvItem.PUZZLE_ITEM3_COMBO2,
InvID.PUZZLE_ITEM3_COMBO2,
0,
0.5,
Rotation.new(0, 0, 0),
@ -60,7 +63,7 @@ test.objects = {
),
InventoryItem.new(
"tut1_ba_cartouche",
InvItem.PUZZLE_ITEM3,
InvID.PUZZLE_ITEM3,
0,
0.5,
Rotation.new(0, 0, 0),
@ -70,7 +73,7 @@ test.objects = {
),
InventoryItem.new(
"tut1_hand_orion",
InvItem.PUZZLE_ITEM6,
InvID.PUZZLE_ITEM6,
0,
0.5,
Rotation.new(270, 180, 0),
@ -80,7 +83,7 @@ test.objects = {
),
InventoryItem.new(
"tut1_hand_sirius",
InvItem.PUZZLE_ITEM8,
InvID.PUZZLE_ITEM8,
0,
0.5,
Rotation.new(270, 180, 0),

View file

@ -14,7 +14,7 @@ settings.windowed = true;
settings.drawingDistance = 102400;
settings.showRendererSteps = false;
settings.showDebugInfo = true;
settings.errorMode = ErrorMode.WARN;
settings.errorMode = Flow.ErrorMode.WARN;
Flow.SetSettings(settings);
local anims = Flow.Animations.new();