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.

Sign up for GitHub

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

Jump to bottom

Feature/g drugselling #1

Merged
merged 17 commits into from
Feb 19, 2023
Merged

Feature/g drugselling #1

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
49cdbdd
Base
Giana Feb 16, 2023
4b2cdb5
Fill config
Giana Feb 16, 2023
4c4a771
Refactor config
Giana Feb 17, 2023
a5fe9ef
Add dependency
Giana Feb 17, 2023
5cdbe40
Add language support
Giana Feb 17, 2023
5f4a51a
Implement walk up and drive up
Giana Feb 17, 2023
91bae9e
Implement selling
Giana Feb 17, 2023
4a56f5d
Implement blip setup
Giana Feb 17, 2023
c0f8853
Implement NPC setup
Giana Feb 17, 2023
2449d78
Fix incorrect trigger
Giana Feb 17, 2023
e37fc15
Split rewards into item and money & fix incorrect reward amount
Giana Feb 17, 2023
2d56b7d
Add target support
Giana Feb 19, 2023
ea0c460
Refactor config
Giana Feb 19, 2023
eefc62a
Add messages
Giana Feb 19, 2023
4b8d877
Implement NPC spawning/despawning
Giana Feb 19, 2023
202ab4c
Refactor and implement police alert
Giana Feb 19, 2023
3edc36c
Update README
Giana Feb 19, 2023
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
Prev Previous commit
Next Next commit
Refactor config
  • Loading branch information
@Giana
Giana committed Feb 17, 2023
commit 4c4a77171efe28bb8156305a98cf4cde4b68201a
86 changes: 53 additions & 33 deletions config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Config = {}
- active: If the sell location is active
- Set to false to disable selling at this location (blip and marker, if enabled, will not appear on map or to players at all)
- policeAlertChance: % chance police are alerted of selling
- notificationsEnabled: If notifications regarding selling are enabled
- itemNotificationsEnabled: If notifications regarding items being added/removed to/from inventory are enabled
- type: How location is approached by player to sell
- Options:
- 'walkup'
Expand Down Expand Up @@ -43,14 +45,16 @@ Config = {}
- scenario: NPC ped scenario
- sellable_items:
- 'itemName': Name of item
- quantity: Amount to sell
- reward_type: Reward type
- reward_amount: Amount of reward
- sell_quantity: Amount to sell in increments of
- rewards:
- 'rewardItemName' (name of money type or reward item) = rewardAmount (# amount of money type or reward item)
]]
Config.SellLocations = {
[1] = {
active = true,
policeAlertChance = 15,
notificationsEnabled = false,
itemNotificationsEnabled = false,
type = 'walkup',
coords = vector3(292.65, -1072.83, 28.41),
blip = {
Expand Down Expand Up @@ -83,40 +87,48 @@ Config.SellLocations = {
},
sellable_items = {
['weed_white-widow'] = {
minimum_quantity = 5,
reward_type = 'cash',
reward_amount = math.random(75, 120)
sell_quantity = 5,
rewards = {
['cash'] = math.random(75, 120)
}
},
['weed_skunk'] = {
minimum_quantity = 5,
reward_type = 'cash',
reward_amount = math.random(75, 120)
sell_quantity = 5,
rewards = {
['cash'] = math.random(75, 120)
}
},
['weed_purple-haze'] = {
minimum_quantity = 5,
reward_type = 'cash',
reward_amount = math.random(75, 120)
sell_quantity = 5,
rewards = {
['cash'] = math.random(75, 120)
}
},
['weed_og-kush'] = {
minimum_quantity = 5,
reward_type = 'cash',
reward_amount = math.random(75, 120)
sell_quantity = 5,
rewards = {
['cash'] = math.random(75, 120)
}
},
['weed_amnesia'] = {
minimum_quantity = 5,
reward_type = 'cash',
reward_amount = math.random(75, 120)
sell_quantity = 5,
rewards = {
['cash'] = math.random(75, 120)
}
},
['weed_brick'] = {
minimum_quantity = 10,
reward_type = 'cash',
reward_amount = math.random(2000, 3000)
sell_quantity = 10,
rewards = {
['cash'] = math.random(2000, 3000)
}
}
}
},
[2] = {
active = true,
policeAlertChance = 15,
notificationsEnabled = false,
itemNotificationsEnabled = false,
type = 'walkup',
coords = vector3(292.65, -1072.83, 28.41),
blip = {
Expand Down Expand Up @@ -149,15 +161,18 @@ Config.SellLocations = {
},
sellable_items = {
['meth'] = {
minimum_quantity = 5,
reward_type = 'cash',
reward_amount = math.random(75, 120)
sell_quantity = 5,
rewards = {
['cash'] = math.random(75, 120)
}
}
}
},
[3] = {
active = true,
policeAlertChance = 15,
notificationsEnabled = false,
itemNotificationsEnabled = false,
type = 'walkup',
coords = vector3(292.65, -1072.83, 28.41),
blip = {
Expand Down Expand Up @@ -190,15 +205,18 @@ Config.SellLocations = {
},
sellable_items = {
['crack_baggy'] = {
minimum_quantity = 5,
reward_type = 'cash',
reward_amount = math.random(90, 170)
sell_quantity = 5,
rewards = {
['cash'] = math.random(90, 170)
}
}
}
},
[4] = {
active = true,
policeAlertChance = 15,
notificationsEnabled = false,
itemNotificationsEnabled = false,
type = 'walkup',
coords = vector3(292.65, -1072.83, 28.41),
blip = {
Expand Down Expand Up @@ -231,14 +249,16 @@ Config.SellLocations = {
},
sellable_items = {
['cokebaggy'] = {
minimum_quantity = 5,
reward_type = 'cash',
reward_amount = math.random(90, 185)
sell_quantity = 5,
rewards = {
['cash'] = math.random(90, 185)
}
},
['coke_brick'] = {
minimum_quantity = 10,
reward_type = 'cash',
reward_amount = math.random(8500, 10000)
sell_quantity = 10,
rewards = {
['cash'] = math.random(8500, 10000)
}
}
}
}
Expand Down