Skip to content
This repository has been archived by the owner on Oct 21, 2023. It is now read-only.

Commit

Permalink
fixed #103 yeet
Browse files Browse the repository at this point in the history
  • Loading branch information
ANightDazingZoroark committed Apr 29, 2021
1 parent 18c2c44 commit 99aaa89
Show file tree
Hide file tree
Showing 12 changed files with 192 additions and 25 deletions.
14 changes: 2 additions & 12 deletions behaviors/entities/apatosaurus.json
Original file line number Diff line number Diff line change
Expand Up @@ -1881,12 +1881,7 @@
"component_groups": [
"rift:apatosaurus_adult_calm"
]
},
"run_command": {
"command": [
"say angery"
]
}
}
},
"rift:adult_on_calm": {
"add": {
Expand All @@ -1898,12 +1893,7 @@
"component_groups": [
"rift:apatosaurus_adult_angry"
]
},
"run_command": {
"command": [
"say kalm"
]
}
}
},
"rift:attach_saddle": {
"add": {
Expand Down
3 changes: 2 additions & 1 deletion resources/entity/apatosaurus.entity.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
]
},
"render_controllers": [
"controller.render.apatosaurus"
"controller.render.apatosaurus",
"controller.render.apatosaurus_platform"
],
"spawn_egg": {
"base_color": "#303a2d",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"format_version": "1.8.0",
"render_controllers": {
"controller.render.apatosaurus_platform": {
"part_visibility": [
{
"platform*": "query.is_saddled",
"neckBelt*": "query.is_saddled",
"neckStrap*": "query.is_saddled",
"playerSeat*": "query.is_saddled",
"passengerSeat0*": "query.is_saddled",
"passengerSeat1*": "query.is_saddled",
"neckSaddle0*": "query.is_saddled",
"neckSaddle1*": "query.is_saddled",
"neckSaddle2*": "query.is_saddled",
"headSaddle*": "query.is_saddled"
}
]
}
}
}
12 changes: 0 additions & 12 deletions resources/render_controllers/apatosaurus.render_controller.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,6 @@
{
"chest*": "query.is_chested"
},
{
"platform*": "query.is_saddled",
"neckBelt*": "query.is_saddled",
"neckStrap*": "query.is_saddled",
"playerSeat*": "query.is_saddled",
"passengerSeat0*": "query.is_saddled",
"passengerSeat1*": "query.is_saddled",
"neckSaddle0*": "query.is_saddled",
"neckSaddle1*": "query.is_saddled",
"neckSaddle2*": "query.is_saddled",
"headSaddle*": "query.is_saddled"
},
{
"rightCannon*": "query.skin_id == 1",
"leftCannon*": "query.skin_id == 1",
Expand Down
2 changes: 2 additions & 0 deletions resources/texts/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ howtoplay.taming=Taming
howtoplay.taming.title=Taming
howtoplay.eggs=Eggs
howtoplay.eggs.title=Eggs
howtoplay.mounted_weapons=Mounted Weapons
howtoplay.mounted_weapons.title=Mounted Weapons

tips.game.1=You don't need to read the vanilla loading tips coz you might have seen them a million times by this point that you already know them.
tips.game.2=Tamed Dimetrodons allow you to hatch eggs faster!
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/textures/ui/cannon crafting.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/textures/ui/cannonball crafting.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/textures/ui/mortar crafting.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/textures/ui/mortar shell crafting.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/textures/ui/wrench crafting.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
165 changes: 165 additions & 0 deletions resources/ui/how_to_play_screen.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@
"eggs_button@how_to_play.eggs_button": {
"$toggle_group_forced_index": 11
}
},
{
"mounted_weapons_button@how_to_play.mounted_weapons_button": {
"$toggle_group_forced_index": 12
}
}
]
}
Expand Down Expand Up @@ -145,6 +150,9 @@
},
{
"eggs_section@how_to_play.eggs_section": {}
},
{
"mounted_weapons_section@how_to_play.mounted_weapons_section": {}
}
]
}
Expand Down Expand Up @@ -942,5 +950,162 @@
}
}
]
},

