Skip to content

Commit

Permalink
updateezzzz
Browse files Browse the repository at this point in the history
  • Loading branch information
stonedDiscord committed Jan 8, 2016
1 parent b2c227d commit 2eaae8a
Show file tree
Hide file tree
Showing 11 changed files with 248 additions and 146 deletions.
22 changes: 9 additions & 13 deletions AOprivateServer.pbp
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,20 @@
<section name="data">
<explorer view="" pattern="8"/>
<log show="1"/>
<lastopen date="2016-01-06 04:58" user="Sven" host="SPC"/>
<lastopen date="2016-01-08 05:08" user="Sven" host="SPC"/>
</section>
<section name="files">
<file name="checker.pb">
<config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
<fingerprint md5="8527051c5c140a934fa2a44be3766a58"/>
</file>
<file name="Common.pb">
<config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
<fingerprint md5="f394641517ae50b970adf907d0d5ae67"/>
</file>
<file name="gui.pb">
<config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
<fingerprint md5="60d68b5f4284b3e9650894150302529d"/>
<fingerprint md5="70d32e9589ef4913ccdf5ad1d00500a9"/>
</file>
<file name="main.pb">
<config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
<fingerprint md5="7c7e0d2de5c5a210ec0fb598d7031a07"/>
<fingerprint md5="81f5d21faf6ae858a7d90c194b38b031"/>
</file>
<file name="server_shared.pb">
<config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
Expand All @@ -34,16 +30,16 @@
<section name="targets">
<target name="serverD" enabled="1" default="1">
<inputfile value="main.pb"/>
<outputfile value="build/serverD.exe"/>
<outputfile value="build\serverD.exe"/>
<compiler version="PureBasic 5.31 (Windows - x86)"/>
<executable value="build\serverD.exe"/>
<options thread="1" xpskin="1" debug="1"/>
<purifier enable="1" granularity="1,1,1,1"/>
<icon enable="1">../dolan.ico</icon>
<format exe="default" cpu="2"/>
<debugger custom="1" type="ide"/>
<compilecount enable="1" value="940"/>
<buildcount enable="1" value="120"/>
<compilecount enable="1" value="951"/>
<buildcount enable="1" value="121"/>
<versioninfo enable="1">
<field0 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>
<field1 value="2,0,0,0"/>
Expand All @@ -70,15 +66,15 @@
</target>
<target name="serverDco" enabled="1" default="0">
<inputfile value="main.pb"/>
<outputfile value="build/serverDco.exe"/>
<outputfile value="build\serverDco.exe"/>
<compiler version="PureBasic 5.31 (Windows - x86)"/>
<executable value="build\serverDco.exe"/>
<options thread="1"/>
<icon enable="0">owner.ico</icon>
<format exe="console" cpu="0"/>
<debugger custom="1" type="ide"/>
<compilecount enable="1" value="940"/>
<buildcount enable="1" value="120"/>
<compilecount enable="1" value="951"/>
<buildcount enable="1" value="121"/>
<versioninfo enable="1">
<field0 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>
<field1 value="2,0,0,0"/>
Expand Down
57 changes: 21 additions & 36 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* reworked area system
* same char can be used independently in different areas
* looping music
* added a simple replayer

### minimal setup (console version)
> OS
Expand All @@ -21,7 +22,7 @@
> HDD
> 150 KB + logs
### pro setu
### pro setup
> OS
> Windows XP/Linux Kernel 2.7
Expand Down Expand Up @@ -125,6 +126,9 @@
- /reload
- reload the kurwalist,wodka files,etc.

- /loadreplay
- loads a replay, control it with mainchat

- /lock 2
- keep other kurwa out of your current wodka drinking contest

Expand All @@ -137,41 +141,22 @@
- /unban 12.34.56.78
- unban this kurwa

** :warning: Mods can only be kicked by admins**
**:warning:Mods can only be kicked by admins**

## FAQ
Q: Will this change my kurwa files?
A: only poker.ini
Q: Are there any kurwas/kurwa code?
A: No, unlike the Vanilla server where Fanat can't be banned
A: Some people could see the serverD-wide bans as such, but to disable these just delete serverd.txt and reload
Q: Then why is the result 3/52 on kurwaTotal?
A: False positives. Google the virus names and you'll see.
Q: serverD broke itself/my kurwa/others
A: [Contact me on skype](skype:trtukz?chat)
Q: I have another question
A: [Contact me on skype](skype:trtukz?chat)
Q: kurwa?
A: :joy: :joy: :joy:
- Q: Will this change my kurwa files?
- A: only poker.ini
- Q: Are there any kurwas/kurwa code?
- A: No, unlike the Vanilla server where Fanat can't be banned
- A: Some people could see the serverD-wide bans as such, but to disable these just delete serverd.txt and reload
- Q: Then why is the result 3/52 on kurwaTotal?
- A: False positives. Google the virus names and you'll see.
- Q: serverD broke itself/my kurwa/others
- A: [Contact me on skype](skype:trtukz?chat)
- Q: I have another question
- A: [Contact me on skype](skype:trtukz?chat)
- Q: kurwa?
- A: :joy: :joy: :joy:

## Info
Rooms are now configured VNO-style, file name /base/scene/[AAOPublic2]/areas.ini
Example
`[Areas]`
`number = 2`
`1 = birthday`
`2 = gs4`
`[filename]`
`1 = birthday`
`2 = gs4`

Music list entries with a > as first character can be used as shortcuts for areanames
Example:
`>default`

Music list entries following a star * and the track length in seconds can be looped
Example:
`Objection (AA).mp3*73`
You also need to activate looping music through the LoopMusic switch in poker.ini

