Merge branch 'main' of https://github.com/Korvarix/Galaxy-Strike-Online

Admin Panel.md

@@ -42,24 +42,25 @@
 - Users (Static)
     - Edit
         - Permission Nodes
+# Permission Nodes
 ### Default Roles
 - Members Permission Nodes
     - permission.node.player.text.chat
+    - permission.node.player.text.chat.emote
     - permission.node.player.text.chat.message
-    - permission.node.player.text.chat.message.alliance
     - permission.node.player.text.chat.message.direct
-    - permission.node.player.text.chat.message.fleet
+    - permission.node.player.text.color.name
-    - permission.node.player.text.color
+    - permission.node.guild.join
 - Moderator Permission Nodes
-    - roles.members.*
+    - global.roles.members.*
     - permission.node.player.server.ban
     - permission.node.player.server.timeout
     - permission.node.player.server.unban
     - permission.node.player.text.ban
-    - permission.node.player.text.timeout.["time_in_seconds"]
+    - permission.node.player.text.timeout.["timeinseconds"]
     - permission.node.player.text.unban
 - Admin Permission Nodes
-    - roles.moderators.*
+    - global.roles.moderators.*
     - permission.node.player.clean.database.all
     - permission.node.player.clean.database.item
     - permission.node.player.clean.inventory.all
@@ -67,7 +68,7 @@
     - permission.node.player.console
     - permission.node.player.give.exp
     - permission.node.player.give.item
-    - permission.node.player.give.skills
+    - permission.node.player.give.skill
     - permission.node.player.permission.add.["permission.node.*"]
     - permission.node.player.permission.edit.["permission.node.*"]
     - permission.node.player.permission.remove.["permission.node.*"]
@@ -102,4 +103,89 @@
 - permission.node.generate.credits.offline.*.(allow/deny)
 - permission.node.generate.datacores.online.*.(allow/deny)
 - permission.node.generate.datacores.offline.*.(allow/deny)
-- permission.node.player.nickname.(allow/deny)
+- permission.node.player.nickname.(allow/deny)
+- permission.node.player.text.color.(allow/deny)
+- permission.node.player.text.emote.(allow/deny)
+### Guild Type Permissions
+- guild.roles.*
+- permission.node.guild.admin.*
+- permission.node.guild.admin.alliance.*
+- permission.node.guild.admin.alliance.create
+- permission.node.guild.admin.alliance.join
+- permission.node.guild.admin.alliance.leave
+- permission.node.guild.admin.manage.*
+- permission.node.guild.admin.manage.base.*
+- permission.node.guild.admin.manage.base.type.*
+- permission.node.guild.admin.manage.base.type.booster.*
+- permission.node.guild.admin.manage.base.type.booster.{integar}
+- permission.node.guild.admin.manage.base.type.mine
+- permission.node.guild.admin.manage.base.type.mine.{integar}
+- permission.node.guild.admin.manage.base.type.research.*
+- permission.node.guild.admin.manage.base.type.research.{{datapackId}.{researchId}}
+- permission.node.guild.admin.manage.base.type.storage.*
+- permission.node.guild.admin.manage.base.type.storage.{integar}
+- permission.node.guild.admin.manage.base.type.storage.{integar}.name
+- permission.node.guild.admin.manage.base.type.storage.{integer}.limit.*
+- permission.node.guild.admin.manage.base.type.storage.{integar}.limit.add
+- permission.node.guild.admin.manage.base.type.storage.{integar}.limit.remove
+- permission.node.guild.admin.manage.base.type.storage.{integar}.hidden
+- permission.node.guild.admin.manage.message.announcement
+- permission.node.guild.admin.manage.message.day
+- permission.node.guild.admin.manage.message.recuitement
+- permission.node.guild.admin.manage.name
+- permission.node.guild.admin.manage.role.*
+- permission.node.guild.admin.manage.role.create
+- permission.node.guild.admin.manage.role.delete
+- permission.node.guild.admin.manage.role.edit.*
+- permission.node.guild.admin.manage.role.edit.hierarchy
+- permission.node.guild.admin.manage.role.edit.name
+- permission.node.guild.admin.manage.role.edit.permission
+- permission.node.guild.invite
+- permission.node.guild.join
+- permission.node.guild.storage.*
+- permission.node.guild.storage.add.*
+- permission.node.guild.storage.add.{integer}
+- permission.node.guild.storage.hidden.{integer}
+- permission.node.guild.storage.remove.*
+- permission.node.guild.storage.remove.{integer}
+- permission.node.guild.text.chat.message.["guild.roles.*"]
+### Alliance Type Permissions
+- alliance.roles.*
+- permission.node.alliance.admin.*
+- permission.node.alliance.admin.manage.*
+- permission.node.alliance.admin.manage.base.*
+- permission.node.alliance.admin.manage.base.type.*
+- permission.node.alliance.admin.manage.base.type.booster.*
+- permission.node.alliance.admin.manage.base.type.booster.{integar}
+- permission.node.alliance.admin.manage.base.type.mine
+- permission.node.alliance.admin.manage.base.type.mine.{integar}
+- permission.node.alliance.admin.manage.base.type.research.*
+- permission.node.alliance.admin.manage.base.type.research.{{datapackId}.{researchId}}
+- permission.node.alliance.admin.manage.base.type.storage.*
+- permission.node.alliance.admin.manage.base.type.storage.{integar}
+- permission.node.alliance.admin.manage.base.type.storage.{integar}.name
+- permission.node.alliance.admin.manage.base.type.storage.{integer}.limit.*
+- permission.node.alliance.admin.manage.base.type.storage.{integar}.limit.add
+- permission.node.alliance.admin.manage.base.type.storage.{integar}.limit.remove
+- permission.node.alliance.admin.manage.base.type.storage.{integar}.hidden
+- permission.node.alliance.admin.manage.kick
+- permission.node.alliance.admin.manage.message.announcement
+- permission.node.alliance.admin.manage.message.day
+- permission.node.alliance.admin.manage.message.recuitement
+- permission.node.alliance.admin.manage.name
+- permission.node.alliance.admin.manage.role.*
+- permission.node.alliance.admin.manage.role.create
+- permission.node.alliance.admin.manage.role.delete
+- permission.node.alliance.admin.manage.role.edit.*
+- permission.node.alliance.admin.manage.role.edit.hierarchy
+- permission.node.alliance.admin.manage.role.edit.name
+- permission.node.alliance.admin.manage.role.edit.permission
+- permission.node.alliance.invite
+- permission.node.alliance.join
+- permission.node.alliance.storage.*
+- permission.node.alliance.storage.add.*
+- permission.node.alliance.storage.add.{integer}
+- permission.node.alliance.storage.hidden.{integer}
+- permission.node.alliance.storage.remove.*
+- permission.node.alliance.storage.remove.{integer}
+- permission.node.alliance.text.chat.message.["alliance.roles.*"]

