From 26165453d284b5b4a876722c732bbe95572b52ab Mon Sep 17 00:00:00 2001 From: David Gumberg Date: Mon, 27 May 2013 20:55:01 -0700 Subject: Compress textures --- games/minimal/menu/background.png | Bin 1387 -> 392 bytes games/minimal/menu/icon.png | Bin 397 -> 218 bytes games/minimal/mods/bucket/textures/bucket.png | Bin 329 -> 182 bytes games/minimal/mods/bucket/textures/bucket_lava.png | Bin 363 -> 183 bytes games/minimal/mods/bucket/textures/bucket_water.png | Bin 369 -> 180 bytes .../minimal/mods/default/textures/crack_anylength.png | Bin 367 -> 255 bytes games/minimal/mods/default/textures/default_apple.png | Bin 203 -> 109 bytes games/minimal/mods/default/textures/default_book.png | Bin 292 -> 157 bytes .../mods/default/textures/default_bookshelf.png | Bin 597 -> 515 bytes games/minimal/mods/default/textures/default_brick.png | Bin 604 -> 457 bytes .../mods/default/textures/default_cactus_side.png | Bin 279 -> 144 bytes .../mods/default/textures/default_cactus_top.png | Bin 236 -> 121 bytes .../mods/default/textures/default_chest_front.png | Bin 167 -> 114 bytes .../mods/default/textures/default_chest_lock.png | Bin 224 -> 145 bytes .../mods/default/textures/default_chest_side.png | Bin 151 -> 98 bytes .../mods/default/textures/default_chest_top.png | Bin 142 -> 93 bytes games/minimal/mods/default/textures/default_clay.png | Bin 613 -> 318 bytes .../mods/default/textures/default_clay_brick.png | Bin 249 -> 173 bytes .../mods/default/textures/default_clay_lump.png | Bin 210 -> 140 bytes games/minimal/mods/default/textures/default_cloud.png | Bin 118 -> 83 bytes .../mods/default/textures/default_coal_lump.png | Bin 933 -> 138 bytes .../minimal/mods/default/textures/default_cobble.png | Bin 830 -> 374 bytes games/minimal/mods/default/textures/default_fence.png | Bin 539 -> 480 bytes .../mods/default/textures/default_furnace_fire_bg.png | Bin 313 -> 220 bytes .../mods/default/textures/default_furnace_fire_fg.png | Bin 865 -> 719 bytes .../mods/default/textures/default_furnace_front.png | Bin 246 -> 159 bytes .../default/textures/default_furnace_front_active.png | Bin 376 -> 283 bytes .../mods/default/textures/default_furnace_side.png | Bin 236 -> 125 bytes games/minimal/mods/default/textures/default_glass.png | Bin 978 -> 210 bytes games/minimal/mods/default/textures/default_grass.png | Bin 874 -> 782 bytes .../mods/default/textures/default_grass_footsteps.png | Bin 856 -> 771 bytes .../minimal/mods/default/textures/default_gravel.png | Bin 591 -> 172 bytes .../mods/default/textures/default_iron_lump.png | Bin 936 -> 140 bytes .../mods/default/textures/default_junglegrass.png | Bin 672 -> 237 bytes .../mods/default/textures/default_jungletree.png | Bin 502 -> 210 bytes .../mods/default/textures/default_jungletree_top.png | Bin 507 -> 205 bytes .../minimal/mods/default/textures/default_ladder.png | Bin 395 -> 368 bytes games/minimal/mods/default/textures/default_lava.png | Bin 357 -> 172 bytes .../textures/default_lava_flowing_animated.png | Bin 8715 -> 7818 bytes .../default/textures/default_lava_source_animated.png | Bin 3481 -> 2902 bytes .../minimal/mods/default/textures/default_leaves.png | Bin 1689 -> 1683 bytes games/minimal/mods/default/textures/default_mese.png | Bin 203 -> 129 bytes .../mods/default/textures/default_mineral_coal.png | Bin 952 -> 142 bytes .../mods/default/textures/default_mineral_iron.png | Bin 1614 -> 922 bytes .../mods/default/textures/default_mossycobble.png | Bin 965 -> 603 bytes .../minimal/mods/default/textures/default_nc_back.png | Bin 317 -> 186 bytes .../mods/default/textures/default_nc_front.png | Bin 378 -> 204 bytes games/minimal/mods/default/textures/default_nc_rb.png | Bin 206 -> 137 bytes .../minimal/mods/default/textures/default_nc_side.png | Bin 231 -> 148 bytes games/minimal/mods/default/textures/default_paper.png | Bin 242 -> 139 bytes .../minimal/mods/default/textures/default_papyrus.png | Bin 366 -> 165 bytes games/minimal/mods/default/textures/default_rail.png | Bin 507 -> 437 bytes .../mods/default/textures/default_rail_crossing.png | Bin 555 -> 388 bytes .../mods/default/textures/default_rail_curved.png | Bin 545 -> 375 bytes .../mods/default/textures/default_rail_t_junction.png | Bin 542 -> 374 bytes games/minimal/mods/default/textures/default_sand.png | Bin 1381 -> 762 bytes .../mods/default/textures/default_sandstone.png | Bin 772 -> 744 bytes .../minimal/mods/default/textures/default_sapling.png | Bin 502 -> 328 bytes .../mods/default/textures/default_scorched_stuff.png | Bin 233 -> 164 bytes .../mods/default/textures/default_sign_wall.png | Bin 489 -> 416 bytes .../mods/default/textures/default_steel_block.png | Bin 219 -> 128 bytes .../mods/default/textures/default_steel_ingot.png | Bin 207 -> 144 bytes games/minimal/mods/default/textures/default_stick.png | Bin 182 -> 120 bytes games/minimal/mods/default/textures/default_stone.png | Bin 806 -> 389 bytes .../mods/default/textures/default_tnt_bottom.png | Bin 161 -> 98 bytes .../mods/default/textures/default_tnt_side.png | Bin 186 -> 129 bytes .../minimal/mods/default/textures/default_tnt_top.png | Bin 264 -> 146 bytes .../mods/default/textures/default_tool_mesepick.png | Bin 252 -> 155 bytes .../mods/default/textures/default_tool_steelaxe.png | Bin 927 -> 140 bytes .../mods/default/textures/default_tool_steelpick.png | Bin 271 -> 163 bytes .../default/textures/default_tool_steelshovel.png | Bin 216 -> 144 bytes .../mods/default/textures/default_tool_steelsword.png | Bin 291 -> 169 bytes .../mods/default/textures/default_tool_stoneaxe.png | Bin 931 -> 141 bytes .../mods/default/textures/default_tool_stonepick.png | Bin 262 -> 155 bytes .../default/textures/default_tool_stoneshovel.png | Bin 203 -> 144 bytes .../mods/default/textures/default_tool_stonesword.png | Bin 301 -> 168 bytes .../mods/default/textures/default_tool_woodaxe.png | Bin 927 -> 134 bytes .../mods/default/textures/default_tool_woodpick.png | Bin 245 -> 149 bytes .../mods/default/textures/default_tool_woodshovel.png | Bin 203 -> 135 bytes .../mods/default/textures/default_tool_woodsword.png | Bin 255 -> 147 bytes games/minimal/mods/default/textures/default_torch.png | Bin 925 -> 146 bytes .../default/textures/default_torch_on_ceiling.png | Bin 913 -> 137 bytes .../mods/default/textures/default_torch_on_floor.png | Bin 917 -> 138 bytes .../mods/default/textures/default_tree_top.png | Bin 1024 -> 177 bytes games/minimal/mods/default/textures/default_water.png | Bin 518 -> 302 bytes games/minimal/mods/default/textures/heart.png | Bin 308 -> 248 bytes games/minimal/mods/default/textures/player.png | Bin 212 -> 157 bytes games/minimal/mods/default/textures/player_back.png | Bin 201 -> 149 bytes games/minimal/mods/default/textures/treeprop.png | Bin 1055 -> 757 bytes games/minimal/mods/default/textures/wieldhand.png | Bin 384 -> 212 bytes .../experimental/textures/experimental_dummyball.png | Bin 838 -> 399 bytes .../textures/experimental_tester_tool_1.png | Bin 209 -> 160 bytes games/minimal/mods/legacy/textures/apple_iron.png | Bin 207 -> 119 bytes games/minimal/mods/legacy/textures/cooked_rat.png | Bin 239 -> 145 bytes games/minimal/mods/legacy/textures/dungeon_master.png | Bin 6636 -> 3007 bytes games/minimal/mods/legacy/textures/fireball.png | Bin 603 -> 279 bytes games/minimal/mods/legacy/textures/firefly.png | Bin 116 -> 99 bytes games/minimal/mods/legacy/textures/oerkki1.png | Bin 250 -> 165 bytes .../minimal/mods/legacy/textures/oerkki1_damaged.png | Bin 341 -> 210 bytes games/minimal/mods/legacy/textures/rat.png | Bin 920 -> 141 bytes 100 files changed, 0 insertions(+), 0 deletions(-) (limited to 'games') diff --git a/games/minimal/menu/background.png b/games/minimal/menu/background.png index e020f909d..ea5fbdce5 100644 Binary files a/games/minimal/menu/background.png and b/games/minimal/menu/background.png differ diff --git a/games/minimal/menu/icon.png b/games/minimal/menu/icon.png index fa8d7cd7f..8ef675023 100644 Binary files a/games/minimal/menu/icon.png and b/games/minimal/menu/icon.png differ diff --git a/games/minimal/mods/bucket/textures/bucket.png b/games/minimal/mods/bucket/textures/bucket.png index f165fd209..b775a9fd3 100644 Binary files a/games/minimal/mods/bucket/textures/bucket.png and b/games/minimal/mods/bucket/textures/bucket.png differ diff --git a/games/minimal/mods/bucket/textures/bucket_lava.png b/games/minimal/mods/bucket/textures/bucket_lava.png index 7cf27cd1f..889ed61d4 100644 Binary files a/games/minimal/mods/bucket/textures/bucket_lava.png and b/games/minimal/mods/bucket/textures/bucket_lava.png differ diff --git a/games/minimal/mods/bucket/textures/bucket_water.png b/games/minimal/mods/bucket/textures/bucket_water.png index f220ec51e..a3c9d72f7 100644 Binary files a/games/minimal/mods/bucket/textures/bucket_water.png and b/games/minimal/mods/bucket/textures/bucket_water.png differ diff --git a/games/minimal/mods/default/textures/crack_anylength.png b/games/minimal/mods/default/textures/crack_anylength.png index 6832c5118..d9b49f911 100644 Binary files a/games/minimal/mods/default/textures/crack_anylength.png and b/games/minimal/mods/default/textures/crack_anylength.png differ diff --git a/games/minimal/mods/default/textures/default_apple.png b/games/minimal/mods/default/textures/default_apple.png index 9593f28f6..4473dca28 100644 Binary files a/games/minimal/mods/default/textures/default_apple.png and b/games/minimal/mods/default/textures/default_apple.png differ diff --git a/games/minimal/mods/default/textures/default_book.png b/games/minimal/mods/default/textures/default_book.png index 176fb6aa9..ea14a372a 100644 Binary files a/games/minimal/mods/default/textures/default_book.png and b/games/minimal/mods/default/textures/default_book.png differ diff --git a/games/minimal/mods/default/textures/default_bookshelf.png b/games/minimal/mods/default/textures/default_bookshelf.png index 5ecc50ff3..f225e3449 100644 Binary files a/games/minimal/mods/default/textures/default_bookshelf.png and b/games/minimal/mods/default/textures/default_bookshelf.png differ diff --git a/games/minimal/mods/default/textures/default_brick.png b/games/minimal/mods/default/textures/default_brick.png index 32d77f347..def1cf0b1 100644 Binary files a/games/minimal/mods/default/textures/default_brick.png and b/games/minimal/mods/default/textures/default_brick.png differ diff --git a/games/minimal/mods/default/textures/default_cactus_side.png b/games/minimal/mods/default/textures/default_cactus_side.png index fc479fde6..128a4d28a 100644 Binary files a/games/minimal/mods/default/textures/default_cactus_side.png and b/games/minimal/mods/default/textures/default_cactus_side.png differ diff --git a/games/minimal/mods/default/textures/default_cactus_top.png b/games/minimal/mods/default/textures/default_cactus_top.png index f9e68df51..eda1a0bb6 100644 Binary files a/games/minimal/mods/default/textures/default_cactus_top.png and b/games/minimal/mods/default/textures/default_cactus_top.png differ diff --git a/games/minimal/mods/default/textures/default_chest_front.png b/games/minimal/mods/default/textures/default_chest_front.png index c5628af94..55b076c35 100644 Binary files a/games/minimal/mods/default/textures/default_chest_front.png and b/games/minimal/mods/default/textures/default_chest_front.png differ diff --git a/games/minimal/mods/default/textures/default_chest_lock.png b/games/minimal/mods/default/textures/default_chest_lock.png index ae038fae5..4b2d1af6c 100644 Binary files a/games/minimal/mods/default/textures/default_chest_lock.png and b/games/minimal/mods/default/textures/default_chest_lock.png differ diff --git a/games/minimal/mods/default/textures/default_chest_side.png b/games/minimal/mods/default/textures/default_chest_side.png index 916dd784d..ae4847cb6 100644 Binary files a/games/minimal/mods/default/textures/default_chest_side.png and b/games/minimal/mods/default/textures/default_chest_side.png differ diff --git a/games/minimal/mods/default/textures/default_chest_top.png b/games/minimal/mods/default/textures/default_chest_top.png index 58c79674d..ac41551b0 100644 Binary files a/games/minimal/mods/default/textures/default_chest_top.png and b/games/minimal/mods/default/textures/default_chest_top.png differ diff --git a/games/minimal/mods/default/textures/default_clay.png b/games/minimal/mods/default/textures/default_clay.png index 3557429d8..070b69e48 100644 Binary files a/games/minimal/mods/default/textures/default_clay.png and b/games/minimal/mods/default/textures/default_clay.png differ diff --git a/games/minimal/mods/default/textures/default_clay_brick.png b/games/minimal/mods/default/textures/default_clay_brick.png index e36648e48..e25633b70 100644 Binary files a/games/minimal/mods/default/textures/default_clay_brick.png and b/games/minimal/mods/default/textures/default_clay_brick.png differ diff --git a/games/minimal/mods/default/textures/default_clay_lump.png b/games/minimal/mods/default/textures/default_clay_lump.png index be0bab9d7..ceed6fa75 100644 Binary files a/games/minimal/mods/default/textures/default_clay_lump.png and b/games/minimal/mods/default/textures/default_clay_lump.png differ diff --git a/games/minimal/mods/default/textures/default_cloud.png b/games/minimal/mods/default/textures/default_cloud.png index 24091a377..faf0ec13d 100644 Binary files a/games/minimal/mods/default/textures/default_cloud.png and b/games/minimal/mods/default/textures/default_cloud.png differ diff --git a/games/minimal/mods/default/textures/default_coal_lump.png b/games/minimal/mods/default/textures/default_coal_lump.png index bad901efa..dae47e342 100644 Binary files a/games/minimal/mods/default/textures/default_coal_lump.png and b/games/minimal/mods/default/textures/default_coal_lump.png differ diff --git a/games/minimal/mods/default/textures/default_cobble.png b/games/minimal/mods/default/textures/default_cobble.png index 7d0447419..2a28d25a5 100644 Binary files a/games/minimal/mods/default/textures/default_cobble.png and b/games/minimal/mods/default/textures/default_cobble.png differ diff --git a/games/minimal/mods/default/textures/default_fence.png b/games/minimal/mods/default/textures/default_fence.png index 0b99f0eb5..e3510c52a 100644 Binary files a/games/minimal/mods/default/textures/default_fence.png and b/games/minimal/mods/default/textures/default_fence.png differ diff --git a/games/minimal/mods/default/textures/default_furnace_fire_bg.png b/games/minimal/mods/default/textures/default_furnace_fire_bg.png index 1272e101e..e3370f438 100644 Binary files a/games/minimal/mods/default/textures/default_furnace_fire_bg.png and b/games/minimal/mods/default/textures/default_furnace_fire_bg.png differ diff --git a/games/minimal/mods/default/textures/default_furnace_fire_fg.png b/games/minimal/mods/default/textures/default_furnace_fire_fg.png index fbb19df74..7a126e325 100644 Binary files a/games/minimal/mods/default/textures/default_furnace_fire_fg.png and b/games/minimal/mods/default/textures/default_furnace_fire_fg.png differ diff --git a/games/minimal/mods/default/textures/default_furnace_front.png b/games/minimal/mods/default/textures/default_furnace_front.png index 1620a27c3..4da398c0a 100644 Binary files a/games/minimal/mods/default/textures/default_furnace_front.png and b/games/minimal/mods/default/textures/default_furnace_front.png differ diff --git a/games/minimal/mods/default/textures/default_furnace_front_active.png b/games/minimal/mods/default/textures/default_furnace_front_active.png index e4d8a5b81..06c4ab3ef 100644 Binary files a/games/minimal/mods/default/textures/default_furnace_front_active.png and b/games/minimal/mods/default/textures/default_furnace_front_active.png differ diff --git a/games/minimal/mods/default/textures/default_furnace_side.png b/games/minimal/mods/default/textures/default_furnace_side.png index 63cb162fe..c729de9bf 100644 Binary files a/games/minimal/mods/default/textures/default_furnace_side.png and b/games/minimal/mods/default/textures/default_furnace_side.png differ diff --git a/games/minimal/mods/default/textures/default_glass.png b/games/minimal/mods/default/textures/default_glass.png index ade0196fe..fd665a40c 100644 Binary files a/games/minimal/mods/default/textures/default_glass.png and b/games/minimal/mods/default/textures/default_glass.png differ diff --git a/games/minimal/mods/default/textures/default_grass.png b/games/minimal/mods/default/textures/default_grass.png index 3610bb2bc..1d76708a0 100644 Binary files a/games/minimal/mods/default/textures/default_grass.png and b/games/minimal/mods/default/textures/default_grass.png differ diff --git a/games/minimal/mods/default/textures/default_grass_footsteps.png b/games/minimal/mods/default/textures/default_grass_footsteps.png index 57e063d8c..8349033d6 100644 Binary files a/games/minimal/mods/default/textures/default_grass_footsteps.png and b/games/minimal/mods/default/textures/default_grass_footsteps.png differ diff --git a/games/minimal/mods/default/textures/default_gravel.png b/games/minimal/mods/default/textures/default_gravel.png index f08666ad9..4b47e2346 100644 Binary files a/games/minimal/mods/default/textures/default_gravel.png and b/games/minimal/mods/default/textures/default_gravel.png differ diff --git a/games/minimal/mods/default/textures/default_iron_lump.png b/games/minimal/mods/default/textures/default_iron_lump.png index edb931018..6b515f66d 100644 Binary files a/games/minimal/mods/default/textures/default_iron_lump.png and b/games/minimal/mods/default/textures/default_iron_lump.png differ diff --git a/games/minimal/mods/default/textures/default_junglegrass.png b/games/minimal/mods/default/textures/default_junglegrass.png index eea87c07c..7066f7dd9 100644 Binary files a/games/minimal/mods/default/textures/default_junglegrass.png and b/games/minimal/mods/default/textures/default_junglegrass.png differ diff --git a/games/minimal/mods/default/textures/default_jungletree.png b/games/minimal/mods/default/textures/default_jungletree.png index ccd20ac74..a1fd36a51 100644 Binary files a/games/minimal/mods/default/textures/default_jungletree.png and b/games/minimal/mods/default/textures/default_jungletree.png differ diff --git a/games/minimal/mods/default/textures/default_jungletree_top.png b/games/minimal/mods/default/textures/default_jungletree_top.png index 2a9b51373..a13fdae4a 100644 Binary files a/games/minimal/mods/default/textures/default_jungletree_top.png and b/games/minimal/mods/default/textures/default_jungletree_top.png differ diff --git a/games/minimal/mods/default/textures/default_ladder.png b/games/minimal/mods/default/textures/default_ladder.png index 11056359d..46757b884 100644 Binary files a/games/minimal/mods/default/textures/default_ladder.png and b/games/minimal/mods/default/textures/default_ladder.png differ diff --git a/games/minimal/mods/default/textures/default_lava.png b/games/minimal/mods/default/textures/default_lava.png index cb02ada13..a4cf649f1 100644 Binary files a/games/minimal/mods/default/textures/default_lava.png and b/games/minimal/mods/default/textures/default_lava.png differ diff --git a/games/minimal/mods/default/textures/default_lava_flowing_animated.png b/games/minimal/mods/default/textures/default_lava_flowing_animated.png index cef8e3611..0bbd13606 100644 Binary files a/games/minimal/mods/default/textures/default_lava_flowing_animated.png and b/games/minimal/mods/default/textures/default_lava_flowing_animated.png differ diff --git a/games/minimal/mods/default/textures/default_lava_source_animated.png b/games/minimal/mods/default/textures/default_lava_source_animated.png index 9339a684e..aa9d57cf1 100644 Binary files a/games/minimal/mods/default/textures/default_lava_source_animated.png and b/games/minimal/mods/default/textures/default_lava_source_animated.png differ diff --git a/games/minimal/mods/default/textures/default_leaves.png b/games/minimal/mods/default/textures/default_leaves.png index 7a25126e9..00ce4471c 100644 Binary files a/games/minimal/mods/default/textures/default_leaves.png and b/games/minimal/mods/default/textures/default_leaves.png differ diff --git a/games/minimal/mods/default/textures/default_mese.png b/games/minimal/mods/default/textures/default_mese.png index 4c876cdc5..123f0f4b9 100644 Binary files a/games/minimal/mods/default/textures/default_mese.png and b/games/minimal/mods/default/textures/default_mese.png differ diff --git a/games/minimal/mods/default/textures/default_mineral_coal.png b/games/minimal/mods/default/textures/default_mineral_coal.png index 3ff9692fb..0f52062af 100644 Binary files a/games/minimal/mods/default/textures/default_mineral_coal.png and b/games/minimal/mods/default/textures/default_mineral_coal.png differ diff --git a/games/minimal/mods/default/textures/default_mineral_iron.png b/games/minimal/mods/default/textures/default_mineral_iron.png index 51b15d95d..6c894ce1c 100644 Binary files a/games/minimal/mods/default/textures/default_mineral_iron.png and b/games/minimal/mods/default/textures/default_mineral_iron.png differ diff --git a/games/minimal/mods/default/textures/default_mossycobble.png b/games/minimal/mods/default/textures/default_mossycobble.png index fad1b33ff..5082953a6 100644 Binary files a/games/minimal/mods/default/textures/default_mossycobble.png and b/games/minimal/mods/default/textures/default_mossycobble.png differ diff --git a/games/minimal/mods/default/textures/default_nc_back.png b/games/minimal/mods/default/textures/default_nc_back.png index febd7384a..e479ace83 100644 Binary files a/games/minimal/mods/default/textures/default_nc_back.png and b/games/minimal/mods/default/textures/default_nc_back.png differ diff --git a/games/minimal/mods/default/textures/default_nc_front.png b/games/minimal/mods/default/textures/default_nc_front.png index 53b02d174..c9dd6a330 100644 Binary files a/games/minimal/mods/default/textures/default_nc_front.png and b/games/minimal/mods/default/textures/default_nc_front.png differ diff --git a/games/minimal/mods/default/textures/default_nc_rb.png b/games/minimal/mods/default/textures/default_nc_rb.png index 7183e6986..685a22ccf 100644 Binary files a/games/minimal/mods/default/textures/default_nc_rb.png and b/games/minimal/mods/default/textures/default_nc_rb.png differ diff --git a/games/minimal/mods/default/textures/default_nc_side.png b/games/minimal/mods/default/textures/default_nc_side.png index 0a34c8bef..bc85427ae 100644 Binary files a/games/minimal/mods/default/textures/default_nc_side.png and b/games/minimal/mods/default/textures/default_nc_side.png differ diff --git a/games/minimal/mods/default/textures/default_paper.png b/games/minimal/mods/default/textures/default_paper.png index ae5c06bc6..3c31f77c2 100644 Binary files a/games/minimal/mods/default/textures/default_paper.png and b/games/minimal/mods/default/textures/default_paper.png differ diff --git a/games/minimal/mods/default/textures/default_papyrus.png b/games/minimal/mods/default/textures/default_papyrus.png index bf0dec7fe..3707e4081 100644 Binary files a/games/minimal/mods/default/textures/default_papyrus.png and b/games/minimal/mods/default/textures/default_papyrus.png differ diff --git a/games/minimal/mods/default/textures/default_rail.png b/games/minimal/mods/default/textures/default_rail.png index 18176d9f3..777e10c00 100644 Binary files a/games/minimal/mods/default/textures/default_rail.png and b/games/minimal/mods/default/textures/default_rail.png differ diff --git a/games/minimal/mods/default/textures/default_rail_crossing.png b/games/minimal/mods/default/textures/default_rail_crossing.png index 984640577..a988c4740 100644 Binary files a/games/minimal/mods/default/textures/default_rail_crossing.png and b/games/minimal/mods/default/textures/default_rail_crossing.png differ diff --git a/games/minimal/mods/default/textures/default_rail_curved.png b/games/minimal/mods/default/textures/default_rail_curved.png index 62afa3d2b..f87e826c9 100644 Binary files a/games/minimal/mods/default/textures/default_rail_curved.png and b/games/minimal/mods/default/textures/default_rail_curved.png differ diff --git a/games/minimal/mods/default/textures/default_rail_t_junction.png b/games/minimal/mods/default/textures/default_rail_t_junction.png index 9985f63cd..fd25b5ba6 100644 Binary files a/games/minimal/mods/default/textures/default_rail_t_junction.png and b/games/minimal/mods/default/textures/default_rail_t_junction.png differ diff --git a/games/minimal/mods/default/textures/default_sand.png b/games/minimal/mods/default/textures/default_sand.png index 15101a7eb..1a56cc737 100644 Binary files a/games/minimal/mods/default/textures/default_sand.png and b/games/minimal/mods/default/textures/default_sand.png differ diff --git a/games/minimal/mods/default/textures/default_sandstone.png b/games/minimal/mods/default/textures/default_sandstone.png index c4759b4d0..bd9cb8692 100644 Binary files a/games/minimal/mods/default/textures/default_sandstone.png and b/games/minimal/mods/default/textures/default_sandstone.png differ diff --git a/games/minimal/mods/default/textures/default_sapling.png b/games/minimal/mods/default/textures/default_sapling.png index 73f502306..93602322c 100644 Binary files a/games/minimal/mods/default/textures/default_sapling.png and b/games/minimal/mods/default/textures/default_sapling.png differ diff --git a/games/minimal/mods/default/textures/default_scorched_stuff.png b/games/minimal/mods/default/textures/default_scorched_stuff.png index 9ced2fbe8..c7efc7e58 100644 Binary files a/games/minimal/mods/default/textures/default_scorched_stuff.png and b/games/minimal/mods/default/textures/default_scorched_stuff.png differ diff --git a/games/minimal/mods/default/textures/default_sign_wall.png b/games/minimal/mods/default/textures/default_sign_wall.png index 06eac1ee9..93c075a2d 100644 Binary files a/games/minimal/mods/default/textures/default_sign_wall.png and b/games/minimal/mods/default/textures/default_sign_wall.png differ diff --git a/games/minimal/mods/default/textures/default_steel_block.png b/games/minimal/mods/default/textures/default_steel_block.png index 8e2020081..9c0a0e248 100644 Binary files a/games/minimal/mods/default/textures/default_steel_block.png and b/games/minimal/mods/default/textures/default_steel_block.png differ diff --git a/games/minimal/mods/default/textures/default_steel_ingot.png b/games/minimal/mods/default/textures/default_steel_ingot.png index f6c9414e7..ad133bc12 100644 Binary files a/games/minimal/mods/default/textures/default_steel_ingot.png and b/games/minimal/mods/default/textures/default_steel_ingot.png differ diff --git a/games/minimal/mods/default/textures/default_stick.png b/games/minimal/mods/default/textures/default_stick.png index 2d31797f0..055a6ac04 100644 Binary files a/games/minimal/mods/default/textures/default_stick.png and b/games/minimal/mods/default/textures/default_stick.png differ diff --git a/games/minimal/mods/default/textures/default_stone.png b/games/minimal/mods/default/textures/default_stone.png index cad0dbe2b..a835fe002 100644 Binary files a/games/minimal/mods/default/textures/default_stone.png and b/games/minimal/mods/default/textures/default_stone.png differ diff --git a/games/minimal/mods/default/textures/default_tnt_bottom.png b/games/minimal/mods/default/textures/default_tnt_bottom.png index 8ba2fca0b..4eda0603f 100644 Binary files a/games/minimal/mods/default/textures/default_tnt_bottom.png and b/games/minimal/mods/default/textures/default_tnt_bottom.png differ diff --git a/games/minimal/mods/default/textures/default_tnt_side.png b/games/minimal/mods/default/textures/default_tnt_side.png index d9a2bc4eb..c259726d6 100644 Binary files a/games/minimal/mods/default/textures/default_tnt_side.png and b/games/minimal/mods/default/textures/default_tnt_side.png differ diff --git a/games/minimal/mods/default/textures/default_tnt_top.png b/games/minimal/mods/default/textures/default_tnt_top.png index a84ffc9af..a031a34ad 100644 Binary files a/games/minimal/mods/default/textures/default_tnt_top.png and b/games/minimal/mods/default/textures/default_tnt_top.png differ diff --git a/games/minimal/mods/default/textures/default_tool_mesepick.png b/games/minimal/mods/default/textures/default_tool_mesepick.png index a1f3812e0..2b5e12cdb 100644 Binary files a/games/minimal/mods/default/textures/default_tool_mesepick.png and b/games/minimal/mods/default/textures/default_tool_mesepick.png differ diff --git a/games/minimal/mods/default/textures/default_tool_steelaxe.png b/games/minimal/mods/default/textures/default_tool_steelaxe.png index 0ad23c93b..fae19dd0d 100644 Binary files a/games/minimal/mods/default/textures/default_tool_steelaxe.png and b/games/minimal/mods/default/textures/default_tool_steelaxe.png differ diff --git a/games/minimal/mods/default/textures/default_tool_steelpick.png b/games/minimal/mods/default/textures/default_tool_steelpick.png index 7982dafeb..3a8f58643 100644 Binary files a/games/minimal/mods/default/textures/default_tool_steelpick.png and b/games/minimal/mods/default/textures/default_tool_steelpick.png differ diff --git a/games/minimal/mods/default/textures/default_tool_steelshovel.png b/games/minimal/mods/default/textures/default_tool_steelshovel.png index ed8413846..d5b1bc6bc 100644 Binary files a/games/minimal/mods/default/textures/default_tool_steelshovel.png and b/games/minimal/mods/default/textures/default_tool_steelshovel.png differ diff --git a/games/minimal/mods/default/textures/default_tool_steelsword.png b/games/minimal/mods/default/textures/default_tool_steelsword.png index a74581238..efc61a0d1 100644 Binary files a/games/minimal/mods/default/textures/default_tool_steelsword.png and b/games/minimal/mods/default/textures/default_tool_steelsword.png differ diff --git a/games/minimal/mods/default/textures/default_tool_stoneaxe.png b/games/minimal/mods/default/textures/default_tool_stoneaxe.png index 698ac918f..532e16fbc 100644 Binary files a/games/minimal/mods/default/textures/default_tool_stoneaxe.png and b/games/minimal/mods/default/textures/default_tool_stoneaxe.png differ diff --git a/games/minimal/mods/default/textures/default_tool_stonepick.png b/games/minimal/mods/default/textures/default_tool_stonepick.png index b34de6f32..d9156ee3a 100644 Binary files a/games/minimal/mods/default/textures/default_tool_stonepick.png and b/games/minimal/mods/default/textures/default_tool_stonepick.png differ diff --git a/games/minimal/mods/default/textures/default_tool_stoneshovel.png b/games/minimal/mods/default/textures/default_tool_stoneshovel.png index ba5243101..7bbd2d407 100644 Binary files a/games/minimal/mods/default/textures/default_tool_stoneshovel.png and b/games/minimal/mods/default/textures/default_tool_stoneshovel.png differ diff --git a/games/minimal/mods/default/textures/default_tool_stonesword.png b/games/minimal/mods/default/textures/default_tool_stonesword.png index 8f8191f92..533b8734f 100644 Binary files a/games/minimal/mods/default/textures/default_tool_stonesword.png and b/games/minimal/mods/default/textures/default_tool_stonesword.png differ diff --git a/games/minimal/mods/default/textures/default_tool_woodaxe.png b/games/minimal/mods/default/textures/default_tool_woodaxe.png index 3daa4af72..6e70f4a21 100644 Binary files a/games/minimal/mods/default/textures/default_tool_woodaxe.png and b/games/minimal/mods/default/textures/default_tool_woodaxe.png differ diff --git a/games/minimal/mods/default/textures/default_tool_woodpick.png b/games/minimal/mods/default/textures/default_tool_woodpick.png index ea728cca3..15c61f408 100644 Binary files a/games/minimal/mods/default/textures/default_tool_woodpick.png and b/games/minimal/mods/default/textures/default_tool_woodpick.png differ diff --git a/games/minimal/mods/default/textures/default_tool_woodshovel.png b/games/minimal/mods/default/textures/default_tool_woodshovel.png index 649ab4c38..e0b3608db 100644 Binary files a/games/minimal/mods/default/textures/default_tool_woodshovel.png and b/games/minimal/mods/default/textures/default_tool_woodshovel.png differ diff --git a/games/minimal/mods/default/textures/default_tool_woodsword.png b/games/minimal/mods/default/textures/default_tool_woodsword.png index d6c6be325..8099af139 100644 Binary files a/games/minimal/mods/default/textures/default_tool_woodsword.png and b/games/minimal/mods/default/textures/default_tool_woodsword.png differ diff --git a/games/minimal/mods/default/textures/default_torch.png b/games/minimal/mods/default/textures/default_torch.png index 7a953c222..21d98bdbb 100644 Binary files a/games/minimal/mods/default/textures/default_torch.png and b/games/minimal/mods/default/textures/default_torch.png differ diff --git a/games/minimal/mods/default/textures/default_torch_on_ceiling.png b/games/minimal/mods/default/textures/default_torch_on_ceiling.png index 6965d380e..dccd380b2 100644 Binary files a/games/minimal/mods/default/textures/default_torch_on_ceiling.png and b/games/minimal/mods/default/textures/default_torch_on_ceiling.png differ diff --git a/games/minimal/mods/default/textures/default_torch_on_floor.png b/games/minimal/mods/default/textures/default_torch_on_floor.png index 76d1dd5ac..c22010750 100644 Binary files a/games/minimal/mods/default/textures/default_torch_on_floor.png and b/games/minimal/mods/default/textures/default_torch_on_floor.png differ diff --git a/games/minimal/mods/default/textures/default_tree_top.png b/games/minimal/mods/default/textures/default_tree_top.png index 2cdd94f80..3e6bd5262 100644 Binary files a/games/minimal/mods/default/textures/default_tree_top.png and b/games/minimal/mods/default/textures/default_tree_top.png differ diff --git a/games/minimal/mods/default/textures/default_water.png b/games/minimal/mods/default/textures/default_water.png index e5f8cdc25..3e385ae8b 100644 Binary files a/games/minimal/mods/default/textures/default_water.png and b/games/minimal/mods/default/textures/default_water.png differ diff --git a/games/minimal/mods/default/textures/heart.png b/games/minimal/mods/default/textures/heart.png index 6bc183e04..c25f43b9a 100644 Binary files a/games/minimal/mods/default/textures/heart.png and b/games/minimal/mods/default/textures/heart.png differ diff --git a/games/minimal/mods/default/textures/player.png b/games/minimal/mods/default/textures/player.png index 90adf9747..cf5d83f10 100644 Binary files a/games/minimal/mods/default/textures/player.png and b/games/minimal/mods/default/textures/player.png differ diff --git a/games/minimal/mods/default/textures/player_back.png b/games/minimal/mods/default/textures/player_back.png index 530aa7519..d498674eb 100644 Binary files a/games/minimal/mods/default/textures/player_back.png and b/games/minimal/mods/default/textures/player_back.png differ diff --git a/games/minimal/mods/default/textures/treeprop.png b/games/minimal/mods/default/textures/treeprop.png index 77ea4d6d4..eb8a8e6c4 100644 Binary files a/games/minimal/mods/default/textures/treeprop.png and b/games/minimal/mods/default/textures/treeprop.png differ diff --git a/games/minimal/mods/default/textures/wieldhand.png b/games/minimal/mods/default/textures/wieldhand.png index c4549e5ed..dbed6ad0c 100644 Binary files a/games/minimal/mods/default/textures/wieldhand.png and b/games/minimal/mods/default/textures/wieldhand.png differ diff --git a/games/minimal/mods/experimental/textures/experimental_dummyball.png b/games/minimal/mods/experimental/textures/experimental_dummyball.png index 084676552..256414f46 100644 Binary files a/games/minimal/mods/experimental/textures/experimental_dummyball.png and b/games/minimal/mods/experimental/textures/experimental_dummyball.png differ diff --git a/games/minimal/mods/experimental/textures/experimental_tester_tool_1.png b/games/minimal/mods/experimental/textures/experimental_tester_tool_1.png index 8b5bc0b41..587923c86 100644 Binary files a/games/minimal/mods/experimental/textures/experimental_tester_tool_1.png and b/games/minimal/mods/experimental/textures/experimental_tester_tool_1.png differ diff --git a/games/minimal/mods/legacy/textures/apple_iron.png b/games/minimal/mods/legacy/textures/apple_iron.png index 2dffdf014..db5945856 100644 Binary files a/games/minimal/mods/legacy/textures/apple_iron.png and b/games/minimal/mods/legacy/textures/apple_iron.png differ diff --git a/games/minimal/mods/legacy/textures/cooked_rat.png b/games/minimal/mods/legacy/textures/cooked_rat.png index daad3be0d..776dc4ee0 100644 Binary files a/games/minimal/mods/legacy/textures/cooked_rat.png and b/games/minimal/mods/legacy/textures/cooked_rat.png differ diff --git a/games/minimal/mods/legacy/textures/dungeon_master.png b/games/minimal/mods/legacy/textures/dungeon_master.png index 3457c8228..d52d8ccd7 100644 Binary files a/games/minimal/mods/legacy/textures/dungeon_master.png and b/games/minimal/mods/legacy/textures/dungeon_master.png differ diff --git a/games/minimal/mods/legacy/textures/fireball.png b/games/minimal/mods/legacy/textures/fireball.png index 523142850..124469ce4 100644 Binary files a/games/minimal/mods/legacy/textures/fireball.png and b/games/minimal/mods/legacy/textures/fireball.png differ diff --git a/games/minimal/mods/legacy/textures/firefly.png b/games/minimal/mods/legacy/textures/firefly.png index 40df7fa1c..ea95a6a84 100644 Binary files a/games/minimal/mods/legacy/textures/firefly.png and b/games/minimal/mods/legacy/textures/firefly.png differ diff --git a/games/minimal/mods/legacy/textures/oerkki1.png b/games/minimal/mods/legacy/textures/oerkki1.png index 33cbac9e7..061709c80 100644 Binary files a/games/minimal/mods/legacy/textures/oerkki1.png and b/games/minimal/mods/legacy/textures/oerkki1.png differ diff --git a/games/minimal/mods/legacy/textures/oerkki1_damaged.png b/games/minimal/mods/legacy/textures/oerkki1_damaged.png index 9b777387c..b2a30337e 100644 Binary files a/games/minimal/mods/legacy/textures/oerkki1_damaged.png and b/games/minimal/mods/legacy/textures/oerkki1_damaged.png differ diff --git a/games/minimal/mods/legacy/textures/rat.png b/games/minimal/mods/legacy/textures/rat.png index d1a0e2ae2..04cf9b865 100644 Binary files a/games/minimal/mods/legacy/textures/rat.png and b/games/minimal/mods/legacy/textures/rat.png differ -- cgit v1.2.3 From 53066024f6a91d5f83241b379b94d8557d43a646 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Wed, 19 Jun 2013 14:30:22 +0000 Subject: Add drowning --- doc/lua_api.txt | 1 + games/minimal/mods/default/textures/bubble.png | Bin 0 -> 273 bytes src/client.cpp | 7 +++++ src/client.h | 1 + src/environment.cpp | 40 ++++++++++++++++++++++++- src/environment.h | 2 ++ src/game.cpp | 2 +- src/hud.cpp | 5 +++- src/hud.h | 3 +- src/nodedef.cpp | 3 ++ src/nodedef.h | 1 + src/player.cpp | 4 ++- src/player.h | 1 + src/script/common/c_content.cpp | 1 + src/script/lua_api/l_object.cpp | 1 + 15 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 games/minimal/mods/default/textures/bubble.png (limited to 'games') diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 85f6ca5a6..d3d427d69 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1710,6 +1710,7 @@ Node definition (register_node) liquid_alternative_source = "", -- Source version of flowing liquid liquid_viscosity = 0, -- Higher viscosity = slower flow (max. 7) liquid_renewable = true, -- Can new liquid source be created by placing + drowning = true, -- Player will drown in these two or more sources nearly? light_source = 0, -- Amount of light emitted by node damage_per_second = 0, -- If player is inside node, this damage is caused diff --git a/games/minimal/mods/default/textures/bubble.png b/games/minimal/mods/default/textures/bubble.png new file mode 100644 index 000000000..3bca7e11c Binary files /dev/null and b/games/minimal/mods/default/textures/bubble.png differ diff --git a/src/client.cpp b/src/client.cpp index 6b1789fe0..5f53e14f7 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -2680,6 +2680,13 @@ u16 Client::getHP() return player->hp; } +u16 Client::getBreath() +{ + Player *player = m_env.getLocalPlayer(); + assert(player != NULL); + return player->breath; +} + bool Client::getChatMessage(std::wstring &message) { if(m_chat_queue.size() == 0) diff --git a/src/client.h b/src/client.h index f0cc55868..1d231a5a3 100644 --- a/src/client.h +++ b/src/client.h @@ -349,6 +349,7 @@ public: void setCrack(int level, v3s16 pos); u16 getHP(); + u16 getBreath(); bool checkPrivilege(const std::string &priv) { return (m_privileges.count(priv) != 0); } diff --git a/src/environment.cpp b/src/environment.cpp index a97a9bd08..99da5190c 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -2227,7 +2227,45 @@ void ClientEnvironment::step(float dtime) damageLocalPlayer(damage_per_second, true); } } - + + /* + Drowning + */ + if(m_drowning_interval.step(dtime, 2.0)) + { + v3f pf = lplayer->getPosition(); + + // head + v3s16 p = floatToInt(pf + v3f(0, BS*1.6, 0), BS); + MapNode n = m_map->getNodeNoEx(p); + ContentFeatures c = m_gamedef->ndef()->get(n); + + if(c.isLiquid() && c.drowning){ + if(lplayer->breath > 10) + lplayer->breath = 11; + if(lplayer->breath > 0) + lplayer->breath -= 1; + } + + if(lplayer->breath == 0){ + damageLocalPlayer(1, true); + } + } + if(m_breathing_interval.step(dtime, 0.5)) + { + v3f pf = lplayer->getPosition(); + + // head + v3s16 p = floatToInt(pf + v3f(0, BS*1.6, 0), BS); + MapNode n = m_map->getNodeNoEx(p); + ContentFeatures c = m_gamedef->ndef()->get(n); + + if(!c.isLiquid() || !c.drowning){ + if(lplayer->breath <= 10) + lplayer->breath += 1; + } + } + /* Stuff that can be done in an arbitarily large dtime */ diff --git a/src/environment.h b/src/environment.h index a62173a11..ac479999c 100644 --- a/src/environment.h +++ b/src/environment.h @@ -494,6 +494,8 @@ private: Queue m_client_event_queue; IntervalLimiter m_active_object_light_update_interval; IntervalLimiter m_lava_hurt_interval; + IntervalLimiter m_drowning_interval; + IntervalLimiter m_breathing_interval; std::list m_player_names; }; diff --git a/src/game.cpp b/src/game.cpp index 30d9c7faf..88be47b39 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -3310,7 +3310,7 @@ void the_game( if (show_hud) { hud.drawHotbar(v2s32(displaycenter.X, screensize.Y), - client.getHP(), client.getPlayerItem()); + client.getHP(), client.getPlayerItem(), client.getBreath()); } /* diff --git a/src/hud.cpp b/src/hud.cpp index a3ae38bcb..9404ed997 100644 --- a/src/hud.cpp +++ b/src/hud.cpp @@ -278,7 +278,7 @@ void Hud::drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture, s } -void Hud::drawHotbar(v2s32 centerlowerpos, s32 halfheartcount, u16 playeritem) { +void Hud::drawHotbar(v2s32 centerlowerpos, s32 halfheartcount, u16 playeritem, s32 breath) { InventoryList *mainlist = inventory->getList("main"); if (mainlist == NULL) { errorstream << "draw_hotbar(): mainlist == NULL" << std::endl; @@ -295,6 +295,9 @@ void Hud::drawHotbar(v2s32 centerlowerpos, s32 halfheartcount, u16 playeritem) { if (player->hud_flags & HUD_FLAG_HEALTHBAR_VISIBLE) drawStatbar(pos - v2s32(0, 4), HUD_CORNER_LOWER, HUD_DIR_LEFT_RIGHT, "heart.png", halfheartcount, v2s32(0, 0)); + if (player->hud_flags & HUD_FLAG_BREATHBAR_VISIBLE && breath <= 10) + drawStatbar(pos - v2s32(-180, 4), HUD_CORNER_LOWER, HUD_DIR_LEFT_RIGHT, + "bubble.png", breath*2, v2s32(0, 0)); } diff --git a/src/hud.h b/src/hud.h index fa9d33f8b..c7289f7c4 100644 --- a/src/hud.h +++ b/src/hud.h @@ -35,6 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #define HUD_FLAG_HEALTHBAR_VISIBLE (1 << 1) #define HUD_FLAG_CROSSHAIR_VISIBLE (1 << 2) #define HUD_FLAG_WIELDITEM_VISIBLE (1 << 3) +#define HUD_FLAG_BREATHBAR_VISIBLE (1 << 4) #define HUD_PARAM_HOTBAR_ITEMCOUNT 1 @@ -122,7 +123,7 @@ public: void drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture, s32 count, v2s32 offset); - void drawHotbar(v2s32 centerlowerpos, s32 halfheartcount, u16 playeritem); + void drawHotbar(v2s32 centerlowerpos, s32 halfheartcount, u16 playeritem, s32 breath); void resizeHotbar(); void drawCrosshair(); diff --git a/src/nodedef.cpp b/src/nodedef.cpp index ba3e42e98..7d8ce70d3 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -211,6 +211,7 @@ void ContentFeatures::reset() liquid_alternative_source = ""; liquid_viscosity = 0; liquid_renewable = true; + drowning = true; light_source = 0; damage_per_second = 0; node_box = NodeBox(); @@ -279,6 +280,7 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) writeU8(os, rightclickable); // Stuff below should be moved to correct place in a version that otherwise changes // the protocol version + writeU8(os, drowning); } void ContentFeatures::deSerialize(std::istream &is) @@ -343,6 +345,7 @@ void ContentFeatures::deSerialize(std::istream &is) try{ // Stuff below should be moved to correct place in a version that // otherwise changes the protocol version + drowning = readU8(is); }catch(SerializationError &e) {}; } diff --git a/src/nodedef.h b/src/nodedef.h index 2691aca33..e397d20e0 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -219,6 +219,7 @@ struct ContentFeatures u8 liquid_viscosity; // Is liquid renewable (new liquid source will be created between 2 existing) bool liquid_renewable; + bool drowning; // Amount of light the node emits u8 light_source; u32 damage_per_second; diff --git a/src/player.cpp b/src/player.cpp index 4eb5955c0..a199c9a6c 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -36,6 +36,7 @@ Player::Player(IGameDef *gamedef): camera_barely_in_ceiling(false), inventory(gamedef->idef()), hp(PLAYER_MAX_HP), + breath(-1), peer_id(PEER_ID_INEXISTENT), // protected m_gamedef(gamedef), @@ -80,7 +81,8 @@ Player::Player(IGameDef *gamedef): physics_override_gravity = 1; hud_flags = HUD_FLAG_HOTBAR_VISIBLE | HUD_FLAG_HEALTHBAR_VISIBLE | - HUD_FLAG_CROSSHAIR_VISIBLE | HUD_FLAG_WIELDITEM_VISIBLE; + HUD_FLAG_CROSSHAIR_VISIBLE | HUD_FLAG_WIELDITEM_VISIBLE | + HUD_FLAG_BREATHBAR_VISIBLE; hud_hotbar_itemcount = HUD_HOTBAR_ITEMCOUNT_DEFAULT; } diff --git a/src/player.h b/src/player.h index d3738fd52..517bd354d 100644 --- a/src/player.h +++ b/src/player.h @@ -232,6 +232,7 @@ public: float physics_override_gravity; u16 hp; + u16 breath; float hurt_tilt_timer; float hurt_tilt_strength; diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index c7966a0be..64c76ef7c 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -389,6 +389,7 @@ ContentFeatures read_content_features(lua_State *L, int index) f.liquid_viscosity = getintfield_default(L, index, "liquid_viscosity", f.liquid_viscosity); getboolfield(L, index, "liquid_renewable", f.liquid_renewable); + getboolfield(L, index, "drowning", f.drowning); // Amount of light the node emits f.light_source = getintfield_default(L, index, "light_source", f.light_source); diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp index 1e45610a6..f90b59285 100644 --- a/src/script/lua_api/l_object.cpp +++ b/src/script/lua_api/l_object.cpp @@ -62,6 +62,7 @@ struct EnumString es_HudBuiltinElement[] = {HUD_FLAG_HEALTHBAR_VISIBLE, "healthbar"}, {HUD_FLAG_CROSSHAIR_VISIBLE, "crosshair"}, {HUD_FLAG_WIELDITEM_VISIBLE, "wielditem"}, + {HUD_FLAG_BREATHBAR_VISIBLE, "breathbar"}, {0, NULL}, }; -- cgit v1.2.3