DP & RP | Add new map

Nikos-Stuff · Aug 23, 2024 · c46cb91 · c46cb91
1 parent 627e488
commit c46cb91
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 3 deletions.
diff --git a/main/assets/minecraft/font/default.json b/main/assets/minecraft/font/default.json
@@ -191,6 +191,17 @@
         ]
     },
 
+    {
+      "type": "bitmap",
+        "file": "vibecraft:gui/voting/pillars.png",
+        "ascent": 13,
+        "height": 138,
+        "chars": [
+          ""
+        ]
+    },
+
+
     {
       "type": "bitmap",
         "file": "vibecraft:gui/voting/notfound.png",

diff --git a/main/assets/vibecraft/textures/gui/voting/pillars.png b/main/assets/vibecraft/textures/gui/voting/pillars.png
diff --git a/nnb_spawnsystem/data/nnb_spawnsystem/functions/__private__/switch_case/0/17.mcfunction b/nnb_spawnsystem/data/nnb_spawnsystem/functions/__private__/switch_case/0/17.mcfunction
@@ -0,0 +1 @@
+function nnb_spawnsystem:call_bots {"sel_map":"nn_pillars"}
diff --git a/nnb_spawnsystem/main.jmc b/nnb_spawnsystem/main.jmc
@@ -153,6 +153,8 @@ switch(nn_map:map) {
         call_bots(sel_map="nn_abandonedoffice");
     case 16:
         call_bots(sel_map="nn_flatgrass_arcade");
+    case 17:
+        call_bots(sel_map="nn_pillars");
    // default:
    //     say "Unable to find anything";
    }

diff --git a/nnb_vote_system/data/nnb_vote/functions/assign.mcfunction b/nnb_vote_system/data/nnb_vote/functions/assign.mcfunction
@@ -83,12 +83,18 @@ execute if entity @e[name=nn_abandonedoffice,tag=map_2] run scoreboard objective
 execute if entity @e[name=nn_abandonedoffice,tag=map_3] run scoreboard objectives add sel_map_3 dummy {"text":""}
 
 
-
+execute if entity @e[name=nn_pillars,tag=map_1] run scoreboard objectives add sel_map_1 dummy {"text":""}
+execute if entity @e[name=nn_pillars,tag=map_2] run scoreboard objectives add sel_map_2 dummy {"text":""}
+execute if entity @e[name=nn_pillars,tag=map_3] run scoreboard objectives add sel_map_3 dummy {"text":""}
 
 
 
 
 # If we failed to detect map icon - use temp placeholder image
 scoreboard objectives add sel_map_1 dummy {"text":""}
 scoreboard objectives add sel_map_2 dummy {"text":""}
-scoreboard objectives add sel_map_3 dummy {"text":""}
+scoreboard objectives add sel_map_3 dummy {"text":""}
+
+
+
+#> https://unicode.bayashi.net/?page=1801 <-- EUGHHHH STUPID UNICODEEEEEEEEEEEEEEEEEEEEEEE
diff --git a/nnb_vote_system/data/nnb_vote/functions/spawn_markers.mcfunction b/nnb_vote_system/data/nnb_vote/functions/spawn_markers.mcfunction
@@ -11,4 +11,6 @@ execute at @e[type=minecraft:armor_stand,tag=nn_hauntedmansion] run summon item_
 execute at @e[type=minecraft:armor_stand,tag=nn_habitablezone] run summon item_display ~ ~ ~ {Tags:["spawn_marker"],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,1f,0f],scale:[2f,2f,2f]},item:{id:"minecraft:beacon",Count:1b,tag:{CustomModelData:1}}}
 execute at @e[type=minecraft:armor_stand,tag=nn_doomspire] run summon item_display ~ ~ ~ {Tags:["spawn_marker"],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,1f,0f],scale:[2f,2f,2f]},item:{id:"minecraft:beacon",Count:1b,tag:{CustomModelData:1}}}
 execute at @e[type=minecraft:armor_stand,tag=nn_topmodernhouse] run summon item_display ~ ~ ~ {Tags:["spawn_marker"],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,1f,0f],scale:[2f,2f,2f]},item:{id:"minecraft:beacon",Count:1b,tag:{CustomModelData:1}}}
-execute at @e[type=minecraft:armor_stand,tag=nn_abandonedoffice] run summon item_display ~ ~ ~ {Tags:["spawn_marker"],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,1f,0f],scale:[2f,2f,2f]},item:{id:"minecraft:beacon",Count:1b,tag:{CustomModelData:1}}}
+execute at @e[type=minecraft:armor_stand,tag=nn_abandonedoffice] run summon item_display ~ ~ ~ {Tags:["spawn_marker"],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,1f,0f],scale:[2f,2f,2f]},item:{id:"minecraft:beacon",Count:1b,tag:{CustomModelData:1}}}
+execute at @e[type=minecraft:armor_stand,tag=nn_flatgrass_a] run summon item_display ~ ~ ~ {Tags:["spawn_marker"],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,1f,0f],scale:[2f,2f,2f]},item:{id:"minecraft:beacon",Count:1b,tag:{CustomModelData:1}}}
+execute at @e[type=minecraft:armor_stand,tag=nn_pillars] run summon item_display ~ ~ ~ {Tags:["spawn_marker"],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,1f,0f],scale:[2f,2f,2f]},item:{id:"minecraft:beacon",Count:1b,tag:{CustomModelData:1}}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		function nnb_spawnsystem:call_bots {"sel_map":"nn_pillars"}