game-server/datapacks/original/data/items/armour/backpack/backpack_advanced.json

@@ -1,19 +0,0 @@
-{
-  "armour": {
-    "id": "original:backpack_advanced",
-    "displayName": "items.materials.original.backpack_advanced",
-    "description": "items.materials.original.backpack_advanced.desc",
-    "texture": "original/assets/armour/backpack/backpack_advanced.png",
-    "stats": {
-      "health": 30,
-      "resistance.base": 0.6,
-      "defence.rating": 0.5,
-      "reflect.chance": 0.7
-    },
-    "meta": {
-      "rarity": "common",
-      "equipmentSlot": "original:accessory",
-      "storeCategory": "original:bag"
-    }
-  }
-}

game-server/datapacks/original/data/items/armour/backpack/backpack_basic.json

@@ -1,19 +0,0 @@
-{
-  "armour": {
-    "id": "original:backpack_basic",
-    "displayName": "items.materials.original.backpack_basic",
-    "description": "items.materials.original.backpack_basic.desc",
-    "texture": "original/assets/armour/backpack/backpack_basic.png",
-    "stats": {
-      "health": 50,
-      "resistance.base": 0.6,
-      "defence.rating": 0.5,
-      "reflect.chance": 0.7
-    },
-    "meta": {
-      "rarity": "common",
-      "equipmentSlot": "original:accessory",
-      "storeCategory": "original:bag"
-    }
-  }
-}

game-server/datapacks/original/data/items/armour/backpack/backpack_elite.json

@@ -1,19 +0,0 @@
-{
-  "armour": {
-    "id": "original:backpack_elite",
-    "displayName": "items.materials.original.backpack_elite",
-    "description": "items.materials.original.backpack_elite.desc",
-    "texture": "original/assets/armour/backpack/backpack_elite.png",
-    "stats": {
-      "health": 30,
-      "resistance.base": 0.6,
-      "defence.rating": 0.5,
-      "reflect.chance": 0.7
-    },
-    "meta": {
-      "rarity": "uncommon",
-      "equipmentSlot": "original:accessory",
-      "storeCategory": "original:bag"
-    }
-  }
-}

game-server/datapacks/original/data/items/equipment/personal/accessory/basic_accessory.json

