コールアウト用ジェネレーターの基礎

DekoKiyo · Sep 21, 2024 · 249f32a · 249f32a
1 parent e63c406
commit 249f32a
Show file tree

Hide file tree

Showing 20 changed files with 818 additions and 138 deletions.
diff --git a/JapaneseCallouts/Callouts/PacificBankHeist/Configurations.cs b/JapaneseCallouts/Callouts/PacificBankHeist/Configurations.cs
@@ -43,7 +43,7 @@ internal class Configurations : IConfig
     public WeaponConfig[] RobbersWeapons { get; set; }
     [JsonPropertyName("robbers_sub_weapons")]
     public WeaponConfig[] RobbersThrowableWeapons { get; set; }
-    [JsonPropertyName("weapon_in_riot")]
+    [JsonPropertyName("weapons_in_riot")]
     public WeaponConfig[] WeaponInRiot { get; set; }
 
     // Positions
@@ -67,7 +67,7 @@ internal class Configurations : IConfig
     public Position[] NormalRobbersPositions { get; set; }
     [JsonPropertyName("robbers_negotiation_positions")]
     public Position[] RobbersNegotiationPositions { get; set; }
-    [JsonPropertyName("robbers_sneak_position")]
+    [JsonPropertyName("robbers_sneak_positions")]
     public RobbersSneakPosition[] RobbersSneakPosition { get; set; }
     [JsonPropertyName("robbers_in_vault_positions")]
     public Position[] RobbersInVaultPositions { get; set; }

diff --git a/JapaneseCallouts/Json/PacificBankHeist.json b/JapaneseCallouts/Json/PacificBankHeist.json
@@ -55,7 +55,7 @@
   "swat_weapons": [],
   "robbers_weapons": [],
   "robbers_sub_weapons": [],
-  "weapon_in_riot": [],
+  "weapons_in_riot": [],
   "police_cruiser_positions": [],
   "police_transporter_positions": [],
   "riot_positions": [],
@@ -66,7 +66,7 @@
   "standing_officer_positions": [],
   "normal_robbers_positions": [],
   "robbers_negotiation_positions": [],
-  "robbers_sneak_position": [],
+  "robbers_sneak_positions": [],
   "robbers_in_vault_positions": [],
   "robbers_surrendering_positions": [],
   "firefighter_positions": [],

diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -19,6 +19,7 @@
   },
   "dependencies": {
     "@hookform/resolvers": "^3.9.0",
+    "@radix-ui/react-accordion": "^1.2.0",
     "@radix-ui/react-checkbox": "^1.1.1",
     "@radix-ui/react-dialog": "^1.1.1",
     "@radix-ui/react-dropdown-menu": "^2.1.1",
@@ -28,6 +29,8 @@
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-switch": "^1.1.0",
     "@radix-ui/react-toast": "^1.2.1",
+    "@radix-ui/react-toggle": "^1.1.0",
+    "@radix-ui/react-toggle-group": "^1.1.0",
     "@types/react-router-dom": "^5.3.3",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",

diff --git a/web/src/App.tsx b/web/src/App.tsx
@@ -13,13 +13,13 @@ import Epic from './pages/Installation/Epic';
 import Rockstar from './pages/Installation/Rockstar';
 import Configurations from './pages/Configurations';
 import { Callouts, CalloutsBase } from './pages/Callouts';
-import PacificBankHeistGen from './generators/Callouts/PacificBankHeist';
-import { VehicleGen } from './generators/Objects/Vehicle';
+import { PacificBankHeistGen } from './generators/pages/Callouts/PacificBankHeist';
+import { VehicleGen } from './generators/pages/Objects/Vehicle';
 import { Toaster } from './components/ui/toaster';
-import { PedGen } from './generators/Objects/Ped';
-import { WeaponGen } from './generators/Objects/Weapon';
+import { PedGen } from './generators/pages/Objects/Ped';
+import { WeaponGen } from './generators/pages/Objects/Weapon';
 import Generators from './pages/Generators';
-import { OutfitGen } from './generators/Outfits/Outfits';
+import { OutfitGen } from './generators/pages/Outfits/Outfits';
 
 function App() {
   return (

diff --git a/web/src/components/ui/accordion.tsx b/web/src/components/ui/accordion.tsx
@@ -0,0 +1,56 @@
+import * as React from "react"
+import * as AccordionPrimitive from "@radix-ui/react-accordion"
+import { ChevronDown } from "lucide-react"
+
+import { cn } from "../../lib/utils"
+
+const Accordion = AccordionPrimitive.Root
+
+const AccordionItem = React.forwardRef<
+  React.ElementRef<typeof AccordionPrimitive.Item>,
+  React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
+>(({ className, ...props }, ref) => (
+  <AccordionPrimitive.Item
+    ref={ref}
+    className={cn("border-b", className)}
+    {...props}
+  />
+))
+AccordionItem.displayName = "AccordionItem"
+
+const AccordionTrigger = React.forwardRef<
+  React.ElementRef<typeof AccordionPrimitive.Trigger>,
+  React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Trigger>
+>(({ className, children, ...props }, ref) => (
+  <AccordionPrimitive.Header className="flex">
+    <AccordionPrimitive.Trigger
+      ref={ref}
+      className={cn(
+        "flex flex-1 items-center justify-between py-4 font-medium transition-all hover:underline [&[data-state=open]>svg]:rotate-180",
+        className
+      )}
+      {...props}
+    >
+      {children}
+      <ChevronDown className="h-4 w-4 shrink-0 transition-transform duration-200" />
+    </AccordionPrimitive.Trigger>
+  </AccordionPrimitive.Header>
+))
+AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName
+
+const AccordionContent = React.forwardRef<
+  React.ElementRef<typeof AccordionPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Content>
+>(({ className, children, ...props }, ref) => (
+  <AccordionPrimitive.Content
+    ref={ref}
+    className="overflow-hidden text-sm transition-all data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down"
+    {...props}
+  >
+    <div className={cn("pb-4 pt-0", className)}>{children}</div>
+  </AccordionPrimitive.Content>
+))
+
+AccordionContent.displayName = AccordionPrimitive.Content.displayName
+
+export { Accordion, AccordionItem, AccordionTrigger, AccordionContent }