From 39228157bcdb2be372d5b32574c5f5b74b7ed8ac Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Thu, 20 Sep 2018 08:57:20 +1000 Subject: [PATCH] add stev and kova's pool tables --- gamemodes/irresistible/cnr/features/pool.pwn | 19 ++++++++++++++++++- .../cnr/static/player_objects.pwn | 3 --- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/gamemodes/irresistible/cnr/features/pool.pwn b/gamemodes/irresistible/cnr/features/pool.pwn index 902aa83..537426b 100644 --- a/gamemodes/irresistible/cnr/features/pool.pwn +++ b/gamemodes/irresistible/cnr/features/pool.pwn @@ -41,7 +41,9 @@ enum E_POOL_SKINS { E_SKIN_DEFAULT, E_SKIN_WOOD_PURPLE, E_SKIN_WOOD_GREEN, - E_SKIN_GOLD_GREEN + E_SKIN_GOLD_GREEN, + E_SKIN_WOOD_BLUE, + E_SKIN_LWOOD_GREEN }; enum E_POOL_BALL_OFFSET_DATA @@ -152,6 +154,8 @@ hook OnScriptInit( ) CreatePoolTable( -1019.264, 1045.7419, 1.763000, 0.000000, 0, 0, E_SKIN_WOOD_PURPLE ); // panther CreatePoolTable( 1999.0837, 1888.4924, 84.22465, 0.000000, VISAGE_APARTMENT_INT, VISAGE_APARTMENT_WORLD[ 1 ], E_SKIN_GOLD_GREEN ); // banging7grams CreatePoolTable( 2005.2181, 1891.0632, 84.22465, 90.00000, VISAGE_APARTMENT_INT, VISAGE_APARTMENT_WORLD[ 7 ], E_SKIN_WOOD_GREEN ); // nibble + CreatePoolTable( -2087.757, 845.72698, 76.36699, 90.00000, 0, 0, E_SKIN_WOOD_BLUE ); // Stev + CreatePoolTable( -2880.332, 56.208999, 7.521999, 0.000000, 0, 0, E_SKIN_LWOOD_GREEN ); // Kova printf( "[POOL TABLES]: %d pool tables have been successfully loaded.", Iter_Count( pooltables ) ); return 1; @@ -623,6 +627,19 @@ stock CreatePoolTable( Float: X, Float: Y, Float: Z, Float: A = 0.0, interior = SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 3, 11631, "mp_ranchcut", "mpCJ_WOOD_DARK", 0 ); SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 4, 11631, "mp_ranchcut", "mpCJ_WOOD_DARK", 0 ); } + else if ( skin == E_SKIN_WOOD_BLUE ) + { + SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 4, 11100, "bendytunnel_sfse", "blackmetal", -16 ); + SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 3, 11100, "bendytunnel_sfse", "blackmetal", -16 ); + } + else if ( skin == E_SKIN_LWOOD_GREEN ) + { + SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 0, 10375, "subshops_sfs", "ws_white_wall1", -11731124 ); + SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 3, 16150, "ufo_bar", "sa_wood07_128", -16 ); + SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 4, 16150, "ufo_bar", "sa_wood07_128", -16 ); + SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 1, 9362, "sfn_byofficeint", "CJ_Black_metal", -16 ); + SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 2, 8463, "vgseland", "tiadbuddhagold", -16 ); + } #if defined POOL_DEBUG ReloadPotTestLabel( 0, poolid ); diff --git a/gamemodes/irresistible/cnr/static/player_objects.pwn b/gamemodes/irresistible/cnr/static/player_objects.pwn index bbc63cf..f98867a 100644 --- a/gamemodes/irresistible/cnr/static/player_objects.pwn +++ b/gamemodes/irresistible/cnr/static/player_objects.pwn @@ -15375,9 +15375,6 @@ stock initializeObjects( ) SetDynamicObjectMaterial( CreateDynamicObject( 1723, -2089.573974, 848.955993, 75.364997, 0.000000, 0.000000, 180.000000, -1, -1, -1 ), 1, 11100, "bendytunnel_sfse", "blackmetal", -16 ); SetDynamicObjectMaterial( CreateDynamicObject( 1723, -2088.222900, 852.067016, 75.364997, 0.000000, 0.000000, -90.000000, -1, -1, -1 ), 1, 11100, "bendytunnel_sfse", "blackmetal", -16 ); SetDynamicObjectMaterial( CreateDynamicObject( 1704, -2091.277099, 852.067016, 75.347000, 0.000000, 0.000000, -30.399999, -1, -1, -1 ), 1, 11100, "bendytunnel_sfse", "blackmetal", -16 ); - tmpVariable = CreateDynamicObject( 2964, -2087.757080, 845.726989, 75.366996, 0.000000, 0.000000, 90.000000, -1, -1, -1 ); - SetDynamicObjectMaterial( tmpVariable, 4, 11100, "bendytunnel_sfse", "blackmetal", -16 ); - SetDynamicObjectMaterial( tmpVariable, 3, 11100, "bendytunnel_sfse", "blackmetal", -16 ); SetDynamicObjectMaterial( CreateDynamicObject( 19923, -2090.320068, 841.908020, 75.416999, 0.000000, 0.000000, 0.000000, -1, -1, -1 ), 0, 11100, "bendytunnel_sfse", "blackmetal", -16 ); SetDynamicObjectMaterial( CreateDynamicObject( 19929, -2095.357910, 840.440002, 75.416999, 0.000000, 0.000000, 0.000000, -1, -1, -1 ), 1, 11100, "bendytunnel_sfse", "blackmetal", -16 ); SetDynamicObjectMaterial( CreateDynamicObject( 19929, -2093.509033, 839.379028, 75.416999, 0.000000, 0.000000, 90.000000, -1, -1, -1 ), 1, 11100, "bendytunnel_sfse", "blackmetal", -16 );