Merge pull request #19 from srt4rulez/develop

v0.6.0
srt4rulez · Jan 24, 2021 · 079d292 · 079d292
2 parents f94ee55 + defb441
commit 079d292
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ An interactive map of the [Mojave Wasteland](https://fallout.fandom.com/wiki/Moj
 
 ## Features
 
-- Contains all [skill books](https://fallout.fandom.com/wiki/Fallout:_New_Vegas_skill_books), [snow globes](https://fallout.fandom.com/wiki/Snow_globe) and [unique weapons](https://fallout.fandom.com/wiki/Fallout:_New_Vegas_unique_weapons). [*](#limited-items)
+- Contains all [skill books](https://fallout.fandom.com/wiki/Fallout:_New_Vegas_skill_books) and [snow globes](https://fallout.fandom.com/wiki/Snow_globe).
 - Mark items as found to keep track of your progress. Your progress is saved in your browser.  
 - Each item type is color-coded to easily identify them.
 - Toggle the visibility of found items.
@@ -50,7 +50,3 @@ This will start up a docker container that has everything we need to develop, an
 Go to http://localhost:3000/ in your browser on your machine to view the site.
 
 Checkout [https://github.com/facebook/create-react-app](https://github.com/facebook/create-react-app) for more info.
-
-## Limited Items
-
-As of 2021-01-03, there are only a limited number of items on the map. This project was started near the end of Dec 2020. I'll be adding more items starting in Jan 2021. 
diff --git a/public/assets/unique-weapon-oh-baby.webp b/public/assets/unique-weapon-oh-baby.webp
diff --git a/public/assets/unique-weapon-pushy.webp b/public/assets/unique-weapon-pushy.webp
diff --git a/src/Components/SettingsPanel/SettingsPanel.js b/src/Components/SettingsPanel/SettingsPanel.js
@@ -30,7 +30,6 @@ const SettingsPanel = (props) => {
 
     const skillBookMarkers = props.markers.filter((marker) => marker.type === typeMap.SkillBook);
     const snowGlobeMarkers = props.markers.filter((marker) => marker.type === typeMap.SnowGlobe);
-    const uniqueWeaponMarkers = props.markers.filter((marker) => marker.type === typeMap.UniqueWeapon);
 
     return (
 
@@ -132,15 +131,6 @@ const SettingsPanel = (props) => {
                     onMarkerTitleClick={props.onMarkerTitleClick}
                 />
 
-                <MarkerTypePanel
-                    className="settings-panel__marker-type-panel"
-                    type={typeMap.UniqueWeapon}
-                    markers={uniqueWeaponMarkers}
-                    onMarkButtonClick={props.onMarkButtonClick}
-                    onTypeClick={props.onTypeClick(typeMap.UniqueWeapon)}
-                    onMarkerTitleClick={props.onMarkerTitleClick}
-                />
-
             </div>
 
             <footer

diff --git a/src/Data/marker-types.js b/src/Data/marker-types.js
@@ -1,20 +1,17 @@
 const typeMap = {
-    SnowGlobe:    'snow_globe',
-    SkillBook:    'skill_book',
-    UniqueWeapon: 'unique_weapon',
+    SnowGlobe: 'snow_globe',
+    SkillBook: 'skill_book',
 };
 
 const typeLabelMap = {
-    [typeMap.SnowGlobe]:    'Snow Globe',
-    [typeMap.SkillBook]:    'Skill Book',
-    [typeMap.UniqueWeapon]: 'Unique Weapon',
+    [typeMap.SnowGlobe]: 'Snow Globe',
+    [typeMap.SkillBook]: 'Skill Book',
 };
 
 // Bulma CSS colors.
 const typeColorMap = {
-    [typeMap.SnowGlobe]:    'link',
-    [typeMap.SkillBook]:    'warning',
-    [typeMap.UniqueWeapon]: 'primary',
+    [typeMap.SnowGlobe]: 'link',
+    [typeMap.SkillBook]: 'warning',
 };
 
 const subTypeSkillBookSubMap = {

diff --git a/src/Data/markers.json b/src/Data/markers.json
@@ -567,7 +567,7 @@
         "id": "skill-book-tt-bitter-springs-recreation-area",
         "type": "skill_book",
         "sub_type": "tt",
-        "title": "Vault 22",
+        "title": "Bitter Springs Recreation Area",
         "desc": "Inside the office shack to the west, on the desk in the smaller of the two rooms.",
         "url": "https://fallout.fandom.com/wiki/Tumblers_Today_(Fallout:_New_Vegas)",
         "imgSrc": "assets/skill-book-tt-bitter-springs-recreation-area.webp",
@@ -650,25 +650,5 @@
         "imgSrc": "assets/skill-book-wsg-scavenger-platform.webp",
         "lat": 617.75,
         "lng": 763.5
-    },
-    {
-        "id": "unique-weapon-oh-baby",
-        "type": "unique_weapon",
-        "title": "Oh, Baby!",
-        "desc": "<a href=\"https://fallout.fandom.com/wiki/Charleston_Cave\" rel=\"noreferrer\" target=\"_blank\">Charleston Cave</a> - The weapon is in the far southwest open area of the cave, accessible via tunnels from the north and east. It is lying on the ground near the west wall, directly west of the eastern tunnel entrance. Next to the dead nightkin.",
-        "url": "https://fallout.fandom.com/wiki/Oh,_Baby!",
-        "imgSrc": "assets/unique-weapon-oh-baby.webp",
-        "lat": 796.5,
-        "lng": 203
-    },
-    {
-        "id": "unique-weapon-pushy",
-        "type": "unique_weapon",
-        "title": "Pushy",
-        "desc": "<a href=\"https://fallout.fandom.com/wiki/Ruby_Hill_mine\" rel=\"noreferrer\" target=\"_blank\">Ruby Hill mine</a> - Found on the body of a dead <a href=\"https://fallout.fandom.com/wiki/Jackal_gang_member\" rel=\"noreferrer\" target=\"_blank\">Jackal gang member</a>, lying near the dry tunnel entrance in the underground lake area.",
-        "url": "https://fallout.fandom.com/wiki/Pushy",
-        "imgSrc": "assets/unique-weapon-pushy.webp",
-        "lat": 840.5,
-        "lng": 311.5
     }
 ]