diff --git a/assets/sfx/weapons/hg-dbl-beretta-m9/unload_0.wav b/assets/sfx/weapons/hg-dbl-beretta-m9/unload.wav similarity index 100% rename from assets/sfx/weapons/hg-dbl-beretta-m9/unload_0.wav rename to assets/sfx/weapons/hg-dbl-beretta-m9/unload.wav diff --git a/assets/sfx/weapons/hg-dbl-beretta-m9/unload_1.wav b/assets/sfx/weapons/hg-dbl-beretta-m9/unload_1.wav deleted file mode 100644 index 9ca0f8b..0000000 Binary files a/assets/sfx/weapons/hg-dbl-beretta-m9/unload_1.wav and /dev/null differ diff --git a/assets/sfx/weapons/rifle-colt-m4a1/clipin_0.wav b/assets/sfx/weapons/rifle-colt-m4a1/clipin_0.wav new file mode 100644 index 0000000..375b05a Binary files /dev/null and b/assets/sfx/weapons/rifle-colt-m4a1/clipin_0.wav differ diff --git a/assets/sfx/weapons/rifle-colt-m4a1/clipout_0.wav b/assets/sfx/weapons/rifle-colt-m4a1/clipout_0.wav new file mode 100644 index 0000000..b83ce62 Binary files /dev/null and b/assets/sfx/weapons/rifle-colt-m4a1/clipout_0.wav differ diff --git a/assets/sfx/weapons/rifle-colt-m4a1/deploy.wav b/assets/sfx/weapons/rifle-colt-m4a1/deploy.wav new file mode 100644 index 0000000..c05980d Binary files /dev/null and b/assets/sfx/weapons/rifle-colt-m4a1/deploy.wav differ diff --git a/assets/sfx/weapons/rifle-colt-m4a1/slide_0.wav b/assets/sfx/weapons/rifle-colt-m4a1/slide_0.wav new file mode 100644 index 0000000..7dbbad7 Binary files /dev/null and b/assets/sfx/weapons/rifle-colt-m4a1/slide_0.wav differ diff --git a/assets/sfx/weapons/rifle-colt-m4a1/unload.wav b/assets/sfx/weapons/rifle-colt-m4a1/unload.wav new file mode 100644 index 0000000..b38908c Binary files /dev/null and b/assets/sfx/weapons/rifle-colt-m4a1/unload.wav differ diff --git a/assets/sfx/weapons/rifle-kalash-ak47/unload_0.wav b/assets/sfx/weapons/rifle-kalash-ak47/unload.wav similarity index 100% rename from assets/sfx/weapons/rifle-kalash-ak47/unload_0.wav rename to assets/sfx/weapons/rifle-kalash-ak47/unload.wav diff --git a/assets/sfx/weapons/sg-ithaca-m37/unload_0.wav b/assets/sfx/weapons/sg-ithaca-m37/unload.wav similarity index 100% rename from assets/sfx/weapons/sg-ithaca-m37/unload_0.wav rename to assets/sfx/weapons/sg-ithaca-m37/unload.wav diff --git a/assets/sfx/weapons/smg-hk-mp5a3/unload_0.wav b/assets/sfx/weapons/smg-hk-mp5a3/unload.wav similarity index 100% rename from assets/sfx/weapons/smg-hk-mp5a3/unload_0.wav rename to assets/sfx/weapons/smg-hk-mp5a3/unload.wav diff --git a/assets/sfx/weapons/smg-hk-mp5k/clipin_0.wav b/assets/sfx/weapons/smg-hk-mp5k/clipin_0.wav index 15fe45d..1d573d7 100644 Binary files a/assets/sfx/weapons/smg-hk-mp5k/clipin_0.wav and b/assets/sfx/weapons/smg-hk-mp5k/clipin_0.wav differ diff --git a/assets/sfx/weapons/smg-hk-mp5k/clipout_0.wav b/assets/sfx/weapons/smg-hk-mp5k/clipout_0.wav index 631c432..c6b7c0d 100644 Binary files a/assets/sfx/weapons/smg-hk-mp5k/clipout_0.wav and b/assets/sfx/weapons/smg-hk-mp5k/clipout_0.wav differ diff --git a/assets/sfx/weapons/smg-hk-mp5k/deploy.wav b/assets/sfx/weapons/smg-hk-mp5k/deploy.wav new file mode 100644 index 0000000..182c639 Binary files /dev/null and b/assets/sfx/weapons/smg-hk-mp5k/deploy.wav differ diff --git a/assets/sfx/weapons/smg-hk-mp5k/slide_0.wav b/assets/sfx/weapons/smg-hk-mp5k/slide_0.wav index 2725522..182c639 100644 Binary files a/assets/sfx/weapons/smg-hk-mp5k/slide_0.wav and b/assets/sfx/weapons/smg-hk-mp5k/slide_0.wav differ diff --git a/assets/sfx/weapons/smg-hk-mp5k/unload.wav b/assets/sfx/weapons/smg-hk-mp5k/unload.wav new file mode 100644 index 0000000..a04b5a2 Binary files /dev/null and b/assets/sfx/weapons/smg-hk-mp5k/unload.wav differ diff --git a/assets/sfx/weapons/smg-hk-mp7/clipin_0.wav b/assets/sfx/weapons/smg-hk-mp7/clipin_0.wav new file mode 100644 index 0000000..15fe45d Binary files /dev/null and b/assets/sfx/weapons/smg-hk-mp7/clipin_0.wav differ diff --git a/assets/sfx/weapons/smg-hk-mp7/clipout_0.wav b/assets/sfx/weapons/smg-hk-mp7/clipout_0.wav new file mode 100644 index 0000000..631c432 Binary files /dev/null and b/assets/sfx/weapons/smg-hk-mp7/clipout_0.wav differ diff --git a/assets/sfx/weapons/smg-hk-mp7/slide_0.wav b/assets/sfx/weapons/smg-hk-mp7/slide_0.wav new file mode 100644 index 0000000..2725522 Binary files /dev/null and b/assets/sfx/weapons/smg-hk-mp7/slide_0.wav differ diff --git a/assets/sfx/weapons/smg-hk-mp5k/unload_0.wav b/assets/sfx/weapons/smg-hk-mp7/unload.wav similarity index 100% rename from assets/sfx/weapons/smg-hk-mp5k/unload_0.wav rename to assets/sfx/weapons/smg-hk-mp7/unload.wav diff --git a/docs/reference/files/config-game.ini b/docs/reference/files/config-game.ini index 8cc5cb4..04b76a6 100644 --- a/docs/reference/files/config-game.ini +++ b/docs/reference/files/config-game.ini @@ -1,60 +1,62 @@ -[Video] -Width=320 -Height=240 -MaxFps=30 -[Joystick.0.ControlMapping] -Affirm=11 -Negate=10 -Action0=1 -Action1=0 -Action2=4 -Action3=3 -Action4=6 -Action5=7 -Action6=8 -Action7=9 -Action8=13 -Action9=14 -[Joystick.0] -DeviceID=0 -AxisThreshold=8000 -[Keyboard.0.ControlMapping] -Up=Up -Right=Right -Down=Down -Left=Left -Affirm=Return -Negate=Backspace -Action0=A -Action1=S -Action2=D -Action3=F -Action4=Z -Action5=X -Action6=C -Action7=V -Action8=W -Action9=E -[MIDIInput.0.ControlMapping] -Up="A#5" -Right=C6 -Down=B5 -Left=A5 -Affirm=F5 -Negate=E5 -Action0=C4 -Action1="C#4" -Action2=D4 -Action3="D#4" -Action4=E4 -Action5=F4 -Action6="F#4" -Action7=G4 -Action8="G#4" -Action9=A4 -[MIDIInput.0] -Channel=0 -DeviceID=0 -[Network] -Username=Player -Interval=200 +[Video] +Width=320 +Height=240 +MaxFps=30 +[Joystick.0.ControlMapping] +Affirm=11 +Negate=10 +Action0=1 +Action1=0 +Action2=4 +Action3=3 +Action4=6 +Action5=7 +Action6=8 +Action7=9 +Action8=13 +Action9=14 +[Joystick.0] +DeviceID=0 +AxisThreshold=8000 +[Keyboard.0.ControlMapping] +Up=Up +Right=Right +Down=Down +Left=Left +Affirm=Return +Negate=Backspace +Action0=A +Action1=S +Action2=D +Action3=F +Action4=Z +Action5=X +Action6=C +Action7=V +Action8=W +Action9=E +[MIDIInput.0.ControlMapping] +Up="A#5" +Right=C6 +Down=B5 +Left=A5 +Affirm=F5 +Negate=E5 +Action0=C4 +Action1="C#4" +Action2=D4 +Action3="D#4" +Action4=E4 +Action5=F4 +Action6="F#4" +Action7=G4 +Action8="G#4" +Action9=A4 +[MIDIInput.0] +Channel=0 +DeviceID=0 +[Network] +Username=Player +PacketIntervalMs=200 +MaxReconnectRetries=3 +ReconnectIntervalSeconds=3 diff --git a/docs/reference/files/config-server.ini b/docs/reference/files/config-server.ini index eb171e1..d563d3f 100644 --- a/docs/reference/files/config-server.ini +++ b/docs/reference/files/config-server.ini @@ -2,3 +2,5 @@ Name=Izanagi Motd= Port=42069 +[Database] +Path=db.sqlite diff --git a/docs/weapons.md b/docs/weapons.md index 48aabc5..80a772b 100644 --- a/docs/weapons.md +++ b/docs/weapons.md @@ -1,15 +1,11 @@ -# Combat knife -# Oriental sword (Katana) -# Twin pistols (Beretta M9) - - Ammo: 9x19mm Parabellum (15x x 2pcs) - - Muzzle velocity: 381 m/s -# Shotgun (Ithaca) - - Ammo: 12 gauge 2.75" shells (8x) -# Submachine gun (MP5A3) - - Ammo: 9x19mm Parabellum (30x) - - Rate of fire: 800 round/min cyclic - - Muzzle velocity: 400 m/s -# Assault rifle (M4A1) - - Rate of fire: 700–950 round/min cyclic - - Ammo: 5.56x45mm NATO - - Muzzle velocity: 910 m/s +| Weapon | Model | Ammo | Bullet count (per unit) | Rate of fire (rounds/min) | Muzzle velocity (m/s) | +|-----------------|------------------|-----------------------|------------------------:|------------------------------------------:|----------------------:| +| Combat knife | Combat knife | - | | - | - | +| Oriental sword | Katana | - | | - | - | +| Twin pistols | Beretta M9 | 9x19mm Parabellum | 15 | - | 381 | +| Shotgun | Ithaca Model 37 | 12 gauge 2.75" shells | 8 | - | - | +| Sub-machine gun | H&K MP5A3 | 9x19mm Parabellum | 30 | 800 (cyclic) | 400 | +| Sub-machine gun | H&K MP5K | 9x19mm Parabellum | 30 | 900 (cyclic) | 375 | +| Sub-machine gun | H&K MP7 | HK 4.6x30mm | 30 | 950 (cyclic) | 735 | +| Assault rifle | Kalashnikov AK47 | 7.62x39mm | 30 | 40 (semi-auto), 100 (burst), 600 (cyclic) | 715 | +| Assault rifle | Colt M4A1 | 5.56x45mm NATO | 30 | 800 (cyclic) | 910 |