From 56a63d3eab5dcff02d9adeb6f833dddf0774b47b Mon Sep 17 00:00:00 2001 From: Sasha RC Date: Mon, 1 May 2023 14:32:54 +0530 Subject: [PATCH 01/30] Initial commit --- mods/ctf/ctf_map/README.md | 68 ++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 616775b49..534ba1ebb 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -13,18 +13,19 @@ 1. Select the `Capture the Flag` subgame. 2. Create a new world. You can select any mapgen you like. 3. Enable creative mode. This will enable `mapedit` mode. -4. *Optional:* Enable `worldedit` +5. *Optional:* Enable `worldedit` ### 3. Select an area 1. Decide where you will build your map. The area can be maximum 230x230 blocks in surface area, but it can be lesser. -2. Grant yourself the `ctf_map_editor` privilege by running `/grantme ctf_map_editor` +2. Grant yourself the `ctf_map_editor` privilege by running `/grantme ctf_map_editor` or by running `/grantme all` which grants you all the privileges that will be useful for map making. 3. Run `/ctf_map editor` 4. Select "Create New Map" 5. Select a position to be one corner of the map. 6. Select a position in the opposite corner. Place it higher/lower than the first one to give the map height. +7. **Note:** you can change your area at any time by typing `/ctf_map editor` and pressing the "Corners" button. - **Note:** you can change your area at any time by typing `/ctf_map editor` and pressing the "Corners" button. +> **Important:** If you ever want to exit the world in which you are making the map and want to come back to it later, simply exit it (**do not** press "Finish Editing in the CTF map editor). When you want to start working on the map again, you can simply rejoin the world and continue. *Only when you have finished making the map should you run* `/ctf_map editor` . ### 4. Build @@ -36,10 +37,12 @@ - Many blocks have an indestructible variant - Don't forget to add - Team chests - - Flags. Place it, then right-click it to choose flag color. + - The blocks under the flag should be indestructible. The minimum is 5x5 blocks in surface area. - "Indestructible Barrier Glass" (`ctf_map:ind_glass`) around the edge of the world. - - "Indestructible Red Barrier Glass" (`ctf_map:ind_glass_red`) for the build-time wall. - - "Indestructible Red Barrier Stone" (`ctf_map:ind_stone_red`) for underground build-time wall. + - "Indestructible Red Barrier Glass" (`ctf_map:ind_glass_red`) for the build-time wall. The setting to make it disappear upon the beginning of the match will be set at last when you will run `/ctf_map editor`. + - "Indestructible Red Barrier Stone" (`ctf_map:ind_stone_red`) for underground build-time wall. This will turn to Normal Stone (`default:stone`) once the match begins. + +> "What about flags?," you may ask. Well, check the next section to see how to add them to your map. ### 5. Fill out information about the map @@ -47,19 +50,18 @@ Run `/ctf_map editor`. An explanation of some of the fields is given below. #### Map Enabled -Whether or not the map is available for play. You will want to check this. +Whether or not the map is available for play. You will want to tick this. #### License - * Every map must have its own license. * If attribution is required (for example if you modify other's map and you have to tell who is author of the original map), that has to be appended to the `license` field. If you want to give more information, you can use the `Other info` field. * If you don't know which license to use, [this list of CC licenses](https://creativecommons.org/use-remix/cc-licenses/) can help you. -* We can only accept Free Software licenses, e.g.`CC BY-SA 4.0`. +* We can only accept Free Software licenses, e.g. `CC BY-SA 4.0`. * Please know what you are doing when choosing a certain license. For example, you can read information about various licenses and/or consult a lawyer. #### Map Hint -Does your map have hidden treasures? You can hint about them with the hint field. +Does your map have hidden treasures? You can hint about them with the "Map Hint" field. #### Treasures A list of treasures that could end up in treasure chests @@ -86,28 +88,40 @@ An example of `initial_stuff` value that registers a stone pickaxe, 30 cobblesto default:pick_stone,default:cobble 30,default:torch 5,ctf_ranged:pistol_loaded ``` -#### Map start_time -What time of the day the match begins at. Changing this field will instantly update the time of day in the world you are editing. +#### Map Constants +1. `Map Shadow Intensity`: Sets the intensity of the shadows. In some maps shadows need to be disabled. +2. `Map Gravity`: Gravitational constant of the map. (default = 1) +3. `Map Movement Speed`: Regulates the speed at which players move. (default = 1) +4. `Map Jump height`: Regulates the height of jumps. (default = 1) +5. `Map start time`: Sets time of the day the match begins at. Changing this field will instantly update the time of day in the world you are editing. + * `0` is for midnight + * `1000` is for 1 AM + * `2000` is for 2 AM + * etc. -* `0` is for midnight -* `1000` is for 1 AM -* `2000` is for 2 AM -* etc. +#### Flag positions +Positions where team flags are placed. You can select the teams that you want on the map and place the flags accordingly. #### Zone Bounds -How far the players of a certain team may go during build time. -**Note:** Even standing on the boundary sends the player back. They do not have to go beyond it. Place the boundaries accordingly. +How far the players of a certain team may go during build time. The zone bounds should overlap at the Red Barrier wall. + +> **Note:** Even standing on the boundary sends the player back. They do not have to go beyond it. Place the boundaries accordingly. #### Chest Zones -Areas where chests can be placed. Some maps allow placing chests anywhere, while others only place them in certain locations. +Areas where chests can be placed. Some maps allow placing chests anywhere, while others only place them in certain locations. + +#### Barrier Area +Area where the Indestructible "Red Barrier Glass and/or Indestructible Red Barrier Stone" wall is located. Setting this will allow the game to know where to make them disappear when the match begins. ### 6. Export +> **Note:** Only do what is instructed below if you have ***finished making the map***. + 1. Press "Finish Editing" -2. Find the exported map -3. Move to \[Minetest folder]/games/capturetheflag/mods/ctf/ctf_map/maps +2. Find the exported map located in `[Mintest folder]/worlds/[Map World]/schems/[Exported Map folder]` +3. Move it to `\[Minetest folder]/games/capturetheflag/mods/ctf/ctf_map/maps`. -### 7. Play +### 7. Play 1. Create a new world with the `singlenode` mapgen. 2. Make sure creative mode is disabled @@ -119,6 +133,7 @@ Areas where chests can be placed. Some maps allow placing chests anywhere, while ### 8. Screenshot If you choose to submit your map, include a screenshot of it in the exported map's folder. It should have an aspect ratio of 3:2 (screenshot 600x400px is suggested). + You can take a screenshot easily by doing the following: 1. Hide the HUD. By default F1 does that. 2. Hide the chat log. By default F2 does that. @@ -126,4 +141,13 @@ You can take a screenshot easily by doing the following: 4. *(Optional)* Increase your view range if important parts of the map cannot be seen. By default the = (or +) and - keys do that. 5. Take a screenshot **from Minetest**. By default F12 does that. 6. You can find the screenshot in `[Minetest folder]/screenshots` unless you have changed the path in settings. + Crop the screenshot into the aspect ratio mentioned above using a tool of your choice, and put the screenshot inside your exported map's folder. It should be named `screenshot.png`. + +### 9. Submission + +> Your PR should contain the Map Folder that should contain the files `map.conf`, `map.mts`, and `screenshot.png`. + +Maps can be submitted to the CTF Maps repository through PRs (Pull Requests). If you don't know how to make them, you could ask someone else to make it for you or make your own GitHub account and make it yourself. If you are new to making PRs and forks, you can learn about them by reading these documentations: +- [https://docs.github.com/en/get-started/quickstart/fork-a-repo](https://docs.github.com/en/get-started/quickstart/fork-a-repo "https://docs.github.com/en/get-started/quickstart/fork-a-repo") +- [https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork "https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork") From 79560aa0ecad5309ebe4c010d5c79ea37a7e8a13 Mon Sep 17 00:00:00 2001 From: Sasha RC Date: Mon, 1 May 2023 19:24:06 +0530 Subject: [PATCH 02/30] Final Commit? --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 534ba1ebb..b060d4e08 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -89,7 +89,7 @@ default:pick_stone,default:cobble 30,default:torch 5,ctf_ranged:pistol_loaded ``` #### Map Constants -1. `Map Shadow Intensity`: Sets the intensity of the shadows. In some maps shadows need to be disabled. +1. `Map Shadow Intensity`: Sets the intensity of the shadows. 2. `Map Gravity`: Gravitational constant of the map. (default = 1) 3. `Map Movement Speed`: Regulates the speed at which players move. (default = 1) 4. `Map Jump height`: Regulates the height of jumps. (default = 1) From acef092698ecbafa600a8701e235e5d51a5cdee9 Mon Sep 17 00:00:00 2001 From: s20 <129506166+src4026@users.noreply.github.com> Date: Thu, 4 May 2023 18:49:03 +0530 Subject: [PATCH 03/30] Update README.md --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index b060d4e08..472d7dde9 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -148,6 +148,6 @@ Crop the screenshot into the aspect ratio mentioned above using a tool of your c > Your PR should contain the Map Folder that should contain the files `map.conf`, `map.mts`, and `screenshot.png`. -Maps can be submitted to the CTF Maps repository through PRs (Pull Requests). If you don't know how to make them, you could ask someone else to make it for you or make your own GitHub account and make it yourself. If you are new to making PRs and forks, you can learn about them by reading these documentations: +Maps can be submitted to the CTF Maps repository through PRs (Pull Requests). If you don't know how to make them, you could ask someone else to make it for you or make your own GitHub account and make it yourself. A benefit of making it on your own is that you can actively engage in the testing and development of the map PR. If you are new to making PRs and forks, you can learn about them by reading these documentations: - [https://docs.github.com/en/get-started/quickstart/fork-a-repo](https://docs.github.com/en/get-started/quickstart/fork-a-repo "https://docs.github.com/en/get-started/quickstart/fork-a-repo") - [https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork "https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork") From df76671e41b61758875e59dfa3be417d603acf6d Mon Sep 17 00:00:00 2001 From: s20 <129506166+src4026@users.noreply.github.com> Date: Fri, 5 May 2023 17:30:52 +0530 Subject: [PATCH 04/30] Update mods/ctf/ctf_map/README.md Co-authored-by: Farooq Karimi Zadeh --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 472d7dde9..5ad1b2221 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -40,7 +40,7 @@ - The blocks under the flag should be indestructible. The minimum is 5x5 blocks in surface area. - "Indestructible Barrier Glass" (`ctf_map:ind_glass`) around the edge of the world. - "Indestructible Red Barrier Glass" (`ctf_map:ind_glass_red`) for the build-time wall. The setting to make it disappear upon the beginning of the match will be set at last when you will run `/ctf_map editor`. - - "Indestructible Red Barrier Stone" (`ctf_map:ind_stone_red`) for underground build-time wall. This will turn to Normal Stone (`default:stone`) once the match begins. + - "Indestructible Red Barrier Stone" (`ctf_map:ind_stone_red`) for underground build-time wall. This will turn to stone(`default:stone`) once the match begins. > "What about flags?," you may ask. Well, check the next section to see how to add them to your map. From f8606c38b290d84f0e3ca8a8670cb75db81630b2 Mon Sep 17 00:00:00 2001 From: s20 <129506166+src4026@users.noreply.github.com> Date: Fri, 5 May 2023 17:31:12 +0530 Subject: [PATCH 05/30] Update mods/ctf/ctf_map/README.md Co-authored-by: Farooq Karimi Zadeh --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 5ad1b2221..84fca17e0 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -50,7 +50,7 @@ Run `/ctf_map editor`. An explanation of some of the fields is given below. #### Map Enabled -Whether or not the map is available for play. You will want to tick this. +Whether or not the map is available for play. You will want to check this. #### License * Every map must have its own license. From 002345906d3112c23317647e9b712d0156802a7c Mon Sep 17 00:00:00 2001 From: s20 <129506166+src4026@users.noreply.github.com> Date: Fri, 5 May 2023 17:31:36 +0530 Subject: [PATCH 06/30] Update mods/ctf/ctf_map/README.md Co-authored-by: Farooq Karimi Zadeh --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 84fca17e0..989a0623c 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -57,7 +57,7 @@ Whether or not the map is available for play. You will want to check this. * If attribution is required (for example if you modify other's map and you have to tell who is author of the original map), that has to be appended to the `license` field. If you want to give more information, you can use the `Other info` field. * If you don't know which license to use, [this list of CC licenses](https://creativecommons.org/use-remix/cc-licenses/) can help you. -* We can only accept Free Software licenses, e.g. `CC BY-SA 4.0`. +* We can only accept the free culture licences like `CC BY-SA 4.0`. Note that not licences in the Creative Commons family are free(as in freedom). For instance those with `ND` are not. * Please know what you are doing when choosing a certain license. For example, you can read information about various licenses and/or consult a lawyer. #### Map Hint From 8963caa668aea6c07ef66f2c76f060be90631a7e Mon Sep 17 00:00:00 2001 From: s20 <129506166+src4026@users.noreply.github.com> Date: Fri, 5 May 2023 17:32:07 +0530 Subject: [PATCH 07/30] Update mods/ctf/ctf_map/README.md Co-authored-by: Farooq Karimi Zadeh --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 989a0623c..96b1d0ed6 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -121,7 +121,7 @@ Area where the Indestructible "Red Barrier Glass and/or Indestructible Red Barri 2. Find the exported map located in `[Mintest folder]/worlds/[Map World]/schems/[Exported Map folder]` 3. Move it to `\[Minetest folder]/games/capturetheflag/mods/ctf/ctf_map/maps`. -### 7. Play +### 7. Play 1. Create a new world with the `singlenode` mapgen. 2. Make sure creative mode is disabled From 6d494563788eb5a1b9446c9995ad6243e0629c22 Mon Sep 17 00:00:00 2001 From: s20 <129506166+src4026@users.noreply.github.com> Date: Sat, 6 May 2023 10:35:50 +0530 Subject: [PATCH 08/30] Update mods/ctf/ctf_map/README.md Co-authored-by: a-blob <88883098+a-blob@users.noreply.github.com> --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 96b1d0ed6..8aa73ccc8 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -37,7 +37,7 @@ - Many blocks have an indestructible variant - Don't forget to add - Team chests - - The blocks under the flag should be indestructible. The minimum is 5x5 blocks in surface area. + - Indestructible blocks under the flag. The minimum is 5x5 blocks in surface area. - "Indestructible Barrier Glass" (`ctf_map:ind_glass`) around the edge of the world. - "Indestructible Red Barrier Glass" (`ctf_map:ind_glass_red`) for the build-time wall. The setting to make it disappear upon the beginning of the match will be set at last when you will run `/ctf_map editor`. - "Indestructible Red Barrier Stone" (`ctf_map:ind_stone_red`) for underground build-time wall. This will turn to stone(`default:stone`) once the match begins. From 94e4ff3eb6692781efaac945c620b8d3bdf755c9 Mon Sep 17 00:00:00 2001 From: s20 <129506166+src4026@users.noreply.github.com> Date: Sat, 6 May 2023 10:46:48 +0530 Subject: [PATCH 09/30] Update mods/ctf/ctf_map/README.md Co-authored-by: a-blob <88883098+a-blob@users.noreply.github.com> --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 8aa73ccc8..0f26afa78 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -92,7 +92,7 @@ default:pick_stone,default:cobble 30,default:torch 5,ctf_ranged:pistol_loaded 1. `Map Shadow Intensity`: Sets the intensity of the shadows. 2. `Map Gravity`: Gravitational constant of the map. (default = 1) 3. `Map Movement Speed`: Regulates the speed at which players move. (default = 1) -4. `Map Jump height`: Regulates the height of jumps. (default = 1) +4. `Map Jump Height`: Regulates the height of jumps. (default = 1) 5. `Map start time`: Sets time of the day the match begins at. Changing this field will instantly update the time of day in the world you are editing. * `0` is for midnight * `1000` is for 1 AM From afd2abf449cb5f55404ddae694324bcaaa1ce610 Mon Sep 17 00:00:00 2001 From: s20 <129506166+src4026@users.noreply.github.com> Date: Sat, 6 May 2023 10:47:31 +0530 Subject: [PATCH 10/30] Update mods/ctf/ctf_map/README.md Co-authored-by: a-blob <88883098+a-blob@users.noreply.github.com> --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 0f26afa78..9202b7c91 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -99,7 +99,7 @@ default:pick_stone,default:cobble 30,default:torch 5,ctf_ranged:pistol_loaded * `2000` is for 2 AM * etc. -#### Flag positions +#### Flag Positions Positions where team flags are placed. You can select the teams that you want on the map and place the flags accordingly. #### Zone Bounds From 24d196453148204b0c3ab15bec756e5f9ce21185 Mon Sep 17 00:00:00 2001 From: s20 <129506166+src4026@users.noreply.github.com> Date: Sat, 6 May 2023 10:49:03 +0530 Subject: [PATCH 11/30] Update mods/ctf/ctf_map/README.md Co-authored-by: a-blob <88883098+a-blob@users.noreply.github.com> --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 9202b7c91..9d2b97359 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -119,7 +119,7 @@ Area where the Indestructible "Red Barrier Glass and/or Indestructible Red Barri 1. Press "Finish Editing" 2. Find the exported map located in `[Mintest folder]/worlds/[Map World]/schems/[Exported Map folder]` -3. Move it to `\[Minetest folder]/games/capturetheflag/mods/ctf/ctf_map/maps`. +3. Move the exported map folder to `\[Minetest folder]/games/capturetheflag/mods/ctf/ctf_map/maps`. ### 7. Play From ad78a6f835196562919f5339cc2cdc70b8dc47ec Mon Sep 17 00:00:00 2001 From: s20 <129506166+src4026@users.noreply.github.com> Date: Sun, 7 May 2023 17:51:20 +0530 Subject: [PATCH 12/30] Update mods/ctf/ctf_map/README.md Co-authored-by: a-blob <88883098+a-blob@users.noreply.github.com> --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 9d2b97359..5c6e99aa2 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -39,7 +39,7 @@ - Team chests - Indestructible blocks under the flag. The minimum is 5x5 blocks in surface area. - "Indestructible Barrier Glass" (`ctf_map:ind_glass`) around the edge of the world. - - "Indestructible Red Barrier Glass" (`ctf_map:ind_glass_red`) for the build-time wall. The setting to make it disappear upon the beginning of the match will be set at last when you will run `/ctf_map editor`. + - "Indestructible Red Barrier Glass" (`ctf_map:ind_glass_red`) for the build-time wall. This will disappear once the match begins. - "Indestructible Red Barrier Stone" (`ctf_map:ind_stone_red`) for underground build-time wall. This will turn to stone(`default:stone`) once the match begins. > "What about flags?," you may ask. Well, check the next section to see how to add them to your map. From 21c694c3b81d85a7ff0084aa06d121a75c835134 Mon Sep 17 00:00:00 2001 From: s20 <129506166+src4026@users.noreply.github.com> Date: Sun, 7 May 2023 17:54:28 +0530 Subject: [PATCH 13/30] Update mods/ctf/ctf_map/README.md Co-authored-by: a-blob <88883098+a-blob@users.noreply.github.com> --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 5c6e99aa2..dc7ab8e93 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -93,7 +93,7 @@ default:pick_stone,default:cobble 30,default:torch 5,ctf_ranged:pistol_loaded 2. `Map Gravity`: Gravitational constant of the map. (default = 1) 3. `Map Movement Speed`: Regulates the speed at which players move. (default = 1) 4. `Map Jump Height`: Regulates the height of jumps. (default = 1) -5. `Map start time`: Sets time of the day the match begins at. Changing this field will instantly update the time of day in the world you are editing. +5. `Map start_time`: Sets time of the day the match begins at. Changing this field will instantly update the time of day in the world you are editing. * `0` is for midnight * `1000` is for 1 AM * `2000` is for 2 AM From 4cf61e03517d44346f878e213ac354d0284018fb Mon Sep 17 00:00:00 2001 From: s20 <129506166+src4026@users.noreply.github.com> Date: Sun, 7 May 2023 17:55:00 +0530 Subject: [PATCH 14/30] Update mods/ctf/ctf_map/README.md Co-authored-by: a-blob <88883098+a-blob@users.noreply.github.com> --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index dc7ab8e93..a5256d6f7 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -111,7 +111,7 @@ How far the players of a certain team may go during build time. The zone bounds Areas where chests can be placed. Some maps allow placing chests anywhere, while others only place them in certain locations. #### Barrier Area -Area where the Indestructible "Red Barrier Glass and/or Indestructible Red Barrier Stone" wall is located. Setting this will allow the game to know where to make them disappear when the match begins. +Area where the Indestructible "Red Barrier Glass and/or Indestructible Red Barrier Stone" wall is located. Setting this will allow the game to know where to make them disappear when the match begins. You can leave this by default unless the game is taking a long time to remove your barriers. ### 6. Export From e364ddedc2bee2c1e843f3c321be13d90fc17981 Mon Sep 17 00:00:00 2001 From: Sasha RC Date: Sun, 7 May 2023 18:22:26 +0530 Subject: [PATCH 15/30] Removing 'Select an Area' and adding other changes --- mods/ctf/ctf_map/README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index a5256d6f7..75966d741 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -15,17 +15,11 @@ 3. Enable creative mode. This will enable `mapedit` mode. 5. *Optional:* Enable `worldedit` -### 3. Select an area +### 3. Important information -1. Decide where you will build your map. The area can be maximum 230x230 blocks in surface area, but it can be lesser. -2. Grant yourself the `ctf_map_editor` privilege by running `/grantme ctf_map_editor` or by running `/grantme all` which grants you all the privileges that will be useful for map making. -3. Run `/ctf_map editor` -4. Select "Create New Map" -5. Select a position to be one corner of the map. -6. Select a position in the opposite corner. Place it higher/lower than the first one to give the map height. -7. **Note:** you can change your area at any time by typing `/ctf_map editor` and pressing the "Corners" button. - -> **Important:** If you ever want to exit the world in which you are making the map and want to come back to it later, simply exit it (**do not** press "Finish Editing in the CTF map editor). When you want to start working on the map again, you can simply rejoin the world and continue. *Only when you have finished making the map should you run* `/ctf_map editor` . +- *Do not run* `/ctf_map editor`*, follow the instructions as mentioned in this guide.* +- The map area can be maximum 230x230 blocks in surface area, but it can be lesser. Build it accordingly. +- You can grant yourself the `ctf_map_editor` privilege by running `/grantme ctf_map_editor` or by running `/grantme all` which grants you all the privileges that will be useful for map making. ### 4. Build @@ -49,6 +43,12 @@ Run `/ctf_map editor`. An explanation of some of the fields is given below. +#### Selecting the Map Area +1. Select a position to be one corner of the map. +2. Select a position in the opposite corner. Place it higher/lower than the first one to give the map height. + +> **Note:** Run `/ctf_map editor` to fill out the rest of the fields. + #### Map Enabled Whether or not the map is available for play. You will want to check this. From ae92fdfec6ed524e436f4949780349af7c1bc752 Mon Sep 17 00:00:00 2001 From: s20 <129506166+src4026@users.noreply.github.com> Date: Sat, 13 May 2023 16:10:45 +0530 Subject: [PATCH 16/30] Update mods/ctf/ctf_map/README.md Removing line. Co-authored-by: a-blob <88883098+a-blob@users.noreply.github.com> --- mods/ctf/ctf_map/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 75966d741..6cffc9822 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -36,7 +36,6 @@ - "Indestructible Red Barrier Glass" (`ctf_map:ind_glass_red`) for the build-time wall. This will disappear once the match begins. - "Indestructible Red Barrier Stone" (`ctf_map:ind_stone_red`) for underground build-time wall. This will turn to stone(`default:stone`) once the match begins. -> "What about flags?," you may ask. Well, check the next section to see how to add them to your map. ### 5. Fill out information about the map From d0534524e857b0809df127071d2665e0b11d781e Mon Sep 17 00:00:00 2001 From: Sasha RC Date: Sun, 14 May 2023 16:48:44 +0530 Subject: [PATCH 17/30] Adding (*required) label to some fields and other small edits --- mods/ctf/ctf_map/README.md | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 6cffc9822..241ed4ade 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -6,7 +6,7 @@ - Minetest 5.0.0 or later (https://minetest.net/) - `Capture the Flag` game (https://content.minetest.net/packages/rubenwardy/capturetheflag/) -- *Optional:* `worldedit` (https://content.minetest.net/packages/sfan5/worldedit/) +- *Optional:* `worldedit` (https://content.minetest.net/packages/sfan5/worldedit/) ### 2. Create the world @@ -20,6 +20,7 @@ - *Do not run* `/ctf_map editor`*, follow the instructions as mentioned in this guide.* - The map area can be maximum 230x230 blocks in surface area, but it can be lesser. Build it accordingly. - You can grant yourself the `ctf_map_editor` privilege by running `/grantme ctf_map_editor` or by running `/grantme all` which grants you all the privileges that will be useful for map making. +- A useful setting to enable is "Append Item Name". It appends the technical name of the item when you hover on it within the inventory. It will help in filling fields while running the map editor in the future. ### 4. Build @@ -42,16 +43,16 @@ Run `/ctf_map editor`. An explanation of some of the fields is given below. -#### Selecting the Map Area +#### Selecting the Map Area (*required) 1. Select a position to be one corner of the map. 2. Select a position in the opposite corner. Place it higher/lower than the first one to give the map height. > **Note:** Run `/ctf_map editor` to fill out the rest of the fields. -#### Map Enabled +#### Map Enabled (*required) Whether or not the map is available for play. You will want to check this. -#### License +#### License (*required) * Every map must have its own license. * If attribution is required (for example if you modify other's map and you have to tell who is author of the original map), that has to be appended to the `license` field. If you want to give more information, you can use the `Other info` field. @@ -63,7 +64,7 @@ If you want to give more information, you can use the `Other info` field. Does your map have hidden treasures? You can hint about them with the "Map Hint" field. #### Treasures -A list of treasures that could end up in treasure chests +A list of treasures that could end up in treasure chests. Use this only if you want to add extra treasures. If not, then do not fill this filed. Format: ``` @@ -79,7 +80,7 @@ default:lava_source;1;10;1;0.2;1;default:water_source;1;10;1;0.2;1; ``` #### Map Initial Stuff -`initial_stuff` are the items given to players at their (re)spawn. The `initial_stuff` field is located in the `map.conf` file. At least a pickaxe and some torches should be given in the map's `initial_stuff`. +`initial_stuff` are the items given to players at their (re)spawn. The `initial_stuff` field is located in the `map.conf` file. At least a pickaxe and some torches should be given in the map's `initial_stuff`. An example of `initial_stuff` value that registers a stone pickaxe, 30 cobblestones, 5 torches and a pistol is given below. @@ -98,18 +99,18 @@ default:pick_stone,default:cobble 30,default:torch 5,ctf_ranged:pistol_loaded * `2000` is for 2 AM * etc. -#### Flag Positions +#### Flag Positions (*required) Positions where team flags are placed. You can select the teams that you want on the map and place the flags accordingly. -#### Zone Bounds +#### Zone Bounds (*required) How far the players of a certain team may go during build time. The zone bounds should overlap at the Red Barrier wall. > **Note:** Even standing on the boundary sends the player back. They do not have to go beyond it. Place the boundaries accordingly. -#### Chest Zones -Areas where chests can be placed. Some maps allow placing chests anywhere, while others only place them in certain locations. +#### Chest Zones (*required) +Areas where chests can be placed. Some maps allow placing chests anywhere, while others only place them in certain locations. The chest zones should be placed such that one corner should be placed higher / lower than the other. This will give it height. -#### Barrier Area +#### Barrier Area (*required) Area where the Indestructible "Red Barrier Glass and/or Indestructible Red Barrier Stone" wall is located. Setting this will allow the game to know where to make them disappear when the match begins. You can leave this by default unless the game is taking a long time to remove your barriers. ### 6. Export From bb3bdb2b755a84816c3a0215f4a200f755e459bd Mon Sep 17 00:00:00 2001 From: s20 <129506166+src4026@users.noreply.github.com> Date: Sun, 14 May 2023 21:22:46 +0530 Subject: [PATCH 18/30] Update mods/ctf/ctf_map/README.md Co-authored-by: Farooq Karimi Zadeh --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 241ed4ade..6b8b56320 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -49,7 +49,7 @@ An explanation of some of the fields is given below. > **Note:** Run `/ctf_map editor` to fill out the rest of the fields. -#### Map Enabled (*required) +#### Map Enabled *(required)* Whether or not the map is available for play. You will want to check this. #### License (*required) From b2ca73208e188980d6220df4a5d2e8f658c40c3a Mon Sep 17 00:00:00 2001 From: Sasha Richalim Date: Sat, 10 Jun 2023 15:06:04 +0530 Subject: [PATCH 19/30] Add new line about re-opening maps --- mods/ctf/ctf_map/README.md | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 6b8b56320..c27608d24 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -6,7 +6,7 @@ - Minetest 5.0.0 or later (https://minetest.net/) - `Capture the Flag` game (https://content.minetest.net/packages/rubenwardy/capturetheflag/) -- *Optional:* `worldedit` (https://content.minetest.net/packages/sfan5/worldedit/) +- *Optional:* `worldedit` (https://content.minetest.net/packages/sfan5/worldedit/) ### 2. Create the world @@ -17,10 +17,8 @@ ### 3. Important information -- *Do not run* `/ctf_map editor`*, follow the instructions as mentioned in this guide.* - The map area can be maximum 230x230 blocks in surface area, but it can be lesser. Build it accordingly. - You can grant yourself the `ctf_map_editor` privilege by running `/grantme ctf_map_editor` or by running `/grantme all` which grants you all the privileges that will be useful for map making. -- A useful setting to enable is "Append Item Name". It appends the technical name of the item when you hover on it within the inventory. It will help in filling fields while running the map editor in the future. ### 4. Build @@ -37,22 +35,23 @@ - "Indestructible Red Barrier Glass" (`ctf_map:ind_glass_red`) for the build-time wall. This will disappear once the match begins. - "Indestructible Red Barrier Stone" (`ctf_map:ind_stone_red`) for underground build-time wall. This will turn to stone(`default:stone`) once the match begins. +If you wish to save your map for later edits, follow the note in the section about exporting the map. ### 5. Fill out information about the map Run `/ctf_map editor`. An explanation of some of the fields is given below. -#### Selecting the Map Area (*required) +#### Selecting the Map Area 1. Select a position to be one corner of the map. 2. Select a position in the opposite corner. Place it higher/lower than the first one to give the map height. > **Note:** Run `/ctf_map editor` to fill out the rest of the fields. -#### Map Enabled *(required)* +#### Map Enabled Whether or not the map is available for play. You will want to check this. -#### License (*required) +#### License * Every map must have its own license. * If attribution is required (for example if you modify other's map and you have to tell who is author of the original map), that has to be appended to the `license` field. If you want to give more information, you can use the `Other info` field. @@ -64,7 +63,7 @@ If you want to give more information, you can use the `Other info` field. Does your map have hidden treasures? You can hint about them with the "Map Hint" field. #### Treasures -A list of treasures that could end up in treasure chests. Use this only if you want to add extra treasures. If not, then do not fill this filed. +A list of treasures that could end up in treasure chests Format: ``` @@ -80,7 +79,7 @@ default:lava_source;1;10;1;0.2;1;default:water_source;1;10;1;0.2;1; ``` #### Map Initial Stuff -`initial_stuff` are the items given to players at their (re)spawn. The `initial_stuff` field is located in the `map.conf` file. At least a pickaxe and some torches should be given in the map's `initial_stuff`. +`initial_stuff` are the items given to players at their (re)spawn. The `initial_stuff` field is located in the `map.conf` file. At least a pickaxe and some torches should be given in the map's `initial_stuff`. An example of `initial_stuff` value that registers a stone pickaxe, 30 cobblestones, 5 torches and a pistol is given below. @@ -99,28 +98,28 @@ default:pick_stone,default:cobble 30,default:torch 5,ctf_ranged:pistol_loaded * `2000` is for 2 AM * etc. -#### Flag Positions (*required) +#### Flag Positions Positions where team flags are placed. You can select the teams that you want on the map and place the flags accordingly. -#### Zone Bounds (*required) +#### Zone Bounds How far the players of a certain team may go during build time. The zone bounds should overlap at the Red Barrier wall. > **Note:** Even standing on the boundary sends the player back. They do not have to go beyond it. Place the boundaries accordingly. -#### Chest Zones (*required) -Areas where chests can be placed. Some maps allow placing chests anywhere, while others only place them in certain locations. The chest zones should be placed such that one corner should be placed higher / lower than the other. This will give it height. +#### Chest Zones +Areas where chests can be placed. Some maps allow placing chests anywhere, while others only place them in certain locations. -#### Barrier Area (*required) +#### Barrier Area Area where the Indestructible "Red Barrier Glass and/or Indestructible Red Barrier Stone" wall is located. Setting this will allow the game to know where to make them disappear when the match begins. You can leave this by default unless the game is taking a long time to remove your barriers. -### 6. Export - -> **Note:** Only do what is instructed below if you have ***finished making the map***. +### 6. Export 1. Press "Finish Editing" 2. Find the exported map located in `[Mintest folder]/worlds/[Map World]/schems/[Exported Map folder]` 3. Move the exported map folder to `\[Minetest folder]/games/capturetheflag/mods/ctf/ctf_map/maps`. +You can access the exported map by running `/ctf_map editor`, clicking on the exported map folder from the list of maps, and then by pressing "Start Editing". + ### 7. Play 1. Create a new world with the `singlenode` mapgen. From ebdc70799387b02ec8181a394b7c3076ad9c119b Mon Sep 17 00:00:00 2001 From: s20 <129506166+src4026@users.noreply.github.com> Date: Sun, 25 Jun 2023 23:48:16 +0530 Subject: [PATCH 20/30] Fix skipped numbering Co-authored-by: LoneWolfHT --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index c27608d24..508dcfedc 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -13,7 +13,7 @@ 1. Select the `Capture the Flag` subgame. 2. Create a new world. You can select any mapgen you like. 3. Enable creative mode. This will enable `mapedit` mode. -5. *Optional:* Enable `worldedit` +4. *Optional:* Enable `worldedit` ### 3. Important information From 1da2f0789c96fdd3917ebafe23b28518f0ac9266 Mon Sep 17 00:00:00 2001 From: Sasha Richalim Date: Wed, 28 Jun 2023 21:01:18 +0530 Subject: [PATCH 21/30] Add line to mention the default textures for screenshots of maps --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 508dcfedc..ac728b12f 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -131,7 +131,7 @@ You can access the exported map by running `/ctf_map editor`, clicking on the ex ### 8. Screenshot -If you choose to submit your map, include a screenshot of it in the exported map's folder. It should have an aspect ratio of 3:2 (screenshot 600x400px is suggested). +If you choose to submit your map, include a screenshot of it in the exported map's folder. It should be taken with on texture packs enabled and have an aspect ratio of 3:2 (screenshot 600x400px is suggested). You can take a screenshot easily by doing the following: 1. Hide the HUD. By default F1 does that. From 8b3c2d06672fbd4e1fbc88cf7f73286ec47e662c Mon Sep 17 00:00:00 2001 From: s20 <129506166+src4026@users.noreply.github.com> Date: Thu, 29 Jun 2023 01:05:19 +0530 Subject: [PATCH 22/30] Fix typo/wording Co-authored-by: Farooq Karimi Zadeh --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index ac728b12f..f3093248b 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -131,7 +131,7 @@ You can access the exported map by running `/ctf_map editor`, clicking on the ex ### 8. Screenshot -If you choose to submit your map, include a screenshot of it in the exported map's folder. It should be taken with on texture packs enabled and have an aspect ratio of 3:2 (screenshot 600x400px is suggested). +If you choose to submit your map, include a screenshot of it in the exported map's folder. It should be taken with default texture packs enabled and have an aspect ratio of 3:2 (screenshot 600x400px is suggested). You can take a screenshot easily by doing the following: 1. Hide the HUD. By default F1 does that. From 49d26b6d1e5da06e5b914c114c7df74d205a4469 Mon Sep 17 00:00:00 2001 From: Sasha Richalim Date: Tue, 18 Jul 2023 19:48:51 +0530 Subject: [PATCH 23/30] Adding line specifying branches for each map change/code change --- mods/ctf/ctf_map/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index f3093248b..6706ed99a 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -131,7 +131,7 @@ You can access the exported map by running `/ctf_map editor`, clicking on the ex ### 8. Screenshot -If you choose to submit your map, include a screenshot of it in the exported map's folder. It should be taken with default texture packs enabled and have an aspect ratio of 3:2 (screenshot 600x400px is suggested). +If you choose to submit your map, include a screenshot of it in the exported map's folder. It should be taken with on texture packs enabled and have an aspect ratio of 3:2 (screenshot 600x400px is suggested). You can take a screenshot easily by doing the following: 1. Hide the HUD. By default F1 does that. @@ -145,8 +145,10 @@ Crop the screenshot into the aspect ratio mentioned above using a tool of your c ### 9. Submission -> Your PR should contain the Map Folder that should contain the files `map.conf`, `map.mts`, and `screenshot.png`. +> Your PR should contain the Map Folder that should include the files `map.conf`, `map.mts`, and `screenshot.png`. Maps can be submitted to the CTF Maps repository through PRs (Pull Requests). If you don't know how to make them, you could ask someone else to make it for you or make your own GitHub account and make it yourself. A benefit of making it on your own is that you can actively engage in the testing and development of the map PR. If you are new to making PRs and forks, you can learn about them by reading these documentations: - [https://docs.github.com/en/get-started/quickstart/fork-a-repo](https://docs.github.com/en/get-started/quickstart/fork-a-repo "https://docs.github.com/en/get-started/quickstart/fork-a-repo") - [https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork "https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork") + +If you are creating the PR yourself, it is always better to make each PR on a different branch of your fork of the repo. For example if you want to add `map A` or make `enhancement A`, then make a separate branch for it, and so on for other maps/changes to the code. This will obviate and possible conflicts with any of your already open PRs. From efcbd62078c204e1fb8561fa94a8918611d7f7ab Mon Sep 17 00:00:00 2001 From: Sasha Richalim Date: Tue, 18 Jul 2023 19:50:33 +0530 Subject: [PATCH 24/30] Adding line specifying branches for each map change/code change --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 6706ed99a..9a105a466 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -151,4 +151,4 @@ Maps can be submitted to the CTF Maps repository through PRs (Pull Requests). If - [https://docs.github.com/en/get-started/quickstart/fork-a-repo](https://docs.github.com/en/get-started/quickstart/fork-a-repo "https://docs.github.com/en/get-started/quickstart/fork-a-repo") - [https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork "https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork") -If you are creating the PR yourself, it is always better to make each PR on a different branch of your fork of the repo. For example if you want to add `map A` or make `enhancement A`, then make a separate branch for it, and so on for other maps/changes to the code. This will obviate and possible conflicts with any of your already open PRs. +If you are creating the PR yourself, it is always better to make each PR on a different branch of your fork of the repo. For example if you want to add a map or make an enhancement, then make a separate branch for it, and so on. This will obviate and possible conflicts with any of your already open PRs. From ab36fa5c096463285f263cc78d6d53b4b117565e Mon Sep 17 00:00:00 2001 From: Sasha Richalim Date: Tue, 18 Jul 2023 19:55:23 +0530 Subject: [PATCH 25/30] Perhaps not needed, so removing it --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 9a105a466..b71171d5a 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -151,4 +151,4 @@ Maps can be submitted to the CTF Maps repository through PRs (Pull Requests). If - [https://docs.github.com/en/get-started/quickstart/fork-a-repo](https://docs.github.com/en/get-started/quickstart/fork-a-repo "https://docs.github.com/en/get-started/quickstart/fork-a-repo") - [https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork "https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork") -If you are creating the PR yourself, it is always better to make each PR on a different branch of your fork of the repo. For example if you want to add a map or make an enhancement, then make a separate branch for it, and so on. This will obviate and possible conflicts with any of your already open PRs. +If you are creating the PR yourself, it is always better to make each PR on a different branch of your fork of the repo. For example if you want to add a map, then make a separate branch for it, and so on. This will obviate and possible conflicts with any of your already open PRs. From 43dc0e938ddbd386d2cfd673c2630c2340d3b59f Mon Sep 17 00:00:00 2001 From: Sasha Richalim Date: Thu, 3 Aug 2023 18:37:21 +0530 Subject: [PATCH 26/30] Adding to the `Barrier Area` section --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index b71171d5a..cd24370b4 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -110,7 +110,7 @@ How far the players of a certain team may go during build time. The zone bounds Areas where chests can be placed. Some maps allow placing chests anywhere, while others only place them in certain locations. #### Barrier Area -Area where the Indestructible "Red Barrier Glass and/or Indestructible Red Barrier Stone" wall is located. Setting this will allow the game to know where to make them disappear when the match begins. You can leave this by default unless the game is taking a long time to remove your barriers. +Area where the Indestructible "Red Barrier Glass and/or Indestructible Red Barrier Stone" wall is located. Setting this will allow the game to know where to make them disappear when the match begins. You can leave this by default unless the game is taking a long time to remove your barriers. If it is so and it is a two-team map, then set the Barrier Area to the region of the barriers only. However, it is not possible to do this with four-team maps ### 6. Export From f846695df38ca01d26d79ab510c54acfa4a4f13b Mon Sep 17 00:00:00 2001 From: Sasha Richalim Date: Thu, 3 Aug 2023 18:39:23 +0530 Subject: [PATCH 27/30] Adding a missing fullstop :shrug: --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index cd24370b4..53d2428fb 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -110,7 +110,7 @@ How far the players of a certain team may go during build time. The zone bounds Areas where chests can be placed. Some maps allow placing chests anywhere, while others only place them in certain locations. #### Barrier Area -Area where the Indestructible "Red Barrier Glass and/or Indestructible Red Barrier Stone" wall is located. Setting this will allow the game to know where to make them disappear when the match begins. You can leave this by default unless the game is taking a long time to remove your barriers. If it is so and it is a two-team map, then set the Barrier Area to the region of the barriers only. However, it is not possible to do this with four-team maps +Area where the Indestructible "Red Barrier Glass and/or Indestructible Red Barrier Stone" wall is located. Setting this will allow the game to know where to make them disappear when the match begins. You can leave this by default unless the game is taking a long time to remove your barriers. If it is so and it is a two-team map, then set the Barrier Area to the region of the barriers only. However, it is not possible to do this with four-team maps. ### 6. Export From 4d6412160719f0d8e8e5a2756eaf9461362bbb28 Mon Sep 17 00:00:00 2001 From: Sasha Richalim Date: Mon, 14 Aug 2023 22:52:40 +0530 Subject: [PATCH 28/30] Few edits taken from the original README that was not intended to be changed; Changing a line to inclue the Resume option --- mods/ctf/ctf_map/README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 53d2428fb..db15dba35 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -15,10 +15,16 @@ 3. Enable creative mode. This will enable `mapedit` mode. 4. *Optional:* Enable `worldedit` -### 3. Important information +> You can grant yourself the `ctf_map_editor` privilege by running `/grantme ctf_map_editor` or by running `/grantme all` which grants you all the privileges that will be useful for map making. -- The map area can be maximum 230x230 blocks in surface area, but it can be lesser. Build it accordingly. -- You can grant yourself the `ctf_map_editor` privilege by running `/grantme ctf_map_editor` or by running `/grantme all` which grants you all the privileges that will be useful for map making. +### 3. Selecting the Map Area + +Decide where you will build your map. The area can be maximum 230x230 blocks in surface area, but it can be lesser. +1. Run `ctf_map editor` +2. Press `Create New Map` +3. Select a position to be one corner of the map. +4. Select a position in the opposite corner. Place it higher/lower than the first one to give the map height. +**Note:** you can change your area at any time by typing `/ctf_map editor` and pressing the "Corners" button. ### 4. Build @@ -42,12 +48,6 @@ If you wish to save your map for later edits, follow the note in the section abo Run `/ctf_map editor`. An explanation of some of the fields is given below. -#### Selecting the Map Area -1. Select a position to be one corner of the map. -2. Select a position in the opposite corner. Place it higher/lower than the first one to give the map height. - -> **Note:** Run `/ctf_map editor` to fill out the rest of the fields. - #### Map Enabled Whether or not the map is available for play. You will want to check this. @@ -118,7 +118,7 @@ Area where the Indestructible "Red Barrier Glass and/or Indestructible Red Barri 2. Find the exported map located in `[Mintest folder]/worlds/[Map World]/schems/[Exported Map folder]` 3. Move the exported map folder to `\[Minetest folder]/games/capturetheflag/mods/ctf/ctf_map/maps`. -You can access the exported map by running `/ctf_map editor`, clicking on the exported map folder from the list of maps, and then by pressing "Start Editing". +You can access the exported map by running `/ctf_map editor`, clicking on the exported map folder from the list of maps, and then by pressing "Resume Editing". ### 7. Play From 79a2240177e3f6af8e58c7912eb8703957bbcf1b Mon Sep 17 00:00:00 2001 From: Sasha Richalim Date: Mon, 14 Aug 2023 22:58:00 +0530 Subject: [PATCH 29/30] Edits to the resume section to what may now be the correct version --- mods/ctf/ctf_map/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index db15dba35..6aced2216 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -118,7 +118,7 @@ Area where the Indestructible "Red Barrier Glass and/or Indestructible Red Barri 2. Find the exported map located in `[Mintest folder]/worlds/[Map World]/schems/[Exported Map folder]` 3. Move the exported map folder to `\[Minetest folder]/games/capturetheflag/mods/ctf/ctf_map/maps`. -You can access the exported map by running `/ctf_map editor`, clicking on the exported map folder from the list of maps, and then by pressing "Resume Editing". +You can make edits to the map without changing the actual map files by running `ctf_map editor`, clicking on the exported map folder from the list of maps, and then by pressing `Resume Editing`. You can do so each time you want to edit before moving the `schems/[Exported Map folder]` to the `maps` folder. If you only want to access the map, do so by running `ctf_map editor` selecting the map folder, and clicking `Start Editing`. ### 7. Play From bd27a668b59f2a24c8fda164cd66f068f555d826 Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Mon, 21 Aug 2023 11:08:56 -0700 Subject: [PATCH 30/30] Update README.md --- mods/ctf/ctf_map/README.md | 60 ++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/mods/ctf/ctf_map/README.md b/mods/ctf/ctf_map/README.md index 6aced2216..0f7426bd2 100644 --- a/mods/ctf/ctf_map/README.md +++ b/mods/ctf/ctf_map/README.md @@ -19,12 +19,12 @@ ### 3. Selecting the Map Area -Decide where you will build your map. The area can be maximum 230x230 blocks in surface area, but it can be lesser. +Decide where you will build your map. We recommend you don't make your map larger than 230x230x230 blocks. 1. Run `ctf_map editor` 2. Press `Create New Map` 3. Select a position to be one corner of the map. 4. Select a position in the opposite corner. Place it higher/lower than the first one to give the map height. -**Note:** you can change your area at any time by typing `/ctf_map editor` and pressing the "Corners" button. +**Note:** you can change your map area at any time by typing `/ctf_map editor` and pressing the "Corners" button. ### 4. Build @@ -36,10 +36,10 @@ Decide where you will build your map. The area can be maximum 230x230 blocks in - Many blocks have an indestructible variant - Don't forget to add - Team chests - - Indestructible blocks under the flag. The minimum is 5x5 blocks in surface area. - - "Indestructible Barrier Glass" (`ctf_map:ind_glass`) around the edge of the world. - - "Indestructible Red Barrier Glass" (`ctf_map:ind_glass_red`) for the build-time wall. This will disappear once the match begins. - - "Indestructible Red Barrier Stone" (`ctf_map:ind_stone_red`) for underground build-time wall. This will turn to stone(`default:stone`) once the match begins. + - Indestructible blocks under the flag. The minimum is 5x5 blocks, with the flag on top of them in the center. + - "Indestructible Barrier Glass" (`ctf_map:ind_glass`) around the sides of the world (You don't need it on the ceiling) + - "Indestructible Red Barrier Glass" (`ctf_map:ind_glass_red`) for the build-time wall. This will disappear once the match begins, if the barrier area covers it (More on that later). + - "Indestructible Red Barrier Stone" (`ctf_map:ind_stone_red`) for underground build-time wall. This will turn into stone(`default:stone`) once the match begins, if the barrier area covers it (More on that later). If you wish to save your map for later edits, follow the note in the section about exporting the map. @@ -49,15 +49,14 @@ Run `/ctf_map editor`. An explanation of some of the fields is given below. #### Map Enabled -Whether or not the map is available for play. You will want to check this. +Whether or not the map is available for play. You will want to make sure it's enabled. #### License * Every map must have its own license. -* If attribution is required (for example if you modify other's map and you have to tell who is author of the original map), that has to be appended to the `license` field. -If you want to give more information, you can use the `Other info` field. +* You can append any attribution you need to give to the `license` field (For example: If you modified someone's map or used one of their builds you'd list their name and what map/build of theirs that you modified/used). If you want to give more information, you can use the `Other info` field. * If you don't know which license to use, [this list of CC licenses](https://creativecommons.org/use-remix/cc-licenses/) can help you. -* We can only accept the free culture licences like `CC BY-SA 4.0`. Note that not licences in the Creative Commons family are free(as in freedom). For instance those with `ND` are not. -* Please know what you are doing when choosing a certain license. For example, you can read information about various licenses and/or consult a lawyer. +* We can only accept the free culture licenses like `CC BY-SA 4.0`. Note that not all licenses in the Creative Commons family are free(as in freedom) (e.g `CC BY-ND`). +* Please make sure you know what you are doing when choosing a license. You could do a little research about various licenses, ask a parent for help if you're young and haven't dealt with licenses before, and/or consult a lawyer. #### Map Hint Does your map have hidden treasures? You can hint about them with the "Map Hint" field. @@ -104,42 +103,47 @@ Positions where team flags are placed. You can select the teams that you want on #### Zone Bounds How far the players of a certain team may go during build time. The zone bounds should overlap at the Red Barrier wall. -> **Note:** Even standing on the boundary sends the player back. They do not have to go beyond it. Place the boundaries accordingly. +> **Note:** Even players standing on the edge of their team zone are sent back to their base. It doesn't just trigger when they go beyond it. #### Chest Zones -Areas where chests can be placed. Some maps allow placing chests anywhere, while others only place them in certain locations. +Areas where treasure chests are placed. Some maps have treasure chests placed throughout the entire map, while others only have them placed in certain small areas/rooms. What you choose for your map is up to you. #### Barrier Area -Area where the Indestructible "Red Barrier Glass and/or Indestructible Red Barrier Stone" wall is located. Setting this will allow the game to know where to make them disappear when the match begins. You can leave this by default unless the game is taking a long time to remove your barriers. If it is so and it is a two-team map, then set the Barrier Area to the region of the barriers only. However, it is not possible to do this with four-team maps. +Area where the Indestructible "Red Barrier Glass and/or Indestructible Red Barrier Stone" wall is located. Setting this will tell the game where to look for the wall when removing them after the build time ends. You can leave this at its default unless the game is taking a long time to remove your barriers. Most 4 team maps will always have slow barrier removal though. -### 6. Export +### 6. Map Saving -1. Press "Finish Editing" -2. Find the exported map located in `[Mintest folder]/worlds/[Map World]/schems/[Exported Map folder]` -3. Move the exported map folder to `\[Minetest folder]/games/capturetheflag/mods/ctf/ctf_map/maps`. +#### Saving your changes +* Run `/ctf_map editor` and press "Finish Editing" after scrolling to the bottom -You can make edits to the map without changing the actual map files by running `ctf_map editor`, clicking on the exported map folder from the list of maps, and then by pressing `Resume Editing`. You can do so each time you want to edit before moving the `schems/[Exported Map folder]` to the `maps` folder. If you only want to access the map, do so by running `ctf_map editor` selecting the map folder, and clicking `Start Editing`. +#### Moving your map to where CTF can load it +* Find the exported map located in your map editor save folder`[Minetest folder]/worlds/[Map World]/schems/[Exported Map folder]` +* Move the exported map folder to the CTF map folder `[Minetest folder]/games/capturetheflag/mods/ctf/ctf_map/maps`. + +#### Resuming editing +Once you've moved your map once (See above) you can make edits to your map without having to move it again by running `/ctf_map editor`, clicking on your map in the list of maps, and then pressing `Resume Editing`, which tells CTF not to use the blocks in the map you copied to the CTF map folder. +* Any changes you make to the `/ctf_map editor` gui (chest zones, etc) won't apply. You have to copy the map for that. +* If you accidentally press `Start Editing` instead of `Resume Editing` you need to close the game without saving *copy your map to where CTF can load it* (See above). Otherwise your changes will be lost, because `Start Editing` tells CTF to use the blocks in the map you moved to the CTF map folder, which will be outdated if you've made changes since you last moved your map over. ### 7. Play 1. Create a new world with the `singlenode` mapgen. -2. Make sure creative mode is disabled +2. Make sure creative mode is disabled before joining 3. Grant yourself `ctf_admin` by issuing `/grantme ctf_admin` -4. Type `/maps` -5. Select your map -6. Press "Skip to map" +4. Run `/ctf_next -f ` Using your map's folder (or technical) name instead of `` ### 8. Screenshot -If you choose to submit your map, include a screenshot of it in the exported map's folder. It should be taken with on texture packs enabled and have an aspect ratio of 3:2 (screenshot 600x400px is suggested). +If you choose to submit your map, include a screenshot of it in the exported map's folder. It should be taken without any texture packs enabled and must have an aspect ratio of 3:2 (screenshot `600px`x`400px` is suggested). You can take a screenshot easily by doing the following: 1. Hide the HUD. By default F1 does that. 2. Hide the chat log. By default F2 does that. -3. Try to find a good view that shows most of the map. -4. *(Optional)* Increase your view range if important parts of the map cannot be seen. By default the = (or +) and - keys do that. -5. Take a screenshot **from Minetest**. By default F12 does that. -6. You can find the screenshot in `[Minetest folder]/screenshots` unless you have changed the path in settings. +3. See if your screenshot looks better with/without fog enabled. You can toggle it with F3 by default +4. Try to find a good view that shows most of the map. +5. *(Optional)* Increase your view range if important parts of the map cannot be seen. By default the = (or +) and - keys do that. +6. Take a screenshot **from Minetest**. By default F12 does that. +7. You can find the screenshot in `[Minetest folder]/screenshots` unless you have changed the path in settings. Crop the screenshot into the aspect ratio mentioned above using a tool of your choice, and put the screenshot inside your exported map's folder. It should be named `screenshot.png`.