## Copyright &copy; sD 2015
## Configuration
See the comments in the files at this repository
78 changes: 70 additions & 8 deletions base/musiclist.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,71 @@
>birthday
>gs4
>cafeteria
X-Files Theme.mp3*203
Pylons.mp3*226
furry.mp3*108
Still Dre.mp3*258
>Default
>Alternative
>Party
~stop.mp3*0
--- AA ---
Annonce The Truth(AA).mp3*80
OBJECTION (AA).mp3*73
Prelude(AA).mp3*78
PURSUIT(AA).mp3*96
PURSUIT(AA) - variation.mp3*90
Questioning(AA-allergo).mp3*127
Questioning(AA-normal).mp3*105
Trial(AA).mp3*109
Suspence(AA).mp3*93
--- AJ ---
Annonce The Truth(AJ).mp3*60
OBJECTIOM(AJ).mp3*96
Annonce The Truth(JFA).mp3*98
Prelude(AJ).mp3*71
PURSUIT(AJ).mp3*109
Questioning AJ (Allegro).mp3*103
Questioning AJ (Moderato).mp3*80
Trial(AJ).mp3*126
--- JFA ---
OBJECTION (JFA).mp3*94
PURSUIT(JFA).mp3*82
PURSUIT(JFA) - variation.mp3*76
Questioning JFA (Allegro).mp3*103
Questioning JFA (Moderato).mp3*90
--- Miles ---
114 Pursuit(Miles).mp3*197
Annonce The Truth(Miles).mp3*153
Great Revival ~ Miles Edgeworth.mp3*90
OBJECTION(Miles).mp3*176
Trial(Miles).mp3*276
--- T&T ---
Annonce The Truth(T&T).mp3*126
OBJECTION (T&T).mp3*119
PURSUIT(T&T) - variation.mp3*114
PURSUIT(T&T).mp3*120
Questioning T&T (Allegro).mp3*160
Questioning T&T (Moderato).mp3*116
--- Godot ---
Godot - The Fragrance of Dark Coffee.mp3*148
--- Others ---
01_turnabout_courtroom_-_prologue.mp3*40
113 Confrontation ~ Presto 2009.mp3*187
Crises of Fate.mp3*144
Forgotten Legend.mp3*141
Great Revival ~ Franziska von Karma.mp3*86
Hotline of Fate.mp3*51
Interesting People.mp3*143
logic_and_trick.mp3*152
Luke Atmey ~ I Just Want Love.mp3*103
Mystery Skulls - Money.mp3*212
Noisy People.mp3*91
Others ~ Guilty love.mp3*99
Pursuit ~ I Want to Find the Truth(Orchestra).mp3*1804
Speak up, Pup!.mp3*167
The Great Truth Burglar.mp3*149
--- TWEWY ---
3DKH.mp3*289
Sin.mp3*122
Objection (AA).mp3*73
Trans.mp3*199
--- Ghost Trick ---
Ghost Trick - 4 Minutes Before Death.mp3*905
Ghost Trick - Countdown.mp3*464
Ghost Trick - The World of the Dead.mp3*686
--- MLP ---
OBJECTION(trixie).mp3*148
Super Trixie.mp3*148
2 changes: 2 additions & 0 deletions base/op.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#put IPs and HDs here which are automatically given moderator rights
127.0.0.1
10 changes: 5 additions & 5 deletions base/scene/AAOPublic2/areas.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[Areas]
number = 3
1 = birthday
2 = gs4
3 = cafeteria
1 = Default
2 = Alternative
3 = Party
[filename]
1 = birthday
1 = default
2 = gs4
3 = cafeteria
3 = birthday
46 changes: 17 additions & 29 deletions base/scene/AAOPublic2/init.ini
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
[Global]
EviNumber = 6
BackGround = birthday

EviNumber = 7
#how much evidence
BackGround = default
#default background if no areas
[chars]
number = 44
slots = -1
#how many chars are loaded
#slots = 300
#how many slots to show in charselect
0 = Discord
1 = Monokuma
1 = Miles
2 = Phoenix
3 = Gumshoe
4 = Hazama
4 = zettaslow
5 = Trixie
6 = Twilight
7 = Derpy
8 = Vinyl
9 = Discord
9 = Hawk
10 = Rainbow
11 = Atmey
12 = Armstrong
Expand Down Expand Up @@ -105,27 +108,6 @@ slots = -1
97 = Apollo
98 = zettaslow
99 = Hawk
100 = Rainbow
101 = Atmey
102 = Armstrong
103 = Gant
104 = Godot
105 = Adrian
106 = Marshall
107 = Apollo
108 = Layton
109 = Hawk
110 = Rainbow
111 = Atmey
112 = Armstrong
113 = Gant
114 = zetaslow
115 = Adrian
116 = Marshall
117 = Apollo
118 = Layton
119 = Hawk


[evi1]
type = 1
Expand Down Expand Up @@ -156,4 +138,10 @@ image= 5.gif
type = 1
name = Keycard
desc = Grants access to unlimited blackjack and hookers.
image= 6.gif
image= 6.gif
[evi7]
type = 2
#photo evidence
name = Autopsy
desc = agun.png
image= 2.png
14 changes: 12 additions & 2 deletions base/settings.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
[net]
public = 0
# show server on masterlist =
password =
#unused =
oppassword = leethax
port = 27015
#password to show the guard button =
port = 27016
#server port =
[server]
name = sD testing server
#servername for masterlist =
desc = it's vanilla$nu get a cookie for breaking the server in a NEW way$nno spam and shit
#masterlist description =
musicmode = 1
replaysave = 0
#musicmode - can be used in combination with char files to make only some characters able to change the music =
replaysave = 1
#save replays =
replayline = 400
#sets a limit on how many replay lines are saved =
case = AAOPublic2
#case folder =
Loading

0 comments on commit 2eaae8a

Please sign in to comment.