From e148123b4396f43c970aa1316f5f0004f9bb7e50 Mon Sep 17 00:00:00 2001 From: TheCoub Date: Mon, 5 Dec 2016 13:43:49 -0500 Subject: [PATCH 01/17] Renamed to the Two-Tap System and Added Deconstruct Renamed the controls to the two tap system. Added Deconstruct as a control. Removed directional specific controls from the master table in order to create uniformity with what was already there. --- ...m).md => Controls_(The_Two_Tap_System).md} | 60 ++++++------------- 1 file changed, 17 insertions(+), 43 deletions(-) rename wiki/{Controls_(The_Triple_Tap_System).md => Controls_(The_Two_Tap_System).md} (84%) diff --git a/wiki/Controls_(The_Triple_Tap_System).md b/wiki/Controls_(The_Two_Tap_System).md similarity index 84% rename from wiki/Controls_(The_Triple_Tap_System).md rename to wiki/Controls_(The_Two_Tap_System).md index b59e69e..eb29b7d 100644 --- a/wiki/Controls_(The_Triple_Tap_System).md +++ b/wiki/Controls_(The_Two_Tap_System).md @@ -1,6 +1,6 @@ -# Controls in And/Ore work on what we call "The Triple-Tap System." +# Controls in And/Ore work on what we call "The Double-Tap System." -The Triple-Tap System involves pressing a "mode" key which determines which mode you are in, and then a modifier key to change the exact actions. The various modes and their mode keys are: +The Two-Tap System involves pressing a "mode" key which determines which mode you are in, and then a modifier key to change the exact actions. The various modes and their mode keys are: @@ -16,7 +16,11 @@ The Triple-Tap System involves pressing a "mode" key which determines which mode - + + + + + @@ -73,28 +77,10 @@ Master Table: - - - - - - - + - - - - - - - - - - - - - + @@ -144,6 +130,12 @@ Master Table: + + + + + + @@ -229,28 +221,10 @@ Master Table: - - - - - - - - - - - - - - - - - - - + - + From c060091ced97f5c493ea93b3e362293dd382c700 Mon Sep 17 00:00:00 2001 From: TheCoub Date: Mon, 5 Dec 2016 13:53:33 -0500 Subject: [PATCH 02/17] Deleted Contributors page Deleted the Contributors page. it will be reworked and re-added in at a later date --- wiki/contributors.md | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 wiki/contributors.md diff --git a/wiki/contributors.md b/wiki/contributors.md deleted file mode 100644 index 2a78ddb..0000000 --- a/wiki/contributors.md +++ /dev/null @@ -1,33 +0,0 @@ -This is a list of people who have helped And/Ore. - -Client -====== -- [@halstedlarsson](https://github.com/halstedlarsson) -- [@JCharante](https://github.com/JCharante) -- [@thelonehamster](https://github.com/thelonehamster) - -Server -====== - -- [@JCharante](https://github.com/JCharante) -- [@halstedlarsson](https://github.com/halstedlarsson) - -Art -=== - -- [@Julian-B](https://github.com/Julian-B) - -Documentation -============= - -Reported Bugs -=========== -- [@JCharante](https://github.com/JCharante) -- [@halstedlarsson](https://github.com/halstedlarsson) -- [@Julian-B](https://github.com/Julian-B) -- [@TheCoub](https://github.com/TheCoub) -- [@wilSecord](https://github.com/wilSecord) -- [@mcdfinn](https://github.com/mcdfinn) -- [@thelonehamster](https://github.com/thelonehamster) -- [@Razerfish](https://github.com/Razerfish) -- [@Liham](https://github.com/Liham) From 8db7eb5cac4b188f253f49769ac2c1a9a1d2b3dd Mon Sep 17 00:00:00 2001 From: TheCoub Date: Thu, 8 Dec 2016 20:14:07 -0500 Subject: [PATCH 03/17] Changed to New format Added health, create a more usable summary of the uses, deleted the origins section. --- wiki/door.md | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/wiki/door.md b/wiki/door.md index 4181f57..5cbb479 100644 --- a/wiki/door.md +++ b/wiki/door.md @@ -5,25 +5,17 @@ Door * Build with: `b, 5, *` * Build Cost: `1000 Ore` * Ore Dropped on Destruction: `333 Ore` +* Health: `250` -#### Services Offered +#### Uses -You can use the Door once per turn. +The door is a high health building that will allow the owner and their friends to pass through, but not their enemies. -The owner or corp member can travels through the door. - -#### Owner Information - -The Door only allows the owner or corp members to pass through. - -The standing (Ally, Neutral, or Enemy) of the owner determines whether a player can pass through the door. - -#### Origin - -The Door is one of the original structures from v1.0. +More specifically, the member's of the owner's corp can pass through as well as the Allies of the owner, but not neutral or enemy players. Contributors ============ - Alexander Pape +- Ryan Courbron -##### Page last edited on 10/14/16 +##### Page last edited on 12/8/2016 (Version 1.5, THe Benovelant Bearded Dragon) From 337a3f1f7fedca678ce1e764a54f64785a2df0e6 Mon Sep 17 00:00:00 2001 From: TheCoub Date: Thu, 8 Dec 2016 20:20:31 -0500 Subject: [PATCH 04/17] Changed to the new format --- wiki/fences.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/wiki/fences.md b/wiki/fences.md index 31e6faa..7fa6e9a 100644 --- a/wiki/fences.md +++ b/wiki/fences.md @@ -4,11 +4,16 @@ Fence * Build with: `b, 1, *` * Build Cost: `30 Ore` * Ore Dropped on Destruction: `10 Ore` -#### Services Offered -Fences block any player from moving through or onto its location. -#### Origin -The Hospital is one of the original structures from v1.0. +* Health: '30' + +#### Uses + +Fences are a low cost building that can be used to create a low health wall. Players will often use fences to mark the edge of their territory. + + Contributors ============ - Graphyte -##### Page last edited on 10/07/16 +- Ryan Courbron + +##### Page last edited on 12/8/16 (Version 1.5, The Benovolent Bearded Dragon) From a2a24e4af065bace073196dd3f71b0683dc3c0a0 Mon Sep 17 00:00:00 2001 From: TheCoub Date: Thu, 8 Dec 2016 20:21:12 -0500 Subject: [PATCH 05/17] Fixed a typo --- wiki/door.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/door.md b/wiki/door.md index 5cbb479..81fa30b 100644 --- a/wiki/door.md +++ b/wiki/door.md @@ -18,4 +18,4 @@ Contributors - Alexander Pape - Ryan Courbron -##### Page last edited on 12/8/2016 (Version 1.5, THe Benovelant Bearded Dragon) +##### Page last edited on 12/8/2016 (Version 1.5, The Benovolent Bearded Dragon) From 84b74188f0f7dc3ecdd76eb17f371421653f720b Mon Sep 17 00:00:00 2001 From: TheCoub Date: Thu, 8 Dec 2016 20:37:12 -0500 Subject: [PATCH 06/17] Converted to the new format I also deleted some irrelevant information --- wiki/hospital.md | 53 ++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/wiki/hospital.md b/wiki/hospital.md index ac44ef8..62b186d 100644 --- a/wiki/hospital.md +++ b/wiki/hospital.md @@ -5,38 +5,43 @@ Hospital * Build with: `b, 2, *` * Build Cost: `200 Ore` * Ore Dropped on Destruction: `66 Ore` +* Health: `200` #### Services Offered -You can use the hospital once per turn, and you are healed by 5 hp per use. +The hospital is a building which allows anyone who uses to heal 5 health, up to the player's max health. Costs for Healing: -* Member of the Hospital Owner: `5 Ore` -* Ally of the Hospital Owner: `6 Ore` -* Neutral to the Hospital Owner: `10 Ore` -* Enemy of the Hospital Owner: `15 Ore` - -#### Owner Information - -Corporation owned buildings that sell items/services for a cost distribute the profits to the owner. - -The expenses for healing someone is `5 Ore`, so you don't profit from your own corporation members using the Hospital. - -You profit `1 Ore` when the hospital is used by an Ally, `5 Ore` when it's used by a neutral, and `10 Ore` when it's used by an enemy. - -The Standings (Ally, Neutral, Enemy) taken into account are the Owner's standings towards you. - -#### Origin - -The Hospital is one of the original structures from v1.0. - -#### History -They originally spawned in naturally, just like ore deposits, but now have to be built by player corporations. - +
B
LootDeconstructC
Loot L
Direction
Move Northm*w
Move WestMove m *a
Move Southm*s
Move Eastm*dDirection in which you want to move
Build Fence8 Desired Location Relative to You
Deconstruct Corp Owned Buildingc*Desired Location Relative to You
Buy Health Potion from Pharmacy l*
Attack Player/Building to your Northk*w
Attack Player/Building to your Westk*a
Attack Player/Building to your Southk*s
Attack Player/Building to your EastAttack Player/Building k *dDirection of Player/Building Adjacent to You
Increase Corporation Standing
+ + + + + + + + + + + + + + + + + + + + +
Relation to OwnerCost
Corp Member5 Ore
Ally6 Ore
Neutral10 Ore
Enemy15 Ore
+ +The owner gains ore when a player uses the hospital. The amount they gain is equal to the amount that the person using the hospital paid - 5 Ore. Contributors ============ - JCharante +- Ryan Courbron + +##### Page last edited on 12/8/16 (Version 1.5, The Benovolent Bearded Dragon) -##### Page last edited on 10/06/16 From b0612e3a7608fbec686ed163eec968085e8603d7 Mon Sep 17 00:00:00 2001 From: TheCoub Date: Thu, 8 Dec 2016 20:53:43 -0500 Subject: [PATCH 07/17] Fixed a typo I didn't bother proofreading. --- wiki/hospital.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/hospital.md b/wiki/hospital.md index 62b186d..645620c 100644 --- a/wiki/hospital.md +++ b/wiki/hospital.md @@ -7,7 +7,7 @@ Hospital * Ore Dropped on Destruction: `66 Ore` * Health: `200` -#### Services Offered +#### Uses The hospital is a building which allows anyone who uses to heal 5 health, up to the player's max health. From b1c6b16126435ce1bac683d30e47b5ac386836e4 Mon Sep 17 00:00:00 2001 From: TheCoub Date: Thu, 8 Dec 2016 21:13:30 -0500 Subject: [PATCH 08/17] Changed to the new format --- wiki/ore_generator.md | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/wiki/ore_generator.md b/wiki/ore_generator.md index 5f6fa5e..f460c1b 100644 --- a/wiki/ore_generator.md +++ b/wiki/ore_generator.md @@ -2,26 +2,22 @@ Ore Generator ======= * Icon: 🏭 -* Health: 225 * Build with: `b,3, *` * Build Cost: `100 Ore` * Ore Dropped on Destruction: `33 Ore` +* Health: `225` -#### Abilities +#### Uses -Ore Generators grant their owners 3 ore per tick, with each -tick decreasing their health by one. +An Ore Generator can only be built adjacent to an Ore Deposit. Once placed, an Ore Generator will produce 3 Ore per tick for as long as it is still running. An Ore Generator will last for 56 Seconds, but if they take damage, they will stop running earlier. -#### Other - -The Ore Generated was originally introduced in v1.1, but has -been continually modified. Contributors ============ - Quinn Balsam - JCharante +- Ryan Courbron -Page last edited on 11/20/16 +Page last edited on 12/8/16 (Version 1.5, The Benovolent Bearded Dragon) From 039d55682a2a489a582fa32d118a2675d72a0769 Mon Sep 17 00:00:00 2001 From: TheCoub Date: Thu, 8 Dec 2016 21:17:58 -0500 Subject: [PATCH 09/17] Marked for conversion --- wiki/{pharmacy.md => pharmacy (NeedsConversion).md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename wiki/{pharmacy.md => pharmacy (NeedsConversion).md} (100%) diff --git a/wiki/pharmacy.md b/wiki/pharmacy (NeedsConversion).md similarity index 100% rename from wiki/pharmacy.md rename to wiki/pharmacy (NeedsConversion).md From 29a96ebe46c8bd0cee66c0de143c9a439dca0578 Mon Sep 17 00:00:00 2001 From: Liham Date: Fri, 16 Dec 2016 10:57:30 -0500 Subject: [PATCH 10/17] Update spiketrap.md --- wiki/spiketrap.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/wiki/spiketrap.md b/wiki/spiketrap.md index 80b5c73..f234127 100644 --- a/wiki/spiketrap.md +++ b/wiki/spiketrap.md @@ -6,13 +6,11 @@ Spike Trap * Ore Dropped on Destruction: `50 Ore` * Health: `40` * Damage: `5` -#### Services Offered -Damages enemy(E) and neutral(N) players that move onto it. -#### Owner Information -Will not damage anyone in the Corp of the builder -#### Origin -The Spike Trap was added in v1.3. +* Services Offered: Damages enemy(E) and neutral(N) players that move onto it. +* Owner Information: Will not damage anyone in the Corp of the builder +* Origin: The Spike Trap was added in v1.3. Contributors ============ -- Graphyte -##### Page last edited on 10/07/16 +- Harrison Cyr +- Liam Connor-Schaefer +##### Page last edited on 12/16/16 From 6815e09fe9caf2585ebe17215d20c770b12aa1f6 Mon Sep 17 00:00:00 2001 From: Liham Date: Fri, 16 Dec 2016 10:58:04 -0500 Subject: [PATCH 11/17] Update spiketrap.md --- wiki/spiketrap.md | 1 + 1 file changed, 1 insertion(+) diff --git a/wiki/spiketrap.md b/wiki/spiketrap.md index f234127..97edae8 100644 --- a/wiki/spiketrap.md +++ b/wiki/spiketrap.md @@ -9,6 +9,7 @@ Spike Trap * Services Offered: Damages enemy(E) and neutral(N) players that move onto it. * Owner Information: Will not damage anyone in the Corp of the builder * Origin: The Spike Trap was added in v1.3. + Contributors ============ - Harrison Cyr From eade503a02c5e5720c5f761a324854e378f2375c Mon Sep 17 00:00:00 2001 From: Liham Date: Fri, 16 Dec 2016 10:58:25 -0500 Subject: [PATCH 12/17] Update spiketrap.md --- wiki/spiketrap.md | 1 + 1 file changed, 1 insertion(+) diff --git a/wiki/spiketrap.md b/wiki/spiketrap.md index 97edae8..84137eb 100644 --- a/wiki/spiketrap.md +++ b/wiki/spiketrap.md @@ -14,4 +14,5 @@ Contributors ============ - Harrison Cyr - Liam Connor-Schaefer + ##### Page last edited on 12/16/16 From 911bc53c42cf03987a32c9d9f5790a00d02510ad Mon Sep 17 00:00:00 2001 From: Liham Date: Fri, 16 Dec 2016 10:59:49 -0500 Subject: [PATCH 13/17] Update spiketrap.md --- wiki/spiketrap.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/wiki/spiketrap.md b/wiki/spiketrap.md index 84137eb..880814a 100644 --- a/wiki/spiketrap.md +++ b/wiki/spiketrap.md @@ -6,9 +6,15 @@ Spike Trap * Ore Dropped on Destruction: `50 Ore` * Health: `40` * Damage: `5` -* Services Offered: Damages enemy(E) and neutral(N) players that move onto it. -* Owner Information: Will not damage anyone in the Corp of the builder -* Origin: The Spike Trap was added in v1.3. + +#### Services Offered +Damages enemy(E) and neutral(N) players that move onto it. + +#### Owner Information +Will not damage anyone in the Corp of the builder + +#### Origin +The Spike Trap was added in v1.3. Contributors ============ From 25f92e808c6688f0faa5230f89dc1794c16a73b6 Mon Sep 17 00:00:00 2001 From: Liham Date: Fri, 16 Dec 2016 11:02:44 -0500 Subject: [PATCH 14/17] Update spiketrap.md --- wiki/spiketrap.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wiki/spiketrap.md b/wiki/spiketrap.md index 880814a..fe6962c 100644 --- a/wiki/spiketrap.md +++ b/wiki/spiketrap.md @@ -11,7 +11,7 @@ Spike Trap Damages enemy(E) and neutral(N) players that move onto it. #### Owner Information -Will not damage anyone in the Corp of the builder +Will not damage the builder or anyone in the Corp of the builder. #### Origin The Spike Trap was added in v1.3. @@ -22,3 +22,4 @@ Contributors - Liam Connor-Schaefer ##### Page last edited on 12/16/16 +##### v1.5 - The Benevolent Bearded Dragon From 3b12843366a7c5f18a59d2b3afd6f8dc737138d2 Mon Sep 17 00:00:00 2001 From: Liham Date: Fri, 16 Dec 2016 11:06:49 -0500 Subject: [PATCH 15/17] Update spiketrap.md --- wiki/spiketrap.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/wiki/spiketrap.md b/wiki/spiketrap.md index fe6962c..7ead88b 100644 --- a/wiki/spiketrap.md +++ b/wiki/spiketrap.md @@ -7,15 +7,10 @@ Spike Trap * Health: `40` * Damage: `5` -#### Services Offered +#### Uses Damages enemy(E) and neutral(N) players that move onto it. - -#### Owner Information Will not damage the builder or anyone in the Corp of the builder. -#### Origin -The Spike Trap was added in v1.3. - Contributors ============ - Harrison Cyr From dc965c3514b44790d0001cc98030f7571e62633c Mon Sep 17 00:00:00 2001 From: Liham Date: Fri, 16 Dec 2016 11:07:54 -0500 Subject: [PATCH 16/17] Update spiketrap.md --- wiki/spiketrap.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wiki/spiketrap.md b/wiki/spiketrap.md index 7ead88b..780a6f1 100644 --- a/wiki/spiketrap.md +++ b/wiki/spiketrap.md @@ -7,9 +7,10 @@ Spike Trap * Health: `40` * Damage: `5` -#### Uses -Damages enemy(E) and neutral(N) players that move onto it. -Will not damage the builder or anyone in the Corp of the builder. +Uses +======= +* Damages enemy(E) and neutral(N) players that move onto it. +* Will not damage the builder or anyone in the Corp of the builder. Contributors ============ From 3342c9a53e42b9380a01bbe63bc25fab2e0e4af9 Mon Sep 17 00:00:00 2001 From: Liham Date: Fri, 16 Dec 2016 11:08:08 -0500 Subject: [PATCH 17/17] Update spiketrap.md --- wiki/spiketrap.md | 1 - 1 file changed, 1 deletion(-) diff --git a/wiki/spiketrap.md b/wiki/spiketrap.md index 780a6f1..dc5455b 100644 --- a/wiki/spiketrap.md +++ b/wiki/spiketrap.md @@ -14,7 +14,6 @@ Uses Contributors ============ -- Harrison Cyr - Liam Connor-Schaefer ##### Page last edited on 12/16/16