diff --git a/gamedir/Data-1.13/Interface/delivery.png b/gamedir/Data-1.13/Interface/delivery.png new file mode 100644 index 000000000..40ea9b2ee Binary files /dev/null and b/gamedir/Data-1.13/Interface/delivery.png differ diff --git a/gamedir/Data-1.13/Interface/kingpinclub_entrance.png b/gamedir/Data-1.13/Interface/kingpinclub_entrance.png new file mode 100644 index 000000000..9249e6b52 Binary files /dev/null and b/gamedir/Data-1.13/Interface/kingpinclub_entrance.png differ diff --git a/gamedir/Data-1.13/Interface/neonsign_beer.png b/gamedir/Data-1.13/Interface/neonsign_beer.png new file mode 100644 index 000000000..351d60770 Binary files /dev/null and b/gamedir/Data-1.13/Interface/neonsign_beer.png differ diff --git a/gamedir/Data-1.13/Interface/neonsign_theclub.png b/gamedir/Data-1.13/Interface/neonsign_theclub.png new file mode 100644 index 000000000..5f0161707 Binary files /dev/null and b/gamedir/Data-1.13/Interface/neonsign_theclub.png differ diff --git a/gamedir/Data-1.13/Interface/neonsign_xxx.png b/gamedir/Data-1.13/Interface/neonsign_xxx.png new file mode 100644 index 000000000..6cc67a2d9 Binary files /dev/null and b/gamedir/Data-1.13/Interface/neonsign_xxx.png differ diff --git a/gamedir/Data-1.13/Interface/poster_beer1.png b/gamedir/Data-1.13/Interface/poster_beer1.png new file mode 100644 index 000000000..45447aaa1 Binary files /dev/null and b/gamedir/Data-1.13/Interface/poster_beer1.png differ diff --git a/gamedir/Data-1.13/Interface/poster_yellow_green_bottle.png b/gamedir/Data-1.13/Interface/poster_yellow_green_bottle.png new file mode 100644 index 000000000..0fb11c1b5 Binary files /dev/null and b/gamedir/Data-1.13/Interface/poster_yellow_green_bottle.png differ diff --git a/gamedir/Data-1.13/Interface/shady_lady.png b/gamedir/Data-1.13/Interface/shady_lady.png new file mode 100644 index 000000000..2c3d97c2d Binary files /dev/null and b/gamedir/Data-1.13/Interface/shady_lady.png differ diff --git a/gamedir/Data-1.13/Interface/sign_generalstore.png b/gamedir/Data-1.13/Interface/sign_generalstore.png new file mode 100644 index 000000000..348b552b9 Binary files /dev/null and b/gamedir/Data-1.13/Interface/sign_generalstore.png differ diff --git a/gamedir/Data-1.13/Scripts/Overhead.lua b/gamedir/Data-1.13/Scripts/Overhead.lua index f95c47240..5117a1238 100644 --- a/gamedir/Data-1.13/Scripts/Overhead.lua +++ b/gamedir/Data-1.13/Scripts/Overhead.lua @@ -574,6 +574,7 @@ MiniGames = { TETRIS = 0, PONG = 1, + PICTURE = 2, } -- luaactionids that aren't used in ModSpecificActions @@ -585,6 +586,16 @@ InteractiveAction = TABLETENNIS = 53, TOILET = 54, TV = 55, + STEAL_CASHREGISTER = 56, + PICTURE_NEONTHECLUB = 57, -- Neon sign: 'The club' + PICTURE_NEONBEER = 58, -- Neon sign: 'Beer' + PICTURE_BEER = 59, -- Poster: 'Beer' + PICTURE_2xBEER = 60, -- 2-tile Poster: 'Beer' + PICTURE_PRIVATE = 61, -- Sign: 'Private' + PICTURE_XXXPITSTOP = 62, -- Neon Sign: 'XXX Pit Stop' + PICTURE_DELIVERY = 63, -- 2-tile Poster: 'Delivery' + PICTURE_GENERALSTORE = 64, -- 2-tile Poster: 'General Store' + PICTURE_SHADYLADY = 65, -- 2-tile Poster: 'Shady Lady' } -- We have an array of 1000 signed integers that a modder can use to set whatever data he wants. @@ -1675,7 +1686,6 @@ function HandleInteractiveActionResult(sSectorX, sSectorY, bSectorZ, sGridNo, bL elseif ( usActionType == ActionTypes.ACTIONTYPE_VARIOUS ) then - -- for now, the only game we have is tetris if ( sLuaactionid == InteractiveAction.BILLIARD ) then PlaySound("Sounds\\billiard.wav") @@ -1691,6 +1701,49 @@ function HandleInteractiveActionResult(sSectorX, sSectorY, bSectorZ, sGridNo, bL elseif ( sLuaactionid == InteractiveAction.TV ) then PlaySound("Sounds\\tvstatic.wav") + + elseif ( sLuaactionid == InteractiveAction.STEAL_CASHREGISTER ) then + + PlaySound("Sounds\\cashregister.wav") + + elseif ( sLuaactionid == InteractiveAction.PICTURE_NEONTHECLUB ) then + + -- The first argument is the path of a .png picture (any other format will be ignored). + -- The second argument determines whether we stretch the picture to fullscreen (1) or not (0). If the picture is larger than our screen, we stretch it anyway. + -- Only call this function from tactical (the call will be ignored otherwise). + DisplayPictureTactical("Interface\\neonsign_theclub.png", 1) + + elseif ( sLuaactionid == InteractiveAction.PICTURE_NEONBEER ) then + + DisplayPictureTactical("Interface\\neonsign_beer.png", 0) + + elseif ( sLuaactionid == InteractiveAction.PICTURE_BEER ) then + + DisplayPictureTactical("Interface\\poster_beer1.png", 0) + + elseif ( sLuaactionid == InteractiveAction.PICTURE_2xBEER ) then + + DisplayPictureTactical("Interface\\poster_yellow_green_bottle.png", 0) + + elseif ( sLuaactionid == InteractiveAction.PICTURE_PRIVATE ) then + + DisplayPictureTactical("Interface\\kingpinclub_entrance.png", 0) + + elseif ( sLuaactionid == InteractiveAction.PICTURE_XXXPITSTOP ) then + + DisplayPictureTactical("Interface\\neonsign_xxx.png", 0) + + elseif ( sLuaactionid == InteractiveAction.PICTURE_DELIVERY ) then + + DisplayPictureTactical("Interface\\delivery.png", 0) + + elseif ( sLuaactionid == InteractiveAction.PICTURE_GENERALSTORE ) then + + DisplayPictureTactical("Interface\\sign_generalstore.png", 0) + + elseif ( sLuaactionid == InteractiveAction.PICTURE_SHADYLADY ) then + + DisplayPictureTactical("Interface\\shady_lady.png", 0) end diff --git a/gamedir/Data-1.13/TableData/Map/InteractiveActions.xml b/gamedir/Data-1.13/TableData/Map/InteractiveActions.xml index 1b32af6a5..0107e8922 100644 --- a/gamedir/Data-1.13/TableData/Map/InteractiveActions.xml +++ b/gamedir/Data-1.13/TableData/Map/InteractiveActions.xml @@ -1072,6 +1072,112 @@ 6 55 - + + + + lawless2.sti + 18 + 19 + 6 + 56 + + + lawless.sti + 20 + 21 + 6 + 56 + + + + + waldc21b.sti + 0 + 1 + 6 + 57 + + + + + waldc21b.sti + 2 + 3 + 4 + 5 + 6 + 58 + + + + + waldc21b.sti + 8 + 6 + 59 + + + + + w_dec06.sti + 0 + 6 + 59 + + + + + w_dec06.sti + 8 + 9 + 6 + 60 + + + + + w_dec08.sti + 5 + 6 + 6 + 61 + + + + + waldec21.sti + 1 + 2 + 6 + 62 + + + + + w_dec09.sti + 2 + 3 + 6 + 63 + + + + + w_dec09.sti + 4 + 5 + 6 + 64 + + + + + w_dec10.sti + 2 + 3 + 6 + 65 + + diff --git a/gamedir/Data/Sounds/cashregister.wav b/gamedir/Data/Sounds/cashregister.wav new file mode 100644 index 000000000..2c5af7e24 Binary files /dev/null and b/gamedir/Data/Sounds/cashregister.wav differ