From 341ae23b58653c243f35613246994c86bd7a108c Mon Sep 17 00:00:00 2001 From: Dev Levarris Date: Fri, 26 Feb 2016 08:50:55 +0000 Subject: [PATCH 1/9] Added a few speeders --- .../terminal_character_builder.script | 53 ++++++++----------- 1 file changed, 22 insertions(+), 31 deletions(-) diff --git a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script index ab71b687c..02f91bf06 100644 --- a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script +++ b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script @@ -200,7 +200,10 @@ const string[] VEHICLE_OPTIONS = { "Barc Speeder", "AV21", "X31", - "Flash Speeder" + "Flash Speeder", + "Mecho Chair", + "Sith Speeder", + "Merr-Sonn JT-12 Jetpack" }; const string[] MOUNT_OPTIONS = { "Carrion Spat", @@ -1508,7 +1511,8 @@ const string[] AURILIA_CRYSTALS = { }; const string[] CRAFTING_SUIT = { - "Blix's Ultra Crafting Suit" + "Blixtev's Ultra Crafting Suit" + "Blixtev's Body Spray" }; @@ -2775,41 +2779,28 @@ messageHandler handleVehicleSelect() sendSystemMessageTestingOnly(player, "XP38 Landspeeder Deed Issued."); break; case 6: //Barc Speeder - if(isGod(player)) - { - createObject("object/tangible/deed/vehicle_deed/barc_speeder_deed.iff", pInv, ""); - sendSystemMessageTestingOnly(player, "Barc Speeder Deed Issued."); - } - else - { - sendSystemMessageTestingOnly(player, "You Must be in God Mode to enjoy the BARC Speeder!"); - } + createObject("object/tangible/deed/vehicle_deed/barc_speeder_deed.iff", pInv, ""); + sendSystemMessageTestingOnly(player, "Barc Speeder Deed Issued."); break; case 7: //AV21 - if(isGod(player)) - { - createObject("object/tangible/deed/vehicle_deed/landspeeder_av21_deed.iff", pInv, ""); - sendSystemMessageTestingOnly(player, "AV21 Deed Issued."); - } - else - { - sendSystemMessageTestingOnly(player, "You Must be in God Mode to enjoy the AV21 Speeder!"); - } + createObject("object/tangible/deed/vehicle_deed/landspeeder_av21_deed.iff", pInv, ""); + sendSystemMessageTestingOnly(player, "AV21 Deed Issued."); break; case 8: //X31 createObject("object/tangible/deed/vehicle_deed/landspeeder_x31_deed.iff", pInv, ""); sendSystemMessageTestingOnly(player, "X31 Deed Issued."); break; - case 9: //Flash Speeder - if(isGod(player)) - { - createObject("object/tangible/deed/vehicle_deed/speederbike_flash_deed.iff", pInv, ""); - sendSystemMessageTestingOnly(player, "Flash Speeder Deed Issued."); - } - else - { - sendSystemMessageTestingOnly(player, "You Must be in God Mode to enjoy the Flash Speeder!"); - } + case 9: //Hover Chair + createObject("item_tcg_loot_reward_series1_mechno_chair", pInv, ""); + sendSystemMessageTestingOnly(player, "Mecho Chair Issued"); + break; + case 10: //Sith Speeder + static_item.createNewItemFunction("tem_tcg_loot_reward_series1_sith_speeder",pInv); + sendSystemMessageTestingOnly(player, "Sith Speeder Issued."); + break; + case 11: //Merr-Sonn JT-12 Jetpack + static_item.createNewItemFunction("item_tcg_merr_sonn_jt12_jetpack_deed",pInv); + sendSystemMessageTestingOnly(player, "Merr-Sonn JT-12 Jetpack"); break; default: cleanScriptVars(player); @@ -7446,9 +7437,9 @@ messageHandler handleMiscSelect() buff.applyBuff((player), "event_ewok_berry", 7200); buff.applyBuff((player), "forceCrystalHealth", 7200); buff.applyBuff((player), "forceCrystalForce", 7200); - buff.applyBuff((player), "frogBuff", 7200); sendSystemMessageTestingOnly(player, "Buffs granted."); + default: cleanScriptVars(player); return SCRIPT_CONTINUE; From d51c1336d061f14aa9e988b8c5468ae0f56a1f19 Mon Sep 17 00:00:00 2001 From: Dev Levarris Date: Fri, 26 Feb 2016 08:53:54 +0000 Subject: [PATCH 2/9] Creation wasn't static. --- .../game/script/terminal/terminal_character_builder.script | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script index 02f91bf06..925c09a45 100644 --- a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script +++ b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script @@ -201,7 +201,7 @@ const string[] VEHICLE_OPTIONS = { "AV21", "X31", "Flash Speeder", - "Mecho Chair", + "Mechno Chair", "Sith Speeder", "Merr-Sonn JT-12 Jetpack" }; @@ -2791,7 +2791,7 @@ messageHandler handleVehicleSelect() sendSystemMessageTestingOnly(player, "X31 Deed Issued."); break; case 9: //Hover Chair - createObject("item_tcg_loot_reward_series1_mechno_chair", pInv, ""); + static_item.createNewItemFunction("item_tcg_loot_reward_series1_mechno_chair",pInv); sendSystemMessageTestingOnly(player, "Mecho Chair Issued"); break; case 10: //Sith Speeder From 7f92216746b1a6843a14d1a26adca0427850681c Mon Sep 17 00:00:00 2001 From: Dev Levarris Date: Sun, 28 Feb 2016 08:36:52 +0000 Subject: [PATCH 3/9] More items --- .../terminal_character_builder.script | 141 +++++++++++++++++- 1 file changed, 138 insertions(+), 3 deletions(-) diff --git a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script index 925c09a45..19831ac2c 100644 --- a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script +++ b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script @@ -217,31 +217,156 @@ const string[] MOUNT_OPTIONS = { }; const string[] BEAST_OPTIONS_FOR_PLAYERS = { + "acklay", "angler", "bageraset", "bantha", "bark_mite", + "baz_nitch", "bearded_jax", + "blistmok", + "blurrg", "boar_wolf", "bocatt", + "bol", "bolle_bol", + "bolma", + "bolotaur", "bordok", "borgle", - "blurrg", + "brackaset", "capper_spineflap", + "carrion_spat", "choku", "chuba", "condor_dragon", + "corellian_butterfly", + "corellian_sand_panther", + "corellian_slice_hound", + "crystal_snake", + "cu_pa", "dalyrake", + "dewback", + "dune_lizard", "durni", + "dwarf_nuna", + "eopie", + "falumpaset", "fambaa", + "fanned_rawl", + "flewt", + "flit", + "fynock", + "gackle_bat", + "gaping_spider", + "gnort", + "graul", "gronda", + "gualama", + "gubbur", + "guf_drolg", + "gulginaw", "gurk", + "gurnaset", + "gurreck", + "hanadak", + "hermit_spider", + "horned_krevol", + "horned_rasp", + "huf_dun", + "huurton", "ikopi", + "jundak", + "kaadu", + "kai_tok", + "kashyyyk_bantha", + "kima", + "kimogila", + "kittle", + "kliknik", + "krahbu", + "kubaza_beetle", + "kusak", + "kwi", + "langlatch", + "lantern_bird", + "lava_flea", + "malkloc", "mamien", + "mawgax", + "merek", + "minstyngar", + "mott", + "mouf", + "murra", + "mutated_acklay", + "mutated_boar", + "mutated_borgax", + "mutated_cat", + "mutated_chuba_fly", + "mutated_cu_pa", + "mutated_dewback", + "mutated_griffon", + "mutated_jax", + "mutated_quenker", + "mutated_rancor", + "mutated_slice_hound", + "mutated_varasquactyl", "mynock", + "narglatch", + "nerf", + "nuna", + "peko_peko", + "perlek", + "pharple", + "piket", + "plumed_rasp", + "pugoriss", + "purbole", "quenker", - "reptilian_flier" + "rancor", + "remmer", + "reptilian_flier", + "roba", + "rock_mite", + "ronto", + "salt_mynock", + "sharnaff", + "shaupaut", + "shear_mite", + "skreeg", + "snorbal", + "spined_puc", + "spined_snake", + "squall", + "squill", + "stintaril", + "swirl_prong", + "tanc_mite", + "tanray", + "tauntaun", + "thune", + "torton", + "tulrus", + "tusk_cat", + "tybis", + "uller", + "varactyl", + "veermok", + "verne", + "vesp", + "vir_vur", + "voritor_lizard", + "vynock", + "walluga", + "wampa", + "webweaver", + "whisper_bird", + "womp_rat", + "woolamander", + "worrt", + "xandank", + "zucca_boar" }; const string[] BEAST_OPTIONS = { @@ -875,6 +1000,8 @@ const string[] MISC_OPTIONS = { "Vet 30k Resource Deed", "Biological Focus Crystal", "Synapse Focus Crystal", + "Mustafarian Injector", + "Naboo Signaling Unit", "Grant Buffs" }; const string[] MEDICINE_OPTIONS = { @@ -7401,7 +7528,15 @@ messageHandler handleMiscSelect() static_item.createNewItemFunction("item_force_crystal_04_02", pInv); sendSystemMessageTestingOnly(player, "Synapse Focus Crystal Issued"); break; - case 13: + case 13: // Musty Injector + static_item.createNewItemFunction("item_tow_proc_generic_03_01", pInv); + sendSystemMessageTestingOnly(player, "Mustafarian Injector Issued"); + break; + case 14: // Instance Reset Device + static_item.createNewItemFunction("item_tcg_loot_reward_series5_signal_unit", pInv); + sendSystemMessageTestingOnly(player, "Naboo Signaling Unit Issued"); + break; + case 15: float currentBuffTime = performance.inspireGetMaxDuration(player); buff.applyBuff(player, "buildabuff_inspiration", 7200); utils.setScriptVar(player, "performance.buildabuff.buffComponentKeys", buffComponentKeys); From d1434cc3897dd1084fd8ed4071fe801ad1733478 Mon Sep 17 00:00:00 2001 From: Dev Levarris Date: Sun, 28 Feb 2016 08:45:10 +0000 Subject: [PATCH 4/9] more vehicles --- .../terminal/terminal_character_builder.script | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script index 19831ac2c..ef0b002b7 100644 --- a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script +++ b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script @@ -203,7 +203,10 @@ const string[] VEHICLE_OPTIONS = { "Flash Speeder", "Mechno Chair", "Sith Speeder", - "Merr-Sonn JT-12 Jetpack" + "Merr-Sonn JT-12 Jetpack", + "RIC-920", + "Republic Gunship", + "XJ-2 Landpeeder }; const string[] MOUNT_OPTIONS = { "Carrion Spat", @@ -2929,6 +2932,17 @@ messageHandler handleVehicleSelect() static_item.createNewItemFunction("item_tcg_merr_sonn_jt12_jetpack_deed",pInv); sendSystemMessageTestingOnly(player, "Merr-Sonn JT-12 Jetpack"); break; + case 12: //RIC-920 + static_item.createNewItemFunction("item_tcg_loot_reward_series6_ric_920_speeder",pInv); + sendSystemMessageTestingOnly(player, "RIC-920 Issued"); + break; + case 13: //Republic Gunship + static_item.createNewItemFunction("item_tcg_loot_reward_series7_buildreward_republic_gunship",pInv); + sendSystemMessageTestingOnly(player, "Republic Gunship Issued"); + break; + static_item.createNewItemFunction("item_tcg_loot_reward_series1_organa_speeder",pInv); + sendSystemMessageTestingOnly(player, "XJ-2 Issued"); + break; default: cleanScriptVars(player); return SCRIPT_CONTINUE; From e309cdbeeca150cbeae466c64f5d6405de359364 Mon Sep 17 00:00:00 2001 From: Dev Levarris Date: Sun, 28 Feb 2016 08:49:12 +0000 Subject: [PATCH 5/9] Missing I in item. --- .../game/script/terminal/terminal_character_builder.script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script index ef0b002b7..0f3995c61 100644 --- a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script +++ b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script @@ -2925,7 +2925,7 @@ messageHandler handleVehicleSelect() sendSystemMessageTestingOnly(player, "Mecho Chair Issued"); break; case 10: //Sith Speeder - static_item.createNewItemFunction("tem_tcg_loot_reward_series1_sith_speeder",pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series1_sith_speeder",pInv); sendSystemMessageTestingOnly(player, "Sith Speeder Issued."); break; case 11: //Merr-Sonn JT-12 Jetpack From 4ee8175b25dbed4f4debe644bcb67731701629af Mon Sep 17 00:00:00 2001 From: Dev Levarris Date: Sun, 28 Feb 2016 08:55:28 +0000 Subject: [PATCH 6/9] TCG Houses to frog. --- .../terminal/terminal_character_builder.script | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script index 0f3995c61..711106bc8 100644 --- a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script +++ b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script @@ -658,7 +658,8 @@ const string[] DEED_OPTIONS = { "Fusion Reactor", "Corellia City Pack", "Naboo City Pack", - "Tatooine City Pack" + "Tatooine City Pack", + "TCG Houses" }; @@ -4756,6 +4757,19 @@ messageHandler handleDeedSelect() createObject("object/tangible/deed/city_deed/garden_tatooine_sml_01_deed.iff", pInv, ""); sendSystemMessageTestingOnly(player, "Tatooine City Pack Created"); break; + case 18; + //TCG House Pack (barn is broken) + static_item.createNewItemFunction("item_tcg_loot_reward_series1_diner",pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series3_sith_meditation_room_deed",pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series3_jedi_meditation_room_deed",pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series4_relaxation_pool_deed_02_01",pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series5_player_house_hangar",pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series5_player_house_atat",pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series6_deed_emperor_spire",pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series6_deed_rebel_spire",pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series7_deed_commando_bunker",pInv); + static_item.createNewItemFunction("item_tcg_loot_reward_series7_deed_vip_bunker",pInv); + sendSystemMessageTestingOnly(player, "TCG House Pack Created"); default: cleanScriptVars(player); return SCRIPT_CONTINUE; From 6e13470b3337b7eb0a4574f218178ed354cc40c7 Mon Sep 17 00:00:00 2001 From: Dev Levarris Date: Sun, 28 Feb 2016 10:42:42 +0000 Subject: [PATCH 7/9] Color Crystals to now give named colored variations. --- .../game/script/terminal/terminal_character_builder.script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script index 711106bc8..c0877e207 100644 --- a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script +++ b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script @@ -9611,7 +9611,7 @@ messageHandler handleCrystalSelect() case 0: for (int i = 0; i < 4; i++) { - jedi.createColorCrystal(pInv, rand(0, 11)); + jedi.createColorCrystal(pInv, rand(0, 31)); } sendSystemMessageTestingOnly(player, "Color Crystals Issued!"); break; From 5a2bf8f27a3e701309feb7b2aed36ed7050eb1d0 Mon Sep 17 00:00:00 2001 From: Dev Levarris Date: Sun, 28 Feb 2016 13:16:32 +0000 Subject: [PATCH 8/9] Drink to frog. --- .../terminal_character_builder.script | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script index c0877e207..ab2bf1422 100644 --- a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script +++ b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script @@ -1006,6 +1006,7 @@ const string[] MISC_OPTIONS = { "Synapse Focus Crystal", "Mustafarian Injector", "Naboo Signaling Unit", + "Custom Drink", "Grant Buffs" }; const string[] MEDICINE_OPTIONS = { @@ -7564,7 +7565,25 @@ messageHandler handleMiscSelect() static_item.createNewItemFunction("item_tcg_loot_reward_series5_signal_unit", pInv); sendSystemMessageTestingOnly(player, "Naboo Signaling Unit Issued"); break; - case 15: + case 15: //drink 2 op + if (isGod(player)) + { + obj_id juice = createObject("object/tangible/food/crafted/drink_blue_milk.iff", pInv, ""); + setCount(juice, 3); + setObjVar(juice, "buffName", crystal_buff); + setObjVar(juice, "duration", 7200.f); + attachScript(juice, "item.special.nomove"); + setObjVar(juice, "noTrade", 1); + sendSystemMessageTestingOnly(player, "Diabetes given."); + break; + } + else + { + sendSystemMessageTestingOnly(player, "You Must be in God to enjoy the diabetes!"); + + } + + case 16: float currentBuffTime = performance.inspireGetMaxDuration(player); buff.applyBuff(player, "buildabuff_inspiration", 7200); utils.setScriptVar(player, "performance.buildabuff.buffComponentKeys", buffComponentKeys); From 91cfd34e96bc76947de7a1466503fd7e884756c1 Mon Sep 17 00:00:00 2001 From: Dev Levarris Date: Tue, 1 Mar 2016 00:41:16 +0000 Subject: [PATCH 9/9] Updated the Frog to reflect pointed out mistakes. --- .../terminal_character_builder.script | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script index ab2bf1422..99cfc806d 100644 --- a/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script +++ b/dsrc/sku.0/sys.server/compiled/game/script/terminal/terminal_character_builder.script @@ -1644,7 +1644,6 @@ const string[] AURILIA_CRYSTALS = { const string[] CRAFTING_SUIT = { "Blixtev's Ultra Crafting Suit" - "Blixtev's Body Spray" }; @@ -2942,6 +2941,7 @@ messageHandler handleVehicleSelect() static_item.createNewItemFunction("item_tcg_loot_reward_series7_buildreward_republic_gunship",pInv); sendSystemMessageTestingOnly(player, "Republic Gunship Issued"); break; + case 14: // XJ-2 static_item.createNewItemFunction("item_tcg_loot_reward_series1_organa_speeder",pInv); sendSystemMessageTestingOnly(player, "XJ-2 Issued"); break; @@ -7566,23 +7566,14 @@ messageHandler handleMiscSelect() sendSystemMessageTestingOnly(player, "Naboo Signaling Unit Issued"); break; case 15: //drink 2 op - if (isGod(player)) - { - obj_id juice = createObject("object/tangible/food/crafted/drink_blue_milk.iff", pInv, ""); - setCount(juice, 3); - setObjVar(juice, "buffName", crystal_buff); - setObjVar(juice, "duration", 7200.f); - attachScript(juice, "item.special.nomove"); - setObjVar(juice, "noTrade", 1); - sendSystemMessageTestingOnly(player, "Diabetes given."); - break; - } - else - { - sendSystemMessageTestingOnly(player, "You Must be in God to enjoy the diabetes!"); - - } - + obj_id juice = createObject("object/tangible/food/crafted/drink_blue_milk.iff", pInv, ""); + setCount(juice, 3); + setObjVar(juice, "buffName", crystal_buff); + setObjVar(juice, "duration", 7200.f); + attachScript(juice, "item.special.nomove"); + setObjVar(juice, "noTrade", 1); + sendSystemMessageTestingOnly(player, "Drink Issued"); + break; case 16: float currentBuffTime = performance.inspireGetMaxDuration(player); buff.applyBuff(player, "buildabuff_inspiration", 7200);