@@ -0,0 +1,22 @@
+{
+  "plating": {
+    "id": "original:basic_personal_accessory",
+    "displayName": "items.materials.original.accessory.basic_personal_accessory",
+    "description": "items.materials.original.accessory.basic_personal_accessory.desc",
+    "texture": "original/assets/textures/equipement/personal/accessory/basic_accessory.png",
+    "stats": {
+      "health": 2.25
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": [
+        "original:personal_accessory_1",
+        "original:personal_accessory_2",
+        "original:personal_accessory_3",
+        "original:personal_accessory_4"
+      ],
+      "storeCategory": "original:personal_equipment",
+      "dungeon": "ground"
+    }
+  }
+}

game-server/datapacks/original/data/items/equipment/personal/backpack/backpack_basic.json

@@ -0,0 +1,19 @@
+{
+  "armour": {
+    "id": "original:backpack_personal_basic",
+    "displayName": "items.materials.original.backpack.backpack_personal_basic",
+    "description": "items.materials.original.backpack.backpack_personal_basic.desc",
+    "texture": "original/assets/textures/equipement/personal/backpacks/backpack_basic.png",
+    "stats": {
+      "health": 20,
+      "resistance.base": 0.125,
+      "defence.rating": 0.125
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": "original:personal_backpack",
+      "storeCategory": "original:personal_equipment",
+      "dungeon": "ground"
+    }
+  }
+}

game-server/datapacks/original/data/items/equipment/personal/boots/basic_boots.json

@@ -0,0 +1,20 @@
+{
+  "plating": {
+    "id": "original:basic_personal_boots",
+    "displayName": "items.materials.original.boots.basic_personal_boots",
+    "description": "items.materials.original.boots.basic_personal_boots.desc",
+    "texture": "original/assets/textures/equipment/personal/boots/basic_boots.png",
+    "stats": {
+      "health": 5,
+      "resistance.base": 0.1,
+      "defence.rating": 1.3,
+      "reflect.chance": 0.1
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": "original:personal_boots",
+      "storeCategory": "original:personal",
+      "dungeon": "ground"
+    }
+  }
+}

game-server/datapacks/original/data/items/equipment/personal/gloves/basic_gloves.json

@@ -0,0 +1,20 @@
+{
+  "plating": {
+    "id": "original:basic_personal_gloves",
+    "displayName": "items.materials.original.gloves.basic_personal_gloves",
+    "description": "items.materials.original.gloves.basic_personal_gloves.desc",
+    "texture": "original/assets/textures/equipment/personal/armor/gloves/basic_gloves.png",
+    "stats": {
+      "health": 5,
+      "resistance.base": 0.1,
+      "defence.rating": 1.3,
+      "reflect.chance": 0.1
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": "original:personal_gloves",
+      "storeCategory": "original:personal",
+      "dungeon": "ground"
+    }
+  }
+}

game-server/datapacks/original/data/items/equipment/personal/suit/basic_suit.json

@@ -0,0 +1,20 @@
+{
+  "plating": {
+    "id": "original:basic_personal_suit",
+    "displayName": "items.materials.original.suit.basic_personal_suit",
+    "description": "items.materials.original.suit.basic_personal_suit.desc",
+    "texture": "original/assets/textures/equipment/personal/suit/basic_suit.png",
+    "stats": {
+      "health": 15,
+      "resistance.base": 0.125,
+      "defence.rating": 0.9,
+      "reflect.chance": 0.0125
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": "original:personal_suit",
+      "storeCategory": "original:personal",
+      "dungeon": "ground"
+    }
+  }
+}

game-server/datapacks/original/data/items/equipment/personal/weapns/basic_weapon.json

@@ -0,0 +1,20 @@
+{
+  "plating": {
+    "id": "original:basic_personal_weapon",
+    "displayName": "items.materials.original.weapon.basic_personal_weapon",
+    "description": "items.materials.original.weapon.basic_personal_weapon.desc",
+    "texture": "original/assets/textures/equipment/personal/weapon/basic_weapon.png",
+    "stats": {
+      "health": 15,
+      "resistance.base": 0.125,
+      "defence.rating": 0.9,
+      "reflect.chance": 0.0125
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": "original:personal_suit",
+      "storeCategory": "original:personal",
+      "dungeon": "ground"
+    }
+  }
+}

game-server/datapacks/original/data/items/equipment/ship/engines/basic_ship_engines.json

