Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to Build 3095 Chop Shop DLC #130

Closed
wants to merge 11 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
157 changes: 157 additions & 0 deletions LICENSE.md

Large diffs are not rendered by default.

82 changes: 51 additions & 31 deletions README.md

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove the wiki reference?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made the Readme redirect to my Repo. That is why I recommended a Cherry-Pick merge.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Fix holes and customize the map (Updated to The Criminal Enterprises DLC)
# Fix holes and customize the map (Updated to The Chop Shop DLC)

The purpose of this script is to fix the holes in the map by loading zones that aren’t loaded by default. I’ve added quite a lot of places to load, based on [Mikeeh’s script](https://forum.fivem.net/t/release-load-unloaded-ipls/5911). If you just want to fix the holes in the map, then use this resource as provided.

Expand Down Expand Up @@ -30,73 +30,93 @@ This resource has been completely rewritten from scratch since v2.0. You can cus
(DD/MM/YYYY)

---
05/12/2023 - 2.1.3
### 15/01/2024 - 3.0
**Added DLC Summer Special**
- Added Arcade

**Added DLC Mercenary**
- Added Mercenary Avenger
- Added Mercenary Garage
- Added Mercenary Zancudo Bunker

### 09/01/2024 - 3.0b
- Fix typo in manifest for GTXD Metafile

### 07/01/2024 - 3.0a
**Added DLC Cayo Perico**
- Added Cayo Perico Island
- Fixed Navigation on Cayo Perico

**Added DLC The ChopShop**
- Added ChopShop Content

### 05/12/2023 - 2.1.3
- Added missing train track near Davis Quartz (https://github.com/Bob74/bob74_ipl/pull/129 @TheIndra55)

10/01/2023 - 2.1.2
### 10/01/2023 - 2.1.2
- Fix native and update native names (@NeenGame )

24/10/2022 - 2.1.1
### 24/10/2022 - 2.1.1
- Fix vespucci beach wall hole
- Fix Boat House Door in Sandy Shores
- Fix GTA 5 24/7 Roof in Sandy Shores
- Fix Industrial Building near Lesters Warehouse
- Fix Collision Holes near Lost MC compound

11/10/2022 - 2.1.0a
### 11/10/2022 - 2.1.0a
- Make Doomsday Facility Objects non network

03/08/2022 - 2.1.0
### 03/08/2022 - 2.1.0
- Added "The Criminal Enterprises" support

02/05/2022 - 2.0.15
### 02/05/2022 - 2.0.15
- Reformatted code
- Removed unused .gitignore
- Bumped version in fxmanifest.lua
- Improved performance

21/04/2022 - 2.0.14
### 21/04/2022 - 2.0.14
- Fix casino penthouse carpet patterns colors

12/02/2022 - 2.0.13a
### 12/02/2022 - 2.0.13a
- Fix Music Roof

12/02/2022 - 2.0.13
### 12/02/2022 - 2.0.13
- Added Contract IPLs: Garage, Studio, Offices, Music Roof, Billboards

10/02/2022 - 2.0.12
### 10/02/2022 - 2.0.12
- Fix FIB roof

07/02/2022 - 2.0.11
### 07/02/2022 - 2.0.11
- Added Tuners IPLs: Garage, Meth Lab, Meetup

18/01/2022 - 2.0.10b
### 18/01/2022 - 2.0.10b
- Change water in yachts to be non-networked.

01/08/2021 - 2.0.10a
### 01/08/2021 - 2.0.10a
- Improved performance
- Fixed hole in the FIB fountain
- Fixed error appearing if casino IPL is loaded, but the game build is not sufficient
- Fixed a few typos in the README file

19/07/2021 - 2.0.10
### 19/07/2021 - 2.0.10
- Added Diamond Casino IPLs: Casino, Garage, VIP garage, Penthouse
- Import: Forced refresh of CEO Garages
- Updated fxmanifest fx_version to cerulean
- Updated IPL list link in fxmanifest nad removed outdated Props list and Interior ID list
- Fixed export typo in `michael.lua`
- Removed unnecessary space in north_yankton IPL

27/05/2020 - 2.0.9a
### 27/05/2020 - 2.0.9a
- Fixed disabling Pillbox Hospital
- Fixed `ResetInteriorVariables`

23/04/2020 - 2.0.9
### 23/04/2020 - 2.0.9
- Replaced deprecated __resource.lua with fxmanifest.lua
- Added ferris wheel on the Del Perro Pier
- Reformatted client.lua

20/10/2019 - 2.0.8
### 20/10/2019 - 2.0.8
- Nightclubs: Added dry ice emitters
- Heist & Gunrunning: Added water to the yachts hot tubs (to enable/disable)
- Offices: Added a way to open and close the safes
Expand All @@ -105,30 +125,30 @@ This resource has been completely rewritten from scratch since v2.0. You can cus
- Fixed error `ReleaseNamedRendertarget`
- Cleaned and optimized the code

22/03/2019 - 2.0.7c
### 22/03/2019 - 2.0.7c
- CEO Offices: Changed the default loaded garage to ImportCEOGarage4.Part.Garage2 in order to avoid Office glitches

15/01/2019 - 2.0.7b
### 15/01/2019 - 2.0.7b
- Nightclubs: Fixed a typo for the fake lights

15/01/2019 - 2.0.7a
### 15/01/2019 - 2.0.7a
- Nightclubs: Added the ability to set no podium (using `AfterHoursNightclubs.Interior.Podium.none`)

14/01/2019 - 2.0.7
### 14/01/2019 - 2.0.7
- Changed the way Trevor’s trailer is handled and added a Wiki entry.
- Added a way to open or close Zancudo’s gates with a Wiki entry.

12/01/2019 - 2.0.6
### 12/01/2019 - 2.0.6
- Added nightclubs interior and exteriors
- Removed Zancudo gates by default (file bob74_ipl/gtav/base.lua: RequestIpl("CS3_07_MPGates") is now commented)

29/12/2018 - 2.0.5a
### 29/12/2018 - 2.0.5a
- Fixed the name of the BikerClubhouse1 export

19/12/2018 - 2.0.5
### 19/12/2018 - 2.0.5
- Fixed a typo that prevents the printers, security stuff, and cash piles to spawn in the counterfeit cash factory

10/11/2018 - 2.0.4
### 10/11/2018 - 2.0.4
- Fixed an issue where the clubhouse2 lower walls wouldn’t be colored on the first resource start
- Fixed gang members names using an old format
- Disabled the Mod shop from CEO garage 3 (ImportCEOGarage3) because it is overlapping with CEO office 3 (FinanceOffice3)
Expand All @@ -137,18 +157,18 @@ This resource has been completely rewritten from scratch since v2.0. You can cus
- Added biker gang’s name, missions, and members pictures
- Added CEO office organization’s name

05/11/2018 - 2.0.1
### 05/11/2018 - 2.0.1
- Removed overlapping Zancudo River
- Added the trailer near Zancudo River

04/11/2018 - 2.0.0
### 04/11/2018 - 2.0.0
- Plugin totally rewritten
- Support for all DLC (up to The Doomsday Heist)
- Ability to easily customize story mode and online purchasable interiors
- You can still use it as it is if you want IPL and interiors to be loaded, the plugin sets a default style for each one
- Check out the Wiki to find out how: https://github.com/Bob74/bob74_ipl/wiki

26/06/2017
### 26/06/2017
- Added optional IPL
- Bunkers exteriors (enabled)
- Bunkers interior
Expand All @@ -157,12 +177,12 @@ This resource has been completely rewritten from scratch since v2.0. You can cus
- Import/Export locations
- Removed the trick to open Lost’s safehouse since the last update already opens it

19/06/2017
### 19/06/2017
- Fix hole in Zancudo River
- Fix hole in Cassidy Creek
- Add optional graffiti on some billboards (enabled by default)
- Opened Lost’s safehouse interior

14/06/2017
### 14/06/2017
- Original release
</details>
14 changes: 14 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Security Policy

## Supported Versions

| Version | Supported | GameBuild | Last added Content |
| ------- | ------------------ | --------- | -------------------------- |
| 3.0 | :white_check_mark: | Max. 3095 | Summer Special & Mercenary |
| 3.0.b | :x: | Max. 3095 | Bugfix |
| 3.0.a | :x: | Max. 3095 | Cayo Perico & Chop Shop |
| < 3.0.a | :x: | Max. 2699 | / |

## Reporting a Vulnerability

To report a vulnerability about changes in this fork please open an Issue or Pull Request.
91 changes: 91 additions & 0 deletions dlc_arcade/arcade.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
CreateThread(function()
RequestIpl("ch_int_placement_ch_interior_1_dlc_arcade_milo_")
RequestIpl("ch_int_placement_ch_interior_2_dlc_plan_milo_")

-- ARCADE
-- 2730, -380, -50
local interiorid_arcade = 278273

-- Interior props / entitysets

-- MAIN STYLES (Choose one)
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_style_01")
EnableInteriorProp(interiorid_arcade, "casino_arcade_style_02")

-- DESTROYED VERSION
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_destroyed")
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_destroyed_extras") -- (extras for the destroyed version)

-- TEXTURE STYLES (Choose one)
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_texture_style_01")
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_texture_style_02")
EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_texture_style_03")
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_texture_style_04")
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_texture_style_09")
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_texture_style_10")
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_texture_style_11")
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_texture_style_16")

-- WALL DESIGNS (Choose one)
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wall_01")
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wall_02")
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wall_03")
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wall_04")
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wall_05")
EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wall_06")
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wall_07")
-- EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wall_08")


-- PROPS: Can all be used at same time without colliding
EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_streetgames_01")
EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wallmonitors")
EnableInteriorProp(interiorid_arcade, "casino_arcade_no_idea") -- Some floor stuff
EnableInteriorProp(interiorid_arcade, "casino_arcade_no_idea2") -- Neon stuff i think
EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_barstuff")
EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_walltv")
EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_lights_01") -- This also has trophies etc
EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_lights_02")
EnableInteriorProp(interiorid_arcade, "casino_arcade_extraprops_wire") -- Main Arcade room ligting, cables and arcade props

-- always refresh the interior or they won't appear
RefreshInterior(interiorid_arcade)

-- UNDERGROUND BASE
-- 2697.615, -376.3892, -56.46193
local interiorid_arcade_underbase = 278529

-- PROPS: Can all be used at same time without colliding
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_hacking")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_keypads")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_hacking2")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_work")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_work2")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_vaultplan")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_work3")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_casino_tablemodel") -- Has to be used together with: casino_plan_work3 (its on a table)
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_work4")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_work5")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_board_drawing")
-- EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_machines") -- Blocks path to back room vehicle parking
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_blueprints")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_c4")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_insect")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_equipment_01")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_equipment_02")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_equipment_03")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_equipment_04")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_equipment_05")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_equipment_hat")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_drone")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_noidea_xd")
EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_equipment_07")

-- DESTROYED/OLD GARAGE VERSION (ONLY LOAD THESE 3)
-- EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_destroyed")
-- EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_destroyed2") -- Enables the walls
-- EnableInteriorProp(interiorid_arcade_underbase, "casino_plan_destroyed3") -- Extra props

-- always refresh the interior or they won't appear
RefreshInterior(interiorid_arcade_underbase)
end)
Loading