From c57067199d9daab937a60aac885ebc42342f2e00 Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Mon, 17 Sep 2018 08:22:45 +1000 Subject: [PATCH] more pool skins for crowdfund patreons --- gamemodes/irresistible/cnr/features/pool.pwn | 24 +++++++++++++++++-- .../cnr/features/visage/apartments.pwn | 3 --- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/gamemodes/irresistible/cnr/features/pool.pwn b/gamemodes/irresistible/cnr/features/pool.pwn index 593a770..436853e 100644 --- a/gamemodes/irresistible/cnr/features/pool.pwn +++ b/gamemodes/irresistible/cnr/features/pool.pwn @@ -1,6 +1,6 @@ /* * Irresistible Gaming (c) 2018 - * Developed by Steven Howard + * Developed by Steven Howard, Lorenc Pekaj * Module: cnr/features/pool.pwn * Purpose: pool minigame */ @@ -39,7 +39,9 @@ enum E_POOL_BALL_TYPE { enum E_POOL_SKINS { E_SKIN_DEFAULT, - E_SKIN_WOOD_PURPLE + E_SKIN_WOOD_PURPLE, + E_SKIN_WOOD_GREEN, + E_SKIN_GOLD_GREEN }; enum E_POOL_BALL_OFFSET_DATA @@ -148,6 +150,8 @@ hook OnScriptInit( ) // custom pool tables 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, 11, 0, E_SKIN_GOLD_GREEN ); // banging7grams + CreatePoolTable( 2005.2181, 1891.0632, 84.22465, 90.00000, 17, 0, E_SKIN_WOOD_GREEN ); // nibble printf( "[POOL TABLES]: %d pool tables have been successfully loaded.", Iter_Count( pooltables ) ); return 1; @@ -597,6 +601,22 @@ stock CreatePoolTable( Float: X, Float: Y, Float: Z, Float: A = 0.0, interior = SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 4, 11631, "mp_ranchcut", "mpCJ_WOOD_DARK", 0 ); SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 0, 10375, "subshops_sfs", "ws_white_wall1", -10072402 ); } + else if ( skin == E_SKIN_GOLD_GREEN ) + { + SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 0, 1273, "icons3", "greengrad32", 0 ); + SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 1, 946, "bskball_standext", "drkbrownmetal", 0 ); + SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 2, 8463, "vgseland", "tiadbuddhagold", 0 ); + SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 3, 8463, "vgseland", "tiadbuddhagold", 0 ); + SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 4, 8463, "vgseland", "tiadbuddhagold", 0 ); + } + else if ( skin == E_SKIN_WOOD_GREEN ) + { + SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 0, 1273, "icons3", "greengrad32", 0 ); + SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 1, 8401, "vgshpground", "dirtywhite", 0 ); + SetDynamicObjectMaterial( g_poolTableData[ poolid ] [ E_TABLE ], 2, 11631, "mp_ranchcut", "mpCJ_WOOD_DARK", 0 ); + 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 ); + } #if defined POOL_DEBUG ReloadPotTestLabel( 0, poolid ); diff --git a/gamemodes/irresistible/cnr/features/visage/apartments.pwn b/gamemodes/irresistible/cnr/features/visage/apartments.pwn index fb25779..b5cb0dd 100644 --- a/gamemodes/irresistible/cnr/features/visage/apartments.pwn +++ b/gamemodes/irresistible/cnr/features/visage/apartments.pwn @@ -598,7 +598,6 @@ static stock InitializeCasinoApartments( ) CreateDynamicObject( 2908, 1986.005004, 1898.262939, 84.394996, 0.000000, 0.000000, 0.000000, VISAGE_APARTMENT_WORLD[ 1 ], VISAGE_APARTMENT_INT ); SetDynamicObjectMaterial( CreateDynamicObject( 14446, 1982.119018, 1889.348022, 83.845001, 0.000000, 0.000000, 90.000000, VISAGE_APARTMENT_WORLD[ 1 ], VISAGE_APARTMENT_INT ), 0, 10789, "xenon_sfse", "ws_white_wall1", -259308269 ); SetDynamicObjectMaterial( CreateDynamicObject( 2323, 1981.831054, 1891.790039, 83.245002, 0.000000, 0.000000, 90.000000, VISAGE_APARTMENT_WORLD[ 1 ], VISAGE_APARTMENT_INT ), 0, 10789, "xenon_sfse", "ws_white_wall1", -259308269 ); - CreateDynamicObject( 14651, 1999.531005, 1887.937988, 85.394996, 0.000000, 0.000000, 90.000000, VISAGE_APARTMENT_WORLD[ 1 ], VISAGE_APARTMENT_INT ); CreateDynamicObject( 19474, 2004.661987, 1892.957031, 83.675003, 0.000000, 0.000000, 0.000000, VISAGE_APARTMENT_WORLD[ 1 ], VISAGE_APARTMENT_INT ); CreateDynamicObject( 16779, 2002.489990, 1900.362060, 87.394996, 0.000000, 0.000000, 0.000000, VISAGE_APARTMENT_WORLD[ 1 ], VISAGE_APARTMENT_INT ); CreateDynamicObject( 2025, 1983.201049, 1892.989013, 83.275001, 0.000000, 0.000000, 0.000000, VISAGE_APARTMENT_WORLD[ 1 ], VISAGE_APARTMENT_INT ); @@ -630,7 +629,6 @@ static stock InitializeCasinoApartments( ) CreateDynamicObject( 1895, 1991.697998, 1904.314941, 85.822998, 0.000000, 0.000000, -179.800003, VISAGE_APARTMENT_WORLD[ 1 ], VISAGE_APARTMENT_INT ); CreateDynamicObject( 2161, 1992.916015, 1889.938964, 85.885002, 0.000000, 0.000000, 270.000000, VISAGE_APARTMENT_WORLD[ 1 ], VISAGE_APARTMENT_INT ); CreateDynamicObject( 2099, 1993.942993, 1893.895019, 83.294998, 0.000000, 0.000000, 90.000000, VISAGE_APARTMENT_WORLD[ 1 ], VISAGE_APARTMENT_INT ); - CreateDynamicObject( 2965, 1999.687988, 1887.298950, 84.235000, 0.000000, 0.000000, 0.000000, VISAGE_APARTMENT_WORLD[ 1 ], VISAGE_APARTMENT_INT ); CreateDynamicObject( 19604, 2008.135986, 1899.901000, 84.285003, 90.000000, 90.000000, 0.000000, VISAGE_APARTMENT_WORLD[ 1 ], VISAGE_APARTMENT_INT ); SetDynamicObjectMaterial( CreateDynamicObject( 18762, 2008.615966, 1897.828979, 85.705001, 0.000000, 0.000000, 0.000000, VISAGE_APARTMENT_WORLD[ 1 ], VISAGE_APARTMENT_INT ), 0, 1676, "wshxrefpump", "black64", 0 ); CreateDynamicObject( 18688, 1994.331054, 1901.467041, 81.785003, 0.000000, 0.000000, 0.000000, VISAGE_APARTMENT_WORLD[ 1 ], VISAGE_APARTMENT_INT ); @@ -1284,7 +1282,6 @@ static stock InitializeCasinoApartments( ) SetDynamicObjectMaterialText( CreateDynamicObject( 18762, 1993.458984, 1889.005004, 84.845001, 0.000000, 0.000000, 0.000000, VISAGE_APARTMENT_WORLD[ 7 ], VISAGE_APARTMENT_INT ), 0, "N", 130, "Times new roman", 100, 0, -16777216, 0, 1 ); CreateDynamicObject( 2315, 2003.316040, 1900.718994, 83.275001, 0.000000, 0.000000, 0.000000, VISAGE_APARTMENT_WORLD[ 7 ], VISAGE_APARTMENT_INT ); CreateDynamicObject( 2315, 2003.316040, 1899.046997, 83.275001, 0.000000, 0.000000, 0.000000, VISAGE_APARTMENT_WORLD[ 7 ], VISAGE_APARTMENT_INT ); - CreateDynamicObject( 14651, 2004.661010, 1890.812988, 85.455001, 0.000000, 0.000000, 180.000000, VISAGE_APARTMENT_WORLD[ 7 ], VISAGE_APARTMENT_INT ); CreateDynamicObject( 1824, 1999.762939, 1889.105957, 83.714996, 0.000000, 0.000000, 0.000000, VISAGE_APARTMENT_WORLD[ 7 ], VISAGE_APARTMENT_INT ); CreateDynamicObject( 1723, 1998.741943, 1891.317993, 83.275001, 0.000000, 0.000000, 0.000000, VISAGE_APARTMENT_WORLD[ 7 ], VISAGE_APARTMENT_INT ); CreateDynamicObject( 1723, 2000.751953, 1886.806030, 83.275001, 0.000000, 0.000000, 180.000000, VISAGE_APARTMENT_WORLD[ 7 ], VISAGE_APARTMENT_INT );