From 33f8c4615aa6f75c74357e3136bc163462c5c43d Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Fri, 4 Dec 2020 02:48:16 -0600 Subject: [PATCH] Many improvements. --- .gitignore | 2 + changes.txt | 0 files/html/login.html | 46 + ideas.txt | 239 ----- meta.xml | 7 +- notes.txt | 1 - scripts/client/afk.js | 10 + scripts/client/gui.js | 899 +++++++++++++++++- scripts/client/main.js | 150 ++- scripts/client/nametags.js | 110 +-- scripts/server/account.js | 327 +++++-- scripts/server/ammunation.js | 6 +- scripts/server/ban.js | 6 +- scripts/server/bitflag.js | 6 +- scripts/server/business.js | 376 +++++++- scripts/server/business/bakery.js | 6 +- scripts/server/business/bar.js | 6 +- scripts/server/business/burger.js | 6 +- scripts/server/business/clothing.js | 6 +- scripts/server/business/club.js | 6 +- scripts/server/business/fuel.js | 6 +- scripts/server/business/mechanic.js | 6 +- scripts/server/business/pizza.js | 6 +- scripts/server/business/restaurant.js | 6 +- scripts/server/business/vehicle.js | 6 +- scripts/server/business/weapon.js | 6 +- scripts/server/chat.js | 6 +- scripts/server/clan.js | 6 +- scripts/server/class.js | 28 +- scripts/server/client.js | 6 +- scripts/server/colour.js | 6 +- scripts/server/command.js | 32 +- scripts/server/config.js | 88 +- scripts/server/const.js | 30 +- scripts/server/core.js | 174 +++- scripts/server/database.js | 6 +- scripts/server/developer.js | 6 +- scripts/server/discord.js | 6 +- scripts/server/event.js | 55 +- scripts/server/faction.js | 6 +- scripts/server/help.js | 6 +- scripts/server/house.js | 6 +- scripts/server/item.js | 6 +- scripts/server/job.js | 30 +- scripts/server/job/bus.js | 6 +- scripts/server/job/drug.js | 6 +- scripts/server/job/fire.js | 6 +- scripts/server/job/garbage.js | 6 +- scripts/server/job/medic.js | 8 +- scripts/server/job/police.js | 6 +- scripts/server/job/taxi.js | 6 +- scripts/server/job/weapon.js | 6 +- scripts/server/locale.js | 6 +- scripts/server/messaging.js | 33 +- scripts/server/misc.js | 166 +++- scripts/server/moderation.js | 6 +- scripts/server/native.js | 6 +- scripts/server/npc.js | 6 +- scripts/server/npc/biker.js | 9 + scripts/server/npc/drugdealer.js | 9 + scripts/server/npc/firefighter.js | 9 + scripts/server/npc/gangsta.js | 9 + scripts/server/npc/mafia.js | 9 + scripts/server/npc/normal.js | 9 + scripts/server/npc/paramedic.js | 9 + scripts/server/npc/police.js | 9 + scripts/server/security.js | 6 +- scripts/server/startup.js | 30 +- scripts/server/timers.js | 36 + scripts/server/translate.js | 6 +- scripts/server/utilities.js | 442 ++++++++- scripts/server/vehicle.js | 58 +- third-party/config.json | 20 - third-party/mexui/Core/Component/Control.js | 13 +- third-party/mexui/Core/Component/Window.js | 12 +- third-party/mexui/Core/Control/Button.js | 14 +- third-party/mexui/Core/Control/CheckBox.js | 26 +- third-party/mexui/Core/Control/Date.js | 58 +- third-party/mexui/Core/Control/Day.js | 15 +- third-party/mexui/Core/Control/DropDown.js | 73 +- third-party/mexui/Core/Control/Grid.js | 3 + third-party/mexui/Core/Control/Hour.js | 12 +- third-party/mexui/Core/Control/Image.js | 3 + third-party/mexui/Core/Control/Integer.js | 7 +- third-party/mexui/Core/Control/List.js | 6 +- third-party/mexui/Core/Control/Minute.js | 12 +- third-party/mexui/Core/Control/Month.js | 15 +- third-party/mexui/Core/Control/Number.js | 7 +- .../mexui/Core/Control/PositiveInteger.js | 16 + .../mexui/Core/Control/PositiveNumber.js | 16 + third-party/mexui/Core/Control/RadioButton.js | 33 +- .../mexui/Core/Control/RangedInteger.js | 16 +- .../mexui/Core/Control/RangedNumber.js | 16 +- third-party/mexui/Core/Control/ScrollBar.js | 23 +- third-party/mexui/Core/Control/Second.js | 12 +- third-party/mexui/Core/Control/Slider.js | 8 +- third-party/mexui/Core/Control/TabPanel.js | 42 +- third-party/mexui/Core/Control/Text.js | 3 + third-party/mexui/Core/Control/TextInput.js | 62 +- third-party/mexui/Core/Control/Time.js | 25 +- third-party/mexui/Core/Control/Tree.js | 14 +- third-party/mexui/Core/Control/Week.js | 12 +- third-party/mexui/Core/Control/WeekDay.js | 16 + third-party/mexui/Core/Control/Year.js | 20 +- third-party/mexui/Core/Entity/Component.js | 4 +- .../mexui/Core/Entity/StyleableEntity.js | 8 + third-party/mexui/Core/Native.js | 17 +- third-party/mexui/Core/Utility.js | 233 +++++ third-party/mexui/Images/down-arrow-bak.png | Bin 0 -> 273 bytes third-party/mexui/mexui.js | 34 +- 110 files changed, 3680 insertions(+), 923 deletions(-) create mode 100644 .gitignore delete mode 100644 changes.txt create mode 100644 files/html/login.html delete mode 100644 ideas.txt delete mode 100644 notes.txt create mode 100644 scripts/server/timers.js delete mode 100644 third-party/config.json create mode 100644 third-party/mexui/Core/Control/PositiveInteger.js create mode 100644 third-party/mexui/Core/Control/PositiveNumber.js create mode 100644 third-party/mexui/Core/Control/WeekDay.js create mode 100644 third-party/mexui/Images/down-arrow-bak.png diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b95e158d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.vs/ +.git/ \ No newline at end of file diff --git a/changes.txt b/changes.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/files/html/login.html b/files/html/login.html new file mode 100644 index 00000000..246d1c1e --- /dev/null +++ b/files/html/login.html @@ -0,0 +1,46 @@ + + + Asshat Gaming: Login + + + +
+ + + + +
+ + \ No newline at end of file diff --git a/ideas.txt b/ideas.txt deleted file mode 100644 index 9dd9cb33..00000000 --- a/ideas.txt +++ /dev/null @@ -1,239 +0,0 @@ -Ideas for Asshat Gaming RP! - -NOTICE: Most of these ideas are totally random and some might be unrealistic. Every time I thought of something, -I immediately threw it into this file. There may be duplicates or similar entries spread out and unorganized. - -Thanks for understanding, -- Vortrex - -============================================================================================================== -- Businesses (some from GTA Online) - - Nightclubs - - Executive Offices - - Warehouses - - Hangars - - Houses - - Garages - - Casinos - -- Interactive peds with each one having a background story, characteristics, certain people or groups they like/dislike. - - Procedurally generated? - -- Nightclubs, bars, etc can employ "bouncer" peds that either prevent entry to certain people, or kick people out. - -- Background ambience. - - Anonymous city traffic and pedestrians - - They come and go and aren't persistent. - - Police peds/traffic will pursue if player has 1+ stars and comes within range and line of sight. - - Police presence becomes more frequent in areas where crimes occur (default police spawn rate will be increased for the area) - - Random text bubble dialog above their heads. - - Complain about life, work, taxes, nearby shady establishments, rising crime rates, gangs, etc - - Praise nearby good establishments, lowered taxes, crime rates dropping, etc - -- Named NPCs - - Persistent - - Move from place to place. Eat at restaurants, drive home, to work, get drunk at a bar, etc. - - Different personalities - - Relationship levels with each player and faction. - - If you piss them off, they won't do business with you. - - If you fuck them over, you have a chance of being greenlit under certain circumstances (peds will show up randomly and attempt to kill or subdue you) - - Faction/clans at war is basically kill on sight as long as cops aren't around - -- Firefighter Job - - Vehicles catch on fire instead of blowing up. - - Random property fires can occur. - - Firetrucks can "spray" a fire, lowering the damage until it is extinguished (Aim detection). - -- Streetsweeper Job - - Instead of checkpoints, show actual messes on the road. - - Drive over the messes with the right vehicle to "clean" the mess. - - Only show messes if at least one player is on duty. - -- Garbageman Job - - Instead of checkpoints, have trashbag objects outside of properties or wherever. - - Allow the trashtruck drivers to "pickup" the trashbag, then "place" into the truck. - - If the truck is full, deliver the trashbags to the dump. - - Only show trashbags if at least one player is currently doing the job. - -- Mailman Job - - Use a white solid van (Pony maybe) as a mail van. - - Load mail at the post office, and drive a specific route to "deliver" mail. - - Return the truck for payment. - -- Vehicle Towing - - Use a Yankee or something to store the vehicle "inside" (just make the car disappear) until better sync options are built for GTA 3/VC. - - Universal command to tow/release a vehicle ( /tow ). - - Attach to nearest vehicle. - -- Item System - - Several item types, including armour, skins, weapons, drugs, materials, and more. - - Items can be dropped and picked up. - - Items can be stored in a vehicle trunk or dash compartment. - - Items can be given, taken, or used. - -- Payphones - - Make built in payphones usable (detect position, ring sound, etc) - - Payphones can be called, making them ring to nearby players. - -- Multiple bed hospital. - - When one is taken, use the next one. - - If all are full, have a waiting list. - - Allow people to go in and lay on a bed to heal (or use a check-in system) - -- Several NPC's - - Paramedics/Doctors at hospitals, - - LC/VC/LS/SF/LV police dept desk clerk and dispatcher. - - Jail guard - - Interactive. Go up and talk to them for responses etc - -- Use permissions/flag system for everything. - - Admin abilities - - Moderation (muted/frozen/etc) - - LEO abilities - - Faction abilities - - etc - -- For games with interiors, properties inside of properties (make it a sub-property, but using a "type" to define it) AKA a business inside a business (illegal back room gambling, perhaps?) - -- Stealable clothes. - - Police uniforms can be stolen, and the cop will be reverted to his non-uniform skin. - - Clothes are items so the criminal can apply it immediately or store/drop/give/sell it - -- Black market for anything. - - Smuggled drugs - - LEO items - - Weapons and weapon upgrades - - Illegal vehicle upgrades like NOS. - -- Drug houses and weed farms. - - Make weed only plantable in certain areas. - - Drug houses aren't limited to the type of house, as anybody can deal or use in any place. - -- Size-based inventories. - - Items should have a size and inventories can only hold so much. - - Items inside of items. This could be (but not limited to): - - Briefcases - - Wallets - - Safes - - Trashbags - - Boxes/crates - - Use the item sizes for storage capacity - -- Weapons like DayZ. - - Multiple weapon types that issue different damages. - - Ammo clips that only fit a compatible weapon - - Different clip types hold different amounts of ammo in them (and specific ammo types) - - Hollow point and armor piercing round types - - Modifications. Flashlight, silencer, bigger clip, tracer, scope, etc. - -- Crime scene investigations. - - Blood - - Fingerprints - - Ballistics/bullets on ground, in objects, walls, etc. - - Gunpowder traces - - Weapons - - Other crime scene stuff for investigation roleplay. - - These items should be visible on the ground (particle effects?) - - Can be cleaned up by anybody (including the murderer or suspects) - - Showering or swimming clears blood from body - - Rain washes away blood outside (if not under an object or bridge). Perhaps line of sight check with high up Z at same coord? - -- Huge police interiors and garages. - - Multiple interrogation rooms with blocked sound (chat is localized to that room) - - Multiple offices for ranking members - - A large locker room - - Crime scene lab - - Cell block area (or multiple cell blocks) - - Elevators that can take you to multiple levels of the building (and roof/garage). - -- Custom MDC. - - Arrest logs - - Past tickets - - Officer reports - - Investigation info - - APB list - -- Admin panel. - - Reports - - Multiple actions for each - - Viewing info and past reports/actions on the reporter and the situation. - - Logs - - Chat - - Action - - Weapon/Kill/Death - - Others - -- Log everything possible. - -- Depending on type of injuries, have multiple results occur over time. - - Gunshots lead to bleeding which could lead to passing out for loss of blood. - - Post-treatment effects are also possible including siezures from blunt force trauma. - -- Custom actions to have different results. Interactive-ness. - - Hotwiring a car could be successful or could also fail, depending on vehicle type and variance. - - The user has to go through each step in order to complete the task. - - Hotwiring could have things like splitting and joining wires to make the car start or the alarm stop. - - Include medical procedures in this idea. - - Require certain tools to perform different actions. - - Different vehicles have different wires to use to be successful. - -- Limit weapons per person. - - Have a visible large weapon if they have one, and allow a concealable smaller weapon as well. - -- Officers usually have a utility belt. Allow it to hold equipment as well. - -- Trunks can hold players/peds (not visibly) and items and is size based. - -- Get "inside" the back of trucks/trailers and store items inside. - - Use an interior for this and allow dropped items (including crates and boxes and etc). - - Ambulance, bus, delivery truck, semi truck trailer, etc. - - Shouts can be heard outside wherever the vehicle is at. - - Vehicle sink or explode while inside the back causes death and objects destroyed. - - Also for airplane interiors - -- Impound - - Inaccessible parking garage. Spawn retrieved impound vehicles at the door. - - Or multi-space impound lot. When retrieving a car from impound, spawn it in the first empty space that isn't obstructed. - -- Weapon wear and tear - - If not cared for, they can have decreased damage from shots, jam, misfire, etc. - - Cleaning weapons improves reliability - -- Weapon ballistics and identity - - Barrel bores - - Serial numbers. Can be removed/rubbed off. - -- GUI color schemes - - Settings page to switch them. Orange, red, blue, purple, etc. - -- Police - - Stars - - 1 star - - Initial misdemeanor. Traffic violation, pedestrian crime, etc. Police will pursue to fine/ticket. - - 2 stars - - Any subsequent crimes, whether felony or misdeanor, after receiving one star and no action taken (if you don't pull over, evade, etc). Results in arrest. - - Any felony crime that isn't extremely violent or doesn't involve a deadly weapon - - 3 stars is basically a warrant. Police will attempt to arrest you on sight and may use heavier force than normal if you become a threat. - - 4 stars is SWAT and/or air support backup callout. Police presence will become more dense and they will really pursue you now. - - 5 stars (highest in the server) is all out manhunt. Police everywhere. They will most likely shoot to kill. - - NPC police will chase you if you have 1+ stars. If you lose them with 2 or less stars, they go away unless you are sighted by another officer before cooldown. - - Civilians can report crimes by calling police or informing nearby police. They will give them your description. - - Any traffic violation that takes place within LOS and range of police will cause them to chase you until you pull over. - - Failure to pull over within a timely manner, or breaking another law before pulling over adds a second star. They won't fine you at this level, only arrest or worse. - -- NPC Ideas - - Bodyguards - - Biker gang formation - - Convoy Line - - Guard/Protect Properties - - Respond to enemy attacks at other locations - - Taxi Driver - - Personal Chauffeur - - Bus Driver - - Train Operator - - Gangs/Mafia Members - - Drug Dealers - - Weapons Dealers - - Mechanic - - Tweakers - - Bouncers \ No newline at end of file diff --git a/meta.xml b/meta.xml index a2f4699d..d5c02b37 100644 --- a/meta.xml +++ b/meta.xml @@ -1,5 +1,5 @@ - +