diff --git a/DATA/CHARACTERS/newcharacter.ini b/DATA/CHARACTERS/newcharacter.ini index 0e554007..c1c52b93 100644 --- a/DATA/CHARACTERS/newcharacter.ini +++ b/DATA/CHARACTERS/newcharacter.ini @@ -7,17 +7,45 @@ body.anim = Sc_MLBODY_STND_000LV_A_31 comm.anim = Sc_comm_body_unfold_female, Sc_headCOM [Package] -nickname = ge_fighter +nickname = ge_fighter_trent strid_name = 11051 strid_desc = 11551 ship = ge_fighter loadout = MP_ge_fighter -money = 2000 +money = 20000 + +[Package] +nickname = li_freighter_trent +strid_name = 11051 +strid_desc = 11551 +ship = li_freighter +loadout = MP_li_freighter +money = 20000 [Faction] nickname = new_player -rep_group = co_ic_grp +rep_group = PLAYER_PVP base = Li01_01_Base -Package = ge_fighter +Package = ge_fighter_trent Pilot = trent +[Faction] +nickname = new_player +rep_group = PLAYER_PVP +base = Li01_01_Base +Package = li_freighter_trent +Pilot = trent + +[Faction] +nickname = new_player +rep_group = PLAYER_PVE +base = Li01_01_Base +Package = ge_fighter_trent +Pilot = trent + +[Faction] +nickname = new_player +rep_group = PLAYER_PVE +base = Li01_01_Base +Package = li_freighter_trent +Pilot = trent \ No newline at end of file diff --git a/DATA/INTERFACE/INTRO/page_charactercreate.page b/DATA/INTERFACE/INTRO/page_charactercreate.page index c015b972..0e363568 100644 --- a/DATA/INTERFACE/INTRO/page_charactercreate.page +++ b/DATA/INTERFACE/INTRO/page_charactercreate.page @@ -1,9 +1,12 @@ #Automatically generated. Do not edit! UITextMsgButton SelectShip .305013020833333 -.367520833333333 .3125 .0625 "Ship >" 12301.0000 "" 393254 UITextMsgButton Back -.62109375 -.367513020833333 .3125 .0625 "< Back" 12300.0000 "" 393257 -UIRichTextWin Title -.331385416666667 .367520833333333 .709645833333333 5.37083333333332E-02 -UIWinObject DataFrame -.334635416666667 .267144097222222 .660807291666667 .537109375 -1.0000 interface\intro\objects\MULTI_charactercreation.cmp -UITextEdit CharacterName -8.07291666666667E-02 -.185329861111111 .364583333333333 5.53385416666667E-02 "Stumpo" -UIWinDeform BaseCostume -.30859375 .237847222222222 .257161458333333 .478515625 -UIRichTextWin StartingDesc -6.77083333333334E-02 .236219618055555 .338541666666667 .371636284722222 -UIRichTextWin NameLabel -6.60807291666667E-02 -.143012152777778 .33203125 .0439453125 +UIWinObject DataFrame -.334635416666667 .267144097222222 .660807291666667 .537109375 -0.8300 interface\intro\objects\MULTI_charactercreation.cmp +UIRichTextWin Title -.331385416666667 .280020833333333 .709645833333333 5.37083333333332E-02 +UITextEdit CharacterName -8.07291666666667E-02 -.215329861111111 .364583333333333 5.53385416666667E-02 "Stumpo" +UIWinDeform BaseCostume -.35859375 .237847222222222 .257161458333333 .478515625 +UIRichTextWin StartingDesc -6.77083333333334E-02 .206219618055555 .338541666666667 .371636284722222 +UIRichTextWin NameLabel -6.60807291666667E-02 -.183012152777778 .33803125 .0439453125 + +UICycle CyclePackage -.11 -.025 .42 2.76666666666667E-02 -1.0000 1.0000 0.0000 1.0000 1 +UICycle CyclePackage -.11 -.12 .42 2.76666666666667E-02 -1.0000 1.0000 0.0000 1.0000 1 diff --git a/DATA/MISSIONS/faction_prop.ini b/DATA/MISSIONS/faction_prop.ini index e969e512..6ff10e0a 100644 --- a/DATA/MISSIONS/faction_prop.ini +++ b/DATA/MISSIONS/faction_prop.ini @@ -2596,12 +2596,17 @@ formation = fighters, fighter_guild ; ### MOD Faction Props ### - ; REM CLAN - [FactionProps] affiliation = REM_CLAN legality = lawful +; PLAYER_PVP +[FactionProps] +affiliation = PLAYER_PVP +legality = lawful - +; PLAYER_PVE +[FactionProps] +affiliation = PLAYER_PVE +legality = lawful diff --git a/DATA/SHIPS/loadouts.ini b/DATA/SHIPS/loadouts.ini index d9fdb1b2..b1b6b138 100644 --- a/DATA/SHIPS/loadouts.ini +++ b/DATA/SHIPS/loadouts.ini @@ -83,8 +83,27 @@ equip = contrail01, HpContrail01 equip = contrail01, HpContrail02 equip = DockingLightRedSmall, HpDockLight01 equip = DockingLightRedSmall, HpDockLight02 -cargo = ge_s_battery_01, 3 -cargo = ge_s_repair_01, 3 + +[Loadout] +nickname = MP_li_freighter +archetype = li_freighter +equip = ge_lfr_engine_01 +equip = shield01_mark01_fr, HpShield01 +equip = li_freighter_power01 +equip = ge_s_scanner_01 +equip = ge_s_tractor_01 +equip = LargeWhiteSpecial, HpHeadlight +equip = SlowSmallBlue, HpRunningLight01 +equip = SlowSmallBlue, HpRunningLight02 +equip = SlowSmallBlue, HpRunningLight03 +equip = SlowSmallBlue, HpRunningLight04 +equip = SlowSmallBlue, HpRunningLight05 +equip = SlowSmallBlue, HpRunningLight06 +equip = SlowSmallBlue, HpRunningLight07 +equip = contrail01, HpContrail01 +equip = contrail01, HpContrail02 +equip = DockingLightRedSmall, HpDockLight01 +equip = DockingLightRedSmall, HpDockLight02 [Loadout] nickname = co_ge_fighter_loadout01 diff --git a/DATA/initialworld.ini b/DATA/initialworld.ini index deeb5cb4..b4eac761 100644 --- a/DATA/initialworld.ini +++ b/DATA/initialworld.ini @@ -3431,4 +3431,126 @@ rep = 1, REM_CLAN -; ### MOD Reps ### \ No newline at end of file +; ### MOD Reps ### + +[Group] +nickname = PLAYER_PVP +ids_name = 261353 +ids_info = 261353 +ids_short_name = 261353 +rep = 0, li_n_grp +rep = 0, li_lsf_grp +rep = 0, li_p_grp +rep = 0, br_n_grp +rep = 0, br_p_grp +rep = 0, ku_n_grp +rep = 0, ku_p_grp +rep = 0, rh_n_grp +rep = 0, rh_p_grp +rep = 0, co_alg_grp +rep = 0, co_be_grp +rep = 0, br_m_grp +rep = 0, co_nws_grp +rep = 0, co_hsp_grp +rep = 0, co_ic_grp +rep = 0, co_khc_grp +rep = 0, co_kt_grp +rep = 0, rh_m_grp +rep = 0, co_me_grp +rep = 0, co_ni_grp +rep = 0, co_os_grp +rep = 0, co_rs_grp +rep = 0, co_shi_grp +rep = 0, co_ss_grp +rep = 0, co_ti_grp +rep = 0, co_vr_grp +rep = 0, fc_bd_grp +rep = 0, fc_b_grp +rep = 0, fc_c_grp +rep = 0, fc_fa_grp +rep = 0, fc_g_grp +rep = 0, fc_gc_grp +rep = 0, fc_h_grp +rep = 0, fc_j_grp +rep = 0, fc_lh_grp +rep = 0, fc_lr_grp +rep = 0, fc_lwb_grp +rep = 0, fc_m_grp +rep = 0, fc_ou_grp +rep = 0, fc_rh_grp +rep = 0, fc_or_grp +rep = 0, fc_u_grp +rep = 0, fc_x_grp +rep = 0, gd_gm_grp +rep = 0, fc_uk_grp +rep = -1, fc_n_grp +rep = 0, fc_ln_grp +rep = 0, fc_kn_grp +rep = 0, fc_rn_grp +rep = 0, fc_ouk_grp +rep = 0, fc_q_grp +rep = 0, fc_f_grp +rep = 0, gd_im_grp +rep = 0, gd_z_grp +rep = 0, gd_bh_grp + +[Group] +nickname = PLAYER_PVE +ids_name = 261354 +ids_info = 261354 +ids_short_name = 261354 +rep = 0, li_n_grp +rep = 0, li_lsf_grp +rep = 0, li_p_grp +rep = 0, br_n_grp +rep = 0, br_p_grp +rep = 0, ku_n_grp +rep = 0, ku_p_grp +rep = 0, rh_n_grp +rep = 0, rh_p_grp +rep = 0, co_alg_grp +rep = 0, co_be_grp +rep = 0, br_m_grp +rep = 0, co_nws_grp +rep = 0, co_hsp_grp +rep = 0, co_ic_grp +rep = 0, co_khc_grp +rep = 0, co_kt_grp +rep = 0, rh_m_grp +rep = 0, co_me_grp +rep = 0, co_ni_grp +rep = 0, co_os_grp +rep = 0, co_rs_grp +rep = 0, co_shi_grp +rep = 0, co_ss_grp +rep = 0, co_ti_grp +rep = 0, co_vr_grp +rep = 0, fc_bd_grp +rep = 0, fc_b_grp +rep = 0, fc_c_grp +rep = 0, fc_fa_grp +rep = 0, fc_g_grp +rep = 0, fc_gc_grp +rep = 0, fc_h_grp +rep = 0, fc_j_grp +rep = 0, fc_lh_grp +rep = 0, fc_lr_grp +rep = 0, fc_lwb_grp +rep = 0, fc_m_grp +rep = 0, fc_ou_grp +rep = 0, fc_rh_grp +rep = 0, fc_or_grp +rep = 0, fc_u_grp +rep = 0, fc_x_grp +rep = 0, gd_gm_grp +rep = 0, fc_uk_grp +rep = -1, fc_n_grp +rep = 0, fc_ln_grp +rep = 0, fc_kn_grp +rep = 0, fc_rn_grp +rep = 0, fc_ouk_grp +rep = 0, fc_q_grp +rep = 0, fc_f_grp +rep = 0, gd_im_grp +rep = 0, gd_z_grp +rep = 0, gd_bh_grp \ No newline at end of file diff --git a/EXE/DALib.dll b/EXE/DALib.dll index 3dae7855..89c53691 100644 Binary files a/EXE/DALib.dll and b/EXE/DALib.dll differ diff --git a/EXE/FLSharp.dll b/EXE/FLSharp.dll new file mode 100644 index 00000000..0e981d68 Binary files /dev/null and b/EXE/FLSharp.dll differ diff --git a/EXE/MP3codec.dll b/EXE/MP3codec.dll index 63f84f9a..f1cf4ee5 100644 Binary files a/EXE/MP3codec.dll and b/EXE/MP3codec.dll differ diff --git a/EXE/REM-Client.dll b/EXE/REM-Client.dll index 578331f3..708ed857 100644 Binary files a/EXE/REM-Client.dll and b/EXE/REM-Client.dll differ diff --git a/EXE/dacom.ini b/EXE/dacom.ini index ea4dbaff..d4f3a5be 100644 --- a/EXE/dacom.ini +++ b/EXE/dacom.ini @@ -39,6 +39,7 @@ HudFacility.dll HudTarget.dll HudStatus.dll NoNavMap.dll +FLSharp.dll ;REM REM-Client.dll diff --git a/EXE/nameresources.dll b/EXE/nameresources.dll index e03d3a11..c081e057 100644 Binary files a/EXE/nameresources.dll and b/EXE/nameresources.dll differ diff --git a/EXE/rp8.dll b/EXE/rp8.dll index a52efd94..a56ed923 100644 Binary files a/EXE/rp8.dll and b/EXE/rp8.dll differ diff --git a/EXE/zlib.dll b/EXE/zlib.dll index 9f3b323b..39fbc3e4 100644 Binary files a/EXE/zlib.dll and b/EXE/zlib.dll differ