diff --git a/DATA/EQUIPMENT/market_misc.ini b/DATA/EQUIPMENT/market_misc.ini index ed666f6d..dca9d58e 100644 --- a/DATA/EQUIPMENT/market_misc.ini +++ b/DATA/EQUIPMENT/market_misc.ini @@ -16966,3 +16966,8 @@ base = LI06_06_Base MarketGood = ge_s_tractor_01, 0, -1, 1, 1, 0, 1, 1 MarketGood = ge_s_repair_01, 0, -1, 1, 1, 0, 1, 1 MarketGood = ge_s_battery_01, 0, -1, 1, 1, 0, 1, 1 + +[BaseGood] +base = LI06_07_Base +MarketGood = ge_s_repair_01, 0, -1, 1, 1, 0, 1, 1 +MarketGood = ge_s_battery_01, 0, -1, 1, 1, 0, 1, 1 diff --git a/DATA/MISSIONS/mbases.ini b/DATA/MISSIONS/mbases.ini index 232a8a4c..b2ed5d5a 100644 --- a/DATA/MISSIONS/mbases.ini +++ b/DATA/MISSIONS/mbases.ini @@ -47450,25 +47450,6 @@ character_density = 2 fixture = LI0604_fix_trader, Zs/NPC/Trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader fixture = LI0604_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment -[MBase] -nickname = LI06_05_Base -local_faction = li_lsf_grp -diff = 2 -msg_id_prefix = gcs_refer_base_LI06_05_Base - -[BaseFaction] -faction = li_p_grp -weight = 1 -offers_missions = false - -[BaseFaction] -faction = li_n_grp -weight = 1 -offers_missions = false - -[MVendor] -num_offers = 0, 0 - [MBase] nickname = LI06_06_Base local_faction = gd_bh_grp @@ -47809,7 +47790,7 @@ fixture = li06_06_base_shipdealer_npc_01, Zs/NPC/ShipDealer/01/A/Stand, scripts\ [MBase] nickname = LI06_07_Base local_faction = li_n_grp -diff = 2 +diff = 1 msg_id_prefix = gcs_refer_base_LI06_07_Base [BaseFaction] @@ -47824,3 +47805,419 @@ offers_missions = false [MVendor] num_offers = 0, 0 + +[GF_NPC] +nickname = li06_07_base_bar_npc_01 +body = rh_wilham_body +head = ge_male1_head +lefthand = benchmark_male_hand_left +righthand = benchmark_male_hand_right +affiliation = co_alg_grp +voice = rvp146 +bribe = co_alg_grp, 10000, 16101 +bribe = co_rs_grp, 10000, 16100 +bribe = fc_j_grp, 10000, 16100 +rumor = base_0_rank, mission_end, 1, 131301 +rumor = base_0_rank, mission_end, 2, 131302 +rumor = base_0_rank, mission_end, 2, 131303 +rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441 +rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580 +rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584 +rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586 +rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591 +rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594 +rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605 +rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606 +rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607 +rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648 +rumor_type2 = base_0_rank, mission_04_loaded, 1, 393481 +rumor_type2 = base_0_rank, mission_04_loaded, 1, 393380 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649 +know = 251785, 253646, 2500, 1 +knowdb = rh01_05 +individual_name = 263081 + +[GF_NPC] +nickname = li06_07_base_bar_npc_02 +body = sh_male2_body +head = br_sales_head +lefthand = benchmark_male_hand_left +righthand = benchmark_male_hand_right +affiliation = gd_bh_grp +voice = rvp111 +misn = DestroyMission, 0, 0.112387 +bribe = co_nws_grp, 10000, 16100 +bribe = co_os_grp, 10000, 16100 +bribe = co_shi_grp, 10000, 16100 +bribe = gd_bh_grp, 10000, 16101 +rumor = base_0_rank, mission_end, 1, 131304 +rumor = base_0_rank, mission_end, 2, 131305 +rumorknowdb = li01_12 +rumor = base_0_rank, mission_end, 1, 131306 +rumor = base_0_rank, mission_end, 2, 131307 +rumor = base_0_rank, mission_end, 2, 131308 +rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393442 +rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574 +rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393575 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577 +rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393578 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580 +rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584 +rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586 +rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591 +rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594 +rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605 +rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606 +rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607 +rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648 +rumor_type2 = base_0_rank, mission_04_loaded, 1, 393482 +rumor_type2 = base_0_rank, mission_04_loaded, 1, 393381 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649 +know = 251644, 252610, 11000, 2 +knowdb = li01_to_li04_hole +accessory = prop_neuralnet_B +individual_name = 263080 + +[GF_NPC] +nickname = li06_07_base_bar_npc_03 +body = pl_female2_journeyman_body +head = pl_female1_head +lefthand = benchmark_female_hand_left +righthand = benchmark_female_hand_right +affiliation = gd_bh_grp +voice = rvp501 +misn = DestroyMission, 0, 0.112387 +bribe = co_be_grp, 10000, 16100 +bribe = co_nws_grp, 10000, 16100 +bribe = gd_bh_grp, 10000, 16101 +rumor = base_0_rank, mission_end, 1, 131304 +rumor = base_0_rank, mission_end, 2, 131305 +rumorknowdb = li01_12 +rumor = base_0_rank, mission_end, 1, 131306 +rumor = base_0_rank, mission_end, 2, 131307 +rumor = base_0_rank, mission_end, 2, 131308 +rumor = base_0_rank, mission_end, 3, 134337 +rumorknowdb = Li01_suprise_bh_fighter_badlands +rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393442 +rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574 +rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393575 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577 +rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393578 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580 +rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584 +rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586 +rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591 +rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594 +rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605 +rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606 +rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607 +rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648 +rumor_type2 = base_0_rank, mission_04_loaded, 1, 393483 +rumor_type2 = base_0_rank, mission_04_loaded, 1, 393382 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649 +know = 251644, 252610, 10000, 2 +knowdb = li01_to_li04_hole +know = 251910, 253647, 7000, 2 +knowdb = Li01_suprise_bh_fighter_badlands +accessory = prop_neuralnet_B +individual_name = 263079 + +[GF_NPC] +nickname = li06_07_base_bar_npc_04 +body = li_bartender_body +head = br_bartender_head +lefthand = benchmark_male_hand_left +righthand = benchmark_male_hand_right +affiliation = li_n_grp +voice = rvp101 +rumor = base_0_rank, mission_end, 1, 131309 +rumor = base_0_rank, mission_end, 1, 131311 +rumor = base_0_rank, mission_end, 1, 131312 +rumor = base_0_rank, mission_end, 1, 131313 +rumor = base_0_rank, mission_end, 1, 131314 +rumor = base_0_rank, mission_end, 1, 131319 +rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393442 +rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574 +rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393575 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577 +rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393578 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393581 +rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393583 +rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584 +rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586 +rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591 +rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594 +rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605 +rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606 +rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607 +rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648 +rumor_type2 = base_0_rank, mission_04_loaded, 1, 393484 +rumor_type2 = base_0_rank, mission_04_loaded, 1, 393383 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649 +individual_name = 263078 + +[GF_NPC] +nickname = li06_07_base_bar_npc_05 +body = li_male_elite_body +head = ge_male6_head +lefthand = male_hand_left_black +righthand = male_hand_right_black +affiliation = li_n_grp +voice = rvp111 +misn = DestroyMission, 0, 0.112387 +rumor = base_0_rank, mission_end, 1, 131309 +rumor = base_0_rank, mission_end, 1, 131310 +rumor = base_0_rank, mission_end, 1, 131311 +rumor = base_0_rank, mission_end, 1, 131312 +rumor = base_0_rank, mission_end, 1, 131313 +rumor = base_0_rank, mission_end, 1, 131314 +rumor = base_0_rank, mission_end, 1, 131315 +rumor = base_0_rank, mission_end, 3, 131316 +rumor = base_0_rank, mission_end, 2, 131317 +rumor = base_0_rank, mission_end, 2, 131318 +rumor = base_0_rank, mission_end, 1, 131319 +rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393442 +rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574 +rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393575 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577 +rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393578 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393581 +rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393583 +rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586 +rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591 +rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605 +rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606 +rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607 +rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393608 +rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648 +rumor_type2 = base_0_rank, mission_04_loaded, 1, 393488 +rumor_type2 = base_0_rank, mission_04_loaded, 1, 393387 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649 +individual_name = 263077 + +[GF_NPC] +nickname = li06_07_base_bar_npc_06 +body = li_female_elite_body +head = ge_female1_head +lefthand = benchmark_female_hand_left +righthand = benchmark_female_hand_right +affiliation = li_n_grp +voice = rvp511 +misn = DestroyMission, 0, 0.112387 +rumor = base_0_rank, mission_end, 1, 131309 +rumor = base_0_rank, mission_end, 1, 131310 +rumor = base_0_rank, mission_end, 1, 131311 +rumor = base_0_rank, mission_end, 1, 131312 +rumor = base_0_rank, mission_end, 1, 131313 +rumor = base_0_rank, mission_end, 1, 131314 +rumor = base_0_rank, mission_end, 3, 131316 +rumor = base_0_rank, mission_end, 2, 131317 +rumor = base_0_rank, mission_end, 2, 131318 +rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393442 +rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574 +rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393575 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577 +rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393578 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393581 +rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393583 +rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586 +rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591 +rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605 +rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606 +rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607 +rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393608 +rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648 +rumor_type2 = base_0_rank, mission_04_loaded, 1, 393489 +rumor_type2 = base_0_rank, mission_04_loaded, 1, 393388 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649 +individual_name = 263076 + +[GF_NPC] +nickname = li06_07_base_bar_npc_07 +body = li_male_elite_body +head = rh_captain_head +lefthand = benchmark_male_hand_left +righthand = benchmark_male_hand_right +affiliation = li_n_grp +voice = rvp101 +misn = DestroyMission, 0, 0.112387 +rumor = base_0_rank, mission_end, 1, 131309 +rumor = base_0_rank, mission_end, 1, 131310 +rumor = base_0_rank, mission_end, 1, 131311 +rumor = base_0_rank, mission_end, 1, 131312 +rumor = base_0_rank, mission_end, 1, 131313 +rumor = base_0_rank, mission_end, 1, 131314 +rumor = base_0_rank, mission_end, 1, 131315 +rumor = base_0_rank, mission_end, 3, 131316 +rumor = base_0_rank, mission_end, 2, 131317 +rumor = base_0_rank, mission_end, 2, 131318 +rumor = base_0_rank, mission_end, 1, 131319 +rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393442 +rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574 +rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393575 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577 +rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393578 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393581 +rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393583 +rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586 +rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591 +rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605 +rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606 +rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607 +rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393608 +rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648 +rumor_type2 = base_0_rank, mission_04_loaded, 1, 393490 +rumor_type2 = base_0_rank, mission_04_loaded, 1, 393390 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649 +individual_name = 263075 + +[GF_NPC] +nickname = li06_07_base_bar_npc_08 +body = li_tilton_body +head = ge_male2_head +lefthand = benchmark_male_hand_left +righthand = benchmark_male_hand_right +affiliation = co_ss_grp +voice = rvp111 +bribe = co_hsp_grp, 10000, 16100 +bribe = co_me_grp, 10000, 16100 +bribe = co_ni_grp, 10000, 16100 +bribe = co_ss_grp, 10000, 16101 +bribe = co_vr_grp, 10000, 16100 +rumor = base_0_rank, mission_end, 1, 131320 +rumor = base_0_rank, mission_end, 2, 131321 +rumor = base_0_rank, mission_end, 1, 131322 +rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441 +rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579 +rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580 +rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584 +rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586 +rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591 +rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594 +rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604 +rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605 +rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606 +rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607 +rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648 +rumor_type2 = base_0_rank, mission_04_loaded, 1, 393491 +rumor_type2 = base_0_rank, mission_04_loaded, 1, 393391 +rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649 +know = 251772, 253648, 1000, 1 +knowdb = li03_01 +know = 251760, 253649, 700, 1 +knowdb = li01_10 +individual_name = 263074 + +[GF_NPC] +nickname = li06_07_base_deck_npc_01 +body = li_male_elite_body +head = rh_hassler_head +lefthand = benchmark_male_hand_left +righthand = benchmark_male_hand_right +affiliation = li_n_grp +voice = rvp111 +individual_name = 263073 + +[GF_NPC] +nickname = li06_07_base_deck_npc_02 +body = li_male_elite_body +head = ge_male3_head +lefthand = benchmark_male_hand_left +righthand = benchmark_male_hand_right +affiliation = li_n_grp +voice = rvp101 +individual_name = 263072 + +[GF_NPC] +nickname = li06_07_base_deck_npc_03 +body = li_male_elite_body +head = li_rockford_head +lefthand = benchmark_male_hand_left +righthand = benchmark_male_hand_right +affiliation = li_n_grp +voice = rvp111 +individual_name = 263071 + +[MRoom] +nickname = Bar +character_density = 7 +fixture = li06_07_base_bar_npc_04, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender + +[MRoom] +nickname = Deck +character_density = 3 +fixture = li06_07_base_deck_npc_01, Zs/NPC/ShipDealer/01/A/Stand, scripts\vendors\li_shipdealer_fidget.thn, ShipDealer +fixture = li06_07_base_deck_npc_02, Zs/NPC/trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader +fixture = li06_07_base_deck_npc_03, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment + +[MRoom] +nickname = Deck2 +character_density = 3 diff --git a/DATA/SOLAR/ASTEROIDS/LI06_asteroid_002.ini b/DATA/SOLAR/ASTEROIDS/LI06_asteroid_002.ini new file mode 100644 index 00000000..0ca10de4 --- /dev/null +++ b/DATA/SOLAR/ASTEROIDS/LI06_asteroid_002.ini @@ -0,0 +1,65 @@ +[TexturePanels] +file = solar\asteroids\rock_shapes.ini + +[Field] +cube_size = 400 +fill_dist = 3300 +tint_field = 255, 255, 255 +empty_cube_frequency = 0.6 + +[Cube] +asteroid = mineable2_asteroid30, 0.6, 0.2, -0.2, 35, 10, 20 +asteroid = mineable2_asteroid60, 0.4, -0.7, -0.2, 15, 90, 120 +asteroid = mine_spike_mineable, -0.2, -0.1, -0.6, 105, 160, 25, mine +asteroid = mine_spike_mineable, 0.5, -0.2, -0.6, 75, 30, 70, mine +asteroid = mineable2_asteroid60, -0.7, 0.4, -0.4, 75, 30, 70 +asteroid = mine_spike_mineable, -0.9, 0.6, -0.8, 75, 30, 70, mine + +[properties] +flag = rock_objects +flag = Object_density_med +flag = DANGER_DENSITY_MED + +[Exclusion Zones] +exclusion = Zone_LI06_asteroid_002_exclusion_1 + +[Band] +render_parts = 6 +shape = asteroid_belt_04 +height = 3000 +offset_dist = 2000 +fade = 1, 1.35, 15, 17 +texture_aspect = 1 +color_shift = 0.8, 0.8, 0.8 +ambient_intensity = 1 +vert_increase = 2 + +[AsteroidBillboards] +count = 400 +start_dist = 2000 +fade_dist_percent = 0.35 +shape = mine_rock_tri +color_shift = 0.7, 0.7, 0.7 +ambient_intensity = 1 +size = 60, 70 + +[DynamicAsteroids] +asteroid = DAsteroid_gold +count = 10 +placement_radius = 150 +placement_offset = 90 +max_velocity = 15 +max_angular_velocity = 3 +color_shift = 1, 1, 1 + +[LootableZone] +asteroid_loot_container = lootcrate_ast_loot_gold +asteroid_loot_commodity = commodity_gold +dynamic_loot_container = lootcrate_ast_loot_gold +dynamic_loot_commodity = commodity_gold +asteroid_loot_count = 0, 0 +dynamic_loot_count = 1, 1 +asteroid_loot_difficulty = 40 +dynamic_loot_difficulty = 2 + +; Copied by FL Atlas from file: solar\ASTEROIDS\br05_molly_gold_field.ini diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_05_Base.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_05_Base.ini deleted file mode 100644 index 17343775..00000000 --- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_05_Base.ini +++ /dev/null @@ -1,11 +0,0 @@ -[BaseInfo] -nickname = LI06_05_Base -start_room = Deck - -[Room] -nickname = bar -file = Universe\Systems\LI06\Bases\Rooms\LI06_05_bar.ini - -[Room] -nickname = Deck -file = Universe\Systems\LI06\Bases\Rooms\LI06_05_deck.ini diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_07_Base.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_07_Base.ini index 532f01c4..5b8d9fd5 100644 --- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_07_Base.ini +++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_07_Base.ini @@ -1,11 +1,16 @@ [BaseInfo] nickname = LI06_07_Base start_room = Deck +price_variance = 0.15 [Room] -nickname = bar +nickname = Bar file = Universe\Systems\LI06\Bases\Rooms\LI06_07_bar.ini [Room] nickname = Deck file = Universe\Systems\LI06\Bases\Rooms\LI06_07_deck.ini + +[Room] +nickname = Deck2 +file = Universe\Systems\LI06\Bases\ROOMS\li06_07_deck2.ini diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_05_bar.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_05_bar.ini deleted file mode 100644 index 6f3bd05b..00000000 --- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_05_bar.ini +++ /dev/null @@ -1,27 +0,0 @@ -[Room_Info] -set_script = Scripts\Bases\Li_09_bar_hardpoint_s020x.thn -scene = all, ambient, Scripts\Bases\Li_09_bar_ambi_int_s020x.thn - -[Room_Sound] -ambient = ambience_deck_space_smaller - -[CharacterPlacement] -name = Zg/PC/Player/01/A/Stand -start_script = Scripts\Bases\li_09_bar_enter_01.thn - -[Camera] -name = Camera_0 - -[Hotspot] -name = IDS_HOTSPOT_DECK -behavior = ExitDoor -room_switch = Deck - -[Hotspot] -name = IDS_HOTSPOT_BAR -behavior = ExitDoor -room_switch = Bar - -[Hotspot] -name = IDS_HOTSPOT_NEWSVENDOR -behavior = NewsVendor diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_05_deck.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_05_deck.ini deleted file mode 100644 index 7fb63506..00000000 --- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_05_deck.ini +++ /dev/null @@ -1,23 +0,0 @@ -[Room_Info] -set_script = Scripts\Bases\Li_08_Deck_hardpoint_01.thn -scene = all, ambient, Scripts\Bases\Li_08_Deck_ambi_int_01.thn -animation = Sc_loop - -[Room_Sound] -ambient = ambience_deck_space_smaller - -[PlayerShipPlacement] -name = X/Shipcentre/01 - -[Camera] -name = Camera_0 - -[Hotspot] -name = IDS_HOTSPOT_DECK -behavior = ExitDoor -room_switch = Deck - -[Hotspot] -name = IDS_HOTSPOT_BAR -behavior = ExitDoor -room_switch = Bar diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_07_bar.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_07_bar.ini index 6f3bd05b..f3956259 100644 --- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_07_bar.ini +++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_07_bar.ini @@ -1,17 +1,18 @@ [Room_Info] -set_script = Scripts\Bases\Li_09_bar_hardpoint_s020x.thn -scene = all, ambient, Scripts\Bases\Li_09_bar_ambi_int_s020x.thn +set_script = Scripts\Bases\li_05_bar_hardpoint_01.thn +scene = all, ambient, Scripts\Bases\Li_05_Bar_ambi_int_01.thn [Room_Sound] -ambient = ambience_deck_space_smaller - -[CharacterPlacement] -name = Zg/PC/Player/01/A/Stand -start_script = Scripts\Bases\li_09_bar_enter_01.thn +ambient = ambience_bar_ground_smaller +music = music_bar_generic09 [Camera] name = Camera_0 +[CharacterPlacement] +name = Zg/PC/Player/01/A/Stand +start_script = scripts\bases\li_05_bar_enter_01.thn + [Hotspot] name = IDS_HOTSPOT_DECK behavior = ExitDoor @@ -22,6 +23,28 @@ name = IDS_HOTSPOT_BAR behavior = ExitDoor room_switch = Bar +[Hotspot] +name = IDS_HOTSPOT_COMMODITYTRADER_ROOM +behavior = ExitDoor +room_switch = Deck +set_virtual_room = Trader + +[Hotspot] +name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM +behavior = ExitDoor +room_switch = Deck +set_virtual_room = Equipment + +[Hotspot] +name = IDS_HOTSPOT_SHIPDEALER_ROOM +behavior = ExitDoor +room_switch = Deck +set_virtual_room = ShipDealer + [Hotspot] name = IDS_HOTSPOT_NEWSVENDOR behavior = NewsVendor + +[Hotspot] +name = IDS_HOTSPOT_MISSIONVENDOR +behavior = MissionVendor diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_07_deck.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_07_deck.ini index 7fb63506..76c8af25 100644 --- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_07_deck.ini +++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_07_deck.ini @@ -1,14 +1,23 @@ [Room_Info] -set_script = Scripts\Bases\Li_08_Deck_hardpoint_01.thn -scene = all, ambient, Scripts\Bases\Li_08_Deck_ambi_int_01.thn -animation = Sc_loop +set_script = Scripts\Bases\Li_05_Deck_hardpoint_01.thn +scene = all, ambient, Scripts\Bases\Li_05_Deck_ambi_int_01.thn + +[Spiels] +CommodityDealer = manhattan_commodity_spiel +EquipmentDealer = manhattan_equipment_spiel [Room_Sound] ambient = ambience_deck_space_smaller +[CharacterPlacement] +name = Zg/PC/Player/01/A/Stand + [PlayerShipPlacement] name = X/Shipcentre/01 +[ForSaleShipPlacement] +name = X/Shipcentre/02 + [Camera] name = Camera_0 @@ -21,3 +30,82 @@ room_switch = Deck name = IDS_HOTSPOT_BAR behavior = ExitDoor room_switch = Bar + +[Hotspot] +name = IDS_HOTSPOT_COMMODITYTRADER_ROOM +behavior = VirtualRoom +room_switch = Trader + +[Hotspot] +name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM +behavior = VirtualRoom +room_switch = Equipment + +[Hotspot] +name = IDS_HOTSPOT_SHIPDEALER_ROOM +behavior = VirtualRoom +room_switch = ShipDealer + +[Hotspot] +name = IDS_NN_REPAIR_YOUR_SHIP +behavior = Repair +virtual_room = Deck + +[Hotspot] +name = IDS_DEALER_FRONT_DESK +behavior = FrontDesk +state_read = 1 +state_send = 2 +virtual_room = Trader + +[Hotspot] +name = IDS_HOTSPOT_COMMODITYTRADER +behavior = StartDealer +state_read = 2 +state_send = 1 +virtual_room = Trader + +[Hotspot] +name = IDS_DEALER_FRONT_DESK +behavior = FrontDesk +state_read = 1 +state_send = 2 +virtual_room = Equipment + +[Hotspot] +name = IDS_HOTSPOT_EQUIPMENTDEALER +behavior = StartEquipDealer +state_read = 2 +state_send = 1 +virtual_room = Equipment + +[Hotspot] +name = IDS_EQUIPMENT_ROOM_RIGHT +behavior = MoveRight +state_read = 2 +state_send = 1 +virtual_room = Equipment + +[Hotspot] +name = IDS_NN_REPAIR_YOUR_SHIP +behavior = Repair +virtual_room = Equipment + +[Hotspot] +name = IDS_DEALER_FRONT_DESK +behavior = FrontDesk +state_read = 1 +state_send = 2 +virtual_room = ShipDealer + +[Hotspot] +name = IDS_HOTSPOT_SHIPDEALER +behavior = StartShipDealer +state_read = 2 +state_send = 1 +virtual_room = ShipDealer + +[Hotspot] +name = IDS_NN_REPAIR_YOUR_SHIP +behavior = Repair +virtual_room = ShipDealer diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/li06_07_deck2.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/li06_07_deck2.ini new file mode 100644 index 00000000..7e741a6d --- /dev/null +++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/li06_07_deck2.ini @@ -0,0 +1,37 @@ +[Room_Info] +set_script = Scripts\Bases\Li_05_Deck_HardPoint_01.thn +scene = all, ambient, Scripts\Bases\Li_05_Deck_ambi_int_01.thn + +[Room_Sound] +ambient = ambience_deck_space_smaller + +[PlayerShipPlacement] +name = X/Shipcentre/01 + +[Camera] +name = Camera_0 + +[Hotspot] +name = IDS_HOTSPOT_DECK +behavior = ExitDoor +room_switch = Deck + +[Hotspot] +name = IDS_HOTSPOT_BAR +behavior = ExitDoor +room_switch = Bar + +[Hotspot] +name = IDS_HOTSPOT_COMMODITYTRADER_ROOM +behavior = VirtualRoom +room_switch = Trader + +[Hotspot] +name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM +behavior = VirtualRoom +room_switch = Equipment + +[Hotspot] +name = IDS_HOTSPOT_SHIPDEALER_ROOM +behavior = VirtualRoom +room_switch = ShipDealer diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini b/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini index 94f7d2e6..3821033e 100644 --- a/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini +++ b/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini @@ -188,6 +188,10 @@ zone = Zone_LI06_asteroid_001 [Asteroids] file = solar\ASTEROIDS\LI06_debris_001.ini zone = Zone_LI06_debris_001 + +[Asteroids] +file = solar\ASTEROIDS\LI06_asteroid_002.ini +zone = Zone_LI06_asteroid_002 [Ambient] color = 50, 50, 50 @@ -330,26 +334,6 @@ voice = atc_leg_f01a ;endregion ;region - Paradise Valley Station -[Object] -nickname = LI06_05 -pos = -3065.34, 0, -26190.48 -ids_info = 65713 -behavior = NOTHING -pilot = pilot_solar_easy -dock_with = LI06_05_Base -base = LI06_05_Base -reputation = li_lsf_grp -rotate = 0, 69.62, 0 -archetype = space_police01 -ids_name = 450055 -loadout = rm_space_police01_li_02 -difficulty_level = 10 -space_costume = benchmark_male_head, benchmark_male_body -voice = atc_leg_m01 -;endregion - -;region - Carson station - [Object] nickname = LI06_06 pos = -45484.648438, 70.279999, -43852.656250 @@ -358,7 +342,7 @@ pilot = pilot_solar_easy dock_with = LI06_06_Base base = LI06_06_Base reputation = gd_bh_grp -rotate = 180.000000, 42.150002, 180.000000 +rotate = 0.000000, -137.850006, 0.000000 archetype = smallstation1 ids_name = 450030 loadout = smallstation_li_01 @@ -372,20 +356,20 @@ ids_info = 263068 ;region - Battleship Henderson [Object] nickname = LI06_07 -pos = -2438.01, -2.39, -27709.217 -ids_info = 65713 +pos = -2211.191650, 0.000000, -27512.640625 behavior = NOTHING pilot = pilot_solar_easy dock_with = LI06_07_Base base = LI06_07_Base reputation = li_n_grp -rotate = 169.160, -66.212, -168.503 +rotate = 169, -110, -169 archetype = l_dreadnought ids_name = 450060 loadout = li_dreadnought_li_01 difficulty_level = 1 -space_costume = benchmark_male_head, benchmark_male_body +space_costume = li_captain_head, li_male_guard_body voice = pilot_c_ill_m01 +ids_info = 263082 ;endregion ;region - Asteroid Field @@ -1206,7 +1190,7 @@ visit = 128 [Object] nickname = LI06_to_LI07_hole ids_name = 450072 -pos = -2656, 0, -27093 +pos = 2844.937500, 0.000000, -44209.792969 rotate = 0, 140, 0 archetype = jumphole_green msg_id_prefix = gcs_refer_system_LI07 @@ -2974,3 +2958,28 @@ loadout = SECRET_lr_pi_fighter_li04 visit = 0 ids_name = 320020 ids_info = 320021 + +[Zone] +nickname = Zone_LI06_asteroid_002 +ids_name = 263069 +pos = 22.997501, 0.000000, -40727.031250 +rotate = 0, 0, 0 +shape = ELLIPSOID +size = 17595, 8613, 8613 +property_flags = 66 +ids_info = 0 +visit = 32 +damage = 0 +comment = Northgrave Field +spacedust = golddust +spacedust_maxparticles = 50 +sort = 99 + +[Zone] +nickname = Zone_LI06_asteroid_002_exclusion_1 +pos = 2782.697754, 0.000000, -44201.199219 +rotate = 0, 0, 0 +shape = SPHERE +size = 896.902588 +property_flags = 131072 +sort = 99 diff --git a/DATA/UNIVERSE/universe.ini b/DATA/UNIVERSE/universe.ini index 648431fe..2f853e09 100644 --- a/DATA/UNIVERSE/universe.ini +++ b/DATA/UNIVERSE/universe.ini @@ -1759,13 +1759,6 @@ strid_name = 0 file = UNIVERSE\SYSTEMS\LI06\Bases\LI06_04_Base.ini BGCS_base_run_by = W02bF33 -[Base] -nickname = LI06_05_Base -system = LI06 -strid_name = 0 -file = Universe\Systems\LI06\Bases\LI06_05_Base.ini -BGCS_base_run_by = W02bF33 - [Base] nickname = LI06_06_Base system = LI06 @@ -1776,8 +1769,8 @@ BGCS_base_run_by = W02bF33 [Base] nickname = LI06_07_Base system = LI06 -strid_name = 0 -file = Universe\Systems\LI06\Bases\LI06_07_Base.ini +strid_name = 450060 +file = UNIVERSE\SYSTEMS\Li06\Bases\LI06_07_Base.ini BGCS_base_run_by = W02bF33 [system] diff --git a/EXE/REM/Lua/Infocards.lua b/EXE/REM/Lua/Infocards.lua index 52e2d602..59988119 100644 --- a/EXE/REM/Lua/Infocards.lua +++ b/EXE/REM/Lua/Infocards.lua @@ -846,6 +846,20 @@ rem.AddInfoCard(263065, "Bounty Hunters Guild Rafael Archer") rem.AddInfoCard(263066, "Bounty Hunters Guild Samira Schneider") rem.AddInfoCard(263067, "Bounty Hunters Guild Maya Patel") rem.AddInfoCard(263068, [[CLASS: DunkirkCREW: CLASSIFIEDARMAMENT: CLASSIFIEDBuilt to monitor the traffic moving through Nevada's trade lanes, this Bounty Hunter station serves as a forward operating post for trackers, contract brokers, and patrol wings assigned to the Las Vegas sector. Its location allows quick response to pirate activity near the debris fields, where criminals and smugglers often try to vanish into the wreckage.The station is heavily secured and keeps its own records separate from the local authorities. Hunters stationed here are known to favor fast contracts, quiet deals, and aggressive pursuit, making the post one of the most effective choke points in the system. Few fugitives pass through Nevada without hearing of the station first.]]) +rem.AddInfoCard(263069, "Northgrave Field") +rem.AddInfoCard(263070, [[CLASS: Liberty BattleshipCREW: CLASSIFIEDARMAMENT: CLASSIFIEDThis Liberty Navy battleship serves as the sole military outpost in Nevada, maintaining order across the system and watching for signs of criminal activity. Its presence is meant to discourage smugglers, pirates, and other fugitives who might otherwise treat Las Vegas and the surrounding lanes as safe ground.The ship acts as both a patrol anchor and a command post, keeping a close eye on traffic moving through the system. While the Zoners handle civilian administration, the Navy vessel remains ready to respond if the local balance shifts too far toward lawlessness. Few ships entering Nevada fail to notice it, and fewer still mistake its silence for weakness.]]) +rem.AddInfoCard(263071, "Battleship Henderson Equipment Dealer Samira Zhao") +rem.AddInfoCard(263072, "Battleship Henderson Trade Dealer Rafael Novak") +rem.AddInfoCard(263073, "Battleship Henderson Ship Dealer Sofia Vargas") +rem.AddInfoCard(263074, "Universal Shipping Alex Archer") +rem.AddInfoCard(263075, "Liberty Navy Hanna Patel") +rem.AddInfoCard(263076, "Liberty Navy Amelia Mercer") +rem.AddInfoCard(263077, "Liberty Navy Samira Wolfe") +rem.AddInfoCard(263078, "Battleship Henderson Bartender Sofia Mercer") +rem.AddInfoCard(263079, "Bounty Hunters Guild Caleb Wolfe") +rem.AddInfoCard(263080, "Bounty Hunters Guild Sofia Wolfe") +rem.AddInfoCard(263081, "ALG Waste Disposal Elena Patel") +rem.AddInfoCard(263082, [[CLASS: DunkirkCREW: CLASSIFIEDARMAMENT: CLASSIFIED]]) -- Thrust Velocity Extensions Equipment