diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-07-31 16:17:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 16:17:05 -0500 |
| commit | ec1c95bdb33dd063880c4cb6c3c9c3cf5d0ed454 (patch) | |
| tree | 19e9217126837cac1ae3ab025b050bb3cfbda64b /base | |
| parent | 8ea01d4c3139e27e84091c0b24266d9fb50ddf38 (diff) | |
| parent | 36b5af3cb9ce8e5530c5bd9353a4e2f10da506b6 (diff) | |
Merge pull request #217 from AttorneyOnline/kfo-ao2
Final mega-merge with the Killing Fever Online client, along with other associated bugfixes and feature additions.
This commit is release-ready.
Diffstat (limited to 'base')
| -rw-r--r-- | base/background/gs4/defensedesk.png | bin | 6880 -> 0 bytes | |||
| -rw-r--r-- | base/background/gs4/prosecutiondesk.png | bin | 6551 -> 0 bytes | |||
| -rw-r--r-- | base/background/gs4/stand.png | bin | 2657 -> 0 bytes | |||
| -rw-r--r-- | base/config.ini | 10 | ||||
| -rw-r--r-- | base/misc/default/chatbox.png | bin | 0 -> 505 bytes | |||
| -rw-r--r-- | base/misc/default/config.ini | 59 | ||||
| -rw-r--r-- | base/misc/default/holdit.opus | bin | 0 -> 15238 bytes | |||
| -rw-r--r-- | base/misc/default/holdit_bubble.gif | bin | 0 -> 39003 bytes | |||
| -rw-r--r-- | base/misc/default/objection.opus | bin | 0 -> 15238 bytes | |||
| -rw-r--r-- | base/misc/default/objection_bubble.gif | bin | 0 -> 43029 bytes | |||
| -rw-r--r-- | base/misc/default/takethat.opus | bin | 0 -> 15238 bytes | |||
| -rw-r--r-- | base/misc/default/takethat_bubble.gif | bin | 0 -> 40634 bytes | |||
| -rw-r--r-- | base/sounds/general/adminhelp.ogg | bin | 17220 -> 0 bytes | |||
| -rw-r--r-- | base/sounds/general/case_announced.ogg | bin | 15790 -> 0 bytes | |||
| -rw-r--r-- | base/sounds/music/failed_login.opus | bin | 396160 -> 0 bytes | |||
| m--------- | base/themes | 0 |
16 files changed, 59 insertions, 10 deletions
diff --git a/base/background/gs4/defensedesk.png b/base/background/gs4/defensedesk.png Binary files differdeleted file mode 100644 index 00a3ffb6..00000000 --- a/base/background/gs4/defensedesk.png +++ /dev/null diff --git a/base/background/gs4/prosecutiondesk.png b/base/background/gs4/prosecutiondesk.png Binary files differdeleted file mode 100644 index 9f626733..00000000 --- a/base/background/gs4/prosecutiondesk.png +++ /dev/null diff --git a/base/background/gs4/stand.png b/base/background/gs4/stand.png Binary files differdeleted file mode 100644 index 3719e36a..00000000 --- a/base/background/gs4/stand.png +++ /dev/null diff --git a/base/config.ini b/base/config.ini deleted file mode 100644 index 1e8705fa..00000000 --- a/base/config.ini +++ /dev/null @@ -1,10 +0,0 @@ -theme = default
-blip_rate = 1
-blank_blip = false
-default_music = 50
-default_sfx = 50
-default_blip = 50
-discord = true
-ic_scroll_down = false
-; master = master.aceattorneyonline.com
-; ooc_name = Phoenix
\ No newline at end of file diff --git a/base/misc/default/chatbox.png b/base/misc/default/chatbox.png Binary files differnew file mode 100644 index 00000000..0c3bae1e --- /dev/null +++ b/base/misc/default/chatbox.png diff --git a/base/misc/default/config.ini b/base/misc/default/config.ini new file mode 100644 index 00000000..b3bf9a81 --- /dev/null +++ b/base/misc/default/config.ini @@ -0,0 +1,59 @@ +c0 = 255, 255, 255
+c0_name = White
+c0_talking = 1
+
+c1 = 0, 255, 0
+c1_name = Green
+c1_start = `
+c1_end = `
+c1_remove = 1
+c1_talking = 1
+
+c2 = 255, 0, 0
+c2_name = Red
+c2_start = ~
+c2_end = ~
+c2_remove = 1
+c2_talking = 1
+
+c3 = 255, 165, 0
+c3_name = Orange
+c3_start = |
+c3_end = |
+c3_remove = 1
+c3_talking = 0
+
+c4 = 45, 150, 255
+c4_name = Blue
+c4_start = (
+c4_end = )
+c4_remove = 0
+c4_talking = 0
+
+c5 = 255, 255, 0
+c5_name = Yellow
+c5_start = º
+c5_end = º
+c5_remove = 1
+c5_talking = 1
+
+c6 = 255, 192, 203
+c6_name = Pink
+c6_start = №
+c6_end = №
+c6_remove = 1
+c6_talking = 1
+
+c7 = 0, 255, 255
+c7_name = Cyan
+c7_start = √
+c7_end = √
+c7_remove = 1
+c7_talking = 1
+
+c8 = 187, 187, 187
+c8_name = Gray
+c8_start = [
+c8_end = ]
+c8_remove = 0
+c8_talking = 1
\ No newline at end of file diff --git a/base/misc/default/holdit.opus b/base/misc/default/holdit.opus Binary files differnew file mode 100644 index 00000000..a454be83 --- /dev/null +++ b/base/misc/default/holdit.opus diff --git a/base/misc/default/holdit_bubble.gif b/base/misc/default/holdit_bubble.gif Binary files differnew file mode 100644 index 00000000..536f8cd7 --- /dev/null +++ b/base/misc/default/holdit_bubble.gif diff --git a/base/misc/default/objection.opus b/base/misc/default/objection.opus Binary files differnew file mode 100644 index 00000000..7e15d05e --- /dev/null +++ b/base/misc/default/objection.opus diff --git a/base/misc/default/objection_bubble.gif b/base/misc/default/objection_bubble.gif Binary files differnew file mode 100644 index 00000000..22c2169b --- /dev/null +++ b/base/misc/default/objection_bubble.gif diff --git a/base/misc/default/takethat.opus b/base/misc/default/takethat.opus Binary files differnew file mode 100644 index 00000000..2f143e12 --- /dev/null +++ b/base/misc/default/takethat.opus diff --git a/base/misc/default/takethat_bubble.gif b/base/misc/default/takethat_bubble.gif Binary files differnew file mode 100644 index 00000000..795552a8 --- /dev/null +++ b/base/misc/default/takethat_bubble.gif diff --git a/base/sounds/general/adminhelp.ogg b/base/sounds/general/adminhelp.ogg Binary files differdeleted file mode 100644 index 704c0fd6..00000000 --- a/base/sounds/general/adminhelp.ogg +++ /dev/null diff --git a/base/sounds/general/case_announced.ogg b/base/sounds/general/case_announced.ogg Binary files differdeleted file mode 100644 index 1e9c3d4e..00000000 --- a/base/sounds/general/case_announced.ogg +++ /dev/null diff --git a/base/sounds/music/failed_login.opus b/base/sounds/music/failed_login.opus Binary files differdeleted file mode 100644 index 33532ee5..00000000 --- a/base/sounds/music/failed_login.opus +++ /dev/null diff --git a/base/themes b/base/themes -Subproject 6e1317ed93a9a4831047aa151c28742b1dd8afb +Subproject 8de30fc0fa0e1492a29dad0e839764ca44168cb |
