Merge remote-tracking branch 'origin' into add-constants

Author: E-nana17

packages/web/src/blocks.ts

@@ -105,7 +105,7 @@ const FighterProperties = {
   HP: "HP",
   STAMINA: "stamina",
   SPEED: "speed",
-  WEAPON: "bulletsLeft",
+  WEAPON: "weapon?.bulletsLeft",
 } as const;
 export const GET_PROPERTY_OF_FIGHTER = "get_property_of_fighter";
 Blockly.Blocks[GET_PROPERTY_OF_FIGHTER] = {
@@ -132,8 +132,12 @@ Blockly.JavaScript[GET_PROPERTY_OF_FIGHTER] = (block: Blockly.Block) => [
     block,
     OBJECT,
     Blockly.JavaScript.ORDER_MEMBER
-  )}.${block.getFieldValue(PROPERTY_NAME)}`,
-  Blockly.JavaScript.ORDER_MEMBER,
+  )}.${block.getFieldValue(PROPERTY_NAME)} ? ${Blockly.JavaScript.valueToCode(
+    block,
+    OBJECT,
+    Blockly.JavaScript.ORDER_MEMBER
+  )}.${block.getFieldValue(PROPERTY_NAME)} : 0`,
+  Blockly.JavaScript.ORDER_CONDITIONAL,
 ];
 
 // 定数
@@ -571,7 +575,7 @@ Blockly.Blocks[CONSOLE_LOG] = {
     this.appendValueInput(VALUE).appendField("console.log");
     this.setPreviousStatement(true);
     this.setNextStatement(true);
-    this.setColour(0);
+    this.setColour(160);
   },
 };
 Blockly.JavaScript[CONSOLE_LOG] = (block: Blockly.Block) =>

packages/web/src/component/Arena.tsx

@@ -124,6 +124,7 @@ export default function Arena(props: ArenaProps) {
   const [open, setOpen] = useState(false);
   const [errorMessage, setErrorMessage] = useState(" ");
   const [name, setName] = useState("");
+  const [uploaded, setUploaded] = useState(false);
   const { password } = useApiPasswordContext();
   if (!password) throw new Error("Missing password");
 
@@ -150,6 +151,7 @@ export default function Arena(props: ArenaProps) {
       program: newProgram,
       rank: currentUser.rank,
     });
+    setUploaded(true);
   };
 
   const handleClickOpen = () => {
@@ -281,6 +283,16 @@ export default function Arena(props: ArenaProps) {
         name={name}
         setName={setName}
       />
+      {uploaded && (
+        <Dialog
+          open={uploaded}
+          onClose={() => {
+            setUploaded(false);
+          }}
+        >
+          <Typography sx={{ px: 2, py: 1 }}>アップロードしました</Typography>
+        </Dialog>
+      )}
     </>
   );
 }

packages/web/src/component/TestPlay.tsx

@@ -431,7 +431,7 @@ export default function TestPlay(props: TestPlayProps) {
             setSubmitted(false);
           }}
         >
-          {currentUser.program}
+          <Typography sx={{ px: 2, py: 1 }}>反映しました</Typography>
         </Dialog>
       )}
     </>

packages/web/src/component/game.ts

@@ -449,11 +449,17 @@ class PunchAction implements FighterAction {
 
   isCompleted = false;
 
+  isSucceeded = false;
+
   requiredStamina = 20;
 
   constructor(actor: Fighter, target: Fighter) {
     this.actor = actor;
     this.target = target;
+    const distance = calculateDistance(this.actor, this.target);
+    if (distance <= Fighter.armLength) {
+      this.isSucceeded = true;
+    }
   }
 
   tick() {
@@ -876,7 +882,7 @@ class WorldRenderer {
       if (action instanceof PunchAction) {
         const existingRenderer = this.punchEffectRenderers.get(action);
         if (!existingRenderer) {
-          if (!action.isCompleted) {
+          if (!action.isCompleted && action.isSucceeded) {
             const newRenderer = new PunchEffectRenderer(action, this.#pixi);
             this.punchEffectRenderers.set(action, newRenderer);
             newRenderer.onCompleted = () => {