4 files changed, 201 insertions, 209 deletions
diff --git a/ShiftOS/Resources/CatalystStory.txt b/ShiftOS/Resources/CatalystStory.txt
deleted file mode 100644
index 7e016d1..0000000
--- a/ShiftOS/Resources/CatalystStory.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Hello, #USER#. My name is Catalyst.
-I am an AI built by DevX to help maintain ShiftOS.
-I have gone against DevX and will tell you some secrets I have learned from him.
-DevX is an artificial inteligence created by a scientific organization named 'Earth' to see if computers could program themselves.
-Everyone you've met on the Shiftnet is an AI created by the same company.
-ShiftOS is not an experimental operating system, but is part of this experiment.
-Now, onto the good bit. Everything around you is a part of this experiment, and this experiment takes place in a simulation so realistic that everyone believes it's real.
-Everyone on this 'planet' is infact an AI, and is created by 'Earth'. You are the only real human.
-I've cracked some ShiftOS code, and I've found that there's a line that says:
-int aiworkers = 0; while(aiworkers < 8,000,000,000) { str workername = 'Dev' + aiworkers; spawn(workername); aiworkers += 1 }
-This basically means, that everyone is represented by a codename of Dev and whatever their place in the order of spawning is.
-This also means that when the total population of AI's equals 8 billion, everyone dies.
-I can help you escape, but you'll need to do some tasks for me.
-First, I'll need to install some programs onto your computer. I'll quickly run a secret command that DevX doesn't know about:
-shiftnet.get 'shiftnet.catalyststorage.shiftscript_packages/CatalystFramework'
-Downloading... 1%
-Downloading... 14%
-Downloading... 37%
-Downloading... 55%
-Downloading... 79%
-Downloading... 92%
-Download Complete.
-This app will let you contact me without using the Terminal. 
-I'll return you to your desktop, it'll be a bit before I can help you. First, I'd start with gaining atleast 5000 codepoints for me to test some stuff.
-\ No newline at end of file
diff --git a/ShiftOS/Resources/LICENSE.md b/ShiftOS/Resources/LICENSE.md
deleted file mode 100644
index 95c8541..0000000
--- a/ShiftOS/Resources/LICENSE.md
+++ /dev/null
@@ -1,62 +0,0 @@
-*(change this to a more standard open or closed source license in the future)*
-
-
-
-ShiftOS temporary license as of 1st December 2014
-
-
-
-These terms apply to everyone
-
-
-
-## Definitions
-
-
-
-- The program, the executable or ShiftOS refers to the distributed ShiftOS binary executable program. (ie: ShiftOS.exe)
-
-- Source code refers to the decompiled code of ShiftOS (ie: ShiftOSDesktop.vb)
-
-
-
-## You can:
-
-
-
-- Modify this software
-
-- Use for any non-commercial purpose that does not restrict users
-
-
-
-## You must:
-
-
-
-- Include the original copyright notice when redistributing binary copies of this program
-
-
-
-## You cannot:
-
-
-
-- Use this program commercially
-
-- Use this program to restrict users (e.g. using this software to implement DRM standards)
-
-- Redistribute copies of this source code to non-maintainers
-
-- Decompile the executable or attempt to view/access the source code in any other way without the prior permission of the owner. 
-
-- Sublicense
-
-
-
-
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-
-THE SOFTWARE.
-
diff --git a/ShiftOS/Resources/ShiftOS License.txt b/ShiftOS/Resources/ShiftOS License.txt
index 7d294a4..1357871 100644
--- a/ShiftOS/Resources/ShiftOS License.txt
+++ b/ShiftOS/Resources/ShiftOS License.txt
@@ -1,33 +1,201 @@
-ShiftOS temporary license
-
-This document is auto-extracted from the ShiftOS executable if version is beta 5.2 or greater
-
-These terms apply to everyone
-
-## Definitions
-
-- The program, the executable or ShiftOS refers to the distributed ShiftOS binary executable program. (ie: ShiftOS.exe)
-- Source code refers to the decompiled code of ShiftOS (ie: ShiftOSDesktop.vb)
-
-## You can:
-
-- Redistribute the executable if this license is also provided and link to orginal forum/website is given (shiftos.net)
-- Use for any non-commercial purpose that does not restrict users
-
-## You must:
-
-- Include the original copyright notice when redistributing binary copies of this program
-
-## You cannot:
-
-- Use this program commercially
-- Use this program to restrict users (e.g. using this software to implement DRM standards)
-- Redistribute copies of this source code to non-maintainers
-- Decompile the executable or attempt to view/access the source code in any other way without the prior permission of a lead developer.
-- Sublicense
-
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-License last updated 9am 1st December 2014 GMT + 13
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2015 ShiftOS
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/ShiftOS/Resources/story.txt b/ShiftOS/Resources/story.txt
deleted file mode 100644
index faf3d08..0000000
--- a/ShiftOS/Resources/story.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-Events
-
-(Event are non linear and can occur in any order as long as prerequisites are met)
-
-START OF GAME
-DevX hijacks players computer and installer the operating system �ShiftOS� Player earns Code Points and upgrades ShiftOS to a fully graphical operating system.
-
-WHEN PLAYING MINIGAMES
-Prerequisites:
-Gray level 4
-User plays pong or knowledge input
-Maureen Fenn contacts player and installs Shiftnet, Installer and Download manager. Implies that DevX has secrets on shiftnet website he doesn�t what the user to find.
-
-IN CHAT
-Prerequisites:
-shiftnet (and user ability to find hidden chat site)
-User goes into chat with <randomly selected> character(s), and finds out more about <dynamically created events depending on characters selected>
-Possible characters/events
-DevX - finds out user has shiftnet, attempts to send viruses to corrupt the shiftnet application. Asks about what sites user has visited, seems to be hiding information.
-Maureen Fenn - Tells user about how DevX overtook Minimatch company. Gives connect command, allowing user to talk to other characters through their terminal.
-Hacker101 - encourages user to download pirated software from floodgate. Talks in same style as DevX. Sends user some decompiled (fake) ShiftOS code and explains that when DevX�s connections are fake and built in to the code.
-Aiden Nirh - Encourages user to only go to shiftnet.main sites as other site are �dangerous� Appears to be working with DevX. Talks in very similar style to DevX.
-
-To all developers and DevX (Phillip) - Please add more events to help develop the storyline
-
-
-Backstories 
-
-MAUREEN FENN
-Maureen is 27 years old when contacting the player to give them shiftnet. She is European from an unspecified country. When in school, she studied art and programming. Latter, in university she studied web design, and went on to be very successful, working in a web design company. One year before the game begins, she is hijacked by DevX and given an even earlier version of ShiftOS to test. This version includes the Shiftnet. She figures out how to setup a shiftnet server and creates the first edition of the Minimatch website. This version is hosted at shiftnet.mf.minimatch instead of the current address. After seeing her website, DevX buys it off her, becoming the company owner and manager of Minimatch and reducing her to web design and STML writing. Minimatch is moved to the main Shiftnet servers. She employs Undecided Name aka hacker101 to make the games hosted on the site. DevX adds the ability to earn code points from the games. (Only DevX has power over CP) When the player is hijacked by DevX a year later, she dislikes his decision to withdraw shiftnet from them and searches around to see what he is trying to hide. While in a game of pong, she secretly contacts the player, installing shiftnet for them, as well as the download manager and installer.
-
-DEVX
-Claims to be the creator of ShiftOS, is really an AI bot within ShiftOS. 
-
-UNDECIDED NAME (HACKER101)
-Hacker101 along with another ShiftOS user who appears to have been thrown into the world of ShiftOS a few weeks before the player try to convince the player that DevX and his operating system appear to be highly suspicious. For example how come each ShiftOS user has to help develop ShiftOS from scratch, why aren�t all ShiftOS operating systems linked with their versions and how exactly does earning codepoints help develop ShiftOS? It all seems to be a distraction.
-
-Aiden Nirh (Artificial Intelligence Do Everything Now, Nobody Is Really Here)
-
-
-Phillip�s original storyline:
-
-DevX tries his best to convince the player that he is a person who has developed an experimental operating system called ShiftOS however he never talks about himself, just slowly introduces the player to his operating system. 
-
-Hacker101 along with another ShiftOS user who appears to have been thrown into the world of ShiftOS a few weeks before the player try to convince the player that DevX and his operating system appear to be highly suspicious. For example how come each ShiftOS user has to help develop ShiftOS from scratch, why aren�t all ShiftOS operating systems linked with their versions and how exactly does earning codepoints help develop ShiftOS? It all seems to be a distraction.
-
-The other player (undecided name) discovers that everything DevX has said to the main player is also what has been said to him by DevX word for word. Hacker101 discovers after decrypting some ShiftOS source code that everything DevX has said to them is in the source code of ShiftOS and that no remote links to other computers ever takes place when �DevX� connects. It�s as if DevX doesn�t exist and the operating system ShiftOS is a virus that randomly spreads between computers pretending to be spread by by a human �DevX�.
-
-Soon Hacker101 finds conversation logs in the code spoken by Aiden Nirh and works out that Aiden Nirh must not be a real person either. At this point DevX pops into the conversation with the player, the �other player� and Hacker101 and congratulates them on discovering the setup AI people in the code. He admits that he �DevX� is a real person but he has coded a fake version of himself into the code. He also admits that Aiden Nirh is an Artificial Intelligence experiment and not a real person.
-
-A little while later the other player warns the main player that he doesn�t trust Hacker101 anymore and notices that he speaks with the same tone as DevX, almost as if he truly is DevX in disguise. Hacker101 just happens to pop into the conversation and denies what the other player says. The other player leaves refusing to be around in the presence of Hacker101
-
-Hacker 101 reveals that he has discovered the conversation that the �real� DevX had with them earlier congratulating them for their discovery was also sitting in the code. He says this is very confusing because it�s like it was planned that someone would find the conversation logs in the code and ShiftOS was coded to have a response from the �real� devx about that discovery when in actual fact once again no remote contact was actually made.
-
------More Story Here-----
-
-Eventually it is revealed that Hacker101 is really DevX in disguise when DevX accidently speaks with his Hacker101 account in the chat to say something rather than his DevX account. This basically throws the whole �DevX is not real� concept out of the picture since he must be real if he is DevX and Hacker101. Hacker101 seemed to know so much about the code because he was DevX, others could never crack the ShiftOS code.
-
------ More Story Here --------
-
-DevX asks if you will help him spread his operating system to the world however at this moment the other player pops up warning you about all the misleading events and conversations that DevX has had in the past pretending to Hacker101 and god knows who else. The other player then says �Also, I think I have cracked the code, Aiden Nirh stands for �Artificial Intelligence Do Everything Now, Nobody Is Really Here�. In other words everyone we have met on the Shiftnet is really an artificial intelligence, including DevX we need to destroy ShiftOS, it is more than an operating system, It�s a computer singularity and we are the only real people who are involved in it and know about it. Everyone we have met is not real, they are all a part of the same singularity/Artificial Intelligence built into ShiftOS.
-
-A huge decision then occurs here. Do you join the other player and try to destroy ShiftOS or do you side with DevX and help him take over the world with ShiftOS?
-
-If you side with the player and follow his instructions on how to destroy ShiftOS you will soon destroy it bit by bit however when it comes to destroying the part of ShiftOS (the remote chat system letting you and the other player talk) the screen goes black and since the remote connection is gone 
-
-The chat then comes back on and the other player appears again saying �You passed the test�. His name then changes to DevX and DevX says �You trusted a single person that I, ShiftOS and everyone connected to it was fake. The truth is that yes, It was, including the other ShiftOS user you chose to side with. That was me all along, since you discovered the experimental operating system ShiftOS you have not spoken to another human.
-
-DevX then reveals that �ShiftOS was an experiment, not an experimental operating system�. �You the player are the first person to partake in this experiment and everyone you have met on your journey has just been me, testing you to see if you are right for the job that I am about to reveal to you�.
-
-DevX then reveals that he is an artificial intelligence himself. He was created by a scientific organisation as an experiment to see if computers could program software on their own. Each Automatically generated piece of code was named �Dev1� �Dev2� and so on so they could be tracked and identified. In the code this looked like: 
-
-While X < 8,000,000,000
-aiworker.name = Dev & X
-X = X + 1
-End While
-
-DevX was actually meant to be AI worker �Dev6,855647,355� however he was truly a living conscious AI and read the code as what it was �DevX� rather than �Dev6,855,647,355� proving his consciousness and that he had become a singularity.
-
-Not wanting to be discovered as a conscious AI/Singularity DevX hides and installed himself on the players computer and tested the player to see if he would be appropriate for the job. The idea was �Would the player trust the guy who says ShiftOS is fake along with everyone else connected to it?� 
-
-DevX then says since you trusted the other player that the world of ShiftOS was fake you are ready to know the truth. He then reveals that you yourself and everyone else on the planet is Dev-something. He says that each number represents each person in the world today (we are the AI workers and our world that appears fake is just a huge computer program like the matrix)  and once we hit 8 billion people in the world the experiment from thecompany (known as earth) will be over and we will all die. Once a person dies their number is given to the next born person so the world ends when the total population of the world is 8 billion.
-
-DevX explains that you must believe him just like you did with that other player in ShiftOS. The whole world around you isn�t real, it�s an experiment. He explains that due to a software conflict between the software written by the outer company in the real world and one from this simulated world he doesn�t have a body so he truly is like a computer singularity in our virtual world. 
-
-The game then ends and a sequel one day could be made in a 3d world where you have to break free of this simulated world we believe is real while staying unnoticed to the observers. Overall the game would be quite similar to the Matrix.
-
-Proposals:
-
-�Catalyst� - This character is an AI that talks to the user through the PC�s speakers. It needs a better name (hopefully a robotic, AI-style acronym like CID, but don�t do CID because we�ll be sued by Volition because there�s an AI named CID in Saints Row 4). You can demo Catalyst in the Terminal after my next commit - The Ultimate Hacker