@@ -0,0 +1,17 @@
+{
+  "plating": {
+    "id": "original:basic_ship_enignes",
+    "displayName": "items.materials.original.engine..basic_ship_enignes",
+    "description": "items.materials.original.plating.basic_ship_enignes.desc",
+    "texture": "original/assets/textures/equipement/ship/engines/basic_ship_enignes.png",
+    "stats": {
+      "health": 50
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": "original:ship_engines",
+      "storeCategory": "original:ship_equipment",
+      "dungeon": "space"
+    }
+  }
+}

game-server/datapacks/original/data/items/equipment/ship/hulls/basic_ship_plating.json

@@ -3,17 +3,18 @@
     "id": "original:basic_ship_plating",
     "displayName": "items.materials.original.plating.basic_ship_plating",
     "description": "items.materials.original.plating.basic_ship_plating.desc",
-    "texture": "original/assets/textures/hullPlating/ship/plating/basic_ship_plating.png",
+    "texture": "original/assets/textures/equipement/ship/hulls/basic_ship_plating.png",
     "stats": {
-      "health": 50,
+      "health": 10,
-      "resistance.base": 0.6,
+      "resistance.base": 0.1,
       "defence.rating": 2.3,
-      "reflect.chance": 5.3
+      "reflect.chance": 1.3
     },
     "meta": {
       "rarity": "common",
-      "equipmentSlot": "original:shipHull",
+      "equipmentSlot": "original:ship_hull",
-      "storeCategory": "original:shipHull"
+      "storeCategory": "original:ship_equipment",
+      "dungeon": "space"
     }
   }
 }

game-server/datapacks/original/data/items/equipment/ship/shields/basic_ship_shield.json

@@ -0,0 +1,20 @@
+{
+  "plating": {
+    "id": "original:basic_ship_shield",
+    "displayName": "items.materials.original.plating.basic_ship_shield",
+    "description": "items.materials.original.plating.basic_ship_shield.desc",
+    "texture": "original/assets/textures/equipement/ship/hulls/basic_ship_plating.png",
+    "stats": {
+      "health": 25,
+      "resistance.base": 0.75,
+      "defence.rating": 5.25,
+      "reflect.chance": 7.25
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": "original:ship_shields",
+      "storeCategory": "original:ship_equipment",
+      "dungeon": "space"
+    }
+  }
+}

game-server/datapacks/original/data/items/equipment/ship/thrusters/basic_ship_thrusters.json

@@ -0,0 +1,24 @@
+{
+  "plating": {
+    "id": "original:basic_ship_thruster",
+    "displayName": "items.materials.original.thruster.basic_ship_thruster",
+    "description": "items.materials.original.thruster.basic_ship_thruster.desc",
+    "texture": "original/assets/textures/equipement/ship/thrusters/basic_ship_thruster.png",
+    "stats": {
+      "health": 15,
+      "defence.rating": 0.125,
+      "speed": 12.5
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": [
+        "original:ship_thruster_1",
+        "original:ship_thruster_2",
+        "original:ship_thruster_3",
+        "original:ship_thruster_4"
+      ],
+      "storeCategory": "original:ship_equipment",
+      "dungeon": "space"
+    }
+  }
+}

game-server/datapacks/original/data/items/equipment/ship/weapons/basic_ship_weapon.json

@@ -0,0 +1,22 @@
+{
+  "plating": {
+    "id": "original:basic_ship_weapon",
+    "displayName": "items.materials.original.plating.basic_ship_weapon",
+    "description": "items.materials.original.plating.basic_ship_weapon.desc",
+    "texture": "original/assets/textures/equipement/ship/weapon/basic_ship_weapon.png",
+    "stats": {
+      "attack": 7.5,
+      "health": 5,
+      "defence.rating": 0.1
+    },
+    "meta": {
+      "rarity": "common",
+      "equipmentSlot": [
+        "original:ship_weapon_1",
+        "original:ship_weapon_2"
+      ],
+      "storeCategory": "original:ship_equipment",
+      "dungeon": "space"
+    }
+  }
+}

game-server/datapacks/original/data/skills/combat/engine_effiency.json

@@ -0,0 +1,15 @@
+{
+  "skills": {
+    "id": "original:engine_effiency",
+    "displayName": "skills.category.original.combat.engine_effiency",
+    "description": "skills.category.original.combat.engine_effiency.desc",
+    "meta": {
+      "category": "combat",
+      "topLevel": 10,
+      "math": {
+        "start": 500,
+        "progressionCurve": 1.7
+      }
+    }
+  }
+}

game-server/datapacks/original/data/skills/combat/shield_effiency.json