"mounted_weapons_button@how_to_play_common.section_toggle_button": {
"$section_topic": "mounted_weapons"
},
"mounted_weapons_section@how_to_play_common.main_sections": {
"bindings": [
{
"binding_type": "view",
"source_control_name": "mounted_weapons_button_toggle",
"source_property_name": "#toggle_state",
"target_property_name": "#visible"
}
],
"controls": [
{
"paragraph_0@how_to_play_common.paragraph": {
"$text": "Currently, the only mob that can have mounted weapons is the Apatosaurus, but whatever, I'm still adding this section especially in case other mobs that can have mounted weapons get added."
}
},
{
"padding_0@how_to_play_common.padding": {}
},
{
"paragraph_1@how_to_play_common.paragraph": {
"$text": "Stationary weapons are powerful weapons, but their main drawback is that they require ammunition and they cannot be easily moved from one place to another without a mob that has a platform. The ones that are currently available are the Cannon and the Mortar"
}
},
{
"header_0@how_to_play_common.header": {
"$text": "Cannon"
}
},
{
"paragraph_2@how_to_play_common.paragraph": {
"$text": "Cannons are weapons that fire explosives at a far off distance. They require cannonballs to work."
}
},
{
"padding_1@how_to_play_common.padding": {}
},
{
"image_0@how_to_play_common.image": {
"texture": "textures\/ui\/cannon crafting",
"size": [
"100%",
"100px"
]
}
},
{
"padding_2@how_to_play_common.padding": {}
},
{
"image_1@how_to_play_common.image": {
"texture": "textures\/ui\/cannonball crafting",
"size": [
"100%",
"100px"
]
}
},
{
"header_1@how_to_play_common.header": {
"$text": "Mortar"
}
},
{
"paragraph_3@how_to_play_common.paragraph": {
"$text": "Mortars are weapons that drop shells on top of mobs at a far off distance. They require mortar shells to work."
}
},
{
"padding_3@how_to_play_common.padding": {}
},
{
"image_2@how_to_play_common.image": {
"texture": "textures\/ui\/mortar crafting",
"size": [
"100%",
"100px"
]
}
},
{
"padding_4@how_to_play_common.padding": {}
},
{
"image_3@how_to_play_common.image": {
"texture": "textures\/ui\/mortar shell crafting",
"size": [
"100%",
"100px"
]
}
},
{
"header_2@how_to_play_common.header": {
"$text": "Apatosaurus Platform"
}
},
{
"paragraph_4@how_to_play_common.paragraph": {
"$text": "The Apatosaurus Platform is an exclusive saddle for the Apatosaurus only. It comes with 3 seats and slots for a chest and one stationary weapon. Equipping it onto an Apatosaurus is as simple as opening its inventory and placing it in the saddle slot."
}
},
{
"padding_5@how_to_play_common.padding": {}
},
{
"image_4@how_to_play_common.image": {
"texture": "textures\/ui\/apatosaurus platform crafting",
"size": [
"100%",
"100px"
]
}
},
{
"padding_6@how_to_play_common.padding": {}
},
{
"paragraph_5@how_to_play_common.paragraph": {
"$text": "In order to equip the weapon of your choice on the platform, right click/tap and hold on a platformed Apatosaurus with the weapon. Then, in order to place ammunition on the weapons, right click/tap and hold on the Apatosaurus with the required ammunition. Apatosauruses with cannons can have 24 cannonballs, while those with mortars can have 12 mortar shells."
}
},
{
"padding_7@how_to_play_common.padding": {}
},
{
"paragraph_6@how_to_play_common.paragraph": {
"$text": "Finally, in order to fire the weapon, use the command console! The crafting recipe for that item can be found in the tools section."
}
},
{
"header_3@how_to_play_common.header": {
"$text": "Wrench"
}
},
{
"paragraph_7@how_to_play_common.paragraph": {
"$text": "In case you equipped the wrong weapon onto the Apatosaurus, you can remove it using the wrench."
}
},
{
"padding_8@how_to_play_common.padding": {}
},
{
"image_5@how_to_play_common.image": {
"texture": "textures\/ui\/wrench crafting",
"size": [
"100%",
"100px"
]
}
}
]
}
}

0 comments on commit 99aaa89

Please sign in to comment.