From cc46b2f8d8f7bfdbb61d45facd493532f80501c6 Mon Sep 17 00:00:00 2001 From: Nekura Date: Tue, 12 May 2026 17:22:23 +0200 Subject: [PATCH] Cleanup Inis :D --- DATA/EQUIPMENT/market_commodities.ini | 2 +- DATA/EQUIPMENT/market_misc.ini | 2 +- DATA/EQUIPMENT/market_ships.ini | 2 +- DATA/MISSIONS/mbases.ini | 119 +++++++++--------- .../SYSTEMS/Ku08/BASES/KU08_04_Base.ini | 24 ---- .../SYSTEMS/Ku08/BASES/KU08_06_Base.ini | 12 -- .../Ku08/BASES/KU08_planet_001_Base.ini | 24 ++++ .../Ku08/BASES/KU08_planet_002_Base.ini | 12 ++ .../Ku08/BASES/ROOMS/KU08_01_Base_bar.ini | 26 ---- .../Ku08/BASES/ROOMS/KU08_01_Base_deck.ini | 89 ------------- .../Ku08/BASES/ROOMS/KU08_02_Base_bar.ini | 5 - .../Ku08/BASES/ROOMS/KU08_02_Base_deck.ini | 39 +----- .../Ku08/BASES/ROOMS/KU08_03_Base_bar.ini | 8 -- .../Ku08/BASES/ROOMS/KU08_03_Base_deck.ini | 65 ---------- .../Ku08/BASES/ROOMS/KU08_05_Base_bar.ini | 8 -- ...e_bar.ini => KU08_planet_001_Base_bar.ini} | 0 ...ini => KU08_planet_001_Base_cityscape.ini} | 0 ...ini => KU08_planet_001_Base_equipment.ini} | 0 ...ni => KU08_planet_001_Base_shipdealer.ini} | 0 ...er.ini => KU08_planet_001_Base_trader.ini} | 0 ...e_bar.ini => KU08_planet_002_Base_bar.ini} | 4 - ...i => KU08_planet_002_Base_planetscape.ini} | 0 DATA/UNIVERSE/SYSTEMS/Ku08/KU08.ini | 12 +- DATA/UNIVERSE/universe.ini | 8 +- DATA/initialworld.ini | 8 +- 25 files changed, 123 insertions(+), 346 deletions(-) delete mode 100644 DATA/UNIVERSE/SYSTEMS/Ku08/BASES/KU08_04_Base.ini delete mode 100644 DATA/UNIVERSE/SYSTEMS/Ku08/BASES/KU08_06_Base.ini create mode 100644 DATA/UNIVERSE/SYSTEMS/Ku08/BASES/KU08_planet_001_Base.ini create mode 100644 DATA/UNIVERSE/SYSTEMS/Ku08/BASES/KU08_planet_002_Base.ini rename DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/{KU08_04_Base_bar.ini => KU08_planet_001_Base_bar.ini} (100%) rename DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/{KU08_04_Base_cityscape.ini => KU08_planet_001_Base_cityscape.ini} (100%) rename DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/{KU08_04_Base_equipment.ini => KU08_planet_001_Base_equipment.ini} (100%) rename DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/{KU08_04_Base_shipdealer.ini => KU08_planet_001_Base_shipdealer.ini} (100%) rename DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/{KU08_04_Base_trader.ini => KU08_planet_001_Base_trader.ini} (100%) rename DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/{KU08_06_Base_bar.ini => KU08_planet_002_Base_bar.ini} (87%) rename DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/{KU08_06_Base_planetscape.ini => KU08_planet_002_Base_planetscape.ini} (100%) diff --git a/DATA/EQUIPMENT/market_commodities.ini b/DATA/EQUIPMENT/market_commodities.ini index f64e7300..01ec37f2 100644 --- a/DATA/EQUIPMENT/market_commodities.ini +++ b/DATA/EQUIPMENT/market_commodities.ini @@ -2612,7 +2612,7 @@ base = KU08_03_Base base = KU08_02_Base [BaseGood] -base = KU08_04_Base +base = KU08_planet_001_Base [BaseGood] base = KU08_01_Base diff --git a/DATA/EQUIPMENT/market_misc.ini b/DATA/EQUIPMENT/market_misc.ini index b684368c..bb1a4979 100644 --- a/DATA/EQUIPMENT/market_misc.ini +++ b/DATA/EQUIPMENT/market_misc.ini @@ -16492,7 +16492,7 @@ base = KU08_03_Base base = KU08_02_Base [BaseGood] -base = KU08_04_Base +base = KU08_planet_001_Base [BaseGood] base = KU08_01_Base diff --git a/DATA/EQUIPMENT/market_ships.ini b/DATA/EQUIPMENT/market_ships.ini index e47dc19b..f7378729 100644 --- a/DATA/EQUIPMENT/market_ships.ini +++ b/DATA/EQUIPMENT/market_ships.ini @@ -378,7 +378,7 @@ base = KU08_03_Base base = KU08_02_Base [BaseGood] -base = KU08_04_Base +base = KU08_planet_001_Base [BaseGood] base = KU08_01_Base diff --git a/DATA/MISSIONS/mbases.ini b/DATA/MISSIONS/mbases.ini index 9894dd44..628fa0b7 100644 --- a/DATA/MISSIONS/mbases.ini +++ b/DATA/MISSIONS/mbases.ini @@ -46604,6 +46604,10 @@ nickname = bar character_density = 7 fixture = ku0801_fix_bartender, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender +[MRoom] +nickname = Deck +character_density = 3 + [MBase] nickname = KU08_02_Base local_faction = sh_n_grp @@ -46628,7 +46632,15 @@ individual_name = 500021 affiliation = sh_corp_grp voice = atc_leg_m01 -room = Deck +[MRoom] +nickname = Deck +character_density = 3 +fixture = ku08_02_base_npc_001, Zs/NPC/trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader + +[MRoom] +nickname = bar +character_density = 3 + [MBase] nickname = KU08_03_Base local_faction = sh_n_grp @@ -46653,15 +46665,24 @@ individual_name = 500022 affiliation = sh_corp_grp voice = atc_leg_m01 -room = Bar -misn = DestroyMission, 28.4782, 53.365 -misn = DestroyMission, 28.4782, 53.365 -misn = DestroyMission, 28.4782, 53.365 +[MRoom] +nickname = Deck +character_density = 3 +fixture = ku08_03_base_npc_001, Zs/NPC/trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader + +[MRoom] +nickname = bar +character_density = 3 + +[MRoom] +nickname = trader +character_density = 3 + [MBase] -nickname = KU08_04_Base +nickname = KU08_planet_001_Base local_faction = sh_corp_grp diff = 1 -msg_id_prefix = gcs_refer_base_KU08_04_Base +msg_id_prefix = gcs_refer_base_KU08_planet_001_Base [MVendor] num_offers = 0, 0 @@ -46669,9 +46690,10 @@ num_offers = 0, 0 [BaseFaction] faction = sh_corp_grp weight = 10 -npc = ku08_04_base_bar_npc_01 +npc = ku08_planet_001_base_bar_npc_01 + [GF_NPC] -nickname = ku08_04_base_equipment_npc_01 +nickname = ku08_planet_001_base_equipment_npc_01 body = ku_commtrader_body head = pl_male5_head lefthand = benchmark_male_hand_left @@ -46681,7 +46703,7 @@ affiliation = sh_corp_grp voice = mc_leg_m01 [GF_NPC] -nickname = ku08_04_base_shipdealer_npc_01 +nickname = ku08_planet_001_base_shipdealer_npc_01 body = ku_commtrader_body head = ku_bartender_head lefthand = benchmark_male_hand_left @@ -46691,7 +46713,7 @@ affiliation = sh_corp_grp voice = mc_leg_m01 [GF_NPC] -nickname = ku08_04_base_trader_npc_01 +nickname = ku08_planet_001_base_trader_npc_01 body = ku_commtrader_body head = ku_captain_head lefthand = benchmark_male_hand_left @@ -46701,7 +46723,7 @@ affiliation = sh_corp_grp voice = mc_leg_m01 [GF_NPC] -nickname = ku08_04_base_bar_npc_01 +nickname = ku08_planet_001_base_bar_npc_01 body = ku_bartender_body head = ge_male2_head lefthand = benchmark_male_hand_left @@ -46710,30 +46732,25 @@ individual_name = 500026 affiliation = sh_corp_grp voice = mc_leg_m01 -room = bar -misn = DestroyMission, 28.4782, 53.365 -misn = DestroyMission, 28.4782, 53.365 -misn = DestroyMission, 28.4782, 53.365 -misn = DestroyMission, 28.4782, 53.365 [MRoom] nickname = bar character_density = 7 -fixture = ku08_04_base_bar_npc_01, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender +fixture = ku08_planet_001_base_bar_npc_01, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender [MRoom] nickname = trader character_density = 3 -fixture = ku08_04_base_trader_npc_01, Zs/NPC/trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader +fixture = ku08_planet_001_base_trader_npc_01, Zs/NPC/trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader [MRoom] nickname = Equipment character_density = 2 -fixture = ku08_04_base_equipment_npc_01, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment +fixture = ku08_planet_001_base_equipment_npc_01, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment [MRoom] nickname = ShipDealer character_density = 2 -fixture = ku08_04_base_shipdealer_npc_01, Zs/NPC/ShipDealer/01/A/Stand, scripts\vendors\li_shipdealer_fidget.thn, ShipDealer +fixture = ku08_planet_001_base_shipdealer_npc_01, Zs/NPC/ShipDealer/01/A/Stand, scripts\vendors\li_shipdealer_fidget.thn, ShipDealer [MBase] nickname = KU08_05_Base @@ -46749,12 +46766,14 @@ faction = fc_bd_grp weight = 10 npc = ku08_05_base_bar_npc_01 npc = ku08_05_base_bar_npc_02 + [BaseFaction] faction = sh_n_grp weight = 10 npc = ku08_05_base_bar_npc_03 npc = ku08_05_base_deck_npc_01 npc = ku08_05_base_deck_npc_02 + [GF_NPC] nickname = ku08_05_base_bar_npc_01 body = br_male_elite_body @@ -46765,7 +46784,6 @@ individual_name = 500027 affiliation = fc_bd_grp voice = mc_leg_m01 -room = deck [GF_NPC] nickname = ku08_05_base_bar_npc_02 body = rh_shipdealer_body @@ -46776,7 +46794,6 @@ individual_name = 500028 affiliation = fc_bd_grp voice = mc_leg_m01 -room = deck [GF_NPC] nickname = ku08_05_base_bar_npc_03 body = rh_sales_head @@ -46787,7 +46804,6 @@ individual_name = 500038 affiliation = sh_n_grp voice = mc_leg_m01 -room = Deck [GF_NPC] nickname = ku08_05_base_deck_npc_01 body = pi_pirate1_head @@ -46798,7 +46814,6 @@ individual_name = 500039 affiliation = sh_n_grp voice = mc_leg_m01 -room = Deck [GF_NPC] nickname = ku08_05_base_deck_npc_02 body = li_bartender_body @@ -46809,23 +46824,22 @@ individual_name = 500040 affiliation = sh_n_grp voice = mc_leg_m01 -room = Deck [MRoom] nickname = Deck character_density = 3 fixture = ku08_05_base_deck_npc_01, Zs/NPC/trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader - fixture = ku08_05_base_deck_npc_02, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment + [MRoom] nickname = bar character_density = 7 fixture = ku08_05_base_bar_npc_03, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender [MBase] -nickname = KU08_06_Base +nickname = KU08_planet_002_Base local_faction = sh_n_grp diff = 1 -msg_id_prefix = gcs_refer_base_KU08_06_Base +msg_id_prefix = gcs_refer_base_KU08_planet_002_Base [MVendor] num_offers = 0, 0 @@ -46833,15 +46847,16 @@ num_offers = 0, 0 [BaseFaction] faction = fc_or_grp weight = 10 -npc = ku08_06_base_bar_npc_02 -npc = ku08_06_base_bar_npc_03 -npc = ku08_06_base_bar_npc_04 -npc = ku08_06_base_bar_npc_05 -npc = ku08_06_base_bar_npc_06 -npc = ku08_06_base_bar_npc_07 -npc = ku08_06_base_bar_npc_08 +npc = ku08_planet_002_base_bar_npc_02 +npc = ku08_planet_002_base_bar_npc_03 +npc = ku08_planet_002_base_bar_npc_04 +npc = ku08_planet_002_base_bar_npc_05 +npc = ku08_planet_002_base_bar_npc_06 +npc = ku08_planet_002_base_bar_npc_07 +npc = ku08_planet_002_base_bar_npc_08 + [GF_NPC] -nickname = ku08_06_base_bar_npc_01 +nickname = ku08_planet_002_base_bar_npc_01 body = benchmark_male_body head = benchmark_male_head lefthand = benchmark_male_hand_left @@ -46851,62 +46866,57 @@ affiliation = fc_or_grp voice = mc_leg_m01 [GF_NPC] -nickname = ku08_06_base_bar_npc_02 +nickname = ku08_planet_002_base_bar_npc_02 body = benchmark_male_body head = benchmark_male_head lefthand = benchmark_male_hand_left righthand = benchmark_male_hand_right -room = bar individual_name = 500042 affiliation = fc_or_grp voice = mc_leg_m01 [GF_NPC] -nickname = ku08_06_base_bar_npc_03 +nickname = ku08_planet_002_base_bar_npc_03 body = benchmark_male_body head = benchmark_male_head lefthand = benchmark_male_hand_left righthand = benchmark_male_hand_right -room = bar individual_name = 500043 affiliation = fc_or_grp voice = mc_leg_m01 [GF_NPC] -nickname = ku08_06_base_bar_npc_04 +nickname = ku08_planet_002_base_bar_npc_04 body = benchmark_male_body head = benchmark_male_head lefthand = benchmark_male_hand_left righthand = benchmark_male_hand_right -room = bar individual_name = 500044 affiliation = fc_or_grp voice = mc_leg_m01 [GF_NPC] -nickname = ku08_06_base_bar_npc_05 +nickname = ku08_planet_002_base_bar_npc_05 body = benchmark_male_body head = benchmark_male_head lefthand = benchmark_male_hand_left righthand = benchmark_male_hand_right -room = bar individual_name = 500045 affiliation = fc_or_grp voice = mc_leg_m01 [GF_NPC] -nickname = ku08_06_base_bar_npc_06 +nickname = ku08_planet_002_base_bar_npc_06 body = benchmark_male_body head = benchmark_male_head lefthand = benchmark_male_hand_left righthand = benchmark_male_hand_right -room = bar individual_name = 500046 affiliation = fc_or_grp voice = mc_leg_m01 [GF_NPC] -nickname = ku08_06_base_bar_npc_07 +nickname = ku08_planet_002_base_bar_npc_07 body = benchmark_male_body head = benchmark_male_head lefthand = benchmark_male_hand_left @@ -46915,10 +46925,8 @@ individual_name = 500047 affiliation = fc_or_grp voice = mc_leg_m01 -room = bar - [GF_NPC] -nickname = ku08_06_base_bar_npc_08 +nickname = ku08_planet_002_base_bar_npc_08 body = benchmark_male_body head = benchmark_male_head lefthand = benchmark_male_hand_left @@ -46927,10 +46935,8 @@ individual_name = 500048 affiliation = fc_or_grp voice = mc_leg_m01 -room = bar - [GF_NPC] -nickname = ku08_06_base_equipment_npc_01 +nickname = ku08_planet_002_base_equipment_npc_01 body = benchmark_male_body head = benchmark_male_head lefthand = benchmark_male_hand_left @@ -46938,12 +46944,13 @@ righthand = benchmark_male_hand_right individual_name = 500049 affiliation = fc_or_grp voice = mc_leg_m01 + [MRoom] nickname = bar character_density = 7 -fixture = ku08_06_base_bar_npc_01, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender +fixture = ku08_planet_002_base_bar_npc_01, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender [MRoom] nickname = Equipment character_density = 2 -fixture = ku08_06_base_equipment_npc_01, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment +fixture = ku08_planet_002_base_equipment_npc_01, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment \ No newline at end of file diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/KU08_04_Base.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/KU08_04_Base.ini deleted file mode 100644 index aba6016f..00000000 --- a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/KU08_04_Base.ini +++ /dev/null @@ -1,24 +0,0 @@ -[BaseInfo] -nickname = KU08_04_Base -start_room = Cityscape -price_variance = 0.00 - -[Room] -nickname = bar -file = Universe\Systems\KU08\Bases\Rooms\KU08_04_Base_bar.ini - -[Room] -nickname = Trader -file = Universe\Systems\KU08\Bases\Rooms\KU08_04_Base_trader.ini - -[Room] -nickname = Equipment -file = Universe\Systems\KU08\Bases\Rooms\KU08_04_Base_equipment.ini - -[Room] -nickname = ShipDealer -file = Universe\Systems\KU08\Bases\Rooms\KU08_04_Base_shipdealer.ini - -[Room] -nickname = Cityscape -file = Universe\Systems\KU08\Bases\Rooms\KU08_04_Base_cityscape.ini diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/KU08_06_Base.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/KU08_06_Base.ini deleted file mode 100644 index 0f8793c2..00000000 --- a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/KU08_06_Base.ini +++ /dev/null @@ -1,12 +0,0 @@ -[BaseInfo] -nickname = KU08_06_Base -start_room = Planetscape -price_variance = 0.15 - -[Room] -nickname = Bar -file = Universe\Systems\KU08\Bases\Rooms\KU08_06_Base_bar.ini - -[Room] -nickname = Planetscape -file = Universe\Systems\KU08\Bases\Rooms\KU08_06_Base_planetscape.ini diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/KU08_planet_001_Base.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/KU08_planet_001_Base.ini new file mode 100644 index 00000000..eb8a5a07 --- /dev/null +++ b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/KU08_planet_001_Base.ini @@ -0,0 +1,24 @@ +[BaseInfo] +nickname = KU08_planet_001_Base +start_room = Cityscape +price_variance = 0.00 + +[Room] +nickname = bar +file = Universe\Systems\KU08\Bases\Rooms\KU08_planet_001_Base_bar.ini + +[Room] +nickname = Trader +file = Universe\Systems\KU08\Bases\Rooms\KU08_planet_001_Base_trader.ini + +[Room] +nickname = Equipment +file = Universe\Systems\KU08\Bases\Rooms\KU08_planet_001_Base_equipment.ini + +[Room] +nickname = ShipDealer +file = Universe\Systems\KU08\Bases\Rooms\KU08_planet_001_Base_shipdealer.ini + +[Room] +nickname = Cityscape +file = Universe\Systems\KU08\Bases\Rooms\KU08_planet_001_Base_cityscape.ini diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/KU08_planet_002_Base.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/KU08_planet_002_Base.ini new file mode 100644 index 00000000..45e26d0b --- /dev/null +++ b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/KU08_planet_002_Base.ini @@ -0,0 +1,12 @@ +[BaseInfo] +nickname = KU08_planet_002_Base +start_room = Planetscape +price_variance = 0.15 + +[Room] +nickname = Bar +file = Universe\Systems\KU08\Bases\Rooms\KU08_planet_002_Base_bar.ini + +[Room] +nickname = Planetscape +file = Universe\Systems\KU08\Bases\Rooms\KU08_planet_002_Base_planetscape.ini diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_01_Base_bar.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_01_Base_bar.ini index 0e572246..c957d19b 100644 --- a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_01_Base_bar.ini +++ b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_01_Base_bar.ini @@ -22,29 +22,3 @@ room_switch = Deck 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/Ku08/BASES/ROOMS/KU08_01_Base_deck.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_01_Base_deck.ini index 1b9d066a..582e0adf 100644 --- a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_01_Base_deck.ini +++ b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_01_Base_deck.ini @@ -13,92 +13,3 @@ name = X/Shipcentre/02 [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 - -[Hotspot] -name = IDS_NN_REPAIR_YOUR_SHIP -behavior = ExitDoor -room_switch = 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/Ku08/BASES/ROOMS/KU08_02_Base_bar.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_02_Base_bar.ini index 655626ba..4a4a981e 100644 --- a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_02_Base_bar.ini +++ b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_02_Base_bar.ini @@ -22,8 +22,3 @@ 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 diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_02_Base_deck.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_02_Base_deck.ini index fea1b690..e93dd07c 100644 --- a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_02_Base_deck.ini +++ b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_02_Base_deck.ini @@ -17,47 +17,20 @@ name = X/Shipcentre/01 name = Camera_0 [Hotspot] -name = IDS_HOTSPOT_DECK -behavior = ExitDoor -room_switch = Deck - -[Hotspot] -name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM +name = IDS_HOTSPOT_COMMODITYTRADER_ROOM behavior = VirtualRoom -room_switch = Equipment - -[Hotspot] -name = IDS_NN_REPAIR_YOUR_SHIP -behavior = ExitDoor -room_switch = Deck - -[Hotspot] -name = IDS_HOTSPOT_BAR -behavior = ExitDoor -room_switch = Bar +room_switch = Trader [Hotspot] name = IDS_DEALER_FRONT_DESK behavior = FrontDesk state_read = 1 state_send = 2 -virtual_room = Equipment +virtual_room = Trader [Hotspot] -name = IDS_HOTSPOT_EQUIPMENTDEALER -behavior = StartEquipDealer +name = IDS_HOTSPOT_COMMODITYTRADER +behavior = StartDealer 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 +virtual_room = Trader diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_03_Base_bar.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_03_Base_bar.ini index 2d4c6aba..022f8ad1 100644 --- a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_03_Base_bar.ini +++ b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_03_Base_bar.ini @@ -25,11 +25,3 @@ room_switch = Bar name = IDS_HOTSPOT_COMMODITYTRADER_ROOM behavior = ExitDoor room_switch = Trader - -[Hotspot] -name = IDS_HOTSPOT_NEWSVENDOR -behavior = NewsVendor - -[Hotspot] -name = IDS_HOTSPOT_MISSIONVENDOR -behavior = MissionVendor diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_03_Base_deck.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_03_Base_deck.ini index 960c9e16..2dcc34e0 100644 --- a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_03_Base_deck.ini +++ b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_03_Base_deck.ini @@ -11,68 +11,3 @@ 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_NN_REPAIR_YOUR_SHIP -behavior = ExitDoor -room_switch = Deck - -[Hotspot] -name = IDS_DEALER_FRONT_DESK -behavior = ExitDoor -room_switch = Trader -state_read = 1 -state_send = 2 - -[Hotspot] -name = IDS_HOTSPOT_COMMODITYTRADER -behavior = ExitDoor -room_switch = Trader -state_read = 2 -state_send = 1 - -[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 diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_05_Base_bar.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_05_Base_bar.ini index be44abb9..e3d48cb4 100644 --- a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_05_Base_bar.ini +++ b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_05_Base_bar.ini @@ -36,11 +36,3 @@ name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM behavior = ExitDoor room_switch = Deck set_virtual_room = Equipment - -[Hotspot] -name = IDS_HOTSPOT_NEWSVENDOR -behavior = NewsVendor - -[Hotspot] -name = IDS_HOTSPOT_MISSIONVENDOR -behavior = MissionVendor diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_04_Base_bar.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_planet_001_Base_bar.ini similarity index 100% rename from DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_04_Base_bar.ini rename to DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_planet_001_Base_bar.ini diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_04_Base_cityscape.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_planet_001_Base_cityscape.ini similarity index 100% rename from DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_04_Base_cityscape.ini rename to DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_planet_001_Base_cityscape.ini diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_04_Base_equipment.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_planet_001_Base_equipment.ini similarity index 100% rename from DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_04_Base_equipment.ini rename to DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_planet_001_Base_equipment.ini diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_04_Base_shipdealer.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_planet_001_Base_shipdealer.ini similarity index 100% rename from DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_04_Base_shipdealer.ini rename to DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_planet_001_Base_shipdealer.ini diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_04_Base_trader.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_planet_001_Base_trader.ini similarity index 100% rename from DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_04_Base_trader.ini rename to DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_planet_001_Base_trader.ini diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_06_Base_bar.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_planet_002_Base_bar.ini similarity index 87% rename from DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_06_Base_bar.ini rename to DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_planet_002_Base_bar.ini index 5fc42dee..8482f020 100644 --- a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_06_Base_bar.ini +++ b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_planet_002_Base_bar.ini @@ -22,7 +22,3 @@ room_switch = Planetscape name = IDS_HOTSPOT_BAR behavior = ExitDoor room_switch = Bar - -[Hotspot] -name = IDS_HOTSPOT_MISSIONVENDOR -behavior = MissionVendor diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_06_Base_planetscape.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_planet_002_Base_planetscape.ini similarity index 100% rename from DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_06_Base_planetscape.ini rename to DATA/UNIVERSE/SYSTEMS/Ku08/BASES/ROOMS/KU08_planet_002_Base_planetscape.ini diff --git a/DATA/UNIVERSE/SYSTEMS/Ku08/KU08.ini b/DATA/UNIVERSE/SYSTEMS/Ku08/KU08.ini index e28b1a7c..12aa48fa 100644 --- a/DATA/UNIVERSE/SYSTEMS/Ku08/KU08.ini +++ b/DATA/UNIVERSE/SYSTEMS/Ku08/KU08.ini @@ -122,7 +122,7 @@ rotate = 0,0,0 archetype = planet_earthcity_3000 spin = 0,0,0 atmosphere_range = 3200 -base = KU08_04_Base +base = KU08_planet_001_Base reputation = sh_corp_grp [Zone] @@ -647,7 +647,7 @@ archetype = planet_ice_blue_2000 spin = 0,0,0 atmosphere_range = 2200 burn_color = 0, 255, 255 -base = KU08_06_Base +base = KU08_planet_002_Base reputation = sh_n_grp [Zone] @@ -1035,7 +1035,7 @@ ids_info = 66141 pos = -1528.00, 0.00, -33045.62 rotate = 0, 18.92, 0 Archetype = dock_ring -dock_with = KU08_04_Base +dock_with = KU08_planet_001_Base loadout = docking_ring behavior = NOTHING voice = atc_leg_m01 @@ -1051,8 +1051,8 @@ pos = -1528.00, 350.00, -33045.62 Archetype = docking_fixture ids_info = 66489 behavior = NOTHING -dock_with = KU08_04_Base -base = KU08_04_Base +dock_with = KU08_planet_001_Base +base = KU08_planet_001_Base reputation = sh_corp_grp [Zone] @@ -1159,7 +1159,7 @@ rotate = 0, 108.51, 0 Archetype = dock_ring reputation = sh_n_grp -dock_with = KU08_06_Base +dock_with = KU08_planet_002_Base loadout = docking_ring behavior = NOTHING voice = atc_leg_m01 diff --git a/DATA/UNIVERSE/universe.ini b/DATA/UNIVERSE/universe.ini index e260da64..8ccf8929 100644 --- a/DATA/UNIVERSE/universe.ini +++ b/DATA/UNIVERSE/universe.ini @@ -2334,10 +2334,10 @@ strid_name = 524302 file = Universe\Systems\KU08\Bases\KU08_03_Base.ini [Base] -nickname = KU08_04_Base +nickname = KU08_planet_001_Base system = KU08 strid_name = 500016 -file = Universe\Systems\KU08\Bases\KU08_04_Base.ini +file = Universe\Systems\KU08\Bases\KU08_planet_001_Base.ini [Base] nickname = KU08_05_Base @@ -2346,10 +2346,10 @@ strid_name = 524295 file = Universe\Systems\KU08\Bases\KU08_05_Base.ini [Base] -nickname = KU08_06_Base +nickname = KU08_planet_002_Base system = KU08 strid_name = 524304 -file = Universe\Systems\KU08\Bases\KU08_06_Base.ini +file = Universe\Systems\KU08\Bases\KU08_planet_002_Base.ini [System] nickname = KU09 diff --git a/DATA/initialworld.ini b/DATA/initialworld.ini index eebff745..276ca19a 100644 --- a/DATA/initialworld.ini +++ b/DATA/initialworld.ini @@ -3930,6 +3930,7 @@ rep = 0.0, PLAYER_LI rep = 0.0, PLAYER_RH rep = 0.0, PLAYER_BR rep = 0.0, PLAYER_KU +rep = 1.0, sh_n_grp rep = 1.0, sh_corp_grp rep = -0.91, sh_pirate_grp @@ -3999,6 +4000,7 @@ rep = 0.0, PLAYER_RH rep = 0.0, PLAYER_BR rep = 0.0, PLAYER_KU rep = 1.0, sh_n_grp +rep = 1.0, sh_corp_grp rep = -0.91, sh_pirate_grp [Group] @@ -4061,12 +4063,12 @@ rep = -0.91, fc_f_grp rep = -0.91, gd_im_grp rep = -0.91, gd_z_grp rep = -0.91, gd_bh_grp -rep = -0.91, sh_n_grp -rep = -0.91, sh_corp_grp -rep = 0.91, sh_pirate_grp rep = 0.0, REM_CLAN rep = 0.0, PLAYER_LI rep = 0.0, PLAYER_RH rep = 0.0, PLAYER_BR rep = 0.0, PLAYER_KU +rep = -0.91, sh_n_grp +rep = -0.91, sh_corp_grp +rep = 0.91, sh_pirate_grp