@@ -0,0 +1,15 @@
+{
+  "skills": {
+    "id": "original:shield_effiency",
+    "displayName": "skills.category.original.combat.shield_effiency",
+    "description": "skills.category.original.combat.shield_effiency.desc",
+    "meta": {
+      "category": "combat",
+      "topLevel": 10,
+      "math": {
+        "start": 500,
+        "progressionCurve": 1.7
+      }
+    }
+  }
+}

game-server/datapacks/original/data/skills/combat/thruster_speed.json

@@ -0,0 +1,15 @@
+{
+  "skills": {
+    "id": "original:thruster_effiency",
+    "displayName": "skills.category.original.combat.thruster_effiency",
+    "description": "skills.category.original.combat.thruster_effiency.desc",
+    "meta": {
+      "category": "combat",
+      "topLevel": 10,
+      "math": {
+        "start": 500,
+        "progressionCurve": 1.7
+      }
+    }
+  }
+}

game-server/datapacks/original/data/skills/combat/weapon_effiency.json

@@ -4,11 +4,11 @@
     "displayName": "skills.category.original.combat.weapon_effiency",
     "description": "skills.category.original.combat.weapon_effiency.desc",
     "meta": {
-      "category": "crafting",
+      "category": "combat",
       "topLevel": 10,
       "math": {
         "start": 500,
-        "input": 1.7
+        "progressionCurve": 1.7
       }
     }
   }

game-server/datapacks/original/data/skills/crafting/alloying.json

@@ -8,7 +8,7 @@
       "topLevel": 10,
       "math": {
         "start": 500,
-        "input": 1.7
+        "progressionCurve": 1.7
       }
     }
   }

game-server/datapacks/original/data/skills/crafting/forging.json

@@ -8,7 +8,7 @@
       "topLevel": 10,
       "math": {
         "start": 500,
-        "input": 1.7
+        "progressionCurve": 1.7
       }
     }
   }

game-server/datapacks/original/data/skills/science/alien_technology.json

@@ -8,7 +8,7 @@
       "topLevel": 10,
       "math": {
         "start": 500,
-        "input": 1.7
+        "progressionCurve": 1.7
       }
     }
   }

game-server/datapacks/original/data/skills/science/biology_engineering.json

@@ -4,11 +4,11 @@
     "displayName": "skills.category.original.science.biology_engineering",
     "description": "skills.category.original.science.biology_engineering.desc",
     "meta": {
-      "category": "crafting",
+      "category": "science",
       "topLevel": 10,
       "math": {
         "start": 500,
-        "input": 1.7
+        "progressionCurve": 1.7
       }
     }
   }

game-server/datapacks/original/manifest.json

@@ -98,31 +98,34 @@
   },
   "core_systems": {
     "categories": {
-      "original:person_helmet": {
+      "original:personal_helmet": {
         "displayName": "core_systems.category.original.person.helmet"
       },
-      "original:person_suit": {
+      "original:personal_suit": {
         "displayName": "core_systems.category.original.person.suit"
       },
-      "original:person_gloves": {
+      "original:personal_gloves": {
         "displayName": "core_systems.category.original.person.gloves"
       },
-      "original:person_boots": {
+      "original:personal_backpack": {
+        "displayName": "core_systems.category.original.person.backpack"
+      },
+      "original:personal_boots": {
         "displayName": "core_systems.category.original.person.boots"
       },
-      "original:person_accessory_1": {
+      "original:personal_accessory_1": {
         "displayName": "core_systems.category.original.person.accessory_1"
       },
-      "original:person_accessory_2": {
+      "original:personal_accessory_2": {
         "displayName": "core_systems.category.original.person.accessory_2"
       },
-      "original:person_accessory_3": {
+      "original:personal_accessory_3": {
         "displayName": "core_systems.category.original.person.accessory_3"
       },
-      "original:person_accessory_4": {
+      "original:personal_accessory_4": {
         "displayName": "core_systems.category.original.person.accessory_4"
       },
-      "original:person_weapons": {
+      "original:personal_weapons": {
         "displayName": "core_systems.category.original.person.weapon"
       },
       "original:ship_hull": {
@@ -190,11 +193,11 @@
       "original:ships": {
         "displayName": "shop.category.original.ships"
       },
-      "original:weapons": {
+      "original:personal_equipment": {
-        "displayName": "shop.category.original.weapons"
+        "displayName": "shop.category.original.personal.equipment"
       },
-      "original:defence": {
+      "original:ship_equipment": {
-        "displayName": "shop.category.original.defence"
+        "displayName": "shop.category.original.ship.equipment"
       },
       "original:consumables": {
         "displayName": "shop.category.original.consumables"