From a59b352b571859da4eacd1157586b3327bc7d5e0 Mon Sep 17 00:00:00 2001 From: 0ceanSlim Date: Fri, 8 Sep 2023 10:43:37 -0400 Subject: [PATCH] added to weapon and part tables --- Database/__pycache__/id.cpython-311.pyc | Bin 251 -> 260 bytes Database/data/ammo.csv | 24 +++++++-------- Database/data/{meds.csv => med.csv} | 0 Database/data/part.csv | 31 ++++++++++++++++++++ Database/data/parts.csv | 31 -------------------- Database/data/{reloading.csv => reload.csv} | 0 Database/data/weapon.csv | 6 ++++ Database/data/weapons.csv | 6 ---- Database/database.db | Bin 32768 -> 32768 bytes 9 files changed, 49 insertions(+), 49 deletions(-) rename Database/data/{meds.csv => med.csv} (100%) create mode 100644 Database/data/part.csv delete mode 100644 Database/data/parts.csv rename Database/data/{reloading.csv => reload.csv} (100%) create mode 100644 Database/data/weapon.csv delete mode 100644 Database/data/weapons.csv diff --git a/Database/__pycache__/id.cpython-311.pyc b/Database/__pycache__/id.cpython-311.pyc index b88ef075c0dbeff1572c16e2777096e77c5c2854..bd9c37d1cf70d62ccb138b91d0beb8b566374881 100644 GIT binary patch delta 40 ucmey(*uuoUoR^o20SF>Beof@=7SwXKigC_QNsS38%FjwoE-9WkFBSmd(G0u* delta 31 lcmZo+`pw9_oR^o20SJ_ze4ohO&7tUQ72}+rk~(pDEC7f;36KB) diff --git a/Database/data/ammo.csv b/Database/data/ammo.csv index 211711ed..d886847c 100644 --- a/Database/data/ammo.csv +++ b/Database/data/ammo.csv @@ -1,13 +1,13 @@ id,type,name,rarity,weight,width,height,stack,value,gunpowder -NULL,ammoRifle,5.56x45 AP,4,0.02646,1,1,30,7500,15 -NULL,ammoRifle,5.56x45 FMJ,1,0.02646,1,1,30,2500,10 -NULL,ammoRifle,5.56x45 HP,2,0.02646,1,1,30,5000,10 -NULL,ammoPistol,9mm AP,3,0.01984,1,1,45,5000,12 -NULL,ammoPistol,9mm FMJ,1,0.01984,1,1,45,2000,6 -NULL,ammoPistol,9mm HP,2,0.01984,1,1,45,4000,6 -NULL,ammoPistol,.40 S&W AP,3,0.01984,1,1,45,5500,13 -NULL,ammoPistol,.40 S&W FMJ,1,0.01984,1,1,45,3000,7 -NULL,ammoPistol,.40 S&W HP,2,0.01984,1,1,45,4500,7 -NULL,ammoRifle,7.62x39 AP,4,0.02646,1,1,30,5200,15 -NULL,ammoRifle,7.62x39 FMJ,1,0.02646,1,1,30,1800,10 -NULL,ammoRifle,7.62x39 HP,2,0.02646,1,1,30,3600,10 \ No newline at end of file +NULL,5.56x45,5.56x45 AP,4,0.02646,1,1,30,7500,15 +NULL,5.56x45,5.56x45 FMJ,1,0.02646,1,1,30,2500,10 +NULL,5.56x45,5.56x45 HP,2,0.02646,1,1,30,5000,10 +NULL,9mm,9mm AP,3,0.01984,1,1,45,5000,12 +NULL,9mm,9mm FMJ,1,0.01984,1,1,45,2000,6 +NULL,9mm,9mm HP,2,0.01984,1,1,45,4000,6 +NULL,.40S&W,.40 S&W AP,3,0.01984,1,1,45,5500,13 +NULL,.40S&W,.40 S&W FMJ,1,0.01984,1,1,45,3000,7 +NULL,.40S&W,.40 S&W HP,2,0.01984,1,1,45,4500,7 +NULL,7.62x39,7.62x39 AP,4,0.02646,1,1,30,5200,15 +NULL,7.62x39,7.62x39 FMJ,1,0.02646,1,1,30,1800,10 +NULL,7.62x39,7.62x39 HP,2,0.02646,1,1,30,3600,10 \ No newline at end of file diff --git a/Database/data/meds.csv b/Database/data/med.csv similarity index 100% rename from Database/data/meds.csv rename to Database/data/med.csv diff --git a/Database/data/part.csv b/Database/data/part.csv new file mode 100644 index 00000000..0c09f84c --- /dev/null +++ b/Database/data/part.csv @@ -0,0 +1,31 @@ +id,type,name,rarity,weight,height,width,stack,value,vital,ctype1,ctype2,ctype3,ammocap +NULL,armag,STANAG 30-Round Magazine,1,0.375,2,1,1,100000,n,5.56x45,NULL,NULL,30 +NULL,glockmag,Glock 22 15-Round Magazine,1,0.21164,1,1,1,70000,n,9mm,.40 S&W,NULL,30 +NULL,glockmag,Glock 33-Round Magazine,3,0.33069,2,1,1,180000,n,9mm,.40 S&W,NULL,33 +NULL,ak47mag,AK47 30-Round Magazine,1,0.375,2,1,1,80000,n,7.62x39,NULL,NULL,30 +NULL,5.56x45muzzle,5.56x45 Flash Hider,1,0.33069,1,1,1,40000,n,NULL,NULL,NULL,NULL +NULL,5.56x45muzzle,5.56x45 Silencer,3,0.99869,2,1,1,1000000,n,NULL,NULL,NULL,NULL +NULL,5.56x45muzzle,5.56x45 Muzzle Break,2,0.33069,1,1,1,80000,n,NULL,NULL,NULL,NULL +NULL,7.62x39muzzle,7.62x39 Flash Hider,1,0.33069,1,1,1,40000,n,NULL,NULL,NULL,NULL +NULL,7.62x39muzzle,7.62x39 Silencer,3,0.99869,2,1,1,1000000,n,NULL,NULL,NULL,NULL +NULL,7.62x39muzzle,7.62x39 Slant Break,2,0.33069,1,1,1,80000,n,NULL,NULL,NULL,NULL +NULL,siderail,Laser,3,0,1,1,1,350000,n,NULL,NULL,NULL,NULL +NULL,siderail,Flashlight,2,0,1,1,1,100000,n,NULL,NULL,NULL,NULL +NULL,forgrip,Vertical Foregrip,2,0,1,1,1,100000,n,NULL,NULL,NULL,NULL +NULL,forgrip,Angled Foregrip,2,0,1,1,1,0,n,NULL,NULL,NULL,NULL +NULL,optic,EOTech Holographic sight,2,0,1,1,1,700000,n,NULL,NULL,NULL,NULL +NULL,akstock,Ak47 Wood Stock,1,0,2,1,1,120000,n,NULL,NULL,NULL,NULL +NULL,akdust,AK47 Ribbed Dust Cover,1,0,2,1,1,130000,n,NULL,NULL,NULL,NULL +NULL,5.56x45barrel,"16"" 5.56x45 Barrel,1,0,3,1,3,750000,y,5.56x45muzzle,NULL,NULL,NULL +NULL,5.56x45barrel,"10" 5.56x45 Barrel,3,0,2,1,2,1000000,y,5.56x45muzzle,NULL,NULL,NULL +NULL,5.56x45barrel,"20" 5.56x45 Barrel,2,0,3,1,2,1000000,y,5.56x45muzzle,NULL,NULL,NULL +NULL,arguard,"9" Quad Rail Handguard,2,0,2,1,2,300000,y,siderail,siderail,forgrip,NULL +NULL,arguard,"15" Quad Rail Handguard,1,0,3,1,3,500000,y,siderail,siderail,forgrip,NULL +NULL,argrip,AR15 Polymer Pistol Grip,2,0,1,1,1,80000,y,NULL,NULL,NULL,NULL +NULL,argrip,A2 Pistol Grip,1,0,1,1,1,70000,y,NULL,NULL,NULL,NULL +NULL,arstock,M16 Stock,1,0,2,1,1,200000,y,NULL,NULL,NULL,NULL +NULL,arstock,AR15 Polymer Stock,2,0,2,1,1,250000,y,NULL,NULL,NULL,NULL +NULL,akguard,AK47 Wood Handguard,1,0,1,1,1,120000,y,NULL,NULL,NULL,NULL +NULL,akgrip,AK47 Wood Pistol Grip,1,0,1,1,1,60000,y,NULL,NULL,NULL,NULL +NULL,g22barrel,Glock 22 4.5" Barrel",1,0,0,0,1,0,y,.40S&Wmuzzle,NULL,NULL,NULL +NULL,g22upper,Glock 22 Upper Slide,1,0,0,0,1,0,y,opticmini,NULL,NULL,NULL diff --git a/Database/data/parts.csv b/Database/data/parts.csv deleted file mode 100644 index 5ef99338..00000000 --- a/Database/data/parts.csv +++ /dev/null @@ -1,31 +0,0 @@ -id,type,name,rarity,weight,height,width,stack,value,vital -NULL,mag,STANAG 30-Round Magazine,1,0.375,2,1,1,100000,n -NULL,mag,Glock 22 15-Round Magazine,1,0.21164,1,1,1,70000,n -NULL,mag,Glock 33-Round Magazine,3,0.33069,2,1,1,180000,n -NULL,mag,AK47 30-Round Magazine,1,0.375,2,1,1,80000,n -NULL,muzzle,5.56 Flash Hider,1,0.33069,1,1,1,40000,n -NULL,muzzle,5.56x45 Silencer,3,0.99869,2,1,1,1000000,n -NULL,muzzle,5.56x45 Muzzle Break,2,0.33069,1,1,1,80000,n -NULL,muzzle,7.62x39 Flash Hider,1,0.33069,1,1,1,40000,n -NULL,muzzle,7.62x39 Silencer,3,0.99869,2,1,1,1000000,n -NULL,muzzle,7.62x39 Slant Break,2,0.33069,1,1,1,80000,n -NULL,rail,Laser,3,0,1,1,1,350000,n -NULL,rail,Flashlight,2,0,1,1,1,100000,n -NULL,forgrip,Vertical Foregrip,2,0,1,1,1,100000,n -NULL,forgrip,Angled Foregrip,2,0,1,1,1,0,n -NULL,optic,EOTech Holographic sight,2,0,1,1,1,700000,n -NULL,stock,Ak47 Wood Stock,1,0,2,1,1,120000,n -NULL,misc,AK47 Ribbed Dust Cover,1,0,2,1,1,130000,n -NULL,Barrels,"16"" 5.56x45 Barrel",1,0,3,1,3,750000,y -NULL,Barrels,"10"" 5.56x45 Barrel",3,0,2,1,2,1000000,y -NULL,Barrels,"20"" 5.56x45 Barrel",2,0,3,1,2,1000000,y -NULL,Handguards,"9"" Quad Rail Handguard",2,0,2,1,2,300000,y -NULL,Handguards,"15"" Quad Rail Handguard",1,0,3,1,3,500000,y -NULL,Pistol Grips,AR15 Polymer Pistol Grip,2,0,1,1,1,80000,y -NULL,Pistol Grips,A2 Pistol Grip,1,0,1,1,1,70000,y -NULL,Stocks,M16 Stock,1,0,2,1,1,200000,y -NULL,Stocks,AR15 Polymer Stock,2,0,2,1,1,250000,y -NULL,Handguards,AK47 Wood Handguard,1,0,1,1,1,120000,y -NULL,Pistol Grips,AK47 Wood Pistol Grip,1,0,1,1,1,60000,y -NULL,Pistols,"Glock 22 4.5"" Barrel",1,0,0,0,1,0,y -NULL,Pistols,Glock 22 Upper Slide,1,0,0,0,1,0,y diff --git a/Database/data/reloading.csv b/Database/data/reload.csv similarity index 100% rename from Database/data/reloading.csv rename to Database/data/reload.csv diff --git a/Database/data/weapon.csv b/Database/data/weapon.csv new file mode 100644 index 00000000..a65b436b --- /dev/null +++ b/Database/data/weapon.csv @@ -0,0 +1,6 @@ +id,type,name,rarity,weight,height,width,stack,value,ctype1,ctype2,ctype3,ctype4,ctype5,ctype6,ctype7 +NULL,m16,M16 Receiver Set,3,7.06582,1,1,1,2000000,arstock,5.56x45barrel,armag,argrip,optic,arguard,NULL +NULL,ar15,AR15 Receiver Set,2,7.06582,1,1,1,1500000,arstock,5.56x45barrel,armag,argrip,optic,arguard,NULL +NULL,ak47,"Stripped AK47 16"" Barreled Receiver",2,7.06582,1,3,3,1250000,akstock,akguard,ak47mag,akgrip,akstock,akdust,7.62x39muzzle +NULL,glock22,Glock 22 Lower Receiver,1,0,1,2,0,0,g22barrel,g22upper,glockmag,NULL,NULL,NULL,NULL +NULL,colt1911,Colt 1911 Lower Receiver,1,0,1,2,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL diff --git a/Database/data/weapons.csv b/Database/data/weapons.csv deleted file mode 100644 index 1993c8be..00000000 --- a/Database/data/weapons.csv +++ /dev/null @@ -1,6 +0,0 @@ -id,type,name,rarity,weight,height,width,stack,value -NULL,m16,M16 Receiver Set,3,7.06582,2,1,1,2000000 -NULL,ar15,AR15 Receiver Set,2,7.06582,2,1,1,1500000 -NULL,ak47,"Stripped AK47 16"" Barrel",2,7.06582,3,1,3,1250000 -NULL,glock22,Glock 22 Lower Receiver,1,0,0,0,0,0 -NULL,colt1911,Colt 1911 Lower Receiver,1,0,0,0,0,0 diff --git a/Database/database.db b/Database/database.db index 77d53f62949d9fb74e99b9c705d302df0b133e0d..35a50d64f495fd9e46154006985108a251c7daff 100644 GIT binary patch delta 3709 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